Set the content root to the application folder

https://github.com/Jackett/Jackett/issues/3522
yggtorrent: fix URL (#3515 )
2025-12-24 23:04:33 +01:00 · 2018-08-04 16:49:26 +10:00 · 2018-08-03 06:15:08 +02:00 · 2018-07-31 20:19:25 +10:00 · 2018-07-31 20:14:02 +10:00 · 2018-07-31 11:00:34 +02:00
475 changed files with 24449 additions and 18562 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,9 @@
 **Please use the search bar** at the top of the page and make sure you are not creating an already submitted issue. Duplicating issues makes it more difficult for everyone to follow. Your issue may have already been solved in the past as well.

 Provide a description of the feature request or bug, the more details the better.
-If you are experiencing an issue with a tracker, a **full log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting
+If you are experiencing an issue with a tracker, a **full enhanced log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting

-Jackett version:  
-Mono version (if not using Windows):  
+**Jackett version**:  
+**Mono version** (if not using Windows):  

 -------------------------------
--- a/.github/cookies-chrome.png
+++ b/.github/cookies-chrome.png
--- a/.github/cookies-firefox.png
+++ b/.github/cookies-firefox.png
--- a/.github/duplicate_issue.md
+++ b/.github/duplicate_issue.md
@@ -0,0 +1,7 @@
+Duplicate of #{{ chosenIssue.number }}
+
+Hi @{{ payload.sender.login }},
+
+This issue looks similar to #{{ chosenIssue.number }}. 
+
+To prevent issue tracker clutter, this issue will now be closed. If you feel this issue isn't a duplicate of #{{ chosenIssue.number }}, then feel free to post a comment on this issue stating why it's not a duplicate. Your comment will automatically re-open this issue.
--- a/.github/no_information_provided.md
+++ b/.github/no_information_provided.md
@@ -0,0 +1,9 @@
+Hi @{{ payload.sender.login }},
+
+You've created an issue, but haven't provided any details to allow the community to assist you. To prevent issue tracker clutter, this issue will now be closed. Please provide the information needed below and your comment will automatically re-open this issue.
+
+Provide a description of the feature request or bug, the more details the better.
+If you are experiencing an issue with a tracker, a **full enhanced log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting
+
+**Jackett version**:  
+**Mono version** (if not using Windows):
--- a/.github/no_response.md
+++ b/.github/no_response.md
@@ -0,0 +1,3 @@
+Hi @{{ payload.data.user.login }},
+
+No response has been received for {{ days }} days. To prevent issue tracker clutter, this issue will now be closed. To re-open the issue, please provide the information requested and the issue will automatically re-open.
--- a/.github/pull_request_readme.md
+++ b/.github/pull_request_readme.md
@@ -0,0 +1,7 @@
+Hi @{{ payload.pull_request.user.login }},
+
+Thanks for your contribution to Jackett!
+
+If you are adding a new indexer, please ensure that you've added it to the readme as well
+
+A human will be along soon to review
--- a/.gitignore
+++ b/.gitignore
@@ -199,3 +199,5 @@ FakesAssemblies/
 /Artifacts
 /TestResults
 *.DS_Store
+.idea/
+launchSettings.json
--- a/Installer.iss
+++ b/Installer.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

 #define MyAppName "Jackett"
-#define MyAppVersion GetFileVersion("BuildOutput\FullFramework\Windows\Jackett\Jackett.Common.dll")
-#define MyAppPublisher "Jackett  Inc."
+#define MyAppVersion GetFileVersion(MyFileForVersion)
+#define MyAppPublisher "Jackett"
 #define MyAppURL "https://github.com/Jackett/Jackett"
 #define MyAppExeName "JackettTray.exe"

@@ -22,9 +22,11 @@ AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=Jackett.Installer.Windows
-SetupIconFile=src\Jackett.Console\jackett.ico
-UninstallDisplayIcon={commonappdata}\Jackett\JackettConsole.exe
+OutputBaseFilename={#MyOutputFilename}
+SetupIconFile=src\Jackett.Tray\jackett.ico
+UninstallDisplayIcon={commonappdata}\Jackett\{#MyAppExeName}
+VersionInfoVersion={#MyAppVersion}
+UninstallDisplayName={#MyAppName}
 Compression=lzma
 SolidCompression=yes
 DisableDirPage=yes
@@ -37,9 +39,7 @@ Name: "windowsService"; Description: "Install as a Windows Service"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

 [Files]
-Source: "BuildOutput\FullFramework\Windows\Jackett\JackettTray.exe"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion
-Source: "BuildOutput\FullFramework\Windows\Jackett\JackettUpdater.exe"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion
-Source: "BuildOutput\FullFramework\Windows\Jackett\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MySourceFolder}\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

 [Icons]
@@ -48,16 +48,15 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{commonappdata}\Jackett\{#MyAppExeName}"; Tasks: desktopicon

 [Run]
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated runhidden;
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--ReserveUrls"; Flags: waituntilterminated runhidden;
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Install"; Flags: waituntilterminated runhidden; Tasks: windowsService
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Start"; Flags: waituntilterminated runhidden; Tasks: windowsService
 Filename: "{commonappdata}\Jackett\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

-[Run]
-Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated;
-Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--ReserveUrls"; Flags: waituntilterminated;
-Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--MigrateSettings"; Flags: waituntilterminated;
-Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Install"; Flags: waituntilterminated; Tasks: windowsService
-Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Start"; Flags: waituntilterminated; Tasks: windowsService
-
 [UninstallRun]
-Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated skipifdoesntexist
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated skipifdoesntexist runhidden
+Filename: "{sys}\taskkill.exe"; Parameters: "/f /im {#MyAppExeName}"; Flags: waituntilterminated skipifdoesntexist runhidden
+Filename: "{sys}\taskkill.exe"; Parameters: "/f /im JackettConsole.exe"; Flags: waituntilterminated skipifdoesntexist runhidden


--- a/README.md
+++ b/README.md
@@ -2,8 +2,7 @@

 [![GitHub issues](https://img.shields.io/github/issues/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/issues)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/pulls)
-[![Bountysource](https://img.shields.io/bountysource/team/jackett/activity.svg?style=flat-square)](https://www.bountysource.com/teams/jackett)
-[![Build status](https://ci.appveyor.com/api/projects/status/gaybh5mvyx418nsp/branch/master?svg=true)](https://ci.appveyor.com/project/camjac251/jackett)
+[![Build status](https://ci.appveyor.com/api/projects/status/gaybh5mvyx418nsp/branch/master?svg=true)](https://ci.appveyor.com/project/Jackett/jackett)
 [![Github Releases](https://img.shields.io/github/downloads/Jackett/Jackett/total.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/releases/latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/jackett.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/jackett/)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA)
@@ -17,8 +16,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/


 #### Supported Systems
-* Windows using .NET 4.5.2 [Download here](https://www.microsoft.com/net/framework/versions/net452).
-* Linux and macOS using Mono 4.6.0 and above. [Download here](http://www.mono-project.com/download/). Earlier versions of mono may work but some trackers may fail to negotiate SSL correctly, and others may cause Jackett to crash when used.
+* Windows using .NET 4.6.1 or above [Download here](https://www.microsoft.com/net/framework/versions/net461).
+* Linux and macOS using Mono 5.8 or above. [Download here](http://www.mono-project.com/download/).

 ### Supported Public Trackers
 * 1337x
@@ -30,40 +29,48 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BT-Scene
 * cpasbien
 * ETTV
+ * ExtraTorrent.ag
 * EZTV
 * Frozen Layer
 * GkTorrent
 * Horrible Subs
 * Idope
 * Il Corsaro Nero <!-- maintained by bonny1992 -->
+ * Il Corsaro Blu
+ * Isohunt2
 * KickAssTorrent
 * KickAssTorrent (thekat.se clone)
 * LimeTorrents
 * MagnetDL
- * NextTorrent
+ * MejorTorrent <!-- maintained by ivandelabeldad -->
+ * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, etc)
 * Nyaa.si
 * Nyaa-Pantsu
 * Nyoo
 * RARBG
 * RuTor
 * ShowRSS
- * Sky torrents
+ * sukebei.Nyaa.si
+ * sukebei-Pantsu
 * The Pirate Bay
 * TNTVillage <!-- maintained by bonny1992 -->
 * Tokyo Toshokan
 * Torlock
 * Torrent Downloads
 * Torrent9
+ * TorrentKim
 * Torrentz2
 * World Wide Torrents
+ * YIFY (YTS)
 * YTS.ag
 * Zooqle
- 
+
 ### Supported Semi-Private Trackers
 * 7tor
 * CzTorrent
 * Deildu
 * Gay-Torrents.net
+ * Gay-Torrents.org
 * Kinozal
 * LostFilm.tv
 * Mega-Bliz
@@ -75,7 +82,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * NoName Club
 * RuTracker
 * SkTorrent
- * TorrentBytes
+ * Union Fansub
 * Xtreme Zone
 * YggTorrent
 * Ztracker
@@ -86,7 +93,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Abnormal
 * Acid-Lounge
 * AlphaRatio
- * Andraste
 * AnimeBytes
 * AnimeTorrents
 * AOX
@@ -112,12 +118,15 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BitMeTV
 * BitSoup  [![(invite needed)][inviteneeded]](#)
 * Bitspyder
+ * BitTorrentFiles  [![(invite needed)][inviteneeded]](#)
 * BJ-Share
 * BlueBird
 * Blutopia
+ * Brasil Tracker
 * BroadcastTheNet
 * BrokenStones
 * BTNext
+ * BTXpress
 * Carpathians
 * CCFBits
 * CGPeers
@@ -126,7 +135,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Cinemageddon
 * CinemaZ
 * Classix
- * CZTeam
 * DanishBits
 * DataScene
 * Demonoid
@@ -138,48 +146,47 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * EliteHD  [![(invite needed)][inviteneeded]](#)
 * Elit Tracker
 * Elite-Tracker
- * EoT-Forum
+ * Empornium
 * eStone
 * Ethor.net (Thor's Land)
 * FANO.IN
 * FileList
+ * Femdomcult
 * Freedom-HD
 * FullMixMusic
 * FunFile
 * FunkyTorrents
 * Fuzer
- * GayTorrent.ru
- * GFTracker
+ * GAYtorrent.ru
+ * GazelleGames
 * Gfxnews
 * GFXPeers
- * Ghost City
 * GigaTorrents
 * GimmePeers <!-- maintained by jamesb2147 -->
+ * Girotottent
 * GODS  [![(invite needed)][inviteneeded]](#)
- * Gormogon
 * Greek Team
+ * HacheDe
 * Hardbay
 * HD-Forever
 * HD-Only
 * HD-Space
+ * HD-Spain
 * HD-Torrents
 * HD-Bits.com
- * HD4Free
 * HDBits
 * HDChina
+ * HDCity
 * HDHome
 * HDME
 * HDSky
 * HDTorrents.it
 * Hebits
 * Hon3y HD
- * Hounddawgs
- * House-of-Torrents
 * Hyperay
 * ICE Torrent
 * I Love Classics
 * Immortalseed
- * Infinity-T
 * inPeril
 * Insane Tracker
 * IPTorrents
@@ -204,19 +211,23 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * notwhat.cd
 * Ourbits
 * Passione Torrent <!-- maintained by bonny1992 -->
- * PassThePopcorn  [![(invite needed)][inviteneeded]](#)
+ * PassThePopcorn
 * PirateTheNet
 * PiXELHD
 * PolishSource
 * PolishTracker
 * Pretome
 * PrivateHD
+ * Psytorrents
 * PTFiles
+ * PuntoTorrent
+ * Racing4Everyone (R4E)
 * Redacted (PassTheHeadphones)
 * RevolutionTT
- * Rockhard Lossless
+ * RGU
 * RoDVD
 * SceneFZ
+ * SceneReactor
 * SceneTime
 * SDBits
 * Secret Cinema
@@ -230,8 +241,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * SportsCult
 * SportHD
 * Superbits
- * Synthesiz3r
 * Tasmanit
+ * TBPlus
+ * TehConnection.me
+ * TenYardTracker
 * The Empire
 * The Geeks
 * The Horror Charnel
@@ -242,40 +255,53 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * The Show
 * The Vault
 * The-Torrents
- * TenYardTracker
 * Torrent Network
 * Torrent Sector Crew
+ * Torrent.LT
 * TorrentBD
+ * TorrentBytes
 * TorrentCCF  [![(invite needed)][inviteneeded]](#)
 * TorrentDay
 * Torrentech
 * TorrentHeaven
 * TorrentHR
 * Torrenting
+ * Torrentland
 * TorrentLeech
 * Torrents.Md
+ * TorrentSeeds
 * Torrent-Syndikat
+ * TOrrent-tuRK (TORK)
 * TorViet
 * ToTheGlory
 * TranceTraffic
 * Trezzor
 * TV Chaos UK
 * TV-Vault
- * u-Torrent
+ * u-torrents (SceneFZ)
 * UHDBits
 * Ultimate Gamer Club
- * ULTRAHDCLUB
 * Waffles
 * World-In-HD
 * WorldOfP2P
+ * x-ite.me
 * x264
+ * xBytesV2
 * XSpeeds
 * Xthor
+ * ExoticaZ (Your Exotic Torrents)
 * Zamunda.net
 * Zelka.org

 Trackers marked with  [![(invite needed)][inviteneeded]](#) have no active maintainer and are missing features or are broken. If you have an invite for them please send it to kaso1717 -at- gmail.com to get them fixed/improved.

+### Aggregate indexers
+
+A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab/api`.
+It will query all configured indexers and return the combined results.
+
+To get all Jackett indexers including their capabilities you can use `t=indexers` on the all indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as query parameter.
+
 ## Installation on Windows

 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
@@ -294,7 +320,7 @@ When installed as a service the tray icon acts as a way to open/start/stop Jacke
 Jackett can also be run from the command line if you would like to see log messages (Ensure the server isn't already running from the tray/service). This can be done by using "JackettConsole.exe" (for Command Prompt), found in the Jackett data folder: "%ProgramData%\Jackett".

 ## Installation on Linux
- 1. Install [Mono 4.6](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release for your distribution is recommended)
+ 1. Install [Mono 5.8](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release is recommended)
       * Follow the instructions on the mono website and install the `mono-devel` and the `ca-certificates-mono` packages.
       * On Red Hat/CentOS/openSUSE/Fedora the `mono-locale-extras` package is also required.
 2. Install  libcurl:
@@ -307,17 +333,19 @@ Detailed instructions for [Ubuntu 14.x](http://www.htpcguides.com/install-jacket

 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  

+Mono must be compiled with the Roslyn compiler (default), using MCS will cause "An error has occurred." errors (See https://github.com/Jackett/Jackett/issues/2704).
+
 ## Installation on macOS

 ### Prerequisites
-Install [Mono 4.6](http://www.mono-project.com/download/#download-mac) or better (using the latest pkg installer is recommended).
+Install [Mono 5.8](http://www.mono-project.com/download/#download-mac) or better (using the latest pkg installer is recommended).
 * Setup ssl support by running `curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin`

 ### Install as service
 1. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.
-       
+
 The service will start on each logon. You can always stop it by running `launchctl unload ~/Library/LaunchAgents/org.user.Jackett.plist` from Terminal. You can start it again it using `launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist`.
 Logs are stored as usual under `~/.config/Jackett/log.txt`.

@@ -335,9 +363,25 @@ When running jackett behind a reverse proxy make sure that the original hostname

 Example config for apache:
 ```
-ProxyPreserveHost On
-RequestHeader set X-Forwarded-Proto "https"
-ProxyPass /jackett http://127.0.0.1:9117/
+<Location /jackett>
+    ProxyPreserveHost On
+    RequestHeader set X-Forwarded-Proto expr=%{REQUEST_SCHEME}
+    ProxyPass http://127.0.0.1:9117
+    ProxyPassReverse http://127.0.0.1:9117
+</Location>
+```
+
+Example config for nginx:
+```
+location /jackett {
+	proxy_pass http://127.0.0.1:9117;
+	proxy_set_header Host $host;
+	proxy_set_header X-Real-IP $remote_addr;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_set_header X-Forwarded-Proto $scheme;
+	proxy_set_header X-Forwarded-Host $host;
+	proxy_redirect off;
+}
 ```

 ## Troubleshooting
@@ -353,18 +397,59 @@ ProxyPass /jackett http://127.0.0.1:9117/
   - On Linux (as user root): `wget -O - https://curl.haxx.se/ca/cacert.pem | cert-sync /dev/stdin`
   - On macOS: `curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin`

-*  __Enable logging__
+*  __Enable enhanced logging__

-  You can get additional logging with the command line switches `-t -l` or by enabling `Enhanced logging` via the web interface.
+  You can get *enhanced* logging with the command line switches `-t -l` or by enabling `Enhanced logging` via the web interface (followed by clicking on the `Apply Server Settings` button).
  Please post logs if you are unable to resolve your issue with these switches ensuring to remove your username/password/cookies.
  The logfiles (log.txt/updater.txt) are stored in `%ProgramData%\Jackett` on Windows and `~/.config/Jackett/` on Linux/macOS.

+## Configuring OMDb
+This feature is used as a fallback to get the movie/series title if only the IMDB ID is provided in the request.
+To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/apikey.aspx) (1,000 daily requests limit) and paste the key in Jackett
+
 ## Creating an issue
 Please supply as much information about the problem you are experiencing as possible. Your issue has a much greater chance of being resolved if logs are supplied so that we can see what is going on. Creating an issue with '### isn't working' doesn't help anyone to fix the problem.

 ## Contributing
 All contributions are welcome just send a pull request.  Jackett's framework allows our team (and any other volunteering dev) to implement new trackers in an hour or two. If you'd like support for a new tracker but are not a developer then feel free to leave a request on the [issues page](https://github.com/Jackett/Jackett/issues).  It is recommended to use Visual Studio 2017 when making code changes in this project. You can download the community version for free [here](https://www.visualstudio.com/downloads/).

+
+## Building from source
+
+### Windows
+* Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
+* Open the Jackett solution in Visual Studio 2017 (version 15.7 or above)
+* Right click on the Jackett solution and click 'Rebuild Solution' to restore nuget packages
+* Select Jackett.Console as startup project
+* Build/Start the project
+
+### OSX
+NOTE: msbuild is included in the mono release. 
+* Install Homebrew https://brew.sh
+* open terminal
+* brew install nuget mono
+* git clone https://github.com/Jackett/Jackett.git
+* cd Jackett/src
+* nuget restore Jackett.sln
+
+NOTE: if you get the error "NU1102: Unable to find package Microsoft.AspNetCore with version (>= 2.1.2)" while restoring packages, you'll need to install it manually.https://www.microsoft.com/net/download/thank-you/dotnet-sdk-2.1.302-macos-x64-installer then delete the entire project directory and restart from a new clone
+
+* msbuild Jackett.Console/Jackett.Console.csproj /t:Build /p:Configuration=Debug
+* curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin
+* mono Jackett.Console/bin/Debug/JackettConsole.exe
+
+
+### Linux
+
+```bash
+sudo apt install mono-complete nuget msbuild # install build tools (debian/ubuntu)
+git clone https://github.com/Jackett/Jackett.git
+cd Jackett/src
+nuget restore Jackett.sln # prepare dependencies
+msbuild Jackett.Console/Jackett.Console.csproj /t:Build /p:Configuration=Debug # compile
+mono Jackett.Console/bin/Debug/JackettConsole.exe # run jackett
+```
+
 ## Screenshots

 ![screenshot](https://i.imgur.com/0d1nl7g.png "screenshot")
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.8.{build}
+version: 0.10.{build}
 skip_tags: true
 image: Visual Studio 2017
 configuration: Release
@@ -27,6 +27,7 @@ deploy:
  description: $(release_description)
  auth_token:
    secure: hOg+16YTIbq4kO9u4D1YVOTbWDqgCX6mAQYMbnmBBSw2CiUsZh7OKbupoUb3FtWa
+  artifact: /^(?:(?![Ee]xperimental).)*$/
  draft: true
  on:
    branch: master
--- a/build.cake
+++ b/build.cake
@@ -1,5 +1,4 @@
 #tool nuget:?package=NUnit.ConsoleRunner
-#addin nuget:?package=Cake.FileHelpers
 #addin nuget:?package=Cake.Git

 //////////////////////////////////////////////////////////////////////
@@ -7,7 +6,7 @@
 //////////////////////////////////////////////////////////////////////

 var target = Argument("target", "Default");
-var configuration = Argument("configuration", "Release");
+var configuration = Argument("configuration", "Debug");

 //////////////////////////////////////////////////////////////////////
 // PREPARATION
@@ -37,8 +36,8 @@ Task("Clean")
 	.IsDependentOn("Info")
 	.Does(() =>
 	{
-		CleanDirectories("./src/**/obj" + configuration);
-		CleanDirectories("./src/**/bin" + configuration);
+		CleanDirectories("./src/**/obj");
+		CleanDirectories("./src/**/bin");
 		CleanDirectories("./BuildOutput");
 		CleanDirectories("./" + artifactsDirName);
 		CleanDirectories("./" + testResultsDirName);
@@ -46,22 +45,21 @@ Task("Clean")
 		Information("Clean completed");
 	});

-Task("Restore-NuGet-Packages")
+Task("Build-Kestrel-Full-Framework")
 	.IsDependentOn("Clean")
 	.Does(() =>
 	{
 		NuGetRestore("./src/Jackett.sln");
-	});

-Task("Build")
-	.IsDependentOn("Restore-NuGet-Packages")
-	.Does(() =>
-	{
-		MSBuild("./src/Jackett.sln", settings => settings.SetConfiguration(configuration));
+		var buildSettings = new MSBuildSettings()
+                .SetConfiguration(configuration)
+                .UseToolVersion(MSBuildToolVersion.VS2017);
+		
+		MSBuild("./src/Jackett.sln", buildSettings);
 	});

 Task("Run-Unit-Tests")
-	.IsDependentOn("Build")
+	.IsDependentOn("Build-Kestrel-Full-Framework")
 	.Does(() =>
 	{
 		CreateDirectory("./" + testResultsDirName);
@@ -78,31 +76,8 @@ Task("Run-Unit-Tests")
 		}
 	});

-Task("Copy-Files-Full-Framework")
-	.IsDependentOn("Run-Unit-Tests")
-	.Does(() =>
-	{
-		var windowsOutput = windowsBuildFullFramework + "/Jackett";
-
-		CopyDirectory("./src/Jackett.Console/bin/" + configuration, windowsOutput);
-		CopyFiles("./src/Jackett.Service/bin/" + configuration + "/JackettService.*", windowsOutput);
-		CopyFiles("./src/Jackett.Tray/bin/" + configuration + "/JackettTray.*", windowsOutput);
-		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/JackettUpdater.*", windowsOutput);
-		CopyFiles("./Upstart.config", windowsOutput);
-		CopyFiles("./LICENSE", windowsOutput);
-		CopyFiles("./README.md", windowsOutput);
-
-		var monoOutput = monoBuildFullFramework + "/Jackett";
-
-		CopyDirectory(windowsBuildFullFramework, monoBuildFullFramework);
-		DeleteFiles(monoOutput + "/JackettService.*");
-		DeleteFiles(monoOutput + "/JackettTray.*");
-
-		Information("Full framework file copy completed");
-	});
-
 Task("Check-Packaging-Platform")
-	.IsDependentOn("Copy-Files-Full-Framework")
+	.IsDependentOn("Run-Unit-Tests")
 	.Does(() =>
 	{
 		if (IsRunningOnWindows())
@@ -116,49 +91,86 @@ Task("Check-Packaging-Platform")
 		}
 	});

-Task("Package-Windows-Installer-Full-Framework")
+Task("Experimental-Kestrel-Windows-Full-Framework")
 	.IsDependentOn("Check-Packaging-Platform")
 	.Does(() =>
 	{
-		InnoSetup("./Installer.iss", new InnoSetupSettings {
-			OutputDirectory = workingDir + "/" + artifactsDirName
-		});
+		string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
+		string buildOutputPath = "./BuildOutput/Experimental/net461/win7-x86/Jackett";
+		
+		DotNetCorePublish(serverProjectPath, "net461", "win7-x86");
+
+		CopyFiles("./src/Jackett.Service/bin/" + configuration + "/JackettService.*", buildOutputPath);
+		CopyFiles("./src/Jackett.Tray/bin/" + configuration + "/JackettTray.*", buildOutputPath);
+		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net461" + "/JackettUpdater.*", buildOutputPath);  //builds against multiple frameworks
+
+		Zip("./BuildOutput/Experimental/net461/win7-x86", $"./{artifactsDirName}/Jackett.Binaries.Windows.zip");
+
+		//InnoSetup
+		string sourceFolder = MakeAbsolute(Directory(buildOutputPath)).ToString();
+
+		InnoSetupSettings settings = new InnoSetupSettings();
+		settings.OutputDirectory = workingDir + "/" + artifactsDirName;
+ 		settings.Defines = new Dictionary<string, string>
+			{
+				{ "MyFileForVersion", sourceFolder + "/Jackett.Common.dll" },
+				{ "MySourceFolder",  sourceFolder },
+				{ "MyOutputFilename",  "Jackett.Installer.Windows" },
+			};
+
+		InnoSetup("./Installer.iss", settings);
 	});

-Task("Package-Files-Full-Framework-Windows")
+Task("Experimental-Kestrel-Mono-Full-Framework")
 	.IsDependentOn("Check-Packaging-Platform")
 	.Does(() =>
 	{
-		Zip(windowsBuildFullFramework, $"./{artifactsDirName}/Jackett.Binaries.Windows.zip");
-		Information(@"Full Framework Windows Binaries Zipping Completed");
-	});
+		string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
+		string buildOutputPath = "./BuildOutput/Experimental/net461/linux-x64/Jackett";

-Task("Package-Files-Full-Framework-Mono")
+		DotNetCorePublish(serverProjectPath, "net461", "linux-x64");
+
+		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net461" + "/JackettUpdater.*", buildOutputPath);  //builds against multiple frameworks
+
+		//There is an issue with Mono 5.8 (fixed in Mono 5.12) where its expecting to use its own patched version of System.Net.Http.dll, instead of the version supplied in folder
+		//https://github.com/dotnet/corefx/issues/19914
+		//https://bugzilla.xamarin.com/show_bug.cgi?id=60315
+		//The workaround is to delete System.Net.Http.dll and patch the .exe.config file
+
+		DeleteFile(buildOutputPath + "/System.Net.Http.dll");
+
+		var configFile = File(buildOutputPath + "/JackettConsole.exe.config");
+		XmlPoke(configFile, "configuration/runtime/*[name()='assemblyBinding']/*[name()='dependentAssembly']/*[name()='assemblyIdentity'][@name='System.Net.Http']/../*[name()='bindingRedirect']/@newVersion", "4.0.0.0");
+
+		Gzip("./BuildOutput/Experimental/net461/linux-x64", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.Mono.tar.gz");
+	});
+	
+Task("Experimental-DotNetCore")
 	.IsDependentOn("Check-Packaging-Platform")
 	.Does(() =>
 	{
-		var cygMonoBuildPath = RelativeWinPathToCygPath(monoBuildFullFramework);
-		var tarFileName = "Jackett.Binaries.Mono.tar";
-		var tarArguments = @"-cvf " + cygMonoBuildPath + "/" + tarFileName + " -C " + cygMonoBuildPath + " Jackett --mode ='755'";
-		var gzipArguments = @"-k " + cygMonoBuildPath + "/" + tarFileName;
+		string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
+		
+		DotNetCorePublish(serverProjectPath, "netcoreapp2.1", "win-x86");
+		DotNetCorePublish(serverProjectPath, "netcoreapp2.1", "linux-x64");
+		DotNetCorePublish(serverProjectPath, "netcoreapp2.1", "osx-x64");

-		RunCygwinCommand("Tar", tarArguments);
-		RunCygwinCommand("Gzip", gzipArguments);
-
-		MoveFile($"{monoBuildFullFramework}/{tarFileName}.gz", $"./{artifactsDirName}/{tarFileName}.gz");
+		Zip("./BuildOutput/Experimental/netcoreapp2.1/win-x86", $"./{artifactsDirName}/Experimental.netcoreapp.win-x86.zip");
+		Zip("./BuildOutput/Experimental/netcoreapp2.1/osx-x64", $"./{artifactsDirName}/Experimental.netcoreapp.osx-x64.zip");
+		Gzip("./BuildOutput/Experimental/netcoreapp2.1/linux-x64", $"./{artifactsDirName}", "Jackett", "Experimental.netcoreapp.linux-x64.tar.gz");
 	});

-Task("Package-Full-Framework")
-	.IsDependentOn("Package-Windows-Installer-Full-Framework")
-	.IsDependentOn("Package-Files-Full-Framework-Windows")
-	.IsDependentOn("Package-Files-Full-Framework-Mono")
+Task("Experimental")
+	.IsDependentOn("Experimental-Kestrel-Windows-Full-Framework")
+	.IsDependentOn("Experimental-Kestrel-Mono-Full-Framework")
+	//.IsDependentOn("Experimental-DotNetCore")
 	.Does(() =>
 	{
-		Information("Full Framwork Packaging Completed");
+		Information("Experimental builds completed");
 	});

 Task("Appveyor-Push-Artifacts")
-	.IsDependentOn("Package-Full-Framework")
+	.IsDependentOn("Experimental")
 	.Does(() =>
 	{
 		if (AppVeyor.IsRunningOnAppVeyor)
@@ -174,7 +186,7 @@ Task("Appveyor-Push-Artifacts")
 		}
 	});

-Task("Potential-Release-Notes")
+Task("Release-Notes")
 	.IsDependentOn("Appveyor-Push-Artifacts")
 	.Does(() =>
 	{
@@ -213,7 +225,7 @@ Task("Potential-Release-Notes")
 			string buildNote = String.Join(Environment.NewLine, notesList);
 			Information(buildNote);

-			FileAppendLines(workingDir + "\\BuildOutput\\ReleaseNotes.txt", notesList.ToArray());
+			System.IO.File.WriteAllLines(workingDir + "\\BuildOutput\\ReleaseNotes.txt", notesList.ToArray());
 		}
 		else
 		{
@@ -264,16 +276,41 @@ private void RunCygwinCommand(string utility, string utilityArguments)
 private string RelativeWinPathToCygPath(string relativePath)
 {
 	var cygdriveBase = "/cygdrive/" + workingDir.ToString().Replace(":", "").Replace("\\", "/");
-	var cygPath = cygdriveBase + relativePath.Replace(".", "");
+	var cygPath = cygdriveBase + relativePath.TrimStart('.');
 	return cygPath;
 }

+private void Gzip(string sourceFolder, string outputDirectory, string tarCdirectoryOption, string outputFileName)
+{
+	var cygSourcePath = RelativeWinPathToCygPath(sourceFolder);
+	var tarFileName = outputFileName.Remove(outputFileName.Length - 3, 3);
+	var tarArguments = @"-cvf " + cygSourcePath + "/" + tarFileName + " -C " + cygSourcePath + $" {tarCdirectoryOption} --mode ='755'";
+	var gzipArguments = @"-k " + cygSourcePath + "/" + tarFileName;
+
+	RunCygwinCommand("Tar", tarArguments);
+	RunCygwinCommand("Gzip", gzipArguments);
+
+	MoveFile($"{sourceFolder}/{tarFileName}.gz", $"{outputDirectory}/{tarFileName}.gz");
+}
+
+private void DotNetCorePublish(string projectPath, string framework, string runtime)
+{
+	var settings = new DotNetCorePublishSettings
+		 {
+			 Framework = framework,
+			 Runtime = runtime,
+			 OutputDirectory = $"./BuildOutput/Experimental/{framework}/{runtime}/Jackett"
+		 };
+
+		 DotNetCorePublish(projectPath, settings);
+}
+
 //////////////////////////////////////////////////////////////////////
 // TASK TARGETS
 //////////////////////////////////////////////////////////////////////

 Task("Default")
-	.IsDependentOn("Potential-Release-Notes")
+	.IsDependentOn("Release-Notes")
 	.Does(() =>
 	{
 		Information("Default Task Completed");
--- a/build.ps1
+++ b/build.ps1
@@ -158,14 +158,15 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
      ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
        Write-Verbose -Message "Missing or changed package.config hash..."
-        Remove-Item * -Recurse -Exclude packages.config,nuget.exe
+        Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
+        Remove-Item -Recurse
    }

    Write-Verbose -Message "Restoring tools from NuGet..."
    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""

    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occured while restoring NuGet tools."
+        Throw "An error occurred while restoring NuGet tools."
    }
    else
    {
@@ -185,7 +186,7 @@ if (Test-Path $ADDINS_PACKAGES_CONFIG) {
    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""

    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occured while restoring NuGet addins."
+        Throw "An error occurred while restoring NuGet addins."
    }

    Write-Verbose -Message ($NuGetOutput | out-string)
@@ -202,7 +203,7 @@ if (Test-Path $MODULES_PACKAGES_CONFIG) {
    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""

    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occured while restoring NuGet modules."
+        Throw "An error occurred while restoring NuGet modules."
    }

    Write-Verbose -Message ($NuGetOutput | out-string)
--- a/src/CurlSharp/Callbacks/CurlEasyCallbacks.cs
+++ b/src/CurlSharp/Callbacks/CurlEasyCallbacks.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;

-namespace CurlSharp
+namespace CurlSharp.Callbacks
 {
    /// <summary>
    ///     Called when cURL has debug information for the client.
--- a/src/CurlSharp/Callbacks/CurlShareCallbacks.cs
+++ b/src/CurlSharp/Callbacks/CurlShareCallbacks.cs
@@ -1,6 +1,7 @@
 using System;
+using CurlSharp.Enums;

-namespace CurlSharp
+namespace CurlSharp.Callbacks
 {
    /// <summary>
    ///     Called when <c>cURL</c> wants to lock a shared resource.
--- a/src/CurlSharp/Curl.cs
+++ b/src/CurlSharp/Curl.cs
@@ -19,6 +19,7 @@

 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;

 namespace CurlSharp
 {
--- a/src/CurlSharp/CurlEasy.cs
+++ b/src/CurlSharp/CurlEasy.cs
@@ -19,6 +19,8 @@

 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Callbacks;
+using CurlSharp.Enums;

 namespace CurlSharp
 {
--- a/src/CurlSharp/CurlHttpMultiPartForm.cs
+++ b/src/CurlSharp/CurlHttpMultiPartForm.cs
@@ -19,6 +19,7 @@

 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;

 namespace CurlSharp
 {
--- a/src/CurlSharp/CurlMulti.cs
+++ b/src/CurlSharp/CurlMulti.cs
@@ -20,6 +20,7 @@
 using System;
 using System.Collections;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;

 namespace CurlSharp
 {
--- a/src/CurlSharp/CurlMultiInfo.cs
+++ b/src/CurlSharp/CurlMultiInfo.cs
@@ -17,6 +17,8 @@
 *
 **************************************************************************/

+using CurlSharp.Enums;
+
 namespace CurlSharp
 {
    /// <summary>
--- a/src/CurlSharp/CurlShare.cs
+++ b/src/CurlSharp/CurlShare.cs
@@ -19,6 +19,8 @@

 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Callbacks;
+using CurlSharp.Enums;

 namespace CurlSharp
 {
--- a/src/CurlSharp/CurlSlist.cs
+++ b/src/CurlSharp/CurlSlist.cs
@@ -20,6 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;

 namespace CurlSharp
 {
--- a/src/CurlSharp/CurlSslContext.cs
+++ b/src/CurlSharp/CurlSslContext.cs
@@ -18,6 +18,7 @@
 **************************************************************************/

 using System;
+using CurlSharp.Callbacks;

 namespace CurlSharp
 {
--- a/src/CurlSharp/CurlVersionInfoData.cs
+++ b/src/CurlSharp/CurlVersionInfoData.cs
@@ -18,7 +18,7 @@
 **************************************************************************/

 using System;
-using System.Runtime.InteropServices;
+using CurlSharp.Enums;

 namespace CurlSharp
 {
--- a/src/CurlSharp/Enums/CurlClosePolicy.cs
+++ b/src/CurlSharp/Enums/CurlClosePolicy.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Contains values used to specify the order in which cached connections
--- a/src/CurlSharp/Enums/CurlCode.cs
+++ b/src/CurlSharp/Enums/CurlCode.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Status code returned from <see cref="CurlEasy" /> functions.
--- a/src/CurlSharp/Enums/CurlFormCode.cs
+++ b/src/CurlSharp/Enums/CurlFormCode.cs
@@ -17,7 +17,7 @@
 * $Id: Enums.cs,v 1.1 2005/02/17 22:47:25 jeffreyphillips Exp $
 **************************************************************************/

-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     One of these is returned by <see cref="CurlHttpMultiPartForm.AddSection" />.
--- a/src/CurlSharp/Enums/CurlFormOption.cs
+++ b/src/CurlSharp/Enums/CurlFormOption.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     These are options available to build a multi-part form section
--- a/src/CurlSharp/Enums/CurlFtpAuth.cs
+++ b/src/CurlSharp/Enums/CurlFtpAuth.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     This enumeration contains values used to specify the FTP Ssl
--- a/src/CurlSharp/Enums/CurlFtpSsl.cs
+++ b/src/CurlSharp/Enums/CurlFtpSsl.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     This enumeration contains values used to specify the FTP Ssl level
--- a/src/CurlSharp/Enums/CurlHttpAuth.cs
+++ b/src/CurlSharp/Enums/CurlHttpAuth.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     This enumeration contains values used to specify the HTTP authentication
--- a/src/CurlSharp/Enums/CurlHttpVersion.cs
+++ b/src/CurlSharp/Enums/CurlHttpVersion.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Contains values used to specify the HTTP version level when using
--- a/src/CurlSharp/Enums/CurlInfo.cs
+++ b/src/CurlSharp/Enums/CurlInfo.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     This enumeration is used to extract information associated with an
--- a/src/CurlSharp/Enums/CurlInfoType.cs
+++ b/src/CurlSharp/Enums/CurlInfoType.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     A member of this enumeration is passed as the first parameter to the
--- a/src/CurlSharp/Enums/CurlInitFlag.cs
+++ b/src/CurlSharp/Enums/CurlInitFlag.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Contains values used to initialize libcurl internally. One of
--- a/src/CurlSharp/Enums/CurlIoCommand.cs
+++ b/src/CurlSharp/Enums/CurlIoCommand.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Your handler for the <see cref="CurlEasy.CurlIoctlCallback" />
--- a/src/CurlSharp/Enums/CurlIoError.cs
+++ b/src/CurlSharp/Enums/CurlIoError.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Your handler for the <see cref="CurlEasy.CurlIoctlCallback" /> delegate
--- a/src/CurlSharp/Enums/CurlIpResolve.cs
+++ b/src/CurlSharp/Enums/CurlIpResolve.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     This enumeration contains values used to specify the IP resolution
--- a/src/CurlSharp/Enums/CurlLockAccess.cs
+++ b/src/CurlSharp/Enums/CurlLockAccess.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Values containing the type of shared access requested when libcurl
--- a/src/CurlSharp/Enums/CurlLockData.cs
+++ b/src/CurlSharp/Enums/CurlLockData.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Members of this enumeration should be passed to
--- a/src/CurlSharp/Enums/CurlMessage.cs
+++ b/src/CurlSharp/Enums/CurlMessage.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     The status code associated with an <see cref="CurlEasy" /> object in a
--- a/src/CurlSharp/Enums/CurlMultiCode.cs
+++ b/src/CurlSharp/Enums/CurlMultiCode.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Contains return codes for many of the functions in the
--- a/src/CurlSharp/Enums/CurlMultiOption.cs
+++ b/src/CurlSharp/Enums/CurlMultiOption.cs
@@ -8,7 +8,7 @@
 // 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    public enum CurlMultiOption
    {
--- a/src/CurlSharp/Enums/CurlNetrcOption.cs
+++ b/src/CurlSharp/Enums/CurlNetrcOption.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Contains values used to specify the preference of libcurl between
--- a/src/CurlSharp/Enums/CurlOptType.cs
+++ b/src/CurlSharp/Enums/CurlOptType.cs
@@ -8,7 +8,7 @@
 // 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    public enum CurlOptType
    {
--- a/src/CurlSharp/Enums/CurlOption.cs
+++ b/src/CurlSharp/Enums/CurlOption.cs
@@ -17,7 +17,9 @@
 *
 **************************************************************************/

-namespace CurlSharp
+using CurlSharp.Callbacks;
+
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     One of these is passed as the first parameter to
--- a/src/CurlSharp/Enums/CurlPipelining.cs
+++ b/src/CurlSharp/Enums/CurlPipelining.cs
@@ -8,7 +8,7 @@
 // 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /* bitmask bits for CURLMOPT_PIPELINING */

--- a/src/CurlSharp/Enums/CurlProxyType.cs
+++ b/src/CurlSharp/Enums/CurlProxyType.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     This enumeration contains values used to specify the proxy type when
--- a/src/CurlSharp/Enums/CurlShareCode.cs
+++ b/src/CurlSharp/Enums/CurlShareCode.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Contains return codes from many of the functions in the
--- a/src/CurlSharp/Enums/CurlShareOption.cs
+++ b/src/CurlSharp/Enums/CurlShareOption.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     A member of this enumeration is passed to the function
--- a/src/CurlSharp/Enums/CurlSslVersion.cs
+++ b/src/CurlSharp/Enums/CurlSslVersion.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Contains values used to specify the Ssl version level when using
--- a/src/CurlSharp/Enums/CurlTimeCond.cs
+++ b/src/CurlSharp/Enums/CurlTimeCond.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     Contains values used to specify the time condition when using
--- a/src/CurlSharp/Enums/CurlVersion.cs
+++ b/src/CurlSharp/Enums/CurlVersion.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     A member of this enumeration is passed to the function
--- a/src/CurlSharp/Enums/CurlVersionFeatureBitmask.cs
+++ b/src/CurlSharp/Enums/CurlVersionFeatureBitmask.cs
@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
    /// <summary>
    ///     A bitmask of libcurl features OR'd together as the value of the
--- a/src/CurlSharp/NativeMethods.cs
+++ b/src/CurlSharp/NativeMethods.cs
@@ -24,6 +24,7 @@ using System;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;

 namespace CurlSharp
 {
--- a/src/CurlSharp/SSLFix.cs
+++ b/src/CurlSharp/SSLFix.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CurlSharp
+namespace CurlSharp
 {
    public class SSLFix
    {
--- a/src/DateTimeRoutines/DateTimeRoutines.cs
+++ b/src/DateTimeRoutines/DateTimeRoutines.cs
@@ -5,14 +5,11 @@
 //        sergey.stoyan@gmail.com
 //        27 February 2007
 //********************************************************************************************
+
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using System.Text.RegularExpressions;
-using System.Threading;
-using System.Collections;
-namespace Cliver
+
+namespace DateTimeRoutines
 {
    /// <summary>
    /// Miscellaneous and parsing methods for DateTime
--- a/src/DateTimeRoutines/DateTimeRoutines.csproj
+++ b/src/DateTimeRoutines/DateTimeRoutines.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>netstandard1.5;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
  </PropertyGroup>

 </Project>
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -87,6 +87,7 @@ function loadJackettSettings() {
        $("#jackett-prerelease").attr('checked', data.prerelease);
        $("#jackett-logging").attr('checked', data.logging);
        $("#jackett-omdbkey").val(data.omdbkey);
+        $("#jackett-omdburl").val(data.omdburl);
        var password = data.password;
        $("#jackett-adminpwd").val(password);
        if (password != null && password != '') {
@@ -110,6 +111,7 @@ function reloadIndexers() {
        unconfiguredIndexers = [];
        for (var i = 0; i < data.length; i++) {
            var item = data[i];
+            item.rss_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q=");
            item.torznab_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/");
            item.potato_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/potato/");

@@ -220,7 +222,7 @@ function displayUnconfiguredIndexersList() {
 		                }
 			        }).fail(function (data) {
 			            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on Github for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
            } else {
                doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
            }
@@ -443,7 +445,7 @@ function testIndexer(id, notifyResult) {
    }).fail(function (data) {
        updateTestState(id, "error", data.error, indexers);
        if(data.responseJSON.error !== undefined && notifyResult) {
-                doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error + " (Test)\" target=\"_blank\">Click here to open an issue on Github for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
            } else {
                doNotify("An error occured while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
            }
@@ -496,10 +498,14 @@ function populateConfigItems(configForm, config) {
            hasReacaptcha = true;
            captchaItem = config[i];
        }
+        else if (config[i].id === 'cookieheader' && hasReacaptcha) { // inject cookie into captcha item
+            captchaItem.cookieheader = config[i].value;
+            console.log(captchaItem);
+        }
    }

    var setupItemTemplate = Handlebars.compile($("#setup-item").html());
-    if (hasReacaptcha && !window.jackettIsLocal) {
+    if (hasReacaptcha && !window.jackettIsLocal && false) { // disable this for now, use inline cookie (below)
        var setupValueTemplate = Handlebars.compile($("#setup-item-nonlocalrecaptcha").html());
        captchaItem.value_element = setupValueTemplate(captchaItem);
        var template = setupItemTemplate(captchaItem);
@@ -508,11 +514,22 @@ function populateConfigItems(configForm, config) {

        for (var i = 0; i < config.length; i++) {
            var item = config[i];
-            var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html());
-            item.value_element = setupValueTemplate(item);
-            var template = setupItemTemplate(item);
-            $formItemContainer.append(template);
+            if ((item.id === 'username' || item.id === 'password') && hasReacaptcha) {
+                continue; // skip username/password if there's a recaptcha
+            }
+            if (item.type != 'recaptcha') {
+                var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html());
+                item.value_element = setupValueTemplate(item);
+                var template = setupItemTemplate(item);
+                $formItemContainer.append(template);
+            }
            if (item.type === 'recaptcha') {
+                // inject cookie dialog until recaptcha can be solved again
+                var setupValueTemplate = Handlebars.compile($("#setup-item-nonlocalrecaptcha").html());
+                captchaItem.value_element = setupValueTemplate(captchaItem);
+                var template = setupItemTemplate(captchaItem);
+                $formItemContainer.append(template);
+                /*
                var jackettrecaptcha = $('.jackettrecaptcha');
                jackettrecaptcha.data("version", item.version);
                switch (item.version) {
@@ -542,6 +559,7 @@ function populateConfigItems(configForm, config) {
                        });
                        break;
                }
+                */
            }
        }
    }
@@ -633,7 +651,7 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
            }
        }).fail(function (data) {
            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on Github for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
            } else {
                doNotify("An error occured while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
            }
@@ -720,9 +738,9 @@ function updateReleasesRow(row)
        if (DownloadVolumeFactor == 0) {
            labels.append('\n<span class="label label-success">FREELEECH</span>');
        } else if (DownloadVolumeFactor < 1) {
-            labels.append('\n<span class="label label-primary">' + DownloadVolumeFactor * 100 + '%DL</span>');
+            labels.append('\n<span class="label label-primary">' + (DownloadVolumeFactor * 100).toFixed(0) + '%DL</span>');
        } else if (DownloadVolumeFactor > 1) {
-            labels.append('\n<span class="label label-danger">' + DownloadVolumeFactor * 100 + '%DL</span>');
+            labels.append('\n<span class="label label-danger">' + (DownloadVolumeFactor * 100).toFixed(0) + '%DL</span>');
        }
    }

@@ -730,7 +748,7 @@ function updateReleasesRow(row)
        if (UploadVolumeFactor == 0) {
            labels.append('\n<span class="label label-warning">NO UPLOAD</span>');
        } else if (UploadVolumeFactor != 1) {
-            labels.append('\n<span class="label label-info">' + UploadVolumeFactor * 100 + '%UL</span>');
+            labels.append('\n<span class="label label-info">' + (UploadVolumeFactor * 100).toFixed(0) + '%UL</span>');
        }
    }
 }
@@ -1133,6 +1151,7 @@ function bindUIButtons() {
        var jackett_prerelease = $("#jackett-prerelease").is(':checked'); 
        var jackett_logging = $("#jackett-logging").is(':checked');
        var jackett_omdb_key = $("#jackett-omdbkey").val();
+        var jackett_omdb_url = $("#jackett-omdburl").val();

        var jackett_proxy_url = $("#jackett-proxy-url").val();
        var jackett_proxy_type = $("#jackett-proxy-type").val();
@@ -1149,6 +1168,7 @@ function bindUIButtons() {
            logging: jackett_logging,
            basepathoverride: jackett_basepathoverride,
            omdbkey: jackett_omdb_key,
+            omdburl: jackett_omdb_url,
            proxy_type: jackett_proxy_type,
            proxy_url: jackett_proxy_url,
            proxy_port: jackett_proxy_port,
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -7,6 +7,7 @@
    <meta name="mobile-web-app-capable" content="yes" />
    <meta name="apple-mobile-web-app-capable" content="yes" />
    <meta charset="utf-8" />
+    <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party ressources (E.g. Empornium banner images won't load) -->
    <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
    <link rel="apple-touch-icon" sizes="57x57" href="../apple-touch-icon-57x57.png" />
    <link rel="apple-touch-icon" sizes="72x72" href="../apple-touch-icon-72x72.png" />
@@ -29,14 +30,14 @@
    <script type="text/javascript" src="../bootstrap/bootstrap.min.js?changed=2017083001"></script>
    <script type="text/javascript" src="../libs/bootstrap-notify.js?changed=2017083001"></script>
    <script type="text/javascript" src="../libs/bootstrap-multiselect.js?changed=2017083001"></script>
-    <script type="text/javascript" src="https://www.google.com/recaptcha/api.js?render=explicit" async defer></script>
+    <!--<script type="text/javascript" src="https://www.google.com/recaptcha/api.js?render=explicit" async defer></script>-->

    <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
    <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
    <link rel="stylesheet" type="text/css" href="../custom.css?changed=2017083001" media="only screen and (min-device-width: 480px)">
    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=2017083001" media="only screen and (max-device-width: 480px)">
    <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
-    <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001"/>
+    <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
    <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
    <title>Jackett</title>
 </head>
@@ -74,24 +75,30 @@
                <li>Go to <b>Settings > Indexers > Add > Torznab > Custom</b>.</li>
                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy Torznab Feed</button> button and paste it into the Sonarr/Radarr <b>URL</b> field.</li>
                <li>For the <b>API key</b> use <b class="api-key-text"></b>.</li>
+                <li>Configure the correct category IDs via the <b>(Anime) Categories</b> options. See the Jackett indexer configuration for a list of supported categories.</li>
            </ol>
            <h4>Adding a Jackett indexer in CouchPotato</h4>
            <ol>
                <li>Go to <b>Settings > Searchers</b>.</li>
                <li>Enable <b>TorrentPotato</b>.
-                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy Potato Feed</button> button and past it into the CouchPotato <b>host</b> field.</li>
+                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy Potato Feed</button> button and paste it into the CouchPotato <b>host</b> field.</li>
                <li>For the <b>Passkey</b> use <b class="api-key-text"></b>. Leave the <b>username</b> field blank.</li>
            </ol>
-
+            <h4>Adding a Jackett indexer to RSS clients (RSS feed)</h4>
+            <ol>
+                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy RSS Feed</button> button and paste it into the URL field of the RSS client.</li>
+                <li>You can adjust the <b>q</b> (search string) and <b>cat</b> (categories) arguments accordingly.
+                E.g. <b>...&cat=2030,2040&q=big+buck+bunny</b> will search for "big buck bunny" in the Movies/SD (2030) and Movies/HD (2040) categories (See the indexer configuration for available categories).</li>
+            </ol>
        </div>
        <hr />
        <h3>Jackett Configuration</h3>
        <div class="text-center">
-            <div class="btn-group">
+            <div class="btn-toolbar">
                <button id="change-jackett-port" class="btn btn-primary btn-sm">
                    <i class="fa fa-wrench"></i>   Apply server settings <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
                </button>
-                <button id="view-jackett-logs" class="btn btn-danger btn-sm">
+                <button id="view-jackett-logs" class="btn btn-success btn-sm">
                    <i class="fa fa-rss"></i> View logs <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
                </button>
                <button id="trigger-updater" class="btn btn-warning btn-sm">
@@ -145,7 +152,7 @@
        </div>
        <div class="input-area">
            <span class="input-header">Proxy password: </span>
-            <input id="jackett-proxy-password" class="form-control input-right" type="text" value="" placeholder="">
+            <input id="jackett-proxy-password" class="form-control input-right" type="password" value="" placeholder="">
        </div>

        <div class="input-area">
@@ -170,6 +177,10 @@
            <span class="input-header">OMDB API key: </span>
            <input id="jackett-omdbkey" class="form-control input-right" type="text" value="" placeholder="">
        </div>
+        <div class="input-area">
+            <span class="input-header">OMDB API Url: </span>
+            <input id="jackett-omdburl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
+        </div>
        <hr />
        <div id="footer">
            <a href="https://github.com/Jackett/Jackett" target="_blank" title="Jackett on GitHub">Jackett</a> Version <span id="app-version"></span>
@@ -182,7 +193,7 @@
        <div class="setup-item-recaptcha">
            <p>This site requires you to solve a ReCaptcha. It's no longer possible to solve the captcha in Jackett. Please enter the cookie for the site manually. <a href="https://github.com/Jackett/Jackett/wiki/Finding-cookies" target="_blank">See here</a> on how get the cookies.</p>
            <div class="setup-item-label">Full cookie header</div>
-            <input class="form-control" type="text" value="" />
+            <input class="form-control" type="text" value="{{cookieheader}}" />
        </div>
    </script>
    <script id="setup-item" type="text/x-handlebars-template">
@@ -265,6 +276,7 @@
                        <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a> <span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span></td>
                        <td class="fit">
                            <div class="indexer-buttons">
+                                <a href="{{rss_host}}" title="{{rss_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info">Copy RSS Feed</i></a>
                                <a href="{{torznab_host}}" title="{{torznab_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info">Copy Torznab Feed</a>
                                <a href="{{potato_host}}" title="{{potato_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info{{#unless potatoenabled}} disabled{{/unless}}">Copy Potato Feed</a>

@@ -651,6 +663,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2017110601"></script>
+    <script type="text/javascript" src="../custom.js?changed=20180710"></script>
 </body>
 </html>
--- a/src/Jackett.Common/CurlHelper.cs
+++ b/src/Jackett.Common/CurlHelper.cs
@@ -1,19 +1,16 @@
-using CurlSharp;
-using System;
-using System.Collections.Concurrent;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using System.Net.Http.Headers;
-using Jackett.Utils;
-using System.Net;
-using System.Threading;
-using Jacket.Common;
-using Jackett.Models.Config;
+using CurlSharp;
+using CurlSharp.Enums;
+using Jackett.Common.Models.Config;
+using Jackett.Common.Utils;

-namespace Jackett
+namespace Jackett.Common
 {
    public class CurlHelper
    {
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -103,21 +103,34 @@
      tv-search: [q, season, ep]
      movie-search: [q]

-  settings: []
+  settings:
+    - name: downloadlink
+      type: select
+      label: Download link
+      default: "magnet:"
+      options:
+        "http://itorrents.org/" : "iTorrents.org"
+        "magnet:": "magnet"

  download:
    # the .torrent url is on the on the details page 
-    selector: ul li a[href^="http://itorrents.org/"]
+    selector: ul li a[href^="{{ .Config.downloadlink }}"]

  search:
    paths:
      # present trending results if there are no search parms supplied
      - path: "{{if .Keywords}}/search/{{ .Keywords}}/1/{{else}}/trending{{end}}"
+    keywordsfilters: 
+      - name: replace # use this as a workaround till #893 is implemented
+        args: ["Greys Anatomy", "Grey's Anatomy"]
    rows:
      selector: tr:has(a[href^="/torrent/"])
    fields:
      title:
        selector: td[class^="coll-1"] a[href^="/torrent/"]
+        filters:
+          - name: replace
+            args: ["Grey's Anatomy", "Greys Anatomy"]
      category:
        optional: true
        selector:  td[class^="coll-1"] a[href^="/sub/"]
--- a/src/Jackett.Common/Definitions/2fast4you.yml
+++ b/src/Jackett.Common/Definitions/2fast4you.yml
@@ -68,7 +68,9 @@
      - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
      - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
      - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
+      - {id: 94, cat: Audio, desc: "Musique: Podcast"}
      - {id: 58, cat: Audio, desc: "Musique: Concert"}
+      - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
      - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
      - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
      - {id: 12, cat: TV/Anime, desc: "Serie TV: Animation"}
@@ -100,9 +102,11 @@
      - path: torrents-search.php
    inputs:
      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{ .Keywords }}"
      incldead: "1"
-
+    keywordsfilters:
+      - name: re_replace
+        args: ["^$", "%"] # replace empty search string with %
    rows:
      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
    fields:
--- a/src/Jackett.Common/Definitions/3dtorrents.yml
+++ b/src/Jackett.Common/Definitions/3dtorrents.yml
@@ -42,15 +42,12 @@
      pwd: "{{ .Config.password }}"
    captcha:
      type: image
-      image: img.captcha
+      selector: img.captcha
      input: private_key
    error:
      - selector: span.errormsg
    test:
      path: index.php
-
-  download:
-    selector: a[href^="download.php?id="]
        
  search:
    paths:
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -0,0 +1,171 @@
+---
+  site: Bittorrentfiles
+  name: Bittorrentfiles
+  description: "Bittorrentfiles is a Private GERMAN tracker"
+  language: de-de
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.Bittorrentfiles.me/
+
+  caps:
+    categorymappings:
+      # Movie
+      - {id: 48, cat: Movies/HD, desc: "1080p"}
+      - {id: 31, cat: Movies/3D, desc: "3D"}
+      - {id: 21, cat: Movies/HD, desc: "720p"}
+      - {id: 28, cat: Movies/SD, desc: "AVI"}
+      - {id: 20, cat: Movies/DVD, desc: "DVD-R"}
+      - {id: 40, cat: Movies/HD, desc: "h264/x264"}
+      - {id: 30, cat: Movies/HD, desc: "HD/BD"}
+      - {id: 49, cat: Movies/Foreign, desc: "International"}
+      - {id: 78, cat: Movies/HD, desc: "UHD"}
+
+      # Serien
+      - {id: 79, cat: TV/HD, desc: "Staffeln HD"}
+      - {id: 56, cat: TV/SD, desc: "Staffeln SD"}
+      - {id: 54, cat: TV/HD, desc: "Folgen HD"}
+      - {id: 80, cat: TV/HD, desc: "Folgen HD/BD"}
+      - {id: 7, cat: TV/SD, desc: "Folgen SD"}
+      - {id: 55, cat: TV/Foreign, desc: "International"}
+
+      # Doku
+      - {id: 64, cat: TV/Documentary, desc: "HD"}
+      - {id: 36, cat: TV/Documentary, desc: "SD"}
+      - {id: 81, cat: TV/Documentary, desc: "3D"}
+      - {id: 82, cat: TV/Documentary, desc: "Packs"}
+
+      # Spiele
+      - {id: 4, cat: PC/Games, desc: "Windows"}
+      - {id: 72, cat: Console/XBox360, desc: "XBOX 360"}
+      - {id: 44, cat: Console/XBoxOne, desc: "XBOX One"}
+      - {id: 43, cat: Console/Wii, desc: "Wii"}
+      - {id: 69, cat: Console, desc: "PS2"}
+      - {id: 70, cat: Console/PS3, desc: "PS3"}
+      - {id: 70, cat: Console/PS4, desc: "PS4"}
+      - {id: 70, cat: Console/PSP, desc: "PSP"}
+      - {id: 42, cat: Console/Other, desc: "Misc"}
+
+      # Musik
+      - {id: 66, cat: Audio, desc: "Alben"}
+      - {id: 75, cat: Audio, desc: "Singles"}
+      - {id: 50, cat: Audio, desc: "Charts"}
+      - {id: 52, cat: Audio, desc: "Packs"}
+      - {id: 53, cat: Audio/Video, desc: "Video"}
+      - {id: 61, cat: Audio/Video, desc: "DVD-R"}
+      - {id: 83, cat: Audio, desc: "Flac"}
+      - {id: 68, cat: Audio, desc: "Live"}
+      - {id: 6, cat: Audio, desc: "Misc"}
+      - {id: 51, cat: Audio, desc: "OST"}
+      - {id: 67, cat: Audio, desc: "Sampler"}
+
+      # App
+      - {id: 22, cat: PC/0day, desc: "Windows"}
+      - {id: 62, cat: PC/Mac, desc: "Mac OS"}
+      - {id: 63, cat: PC/0day, desc: "Linux"}
+      - {id: 34, cat: PC, desc: "Andere"}
+
+      # Sport
+      - {id: 74, cat: TV/Sport, desc: "HD"}
+      - {id: 39, cat: TV/Sport, desc: "SD"}
+
+      # Sonstiges
+      - {id: 41, cat: Books/Comics, desc: "A-Book"}
+      - {id: 33, cat: TV/Anime, desc: "Anime"}
+      - {id: 35, cat: Books, desc: "e-Book"}
+      - {id: 65, cat: Other, desc: "E-Learning"}
+      - {id: 65, cat: PC, desc: "Mobile"}
+      - {id: 9, cat: Other, desc: "Other"}
+
+      #XXX
+      - {id: 58, cat: Books/Comics, desc: "HD"}
+      - {id: 33, cat: XXX, desc: "Hentai"}
+      - {id: 35, cat: XXX/Other, desc: "Other"}
+      - {id: 65, cat: XXX/Packs, desc: "Pack"}
+      - {id: 65, cat: XXX, desc: "SD"}
+
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings:
+    - name: user
+      type: text
+      label: Username
+    - name: pass
+      type: password
+      label: Password
+
+  login:
+    path: signin.php
+    method: form
+    form: form
+    inputs:
+      user: "{{ .Config.user }}"
+      pass: "{{ .Config.pass }}"
+    error:
+      - selector: .error
+    test:
+      path: browse.php
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+
+    rows:
+      selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
+    fields:
+      title:
+        selector: a[href^="details.php"]
+        attribute: title
+      category:
+        selector: a[href^="/browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php"]
+        attribute: href
+      download:
+        selector: a[href^="/download.php"]
+        attribute: href
+      files:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(6)
+      size:
+        selector: td:nth-child(8)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: td:nth-child(3) > a
+      leechers:
+        selector: td:nth-child(4)
+      date:
+        selector: td:nth-child(9)
+        filters:
+          - name: split
+            args: ["by", 0]
+          - name: replace
+            args: ["Heute", "Today"]
+          - name: replace
+            args: ["Gestern", "Yesterday"]
+          - name: dateparse
+            args: "02.01.2006 15:04:05"
+      downloadvolumefactor:
+        case:
+          img[alt="OU"]: "0"
+          img[alt="D/2"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[alt="2xU"]: "2"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/acidlounge.yml
+++ b/src/Jackett.Common/Definitions/acidlounge.yml
@@ -65,7 +65,7 @@
    form: form#login
    captcha:
      type: image
-      image: img[alt="Security code"]
+      selector: img[alt="Security code"]
      input: code
    inputs:
      username: "{{ .Config.username }}"
--- a/src/Jackett.Common/Definitions/anidex.yml
+++ b/src/Jackett.Common/Definitions/anidex.yml
@@ -38,10 +38,13 @@
      type: info
      label: Category Id Note
      default: "You can filter your searches by using any of the following category numbers (comma delimited):<br>1 :Anime - Sub<br>2 :Anime - Raw<br>3 :Anime - Dub<br>4 :LA - Sub<br>5 :LA - Raw<br>6 :Light Novel<br>7 :Manga - TLed<br>8 :Manga - Raw<br>9 :♫ - Lossy<br>10 :♫ - Lossless<br>11 :♫ - Video<br>12 :Games<br>13 :Applications<br>14 :Pictures<br>15 :Adult Video<br>16 :Other"
-      
+    - name: lang-id
+      type: text
+      label: Language Id
+
  search:
    paths:
-      - path: "?{{if .Config.cat-id}}id={{.Config.cat-id }}&{{else}}{{end}}q={{if .Keywords}}{{.Keywords}}{{else}}{{end}}"
+      - path: "?{{if .Config.cat-id}}id={{.Config.cat-id }}&{{else}}{{end}}{{if .Config.lang-id}}lang_id={{.Config.lang-id}}&{{else}}{{end}}q={{if .Keywords}}{{.Keywords}}{{else}}{{end}}"
    rows:
      selector: div.table-responsive > table > tbody > tr
    fields:
@@ -53,6 +56,9 @@
            args: id
      title:
        selector: td:nth-child(3) > a.torrent > span.span-1440
+        filters:
+          - name: re_replace # remove anidb id from return string
+            args: ["(\\[[A-Z0-9]*\\])\\.", "."]
      details:
        selector: td:nth-child(3) > a.torrent
        attribute: href
--- a/src/Jackett.Common/Definitions/aox.yml
+++ b/src/Jackett.Common/Definitions/aox.yml
@@ -10,23 +10,10 @@

  caps:
    categorymappings:
-      # Japanese
-      - {id: 1, cat: Movies, desc: "jMovies"}
-      - {id: 2, cat: TV, desc: "TV Shows"}
-      - {id: 3, cat: TV/Other, desc: "Variety Shows"}
-
-      # Korean
-      - {id: 6, cat: Movies, desc: "kMovies"}
-      - {id: 4, cat: TV, desc: "TV Shows"}
-      - {id: 14, cat: TV/Other, desc: "Variety Shows"}
-
-      # Chinese
-      - {id: 8, cat: Movies, desc: "cMovies"}
-      - {id: 9, cat: TV, desc: "TV Shows"}
-      - {id: 13, cat: TV/Other, desc: "Variety Shows"}
-      
-      # Adult
-      - {id: 13, cat: XXX, desc: "Adult"}
+      - {id: 13, cat: Movies, desc: "Movie"}
+      - {id: 11, cat: TV, desc: "TV-Show"}
+      - {id: 5, cat: TV/Other, desc: "Variety Show"}
+      - {id: 24, cat: XXX, desc: "Adult"}

    modes:
      search: [q]
@@ -51,9 +38,6 @@
    test:
      path: index.php

-  download:
-    selector: a[href^="download.php?id="]
-
  search:
    paths:
      - path: index.php
@@ -64,19 +48,16 @@
      options: "0"
      active: "0"
    rows:
-      selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+      selector: table.table.table-bordered > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
    fields:
      download:
-        selector: a[href^="index.php?page=downloadcheck&id="]
+        selector: a[href^="download.php"]
        attribute: href
      title:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        selector: a[title][href^="index.php?page=torrent-details&id="]
      banner:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src=(.*?) "
+        selector: img[src^="torrentimg/"]
+        attribute: src
      category:
        selector: a[href^="index.php?page=torrents&category="]
        attribute: href
@@ -84,43 +65,42 @@
          - name: querystring
            args: category
      details:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        selector: a[title][href^="index.php?page=torrent-details&id="]
        attribute: href
      size:
-        selector: td:nth-child(12)
+        selector: p:has(b:contains("Size:"))
+        remove: b
      date:
-        selector: td:nth-child(7)
+        selector: p:has(b:contains("Added:"))
+        remove: b
        filters:
+          - name: replace
+            args: ["@ ", ""]
          - name: append
            args: " +01:00"
          - name: dateparse
-            args: "02/01/2006 -07:00"
+            args: "01/02/2006 15:04:05 -07:00"
+      seeders:
+        selector: b:contains("Seeds:") + a
+      leechers:
+        selector: b:contains("Leechers:") + a
      grabs:
-        selector: td:nth-child(10)
+        selector: p:has(b:contains("Complete:"))
+        remove: b, a[href^="index.php?page=peers"]
        filters:
          - name: replace
            args: ["---", "0"]
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
      downloadvolumefactor:
        case:
-          img[alt="Full Star 100% Free"]: "0"
-          img[alt="Half Star 50% Free"]: "0.5"
-          img[alt="Empty Star 25% Free"]: "0.75"
+          i.fa-star: "0"
+          i.fa-star-half-o: "0.5"
+          i.fa-star-o: "0.75"
          "*": "1"
      uploadvolumefactor:
        case:
+          span[title="2x Upload Multiplier"]: "2"
          "*": "1"
      description:
-        selector: td:nth-child(2)
-        remove: a
-      description|append:
-        selector: td:nth-child(3) > img
-        attribute: title
-        filters:
-          - name: prepend
-            args: "<br>Language: "
-        
+        selector: p:has(b:contains("Language:"))
+       
        
--- a/src/Jackett.Common/Definitions/apollo.yml
+++ b/src/Jackett.Common/Definitions/apollo.yml
@@ -1,96 +0,0 @@
---
-  site: apollo
-  name: Apollo
-  description: "A music tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://apollo.rip
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Audio, desc: "Music"}
-      - {id: 2, cat: PC, desc: "Applications"}
-      - {id: 3, cat: Books, desc: "E-Books"}
-      - {id: 4, cat: Audio/Audiobook, desc: "Audiobooks"}
-      - {id: 5, cat: Movies, desc: "E-Learning Videos"}
-      - {id: 6, cat: TV, desc: "Comedy"}
-      - {id: 7, cat: Books/Comics, desc: "Comics"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      keeplogged: 1
-      login: "Log in"
-    error:
-      - selector: form#loginform > span.warning
-    test:
-      path: torrents.php
-
-  ratio:
-    path: torrents.php
-    selector: li#stats_ratio > span
-
-  search:
-    paths:
-      - path: torrents.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
-      order_by: time
-      order_way: desc
-      action: basic
-      searchsubmit: 1
-    rows:
-      selector: table#torrent_table > tbody > tr.torrent
-    fields:
-      download:
-        selector: a[href^="torrents.php?action=download&id="]
-        attribute: href
-      description:
-        selector: div.group_info
-        remove: span
-      title:
-        selector: div.group_info
-        remove: span, div.tags
-      category:
-        selector: td.cats_col
-        case:
-          div.cats_music: 1
-          div.cats_applications: 2
-          div.cats_ebooks: 3
-          div.cats_audiobooks: 4
-          div.cats_elearningvideos: 5
-          div.cats_comedy: 6
-          div.cats_comics: 7
-      comments:
-        selector: a[href^="torrents.php?id="]
-        attribute: href
-      files:
-        selector: td:nth-child(3)
-      date:
-        selector: td:nth-child(4)
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        case:
-          ":root div.alertbar:contains(\"freeleech\")": "0"
-          ":root div.alertbar:contains(\"FREELEECH\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
--- a/src/Jackett.Common/Definitions/archetorrent.yml
+++ b/src/Jackett.Common/Definitions/archetorrent.yml
@@ -102,7 +102,7 @@
          - name: replace
            args: ["torrents-details.php", "download.php"]
      date:
-        selector: td:nth-child(2) a
+        selector: td:nth-child(3) a
        attribute: onmouseover
        filters:
          - name: regexp
@@ -127,13 +127,13 @@
        selector: img.rounded-img
        attribute: src
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-child(6)
      grabs:
-        selector: td:nth-child(8) font b
+        selector: td:nth-child(9) font b
      seeders:
-        selector: td:nth-child(6) font b
-      leechers:
        selector: td:nth-child(7) font b
+      leechers:
+        selector: td:nth-child(8) font b
      downloadvolumefactor:
        case:
          img[title="freeleech"]: "0"
--- a/src/Jackett.Common/Definitions/ast4u.yml
+++ b/src/Jackett.Common/Definitions/ast4u.yml
@@ -40,6 +40,18 @@
      search: [q]
      tv-search: [q, season, ep]
      movie-search: [q]
+      
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: info
+      type: info
+      label: Results Per Page
+      default: For best results, change the 'Torrentliste' setting to "Platzsparendes Layout mit PopUp für zusätzliche Informationen" in your profile.

  login:
    path: takelogin.php
@@ -63,9 +75,13 @@

    rows:
      selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
-    fields:
+    fields: # note: two alternative layouts available
      title:
        selector: a[href^="details.php"]
+      title:
+        optional: true
+        selector: a[href^="details.php"][title]
+        attribute: title
      category:
        selector: a[href^="browse.php?cat="]
        attribute: href
@@ -76,32 +92,34 @@
        selector: a[href^="details.php"]
        attribute: href
      download:
-        selector: a[href^=" /gettorrent/ssl/"]
+        selector: a[href^=" /gettorrent/"]
        attribute: href
      files:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2), a[href*="&filelist=1"]
      grabs:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1), a[href*="&tosnatchers=1"]
      size:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1), td:nth-child(7):has(br)
        filters:
          - name: replace
            args: [".", ""]
          - name: replace
            args: [",", "."]
      seeders:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1), a[href*="&toseeders=1"]
      leechers:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3), a[href*="&todlers=1"]
      date:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5)
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5), td:nth-child(5):has(br)
        filters:
+          - name: replace
+            args: [" ", ""]
          - name: append
            args: " +2:00"
          - name: replace
-            args: ["\xA0", " "]
+            args: ["\xA0", ""]
          - name: dateparse
-            args: "02.01.2006 15:04:05 -07:00"
+            args: "02.01.200615:04:05 -07:00"
      downloadvolumefactor:
        case:
          img[src="/pic/free.gif"]: "0"
--- a/src/Jackett.Common/Definitions/audiobooktorrents.yml
+++ b/src/Jackett.Common/Definitions/audiobooktorrents.yml
@@ -72,7 +72,7 @@
    rows:
      selector: tr.browse_color, tr.freeleech_color, tr[id^="kdescr"]
      after: 1
-    fields:
+    fields: # some users (rank specific?) have an extra column (td:nth-child(4)) with bookmark features
      banner:
        selector: a[href^="details.php?id="][onmouseover]
        attribute: onmouseover
@@ -98,20 +98,20 @@
        selector: a[href^="download.php"]
        attribute: href
      files:
-        selector: td:nth-child(4)
+        selector: a[href^="filelist.php"]
      size:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(6)
      grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(5)
        filters:
          - name: regexp
            args: ([\d,]+)
      seeders:
-        selector: td:nth-child(9)
+        selector: td:nth-last-child(4)
      leechers:
-        selector: td:nth-child(10)
+        selector: td:nth-last-child(3)
      date:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(7)
      downloadvolumefactor:
        case:
          "a.info > b:contains(\"[FREE]\")": "0"
--- a/src/Jackett.Common/Definitions/bitme.yml
+++ b/src/Jackett.Common/Definitions/bitme.yml
@@ -50,7 +50,7 @@
    form: form[action="takelogin.php"]
    captcha:
      type: image
-      image: img[src="visual.php"]
+      selector: img[src="visual.php"]
      input: secimage
    inputs:
      username: "{{ .Config.username }}"
--- a/src/Jackett.Common/Definitions/blutopia.yml
+++ b/src/Jackett.Common/Definitions/blutopia.yml
@@ -1,7 +1,7 @@
 ---
  site: blutopia
  name: Blutopia
-  description: "HD Movie tracker"
+  description: "HD Tracker Movies/TV/FANRES"
  language: en-us
  type: private
  encoding: UTF-8
@@ -32,25 +32,20 @@

  search:
    paths:
-      - path: /filter
+      - path: /filterTorrents
    inputs:
      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      uploader: ""
      imdb: "{{ .Query.IMDBIDShort }}"
      tvdb: ""
      tmdb: ""
+      mal: ""
      sorting: created_at
      direction: desc
      qty: 100
-    preprocessingfilters:
-      - name: jsonjoinarray
-        args: ["$.result", ""]
-      - name: prepend
-        args: "<table>"
-      - name: append
-        args: "</table>"
    rows:
-      selector: tr
+      selector: table > tbody > tr
    fields:
      category:
        selector: a[href*="/categories/"]
@@ -61,37 +56,24 @@
      title:
        selector: a.view-torrent
      download:
-        selector: a[href*="/download_check/"]
+        selector: a[href*="/download/"]
        attribute: href
-        filters:
-          - name: replace
-            args: ["/download_check/", "/download/"]
      details:
        selector: a.view-torrent
        attribute: href
-      imdb:
-        optional: true
-        selector: a[href*="://www.imdb.com/title/"]
-        attribute: href
      size:
-        selector: td:nth-child(5)
+        selector: td:nth-child(4)
      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      grabs:
        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(5)
        filters:
          - name: regexp
            args: ([\d\.]+)
      date:
        selector: time
-        attribute: datetime
-        filters:
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
      downloadvolumefactor:
        case:
          "i[data-original-title=\"100% Free\"]": "0"
@@ -100,4 +82,4 @@
      uploadvolumefactor:
        case:
          "i[data-original-title=\"Double upload\"]": "2"
-          "*": "1"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/bt-scene.yml
+++ b/src/Jackett.Common/Definitions/bt-scene.yml
@@ -53,6 +53,8 @@
      - path: "{{ if .Keywords }}results_.php?q={{ .Keywords }}&advcat={{ .Config.category }}{{else}}indexfull/{{end}}"
    rows:
      selector: table.tor > tbody > tr[id^="_"]
+      filters:
+        - name: andmatch
    fields:
      title:
        selector: td[class^="tname"] > a
--- a/src/Jackett.Common/Definitions/btbit.yml
+++ b/src/Jackett.Common/Definitions/btbit.yml
@@ -28,7 +28,7 @@

  search:
    paths:
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}.html"
+      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/1-1-0.html"
    rows:
      selector: .rs
    fields:
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@@ -11,8 +11,6 @@
  caps:
    categorymappings:
      - {id: 1, cat: Other, desc: "Other"}
-      - {id: 2, cat: TV, desc: "TV"}
-      - {id: 3, cat: Movies, desc: ""}

    modes:
      search: [q]
@@ -39,6 +37,8 @@
      - path: "{{if .Keywords}}q/{{ .Keywords}}/10?sort=time{{else}}{{end}}"
    rows:
      selector: li[class$="item"]
+      filters:
+        - name: andmatch
    fields:
      title:
        selector: h2[class$="title"] a[href^="/torrent/"]
@@ -51,36 +51,21 @@
      magnet:
        selector: div[class$="info"] a[href^="magnet:"]
        attribute: href
+      size:
+        selector: div[class$="info"] span:nth-of-type(1)
+      files:
+        selector: div[class$="info"] span:nth-of-type(2)
      date:
-        selector: div[class$="info"]
+        selector: div[class$="info"] span:nth-of-type(3)
        filters:
-          - name: split
-            args: ["\n", 3]
-          - name: replace
-            args: ["AddTime: ", ""]
          - name: dateparse
            args: "2006-01-02 15:04:05"
-      size:
-        selector: div[class$="info"]
-        filters:
-          - name: split
-            args: ["\n", 1]
-          - name: replace
-            args: ["Size: ", ""]
-      files:
-        selector: div[class$="info"]
-        filters:
-          - name: split
-            args: ["\n", 2]
-          - name: replace
-            args: ["Files: ", ""]
      grabs:
-        selector: div[class$="info"]
-        filters:
-          - name: split
-            args: ["\n", 4]
-          - name: replace
-            args: ["Popularity: ", ""]
+        selector: div[class$="info"] span:nth-of-type(4)
+      seeders:
+        text: "999"
+      leechers:
+        text: "999"
      downloadvolumefactor:
        text: "0"
      uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/btxpress.yml
+++ b/src/Jackett.Common/Definitions/btxpress.yml
@@ -0,0 +1,84 @@
+---
+  site: btxpress
+  name: BTXpress
+  description: "HD Tracker Movies/TV"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://btxpress.org/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: /login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table.main:contains("Login Failed!")
+    test:
+      path: /torrents
+
+  search:
+    paths:
+      - path: /filterTorrents
+    inputs:
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      uploader: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tvdb: ""
+      tmdb: ""
+      mal: ""
+      sorting: created_at
+      direction: desc
+      qty: 100
+    rows:
+      selector: table > tbody > tr
+    fields:
+      category:
+        selector: a[href*="/categories/"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "/categories/.*?\\.(\\d+)"
+      title:
+        selector: a.view-torrent
+      download:
+        selector: a[href*="/download/"]
+        attribute: href
+      details:
+        selector: a.view-torrent
+        attribute: href
+      size:
+        selector: td:nth-child(4)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: ([\d\.]+)
+      date:
+        selector: time
+      downloadvolumefactor:
+        case:
+          "i[data-original-title=\"100% Free\"]": "0"
+          "i[data-original-title=\"Global FreeLeech\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "i[data-original-title=\"Double upload\"]": "2"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/cinemageddon.yml
+++ b/src/Jackett.Common/Definitions/cinemageddon.yml
@@ -45,10 +45,7 @@
      - selector: table:contains("Login failed!")
    test:
      path: index.php
-
-  download:
-    selector: a[href^="download.php?id="]
-        
+ 
  search:
    paths:
      - path: browse.php
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -1,13 +1,39 @@
 ---
+  # Update by LA5T based on the orignial 'cinematik.yml'
+  # 29.07.2018 22:53 UTC+2
+  #
  site: cinematik
  name: Cinematik
-  description: "Non-Hollywood movie tracker"
+  description: "Tracker for non-hollywood movies."
  language: en-us
  type: private
  encoding: UTF-8
  links:
    - https://www.cinematik.net

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: incldead
+      type: select
+      label: Status
+      default: 1
+      options:
+        0: Active
+        1: "Active and Inactive"
+        2: Inactive
+    - name: srchdtls
+      type: checkbox
+      label: "Detailed search"
+    - name: info_results
+      type: info
+      label: "Search results"
+      default: "You can increase the number of search results in your profile.<br />Default is 15."
+
  caps:
    categorymappings:
      - {id: 1, cat: Movies, desc: "Comedy"}
@@ -43,15 +69,14 @@
    test:
      path: my.php

-  download:
-    selector: a[href^="download.php?id="]
-        
  search:
    paths:
      - path: browse.php
    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
      search: "{{ .Query.Keywords }}"
+      incldead: "{{ .Config.incldead }}"
+      srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"
    rows:
      selector: table[border="1"] tr:not(:first-child)
    fields:
@@ -85,11 +110,11 @@
        selector: td:nth-child(11) div.addedtor
      downloadvolumefactor:
        case:
-          "img[title=\"Golden Torrent: No Download Stats are Recorded\"]": "0"
-          "img[title=\"Silver Torrent: Download Stats are 25% Recorded\"]": "0.25"
-          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": "0"
-          "*": "1"
+          "img[title=\"Golden Torrent: No Download Stats are Recorded\"]": 0
+          "img[title=\"Silver Torrent: Download Stats are 25% Recorded\"]": 0.25
+          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 0
+          "*": 1
      uploadvolumefactor:
        case:
-          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": "2"
-          "*": "1"
+          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 2
+          "*": 1
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -6,12 +6,21 @@
  type: public
  encoding: UTF-8
  links:
-    - http://cpabien.club/
+    - http://www.cpabien.io/
  legacylinks:
+    - http://www.cpasbiens.cc/
+    - http://www.cpabien.cm/
+    - http://cpabien.cm/
+    - http://cpasbiens1.com/
+    - http://cpabien.mx/
+    - https://www.cpabien.bz/
+    - http://www.cpabien.bz/
+    - http://www.cpabien.cx/
    - http://cpabien.org/
    - http://cpabien.cc/
    - http://cpabien.co/
    - http://cpabien.la/
+    - http://cpabien.club/

  caps:
    categorymappings:
@@ -25,13 +34,13 @@
  settings: []

  download:
-    selector: "#telecharger"
-
+    selector: div.btn-download a
+    attribute: href
  search:
    paths:
-      - path: "/search.php?t={{ .Query.Keywords }}"
+      - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{else}}derniers/{{end}}"
    rows:
-      selector: div[class^='ligne']
+      selector: table.table-corps tbody tr td
    fields:
      site_date:
        selector: a
--- a/src/Jackett.Common/Definitions/czteam.yml
+++ b/src/Jackett.Common/Definitions/czteam.yml
@@ -1,96 +0,0 @@
---
-  site: czteam
-  name: CZTeam
-  description: "CZTeam (CZT) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-  language: cs-cz
-  type: private
-  encoding: UTF-8
-  links:
-    - https://czteam.club/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Movies, desc: "Movies"}
-      - {id: 2, cat: TV, desc: "TV-Eps"}
-      - {id: 3, cat: Audio, desc: "Music"}
-      - {id: 4, cat: PC/Games, desc: "Games"}
-      - {id: 5, cat: PC/ISO, desc: "Software"}
-      - {id: 6, cat: XXX, desc: "XxX"}
-      - {id: 7, cat: Other, desc: "Other"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      keeplogged: 1
-      login: "Log in"
-    error:
-      - selector: form#loginform > span.warning
-    test:
-      path: torrents.php
-
-  search:
-    paths:
-      - path: torrents.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
-      order_by: time
-      order_way: desc
-      action: basic
-      searchsubmit: 1
-    rows:
-      selector: table#torrent_table > tbody > tr.torrent
-    fields:
-      download:
-        selector: a[href^="torrents.php?action=download&id="]
-        attribute: href
-      title:
-        selector: a.torrent_name
-      category:
-        selector: td.cats_col
-        case:
-          div.cats_movies: 1
-          div.cats_tveps: 2
-          div.cats_music: 3
-          div.cats_games: 4
-          div.cats_software: 5
-          div.cats_xxx: 6
-          div.cats_other: 7
-      details:
-        selector: a.torrent_name
-        attribute: href
-      banner:
-        selector: a.torrent_name
-        optional: true
-        attribute: cover
-      files:
-        selector: td:nth-child(3)
-      date:
-        selector: td:nth-child(4)
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        case:
-          "strong.tl_free": "0"
-          "strong.tl_neutral": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "strong.tl_neutral": "0"
-          "*": "1"
-      description:
-        selector: div.torrent_info
-        remove: strong
--- a/src/Jackett.Common/Definitions/cztorrent.yml
+++ b/src/Jackett.Common/Definitions/cztorrent.yml
@@ -38,16 +38,15 @@
      tv-search: [q, season, ep]
      movie-search: [q]

+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+          
  login:
-    path: /login-page
-    method: form
-    form: form[action^="/login"]
+    method: cookie
    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      persistent_login: "1"
-    error:
-      - selector: div.error
+      cookie: "{{ .Config.cookie }}"
    test:
      path: /torrents

--- a/src/Jackett.Common/Definitions/downloadville.yml
+++ b/src/Jackett.Common/Definitions/downloadville.yml
@@ -6,6 +6,8 @@
  type: private
  encoding: UTF-8
  links:
+    - https://downloadville.net/
+  legacylinks:
    - https://downloadville.net/tracker/

  caps:
@@ -126,9 +128,20 @@
        "2" : "Argent (Silver)"
        "3" : "Or (Gold)"
        "4" : "Argent & Or (Both)"
-
+    - name: multilang
+      type: checkbox
+      label: Replace MULTI by another language in release name
+      default:  false
+    - name: multilanguage
+      type: select
+      label: Replace MULTI by this language
+      default: FRENCH
+      options:
+        FRENCH : "FRENCH"
+        MULTI.FRENCH : "MULTI.FRENCH" 
+        ENGLISH: "ENGLISH"
  login:
-    path: index.php?page=login
+    path: tracker/index.php?page=login
    method: post
    form: form[action="index.php?page=login"]
    inputs:
@@ -139,12 +152,12 @@
        message:
          selector: form[action="index.php?page=login&returnto=index.php"] table tr:nth-of-type(2) td span
    test:
-      path: index.php
+      path: tracker/index.php
      select: a[href="logout.php"]

  download:
    before:
-      path: "thanks.php"
+      path: tracker/thanks.php
      method: "post"
      inputs:
        infohash: "{{ .DownloadUri.Query.id }}"
@@ -154,7 +167,7 @@

  search:
    paths:
-      - path: index.php
+      - path: tracker/index.php
    inputs:
      page: "torrents"
      search: "{{ .Keywords }}"
@@ -166,8 +179,15 @@
    rows:
      selector: table > tbody > tr > td > table.lista > tbody > tr:has(td[onmouseover="this.className='post'"])
    fields:
-      title:
+      title_phase1:
        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      title_multilang:
+        text: "{{ .Result.title_phase1 }}"
+        filters:
+          - name: re_replace
+            args: ["[\\.\\s\\[\\-][Mm][Uu][Ll][Tt][Ii][\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."] 
+      title:
+        text: "{{if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_phase1 }}{{end}}"
      details:
        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
        attribute: href
@@ -187,23 +207,23 @@
          - name: querystring
            args: "category"
      date:
-        selector: td:nth-of-type(4)
+        selector: td:nth-of-type(5)
        filters:
          - name: append
            args: " -04:00"
          - name: dateparse
            args: "02/01/2006 15:04:05 -07:00"
      seeders:
-        selector: td:nth-of-type(6)
-      leechers:
        selector: td:nth-of-type(7)
-      grabs:
+      leechers:
        selector: td:nth-of-type(8)
+      grabs:
+        selector: td:nth-of-type(9)
        filters:
          - name: replace
            args: ["---", "0"]
      size:
-        selector: td:nth-of-type(10)
+        selector: td:nth-of-type(11)
      downloadvolumefactor:
        case:
          img[src="images/freeleech.gif"]: "0"
--- a/src/Jackett.Common/Definitions/dragonworldreloaded.yml
+++ b/src/Jackett.Common/Definitions/dragonworldreloaded.yml
@@ -27,7 +27,7 @@
      - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
      - {id: 80, cat: TV/HD, desc: "Serien - Pack HD"}
      # Musik
-      - {id: 119, cat: Audio, desc: "Musik - ALBEN"}
+      - {id: 119, cat: Audio, desc: "Musik - Alben"}
      - {id: 5, cat: Audio/MP3, desc: "Musik - Mp3"}
      - {id: 6, cat: Audio, desc: "Musik - Mixe"}
      - {id: 92, cat: Audio, desc: "Musik - Discography"}
@@ -73,7 +73,18 @@
      search: [q]
      tv-search: [q, season, ep]
      movie-search: [q]
-  
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: pin
+      type: text
+      label: Pin     
+
  login:
    path: /login.php
    method: form
@@ -81,11 +92,12 @@
    cookies: ["JAVA=OK"] # avoid jscheck redirect
    captcha:
      type: image
-      image: img[src^="cap/captcha_math.php"]
+      selector: img[src^="cap/captcha_math.php"]
      input: stringCaptcha
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
+      pin: "{{ .Config.pin }}"
      loggiin: "einloggen"
    error:
      - selector: div#login_error
@@ -143,7 +155,7 @@
          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": "42"
          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": "80"
          # Musik
-          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"ALBEN\"))": "119"
+          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Alben\"))": "119"
          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mp3\"))": "5"
          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": "6"
          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Discography\"))": "92"
--- a/src/Jackett.Common/Definitions/elitehd.yml
+++ b/src/Jackett.Common/Definitions/elitehd.yml
@@ -29,7 +29,7 @@
    form: form[action="takelogin.php"]
    captcha:
      type: image
-      image: img#captcha
+      selector: img#captcha
      input: imagestring
    inputs:
      username: "{{ .Config.username }}"
--- a/src/Jackett.Common/Definitions/elittracker.yml
+++ b/src/Jackett.Common/Definitions/elittracker.yml
@@ -114,7 +114,9 @@
      category: "{{ .Config.category }}"

    rows:
-      selector: table > tbody > tr:has(td a[href*="/browse.php?browse_categories&category="])
+      selector: table > tbody > tr:has(img[src*="/pic/categories/"])
+      filters:
+        - name: andmatch
    fields:
      title:
        # using attribute title from td(3) because the text from td(2) a(2) can be abbreviated
@@ -124,7 +126,7 @@
          - name: replace
            args: ["Torrent letöltése: ", ""]
      details:
-        selector: td:nth-of-type(2) a:nth-of-type(2)
+        selector: td:nth-of-type(2) > a[href$=".ts"]
        attribute: href
      banner:
        selector: td:nth-of-type(2) a:nth-of-type(2)
@@ -136,11 +138,11 @@
        selector: td:nth-of-type(3) a
        attribute: href
      category:
-        selector: td:nth-of-type(1) a
+        selector: td:nth-of-type(1) > a
        attribute: href
        filters:
-          - name: querystring
-            args: category
+          - name: regexp
+            args: -c-(\d+)\.ts
      date:
        selector: td:nth-of-type(2)
        remove: b
--- a/src/Jackett.Common/Definitions/empornium.yml
+++ b/src/Jackett.Common/Definitions/empornium.yml
@@ -0,0 +1,147 @@
+# Empornium uses the Luminance code, which is based on gazelle
+# ajax.php API additionally needs the auth=$authkey argument
+# Because the API is e.g. missing banner images we use screen scraping instead of the generic gazelle based approach
+---
+  site: empornium
+  name: Empornium
+  description: "A porn tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.empornium.me/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: XXX, desc: "Amateur"}
+      - {id: 2, cat: XXX, desc: "Anal"}
+      - {id: 5, cat: XXX, desc: "Asian"}
+      - {id: 6, cat: XXX, desc: "BBW"}
+      - {id: 30, cat: XXX, desc: "BDSM"}
+      - {id: 36, cat: XXX, desc: "Big Ass"}
+      - {id: 8, cat: XXX, desc: "Big Tits"}
+      - {id: 7, cat: XXX, desc: "Black"}
+      - {id: 9, cat: XXX, desc: "Classic"}
+      - {id: 37, cat: XXX, desc: "Creampie"}
+      - {id: 10, cat: XXX, desc: "Cumshot"}
+      - {id: 11, cat: XXX, desc: "DVD-R"}
+      - {id: 12, cat: XXX, desc: "Fetish"}
+      - {id: 14, cat: XXX, desc: "Gang Bang / Orgy"}
+      - {id: 39, cat: XXX, desc: "Gay / Bi"}
+      - {id: 56, cat: XXX, desc: "Hairy"}
+      - {id: 35, cat: XXX, desc: "Hardcore"}
+      - {id: 44, cat: XXX, desc: "HD Porn"}
+      - {id: 3, cat: XXX, desc: "Hentai / 3D"}
+      - {id: 25, cat: XXX, desc: "Homemade"}
+      - {id: 43, cat: XXX, desc: "Interracial"}
+      - {id: 16, cat: XXX, desc: "Latina"}
+      - {id: 23, cat: XXX, desc: "Lesbian"}
+      - {id: 52, cat: XXX, desc: "Lingerie"}
+      - {id: 27, cat: XXX, desc: "Magazines"}
+      - {id: 53, cat: XXX, desc: "Manga / Comic"}
+      - {id: 18, cat: XXX, desc: "Masturbation"}
+      - {id: 26, cat: XXX, desc: "Mature"}
+      - {id: 40, cat: XXX, desc: "Megapack"}
+      - {id: 41, cat: XXX, desc: "Natural Tits"}
+      - {id: 17, cat: XXX, desc: "Oral"}
+      - {id: 29, cat: XXX, desc: "Other"}
+      - {id: 47, cat: XXX, desc: "Parody"}
+      - {id: 24, cat: XXX, desc: "Paysite"}
+      - {id: 21, cat: XXX, desc: "Pictures / Images"}
+      - {id: 50, cat: XXX, desc: "Piss"}
+      - {id: 55, cat: XXX, desc: "Porn Music Videos"}
+      - {id: 46, cat: XXX, desc: "Pregnant / Preggo"}
+      - {id: 51, cat: XXX, desc: "Scat/Puke"}
+      - {id: 22, cat: XXX, desc: "Siterip"}
+      - {id: 20, cat: XXX, desc: "Softcore"}
+      - {id: 49, cat: XXX, desc: "Squirt"}
+      - {id: 34, cat: XXX, desc: "Straight"}
+      - {id: 19, cat: XXX, desc: "Teen"}
+      - {id: 15, cat: XXX, desc: "Transsexual"}
+      - {id: 45, cat: XXX, desc: "Voyeur"}
+      - {id: 13, cat: XXX, desc: "XXX Games / Apps"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      cinfo: "2550|1350|24|-60"
+      keeploggedin: 1
+    error:
+      - selector: form#loginform > span.warning
+    test:
+      path: torrents.php
+      selector: "#nav_userinfo"
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      title: "{{ .Query.Keywords }}"
+      order_by: time
+      order_way: desc
+      action: basic
+      searchsubmit: 1
+    rows:
+      # exclude redbar torrents
+      selector: table#torrent_table > tbody > tr[class^="torrent row"]
+    fields:
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.tags
+      title:
+        selector: a[href^="/torrents.php?id="]
+      category:
+        selector: a[href*="filter_cat"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\[(\\d+?)\\]"
+      details:
+        selector: a[href^="/torrents.php?id="]
+        attribute: href
+      banner:
+        optional: true
+        selector: td:nth-child(2) > script
+        filters:
+          - name: regexp
+            args: "src=\\\\\"(.*?)\\\\\""
+          - name: re_replace
+            args: ["\\\\(.)", "$1"]
+          - name: replace
+            args: ["/static/common/noartwork/noimage.png", ""]
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(5) > span
+        attribute: title
+        filters:
+          - name: append
+            args: " +00:00"
+          - name: dateparse
+            args: "Jan 02 2006, 15:04 -07:00"
+      size:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          "img[alt=\"Freeleech\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/eotforum.yml
+++ b/src/Jackett.Common/Definitions/eotforum.yml
@@ -1,181 +0,0 @@
---
-  site: eotforum
-  name: EoT-Forum
-  description: "A German gerneral tracker"
-  language: de-de
-  type: private
-  encoding: windows-1252
-  links:
-    - https://eot-forum.net
-
-  caps:
-    categorymappings:
-      # Filme
-      - {id: 14, cat: Movies/SD, desc: "SD XviD"}
-      - {id: 15, cat: Movies/SD, desc: "SD x264"}
-      - {id: 16, cat: Movies/HD, desc: "HD"}
-      - {id: 68, cat: Movies/HD, desc: "UHD"}
-      - {id: 17, cat: Movies/3D, desc: "3D"}
-      - {id: 18, cat: Movies/DVD, desc: "DVD-R"}
-      - {id: 19, cat: Movies, desc: "Pack"}
-      - {id: 20, cat: Movies, desc: "International"}
-      - {id: 21, cat: XXX, desc: "XXX"}
-
-      # Serien/TV
-      - {id: 23, cat: TV/SD, desc: "SD XviD"}
-      - {id: 24, cat: TV/SD, desc: "SD x264"}
-      - {id: 25, cat: TV/HD, desc: "HD"}
-      - {id: 26, cat: TV/SD, desc: "DVD-R"}
-      - {id: 27, cat: TV, desc: "Pack"}
-      - {id: 28, cat: TV, desc: "International"}
-      - {id: 29, cat: TV/Sport, desc: "Sport"}
-
-      # Dokus
-      - {id: 31, cat: TV/Documentary, desc: "SD XviD"}
-      - {id: 32, cat: TV/Documentary, desc: "SD x264"}
-      - {id: 33, cat: TV/Documentary, desc: "HD"}
-      - {id: 34, cat: TV/Documentary, desc: "3D"}
-      - {id: 35, cat: TV/Documentary, desc: "Pack"}
-      - {id: 67, cat: TV/Documentary, desc: "DVD-R"}
-      - {id: 36, cat: TV/Documentary, desc: "International"}
-
-      # Audio
-      - {id: 38, cat: Audio, desc: "Charts"}
-      - {id: 39, cat: Audio/MP3, desc: "MP3"}
-      - {id: 40, cat: Audio/Lossless, desc: "Flac"}
-      - {id: 41, cat: Audio, desc: "Pack"}
-      - {id: 42, cat: Audio/Video, desc: "MusikVideo"}
-      - {id: 43, cat: Audio/Audiobook, desc: "Hörbücher"}
-
-      # Spiele
-      - {id: 45, cat: PC/Games, desc: "Windows"}
-      - {id: 46, cat: PC/Mac, desc: "MacOS"}
-      - {id: 47, cat: Console/PS4, desc: "Sony PS"}
-      - {id: 48, cat: Console/Xbox , desc: "Microsoft XBox"}
-      - {id: 49, cat: Console/NDS, desc: "Nintendo"}
-      - {id: 50, cat: PC/Games, desc: "Linux"}
-      - {id: 51, cat: Console, desc: "Andere"}
-
-      # Software
-      - {id: 53, cat: PC, desc: "Windows"}
-      - {id: 54, cat: PC/Mac, desc: "MacOS"}
-      - {id: 55, cat: PC, desc: "Linux"}
-      - {id: 56, cat: PC/Phone-Android, desc: "Android"}
-      - {id: 57, cat: PC/Phone-IOS, desc: "Apple IOS"}
-      - {id: 58, cat: PC/Phone-Other, desc: "Andere"}
-
-      # Sonstiges
-      - {id: 60, cat: Books, desc: "EBooks"}
-      - {id: 61, cat: Other, desc: "Bilder"}
-      - {id: 62, cat: TV/Anime, desc: "Anime"}
-      - {id: 63, cat: Other, desc: "MISC"}
-      - {id: 64, cat: XXX, desc: "XXX-Bilder/EBooks/Audio"}
-
-      # EOT-Specials
-      - {id: 66, cat: Other, desc: "Special"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: index.php?page=login
-    method: post
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-      rememberme: "forever"
-      submit: "Login"
-    error:
-    - selector: td.lista[align="center"][colspan="2"] > span
-    test:
-      path: index.php
-      selector: img[alt="Ratio"]
-
-  ratio:
-    path: index.php
-    selector: img[alt="Ratio"] + font
-
-  search:
-    paths:
-      - path: index.php
-    inputs:
-      page: "torrents"
-      search: "{{ .Query.Keywords }}"
-      options: "0"
-      active: "0"
-      gold: "0"
-    rows:
-      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-      dateheaders:
-        selector: ":has(td.header > b)"
-        filters:
-          - name: replace
-            args: ["Torrents vom ", ""]
-          - name: replace
-            args: ["Januar", "January"]
-          - name: replace
-            args: ["Februar", "February"]
-          - name: replace
-            args: ["März", "March"]
-          - name: replace
-            args: ["Mai", "May"]
-          - name: replace
-            args: ["Juni", "June"]
-          - name: replace
-            args: ["Juli", "July"]
-          - name: replace
-            args: ["Oktober", "October"]
-          - name: replace
-            args: ["Dezember", "December"]
-          - name: dateparse
-            args: "02.January.2006"
-    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: a[href^="index.php?page=torrent-details&id="]
-        attribute: title
-        filters:
-          - name: replace
-            args: ["Details anzeigen: ", ""]
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      comments:
-        selector: a[href*="#comments"]
-        attribute: href
-      size:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(5)
-        filters:
-          - name: split
-            args: ["♦", 2]
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: td:nth-child(5) > a:nth-child(1)
-      leechers:
-        selector: td:nth-child(5) > a:nth-child(2)
-      downloadvolumefactor:
-        case:
-          img[alt="gold"]: "0"
-          img[alt="silver"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt="2x Upload Multiplier"]: "2"
-          img[alt="3x Upload Multiplier"]: "3"
-          img[alt="4x Upload Multiplier"]: "4"
-          img[alt="5x Upload Multiplier"]: "5"
-          img[alt="6x Upload Multiplier"]: "6"
-          img[alt="7x Upload Multiplier"]: "7"
-          img[alt="8x Upload Multiplier"]: "8"
-          img[alt="9x Upload Multiplier"]: "9"
-          img[alt="10x Upload Multiplier"]: "10"
-          "*": "1"
--- a/src/Jackett.Common/Definitions/ethor.yml
+++ b/src/Jackett.Common/Definitions/ethor.yml
@@ -46,7 +46,7 @@
    form: form[action="login3.php?takelogin=1"]
    captcha:
      type: image
-      image: img#validationimage
+      selector: img#validationimage
      input: validationcode
    inputs:
      username: "{{ .Config.username }}"
--- a/src/Jackett.Common/Definitions/ettv.yml
+++ b/src/Jackett.Common/Definitions/ettv.yml
@@ -13,29 +13,64 @@
      - {id: 49, cat: Movies/3D, desc: "Movies - 3D"}
      - {id: 1, cat: Movies/HD, desc: "Movies - HD 1080p"}
      - {id: 2, cat: Movies/HD, desc: "Movies - HD 720p"}
-      - {id: 3, cat: Movies/HD, desc: "Movies - UltraHD/4K"}
+      - {id: 3, cat: Movies/UHD, desc: "Movies - UltraHD/4K"}
      - {id: 47, cat: Movies/SD, desc: "Movies - X264/H264"}
+      - {id: 76, cat: Movies/SD, desc: "Movies - HEVC/x265"}
      - {id: 42, cat: Movies/SD, desc: "Movies - XviD"}
+      - {id: 65, cat: Movies, desc: "Movies - CAM/TS"}
+      - {id: 51, cat: Movies, desc: "Movies - Dubs/Dual Audio"}
+      - {id: 67, cat: Movies/DVD, desc: "Movies - DVDR"}
+      - {id: 66, cat: Movies/BluRay, desc: "Movies - BluRay Disc/Remux"}
      - {id: 41, cat: TV/HD, desc: "TV - HD/X264/H264"}
      - {id: 5, cat: TV/SD, desc: "TV - SD/X264/H264"}
+      - {id: 77, cat: TV/SD, desc: "TV - HEVC/x265"}
      - {id: 50, cat: TV/SD, desc: "TV - SD/XVID"}
      - {id: 7, cat: TV, desc: "TV - TV Packs"}
+      - {id: 72, cat: TV/Sport, desc: "TV - Sport"}
+      - {id: 74, cat: TV/Anime, desc: "Anime - Dubbed/Subbed"}
+      - {id: 73, cat: TV/Anime, desc: "Anime - Movies"}
+      - {id: 75, cat: TV/Anime, desc: "Anime - Others"}
+      - {id: 56, cat: Audio/Audiobook, desc: "Books - Audio"}
+      - {id: 55, cat: Books/Comics, desc: "Books - Comics"}
+      - {id: 53, cat: Books/Ebook, desc: "Books - Ebooks"}
+      - {id: 54, cat: Books/Magazines, desc: "Books - Magazines"}
+      - {id: 68, cat: Books/Other, desc: "Books - Others"}
+      - {id: 58, cat: PC/Games, desc: "Games - Android"}
+      - {id: 71, cat: PC/Games, desc: "Games - Others"}
+      - {id: 57, cat: PC/Games, desc: "Games - Windows"}
+      - {id: 60, cat: Audio/Lossless, desc: "Music - FLAC"}
+      - {id: 59, cat: Audio/MP3, desc: "Music - MP3"}
+      - {id: 61, cat: Audio/Video, desc: "Music - Music Videos"}
+      - {id: 69, cat: Audio/Other, desc: "Music - Others"}
+      - {id: 63, cat: PC/Phone-Android, desc: "Software - Android"}
+      - {id: 64, cat: PC/Mac, desc: "Software - Mac"}
+      - {id: 70, cat: PC, desc: "Software - Others"}
+      - {id: 62, cat: PC/0Day, desc: "Software - Windows"}

    modes:
      search: [q]
      tv-search: [q, season, ep]
      movie-search: [q]

-  settings: []
+  settings:
+    - name: downloadlink
+      type: select
+      label: Download link
+      default: "magnet:"
+      options:
+        "https://etorrent.click/" : "eTorrent.click"
+        "magnet:": "magnet"
  
  download:
-    selector: a[href^="magnet:"]
+    selector: a[href^="{{ .Config.downloadlink }}"]

  search:
    path: torrents-search.php
    inputs:
      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
+      sort: "id"
+      order: "desc"
      incldead: "1"
    keywordsfilters:
      - name: replace
@@ -58,7 +93,7 @@
        selector: a[href^="/torrent/"][title]
        attribute: title
      category:
-        selector: a[href^="torrents.php?cat="]
+        selector: a[href^="/torrents.php?cat="]
        attribute: href
        filters:
          - name: querystring
@@ -77,4 +112,4 @@
      downloadvolumefactor:
        text: "0"
      uploadvolumefactor:
-        text: "1"
+        text: "1"
--- a/src/Jackett.Common/Definitions/extratorrent-ag.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-ag.yml
@@ -0,0 +1,979 @@
+---
+  site: extratorrent-ag
+  name: ExtraTorrent.ag
+  description: "ExtraTorrent.ag is a Public tracker, a  popular alternative to the original ET site, providing Movie / TV / General magnets"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://extratorrent.ag/
+
+  caps:
+    categorymappings:
+      #Anime
+      - {id: 1, cat: TV/Anime, desc: "Anime"}
+      - {id: 963, cat: TV/Anime, desc: "Anime - Absolute Duo"}
+      - {id: 951, cat: TV/Anime, desc: "Anime - Akame ga Kill"}
+      - {id: 959, cat: TV/Anime, desc: "Anime - Aldnoah Zero"}
+      - {id: 99, cat: TV/Anime, desc: "Anime - Anime - Other"}
+      - {id: 86, cat: TV/Anime, desc: "Anime - Battle Programer Shirase"}
+      - {id: 87, cat: TV/Anime, desc: "Anime - Big O"}
+      - {id: 960, cat: TV/Anime, desc: "Anime - Binan Koukou Chikyuu Bouei-bu Love"}
+      - {id: 267, cat: TV/Anime, desc: "Anime - Bleach"}
+      - {id: 88, cat: TV/Anime, desc: "Anime - Cardcaptor Sakura"}
+      - {id: 89, cat: TV/Anime, desc: "Anime - Chobits"}
+      - {id: 142, cat: TV/Anime, desc: "Anime - Comics"}
+      - {id: 962, cat: TV/Anime, desc: "Anime - Death Parade"}
+      - {id: 151, cat: TV/Anime, desc: "Anime - Dragon ball"}
+      - {id: 90, cat: TV/Anime, desc: "Anime - Dragonball GT"}
+      - {id: 91, cat: TV/Anime, desc: "Anime - Dragonball Z"}
+      - {id: 156, cat: TV/Anime, desc: "Anime - DVD-R"}
+      - {id: 950, cat: TV/Anime, desc: "Anime - Fairy Tail"}
+      - {id: 92, cat: TV/Anime, desc: "Anime - Flame of Recca"}
+      - {id: 93, cat: TV/Anime, desc: "Anime - Full Metal Alchemist"}
+      - {id: 95, cat: TV/Anime, desc: "Anime - Ghost In The Shell SAC"}
+      - {id: 94, cat: TV/Anime, desc: "Anime - Gundam"}
+      - {id: 620, cat: TV/Anime, desc: "Anime - Hentai"}
+      - {id: 145, cat: TV/Anime, desc: "Anime - Hunter X Hunter"}
+      - {id: 949, cat: TV/Anime, desc: "Anime - Inou Battle wa Nichijou-kei no Naka de"}
+      - {id: 96, cat: TV/Anime, desc: "Anime - InuYasha"}
+      - {id: 524, cat: TV/Anime, desc: "Anime - Kiba"}
+      - {id: 97, cat: TV/Anime, desc: "Anime - Konkiki No Gash Bell"}
+      - {id: 961, cat: TV/Anime, desc: "Anime - Kuroko No Basuke"}
+      - {id: 98, cat: TV/Anime, desc: "Anime - Last Exile"}
+      - {id: 964, cat: TV/Anime, desc: "Anime - Log Horizon"}
+      - {id: 952, cat: TV/Anime, desc: "Anime - Nanatsu no Taizai"}
+      - {id: 101, cat: TV/Anime, desc: "Anime - Naruto"}
+      - {id: 508, cat: TV/Anime, desc: "Anime - One Piece"}
+      - {id: 100, cat: TV/Anime, desc: "Anime - Onegai Twins"}
+      - {id: 523, cat: TV/Anime, desc: "Anime - Ouran High School Host Club"}
+      - {id: 102, cat: TV/Anime, desc: "Anime - PlanetES"}
+      - {id: 146, cat: TV/Anime, desc: "Anime - Prince of Tennis"}
+      - {id: 103, cat: TV/Anime, desc: "Anime - Ranma 1/2"}
+      - {id: 104, cat: TV/Anime, desc: "Anime - Ruroni Kenshin"}
+      - {id: 105, cat: TV/Anime, desc: "Anime - Samurai Champloo"}
+      - {id: 107, cat: TV/Anime, desc: "Anime - Scrapped Princess"}
+      - {id: 997, cat: TV/Anime, desc: "Anime - Spider-man"}
+      - {id: 106, cat: TV/Anime, desc: "Anime - Stellvia of the Universe"}
+      - {id: 525, cat: TV/Anime, desc: "Anime - Strawberry Panic"}
+      - {id: 953, cat: TV/Anime, desc: "Anime - Sword Art Online II"}
+      - {id: 958, cat: TV/Anime, desc: "Anime - Tokyo Ghoul"}
+
+      #Audio
+      - {id: 5, cat: Audio, desc: "Music"}
+      - {id: 54, cat: Audio, desc: "Music - Alternative"}
+      - {id: 990, cat: Audio, desc: "Music - Ambient"}
+      - {id: 160, cat: Audio, desc: "Music - Anime"}
+      - {id: 55, cat: Audio, desc: "Music - Asian"}
+      - {id: 56, cat: Audio, desc: "Music - Blues"}
+      - {id: 809, cat: Audio, desc: "Music - Bollywood"}
+      - {id: 57, cat: Audio, desc: "Music - Christian"}
+      - {id: 58, cat: Audio, desc: "Music - Classic"}
+      - {id: 515, cat: Audio, desc: "Music - Compilation/Various Artists (VA)"}
+      - {id: 59, cat: Audio, desc: "Music - Country/Western"}
+      - {id: 971, cat: Audio, desc: "Music - Discography"}
+      - {id: 60, cat: Audio, desc: "Music - Drum N Bass"}
+      - {id: 61, cat: Audio, desc: "Music - Electronic"}
+      - {id: 850, cat: Audio, desc: "Music - FLAC"}
+      - {id: 519, cat: Audio, desc: "Music - Folk"}
+      - {id: 62, cat: Audio, desc: "Music - Game Music"}
+      - {id: 233, cat: Audio, desc: "Music - Gothic"}
+      - {id: 63, cat: Audio, desc: "Music - Hardcore"}
+      - {id: 78, cat: Audio, desc: "Music - HardHouse/Old School Radio Mixes"}
+      - {id: 512, cat: Audio, desc: "Music - Hardrock"}
+      - {id: 724, cat: Audio, desc: "Music - Hardstyle"}
+      - {id: 306, cat: Audio, desc: "Music - Heavy/Death Metal"}
+      - {id: 64, cat: Audio, desc: "Music - Hip Hop"}
+      - {id: 511, cat: Audio, desc: "Music - Indie/Britpop"}
+      - {id: 65, cat: Audio, desc: "Music - Industrial"}
+      - {id: 66, cat: Audio, desc: "Music - Jazz"}
+      - {id: 67, cat: Audio, desc: "Music - Karaoke"}
+      - {id: 521, cat: Audio, desc: "Music - Latin"}
+      - {id: 68, cat: Audio, desc: "Music - Metal"}
+      - {id: 526, cat: Audio, desc: "Music - Motown"}
+      - {id: 79, cat: Audio, desc: "Music - Music - Other"}
+      - {id: 69, cat: Audio, desc: "Music - Music Videos"}
+      - {id: 522, cat: Audio, desc: "Music - Non-English"}
+      - {id: 507, cat: Audio, desc: "Music - Now That's What I Call Music"}
+      - {id: 70, cat: Audio, desc: "Music - Pop"}
+      - {id: 852, cat: Audio, desc: "Music - Progressive"}
+      - {id: 71, cat: Audio, desc: "Music - Punk"}
+      - {id: 72, cat: Audio, desc: "Music - R&B"}
+      - {id: 851, cat: Audio, desc: "Music - Rai"}
+      - {id: 73, cat: Audio, desc: "Music - Rap"}
+      - {id: 74, cat: Audio, desc: "Music - Reggae"}
+      - {id: 75, cat: Audio, desc: "Music - Rock"}
+      - {id: 527, cat: Audio, desc: "Music - Rock 'n' Roll"}
+      - {id: 514, cat: Audio, desc: "Music - Singer Songwriter"}
+      - {id: 230, cat: Audio, desc: "Music - Ska"}
+      - {id: 505, cat: Audio, desc: "Music - Soul"}
+      - {id: 77, cat: Audio, desc: "Music - Soundtracks"}
+      - {id: 161, cat: Audio, desc: "Music - Techno"}
+      - {id: 420, cat: Audio, desc: "Music - Trance/House/Dance"}
+      - {id: 76, cat: Audio, desc: "Music - Unsigned/Amateur"}
+      - {id: 1002, cat: Audio, desc: "Music - AAC"}
+      - {id: 1003, cat: Audio, desc: "Music - Album"}
+      - {id: 1004, cat: Audio, desc: "Music - Box Set"}
+      - {id: 1005, cat: Audio, desc: "Music - Concerts"}
+      - {id: 1006, cat: Audio, desc: "Music - Discography"}
+      - {id: 1007, cat: Audio, desc: "Music - DVD"}
+      - {id: 1008, cat: Audio/Lossless, desc: "Music - Lossless"}
+      - {id: 1009, cat: Audio/MP3, desc: "Music - MP3"}
+      - {id: 1011, cat: Audio, desc: "Music - Radio"}
+      - {id: 1012, cat: Audio, desc: "Music - Single"}
+
+      #Movies
+      - {id: 4, cat: Movies, desc: "Movies"}
+      - {id: 419, cat: Movies, desc: "Movies - Action"}
+      - {id: 28, cat: Movies, desc: "Movies - Adventure"}
+      - {id: 29, cat: Movies, desc: "Movies - Animation"}
+      - {id: 30, cat: Movies, desc: "Movies - Asian"}
+      - {id: 32, cat: Movies, desc: "Movies - Automotive/Cars"}
+      - {id: 628, cat: Movies, desc: "Movies - Biography"}
+      - {id: 977, cat: Movies, desc: "Movies - Black and White"}
+      - {id: 558, cat: Movies, desc: "Movies - Bollywood/Desi"}
+      - {id: 976, cat: Movies, desc: "Movies - Classic"}
+      - {id: 33, cat: Movies, desc: "Movies - Comedy"}
+      - {id: 34, cat: Movies, desc: "Movies - Concerts"}
+      - {id: 600, cat: Movies, desc: "Movies - Crime"}
+      - {id: 35, cat: Movies, desc: "Movies - Documentary"}
+      - {id: 37, cat: Movies, desc: "Movies - Drama"}
+      - {id: 742, cat: Movies, desc: "Movies - Dubbed/Dual Audio"}
+      - {id: 36, cat: Movies, desc: "Movies - DVD/Film Extras"}
+      - {id: 149, cat: Movies, desc: "Movies - Family"}
+      - {id: 38, cat: Movies, desc: "Movies - Fantasy"}
+      - {id: 39, cat: Movies, desc: "Movies - Gore Flicks"}
+      - {id: 602, cat: Movies, desc: "Movies - History"}
+      - {id: 40, cat: Movies, desc: "Movies - Horror"}
+      - {id: 41, cat: Movies, desc: "Movies - Kids"}
+      - {id: 150, cat: Movies, desc: "Movies - KVCD"}
+      - {id: 974, cat: Movies, desc: "Movies - Lollywood"}
+      - {id: 42, cat: Movies, desc: "Movies - Martial Arts"}
+      - {id: 44, cat: Movies/Other, desc: "Movies - Other"}
+      - {id: 805, cat: Movies/3D, desc: "Movies - 3D"}
+      - {id: 975, cat: Movies/UHD, desc: "Movies - 4K"}
+      - {id: 947, cat: Movies, desc: "Movies - Musical"}
+      - {id: 43, cat: Movies, desc: "Movies - Mystery"}
+      - {id: 603, cat: Movies/Foreign, desc: "Movies - non English"}
+      - {id: 978, cat: Movies, desc: "Movies - Rarities"}
+      - {id: 45, cat: Movies, desc: "Movies - Romance"}
+      - {id: 46, cat: Movies, desc: "Movies - Samples/Trailers"}
+      - {id: 47, cat: Movies, desc: "Movies - Sci-Fi"}
+      - {id: 48, cat: Movies, desc: "Movies - Sports related"}
+      - {id: 779, cat: Movies, desc: "Movies - Stand-up comedy"}
+      - {id: 49, cat: Movies, desc: "Movies - Thriller"}
+      - {id: 671, cat: Movies, desc: "Movies - Travel"}
+      - {id: 307, cat: Movies, desc: "Movies - War"}
+      - {id: 601, cat: Movies, desc: "Movies - Western"}
+      - {id: 1024, cat: Movies, desc: "Movies - HEVC/x265"}
+      - {id: 1030, cat: Movies, desc: "Movies - Divx/Xvid"}
+      - {id: 1031, cat: Movies, desc: "Movies - h.264/x264"}
+      - {id: 1032, cat: Movies/HD, desc: "Movies - HD"}
+      - {id: 1033, cat: Movies, desc: "Movies - MP4"}
+      - {id: 1034, cat: Movies, desc: "Movies - SVCD/VCD"}
+      - {id: 1035, cat: Movies, desc: "Movies - YIFY"}
+
+      #TV
+      - {id: 8, cat: TV, desc: "TV"}
+      - {id: 986, cat: TV, desc: "TV - 12 Monkeys"}
+      - {id: 598, cat: TV, desc: "TV - 19-2"}
+      - {id: 795, cat: TV, desc: "TV - 2 Broke Girls"}
+      - {id: 435, cat: TV, desc: "TV - 24"}
+      - {id: 169, cat: TV, desc: "TV - 30 Days"}
+      - {id: 561, cat: TV, desc: "TV - 30 Rock"}
+      - {id: 274, cat: TV, desc: "TV - 60 Minutes"}
+      - {id: 862, cat: TV, desc: "TV - 666 Park Avenue"}
+      - {id: 273, cat: TV, desc: "TV - 'Allo 'Allo!"}
+      - {id: 310, cat: TV, desc: "TV - A-Team"}
+      - {id: 797, cat: TV, desc: "TV - About a Boy"}
+      - {id: 998, cat: TV, desc: "TV - Above Suspicion"}
+      - {id: 966, cat: TV, desc: "TV - Adam - E.V.A"}
+      - {id: 573, cat: TV, desc: "TV - Alaska State Troopers"}
+      - {id: 821, cat: TV, desc: "TV - Alcatraz"}
+      - {id: 118, cat: TV, desc: "TV - Alias"}
+      - {id: 810, cat: TV, desc: "TV - Almost Human"}
+      - {id: 771, cat: TV, desc: "TV - Alphas"}
+      - {id: 818, cat: TV, desc: "TV - American Chopper"}
+      - {id: 234, cat: TV, desc: "TV - American Dad"}
+      - {id: 194, cat: TV, desc: "TV - American Horror Story"}
+      - {id: 634, cat: TV, desc: "TV - American Idol"}
+      - {id: 674, cat: TV, desc: "TV - Americas Got Talent"}
+      - {id: 675, cat: TV, desc: "TV - Americas Next Top Model"}
+      - {id: 894, cat: TV, desc: "TV - Ancient Aliens"}
+      - {id: 170, cat: TV, desc: "TV - Angel"}
+      - {id: 911, cat: TV, desc: "TV - Anger Management"}
+      - {id: 659, cat: TV, desc: "TV - Archer"}
+      - {id: 275, cat: TV, desc: "TV - Arrested Development"}
+      - {id: 872, cat: TV, desc: "TV - Arrow"}
+      - {id: 984, cat: TV, desc: "TV - Ash vs Evil Dead"}
+      - {id: 171, cat: TV, desc: "TV - Attack Of The Show"}
+      - {id: 837, cat: TV, desc: "TV - Awake"}
+      - {id: 902, cat: TV, desc: "TV - Awkward"}
+      - {id: 916, cat: TV, desc: "TV - Baby Daddy"}
+      - {id: 165, cat: TV, desc: "TV - Babylon 5"}
+      - {id: 309, cat: TV, desc: "TV - Back In The Game"}
+      - {id: 460, cat: TV, desc: "TV - Band Of Brothers"}
+      - {id: 329, cat: TV, desc: "TV - Banshee"}
+      - {id: 891, cat: TV, desc: "TV - Bates Motel"}
+      - {id: 802, cat: TV, desc: "TV - Batman The Brave and The Bold"}
+      - {id: 163, cat: TV, desc: "TV - Battlestar Galactica"}
+      - {id: 794, cat: TV, desc: "TV - BBC"}
+      - {id: 886, cat: TV, desc: "TV - Beauty and the Beast"}
+      - {id: 172, cat: TV, desc: "TV - Beauty And The Geek"}
+      - {id: 782, cat: TV, desc: "TV - Beavis and Butt-Head"}
+      - {id: 584, cat: TV, desc: "TV - Being Erica"}
+      - {id: 669, cat: TV, desc: "TV - Being Human"}
+      - {id: 683, cat: TV, desc: "TV - Believe"}
+      - {id: 335, cat: TV, desc: "TV - Bellator FC"}
+      - {id: 979, cat: TV, desc: "TV - Better Call Saul"}
+      - {id: 173, cat: TV, desc: "TV - Big Brother"}
+      - {id: 666, cat: TV, desc: "TV - Big Love"}
+      - {id: 774, cat: TV, desc: "TV - Bigg Boss"}
+      - {id: 989, cat: TV, desc: "TV - Billions"}
+      - {id: 174, cat: TV, desc: "TV - Bitten"}
+      - {id: 396, cat: TV, desc: "TV - Black Sails"}
+      - {id: 981, cat: TV, desc: "TV - Blindspot"}
+      - {id: 717, cat: TV, desc: "TV - Blue Bloods"}
+      - {id: 754, cat: TV, desc: "TV - Boardwalk Empire"}
+      - {id: 709, cat: TV, desc: "TV - Bobs Burgers"}
+      - {id: 767, cat: TV, desc: "TV - Body of Proof"}
+      - {id: 175, cat: TV, desc: "TV - Bold and the beautiful"}
+      - {id: 969, cat: TV, desc: "TV - Bollywood TV Shows"}
+      - {id: 269, cat: TV, desc: "TV - Bones"}
+      - {id: 235, cat: TV, desc: "TV - Boston Legal"}
+      - {id: 676, cat: TV, desc: "TV - Breaking Bad"}
+      - {id: 707, cat: TV, desc: "TV - Breakout Kings"}
+      - {id: 409, cat: TV, desc: "TV - Brickleberry"}
+      - {id: 680, cat: TV, desc: "TV - Brooklyn Nine-Nine"}
+      - {id: 560, cat: TV, desc: "TV - Brothers And Sisters"}
+      - {id: 147, cat: TV, desc: "TV - Buffy"}
+      - {id: 677, cat: TV, desc: "TV - Burn Notice"}
+      - {id: 619, cat: TV, desc: "TV - Californication"}
+      - {id: 883, cat: TV, desc: "TV - Call of the Wildman"}
+      - {id: 719, cat: TV, desc: "TV - Camelot"}
+      - {id: 921, cat: TV, desc: "TV - Camp"}
+      - {id: 661, cat: TV, desc: "TV - Caprica"}
+      - {id: 928, cat: TV, desc: "TV - Capture"}
+      - {id: 128, cat: TV, desc: "TV - Carnivale"}
+      - {id: 736, cat: TV, desc: "TV - Cartoon"}
+      - {id: 658, cat: TV, desc: "TV - Castle"}
+      - {id: 941, cat: TV, desc: "TV - Cedar Cove"}
+      - {id: 846, cat: TV, desc: "TV - Celebrity Juice"}
+      - {id: 141, cat: TV, desc: "TV - Charmed"}
+      - {id: 900, cat: TV, desc: "TV - Chicago Fire"}
+      - {id: 324, cat: TV, desc: "TV - Chicago PD"}
+      - {id: 315, cat: TV, desc: "TV - Chopped"}
+      - {id: 184, cat: TV, desc: "TV - Chozen"}
+      - {id: 657, cat: TV, desc: "TV - Chuck"}
+      - {id: 133, cat: TV, desc: "TV - Cold Case"}
+      - {id: 629, cat: TV, desc: "TV - Community"}
+      - {id: 178, cat: TV, desc: "TV - Conan O'Brien"}
+      - {id: 946, cat: TV, desc: "TV - Constantine"}
+      - {id: 879, cat: TV, desc: "TV - Continuum"}
+      - {id: 861, cat: TV, desc: "TV - Copper"}
+      - {id: 322, cat: TV, desc: "TV - Cops"}
+      - {id: 186, cat: TV, desc: "TV - Cosmos A Space Time Odyssey"}
+      - {id: 670, cat: TV, desc: "TV - Cougar Town"}
+      - {id: 729, cat: TV, desc: "TV - Covert Affairs"}
+      - {id: 651, cat: TV, desc: "TV - Craig Ferguson"}
+      - {id: 280, cat: TV, desc: "TV - Criminal Minds"}
+      - {id: 788, cat: TV, desc: "TV - Crisis"}
+      - {id: 279, cat: TV, desc: "TV - Criss Angel BeLIEve"}
+      - {id: 323, cat: TV, desc: "TV - Crossing Jordan"}
+      - {id: 926, cat: TV, desc: "TV - Crossing Lines"}
+      - {id: 108, cat: TV, desc: "TV - CSI"}
+      - {id: 325, cat: TV, desc: "TV - Curb Your Enthusiasm"}
+      - {id: 882, cat: TV, desc: "TV - Da Vincis Demons"}
+      - {id: 282, cat: TV, desc: "TV - Dallas"}
+      - {id: 678, cat: TV, desc: "TV - Damages"}
+      - {id: 798, cat: TV, desc: "TV - Dancing with the Stars US"}
+      - {id: 652, cat: TV, desc: "TV - David Letterman"}
+      - {id: 994, cat: TV, desc: "TV - Days of Our Lives"}
+      - {id: 985, cat: TV, desc: "TV - DCs Legends of Tomorrow"}
+      - {id: 181, cat: TV, desc: "TV - Dead Like Me"}
+      - {id: 679, cat: TV, desc: "TV - Deadliest Catch"}
+      - {id: 182, cat: TV, desc: "TV - Deadwood"}
+      - {id: 890, cat: TV, desc: "TV - Defiance"}
+      - {id: 281, cat: TV, desc: "TV - Democracy Now!"}
+      - {id: 183, cat: TV, desc: "TV - Desperate Housewives"}
+      - {id: 939, cat: TV, desc: "TV - Devious Maids"}
+      - {id: 585, cat: TV, desc: "TV - Dexter"}
+      - {id: 644, cat: TV, desc: "TV - Dirty Jobs"}
+      - {id: 122, cat: TV, desc: "TV - Discovery Channel"}
+      - {id: 167, cat: TV, desc: "TV - Doctor Who"}
+      - {id: 968, cat: TV, desc: "TV - Documentary"}
+      - {id: 606, cat: TV, desc: "TV - Dollhouse"}
+      - {id: 839, cat: TV, desc: "TV - Dont Trust the Bitch in Apartment"}
+      - {id: 326, cat: TV, desc: "TV - Dr Who"}
+      - {id: 925, cat: TV, desc: "TV - Dracula"}
+      - {id: 328, cat: TV, desc: "TV - Drawn Together"}
+      - {id: 732, cat: TV, desc: "TV - Drop Dead"}
+      - {id: 820, cat: TV, desc: "TV - Eastbound and Down"}
+      - {id: 875, cat: TV, desc: "TV - Elementary"}
+      - {id: 283, cat: TV, desc: "TV - Ellen DeGeneres"}
+      - {id: 330, cat: TV, desc: "TV - Enlisted"}
+      - {id: 187, cat: TV, desc: "TV - Entourage"}
+      - {id: 270, cat: TV, desc: "TV - ER"}
+      - {id: 765, cat: TV, desc: "TV - Eureka"}
+      - {id: 238, cat: TV, desc: "TV - Everybody Loves Raymond"}
+      - {id: 571, cat: TV, desc: "TV - Extant"}
+      - {id: 840, cat: TV, desc: "TV - Fact or Faked Paranormal Files"}
+      - {id: 828, cat: TV, desc: "TV - Fairly Legeal"}
+      - {id: 876, cat: TV, desc: "TV - Faking It"}
+      - {id: 917, cat: TV, desc: "TV - Falling Skies"}
+      - {id: 188, cat: TV, desc: "TV - Family Guy"}
+      - {id: 855, cat: TV, desc: "TV - Family Tools"}
+      - {id: 411, cat: TV, desc: "TV - Fargo"}
+      - {id: 331, cat: TV, desc: "TV - Farscape"}
+      - {id: 983, cat: TV, desc: "TV - Fear the Walking Dead"}
+      - {id: 332, cat: TV, desc: "TV - Fifth Gear"}
+      - {id: 672, cat: TV, desc: "TV - Flashforward"}
+      - {id: 753, cat: TV, desc: "TV - Flashpoint"}
+      - {id: 831, cat: TV, desc: "TV - Foreign Series/Non English"}
+      - {id: 266, cat: TV, desc: "TV - Forever"}
+      - {id: 922, cat: TV, desc: "TV - Franklin and Bash"}
+      - {id: 140, cat: TV, desc: "TV - Friends"}
+      - {id: 612, cat: TV, desc: "TV - Fringe"}
+      - {id: 277, cat: TV, desc: "TV - From Dusk Till Dawn"}
+      - {id: 681, cat: TV, desc: "TV - Futurama"}
+      - {id: 728, cat: TV, desc: "TV - Game of Thrones"}
+      - {id: 334, cat: TV, desc: "TV - Gang Related"}
+      - {id: 996, cat: TV, desc: "TV - General Hospital"}
+      - {id: 954, cat: TV, desc: "TV - Geordie Shore"}
+      - {id: 574, cat: TV, desc: "TV - Ghost Adventures"}
+      - {id: 704, cat: TV, desc: "TV - Ghost Hunters"}
+      - {id: 642, cat: TV, desc: "TV - Ghost Mine"}
+      - {id: 338, cat: TV, desc: "TV - Ghost Whisperer"}
+      - {id: 284, cat: TV, desc: "TV - Gilmore Girls"}
+      - {id: 682, cat: TV, desc: "TV - Glee"}
+      - {id: 865, cat: TV, desc: "TV - Go On"}
+      - {id: 276, cat: TV, desc: "TV - Gold Rush"}
+      - {id: 339, cat: TV, desc: "TV - Good Eats"}
+      - {id: 599, cat: TV, desc: "TV - Gossip Girl"}
+      - {id: 580, cat: TV, desc: "TV - Gotham"}
+      - {id: 919, cat: TV, desc: "TV - Graceland"}
+      - {id: 955, cat: TV, desc: "TV - Gracepoint"}
+      - {id: 285, cat: TV, desc: "TV - Greys Anatomy"}
+      - {id: 819, cat: TV, desc: "TV - Grimm"}
+      - {id: 237, cat: TV, desc: "TV - Growing Up Fisher"}
+      - {id: 340, cat: TV, desc: "TV - Guiding Light"}
+      - {id: 866, cat: TV, desc: "TV - Guys With Kids"}
+      - {id: 880, cat: TV, desc: "TV - Hannibal"}
+      - {id: 813, cat: TV, desc: "TV - Happily Divorced"}
+      - {id: 769, cat: TV, desc: "TV - Happy Endings"}
+      - {id: 190, cat: TV, desc: "TV - Harald Schmidt"}
+      - {id: 713, cat: TV, desc: "TV - Harrys Law"}
+      - {id: 832, cat: TV, desc: "TV - Hart of Dixie"}
+      - {id: 341, cat: TV, desc: "TV - Haunted"}
+      - {id: 773, cat: TV, desc: "TV - Haven"}
+      - {id: 712, cat: TV, desc: "TV - Hawaii Five-0"}
+      - {id: 781, cat: TV, desc: "TV - Helix"}
+      - {id: 853, cat: TV, desc: "TV - Hell on Wheels"}
+      - {id: 191, cat: TV, desc: "TV - Hells Kitchen"}
+      - {id: 884, cat: TV, desc: "TV - Hemlock Grove"}
+      - {id: 342, cat: TV, desc: "TV - Hercules"}
+      - {id: 556, cat: TV, desc: "TV - Heroes"}
+      - {id: 343, cat: TV, desc: "TV - Hex"}
+      - {id: 192, cat: TV, desc: "TV - Hogans Heroes"}
+      - {id: 588, cat: TV, desc: "TV - Hollands Hoop"}
+      - {id: 755, cat: TV, desc: "TV - Homeland"}
+      - {id: 812, cat: TV, desc: "TV - Hostages"}
+      - {id: 684, cat: TV, desc: "TV - Hot in Cleveland"}
+      - {id: 286, cat: TV, desc: "TV - House"}
+      - {id: 913, cat: TV, desc: "TV - House Of Cards"}
+      - {id: 287, cat: TV, desc: "TV - How I Met Your Mother"}
+      - {id: 568, cat: TV, desc: "TV - How Its Made"}
+      - {id: 893, cat: TV, desc: "TV - How to Live with Your Parents"}
+      - {id: 288, cat: TV, desc: "TV - Howard Stern"}
+      - {id: 132, cat: TV, desc: "TV - Huff"}
+      - {id: 345, cat: TV, desc: "TV - Humor Amarillo"}
+      - {id: 756, cat: TV, desc: "TV - Hung"}
+      - {id: 637, cat: TV, desc: "TV - Hustle"}
+      - {id: 346, cat: TV, desc: "TV - In Justice"}
+      - {id: 685, cat: TV, desc: "TV - In Plain Sight"}
+      - {id: 582, cat: TV, desc: "TV - Ink Master"}
+      - {id: 347, cat: TV, desc: "TV - Inked"}
+      - {id: 965, cat: TV, desc: "TV - Inside MMA"}
+      - {id: 873, cat: TV, desc: "TV - Intelligence US"}
+      - {id: 240, cat: TV, desc: "TV - Into the West"}
+      - {id: 166, cat: TV, desc: "TV - Iron Chef"}
+      - {id: 289, cat: TV, desc: "TV - Invasion"}
+      - {id: 817, cat: TV, desc: "TV - Ironside"}
+      - {id: 772, cat: TV, desc: "TV - Its Always Sunny in Philadelphia"}
+      - {id: 988, cat: TV, desc: "TV - iZombie"}
+      - {id: 991, cat: TV, desc: "TV - Jane the Virgin"}
+      - {id: 290, cat: TV, desc: "TV - Jay Leno"}
+      - {id: 763, cat: TV, desc: "TV - Jersey Shore"}
+      - {id: 177, cat: TV, desc: "TV - Joe Rogan Questions Everything"}
+      - {id: 110, cat: TV, desc: "TV - Joey"}
+      - {id: 196, cat: TV, desc: "TV - Justice League Unlimited"}
+      - {id: 686, cat: TV, desc: "TV - Justified"}
+      - {id: 412, cat: TV, desc: "TV - kabachitare!"}
+      - {id: 738, cat: TV, desc: "TV - Killer Contact"}
+      - {id: 349, cat: TV, desc: "TV - Killer Instinct"}
+      - {id: 197, cat: TV, desc: "TV - Kim Possible"}
+      - {id: 741, cat: TV, desc: "TV - King"}
+      - {id: 933, cat: TV, desc: "TV - King and Maxwel"}
+      - {id: 350, cat: TV, desc: "TV - King Of The Hill"}
+      - {id: 351, cat: TV, desc: "TV - Kitchen Confidential"}
+      - {id: 790, cat: TV, desc: "TV - Kitchen Nightmares US"}
+      - {id: 348, cat: TV, desc: "TV - Kolchak The Night Stalker"}
+      - {id: 241, cat: TV, desc: "TV - Koot en Bie"}
+      - {id: 198, cat: TV, desc: "TV - Kung Fu"}
+      - {id: 199, cat: TV, desc: "TV - La Femme Nikita"}
+      - {id: 570, cat: TV, desc: "TV - LA Ink"}
+      - {id: 242, cat: TV, desc: "TV - Laguna Beach"}
+      - {id: 130, cat: TV, desc: "TV - Las Vegas"}
+      - {id: 843, cat: TV, desc: "TV - Last Man Standing"}
+      - {id: 867, cat: TV, desc: "TV - Last Resort"}
+      - {id: 200, cat: TV, desc: "TV - Late Night with Conan O'Brien"}
+      - {id: 115, cat: TV, desc: "TV - Law And Order"}
+      - {id: 591, cat: TV, desc: "TV - Law and Order UK"}
+      - {id: 243, cat: TV, desc: "TV - Le Cameleon"}
+      - {id: 578, cat: TV, desc: "TV - Legend of the Seeker"}
+      - {id: 590, cat: TV, desc: "TV - Legends"}
+      - {id: 898, cat: TV, desc: "TV - Legit"}
+      - {id: 638, cat: TV, desc: "TV - Level3"}
+      - {id: 656, cat: TV, desc: "TV - Leverage"}
+      - {id: 618, cat: TV, desc: "TV - Lie To Me"}
+      - {id: 650, cat: TV, desc: "TV - Life"}
+      - {id: 353, cat: TV, desc: "TV - Life on Mars"}
+      - {id: 716, cat: TV, desc: "TV - Lights Out"}
+      - {id: 244, cat: TV, desc: "TV - Line Of Fire"}
+      - {id: 504, cat: TV, desc: "TV - Little Britain"}
+      - {id: 665, cat: TV, desc: "TV - Little Mosque on the Prairie"}
+      - {id: 148, cat: TV, desc: "TV - Long Island Medium"}
+      - {id: 914, cat: TV, desc: "TV - Longmire"}
+      - {id: 354, cat: TV, desc: "TV - Los Serrano"}
+      - {id: 111, cat: TV, desc: "TV - Lost"}
+      - {id: 314, cat: TV, desc: "TV - Lost Girl"}
+      - {id: 858, cat: TV, desc: "TV - Louie"}
+      - {id: 726, cat: TV, desc: "TV - Love Bites"}
+      - {id: 937, cat: TV, desc: "TV - Low Winter Sun"}
+      - {id: 956, cat: TV, desc: "TV - Lucha Underground"}
+      - {id: 980, cat: TV, desc: "TV - Lucifer"}
+      - {id: 503, cat: TV, desc: "TV - Lucky Louie"}
+      - {id: 687, cat: TV, desc: "TV - Luther"}
+      - {id: 157, cat: TV, desc: "TV - MacGyver"}
+      - {id: 705, cat: TV, desc: "TV - Mad Love"}
+      - {id: 826, cat: TV, desc: "TV - Mad Men"}
+      - {id: 869, cat: TV, desc: "TV - Made in Jersey"}
+      - {id: 355, cat: TV, desc: "TV - MADtv"}
+      - {id: 871, cat: TV, desc: "TV - Major Crimes"}
+      - {id: 667, cat: TV, desc: "TV - Make It or Break It"}
+      - {id: 357, cat: TV, desc: "TV - Malcolm In The Middle"}
+      - {id: 662, cat: TV, desc: "TV - Man vs Wild"}
+      - {id: 759, cat: TV, desc: "TV - Marvels Agents of S.H.I.E.L.D"}
+      - {id: 910, cat: TV, desc: "TV - MasterChef US"}
+      - {id: 358, cat: TV, desc: "TV - Masters Of Horror"}
+      - {id: 824, cat: TV, desc: "TV - Masters of Sex"}
+      - {id: 291, cat: TV, desc: "TV - Medium"}
+      - {id: 617, cat: TV, desc: "TV - Melrose Place"}
+      - {id: 688, cat: TV, desc: "TV - Memphis Beat"}
+      - {id: 905, cat: TV, desc: "TV - Men at Work"}
+      - {id: 645, cat: TV, desc: "TV - Men of a Certain Age"}
+      - {id: 633, cat: TV, desc: "TV - Mercy"}
+      - {id: 579, cat: TV, desc: "TV - Merlin"}
+      - {id: 359, cat: TV, desc: "TV - Miami Ink"}
+      - {id: 825, cat: TV, desc: "TV - Midsomer Murders"}
+      - {id: 783, cat: TV, desc: "TV - Mike and Molly"}
+      - {id: 823, cat: TV, desc: "TV - Mind Games"}
+      - {id: 246, cat: TV, desc: "TV - Mind of Mencia"}
+      - {id: 313, cat: TV, desc: "TV - Misfits"}
+      - {id: 842, cat: TV, desc: "TV - Missing"}
+      - {id: 647, cat: TV, desc: "TV - Mistresses US"}
+      - {id: 179, cat: TV, desc: "TV - Mixology"}
+      - {id: 632, cat: TV, desc: "TV - Modern Family"}
+      - {id: 245, cat: TV, desc: "TV - Modern Marvels"}
+      - {id: 398, cat: TV, desc: "TV - Mom"}
+      - {id: 201, cat: TV, desc: "TV - Monk"}
+      - {id: 361, cat: TV, desc: "TV - Monty Pythons Flying Circus"}
+      - {id: 907, cat: TV, desc: "TV - Motive"}
+      - {id: 247, cat: TV, desc: "TV - Mr Bean"}
+      - {id: 992, cat: TV, desc: "TV - Mr. Robot"}
+      - {id: 356, cat: TV, desc: "TV - MST3K"}
+      - {id: 292, cat: TV, desc: "TV - My Favorite Martian"}
+      - {id: 792, cat: TV, desc: "TV - My Ghost Story"}
+      - {id: 999, cat: TV, desc: "TV - My Little Pony - Friendship is Magic"}
+      - {id: 362, cat: TV, desc: "TV - My Name Is Earl"}
+      - {id: 202, cat: TV, desc: "TV - My Restaurant Rules"}
+      - {id: 193, cat: TV, desc: "TV - Mythbusters"}
+      - {id: 940, cat: TV, desc: "TV - Naked And Afraid"}
+      - {id: 203, cat: TV, desc: "TV - NASA 50 Years Of Space Exploration"}
+      - {id: 899, cat: TV, desc: "TV - Nashville"}
+      - {id: 636, cat: TV, desc: "TV - National Geographic"}
+      - {id: 120, cat: TV, desc: "TV - NCIS"}
+      - {id: 920, cat: TV, desc: "TV - Necessary Roughness"}
+      - {id: 841, cat: TV, desc: "TV - New Girl"}
+      - {id: 957, cat: TV, desc: "TV - New Japan Pro Wrestling"}
+      - {id: 311, cat: TV, desc: "TV - NewGamePlus"}
+      - {id: 363, cat: TV, desc: "TV - Night Stalker"}
+      - {id: 722, cat: TV, desc: "TV - Nikita"}
+      - {id: 293, cat: TV, desc: "TV - Nip Tuck"}
+      - {id: 710, cat: TV, desc: "TV - No Ordinary Family"}
+      - {id: 294, cat: TV, desc: "TV - Numb3rs"}
+      - {id: 689, cat: TV, desc: "TV - Nurse Jackie"}
+      - {id: 703, cat: TV, desc: "TV - Off the Map"}
+      - {id: 833, cat: TV, desc: "TV - Once Upon a Time Once"}
+      - {id: 364, cat: TV, desc: "TV - One Tree Hill"}
+      - {id: 424, cat: TV, desc: "TV - Only Fools And Horses"}
+      - {id: 935, cat: TV, desc: "TV - Orange Is The New Black"}
+      - {id: 881, cat: TV, desc: "TV - Orphan Black"}
+      - {id: 113, cat: TV, desc: "TV - Other"}
+      - {id: 365, cat: TV, desc: "TV - Out of Practice S01E"}
+      - {id: 248, cat: TV, desc: "TV - Outer Limits"}
+      - {id: 646, cat: TV, desc: "TV - Outer Space Astronauts"}
+      - {id: 336, cat: TV, desc: "TV - Outlander"}
+      - {id: 723, cat: TV, desc: "TV - Outsourced"}
+      - {id: 249, cat: TV, desc: "TV - Over There"}
+      - {id: 757, cat: TV, desc: "TV - Pan Am"}
+      - {id: 640, cat: TV, desc: "TV - Paradox"}
+      - {id: 778, cat: TV, desc: "TV - Parenthood"}
+      - {id: 613, cat: TV, desc: "TV - Parks and Recreation"}
+      - {id: 250, cat: TV, desc: "TV - Passions"}
+      - {id: 414, cat: TV, desc: "TV - PBS NOW"}
+      - {id: 690, cat: TV, desc: "TV - Penn and Teller Bullshit"}
+      - {id: 945, cat: TV, desc: "TV - Penny Dreadful"}
+      - {id: 927, cat: TV, desc: "TV - Perception"}
+      - {id: 785, cat: TV, desc: "TV - Person of Interest"}
+      - {id: 366, cat: TV, desc: "TV - Phil of the Future"}
+      - {id: 204, cat: TV, desc: "TV - Pimp My Ride"}
+      - {id: 967, cat: TV, desc: "TV - Player Attack"}
+      - {id: 427, cat: TV, desc: "TV - Poker"}
+      - {id: 691, cat: TV, desc: "TV - Pretty Little Liars"}
+      - {id: 784, cat: TV, desc: "TV - Prime Suspect US"}
+      - {id: 734, cat: TV, desc: "TV - Primeval"}
+      - {id: 229, cat: TV, desc: "TV - Prison Break"}
+      - {id: 692, cat: TV, desc: "TV - Private Practice"}
+      - {id: 368, cat: TV, desc: "TV - Project Runway"}
+      - {id: 663, cat: TV, desc: "TV - Psych"}
+      - {id: 205, cat: TV, desc: "TV - Punkd"}
+      - {id: 803, cat: TV, desc: "TV - QI"}
+      - {id: 982, cat: TV, desc: "TV - Quantico"}
+      - {id: 251, cat: TV, desc: "TV - Quantum Leap"}
+      - {id: 993, cat: TV, desc: "TV - Queen of the South"}
+      - {id: 252, cat: TV, desc: "TV - Queer as Folk"}
+      - {id: 714, cat: TV, desc: "TV - Raising Hope"}
+      - {id: 317, cat: TV, desc: "TV - Ravenswood"}
+      - {id: 936, cat: TV, desc: "TV - Ray Donovan"}
+      - {id: 594, cat: TV, desc: "TV - Ray Mears Northern Wilderness"}
+      - {id: 822, cat: TV, desc: "TV - Real Time with Bill Maher"}
+      - {id: 369, cat: TV, desc: "TV - Reba"}
+      - {id: 885, cat: TV, desc: "TV - Rectify"}
+      - {id: 206, cat: TV, desc: "TV - Red Dwarf"}
+      - {id: 906, cat: TV, desc: "TV - Red Widow"}
+      - {id: 117, cat: TV, desc: "TV - ReGenesis"}
+      - {id: 854, cat: TV, desc: "TV - Reign"}
+      - {id: 370, cat: TV, desc: "TV - Related"}
+      - {id: 327, cat: TV, desc: "TV - Remedy"}
+      - {id: 253, cat: TV, desc: "TV - Remington Steele"}
+      - {id: 254, cat: TV, desc: "TV - Reno 911"}
+      - {id: 207, cat: TV, desc: "TV - Rescue Me"}
+      - {id: 576, cat: TV, desc: "TV - Resurrection"}
+      - {id: 295, cat: TV, desc: "TV - Reunion"}
+      - {id: 208, cat: TV, desc: "TV - Revelations"}
+      - {id: 760, cat: TV, desc: "TV - Revenge"}
+      - {id: 859, cat: TV, desc: "TV - Revolution"}
+      - {id: 312, cat: TV, desc: "TV - Rewind"}
+      - {id: 768, cat: TV, desc: "TV - Ringer"}
+      - {id: 604, cat: TV, desc: "TV - Rip Off Britain"}
+      - {id: 693, cat: TV, desc: "TV - River Monsters"}
+      - {id: 929, cat: TV, desc: "TV - Rizzoli and Isles"}
+      - {id: 209, cat: TV, desc: "TV - Robot Chicken"}
+      - {id: 888, cat: TV, desc: "TV - Rogue"}
+      - {id: 944, cat: TV, desc: "TV - ROH-Wrestling"}
+      - {id: 255, cat: TV, desc: "TV - Rome"}
+      - {id: 849, cat: TV, desc: "TV - Rookie Blue"}
+      - {id: 694, cat: TV, desc: "TV - Royal Pains"}
+      - {id: 695, cat: TV, desc: "TV - Rubicon"}
+      - {id: 807, cat: TV, desc: "TV - Rules of Engagement"}
+      - {id: 372, cat: TV, desc: "TV - Ruri no Shima"}
+      - {id: 892, cat: TV, desc: "TV - Rush"}
+      - {id: 555, cat: TV, desc: "TV - Russian TV programs"}
+      - {id: 789, cat: TV, desc: "TV - Salem"}
+      - {id: 605, cat: TV, desc: "TV - Sanctuary"}
+      - {id: 776, cat: TV, desc: "TV - Satisfaction US"}
+      - {id: 373, cat: TV, desc: "TV - Saturday Night Live"}
+      - {id: 915, cat: TV, desc: "TV - Save Me"}
+      - {id: 696, cat: TV, desc: "TV - Saving Grace"}
+      - {id: 931, cat: TV, desc: "TV - Saving Hope"}
+      - {id: 844, cat: TV, desc: "TV - Scandal"}
+      - {id: 344, cat: TV, desc: "TV - Scorpion"}
+      - {id: 987, cat: TV, desc: "TV - Scream"}
+      - {id: 138, cat: TV, desc: "TV - Scrubs"}
+      - {id: 304, cat: TV, desc: "TV - Sean Saves The World"}
+      - {id: 715, cat: TV, desc: "TV - Secret Diary Of A Call Girl"}
+      - {id: 210, cat: TV, desc: "TV - Seinfeld"}
+      - {id: 296, cat: TV, desc: "TV - Sex and The City"}
+      - {id: 708, cat: TV, desc: "TV - Shameless"}
+      - {id: 375, cat: TV, desc: "TV - Sin Rastro"}
+      - {id: 737, cat: TV, desc: "TV - Single Ladies"}
+      - {id: 211, cat: TV, desc: "TV - Six Feet Under"}
+      - {id: 697, cat: TV, desc: "TV - Skins"}
+      - {id: 376, cat: TV, desc: "TV - Sleeper Cell"}
+      - {id: 112, cat: TV, desc: "TV - Sleepy Hollow"}
+      - {id: 256, cat: TV, desc: "TV - Sliders"}
+      - {id: 137, cat: TV, desc: "TV - Smallville"}
+      - {id: 830, cat: TV, desc: "TV - Smash"}
+      - {id: 649, cat: TV, desc: "TV - So You Think You Can Dance"}
+      - {id: 569, cat: TV, desc: "TV - Sons of Anarchy"}
+      - {id: 815, cat: TV, desc: "TV - Sons of Guns"}
+      - {id: 212, cat: TV, desc: "TV - South Park"}
+      - {id: 718, cat: TV, desc: "TV - Southland"}
+      - {id: 257, cat: TV, desc: "TV - Space 1999"}
+      - {id: 297, cat: TV, desc: "TV - Space Above and Beyond"}
+      - {id: 631, cat: TV, desc: "TV - Spartacus"}
+      - {id: 845, cat: TV, desc: "TV - Spike TV"}
+      - {id: 607, cat: TV, desc: "TV - Spooks"}
+      - {id: 131, cat: TV, desc: "TV - Sports Illustrated"}
+      - {id: 159, cat: TV, desc: "TV - Sports related"}
+      - {id: 378, cat: TV, desc: "TV - Stacked"}
+      - {id: 379, cat: TV, desc: "TV - Star Trek"}
+      - {id: 563, cat: TV, desc: "TV - Star Wars The Clone Wars"}
+      - {id: 615, cat: TV, desc: "TV - Star-Crossed"}
+      - {id: 139, cat: TV, desc: "TV - Star-Trek Enterprise"}
+      - {id: 144, cat: TV, desc: "TV - Star-Trek The Next Generation"}
+      - {id: 380, cat: TV, desc: "TV - Stargate"}
+      - {id: 123, cat: TV, desc: "TV - Stargate Atlantis"}
+      - {id: 124, cat: TV, desc: "TV - StarGate SG1"}
+      - {id: 562, cat: TV, desc: "TV - Stargate Universe"}
+      - {id: 258, cat: TV, desc: "TV - Starved"}
+      - {id: 213, cat: TV, desc: "TV - Stella"}
+      - {id: 614, cat: TV, desc: "TV - Steven Seagal Lawman"}
+      - {id: 381, cat: TV, desc: "TV - Still Standing"}
+      - {id: 857, cat: TV, desc: "TV - Strike Back"}
+      - {id: 528, cat: TV, desc: "TV - Studio 60 on the Sunset Strip"}
+      - {id: 838, cat: TV, desc: "TV - Suburgatory"}
+      - {id: 761, cat: TV, desc: "TV - Suits"}
+      - {id: 214, cat: TV, desc: "TV - Summerland"}
+      - {id: 400, cat: TV, desc: "TV - Super Fun Night"}
+      - {id: 298, cat: TV, desc: "TV - Supernatural"}
+      - {id: 299, cat: TV, desc: "TV - Surface"}
+      - {id: 382, cat: TV, desc: "TV - Survivor"}
+      - {id: 215, cat: TV, desc: "TV - Survivors"}
+      - {id: 847, cat: TV, desc: "TV - Swamp People"}
+      - {id: 863, cat: TV, desc: "TV - Switched at Birth"}
+      - {id: 153, cat: TV, desc: "TV - Tattoo Nightmares"}
+      - {id: 217, cat: TV, desc: "TV - Teen Titans"}
+      - {id: 731, cat: TV, desc: "TV - Teen Wolf"}
+      - {id: 764, cat: TV, desc: "TV - Terra Nova"}
+      - {id: 119, cat: TV, desc: "TV - That 70s Show"}
+      - {id: 316, cat: TV, desc: "TV - The 100"}
+      - {id: 168, cat: TV, desc: "TV - The 4400"}
+      - {id: 300, cat: TV, desc: "TV - The Adventures of Sherlock Holmes"}
+      - {id: 185, cat: TV, desc: "TV - The After"}
+      - {id: 383, cat: TV, desc: "TV - The Amazing Race"}
+      - {id: 887, cat: TV, desc: "TV - The Americans"}
+      - {id: 301, cat: TV, desc: "TV - The Apprentice"}
+      - {id: 384, cat: TV, desc: "TV - The Bernie Mac Show"}
+      - {id: 583, cat: TV, desc: "TV - The Big Bang Theory"}
+      - {id: 829, cat: TV, desc: "TV - The Big C"}
+      - {id: 572, cat: TV, desc: "TV - The Biggest Loser"}
+      - {id: 581, cat: TV, desc: "TV - The Blacklist"}
+      - {id: 410, cat: TV, desc: "TV - The Boondocks"}
+      - {id: 608, cat: TV, desc: "TV - The Border"}
+      - {id: 775, cat: TV, desc: "TV - The Borgias"}
+      - {id: 923, cat: TV, desc: "TV - The Bridge US"}
+      - {id: 711, cat: TV, desc: "TV - The Cape"}
+      - {id: 730, cat: TV, desc: "TV - The Carrie Diaries"}
+      - {id: 586, cat: TV, desc: "TV - The Cleveland Show"}
+      - {id: 896, cat: TV, desc: "TV - The Client List"}
+      - {id: 218, cat: TV, desc: "TV - The Closer"}
+      - {id: 272, cat: TV, desc: "TV - The Colbert Report"}
+      - {id: 219, cat: TV, desc: "TV - The Comeback"}
+      - {id: 510, cat: TV, desc: "TV - The Contender"}
+      - {id: 758, cat: TV, desc: "TV - The Crazy Ones"}
+      - {id: 114, cat: TV, desc: "TV - The Daily Show"}
+      - {id: 856, cat: TV, desc: "TV - The Dead Files"}
+      - {id: 220, cat: TV, desc: "TV - The Dead Zone"}
+      - {id: 189, cat: TV, desc: "TV - The Divide"}
+      - {id: 386, cat: TV, desc: "TV - The Dog Whisperer"}
+      - {id: 702, cat: TV, desc: "TV - The Event"}
+      - {id: 610, cat: TV, desc: "TV - The F Word"}
+      - {id: 639, cat: TV, desc: "TV - The Family"}
+      - {id: 835, cat: TV, desc: "TV - The Finder"}
+      - {id: 834, cat: TV, desc: "TV - The Firm"}
+      - {id: 973, cat: TV, desc: "TV - The Flash"}
+      - {id: 877, cat: TV, desc: "TV - The Following"}
+      - {id: 635, cat: TV, desc: "TV - The Forgotten"}
+      - {id: 932, cat: TV, desc: "TV - The Fosters"}
+      - {id: 816, cat: TV, desc: "TV - The Game"}
+      - {id: 766, cat: TV, desc: "TV - The Gates"}
+      - {id: 259, cat: TV, desc: "TV - The Girls Next Door"}
+      - {id: 740, cat: TV, desc: "TV - The Glades"}
+      - {id: 587, cat: TV, desc: "TV - The Goldbergs"}
+      - {id: 648, cat: TV, desc: "TV - The Good Wife"}
+      - {id: 912, cat: TV, desc: "TV - The Goodwin Games"}
+      - {id: 278, cat: TV, desc: "TV - The Haunting Of"}
+      - {id: 903, cat: TV, desc: "TV - The Hero"}
+      - {id: 655, cat: TV, desc: "TV - The Hills"}
+      - {id: 221, cat: TV, desc: "TV - The Inside"}
+      - {id: 595, cat: TV, desc: "TV - The Jeff Dunham Show"}
+      - {id: 387, cat: TV, desc: "TV - The Jetsons"}
+      - {id: 827, cat: TV, desc: "TV - The Killing"}
+      - {id: 388, cat: TV, desc: "TV - The King Of Queens"}
+      - {id: 321, cat: TV, desc: "TV - The Knick"}
+      - {id: 271, cat: TV, desc: "TV - The L Word"}
+      - {id: 609, cat: TV, desc: "TV - The League"}
+      - {id: 897, cat: TV, desc: "TV - The Leftovers"}
+      - {id: 808, cat: TV, desc: "TV - The Life and Times of Tim"}
+      - {id: 924, cat: TV, desc: "TV - The Listener"}
+      - {id: 222, cat: TV, desc: "TV - The Lone Gunmen"}
+      - {id: 152, cat: TV, desc: "TV - The Lost World"}
+      - {id: 643, cat: TV, desc: "TV - The Mentalist"}
+      - {id: 878, cat: TV, desc: "TV - The Michael J Fox"}
+      - {id: 630, cat: TV, desc: "TV - The Middle"}
+      - {id: 405, cat: TV, desc: "TV - The Millers"}
+      - {id: 901, cat: TV, desc: "TV - The Mindy Project"}
+      - {id: 860, cat: TV, desc: "TV - The Mob Doctor"}
+      - {id: 870, cat: TV, desc: "TV - The Musketeers"}
+      - {id: 239, cat: TV, desc: "TV - The Mysteries Of Laura"}
+      - {id: 938, cat: TV, desc: "TV - The Newsroom"}
+      - {id: 109, cat: TV, desc: "TV - The O.C."}
+      - {id: 308, cat: TV, desc: "TV - The Office"}
+      - {id: 319, cat: TV, desc: "TV - The Originals"}
+      - {id: 392, cat: TV, desc: "TV - The Others"}
+      - {id: 390, cat: TV, desc: "TV - The O`Reilly Factor"}
+      - {id: 698, cat: TV, desc: "TV - The Pacific"}
+      - {id: 302, cat: TV, desc: "TV - The PJs"}
+      - {id: 567, cat: TV, desc: "TV - The Practice"}
+      - {id: 260, cat: TV, desc: "TV - The Real World"}
+      - {id: 176, cat: TV, desc: "TV - The Red Road"}
+      - {id: 597, cat: TV, desc: "TV - The Replacements"}
+      - {id: 664, cat: TV, desc: "TV - The Sci Fi Guys"}
+      - {id: 393, cat: TV, desc: "TV - The Secret Adventures of Jules Verne"}
+      - {id: 786, cat: TV, desc: "TV - The Secret Circle"}
+      - {id: 668, cat: TV, desc: "TV - The Secret Life of the American Teenager"}
+      - {id: 735, cat: TV, desc: "TV - The Shadow Line"}
+      - {id: 223, cat: TV, desc: "TV - The Shield"}
+      - {id: 125, cat: TV, desc: "TV - The Simpsons"}
+      - {id: 423, cat: TV, desc: "TV - The Sopranos"}
+      - {id: 333, cat: TV, desc: "TV - The Strain"}
+      - {id: 236, cat: TV, desc: "TV - The Tomorrow People US"}
+      - {id: 699, cat: TV, desc: "TV - The Tudors"}
+      - {id: 611, cat: TV, desc: "TV - The Ultimate Fighter"}
+      - {id: 320, cat: TV, desc: "TV - The Unexplained Files"}
+      - {id: 721, cat: TV, desc: "TV - The Vampire Diaries"}
+      - {id: 654, cat: TV, desc: "TV - The Venture Bros"}
+      - {id: 725, cat: TV, desc: "TV - The Voice"}
+      - {id: 720, cat: TV, desc: "TV - The Walking Dead"}
+      - {id: 394, cat: TV, desc: "TV - The War At Home"}
+      - {id: 116, cat: TV, desc: "TV - The West Wing"}
+      - {id: 577, cat: TV, desc: "TV - The X Factor"}
+      - {id: 425, cat: TV, desc: "TV - Thief"}
+      - {id: 268, cat: TV, desc: "TV - Threshold"}
+      - {id: 796, cat: TV, desc: "TV - Thundercats"}
+      - {id: 216, cat: TV, desc: "TV - TLC Connections"}
+      - {id: 904, cat: TV, desc: "TV - TNA-Wrestling"}
+      - {id: 399, cat: TV, desc: "TV - Tonight Show With Jay Leno"}
+      - {id: 616, cat: TV, desc: "TV - Top Chef"}
+      - {id: 224, cat: TV, desc: "TV - Top Gear"}
+      - {id: 942, cat: TV, desc: "TV - Top Shot"}
+      - {id: 762, cat: TV, desc: "TV - Torchwood"}
+      - {id: 836, cat: TV, desc: "TV - Touch"}
+      - {id: 225, cat: TV, desc: "TV - Trailer Park Boys"}
+      - {id: 1001, cat: TV, desc: "TV - Transformers Prime"}
+      - {id: 733, cat: TV, desc: "TV - Treme"}
+      - {id: 303, cat: TV, desc: "TV - Tripping the Rift"}
+      - {id: 787, cat: TV, desc: "TV - Trophy Wife"}
+      - {id: 565, cat: TV, desc: "TV - True Blood"}
+      - {id: 180, cat: TV, desc: "TV - True Detective"}
+      - {id: 727, cat: TV, desc: "TV - Turn"}
+      - {id: 261, cat: TV, desc: "TV - Twin Peaks"}
+      - {id: 930, cat: TV, desc: "TV - Twisted"}
+      - {id: 401, cat: TV, desc: "TV - Two And A Half Men"}
+      - {id: 337, cat: TV, desc: "TV - Tyrant"}
+      - {id: 793, cat: TV, desc: "TV - UFC"}
+      - {id: 814, cat: TV, desc: "TV - Ugly Americans"}
+      - {id: 559, cat: TV, desc: "TV - Ugly Betty"}
+      - {id: 155, cat: TV, desc: "TV - UK"}
+      - {id: 934, cat: TV, desc: "TV - Under the Dome"}
+      - {id: 791, cat: TV, desc: "TV - Underbelly"}
+      - {id: 706, cat: TV, desc: "TV - Undercover Boss"}
+      - {id: 777, cat: TV, desc: "TV - Unforgettable"}
+      - {id: 129, cat: TV, desc: "TV - Unscripted"}
+      - {id: 739, cat: TV, desc: "TV - Unsealed Alien Files"}
+      - {id: 226, cat: TV, desc: "TV - Unsolved Mysteries"}
+      - {id: 868, cat: TV, desc: "TV - Up All Night"}
+      - {id: 262, cat: TV, desc: "TV - Urgences"}
+      - {id: 566, cat: TV, desc: "TV - V"}
+      - {id: 895, cat: TV, desc: "TV - Veep"}
+      - {id: 864, cat: TV, desc: "TV - Vegas"}
+      - {id: 121, cat: TV, desc: "TV - Veronica Mars"}
+      - {id: 908, cat: TV, desc: "TV - Vice"}
+      - {id: 402, cat: TV, desc: "TV - Viewtiful Joe"}
+      - {id: 799, cat: TV, desc: "TV - Vikings"}
+      - {id: 227, cat: TV, desc: "TV - Viva La Bam"}
+      - {id: 263, cat: TV, desc: "TV - Wanted"}
+      - {id: 593, cat: TV, desc: "TV - Warehouse 13"}
+      - {id: 995, cat: TV, desc: "TV - Wayward Pines"}
+      - {id: 264, cat: TV, desc: "TV - Weeds"}
+      - {id: 404, cat: TV, desc: "TV - Weird U S"}
+      - {id: 909, cat: TV, desc: "TV - Wentworth"}
+      - {id: 596, cat: TV, desc: "TV - When Ghosts Attack"}
+      - {id: 575, cat: TV, desc: "TV - White Collar"}
+      - {id: 406, cat: TV, desc: "TV - Whose Line Is It Anyway"}
+      - {id: 918, cat: TV, desc: "TV - Wilfred US"}
+      - {id: 135, cat: TV, desc: "TV - Will And Grace"}
+      - {id: 673, cat: TV, desc: "TV - Witches of East End"}
+      - {id: 408, cat: TV, desc: "TV - Without A Trace"}
+      - {id: 800, cat: TV, desc: "TV - Workaholics"}
+      - {id: 127, cat: TV, desc: "TV - WWE - Wrestling"}
+      - {id: 228, cat: TV, desc: "TV - X Files"}
+      - {id: 770, cat: TV, desc: "TV - X-Men"}
+      - {id: 265, cat: TV, desc: "TV - Young and the Restless"}
+      - {id: 801, cat: TV, desc: "TV - Young Justice"}
+      - {id: 889, cat: TV, desc: "TV - Zero Hour US"}
+      - {id: 1025, cat: TV, desc: "TV - HEVC/x265"}
+      - {id: 1026, cat: TV, desc: "TV - Divx/Xvid"}
+      - {id: 1027, cat: TV, desc: "TV - DVD"}
+      - {id: 1028, cat: TV, desc: "TV/HD - HD"}
+      - {id: 1029, cat: TV, desc: "TV - SVCD/VCD"}
+
+      #Apps
+      - {id: 7, cat: PC, desc: "Software"}
+      - {id: 416, cat: PC/Phone-Other, desc: "Software - Mobile"}
+      - {id: 532, cat: PC, desc: "Software - KeyGen / Tools"}
+      - {id: 17, cat: PC, desc: "Software - Linux"}
+      - {id: 27, cat: PC/Mac, desc: "Software - Mac"}
+      - {id: 232, cat: PC/Phone-Other, desc: "Software - Mobile phones"}
+      - {id: 18, cat: PC, desc: "Software - Other operating systems"}
+      - {id: 19, cat: PC, desc: "Software - Palm, PocketPC and IPAQ"}
+      - {id: 20, cat: PC, desc: "Software - Windows - CD/DVD Tools"}
+      - {id: 25, cat: PC, desc: "Software - Windows - Other"}
+      - {id: 21, cat: PC, desc: "Software - Windows - Photo Editing"}
+      - {id: 22, cat: PC, desc: "Software - Windows - Security"}
+      - {id: 23, cat: PC, desc: "Software - Windows - Sound Editing"}
+      - {id: 24, cat: PC, desc: "Software - Windows - Video Apps"}
+
+      #Games
+      - {id: 3, cat: PC/Games, desc: "Games"}
+      - {id: 136, cat: PC/Games, desc: "Games - fixes/patches"}
+      - {id: 422, cat: PC/Games, desc: "Games - Other"}
+      - {id: 26, cat: PC/Games, desc: "Games - Mac"}
+      - {id: 231, cat: Console, desc: "Games - Mobile phones"}
+      - {id: 627, cat: Console/NDS, desc: "Games - Nintendo DS"}
+      - {id: 11, cat: Console, desc: "Games - PS 2"}
+      - {id: 700, cat: Console/PS3, desc: "Games - PS 3"}
+      - {id: 12, cat: Console, desc: "Games - PS X"}
+      - {id: 158, cat: Console/PSP, desc: "Games - PSP"}
+      - {id: 13, cat: Console, desc: "Games - ROMS/Retro"}
+      - {id: 15, cat: Console, desc: "Games - Sega Saturn"}
+      - {id: 14, cat: PC/Games, desc: "Games - Video Demonstrations"}
+      - {id: 701, cat: Console/Wii, desc: "Games -Wii"}
+      - {id: 421, cat: PC/Games, desc: "Games - Windows"}
+      - {id: 10, cat: PC/Games, desc: "Games - Windows Kids Games"}
+      - {id: 16, cat: Console/Xbox, desc: "Games - XBox"}
+      - {id: 1017, cat: Console, desc: "Games - PS 1"}
+      - {id: 1018, cat: Console/Xbox 360, desc: "Games - Xbox 360"}
+      - {id: 1014, cat: Console/3DS, desc: "Games - Nintendo 3DS"}
+      - {id: 1015, cat: Console, desc: "Games - Dreamcast"}
+      - {id: 1016, cat: Console, desc: "Games - GameCube"}
+
+      #XXX
+      - {id: 533, cat: XXX, desc: "XXX"}
+      - {id: 943, cat: XXX, desc: "XXX - Animation/Hentai"}
+      - {id: 553, cat: XXX/DVD, desc: "XXX - DVD"}
+      - {id: 536, cat: XXX, desc: "XXX - Games"}
+      - {id: 948, cat: XXX/x264, desc: "XXX - HD Video"}
+      - {id: 535, cat: XXX/Imageset, desc: "XXX - Pictures"}
+      - {id: 552, cat: XXX, desc: "XXX - Video"}
+      - {id: 804, cat: XXX, desc: "XXX - Video 3D"}
+      - {id: 970, cat: XXX, desc: "XXX - Virtual Reality"}
+      - {id: 806, cat: XXX, desc: "XXX - Wallpapers"}
+
+      #Books
+      - {id: 2, cat: Books, desc: "Books"}
+      - {id: 625, cat: Books, desc: "Books - Adventure"}
+      - {id: 51, cat: Books, desc: "Books - Audio books"}
+      - {id: 848, cat: Books/Comics, desc: "Books - Comics"}
+      - {id: 624, cat: Books, desc: "Books - Crime"}
+      - {id: 623, cat: Books, desc: "Books - Drama"}
+      - {id: 50, cat: Books/Ebook, desc: "Books - Ebooks"}
+      - {id: 621, cat: Books, desc: "Books - Educational"}
+      - {id: 622, cat: Books, desc: "Books - Horror"}
+      - {id: 465, cat: Books/Magazines, desc: "Books - Magazines"}
+      - {id: 1000, cat: Books, desc: "Books - Sexual Fitness and Education"}
+      - {id: 626, cat: Books, desc: "Books - True Stories"}
+
+      #Other
+      - {id: 6, cat: Other, desc: "Pictures"}
+      - {id: 9, cat: Other, desc: "Other"}
+      - {id: 53, cat: Other, desc: "Pictures - Other"}
+      - {id: 52, cat: Other, desc: "Wallpapers"}
+      - {id: 80, cat: Other, desc: "Other - Articles"}
+      - {id: 143, cat: Other, desc: "Other - Comics"}
+      - {id: 85, cat: Other, desc: "Other - Funny clips"}
+      - {id: 81, cat: Other, desc: "Other - Manuals"}
+      - {id: 83, cat: Other, desc: "Other - Other"}
+      - {id: 413, cat: Other, desc: "Other - Radio shows"}
+      - {id: 82, cat: Other, desc: "Other - Religion"}
+      - {id: 874, cat: Other, desc: "Other - Subtitles"}
+      - {id: 557, cat: Other, desc: "Other - Training "}
+      - {id: 1021, cat: Other, desc: "Other - Tutorials"}
+      - {id: 1022, cat: Other, desc: "Other - Sounds"}
+      - {id: 1023, cat: Other, desc: "Other - Nulled Scripts"}
+
+      #Mobile
+      - {id: 752, cat: PC/Phone-Other, desc: "Mobile - Games for Android"}
+      - {id: 746, cat: PC/Phone-Other, desc: "Mobile - Games for Apple iPod, iPod Touch, iPad, iPhone"}
+      - {id: 745, cat: PC/Phone-Other, desc: "Mobile - Games for Java"}
+      - {id: 744, cat: PC/Phone-Other, desc: "Mobile - Games for Symbian"}
+      - {id: 743, cat: PC/Phone-Other, desc: "Mobile - Games for Windows Mobile"}
+      - {id: 517, cat: PC/Phone-Other, desc: "Mobile - Music"}
+      - {id: 554, cat: PC/Phone-Other, desc: "Mobile - Other"}
+      - {id: 748, cat: PC/Phone-Other, desc: "Mobile - Software - Other"}
+      - {id: 972, cat: PC/Phone-Other, desc: "Mobile - Software for Android"}
+      - {id: 749, cat: PC/Phone-Other, desc: "Mobile - Software for Apple iPad, iPhone, iPod Touch"}
+      - {id: 747, cat: PC/Phone-Other, desc: "Mobile - Software for Windows Mobile"}
+      - {id: 428, cat: PC/Phone-Other, desc: "Mobile - Tv"}
+      - {id: 417, cat: PC/Phone-Other, desc: "Mobile - Video"}
+      - {id: 750, cat: PC/Phone-Other, desc: "Mobile - Video for Apple iPad, iPhone, iPod Touch"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  search:
+    paths:
+      - path: "{{if .Keywords}}search/?search={{ .Keywords}}{{else}}{{end}}"
+    rows:
+      selector: tr[class^="tl"]
+    fields:
+      title:
+        selector: td.tli a
+      category:
+        selector:  td a[href^="/category/"]
+        attribute: href
+        filters:
+          - name: split
+            args: ["/", 2]
+      details:
+        selector: td.tli a
+        attribute: href
+      download:
+        selector: td a[href^="magnet:?xt="]
+        attribute: href
+      date:
+        selector: td:nth-last-of-type(5)
+        filters:
+          - name: timeago
+      size:
+        selector: td:nth-last-of-type(4)
+      seeders:
+        text: 0
+      leechers:
+        text: 0
+      seeders:
+        optional: true
+        selector: td.sy
+      leechers:
+        optional: true
+        selector: td.ly
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
--- a/src/Jackett.Common/Definitions/femdomcult.yml
+++ b/src/Jackett.Common/Definitions/femdomcult.yml
@@ -0,0 +1,114 @@
+# Femdomcult uses the Luminance code, which is based on gazelle
+# ajax.php API additionally needs the auth=$authkey argument
+# Because the API is e.g. missing banner images we use screen scraping instead of the generic gazelle based approach
+---
+  site: femdomcult
+  name: Femdomcult
+  description: "A porn tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://femdomcult.org/
+
+  caps:
+    categorymappings:
+      - {id: 58, cat: XXX, desc: "Amateur/Mainstream"}
+      - {id: 60, cat: XXX, desc: "Anime Comics"}
+      - {id: 73, cat: XXX, desc: "Asian Femdom"}
+      - {id: 61, cat: XXX, desc: "Audio"}
+      - {id: 59, cat: XXX, desc: "Femdom"}
+      - {id: 62, cat: XXX, desc: "Femdom Vip"}
+      - {id: 63, cat: XXX, desc: "Fetish"}
+      - {id: 68, cat: XXX, desc: "Fetish Vip"}
+      - {id: 64, cat: XXX, desc: "Gts-Vore-Crush"}
+      - {id: 72, cat: XXX, desc: "Images"}
+      - {id: 69, cat: XXX, desc: "Lezdom"}
+      - {id: 70, cat: XXX, desc: "Pov"}
+      - {id: 65, cat: XXX, desc: "Scat"}
+      - {id: 71, cat: XXX, desc: "Strapon"}
+      - {id: 66, cat: XXX, desc: "Transdom"}
+
+    modes:
+      search: [q]
+      tv-search: [q]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      cinfo: "2550|1350|24|-60"
+      keeploggedin: 1
+    error:
+      - selector: form#loginform > span.warning
+    test:
+      path: torrents.php
+      selector: "#nav_userinfo"
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      title: "{{ .Query.Keywords }}"
+      order_by: time
+      order_way: desc
+      action: basic
+      searchsubmit: 1
+    rows:
+      # exclude redbar torrents
+      selector: table#torrent_table > tbody > tr[class^="torrent row"]
+    fields:
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.tags
+      title:
+        selector: a[href^="torrents.php?id="]
+      category:
+        selector: a[href*="filter_cat"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\[(\\d+?)\\]"
+      details:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      banner:
+        selector: td:nth-child(2) > script
+        filters:
+          - name: regexp
+            args: "src=(.*?)>"
+          - name: re_replace
+            args: ["\\\\(.)", "$1"]
+          - name: replace
+            args: ["/static/common/noartwork/noimage.png", ""]
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(5) > span
+        attribute: title
+        filters:
+          - name: append
+            args: " +00:00"
+          - name: dateparse
+            args: "Jan 02 2006, 15:04 -07:00"
+      size:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          "img[alt=\"Freeleech\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
--- a/src/Jackett.Common/Definitions/freedomhd.yml
+++ b/src/Jackett.Common/Definitions/freedomhd.yml
@@ -87,6 +87,7 @@
      - selector: div.myFrame:has(font.error)
    test:
      path: torrents-search.php
+      selector: a.logout

  search:
    paths:
--- a/src/Jackett.Common/Definitions/frozenlayer.yml
+++ b/src/Jackett.Common/Definitions/frozenlayer.yml
@@ -7,7 +7,9 @@
  encoding: UTF-8
  links:
    - https://www.frozen-layer.com/
-    
+  certificates:
+    - 001bc21dd13b54b05106b510a327a7182ec443a4
+
  settings:
    - name: category
      type: select
@@ -45,11 +47,41 @@
    paths:
      - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar{{else}}descargas{{end}}"
      - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&page=2{{else}}descargas{{end}}"
+    keywordsfilters:
+      - name: re_replace #remove S/EXX from search string
+        args: ["(S1)", ""]
+      - name: re_replace #remove S/EXX from search string
+        args: ["(S2)", "segunda temporada"]
+      - name: re_replace #remove S/EXX from search string
+        args: ["(S3)", "tercera temporada"]
+      - name: re_replace #remove S/EXX from search string
+        args: ["E([0-9]+)", "$1"]
    rows:
      selector: table#descargas > tbody > tr:has(td:has(a[href^="magnet:?"]))
    fields:
      title:
        selector: td.tit a
+        filters:
+          - name: re_replace
+            args: ["\\/", " "]
+          - name: re_replace
+            args: ["\\(", ""]
+          - name: re_replace
+            args: ["\\)", ""]
+          - name: re_replace
+            args: ["([A-z]*) temporada", ""]
+          - name: re_replace
+            args: ["S[pP]rimera", ""]
+          - name: re_replace
+            args: ["S[sS]egunda", ""]
+          - name: re_replace
+            args: ["S[tT]ercera", ""]
+          - name: re_replace
+            args: ["S([0-9]+) - Episodio ([0-9]+)", "$2"]
+          - name: re_replace
+            args: ["- Episodio ([0-9]*)", "$1"]
+          - name: append
+            args: " [spanish]"
      details:
        selector: td.tit a
        attribute: href
--- a/src/Jackett.Common/Definitions/gay-torrentsorg.yml
+++ b/src/Jackett.Common/Definitions/gay-torrentsorg.yml
@@ -0,0 +1,151 @@
+---
+  # By LA5T for https://gay-torrents.org (29.07.2018 22:55 UTC+2)
+  #
+  site: gay-torrentsorg
+  name: gay-torrents.org
+  description: "Tracker for GAY XXX, movies, TV, books and PC."
+  language: en-us
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://gay-torrents.org
+    - https://gay-area.org/
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: active
+      type: select
+      label: Status
+      default: 0
+      options:
+        0: "Active and Inactive"
+        1: Active
+        2: Inactive
+    - name: info_categories
+      type: info
+      label: "Hidden categories"
+      default: "Results for categories hidden in profile will not be visible."
+    - name: info_results
+      type: info
+      label: "Search results"
+      default: "You can increase the number of search results in your profile.<br />Default is 15."
+
+  caps:
+    categorymappings:
+      - {id: 15, cat: XXX, desc: "Amateur"}
+      - {id: 16, cat: XXX, desc: "Anal"}
+      - {id: 42, cat: XXX, desc: "Animation"}
+      - {id: 18, cat: XXX, desc: "Asian"}
+      - {id: 19, cat: XXX, desc: "Bareback"}
+      - {id: 20, cat: XXX, desc: "Bears"}
+      - {id: 22, cat: XXX, desc: "Bisexual"}
+      - {id: 21, cat: XXX, desc: "Black"}
+      - {id: 23, cat: XXX, desc: "Chubs"}
+      - {id: 25, cat: XXX, desc: "Cross Generation"}
+      - {id: 51, cat: XXX, desc: "Doctor/Medical"}
+      - {id: 27, cat: XXX, desc: "Fetish"}
+      - {id: 28, cat: XXX, desc: "Group Sex"}
+      - {id: 30, cat: XXX, desc: "Hunks"}
+      - {id: 52, cat: XXX, desc: "Interracial"}
+      - {id: 68, cat: XXX, desc: "Homo Erotic"}
+      - {id: 68, cat: Movies, desc: "Homo Erotic"}
+      - {id: 68, cat: TV, desc: "Homo Erotic"}
+      - {id: 68, cat: Other, desc: "Homo Erotic"}
+      - {id: 32, cat: XXX, desc: "Latino"}
+      - {id: 50, cat: XXX, desc: "Middle Eastern"}
+      - {id: 33, cat: XXX, desc: "Military"}
+      - {id: 34, cat: XXX, desc: "Oral-Sex"}
+      - {id: 40, cat: Other, desc: "Other"}
+      - {id: 35, cat: XXX, desc: "Solo"}
+      - {id: 36, cat: XXX, desc: "Transsexual"}
+      - {id: 37, cat: XXX, desc: "Twinks"}
+      - {id: 38, cat: XXX, desc: "Vintage"}
+      - {id: 39, cat: XXX, desc: "Wrestling"}
+      - {id: 17, cat: PC, desc: "Applications"}
+      - {id: 31, cat: XXX/Imageset, desc: "Images"}
+      - {id: 49, cat: Books, desc: "Books"}
+      - {id: 41, cat: Movies, desc: "Non-Porn"}
+      - {id: 41, cat: TV, desc: "Non-Porn"}
+      - {id: 41, cat: Other, desc: "Non-Porn"}
+    modes:
+      search: [q]
+
+  login:
+    method: post
+    path: login.php
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: div.fixed_width:nth-child(4) > span:contains("Incorrect")
+    test:
+      path: usercp.php
+
+  search:
+    paths:
+      - path: torrents_beta.php
+        method: get
+    inputs:
+      $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      active: "{{ .Config.active }}"
+    rows:
+      selector: div.torrent
+    fields:
+      title:
+        selector: div:nth-child(2) > div:nth-child(1) > a:nth-child(1)
+      category:
+        selector: a[href^="torrents_beta.php?category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      banner:
+        optional: true
+        selector: a.screenshot
+        attribute: rel  
+      grabs:
+        selector: div.downloadTimes
+        filters:
+          - name: replace
+            args: ["No downloads yet", "0"]
+          - name: regexp
+            args: ([\d,]+)
+      comments:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      size:
+        selector: div.size
+      seeders:
+        selector: div.downloadPeers div:nth-child(1) > a
+      leechers:
+        selector: div.downloadPeers > div:nth-child(2) > a
+      date:
+        selector: div.date
+        filters:
+          - name: re_replace
+            args: ["on (\\d{2}:\\d{2}) (\\d{2})-([a-zA-Z]{3})-(\\d{4})", "$2 $3 $4 $1"]
+          - name: append
+            args: " +01:00"
+          - name: dateparse
+            args: "02 Jan 2006 15:04 -07:00"
+      downloadvolumefactor:
+        case:
+          "div:nth-child(2) > div:nth-child(3) > a:contains(\"FREE!\")": 0
+          "div:nth-child(2) > div:nth-child(3) > a:contains(\"-50%\")": 0.5
+          "div:nth-child(2) > div:nth-child(3) > a:contains(\"-25%\")": 0.25
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1
--- a/src/Jackett.Common/Definitions/gaytorrentru.yml
+++ b/src/Jackett.Common/Definitions/gaytorrentru.yml
@@ -1,52 +1,80 @@
+---
+  # Update by LA5T based on the orignial 'gaytorrentru.yml'
+  # 29.07.2018 23:02 UTC+2
+  #
  site: gaytorrentru
-  name: GayTorrent.ru
-  description: "World largest gay porn library for free with a stunning forum and 24/7 Chat"
+  name: GAYtorrent.ru
+  description: "World largest gay porn library for free with a stunning forum and 24/7 chat."
  language: en-us
  type: private
  encoding: UTF-8
  links:
    - https://www.gaytorrent.ru/

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: incldead
+      type: select
+      label: Status
+      default: 1
+      options:
+        0: Active
+        1: "Active and Inactive"
+        2: Inactive
+    - name: info
+      type: info
+      label: "Hidden categories"
+      default: "For results in the following categories you must edit your profile.<br />- Straight<br />- Bisexual<br />- Scat"
+
  caps:
    categorymappings:
-     - {id: 62 , cat: XXX , desc: "Amateur"}
-     - {id: 29 , cat: XXX , desc: "Anal"}
-     - {id: 46 , cat: XXX , desc: "Anime Games"}
-     - {id: 30 , cat: XXX , desc: "Asian"}
-     - {id: 43 , cat: XXX , desc: "Bareback"}
-     - {id: 19 , cat: XXX , desc: "BDSM"}
-     - {id: 17 , cat: XXX , desc: "Bears"}
-     - {id: 44 , cat: XXX , desc: "Black"}
-     - {id: 50 , cat: Books , desc: "Books & Magazines"}
-     - {id: 9 , cat: XXX , desc: "Chubbies"}
-     - {id: 7 , cat: XXX , desc: "Clips"}
-     - {id: 48 , cat: Books/Comics  , desc: "Comic & Yaoi"}
-     - {id: 5 , cat: XXX , desc: "Daddies / Sons"}
-     - {id: 34 , cat: XXX , desc: "Fetish"}
-     - {id: 27 , cat: XXX , desc: "Grey / Older"}
-     - {id: 32 , cat: XXX , desc: "Group-Sex"}
-     - {id: 63 , cat: XXX , desc: "Homemade"}
-     - {id: 12 , cat: XXX , desc: "Hunks"}
-     - {id: 33 , cat: XXX , desc: "Images"}
-     - {id: 53 , cat: XXX , desc: "Interracial"}
-     - {id: 57 , cat: XXX , desc: "Jocks"}
-     - {id: 35 , cat: XXX , desc: "Latino"}
-     - {id: 36 , cat: XXX , desc: "Mature"}
-     - {id: 58 , cat: PC , desc: "Media Programs"}
-     - {id: 37 , cat: XXX , desc: "Member"}
-     - {id: 54 , cat: XXX , desc: "Middle Eastern"}
-     - {id: 38 , cat: XXX , desc: "Military"}
-     - {id: 39 , cat: XXX , desc: "Oral-Sex"}
-     - {id: 47 , cat: XXX , desc: "Shemale"}
-     - {id: 56 , cat: XXX , desc: "Softcore"}
-     - {id: 40 , cat: XXX , desc: "Solo"}
-     - {id: 45 , cat: Movies , desc: "Themed Movie"}
-     - {id: 1 , cat: TV , desc: "TV / Episodes"}
-     - {id: 41 , cat: XXX , desc: "Twinks"}
-     - {id: 42 , cat: XXX , desc: "Vintage"}
-     - {id: 51 , cat: XXX , desc: "Voyeur"}
-     - {id: 65 , cat: XXX , desc: "Wrestling and Sports"}
-     - {id: 28 , cat: XXX , desc: "Youngblood"}
+      - {id: 62, cat: XXX, desc: "Amateur"}
+      - {id: 29, cat: XXX, desc: "Anal"}
+      - {id: 46, cat: XXX, desc: "Anime Games"}
+      - {id: 30, cat: XXX, desc: "Asian"}
+      - {id: 43, cat: XXX, desc: "Bareback"}
+      - {id: 19, cat: XXX, desc: "BDSM"}
+      - {id: 17, cat: XXX, desc: "Bears"}
+      - {id: 44, cat: XXX, desc: "Black"}
+      - {id: 50, cat: Books, desc: "Books & Magazines"}
+      - {id: 9, cat: XXX, desc: "Chubbies"}
+      - {id: 7, cat: XXX, desc: "Clips"}
+      - {id: 48, cat: Books/Comics, desc: "Comic & Yaoi"}
+      - {id: 5, cat: XXX, desc: "Daddies / Sons"}
+      - {id: 34, cat: XXX, desc: "Fetish"}
+      - {id: 27, cat: XXX, desc: "Grey / Older"}
+      - {id: 32, cat: XXX, desc: "Group-Sex"}
+      - {id: 63, cat: XXX, desc: "Homemade"}
+      - {id: 12, cat: XXX, desc: "Hunks"}
+      - {id: 33, cat: XXX/Imageset, desc: "Images"}
+      - {id: 53, cat: XXX, desc: "Interracial"}
+      - {id: 57, cat: XXX, desc: "Jocks"}
+      - {id: 35, cat: XXX, desc: "Latino"}
+      - {id: 36, cat: XXX, desc: "Mature"}
+      - {id: 58, cat: PC, desc: "Media Programs"}
+      - {id: 37, cat: XXX, desc: "Member"}
+      - {id: 54, cat: XXX, desc: "Middle Eastern"}
+      - {id: 38, cat: XXX, desc: "Military"}
+      - {id: 39, cat: XXX, desc: "Oral-Sex"}
+      - {id: 47, cat: XXX, desc: "Shemale"}
+      - {id: 56, cat: XXX, desc: "Softcore"}
+      - {id: 40, cat: XXX, desc: "Solo"}
+      - {id: 45, cat: Movies, desc: "Themed Movie"}
+      - {id: 1, cat: TV, desc: "TV / Episodes"}
+      - {id: 41, cat: XXX, desc: "Twinks"}
+      - {id: 42, cat: XXX, desc: "Vintage"}
+      - {id: 51, cat: XXX, desc: "Voyeur"}
+      - {id: 65, cat: XXX, desc: "Wrestling and Sports"}
+      - {id: 28, cat: XXX, desc: "Youngblood"}
+      - {id: 59, cat: XXX, desc: "Bisexual"}
+      - {id: 61, cat: XXX, desc: "Straight older"}
+      - {id: 60, cat: XXX, desc: "Straight younger"}
+      - {id: 64, cat: XXX, desc: "Scat"}
    modes:
      search: [q]

@@ -65,7 +93,7 @@
    inputs:
      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
      search: "{{ .Query.Keywords }}"
-      incldead: "0" # Searches only for alive torrents
+      incldead: "{{ .Config.incldead }}"
    rows:
      selector: table.browse_result > tbody > tr:has(a[href^="details.php?id="])
    fields:
@@ -89,12 +117,12 @@
        selector: .tfiles
        filters:
          - name: regexp
-            args: ([\d]+)
+            args: ([\d,]+)
      size:
        selector: .tsize
      seeders:
        optional: true
-        selector: a[href$="&toseeders=1"]
+        selector: a[href$="&toseeders=1"], span.red
      leechers:
        optional: true
        selector: a[href$="&todlers=1"]
@@ -102,13 +130,13 @@
        selector: .tadded
        filters:
          - name: re_replace
-            args: ["(\\d{4}-\\d{2}-\\d{2})(\\d{2}:\\d{2}:\\d{2})(.*)","$1 $2"]
+            args: ["(\\d{4}-\\d{2}-\\d{2})(\\d{2}:\\d{2}:\\d{2}).*", "$1 $2"]
          - name: dateparse
            args: "2006-01-02 15:04:05"
      downloadvolumefactor:
        case:
-          "td:nth-child(3) > div > nobr > font[color=\"yellow\"]": "0"
-          "*": "1"
+          "td:nth-child(3) > div > nobr > font[color=\"yellow\"]": 0
+          "*": 1
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": 1
--- a/src/Jackett.Common/Definitions/girotorrent.yml
+++ b/src/Jackett.Common/Definitions/girotorrent.yml
@@ -0,0 +1,225 @@
+---
+  site: girotorrent
+  name: Girotorrent
+  description: "Girotorrent is an ITALIAN Private site for TV / MOVIES / GENERAL"
+  language: it-it
+  type: private
+  encoding: UTF-8
+  links:
+    - http://girotorrent.org/
+
+  caps:
+    categorymappings:
+      # LIBREDICOLA
+      - {id: 13, cat: Books, desc: "Giornali e Riviste"}
+      - {id: 15, cat: Books, desc: "Ebook"}
+      - {id: 16, cat: Books, desc: "Fumetti"}
+      - {id: 70, cat: Books, desc: "Manuali e Guide"}
+      - {id: 72, cat: Audio/Audiobook, desc: "Audiolibri"}
+      # CINEMA
+      - {id: 17, cat: Movies/Other, desc: "Movie Cam-Ts"}
+      - {id: 18, cat: Movies/Other, desc: "Movie Screener"}
+      - {id: 61, cat: Movies/Other, desc: "Movie R5-R6"}
+      - {id: 19, cat: Movies/Other, desc: "Movie DVDRip"}
+      - {id: 20, cat: Movies/Other, desc: "Movie BDRip"}
+      - {id: 60, cat: Movies/Other, desc: "Movie BluRay"}
+      - {id: 63, cat: Movies/Other, desc: "Movie WEBDLRip"}
+      # VIDEOTECA
+      - {id: 22, cat: Movies/SD, desc: "Movie BDRip"}
+      - {id: 23, cat: Movies/SD, desc: "Movie DvdRip"}
+      - {id: 23, cat: Movies/SD, desc: "Movie WEBRip"}
+      - {id: 24, cat: Movies/DVD, desc: "Movie DVD-R 5"}
+      - {id: 25, cat: Movies/DVD, desc: "Movie DVD-R 9"}
+      - {id: 26, cat: Movies/HD, desc: "Movie Blu-Ray HD"}
+      - {id: 27, cat: Movies/3D, desc: "Movie 3D-SBS"}
+      - {id: 96, cat: Movies/HD, desc: "Movie x265 HEVC"}
+      - {id: 28, cat: Movies/Foreign, desc: "Movie Subbet-ita"}
+      - {id: 73, cat: Movies/SD, desc: "Movie MP4"}
+      - {id: 29, cat: Movies/Foreign, desc: "Movie Ligua Originale"}
+      # ANIMAZIONE
+      - {id: 32, cat: TV/Anime, desc: "Anime Disney"}
+      - {id: 33, cat: TV/Anime, desc: "Anime"}
+      - {id: 34, cat: TV/Anime, desc: "Anime Altri Cartoni"}
+      # TELEVISIONE
+      - {id: 36, cat: TV, desc: "TV Serie TV"}
+      - {id: 77, cat: TV, desc: "TV Reality"}
+      - {id: 37, cat: TV, desc: "TV Film TV"}
+      - {id: 59, cat: TV, desc: "TV Sport"}
+      - {id: 38, cat: TV, desc: "TV Concerti-Spettacoli"}
+      - {id: 39, cat: TV, desc: "TV Teatro-Cabaret"}
+      - {id: 40, cat: TV/Documentary, desc: "Tv Documentario"}
+      # MUSICA
+      - {id: 42, cat: Audio, desc: "Musica CD Singoli"}
+      - {id: 43, cat: Audio, desc: "Musica Italiana"}
+      - {id: 44, cat: Audio, desc: "Musica Straniera"}
+      - {id: 45, cat: Audio, desc: "Musica Compilation"}
+      - {id: 46, cat: Audio, desc: "Musica Video Clip"}
+      - {id: 58, cat: Audio, desc: "Musica Discografie"}
+      # SALA GIOCHI
+      - {id: 47, cat: PC/Games, desc: "PC Games"}
+      - {id: 48, cat: PC/Games, desc: "PC Giochi PS2-PS3"}
+      - {id: 49, cat: PC/Games, desc: "PC Giochi Nintendo Wii"}
+      - {id: 50, cat: PC/Games, desc: "PC Giochi Xbox"}
+      - {id: 52, cat: PC/Games, desc: "PC Giochi DS-DS3"}
+      # SOFTWARE
+      - {id: 54, cat: PC, desc: "PC Programmi Windows"}
+      - {id: 55, cat: PC/Mac, desc: "PC Mac"}
+      - {id: 69, cat: PC, desc: "PC Portable"}
+      - {id: 56, cat: PC, desc: "PC Linux"}
+      # CELLULARI-PALMARI
+      - {id: 71, cat: PC/Phone-Android, desc: "Android APP"}
+      - {id: 74, cat: Other, desc: "Varie"}
+      - {id: 75, cat: Other, desc: "Immagini Wallpaper"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: /index.php?page=login
+    method: post
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+    test:
+      path: /index.php
+      selector: a[href="logout.php"]
+
+  download:
+    before:
+      path: "thanks.php"
+      method: "post"
+      inputs:
+        infohash: "{{ .DownloadUri.Query.id }}"
+        thanks: "1"
+        rndval: "1487013827343"
+    selector: a[href^="download.php?id="]
+
+  search:
+    paths:
+      - path: /index.php
+    keywordsfilters:
+      - name: re_replace
+        args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
+      - name: diacritics
+        args: replace
+      # most ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
+      - name: re_replace
+        args: ["S0?(\\d{1,2})", " $1 "]
+      - name: re_replace
+        args: ["E(\\d{2,3})", " $1 "]
+    inputs:
+      search: "{{ .Keywords }}"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      page: "torrents"
+      active: 0
+    rows:
+      selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+      #http://girotorrent.org/index.php?page=torrent-details&id=73d93dccf84ea3a8b614a3113acfd9eea186d730
+    fields:
+      download:
+        selector: a[href^="index.php?page=downloadcheck&id="]
+        attribute: href
+      title: # shortened title?
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        # normalize to SXXEYY format
+        filters:
+          - name: re_replace # replace special characters with " " (space)
+            args: ["[^a-zA-Z0-9]|\\.", " "]
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["(\\d{2})x(\\d{2})", "S$1E$2"]
+          - name: re_replace
+            args: ["(\\d{1})x(\\d{2})", "S0$1E$2"]
+          - name: re_replace #Stagione X --> S0X
+            args: ["Stagione (\\d{0,1}\\s)", "S0$1"]
+          - name: re_replace #Stagione XX --> SXX
+            args: ["Stagione (\\d{2}\\s)", "S$1"]
+          - name: re_replace #/ Episodio [YY-YY --> EYY-YY
+            args: ["(\\s\\/\\sEpisodio|\\s\\/\\sEpisodi|\\sEpisodio|\\s\\|\\sEpisodio|\\sEpisodi)\\s\\[", "E"]
+          - name: re_replace #/ Completa [episodi  YY-YY --> EYY-YY
+            args: ["(\\s\\/\\sCompleta\\s\\[episodi\\s)", "E"]
+          - name: re_replace #remove  di YY] | remove /YY]
+            args: ["(\\sdi\\s\\d{1,2}|\\/\\d{1,2})\\]", " "]
+          - name: re_replace #remove various
+            args: ["(Serie completa|Completa|\\[in pausa\\])", ""]
+          # fine prova
+      title: # long titles?
+        optional: true
+        selector: a[title][href^="index.php?page=torrent-details"]
+        attribute: title
+        filters:
+          - name: replace
+            args: ["Vedi Dettagli: ", ""]
+          # inizio prova
+          - name: re_replace # replace special characters with " " (space)
+            args: ["[^a-zA-Z0-9]|\\.", " "]
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["(\\d{2})x(\\d{2})", "S$1E$2"]
+          - name: re_replace
+            args: ["(\\d{1})x(\\d{2})", "S0$1E$2"]
+          - name: re_replace #Stagione X --> S0X
+            args: ["Stagione (\\d{0,1}\\s)", "S0$1"]
+          - name: re_replace #Stagione XX --> SXX
+            args: ["Stagione (\\d{2}\\s)", "S$1"]
+          - name: re_replace #/ Episodio [YY-YY --> EYY-YY
+            args: ["(\\s\\/\\sEpisodio|\\s\\/\\sEpisodi|\\sEpisodio|\\s\\|\\sEpisodio|\\sEpisodi)\\s\\[", "E"]
+          - name: re_replace #/ Completa [episodi  YY-YY --> EYY-YY
+            args: ["(\\s\\/\\sCompleta\\s\\[episodi\\s)", "E"]
+          - name: re_replace #remove  di YY] | remove /YY]
+            args: ["(\\sdi\\s\\d{1,2}|\\/\\d{1,2})\\]", " "]
+          - name: re_replace #remove various
+            args: ["(Serie completa|Completa|\\[in pausa\\])", ""]
+          # fine prova
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: href
+      banner:
+        optional: true
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?) "
+      size:
+        selector: td:nth-child(11)
+      date:
+        selector: td:nth-child(6)
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
+      grabs:
+        selector: td:nth-child(9)
+        filters:
+          - name: replace
+            args: ["---", "0"]
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          img[alt="Free Leech"]: "0"
+          img[alt="Gold 100% Free"]: "0"
+          img[alt="Silver 50% Free"]: "0.5"
+          img[alt="Bronze 25% Free"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        optional: true
+        selector: img[alt$="x Upload Multiplier"]
+        attribute: alt
+        filters:
+          - name: replace
+            args: ["x Upload Multiplier", ""]
--- a/src/Jackett.Common/Definitions/gktorrent.yml
+++ b/src/Jackett.Common/Definitions/gktorrent.yml
@@ -6,9 +6,11 @@
  type: public
  encoding: UTF-8
  links:
-    - http://www.gktorrent.com
+    - https://www.gktorrent.org/
  legacylinks:
-    - https://www.gktorrent.com # they're forcing http
+    - http://www.gktorrent.net/
+    - https://www.gktorrent.com/ # they're forcing http
+    - http://www.gktorrent.com/

  caps:
    categorymappings:
@@ -16,7 +18,8 @@
      - {id: tvshows, cat: TV, desc: "TV Shows"}
      - {id: softwares, cat: PC, desc: "Softwares"}
      - {id: music, cat: Audio, desc: "Music"}
-      - {id: games, cat: Console, desc: "Games"}
+      - {id: console-games, cat: Console, desc: "Console Games"}
+      - {id: pc-games, cat: PC/Games, desc: "PC Games"}
      - {id: books, cat: Books, desc: "Books"}

    modes:
@@ -76,8 +79,9 @@
          .Films: "movies"
          .Séries: "tvshows"
          .Logiciels: "softwares"
-          .Musiques: "music"
-          .Jeux: "games"
-          .Ebooks: "books"
+          .Musique: "music"
+          .Jeux-Consoles: "console-games"
+          .Jeux-PC: "pc-games"
+          .Ebook: "books"
      date:
        text: "now"
--- a/src/Jackett.Common/Definitions/gormogon.yml
+++ b/src/Jackett.Common/Definitions/gormogon.yml
@@ -1,195 +0,0 @@
---
-  site: gormogon
-  name: Gormogon
-  description: "Gormogon is a Private Torrent Tracker for CLASSIC MOVIES / TV / GENERAL"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.gormogon.com
-
-  caps:
-    categorymappings:
-      # Movies:
-      - {id: 1, cat: Movies/DVD, desc: "DVD-R"}
-      - {id: 2, cat: Movies, desc: "Action"}
-      - {id: 14, cat: Movies, desc: "Adventure"}
-      - {id: 15, cat: Movies, desc: "Animation"}
-      - {id: 16, cat: Movies, desc: "Biography"}
-      - {id: 17, cat: Movies, desc: "Comedy"}
-      - {id: 18, cat: Movies, desc: "Crime"}
-      - {id: 19, cat: Movies, desc: "Disney"}
-      - {id: 92, cat: Movies, desc: "Documentary"}
-      - {id: 20, cat: Movies, desc: "Drama"}
-      - {id: 21, cat: Movies, desc: "Family"}
-      - {id: 22, cat: Movies, desc: "Fantasy"}
-      - {id: 23, cat: Movies, desc: "Film Noir"}
-      - {id: 97, cat: Movies, desc: "History"}
-      - {id: 24, cat: Movies, desc: "Horror"}
-      - {id: 25, cat: Movies, desc: "Martial Arts"}
-      - {id: 26, cat: Movies, desc: "Musicals"}
-      - {id: 27, cat: Movies, desc: "Mystery"}
-      - {id: 28, cat: Movies, desc: "Romance"}
-      - {id: 29, cat: Movies, desc: "Sci-Fi"}
-      - {id: 30, cat: Movies, desc: "Thriller"}
-      - {id: 31, cat: Movies, desc: "War"}
-      - {id: 32, cat: Movies, desc: "Western"}
-      - {id: 33, cat: Movies, desc: "Other"}
-
-      # Classic TV:
-      - {id: 34, cat: TV, desc: "Action"}
-      - {id: 35, cat: TV, desc: "Adventure"}
-      - {id: 36, cat: TV, desc: "Animation"}
-      - {id: 37, cat: TV, desc: "Biography"}
-      - {id: 38, cat: TV, desc: "Comedy"}
-      - {id: 39, cat: TV, desc: "Crime"}
-      - {id: 40, cat: TV, desc: "Disney"}
-      - {id: 41, cat: TV, desc: "Documentary"}
-      - {id: 42, cat: TV, desc: "Drama"}
-      - {id: 43, cat: TV, desc: "Family"}
-      - {id: 44, cat: TV, desc: "Fantasy"}
-      - {id: 45, cat: TV, desc: "TV Noir"}
-      - {id: 46, cat: TV, desc: "Horror"}
-      - {id: 47, cat: TV, desc: "Martial Arts"}
-      - {id: 49, cat: TV, desc: "Musicals"}
-      - {id: 50, cat: TV, desc: "Mystery"}
-      - {id: 51, cat: TV, desc: "Romance"}
-      - {id: 52, cat: TV, desc: "Sci-Fi"}
-      - {id: 48, cat: TV, desc: "Shows"}
-      - {id: 53, cat: TV, desc: "Thriller"}
-      - {id: 54, cat: TV, desc: "War"}
-      - {id: 55, cat: TV, desc: "Western"}
-      - {id: 56, cat: TV, desc: "Other"}
-      - {id: 90, cat: TV, desc: "TV Movies"}
-
-      # Old Time Radio
-      - {id: 57, cat: Audio, desc: "Action"}
-      - {id: 58, cat: Audio, desc: "Adventure"}
-      - {id: 59, cat: Audio, desc: "Biography"}
-      - {id: 60, cat: Audio, desc: "Comedy"}
-      - {id: 61, cat: Audio, desc: "Crime"}
-      - {id: 62, cat: Audio, desc: "Documentary"}
-      - {id: 63, cat: Audio, desc: "Drama"}
-      - {id: 64, cat: Audio, desc: "Family"}
-      - {id: 65, cat: Audio, desc: "Fantasy"}
-      - {id: 66, cat: Audio, desc: "Radio Noir"}
-      - {id: 67, cat: Audio, desc: "Horror"}
-      - {id: 68, cat: Audio, desc: "Musicals"}
-      - {id: 69, cat: Audio, desc: "Mystery"}
-      - {id: 70, cat: Audio, desc: "Romance"}
-      - {id: 71, cat: Audio, desc: "Sci-Fi"}
-      - {id: 72, cat: Audio, desc: "Shows"}
-      - {id: 73, cat: Audio, desc: "Thriller"}
-      - {id: 74, cat: Audio, desc: "War"}
-      - {id: 75, cat: Audio, desc: "Western"}
-      - {id: 76, cat: Audio, desc: "Other"}
-
-      # Music:
-      - {id: 77, cat: Audio, desc: "Official Sountracks"}
-      - {id: 78, cat: Audio, desc: "Theme Tunes"}
-      - {id: 79, cat: Audio, desc: "Music 30s"}
-      - {id: 80, cat: Audio, desc: "Music 40s"}
-      - {id: 81, cat: Audio, desc: "Music 50s"}
-      - {id: 85, cat: Audio, desc: "Music 60s"}
-      - {id: 86, cat: Audio, desc: "Music 70s"}
-      - {id: 87, cat: Audio, desc: "Music '80 - '84"}
-
-      # Printed:
-      - {id: 82, cat: Books, desc: "Books"}
-      - {id: 91, cat: Books, desc: "Newspaper"}
-      - {id: 83, cat: Books, desc: "Scripts"}
-      - {id: 84, cat: Books, desc: "Posters"}
-      - {id: 88, cat: Books, desc: "Comics"}
-      - {id: 89, cat: Books, desc: "Magazines"}
-
-      # Software:
-      - {id: 94, cat: Other, desc: "Screensavers"}
-      - {id: 95, cat: PC, desc: "Programs"}
-      - {id: 96, cat: Other, desc: "Other"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: index.php?page=login&returnto=index.php
-    method: post
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: td.lista > span[style="color:#FF0000;"]
-    test:
-      path: index.php
-      selector: form[name="jump1"]
-
-  ratio:
-    path: index.php
-    selector: form[name="jump1"] > table > tbody > tr > td:contains("SR ")
-    filters:
-      - name: trim
-        args: ")"
-      - name: split
-        args: [" ", 1]
-
-  download:
-    selector: a[href^="download.php?id="]
-        
-  search:
-    paths:
-      - path: index.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      page: torrents
-      active: 0
-    rows:
-      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
-    fields:
-      download:
-        selector: a[href^="index.php?page=downloadcheck&id="]
-        attribute: href
-      title:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      details:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: href
-      size:
-        selector: td:nth-child(10)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: dateparse
-            args: "02/01/2006"
-      grabs:
-        selector: td:nth-child(8)
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      downloadvolumefactor:
-        case:
-          img[alt="gold"]: "0"
-          img[alt="silver"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt="2x Upload Multiplier"]: "2"
-          img[alt="3x Upload Multiplier"]: "3"
-          img[alt="4x Upload Multiplier"]: "4"
-          img[alt="5x Upload Multiplier"]: "5"
-          img[alt="6x Upload Multiplier"]: "6"
-          img[alt="7x Upload Multiplier"]: "7"
-          img[alt="8x Upload Multiplier"]: "8"
-          img[alt="9x Upload Multiplier"]: "9"
-          img[alt="10x Upload Multiplier"]: "10"
-          "*": "1"
--- a/Show More
+++ b/Show More