diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini
index 945ad1eb..aae293c7 100644
--- a/installer/portable/FileBot.l4j.ini
+++ b/installer/portable/FileBot.l4j.ini
@@ -8,6 +8,7 @@
 
 # look for native libs here
 -Djna.library.path="%EXEDIR%"
+-Djava.library.path="%EXEDIR%"
 
 # store preferences to text file
 -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory
diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index 8c8a9da8..34c6daad 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -6,8 +6,9 @@
 ^(TV.)?(Show|Serie)[s]?
 ^[0-9]{1,2}[.]
 ^Cover
+^Film[s]?
 ^Info
-^Movie
+^Movie[s]?
 ^SAMPLE
 ^Season.[0-9]+
 ^Tracker
diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt
index d44cb3e2..04d4a2f8 100644
--- a/website/data/release-groups.txt
+++ b/website/data/release-groups.txt
@@ -30,7 +30,9 @@ BaSS
 BAUM
 BDiSC
 BiA
+blueF
 BlueTV
+blueZilla
 BMB
 BrG
 BRZONE
@@ -44,6 +46,7 @@ CHD
 CHDSUBS
 Chel
 CHGRP
+Chotab
 CHRONiCLES
 CHUPPI
 CiA
@@ -91,19 +94,24 @@ DivXNL-Team
 DMT
 DnB
 DNL
+DNR
 DOT
 DOWN
 DUQA
 DutchReleaseTeam
+EbP
+ECI
 Ekolb
 Electri4ka
 ELECTRiC
 Electrichka
 EMPiREHD
 EnDoR
+EPiK
 ESiR
 ETM
 ETRG
+EuchHD
 EUHD
 EuReKA
 ExtraTorrentRG
@@ -126,16 +134,20 @@ FXG
 FxM
 GB
 GEHENNA
+GFY
 GiNJi
 GMoRK
 Goblin10
 GoLDSToNE
 GOTHiC
 H2
+Haggis
 HALCYON
 HANGOVER
 HD-UNiT3D
 HD1080
+HDC
+HDChina
 HDFiRE
 HDFL
 HDi
@@ -149,9 +161,13 @@ HHH
 HiDt
 HiGHTIMES
 HiNT
+HOWL
 HqDTS
 hV
+HWD
+HWE
 HyDe
+Hype
 iaK
 iGNHD
 IGUANA
@@ -161,6 +177,7 @@ IMF
 IMMERSE
 imNaKeD
 iNFAMOUS
+iNGOT
 InSaNiTy
 iNSECTS
 iNSPiRED
@@ -173,6 +190,7 @@ JAVLiU
 k2
 KaKa
 keltz
+KiNGS
 KLAXXON
 KOENiG
 KRaLiMaRKo
@@ -199,6 +217,7 @@ MMI
 MOMENTUM
 MONK
 MOREHD
+MOTU
 MOViESTARS
 MsR
 MuSt
@@ -207,6 +226,7 @@ mVmHD
 NBS
 NEW.SOURCE
 NewArtRiot
+NFHD
 NGR
 NGXHD
 NhaNc3
@@ -220,6 +240,8 @@ NOsegmenT
 NoTV
 NOVO
 NSUBS
+NT
+NTb
 NWO
 NyTT
 OAS
@@ -228,13 +250,19 @@ ONYX
 ORC
 ORENJi
 ORPHEUS
+OSiTV
 OUTDATED
+P0W4
 papi
 PaYxXx
 PerfectionHD
+PFa
+PhoenixRG
 piepHD
+PiLAF
 PiNER
 PiX
+POD
 PoRNDoCtOR
 PORNOHOLiCS
 PoTuS
@@ -246,12 +274,15 @@ PROGRESS
 PROPHETS
 ProPL
 PRXHD
+psig
 PtS
 Pukka
 PURE
+PxHD
 QDP
 QXE
 rabomil
+RANDi
 RAP
 Razor1911
 REAVERS
@@ -262,11 +293,13 @@ RELOADED
 Republic
 REPULSiON
 REVEiLLE
+REWARD
 RiVER
 RMT
 RoCKRioT
 RSG
 S26
+SAiNTS
 SAiVERT
 SAMFD
 SANTI
@@ -277,6 +310,7 @@ SEPTiC
 SexSh0p
 SFM
 SHAMNBOYZ
+shortbrehd
 SiGHTHD
 SiNNERS
 SiTV
@@ -287,9 +321,12 @@ SoCkS
 SoW
 STV
 SUNSPOT
+SURFER
 SVD
 Swesub
 SYS
+t00ng0d
+TB
 TELEFLiX
 TERRA
 THOR
@@ -299,6 +336,7 @@ TLF
 TM
 TN
 TOKUS
+TOPAZ
 trentalent
 TruCK
 TRUEFRENCH
diff --git a/website/scripts/cpmv.groovy b/website/scripts/cpmv.groovy
deleted file mode 100644
index b960e724..00000000
--- a/website/scripts/cpmv.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-// filebot -script "http://filebot.sf.net/scripts/cpmv.groovy" -trust-script <folder>
-
-// copy files
-def temp = args*.copyTo("E:/filebot-temp")
-
-// sort copies into the given file structure
-temp.eachMediaFolder { 
-	rename(folder:it, format:'E:/TV Shows/{n}/{n} - {s00e00} - {t}', db:'thetvdb', strict:false)
-}
diff --git a/website/scripts/rsam.groovy b/website/scripts/rsam.groovy
deleted file mode 100644
index fc70fee8..00000000
--- a/website/scripts/rsam.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-// filebot -script "http://filebot.sf.net/scripts/rsam.groovy" <options> <folder>
-
-
-def isMatch(a, b) { similarity(a, b) > 0.9 }
-
-/*
- * Rename anime, tv shows or movies (assuming each folder represents one item)
- */
-args.eachMediaFolder { dir ->
-	def n = dir.name
-		
-	[	[db:anidb,      query:{ anidb.search(n, _args.locale).find{ isMatch(it, n) } }],
-		[db:thetvdb,    query:{ thetvdb.search(n, _args.locale).find{ isMatch(it, n) } }],
-		[db:themoviedb, query:{ themoviedb.searchMovie(n, _args.locale).find{ isMatch(it, n) } }]
-	].find {
-		def match = it.query()
-		if (match) { rename(folder:dir, db:it.db.name, query:match.name) }
-		return match
-	}
-}
diff --git a/website/scripts/sorteps.groovy b/website/scripts/sorteps.groovy
new file mode 100644
index 00000000..95a451e2
--- /dev/null
+++ b/website/scripts/sorteps.groovy
@@ -0,0 +1,12 @@
+def dir = 'E:/Downloads'
+
+// extract files from archives and delete archives afterwards
+extract(folder:dir, output:dir) && dir.listFiles{ it =~ /rar$/ }*.delete()
+
+getMissingSubtitles(folder:dir, lang:'de', strict:false)
+getMissingSubtitles(folder:dir, lang:'en', strict:false)
+
+// rename each file individually in strict mode
+dir.listFiles().each {
+	rename(file:it, format:"E:/Series/{n}/{n.space('.')}.{s00e00}.{t.space('.')}", strict:true)
+}
diff --git a/website/scripts/sortivo.groovy b/website/scripts/sortivo.groovy
index b24a714e..5d52fb84 100644
--- a/website/scripts/sortivo.groovy
+++ b/website/scripts/sortivo.groovy
@@ -11,11 +11,10 @@ args.getFiles{ it.isVideo() }.each{
 	
 	// DECIDE EPISODE VS MOVIE (IF NOT CLEAR)
 	if (tvs && mov) {
-		if (it.name =~ "(?i:$tvs - .+)") {
+		if (it.name =~ "(?i:$tvs - .+)" || parseEpisodeNumber(it) || parseDate(it)) {
 			println "Exclude Movie: $mov"
 			mov = null
-		}
-		if (detectMovie(it, true)) {
+		} else if (detectMovie(it, true)) {
 			println "Exclude Series: $tvs"
 			tvs = null
 		}