From 0932a1969f7e140b5adf7c403de38bc5ffe3029d Mon Sep 17 00:00:00 2001
From: marco <m.toma99@gmail.com>
Date: Fri, 3 Jul 2020 23:08:20 +0200
Subject: [PATCH] KoD 1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- aggiunto nuovo canale: guardaserie.cam
- autoplay migliorato, ora i settaggi sono globali e non più per canale
- adesso in onda riscritto, ora usa EPG (ringraziamo epg-guide.com)
- Riprendi la visione di un film o episodio da server diversi (solo videoteca)
- fix e ottimizzazioni varie
---
 addon.xml                                     |   10 +-
 channels.json                                 |    9 +-
 channels/0example.py.txt                      |    4 -
 channels/altadefinizione01.py                 |   10 +-
 channels/altadefinizione01_link.py            |    6 +-
 channels/altadefinizioneclick.py              |    4 +-
 channels/animeforce.py                        |   16 +-
 channels/animeleggendari.py                   |    4 +-
 channels/animesaturn.py                       |   42 +-
 channels/animesubita.json                     |   11 -
 channels/animesubita.py                       |  123 -
 channels/animetubeita.json                    |   10 -
 channels/animetubeita.py                      |  137 -
 channels/animeunity.py                        |   19 +-
 channels/animeworld.py                        |   26 +-
 channels/casacinema.py                        |    4 +-
 channels/casacinemaInfo.py                    |    4 +-
 channels/cb01anime.py                         |    6 +-
 channels/cineblog01.py                        |   36 +-
 channels/cinemalibero.py                      |    4 +-
 channels/cinetecadibologna.py                 |   11 +-
 channels/dreamsub.py                          |   24 +-
 channels/eurostreaming.py                     |   10 +-
 channels/fastsubita.py                        |   29 +-
 channels/filmigratis.json                     |    2 +-
 channels/filmigratis.py                       |    4 +-
 channels/filmpertutti.py                      |    4 +-
 channels/filmsenzalimiticc.json               |   61 -
 channels/filmsenzalimiticc.py                 |  317 ---
 channels/guardaserieCam.json                  |   11 +
 channels/guardaserieCam.py                    |   73 +
 channels/guardaserieIcu.json                  |   11 +
 channels/guardaserieIcu.py                    |   59 +
 channels/guardaserieclick.py                  |    2 -
 channels/hd4me.py                             |    4 +-
 channels/ilcorsaronero.py                     |   17 +-
 channels/ilgeniodellostreaming.json           |    2 +-
 channels/ilgeniodellostreaming.py             |    6 +-
 channels/italiaserie.py                       |    3 -
 channels/mediasetplay.json                    |   13 +
 channels/mediasetplay.py                      |  230 ++
 channels/metalvideo.py                        |    6 +-
 channels/mondoserietv.py                      |    4 +-
 channels/netfreex.py                          |   20 +-
 channels/piratestreaming.py                   |    4 +-
 channels/polpotv.py                           |   89 +-
 channels/pufimovies.json                      |    2 +-
 channels/pufimovies.py                        |    6 +-
 channels/raiplay.json                         |    1 +
 channels/raiplay.py                           |   91 +-
 channels/seriehd.py                           |    4 +-
 channels/serietvonline.py                     |   20 +-
 channels/serietvsubita.py                     |  112 +-
 channels/serietvu.py                          |   18 +-
 channels/streamingaltadefinizione.py          |   16 +-
 channels/streamtime.py                        |   37 +-
 channels/tantifilm.py                         |    8 +-
 channels/toonitalia.py                        |    4 +-
 channels/tunein.py                            |   60 +-
 channels/vedohd.py                            |   17 +-
 channels/vvvvid.py                            |   60 +-
 channelselector.py                            |   41 +-
 core/channeltools.py                          |    2 +-
 core/downloadtools.py                         |    2 +-
 core/scrapertools.py                          |   20 +-
 core/servertools.py                           |   85 +-
 core/support.py                               |   83 +-
 core/videolibrarytools.py                     |   31 +-
 lib/generictools.py                           | 2311 ++++++-----------
 lib/unshortenit.py                            |    5 +
 platformcode/config.py                        |    4 +
 platformcode/launcher.py                      |  208 +-
 platformcode/platformtools.py                 |  540 +---
 platformcode/xbmc_config_menu.py              |   13 +-
 platformcode/xbmc_videolibrary.py             |  238 +-
 .../strings.po                                |   12 +
 .../strings.po                                |   12 +
 resources/settings.xml                        |   19 +-
 .../skins/Default/720p/ChannelSettings.xml    |   26 +-
 .../skins/Default/720p/DarkShortCutMenu.xml   |   14 +-
 resources/skins/Default/720p/InfoWindow.xml   |   22 +-
 resources/skins/Default/720p/NextDialog.xml   |  112 +-
 .../skins/Default/720p/NextDialogCompact.xml  |  118 +-
 .../skins/Default/720p/NextDialogExtended.xml |  113 +-
 resources/skins/Default/720p/Recaptcha.xml    |   68 +-
 .../skins/Default/720p/ResumePlayback.xml     |   53 +
 resources/skins/Default/720p/ShortCutMenu.xml |   14 +-
 .../media/Controls/DialogCloseButton.png      |  Bin 1471 -> 0 bytes
 .../Default/media/Controls/KeyboardKey.png    |  Bin 1162 -> 0 bytes
 .../Default/media/Controls/KeyboardKeyNF.png  |  Bin 1059 -> 0 bytes
 .../media/Controls/KeyboardKeyWhite.png       |  Bin 1183 -> 0 bytes
 .../Default/media/Controls/ScrollBack.png     |  Bin 1208 -> 0 bytes
 .../Default/media/Controls/ScrollBar.png      |  Bin 1162 -> 0 bytes
 .../media/Controls/background-diffuse.png     |  Bin 1627 -> 0 bytes
 .../Default/media/Controls/check_mark.png     |  Bin 2424 -> 2461 bytes
 .../dialog-bg-solid.png                       |  Bin
 .../Default/media/Controls/dialogheader.png   |  Bin 1086 -> 0 bytes
 .../Default/media/Controls/spinDown-Focus.png |  Bin 866 -> 0 bytes
 .../media/Controls/spinDown-noFocus.png       |  Bin 912 -> 0 bytes
 .../Default/media/Controls/spinUp-Focus.png   |  Bin 863 -> 0 bytes
 .../Default/media/Controls/spinUp-noFocus.png |  Bin 902 -> 0 bytes
 .../media/NextDialog/background-diffuse.png   |  Bin 1627 -> 0 bytes
 .../media/NextDialog/background-play.png      |  Bin 3409 -> 3683 bytes
 .../Default/media/NextDialog/background.png   |  Bin 2088 -> 0 bytes
 .../Default/media/NextDialog/close-fo.png     |  Bin 11255 -> 0 bytes
 .../NextDialog/{close-nf.png => close.png}    |  Bin 11226 -> 11023 bytes
 .../Default/media/NextDialog/play-fo.png      |  Bin 2012 -> 0 bytes
 .../Default/media/NextDialog/play-nf.png      |  Bin 2007 -> 0 bytes
 .../skins/Default/media/NextDialog/play.png   |  Bin 0 -> 2117 bytes
 .../DialogCloseButton-focus.png => close.png} |  Bin
 resources/skins/Default/media/white.png       |  Bin 0 -> 167 bytes
 servers/akvideo.json                          |    1 -
 servers/anavids.json                          |    3 +-
 servers/animeid.json                          |    5 +-
 servers/animeworld_server.json                |    3 +-
 servers/anonfile.json                         |    5 +-
 servers/archiveorg.json                       |    3 +-
 servers/backin.json                           |    2 +-
 servers/badshare.json                         |    5 +-
 servers/bdupload.json                         |    4 +-
 servers/bitertv.json                          |   47 -
 servers/bitertv.py                            |   24 -
 servers/bitshare.json                         |   53 -
 servers/bitshare.py                           |   19 -
 servers/cinemaupload.json                     |    5 +-
 servers/clicknupload.json                     |    2 +-
 servers/clipwatching.json                     |    3 +-
 servers/cloudvideo.json                       |    6 +-
 servers/crunchyroll.json                      |    3 +-
 servers/dailymotion.json                      |    3 +-
 servers/deltabit.json                         |    5 +-
 servers/deltabit.py                           |   30 +-
 servers/directo.json                          |    6 +-
 servers/dostream.json                         |    5 +-
 servers/downace.json                          |    5 +-
 servers/estream.json                          |   46 -
 servers/estream.py                            |   35 -
 servers/fastplay.json                         |    5 +-
 servers/fembed.json                           |    1 -
 servers/fex.json                              |    2 +-
 servers/filebebo.json                         |   42 -
 servers/filebebo.py                           |   36 -
 servers/filefactory.json                      |    5 +-
 servers/filepup.json                          |    5 +-
 servers/filescdn.json                         |    5 +-
 servers/filevideo.json                        |   42 -
 servers/filevideo.py                          |   42 -
 servers/flashx.json                           |    5 +-
 servers/flix555.json                          |   42 -
 servers/flix555.py                            |   44 -
 servers/fourshared.json                       |    2 +-
 servers/freakshare.json                       |   45 -
 servers/freakshare.py                         |   18 -
 servers/gamovideo.json                        |    5 +-
 servers/gigasize.json                         |    2 +-
 servers/googlevideo.json                      |    2 +-
 servers/gounlimited.json                      |    3 +-
 servers/gvideo.json                           |    5 +-
 servers/hdload.json                           |    3 +-
 servers/hdmario.json                          |    3 +-
 servers/hdplayer.json                         |    3 +-
 servers/hugefiles.json                        |    5 +-
 servers/idtbox.json                           |    5 +-
 servers/jawcloud.json                         |    5 +-
 servers/jetload.json                          |    5 +-
 servers/jplayer.json                          |   42 -
 servers/jplayer.py                            |   43 -
 servers/mailru.json                           |    5 +-
 servers/mangoplay.json                        |   42 -
 servers/mangoplay.py                          |   28 -
 servers/manyvideos.json                       |   42 -
 servers/manyvideos.py                         |   38 -
 servers/mediafire.json                        |    2 +-
 servers/mega.json                             |    5 +-
 servers/megadrive.json                        |   42 -
 servers/megadrive.py                          |   27 -
 servers/mixdrop.json                          |    3 +-
 servers/mydaddy.json                          |    3 +-
 servers/mystream.json                         |    5 +-
 servers/myupload.json                         |    5 +-
 servers/netutv.json                           |    3 +-
 servers/nofile.json                           |   42 -
 servers/nofile.py                             |   27 -
 servers/nowvideo.json                         |    4 +-
 servers/okru.json                             |    3 +-
 servers/onefichier.json                       |    3 +-
 servers/onlystream.json                       |    3 +-
 servers/openload.json                         |   45 -
 servers/openload.py                           |  183 --
 servers/oprem.json                            |   49 -
 servers/oprem.py                              |   38 -
 servers/powvideo.json                         |   42 -
 servers/powvideo.py                           |   46 -
 servers/prostream.json                        |   42 -
 servers/prostream.py                          |   33 -
 servers/rapidgator.json                       |    5 +-
 servers/rapidvideo.json                       |   42 -
 servers/rapidvideo.py                         |   53 -
 servers/rcdnme.json                           |    5 +-
 servers/rutube.json                           |    5 +-
 servers/samaup.json                           |    5 +-
 servers/speedvideo.json                       |    3 +-
 servers/streamango.json                       |   54 -
 servers/streamango.py                         |   74 -
 servers/streamcherry.json                     |   45 -
 servers/streamcherry.py                       |   77 -
 servers/streamcloud.json                      |   59 -
 servers/streamcloud.py                        |   78 -
 servers/streamplay.json                       |   42 -
 servers/streamplay.py                         |   48 -
 servers/streamtape.json                       |    3 +-
 servers/streamty.json                         |   42 -
 servers/streamty.py                           |   34 -
 servers/streamz.json                          |    5 +-
 servers/supervideo.json                       |    3 +-
 servers/thevid.json                           |    5 +-
 servers/thevideobee.json                      |    5 +-
 servers/thevideome.json                       |   42 -
 servers/thevideome.py                         |   45 -
 servers/thevideos.py                          |   29 -
 servers/thevimeo.json                         |   42 -
 servers/thevimeo.py                           |   40 -
 servers/tiwikiwi.json                         |   42 -
 servers/tiwikiwi.py                           |   31 -
 servers/torrent.json                          |    2 +-
 servers/turbobit.json                         |    3 +-
 servers/turbovid.json                         |    3 +-
 servers/tusfiles.json                         |    5 +-
 servers/unsupported.json                      |    3 +-
 servers/uploadedto.json                       |    5 +-
 servers/uploadmp4.json                        |   42 -
 servers/uploadmp4.py                          |   27 -
 servers/uppom.json                            |    5 +-
 servers/upstream.json                         |    3 +-
 servers/uptobox.json                          |    3 +-
 servers/upvid.json                            |    5 +-
 servers/uqload.json                           |    5 +-
 servers/userscloud.json                       |    5 +-
 servers/verystream.json                       |   45 -
 servers/verystream.py                         |   55 -
 servers/vevio.json                            |    5 +-
 servers/vidbull.json                          |   42 -
 servers/vidbull.py                            |   31 -
 servers/vidcloud.json                         |    3 +-
 servers/videobb.json                          |   42 -
 servers/videobb.py                            |   30 -
 servers/videobin.json                         |    5 +-
 servers/videofiles.json                       |   42 -
 servers/videofiles.py                         |   39 -
 servers/videomega.json                        |    5 +-
 servers/videoz.json                           |   42 -
 servers/videoz.py                             |   34 -
 servers/vidfast.json                          |    5 +-
 servers/vidgot.json                           |   42 -
 servers/vidlox.json                           |    5 +-
 servers/vidmoly.json                          |    3 +-
 servers/vidoza.json                           |    5 +-
 servers/vidtodo.json                          |    2 +-
 servers/vidtome.json                          |   10 +-
 servers/vidtome.py                            |   26 +-
 servers/vidup.json                            |    5 +-
 servers/vidzi.json                            |   46 -
 servers/vidzi.py                              |   38 -
 servers/vimeo.json                            |    3 +-
 servers/vimpleru.json                         |    3 +-
 servers/vivo.json                             |    5 +-
 servers/vk.json                               |    5 +-
 servers/vshare.json                           |    3 +-
 servers/{thevideos.json => vudeo.json}        |   14 +-
 servers/vudeo.py                              |   22 +
 servers/vupplayer.json                        |    3 +-
 servers/vvvvid.json                           |    5 +-
 servers/watchanimestream.json                 |    5 +-
 servers/watchvideo.json                       |    5 +-
 servers/wstream.json                          |    2 +-
 servers/wstream.py                            |   20 +-
 servers/youdbox.json                          |    5 +-
 servers/yourupload.json                       |    5 +-
 servers/youtube.json                          |    5 +-
 servers/youwatch.json                         |    2 +-
 servers/zippyshare.json                       |    2 +-
 service.py                                    |    3 +-
 specials/autoplay.py                          |  651 +----
 specials/backup.py                            |    2 +-
 specials/community.py                         |   22 +-
 specials/downloads.json                       |   36 +-
 specials/downloads.py                         |    6 +-
 specials/filmontv.py                          |  480 ++--
 specials/filtertools.py                       |    4 -
 specials/news.py                              |    2 +-
 specials/nextep.py                            |  207 --
 specials/search.py                            |    2 +-
 specials/setting.py                           |   86 +-
 specials/videolibrary.json                    |   15 -
 specials/videolibrary.py                      |   15 +-
 tests.py                                      |  216 ++
 296 files changed, 3205 insertions(+), 8075 deletions(-)
 delete mode 100644 channels/animesubita.json
 delete mode 100644 channels/animesubita.py
 delete mode 100644 channels/animetubeita.json
 delete mode 100644 channels/animetubeita.py
 delete mode 100644 channels/filmsenzalimiticc.json
 delete mode 100644 channels/filmsenzalimiticc.py
 create mode 100644 channels/guardaserieCam.json
 create mode 100644 channels/guardaserieCam.py
 create mode 100644 channels/guardaserieIcu.json
 create mode 100644 channels/guardaserieIcu.py
 create mode 100644 channels/mediasetplay.json
 create mode 100644 channels/mediasetplay.py
 rename resources/language/{English => resource.language.en_gb}/strings.po (99%)
 rename resources/language/{Italian => resource.language.it_it}/strings.po (99%)
 create mode 100644 resources/skins/Default/720p/ResumePlayback.xml
 delete mode 100644 resources/skins/Default/media/Controls/DialogCloseButton.png
 delete mode 100644 resources/skins/Default/media/Controls/KeyboardKey.png
 delete mode 100644 resources/skins/Default/media/Controls/KeyboardKeyNF.png
 delete mode 100644 resources/skins/Default/media/Controls/KeyboardKeyWhite.png
 delete mode 100644 resources/skins/Default/media/Controls/ScrollBack.png
 delete mode 100644 resources/skins/Default/media/Controls/ScrollBar.png
 delete mode 100644 resources/skins/Default/media/Controls/background-diffuse.png
 rename resources/skins/Default/media/{Shortcut => Controls}/dialog-bg-solid.png (100%)
 delete mode 100644 resources/skins/Default/media/Controls/dialogheader.png
 delete mode 100644 resources/skins/Default/media/Controls/spinDown-Focus.png
 delete mode 100644 resources/skins/Default/media/Controls/spinDown-noFocus.png
 delete mode 100644 resources/skins/Default/media/Controls/spinUp-Focus.png
 delete mode 100644 resources/skins/Default/media/Controls/spinUp-noFocus.png
 delete mode 100644 resources/skins/Default/media/NextDialog/background-diffuse.png
 delete mode 100644 resources/skins/Default/media/NextDialog/background.png
 delete mode 100644 resources/skins/Default/media/NextDialog/close-fo.png
 rename resources/skins/Default/media/NextDialog/{close-nf.png => close.png} (91%)
 delete mode 100644 resources/skins/Default/media/NextDialog/play-fo.png
 delete mode 100644 resources/skins/Default/media/NextDialog/play-nf.png
 create mode 100644 resources/skins/Default/media/NextDialog/play.png
 rename resources/skins/Default/media/{Controls/DialogCloseButton-focus.png => close.png} (100%)
 create mode 100644 resources/skins/Default/media/white.png
 delete mode 100644 servers/bitertv.json
 delete mode 100644 servers/bitertv.py
 delete mode 100644 servers/bitshare.json
 delete mode 100644 servers/bitshare.py
 delete mode 100644 servers/estream.json
 delete mode 100644 servers/estream.py
 delete mode 100644 servers/filebebo.json
 delete mode 100644 servers/filebebo.py
 delete mode 100644 servers/filevideo.json
 delete mode 100644 servers/filevideo.py
 delete mode 100644 servers/flix555.json
 delete mode 100644 servers/flix555.py
 delete mode 100644 servers/freakshare.json
 delete mode 100644 servers/freakshare.py
 delete mode 100644 servers/jplayer.json
 delete mode 100644 servers/jplayer.py
 delete mode 100644 servers/mangoplay.json
 delete mode 100644 servers/mangoplay.py
 delete mode 100644 servers/manyvideos.json
 delete mode 100644 servers/manyvideos.py
 delete mode 100644 servers/megadrive.json
 delete mode 100644 servers/megadrive.py
 delete mode 100644 servers/nofile.json
 delete mode 100644 servers/nofile.py
 delete mode 100644 servers/openload.json
 delete mode 100644 servers/openload.py
 delete mode 100644 servers/oprem.json
 delete mode 100644 servers/oprem.py
 delete mode 100755 servers/powvideo.json
 delete mode 100644 servers/powvideo.py
 delete mode 100644 servers/prostream.json
 delete mode 100644 servers/prostream.py
 delete mode 100755 servers/rapidvideo.json
 delete mode 100755 servers/rapidvideo.py
 delete mode 100644 servers/streamango.json
 delete mode 100644 servers/streamango.py
 delete mode 100644 servers/streamcherry.json
 delete mode 100644 servers/streamcherry.py
 delete mode 100755 servers/streamcloud.json
 delete mode 100755 servers/streamcloud.py
 delete mode 100755 servers/streamplay.json
 delete mode 100644 servers/streamplay.py
 delete mode 100644 servers/streamty.json
 delete mode 100644 servers/streamty.py
 delete mode 100755 servers/thevideome.json
 delete mode 100755 servers/thevideome.py
 delete mode 100644 servers/thevideos.py
 delete mode 100644 servers/thevimeo.json
 delete mode 100644 servers/thevimeo.py
 delete mode 100644 servers/tiwikiwi.json
 delete mode 100644 servers/tiwikiwi.py
 delete mode 100644 servers/uploadmp4.json
 delete mode 100644 servers/uploadmp4.py
 delete mode 100644 servers/verystream.json
 delete mode 100644 servers/verystream.py
 delete mode 100644 servers/vidbull.json
 delete mode 100644 servers/vidbull.py
 delete mode 100644 servers/videobb.json
 delete mode 100644 servers/videobb.py
 delete mode 100644 servers/videofiles.json
 delete mode 100644 servers/videofiles.py
 delete mode 100644 servers/videoz.json
 delete mode 100644 servers/videoz.py
 delete mode 100644 servers/vidgot.json
 mode change 100755 => 100644 servers/vidtome.json
 delete mode 100644 servers/vidzi.json
 delete mode 100644 servers/vidzi.py
 rename servers/{thevideos.json => vudeo.json} (67%)
 create mode 100644 servers/vudeo.py
 delete mode 100644 specials/nextep.py
 create mode 100644 tests.py

diff --git a/addon.xml b/addon.xml
index f1fa97ba..a3be847e 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="plugin.video.kod" name="Kodi on Demand" version="1.1" provider-name="KoD Team">
+<addon id="plugin.video.kod" name="Kodi on Demand" version="1.2" provider-name="KoD Team">
   <requires>
     <!-- <import addon="script.module.libtorrent" optional="true"/> -->
     <import addon="metadata.themoviedb.org"/>
@@ -18,9 +18,11 @@
       <screenshot>resources/media/themes/ss/2.png</screenshot>
       <screenshot>resources/media/themes/ss/3.png</screenshot>
     </assets>
-      <news> - Ottimizzata e migliorata la ricerca globale
-      - fix Mega
-    - altri cambiamenti minori</news>
+      <news> - aggiunto nuovo canale: guardaserie.cam
+- autoplay migliorato, ora i settaggi sono globali e non più per canale
+- adesso in onda riscritto, ora usa EPG (ringraziamo epg-guide.com)
+- Riprendi la visione di un film o episodio da server diversi (solo videoteca)
+- fix e ottimizzazioni varie</news>
     <description lang="it">Naviga velocemente sul web e guarda i contenuti presenti</description>
     <disclaimer>[COLOR red]The owners and submitters to this addon do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers.[/COLOR]
     [COLOR yellow]Kodi © is a registered trademark of the XBMC Foundation. We are not connected to or in any other way affiliated with Kodi, Team Kodi, or the XBMC Foundation. Furthermore, any software, addons, or products offered by us will receive no support in official Kodi channels, including the Kodi forums and various social networks.[/COLOR]</disclaimer>
diff --git a/channels.json b/channels.json
index b8121f4b..2b3473ab 100644
--- a/channels.json
+++ b/channels.json
@@ -24,10 +24,13 @@
     "filmstreaming01": "https://filmstreaming01.com", 
     "guardaserie_stream": "https://guardaserie.store", 
     "guardaserieclick": "https://www.guardaserie.style", 
-    "hd4me": "https://hd4me.net", 
-    "ilgeniodellostreaming": "https://ilgeniodellostreaming.tw", 
+    "hd4me": "https://hd4me.net",
+    "netfreex": "https://www.netfreex.stream/",
+    "ilgeniodellostreaming": "https://ilgeniodellostreaming.tw",
     "italiaserie": "https://italiaserie.org", 
-    "mondoserietv": "https://mondoserietv.com", 
+    "mondoserietv": "https://mondoserietv.com",
+    "guardaserieIcu": "https://guardaserie.icu/",
+    "guardaserieCam": "https://guardaserie.cam",
     "piratestreaming": "https://www.piratestreaming.biz", 
     "polpotv": "https://polpotv.club", 
     "pufimovies": "https://pufimovies.com", 
diff --git a/channels/0example.py.txt b/channels/0example.py.txt
index 72c2152d..72e4b75b 100644
--- a/channels/0example.py.txt
+++ b/channels/0example.py.txt
@@ -69,10 +69,6 @@ host = config.get_channel_url(findhost)
 host = config.get_channel_url()
 headers = [['Referer', host]]
 
-# server di esempio...
-list_servers = ['supervideo', 'streamcherry','rapidvideo', 'streamango', 'openload']
-# quality di esempio
-list_quality = ['default', 'HD', '3D', '4K', 'DVD', 'SD']
 
 ### fine variabili
 
diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py
index ab2f9e1f..0fa60cfa 100644
--- a/channels/altadefinizione01.py
+++ b/channels/altadefinizione01.py
@@ -28,8 +28,8 @@ def findhost():
 host = config.get_channel_url(findhost)
 headers = [['Referer', host]]
 
-list_servers = ['mixdrop','vidoza','cloudvideo','vup','supervideo','gounlimited']
-list_quality = ['default']
+
+
 
 @support.menu
 def mainlist(item):
@@ -80,13 +80,13 @@ def genres(item):
     blacklist = ['Altadefinizione01']
     if item.args == 'genres':
         patronBlock = r'<ul class="kategori_list">(?P<block>.*?)<div class="tab-pane fade" id="wtab2">'
-        patron = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>'
+        patronMenu = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>'
     elif item.args == 'years':
         patronBlock = r'<ul class="anno_list">(?P<block>.*?)</a></li> </ul> </div>'
-        patron = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>'
+        patronMenu = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>'
     elif item.args == 'orderalf':
         patronBlock = r'<div class="movies-letter">(?P<block>.*?)<div class="clearfix">'
-        patron = '<a title=.*?href="(?P<url>[^"]+)"><span>(?P<title>.*?)</span>'
+        patronMenu = '<a title=.*?href="(?P<url>[^"]+)"><span>(?P<title>.*?)</span>'
 
     #debug = True
     return locals()
diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py
index cb892802..ebd69e34 100644
--- a/channels/altadefinizione01_link.py
+++ b/channels/altadefinizione01_link.py
@@ -11,8 +11,8 @@ __channel__ = "altadefinizione01_link"
 host = config.get_channel_url()
 headers = [['Referer', host]]
 
-list_servers = ['mixdrop', 'vup', 'supervideo']
-list_quality = ['default']
+
+
 
 # =========== home menu ===================
 @support.menu
@@ -102,4 +102,4 @@ def newest(categoria):
 
 def findvideos(item):
     support.log('findvideos', item)
-    return support.server(item, headers=headers)
+    return support.server(item, support.match(item, patron='<ul class="playernav">.*?</ul>', headers=headers).match)
diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py
index 8693320a..f0d2efa4 100644
--- a/channels/altadefinizioneclick.py
+++ b/channels/altadefinizioneclick.py
@@ -28,8 +28,8 @@ def findhost():
 
 host = config.get_channel_url(findhost)
 headers = [['Referer', host]]
-list_servers = ['mixdrop', 'vidcloud', 'vidoza', 'supervideo', 'hdload', 'mystream']
-list_quality = ['1080p', '720p', '360p']
+
+
 
 @support.menu
 def mainlist(item):
diff --git a/channels/animeforce.py b/channels/animeforce.py
index 565e395c..cfd1efe3 100644
--- a/channels/animeforce.py
+++ b/channels/animeforce.py
@@ -7,8 +7,8 @@ from core import support
 
 host = support.config.get_channel_url()
 
-list_servers = ['directo', 'vvvvid']
-list_quality = ['default']
+
+
 
 
 headers = [['Referer', host]]
@@ -142,10 +142,7 @@ def findvideos(item):
                     if 'https' not in item.url:
                         url = support.match(item, url='https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/playlist.m3u')[1]
                         url = url.split()[-1]
-                        itemlist.append(
-                            support.Item(action= 'play',
-                                         url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url,
-                                         server= 'directo'))
+                        itemlist.append(item.clone(action= 'play', url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url, server= 'directo'))
 
     elif 'adf.ly' in item.url:
         from servers.decrypters import adfly
@@ -170,11 +167,6 @@ def findvideos(item):
         elif url.startswith('/'): url = 'https:/' + url
 
 
-        itemlist.append(
-            support.Item(channel=item.channel,
-                        action="play",
-                        title='Diretto',
-                        url=url,
-                        server='directo'))
+        itemlist.append(item.clone(action="play", title='Diretto', url=url, server='directo'))
 
     return support.server(item, itemlist=itemlist)
diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py
index a26e8314..091dcefb 100644
--- a/channels/animeleggendari.py
+++ b/channels/animeleggendari.py
@@ -11,8 +11,8 @@ host = support.config.get_channel_url()
 headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
            ['Referer', host]]
 
-list_servers = ['verystream','openload','rapidvideo','streamango']
-list_quality = ['default']
+
+
 
 
 @support.menu
diff --git a/channels/animesaturn.py b/channels/animesaturn.py
index 63fc394d..fb50a7d4 100644
--- a/channels/animesaturn.py
+++ b/channels/animesaturn.py
@@ -9,9 +9,6 @@ host = support.config.get_channel_url()
 headers={'X-Requested-With': 'XMLHttpRequest'}
 
 
-list_servers = ['directo', 'fembed', 'animeworld']
-list_quality = ['default', '480p', '720p', '1080p']
-
 @support.menu
 def mainlist(item):
 
@@ -26,9 +23,10 @@ def mainlist(item):
 @support.scrape
 def search(item, texto):
     search = texto
+    # debug = True
     item.contentType = 'tvshow'
     anime = True
-    patron = r'<a href="(?P<url>[^"]+)"[^>]+> <span>(?P<title>[^<\(]+)(?:\s*\((?P<year>\d+)\))?(?:\s*\((?P<lang>[A-Za-z-]+)\))?'
+    patron = r'href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)(?:\((?P<lang>ITA)\))?(?:(?P<year>\((\d+)\)))?</a>.*?<p[^>]+>(?P<plot>[^<]+).*?<img src="(?P<thumbnail>[^"]+)'
     action = 'check'
     return locals()
 
@@ -53,15 +51,20 @@ def newest(categoria):
 
 @support.scrape
 def menu(item):
-    patronMenu = r'<div class="col-md-13 bg-dark-as-box-shadow p-2 text-white text-center">(?P<title>[^"<]+)<(?P<url>.*?)(?:"lista-top"|"clearfix")'
+    patronMenu = r'<div class="col-md-13 bg-dark-as-box-shadow p-2 text-white text-center">(?P<title>[^"<]+)<(?P<other>.*?)(?:"lista-top"|"clearfix")'
     action = 'peliculas'
     item.args = 'top'
+    def itemHook(item2):
+        item2.url = item.url
+        return item2
+
     return locals()
 
 
 @support.scrape
 def peliculas(item):
     anime = True
+    # debug = True
 
     deflang= 'Sub-ITA'
     action = 'check'
@@ -70,9 +73,8 @@ def peliculas(item):
     post = "page=" + str(item.page if item.page else 1) if item.page > 1 else None
 
     if item.args == 'top':
-        data=item.url
-        patron = r'light">(?P<title2>[^<]+)</div>\s(?P<title>[^<]+)[^>]+>[^>]+>\s<a href="(?P<url>[^"]+)">(?:<a[^>]+>|\s*)<img alt="[^"]+" src="(?P<thumb>[^"]+)"'
-
+        data = item.other
+        patron = r'light">(?P<title2>[^<]+)</div>\s(?P<title>[^<]+)[^>]+>[^>]+>\s<a href="(?P<url>[^"]+)">(?:<a[^>]+>|\s*)<img.*?src="(?P<thumb>[^"]+)"'
     else:
         data = support.match(item, post=post, headers=headers).data
         if item.args == 'updated':
@@ -82,22 +84,14 @@ def peliculas(item):
             action = 'findvideos'
             def itemlistHook(itemlist):
                 if page:
-                    itemlist.append(
-                        support.Item(channel=item.channel,
-                            action = item.action,
-                            contentType=item.contentType,
-                            title=support.typo(support.config.get_localized_string(30992), 'color kod bold'),
-                            url=item.url,
-                            page= page,
-                            args=item.args,
-                            thumbnail=support.thumb()))
+                    itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'),page= page, thumbnail=support.thumb()))
                     return itemlist
         else:
             pagination = ''
             if item.args == 'incorso':
                 patron = r'<a href="(?P<url>[^"]+)"[^>]+>(?P<title>[^<(]+)(?:\s*\((?P<year>\d+)\))?(?:\s*\((?P<lang>[A-za-z-]+)\))?</a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s*<img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<plot>[^<]+)<'
             else:
-                patron = r'href="(?P<url>[^"]+)"[^>]+>[^>]+>(?P<title>.+?)(?:\((?P<lang>ITA)\))?(?:(?P<year>\((\d+)\)))?</span>'
+                patron = r'href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)(?:\((?P<lang>ITA)\))?(?:(?P<year>\((\d+)\)))?</a>.*?<p[^>]+>(?P<plot>[^<]+).*?<img src="(?P<thumbnail>[^"]+)'
 
     return locals()
 
@@ -131,17 +125,7 @@ def findvideos(item):
     if url:
         links = support.match(url, patron=r'(?:<source type="[^"]+"\s*src=|file:\s*)"([^"]+)"', headers=headers, debug=False).matches
         for link in links:
-            itemlist.append(
-                support.Item(channel=item.channel,
-                            action="play",
-                            title='Diretto',
-                            quality='',
-                            url=link,
-                            server='directo',
-                            fulltitle=item.fulltitle,
-                            show=item.show,
-                            contentType=item.contentType,
-                            folder=False))
+            itemlist.append(item.clone(action="play", title='Diretto', url=link, server='directo'))
     return support.server(item, itemlist=itemlist)
 
 
diff --git a/channels/animesubita.json b/channels/animesubita.json
deleted file mode 100644
index 617f6109..00000000
--- a/channels/animesubita.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "id": "animesubita",
-    "name": "AnimeSubIta",
-    "active": false,
-    "language": ["sub-ita"],
-    "thumbnail": "animesubita.png",
-    "bannermenu": "animesubita.png",
-    "categories": ["anime", "vos"],
-    "settings": []
-}
-
diff --git a/channels/animesubita.py b/channels/animesubita.py
deleted file mode 100644
index 0df2dc84..00000000
--- a/channels/animesubita.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-# Canale per AnimeSubIta
-# ------------------------------------------------------------
-
-
-from core import support
-
-host = support.config.get_channel_url()
-headers = {'Upgrade-Insecure-Requests': '1', 'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0'}
-
-list_servers = ['directo']
-list_quality = ['default']
-
-
-@support.menu
-def mainlist(item):
-    anime = ['/lista-anime/',
-             ('Ultimi Episodi',['/category/ultimi-episodi/', 'peliculas', 'updated']),
-             ('in Corso',['/category/anime-in-corso/', 'peliculas', 'alt']),
-             ('Generi',['/generi/', 'genres', 'alt'])]
-    return locals()
-
-
-def newest(categoria):
-    support.log(categoria)
-    itemlist = []
-    item = support.Item()
-    try:
-        if categoria == "anime":
-            item.url = host
-            item.args = "updated"
-            itemlist = peliculas(item)
-
-            if itemlist[-1].action == "ultimiep":
-                itemlist.pop()
-    # Continua l'esecuzione in caso di errore
-    except:
-        import sys
-        for line in sys.exc_info():
-            support.logger.error("{0}".format(line))
-        return []
-
-    return itemlist
-
-
-def search(item, texto):
-    support.log(texto)
-    item.url = host + "/?s=" + texto
-    item.args = 'alt'
-    try:
-        return peliculas(item)
-    # Continua la ricerca in caso di errore
-    except:
-        import sys
-        for line in sys.exc_info():
-            support.logger.error("%s" % line)
-        return []
-
-
-@support.scrape
-def genres(item):
-    blacklist= ['Anime In Corso','Ultimi Episodi']
-    patronMenu=r'<li><a title="[^"]+" href="(?P<url>[^"]+)">(?P<title>[^<]+)</a>'
-    action = 'peliculas'
-    return locals()
-
-
-@support.scrape
-def peliculas(item):
-    anime = True
-    if item.args == 'updated':
-        patron = r'<div class="post-thumbnail">\s*<a href="(?P<url>[^"]+)" title="(?P<title>.*?)\s*Episodio (?P<episode>\d+) (?P<lang>[a-zA-Z-\s]+)[^"]*"> <img[^src]+src="(?P<thumb>[^"]+)"'
-        patronNext = r'<link rel="next" href="([^"]+)"\s*/>'
-        action = 'findvideos'
-    elif item.args == 'alt':
-        patron = r'<div class="post-thumbnail">\s*<a href="(?P<url>[^"]+)" title="(?P<title>.*?)(?: [Oo][Aa][Vv])?(?:\s*(?P<lang>[Ss][Uu][Bb].[Ii][Tt][Aa]))[^"]+">\s*<img[^src]+src="(?P<thumb>[^"]+)"'
-        patronNext = r'<link rel="next" href="([^"]+)"\s*/>'
-        action = 'episodios'
-    else:
-        pagination = ''
-        patronBlock = r'<ul class="lcp_catlist"[^>]+>(?P<block>.*?)</ul>'
-        patron = r'<a href="(?P<url>[^"]+)"[^>]+>(?P<title>.*?)(?: [Oo][Aa][Vv])?(?:\s*(?P<lang>[Ss][Uu][Bb].[Ii][Tt][Aa])[^<]+)?</a>'
-        action = 'episodios'
-    return locals()
-
-
-@support.scrape
-def episodios(item):
-    anime = True
-    patron = r'<td style="[^"]*?">\s*.*?<strong>(?P<episode>[^<]+)</strong>\s*</td>\s*<td[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>\s*<img src="(?P<thumb>[^"]+?)"[^>]+>'
-    return locals()
-
-
-def findvideos(item):
-    support.log(item)
-    itemlist = []
-
-    if item.args == 'updated':
-        ep = support.match(item.fulltitle, patron=r'(\d+)').match
-        item.url = support.re.sub(r'episodio-\d+-|oav-\d+-'+ep, '',item.url)
-        if 'streaming' not in item.url: item.url = item.url.replace('sub-ita','sub-ita-streaming')
-        item.url = support.match(item, patron= ep + r'[^>]+>[^>]+>[^>]+><a href="([^"]+)"').match
-
-    # post
-    url = host + '/' + support.match(item.url, patron=r'(episodio\d*.php.*?)"').match.replace('%3F','?').replace('%3D','=')
-    headers['Referer'] =  url
-    cookies = ""
-    matches = support.re.compile('(.%s.*?)\n' % host.replace("http://", "").replace("www.", ""), support.re.DOTALL).findall(support.config.get_cookie_data())
-    for cookie in matches:
-        cookies += cookie.split('\t')[5] + "=" + cookie.split('\t')[6] + ";"
-    headers['Cookie'] = cookies[:-1]
-
-    url = support.match(url, patron=r'<source src="([^"]+)"[^>]+>').match
-
-    itemlist.append(
-        support.Item(channel=item.channel,
-                     action="play",
-                     title='Diretto',
-                     url=url + '|' + support.urllib.urlencode(headers),
-                     server='directo'))
-
-    return support.server(item,itemlist=itemlist)
\ No newline at end of file
diff --git a/channels/animetubeita.json b/channels/animetubeita.json
deleted file mode 100644
index 39384875..00000000
--- a/channels/animetubeita.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "id": "animetubeita",
-    "name": "AnimeTubeITA",
-    "active": false,
-    "language": ["sub-ita"],
-    "thumbnail": "animetubeita.png",
-    "bannermenu": "animetubeita.png",
-    "categories": ["anime","vos"],
-    "settings": []
-}
diff --git a/channels/animetubeita.py b/channels/animetubeita.py
deleted file mode 100644
index 63db64e6..00000000
--- a/channels/animetubeita.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-# ----------------------------------------------------------
-# Canale per animetubeita
-# ----------------------------------------------------------
-import re
-import urllib
-from core import support
-
-host = support.config.get_channel_url()
-
-headers = {'Upgrade-Insecure-Requests': '1',
-               'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0'}
-
-list_servers = ['directo']
-list_quality = ['default']
-
-@support.menu
-def mainlist(item):
-	anime = [('Generi',['/generi', 'genres', 'genres']),
-             ('Ordine Alfabetico',['/lista-anime', 'peliculas', 'list']),
-             ('In Corso',['/category/serie-in-corso/', 'peliculas', 'in_progress'])
-             ]
-	return locals()
-
-@support.scrape
-def genres(item):
-    blacklist = ['Ultimi Episodi', 'Serie in Corso']
-    patronMenu = r'<li[^>]+><a href="(?P<url>[^"]+)" >(?P<title>[^<]+)</a>'
-    action = 'peliculas'
-    return locals()
-
-
-def search(item, text):
-    support.log(text)
-    item.url = host + '/lista-anime'
-    item.args = 'list'
-    item.search = text
-    try:
-        return peliculas(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            support.logger.error("%s" % line)
-        return []
-
-
-def newest(categoria):
-    support.log(categoria)
-    item = support.Item()
-    try:
-        if categoria == "anime":
-            item.contentType='tvshow'
-            item.url = host
-            item.args = "last"
-            return peliculas(item)
-    # Continua la ricerca in caso di errore
-    except:
-        import sys
-        for line in sys.exc_info():
-            support.logger.error("{0}".format(line))
-        return []
-
-
-@support.scrape
-def peliculas(item):
-    anime = True
-    if not item.search: pagination = ''
-    action = 'episodios'
-
-    if item.args == 'list':
-        search = item.search
-        patronBlock = r'<ul class="page-list ">(?P<block>.*?)<div class="wprc-container'
-        patron = r'<li.*?class="page_.*?href="(?P<url>[^"]+)">(?P<title>.*?) Sub Ita'
-    elif item.args == 'last':
-        action = 'findvideos'
-        item.contentType='episode'
-        patronBlock = r'<div class="blocks">(?P<block>.*?)<div id="sidebar'
-        patron = r'<h2 class="title"><a href="(?P<url>[^"]+)" [^>]+>.*?<img.*?src="(?P<thumb>[^"]+)".*?<strong>Titolo</strong></td>.*?<td>(?P<title>.*?)\s*Episodio\s*(?P<episode>\d+)[^<]+</td>.*?<td><strong>Trama</strong></td>\s*<td>(?P<plot>[^<]+)<'
-    elif item.args in  ['in_progress','genres']:
-        patronBlock = r'<div class="blocks">(?P<block>.*?)<div id="sidebar'
-        patron = r'<h2 class="title"><a href="(?P<url>[^"]+)"[^>]+>(?P<title>.*?)\s* Sub Ita[^<]+</a></h2>.*?<img.*?src="(?P<thumb>.*?)".*?<td><strong>Trama</strong></td>.*?<td>(?P<plot>[^<]+)<'
-        patronNext = r'href="([^"]+)" >&raquo;'
-    else:
-        patronBlock = r'<div class="blocks">(?P<block>.*?)<div id="sidebar'
-        patron = r'<img.*?src="(?P<thumb>[^"]+)".*?<strong>Titolo</strong></td>.*?<td>\s*(?P<title>.*?)\s*Episodio[^<]+</td>.*?<td><strong>Trama</strong></td>\s*<td>(?P<plot>[^<]+)<.*?<a.*?href="(?P<url>[^"]+)"'
-        patronNext = r'href="([^"]+)" >&raquo;'
-    return locals()
-
-
-@support.scrape
-def episodios(item):
-    patronBlock = r'<h6>Episodio</h6>(?P<block>.*?)(?:<!--|</table>)'
-    patron = r'<strong>(?P<title>[^<]+)</strong>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a href="http://link\.animetubeita\.com/2361078/(?P<url>[^"]+)"'
-    action = 'findvideos'
-    return locals()
-
-
-def findvideos(item):
-    itemlist=[]
-    if item.args == 'last':
-        match = support.match(item, patron=r'href="(?P<url>[^"]+)"[^>]+><strong>DOWNLOAD &amp; STREAMING</strong>').match
-        if match:
-            patronBlock = r'<h6>Episodio</h6>(?P<block>.*?)(?:<!--|</table>)'
-            patron = r'<a href="http://link\.animetubeita\.com/2361078/(?P<url>[^"]+)"'
-            match = support.match(match, patron=patron, patronBlock=patronBlock, headers=headers).match
-        else: return itemlist
-
-        if match: item.url = match[-1]
-        else: return itemlist
-    data = support.httptools.downloadpage(item.url, headers=headers).data
-    cookies = ""
-    matches = re.compile('(.animetubeita.com.*?)\n', re.DOTALL).findall(support.config.get_cookie_data())
-    for cookie in matches:
-        name = cookie.split('\t')[5]
-        value = cookie.split('\t')[6]
-        cookies += name + "=" + value + ";"
-
-    headers['Referer'] =  item.url
-    headers['Cookie'] = cookies[:-1]
-
-    url = support.scrapertools.find_single_match(data, """<source src="([^"]+)" type='video/mp4'>""")
-    if not url: url = support.scrapertools.find_single_match(data, 'file: "([^"]+)"')
-    if url:
-        url += '|' + urllib.urlencode(headers)
-        itemlist.append(
-            support.Item(channel=item.channel,
-                        action="play",
-                        title='diretto',
-                        server='directo',
-                        quality='',
-                        url=url,
-                        thumbnail=item.thumbnail,
-                        fulltitle=item.fulltitle,
-                        show=item.show,
-                        contentType=item.contentType,
-                        folder=False))
-    return support.server(item, itemlist=itemlist)
\ No newline at end of file
diff --git a/channels/animeunity.py b/channels/animeunity.py
index 09a628ad..ba614d7b 100644
--- a/channels/animeunity.py
+++ b/channels/animeunity.py
@@ -7,8 +7,8 @@ from core import support
 
 host = support.config.get_channel_url()
 
-list_servers = ['mixdrop', 'wstream', 'vupplayer', 'supervideo', 'cloudvideo', 'gounlimited']
-list_quality = ['default','1080p', '720p', '480p', '360p']
+
+
 
 headers = [['Referer', host]]
 
@@ -61,7 +61,7 @@ def newest(categoria):
     except:
         import sys
         for line in sys.exc_info():
-            support.log({0}.format(line))
+            support.log(line)
         return []
 
     return itemlist
@@ -108,16 +108,5 @@ def findvideos(item):
         itemlist = []
         if item.contentType != 'episode': item.contentType = 'movie'
         video = support.match(html.data, patron=r'<source src="([^"]+)"').match
-        itemlist.append(
-            support.Item(
-                channel=item.channel,
-                action="play",
-                title='Diretto',
-                quality='',
-                url=video,
-                server='directo',
-                fulltitle=item.fulltitle,
-                show=item.show,
-                contentType=item.contentType,
-                folder=False))
+        itemlist.append(item.clone(action="play", title='Diretto', url=video, server='directo'))
     return support.server(item, itemlist=itemlist)
diff --git a/channels/animeworld.py b/channels/animeworld.py
index c3177aa9..727ea78c 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -3,16 +3,13 @@
 # Canale per animeworld
 # ----------------------------------------------------------
 
-from core import  support, jsontools
+from core import support, jsontools
 
 host = support.config.get_channel_url()
 headers = [['Referer', host]]
 
 __channel__ = 'animeworld'
 
-list_servers = ['directo', 'animeworld', 'vvvvid']
-list_quality = ['default', '480p', '720p', '1080p']
-
 
 def order():
     # Seleziona l'ordinamento dei risultati
@@ -35,6 +32,7 @@ def genres(item):
     action = 'peliculas'
     patronBlock = r'<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown"> Generi <span.[^>]+>(?P<block>.*?)</ul>'
     patronMenu = r'<input.*?name="(?P<name>[^"]+)" value="(?P<value>[^"]+)"\s*>[^>]+>(?P<title>[^<]+)<\/label>'
+
     def itemHook(item):
         item.url = host + '/filter?' + item.name + '=' + item.value + '&sort='
         return item
@@ -45,7 +43,8 @@ def genres(item):
 def menu(item):
     action = 'submenu'
     patronBlock=r'<form class="filters.*?>(?P<block>.*?)</form>'
-    patronMenu=r'<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown"> (?P<title>.*?) <span.[^>]+>(?P<url>.*?)</ul>'
+    patronMenu=r'<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown"> (?P<title>.*?) <span.[^>]+>(?P<other>.*?)</ul>'
+
     def itemlistHook(itemlist):
         item.title = support.typo('Tutti','bold')
         item.action = 'peliculas'
@@ -57,7 +56,7 @@ def menu(item):
 @support.scrape
 def submenu(item):
     action = 'peliculas'
-    data = item.url
+    data = item.other
     patronMenu = r'<input.*?name="(?P<name>[^"]+)" value="(?P<value>[^"]+)"\s*>[^>]+>(?P<title>[^<]+)<\/label>'
     def itemHook(item):
         item.url = host + '/filter?' + item.name + '=' + item.value + '&language[]=' + item.args + '&sort='
@@ -157,20 +156,7 @@ def findvideos(item):
 
         if serverid == '18':
             url = support.match('%s/ajax/episode/serverPlayer?id=%s' % (host, ID), patron=r'source src="([^"]+)"', debug=False).match
-            itemlist.append(
-                support.Item(
-                    channel=item.channel,
-                    action="play",
-                    title='diretto',
-                    quality='',
-                    url=url,
-                    server='directo',
-                    fulltitle=item.fulltitle,
-                    contentSerieName=item.contentSerieName,
-                    contentTitle=item.contentTitle,
-                    show=item.show,
-                    contentType=item.contentType,
-                    folder=False))
+            itemlist.append(item.clone(action="play", title='diretto', url=url, server='directo'))
 
         elif serverid == '26':
             matches = support.match('%s/ajax/episode/serverPlayer?id=%s' % (host, item.url.split('/')[-1]), patron=r'<a href="([^"]+)"', ).matches
diff --git a/channels/casacinema.py b/channels/casacinema.py
index c4046df0..c8a4fc30 100644
--- a/channels/casacinema.py
+++ b/channels/casacinema.py
@@ -10,8 +10,8 @@ from core import support
 host = support.config.get_channel_url()
 headers = [['Referer', host]]
 
-list_servers = ['verystream', 'openload', 'wstream', 'speedvideo']
-list_quality = ['HD', 'SD']
+
+
 
 @support.menu
 def mainlist(item):
diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py
index 96eb3f07..e0f9f984 100644
--- a/channels/casacinemaInfo.py
+++ b/channels/casacinemaInfo.py
@@ -32,8 +32,8 @@ from core.item import Item
 host = support.config.get_channel_url()
 headers = [['Referer', host]]
 
-list_servers = ['supervideo', 'streamcherry','rapidvideo', 'streamango', 'openload']
-list_quality = ['default', 'HD', '3D', '4K', 'DVD', 'SD']
+
+
 
 @support.menu
 def mainlist(item):
diff --git a/channels/cb01anime.py b/channels/cb01anime.py
index e4d1f6d4..b47edc59 100644
--- a/channels/cb01anime.py
+++ b/channels/cb01anime.py
@@ -9,8 +9,8 @@ from core import support
 host = support.config.get_channel_url() + '/cb01-anime-cartoon'
 
 Blacklist = ['AVVISO IMPORTANTE – CB01.ROCKS', 'Lista Alfabetica Completa Anime/Cartoon', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE','Lista Richieste Up &amp; Re-Up']
-list_servers = ['verystream', 'openload', 'streamango', 'thevideome']
-list_quality = ['1080p', '720p', '480p', '360']
+
+
 headers = [['Referer', host]]
 
 @support.menu
@@ -62,7 +62,7 @@ def peliculas(item):
     blacklist = Blacklist
     item.contentType = 'tvshow'
     if item.args == 'newest':
-        patron = r'<div id="blockvids">\s*<ul>\s*<li>\s*<a href="(?P<url>[^"]+)"[^>]+><img src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^\[]+)\[(?P<lang>[^\]]+)\]'
+        patron = r'<div id="blockvids">\s*<ul>\s*<li>\s*<a href="(?P<url>[^"]+)"[^>]+><img[^>]+src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^\[]+)\[(?P<lang>[^\]]+)\]'
     else:
         patron = r'<div class="span4">\s*<a href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+><\/a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> <h1>(?P<title>[^<\[]+)(?:\[(?P<lang>[^\]]+)\])?</h1></a>.*?-->(?:.*?<br />)?\s*(?P<plot>[^<]+)'
         patronNext = r'<link rel="next" href="([^"]+)"'
diff --git a/channels/cineblog01.py b/channels/cineblog01.py
index 15dbf9ae..88712a38 100644
--- a/channels/cineblog01.py
+++ b/channels/cineblog01.py
@@ -21,8 +21,8 @@ def findhost():
 host = config.get_channel_url(findhost)
 headers = [['Referer', host]]
 
-list_servers = ['mixdrop', 'akstream', 'wstream', 'backin']
-list_quality = ['HD', 'SD', 'default']
+
+
 
 checklinks = config.get_setting('checklinks', 'cineblog01')
 checklinks_number = config.get_setting('checklinks_number', 'cineblog01')
@@ -135,7 +135,7 @@ def episodios(item):
     data = support.match(item.url, headers=headers).data
     support.log(data)
     if 'TUTTA LA ' in data:
-        folderUrl = scrapertools.find_single_match(data, 'TUTTA LA \w+\s+(?:&#8211;|-)\s+<a href="?([^" ]+)')
+        folderUrl = scrapertools.find_single_match(data, r'TUTTA LA \w+\s+(?:&#8211;|-)\s+<a href="?([^" ]+)')
         data = httptools.downloadpage(folderUrl).data
         patron = r'<a href="(?P<url>[^"]+)[^>]+>(?P<title>[^<]+)'
         sceneTitle = True
@@ -181,18 +181,7 @@ def findvideos(item):
         matches = support.match(streaming, patron = r'<td><a.*?href=([^ ]+) [^>]+>([^<]+)<').matches
         for scrapedurl, scrapedtitle in matches:
             logger.debug("##### findvideos %s ## %s ## %s ##" % (desc_txt, scrapedurl, scrapedtitle))
-            itemlist.append(
-                Item(channel=item.channel,
-                     action="play",
-                     title=scrapedtitle,
-                     url=scrapedurl,
-                     server=scrapedtitle,
-                     fulltitle=item.fulltitle,
-                     thumbnail=item.thumbnail,
-                     show=item.show,
-                     quality=quality,
-                     contentType=item.contentType,
-                     folder=False))
+            itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl, server=scrapedtitle, quality=quality))
 
     support.log()
 
@@ -213,7 +202,7 @@ def findvideos(item):
 
     itemlist = support.server(item, itemlist=itemlist)
     # Extract the quality format
-    patronvideos = '([\w.]+)</strong></div></td>'
+    patronvideos = r'([\w.]+)</strong></div></td>'
     support.addQualityTag(item, itemlist, data, patronvideos)
 
     return itemlist
@@ -231,24 +220,13 @@ def findvid_serie(item):
         # Estrae i contenuti
         matches = support.match(html, patron=r'<a href=(?:")?([^ "]+)[^>]+>(?!<!--)(.*?)(?:</a>|<img)').matches
         for url, server in matches:
-            item = Item(channel=item.channel,
-                        action="play",
-                        title=server,
-                        url=url,
-                        server=server,
-                        fulltitle=item.fulltitle,
-                        show=item.show,
-                        quality=blktxt,
-                        contentType=item.contentType,
-                        folder=False)
+            item = item.clone(action="play", title=server, url=url, server=server, quality=blktxt)
             if 'swzz' in item.url: item.url = support.swzz_get_url(item)
             itemlist.append(item)
 
     support.log()
 
     itemlist = []
-    lnkblk = []
-    lnkblkp = []
 
     data = re.sub(r'((?:<p>|<strong>)?[^\d]*\d*(?:&#215;|×)[0-9]+[^<]+)', '' ,item.url)
 
@@ -267,4 +245,4 @@ def findvid_serie(item):
 
 def play(item):
     support.log()
-    return servertools.find_video_items(data=item.url)
+    return servertools.find_video_items(item, data=item.url)
diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py
index ea703cfe..4d8f0a5a 100644
--- a/channels/cinemalibero.py
+++ b/channels/cinemalibero.py
@@ -9,8 +9,8 @@ from core import httptools, support, scrapertools
 from core.item import Item
 from platformcode import config
 
-list_servers = ['akstream', 'wstream', 'backin', 'clipwatching', 'cloudvideo', 'verystream', 'onlystream', 'mixdrop']
-list_quality = ['default']
+
+
 
 # rimanda a .today che contiene tutti link a .plus
 # def findhost():
diff --git a/channels/cinetecadibologna.py b/channels/cinetecadibologna.py
index 34a4e8e6..885e975f 100644
--- a/channels/cinetecadibologna.py
+++ b/channels/cinetecadibologna.py
@@ -28,7 +28,7 @@ def menu(item):
     elif 'percorsi' in item.url:
         patron = r'<div class="cover_percorso">\s*<a href="(?P<url>[^"]+)">\s*<img src="(?P<thumb>[^"]+)"[^>]+>\s*[^>]+>(?P<title>.*?)<'
     else:
-        patron = r'<h2>\s*<a href="(?P<url>[^"]+)"\s*>(?P<title>[^<]+)<'
+        patron = r'<h2>\s*<a href="(?P<url>[^,"]+),[^"]+"\s*>(?P<title>[^<]+)<'
         patronNext = r'<div class="dx">\s*<a href="(.*?)">pagina suc'
     return locals()
 
@@ -68,14 +68,7 @@ def findvideos(item):
     matches = support.match(item, patron=r'filename: "(.*?)"').matches
 
     for url in matches:
-        itemlist.append(
-            Item(
-                channel=item.channel,
-                action="play",
-                title='Diretto',
-                server='directo',
-                url=host + url,
-                folder=False))
+        itemlist.append(item.clone(action="play", title='Diretto', server='directo', url=host + url))
 
     return support.server(item, itemlist=itemlist)
 
diff --git a/channels/dreamsub.py b/channels/dreamsub.py
index b05a0a11..ab21d6df 100644
--- a/channels/dreamsub.py
+++ b/channels/dreamsub.py
@@ -76,6 +76,7 @@ def newest(categoria):
 
 @support.scrape
 def peliculas(item):
+    # debug = True
     anime = True
     if 'movie' in item.url:
         item.contentType = 'movie'
@@ -88,7 +89,7 @@ def peliculas(item):
         patronBlock = r'<div id="%s"[^>]+>(?P<block>.*?)<div class="vistaDettagliata"' % item.args[1]
         patron = r'<li>\s*<a href="(?P<url>[^"]+)" title="(?P<title>[^"]+)" class="thumb">[^>]+>[^>]+>[^>]+>\s*[EePp]+\s*(?P<episode>\d+)[^>]+>[^>]+>[^>]+>(?P<lang>[^<]*)<[^>]+>[^>]+>\s<img src="(?P<thumb>[^"]+)"'
     else:
-        patron = r'<div class="showStreaming"> <b>(?P<title>[^<]+)[^>]+>[^>]+>\s*Stato streaming: (?:[^<]+)<[^>]+>[^>]+>\s*Lingua:[ ](?P<lang>ITA\/JAP|ITA|JAP|SUB ITA)?[^>]+>[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s*<div class="[^"]+" style="background: url\((?P<thumb>[^\)]+)\)'
+        patron = r'<div class="showStreaming"> <b>(?P<title>[^<]+)[^>]+>[^>]+>\s*<span>Lingua:\s*(?P<lang>[^>]+)?>[<>br\s]+a href="(?P<url>[^"]+)"[^>]+>.*?--image-url:url\(/*(?P<thumb>[^\)]+).*?Anno di inizio</b>:\s*(?P<year>[0-9]{4})'
         patronNext = '<li class="currentPage">[^>]+><li[^<]+<a href="([^"]+)">'
 
     return locals()
@@ -120,14 +121,7 @@ def findvideos(item):
         return episodios(item)
 
     if 'vvvvid' in matches.data:
-        itemlist.append(
-                support.Item(channel=item.channel,
-                            action="play",
-                            contentType=item.contentType,
-                            title='vvvid',
-                            url=support.match(matches.data, patron=r'(http://www.vvvvid[^"]+)').match,
-                            server='vvvvid',
-                            ))
+        itemlist.append(item.clone(action="play", title='VVVVID', url=support.match(matches.data, patron=r'(http://www.vvvvid[^"]+)').match, server='vvvvid'))
     else:
     # matches.matches.sort()
         support.log('VIDEO')
@@ -139,17 +133,7 @@ def findvideos(item):
                 language = 'Sub-' + language
             quality = url.split('/')[-1].split('?')[0]
 
-            itemlist.append(
-                support.Item(channel=item.channel,
-                            action="play",
-                            contentType=item.contentType,
-                            title=language,
-                            url=url,
-                            contentLanguage = language,
-                            quality = quality,
-                            order = quality.replace('p','').zfill(4),
-                            server='directo',
-                            ))
+            itemlist.append(item.clone(action="play", title=language, url=url, contentLanguage = language, quality = quality, order = quality.replace('p','').zfill(4), server='directo',))
 
     itemlist.sort(key=lambda x: (x.title, x.order), reverse=False)
     return support.server(item, itemlist=itemlist)
\ No newline at end of file
diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py
index 152493a9..c691cd82 100644
--- a/channels/eurostreaming.py
+++ b/channels/eurostreaming.py
@@ -15,15 +15,9 @@ def findhost():
 host = support.config.get_channel_url(findhost)
 headers = [['Referer', host]]
 
-
-list_servers = ['akstream', 'wstream', 'mixdrop', 'vidtome', 'turbovid', 'speedvideo', 'flashx', 'nowvideo', 'deltabit']
-list_quality = ['default']
-
 @support.menu
 def mainlist(item):
     support.log()
-
-
     tvshow = []
     anime = ['/category/anime-cartoni-animati/']
     mix = [('Aggiornamenti {bullet bold} {TV}', ['/aggiornamento-episodi/', 'peliculas', 'newest']),
@@ -37,7 +31,7 @@ def mainlist(item):
 def peliculas(item):
     action = 'episodios'
     if item.args == 'newest':
-        patron = r'<span class="serieTitle" style="font-size:20px">(?P<title>.*?)[^–â][\s]*<a href="(?P<url>[^"]+)"[^>]*> ?(?P<episode>\d+x\d+-\d+|\d+x\d+) .*?[ ]?\(?(?P<lang>SUB ITA)?\)?</a>'
+        patron = r'<span class="serieTitle" style="font-size:20px">(?P<title>[^<]+)–\s*<a href="(?P<url>[^"]+)"[^>]*>\s?(?P<episode>\d+[×x]\d+-\d+|\d+[×x]\d+) (?P<title2>[^<]+)\s?\(?(?P<lang>SUB ITA)?\)?</a>'
         pagination = ''
     else:
         patron = r'<div class="post-thumb">.*?\s<img src="(?P<thumb>[^"]+)".*?><a href="(?P<url>[^"]+)"[^>]+>(?P<title>.+?)\s?(?: Serie Tv)?\s?\(?(?P<year>\d{4})?\)?<\/a><\/h2>'
@@ -55,7 +49,7 @@ def episodios(item):
 
     def itemHook(item):
         if not item.url:
-            item.url =''
+            item.url = ''
         return item
 
     return locals()
diff --git a/channels/fastsubita.py b/channels/fastsubita.py
index 77b2deb6..0e23e097 100644
--- a/channels/fastsubita.py
+++ b/channels/fastsubita.py
@@ -23,8 +23,8 @@ from platformcode import config
 
 host = config.get_channel_url()
 headers = [['Referer', host]]
-list_servers = ['wstream', 'upstream', 'flashx', 'vidoza', 'vidtome']
-list_quality = ['default']
+
+
 
 
 @support.menu
@@ -100,7 +100,6 @@ def genres(item):
 
 def search(item, text):
     support.log('search', item)
-    itemlist = []
     text = text.replace(' ', '+')
     item.url = host + '?s=' + text
     try:
@@ -133,7 +132,7 @@ def newest(categoria):
         except:
             import sys
             for line in sys.exc_info():
-                support.log('newest log: ', {0}.format(line))
+                support.log('newest log: ', line)
             return []
 
     return itemlist
@@ -163,16 +162,16 @@ def findvideos(item):
     titles = support.typo(series.upper().replace('-', ' '), 'bold color kod')
     goseries = support.typo("Vai alla Serie:", ' bold color kod')
     itemlist.append(
-        Item(channel=item.channel,
-                title=goseries + titles,
-                fulltitle=titles,
-                show=series,
-                contentType='tvshow',
-                contentSerieName=series,
-                url=host+"/serietv/"+series,
-                action='episodios',
-                contentTitle=titles,
-                plot = "Vai alla Serie " + titles + " con tutte le puntate",
-                ))
+        item.clone(channel=item.channel,
+                   title=goseries + titles,
+                   fulltitle=titles,
+                   show=series,
+                   contentType='tvshow',
+                   contentSerieName=series,
+                   url=host+"/serietv/"+series,
+                   action='episodios',
+                   contentTitle=titles,
+                   plot = "Vai alla Serie " + titles + " con tutte le puntate",
+                   ))
 
     return itemlist
diff --git a/channels/filmigratis.json b/channels/filmigratis.json
index 6a970b15..88221ecc 100644
--- a/channels/filmigratis.json
+++ b/channels/filmigratis.json
@@ -1,7 +1,7 @@
 {
   "id": "filmigratis",
   "name": "Filmi Gratis",
-  "active": true,
+  "active": false,
   "language": ["ita", "sub-ita"],
   "thumbnail": "filmigratis.png",
   "banner": "filmigratis.png",
diff --git a/channels/filmigratis.py b/channels/filmigratis.py
index 00bf7c57..4f9335cb 100644
--- a/channels/filmigratis.py
+++ b/channels/filmigratis.py
@@ -19,8 +19,8 @@ from platformcode import config
 
 host = config.get_channel_url()
 
-list_servers = ['verystream', 'openload', 'streamango', 'vidoza', 'okru']
-list_quality = ['1080p', '720p', '480p', '360']
+
+
 
 headers = [['Referer', host]]
 
diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py
index a5fc8c9f..b4c7b8ea 100644
--- a/channels/filmpertutti.py
+++ b/channels/filmpertutti.py
@@ -16,8 +16,8 @@ def findhost():
 
 host = config.get_channel_url(findhost)
 headers = [['Referer', host]]
-list_servers = ['mixdrop', 'akvideo', 'wstream', 'onlystream', 'speedvideo']
-list_quality = ['HD', 'SD']
+
+
 
 @support.menu
 def mainlist(item):
diff --git a/channels/filmsenzalimiticc.json b/channels/filmsenzalimiticc.json
deleted file mode 100644
index 76a9eb72..00000000
--- a/channels/filmsenzalimiticc.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "id": "filmsenzalimiticc",
-    "name": "Filmsenzalimiti CC",
-    "active": false,
-    "language": ["ita"],
-    "thumbnail": "filmsenzalimiticc.png",
-    "banner": "",
-    "categories": ["movie","tvshow"],
-    "settings": [
-        {
-            "id": "include_in_global_search",
-            "type": "bool",
-            "label": "Includi ricerca globale",
-            "default": false,
-            "enabled": false,
-            "visible": false
-        },
-        {
-            "id": "include_in_newest_peliculas",
-            "type": "bool",
-            "label": "Includi in Novità - Film",
-            "default": true,
-            "enabled": true,
-            "visible": true
-        },	
-        {
-            "id": "include_in_newest_series",
-            "type": "bool",
-            "label": "Includi in Novità - Serie TV",
-            "default": true,
-            "enabled": true,
-            "visible": true
-        },
-        {
-            "id": "checklinks",
-            "type": "bool",
-            "label": "Verifica se i link esistono",
-            "default": false,
-            "enabled": true,
-            "visible": true
-        },
-        {
-            "id": "checklinks_number",
-            "type": "list",
-            "label": "Numero de link da verificare",
-            "default": 1,
-            "enabled": true,
-            "visible": "eq(-1,true)",
-            "lvalues": [ "1", "3", "5", "10" ]
-        },
-        {
-            "id": "filter_languages",
-            "type": "list",
-            "label": "Mostra link in lingua...",
-            "default": 0,
-            "enabled": true,
-            "visible": true,
-            "lvalues": ["Non filtrare","IT"]
-        }
-    ]
-}
diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py
deleted file mode 100644
index 25ad2875..00000000
--- a/channels/filmsenzalimiticc.py
+++ /dev/null
@@ -1,317 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-# Canale per Filmsenzalimiti CC
-# ------------------------------------------------------------
-import re
-
-try:
-    import urlparse
-except:
-    import urllib.parse as urlparse
-
-from core import scrapertools, servertools, httptools
-from core import tmdb
-from core.item import Item
-from platformcode import config
-from platformcode import logger
-from specials import autoplay
-
-# Necessario per Autoplay
-host = config.get_channel_url()
-
-IDIOMAS = {'Italiano': 'IT'}
-list_language = IDIOMAS.values()
-list_servers = ['verystream', 'openload', 'vidlox', 'youtube']
-list_quality = ['default']
-
-# Necessario per Verifica Link
-checklinks = config.get_setting('checklinks', 'filmsenzalimiticc')
-checklinks_number = config.get_setting('checklinks_number', 'filmsenzalimiticc')
-
-headers = [['Referer', host]]
-
-
-
-def mainlist(item):
-    logger.info('[filmsenzalimiticc.py] mainlist')
-    
-    autoplay.init(item.channel, list_servers, list_quality) # Necessario per Autoplay
-
-    # Menu Principale
-    itemlist = [Item(channel=item.channel,
-                     action='video',
-                     title='Film',
-                     url=host,
-                     contentType='movie',
-                     thumbnail=''),
-                Item(channel=item.channel,
-                     action='sottomenu_film',
-                     title='Categorie Film',
-                     url=host,
-                     contentType='movie',
-                     thumbnail=''),
-                Item(channel=item.channel,
-                     action='video',
-                     title='Serie TV',
-                     url=host+'/serie-tv/',
-                     contentType='tvshow',
-                     thumbnail=''),
-                Item(channel=item.channel,
-                     action='sottomenu_serie',
-                     title='[B]Categorie Serie TV[/B]',
-                     thumbnail=''),
-                Item(channel=item.channel,
-                     action='search',
-                     extra='tvshow',
-                     title='[B]Cerca... (non funziona)[/B]',
-                     thumbnail='')
-                ]
-    
-    autoplay.show_option(item.channel, itemlist) # Necessario per Autoplay (Menu Configurazione)
-    
-    return itemlist
-    
-def search(item, texto):
-    logger.info('[filmsenzalimiticc.py] search')
-
-    item.url = host + '/?s=' + texto
-
-    try:
-        return video(item)
-
-    # Continua la ricerca in caso di errore .
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error('%s' % line)
-        return []
-        
-def sottomenu_film(item):
-    logger.info('[filmsenzalimiticc.py] sottomenu_film')
-    itemlist = []
-
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url).data
-
-    # Estrae i contenuti
-    patron = "<li><a href='([^']+)'>(.*?)<"
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        itemlist.append(
-            Item(channel=__channel__,
-                 action='video',
-                 contentType=item.contentType,
-                 title=scrapedtitle,
-                 url=scrapedurl))
-
-    # Elimina le Serie al Sottomenù
-    itemlist.pop(3)
-    itemlist.pop(29)
-    itemlist.pop(29)
-    itemlist.pop(32)
-
-    return itemlist
-    
-def sottomenu_serie(item):
-    logger.info('[seriehd.py] sottomenu_serie')
-    itemlist = [
-                Item(channel=item.channel,
-                     action='video',
-                     title='Serie TV HD',
-                     url=host+'/watch-genre/serie-altadefinizione/',
-                     contentType='tvshow',
-                     thumbnail=''),
-                Item(channel=item.channel,
-                     action='video',
-                     title='Miniserie',
-                     url=host+'/watch-genre/miniserie/',
-                     contentType='tvshow',
-                     thumbnail=''),
-                Item(channel=item.channel,
-                     action='video',
-                     title='Programmi TV',
-                     url=host+'/watch-genre/programmi-tv/',
-                     contentType='tvshow',
-                     thumbnail='')   
-                ]
-                
-    return itemlist
-
-
-def video(item):
-    logger.info('[filmsenzalimiticc.py] video')
-    itemlist = []
-
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url).data.replace('\n','').replace('\t','')
-
-    # Estrae i contenuti 
-    patron = r'<div class="mediaWrap mediaWrapAlt">.*?<a href="([^"]+)".*?src="([^"]+)".*?<p>([^"]+) (\(.*?)streaming<\/p>.*?<p>\s*(\S+).*?<\/p>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, scrapedquality in matches:
-        scrapedthumbnail = httptools.get_url_headers(scrapedthumbnail)
-        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
-        scrapedyear = scrapertools.decodeHtmlentities(scrapedyear)
-        scrapedquality = scrapertools.decodeHtmlentities(scrapedquality)
-
-        year = scrapedyear.replace('(','').replace(')','')
-        infolabels = {}
-        if year:
-            infolabels['year'] = year
-
-        title = scrapedtitle + ' '+ scrapedyear +' [' + scrapedquality + ']'
-        
-        # Seleziona fra Serie TV e Film
-        if item.contentType == 'movie':
-            azione = 'findvideos'
-            tipologia = 'movie'
-        if item.contentType == 'tvshow':
-            azione='episodios'
-            tipologia = 'tv'
-        
-        itemlist.append(
-            Item(channel=item.channel,
-                 action=azione,
-                 contentType=item.contentType,
-                 title=title,
-                 fulltitle=scrapedtitle,
-                 text_color='azure',
-                 url=scrapedurl,
-                 thumbnail=scrapedthumbnail,
-                 infoLabels=infolabels,
-                 show=scrapedtitle))
-
-    # Next page
-    next_page = scrapertools.find_single_match(data, '<a class="nextpostslink".*?href="([^"]+)">')
-
-    if next_page != '':
-        itemlist.append(
-            Item(channel=item.channel,
-                 action='film',
-                 title='[COLOR lightgreen]' + config.get_localized_string(30992) + '[/COLOR]',
-                 url=next_page,
-                 contentType=item.contentType,
-                 thumbnail='http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png'))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    return itemlist
-
-
-
-def findvideos(item): # Questa def. deve sempre essere nominata findvideos
-    logger.info('[filmsenzalimiticc.py] findvideos')
-    itemlist = []
-
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url, headers=headers).data
-    
-    # Aggira protectlink
-    if 'protectlink' in data:
-        urls = scrapertools.find_multiple_matches(data, r'<iframe src="[^=]+=(.*?)"')
-        for url in urls:
-            url= url.decode('base64')
-            if '\t' in url:    #fix alcuni link presentano una tabulazione finale.
-                url = url[:-1]
-            data += '\t' + url
-        if 'nodmca' in data:    #fix player Openload sezione Serie TV
-            page = httptools.downloadpage(url, headers=headers).data
-            data += '\t' + scrapertools.find_single_match(page,'<meta name="og:url" content="([^=]+)">')
-            
-           
-
-    itemlist = servertools.find_video_items(data=data)    
-
-    for videoitem in itemlist:
-        videoitem.title = item.fulltitle + ' - [[COLOR limegreen]'+videoitem.title+'[/COLOR] ]'
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.show = item.show
-        videoitem.plot = item.plot
-        videoitem.channel = item.channel
-        videoitem.contentType = item.contentType
-
-    # Link Aggiungi alla Libreria
-    if item.contentType != 'episode':
-        if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findservers':
-            itemlist.append(
-                Item(channel=item.channel, title='[COLOR lightblue][B]Aggiungi alla videoteca[/B][/COLOR]', url=item.url,
-                     action='add_pelicula_to_library', extra='findservers', contentTitle=item.contentTitle))
-
-    # Necessario per  FilterTools
-    # itemlist = filtertools.get_links(itemlist, item, list_language)
-
-    # Necessario per  AutoPlay
-    autoplay.start(itemlist, item)
-    
-    
-    
-    return itemlist
-
-
-
-def episodios(item): # Questa def. deve sempre essere nominata episodios
-    logger.info('[filmsenzalimiticc.py] episodios')
-    itemlist = []
-    
-    # Trova le Stagioni
-    
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url, headers=headers).data
-
-    # Estrae i contenuti
-    patron = r'<iframe src="([^"]+)".*?>'
-    url = scrapertools.find_single_match(data, patron)
-
-    # Carica la pagina 
-    data = httptools.downloadpage(url).data.replace('\t', '').replace('\n', '')
-
-    # Estrae i contenuti
-    section_stagione = scrapertools.find_single_match(data, r'Stagioni<\/a>(.*?)<\/ul>')
-    patron = r'<a href="([^"]+)" >.*?<\/i>\s(.*?)<\/a>'
-    seasons = re.compile(patron, re.DOTALL).findall(section_stagione)
-
-    for scrapedseason_url, scrapedseason in seasons:
-
-        # Trova gli Episodi
-        
-        season_url = urlparse.urljoin(url, scrapedseason_url)
-        
-        # Carica la pagina 
-        data = httptools.downloadpage(season_url).data.replace('\t', '').replace('\n', '')
-
-        # Estrae i contenuti
-        section_episodio = scrapertools.find_single_match(data, r'Episodio<\/a>(.*?)<\/ul>')
-        patron = r'<a href="([^"]+)" >.*?<\/i>\s(.*?)<\/a>'
-        episodes = re.compile(patron, re.DOTALL).findall(section_episodio)
-
-        for scrapedepisode_url, scrapedepisode in episodes:
-            episode_url = urlparse.urljoin(url, scrapedepisode_url)
-
-            title = scrapedseason + 'x' + scrapedepisode.zfill(2)
-
-            itemlist.append(
-                Item(channel=item.channel,
-                     action='findvideos',
-                     contentType='episode',
-                     title=title,
-                     url=episode_url,
-                     fulltitle=title + ' - ' + item.show,
-                     show=item.show,
-                     thumbnail=item.thumbnail))
-    
-    # Link Aggiungi alla Libreria
-    if config.get_videolibrary_support() and len(itemlist) != 0:
-        itemlist.append(
-            Item(channel=item.channel,
-                 title='[COLOR lightblue][B]Aggiungi Serie alla videoteca[/B][/COLOR]',
-                 url=item.url,
-                 action='add_serie_to_library',
-                 extra='episodios' + '###' + item.extra,
-                 show=item.show))
-
-    return itemlist
-
-
-
diff --git a/channels/guardaserieCam.json b/channels/guardaserieCam.json
new file mode 100644
index 00000000..83a4730d
--- /dev/null
+++ b/channels/guardaserieCam.json
@@ -0,0 +1,11 @@
+{
+    "id": "guardaserieCam",
+    "name": "GuardaSerie Cam",
+    "language": ["ita", "sub-ita"],
+    "active": true,
+    "thumbnail": "https://raw.githubusercontent.com/32Dexter/DexterRepo/master/media/guardaserie_live.png",
+    "banner": "",
+    "categories": ["tvshow"],
+    "not_active": ["include_in_newest"],
+    "settings": []
+}
diff --git a/channels/guardaserieCam.py b/channels/guardaserieCam.py
new file mode 100644
index 00000000..03b27fd2
--- /dev/null
+++ b/channels/guardaserieCam.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Canale per 'guardaserie_live'
+# By: Napster32
+# ------------------------------------------------------------
+# Rev: 0.0
+# Update 11-06-2020
+# fix:
+# 1. Emissione
+
+# possibilità di miglioramento: inserire menu per genere - lista serie tv e gestire le novità
+
+from core import support
+from core.support import log
+from platformcode import logger, config
+
+host = config.get_channel_url()
+headers = [['Referer', host]]
+
+
+
+
+
+@support.menu
+def mainlist(item):
+    tvshow = ['/serietv-streaming',
+              ('Per Lettera', ['/serietv-streaming/A', 'list', 'Serie-Tv per Lettera'])
+              ]
+    return locals()
+
+
+@support.scrape
+def list(item):
+    patronMenu = r'<a title="(?P<title>[^"]+)" href="(?P<url>[^"]+)'
+    action = 'peliculas'
+    return locals()
+
+
+@support.scrape
+def peliculas(item):
+    patron = r'<div class="mlnh-thumb"><a href="(?P<url>[^"]+).*?title="(?P<title>[^"]+).*?src="(?P<thumb>[^"]+).*?hdn">(?P<year>[0-9]{4})'
+    patronNext = 'pagenavi.*?<span>.</span>.*?<a href="([^"]+)'
+    action = 'episodios'
+    return locals()
+
+
+@support.scrape
+def episodios(item):
+    patronBlock = r'<div class="tab-pane fade" id="season-(?P<season>.)"(?P<block>.*?)</div>'
+    patron = r'<a href="#" allowfullscreen data-link="(?P<url>[^"]+).*?title="(?P<title>[^"]+)(?P<lang>[sS][uU][bB]-?[iI][tT][aA])?\s*">(?P<episode>[^<]+)'
+    action = 'findvideos'
+    # debug = True
+    return locals()
+
+
+def search(item, text):
+    support.log('search', item)
+    item.contentType = 'tvshow'
+    itemlist = []
+    text = text.replace(' ', '+')
+    item.url = host + '/index.php?story=%s&do=search&subaction=search' % (text)
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            log('search log:', line)
+        return []
+
+
+def findvideos(item):
+    logger.info("[guardaserie_live] findvideos")
+    return support.server(item, item.url)
\ No newline at end of file
diff --git a/channels/guardaserieIcu.json b/channels/guardaserieIcu.json
new file mode 100644
index 00000000..86531e5b
--- /dev/null
+++ b/channels/guardaserieIcu.json
@@ -0,0 +1,11 @@
+{
+    "id": "guardaserieIcu",
+    "name": "Guarda Serie Icu",
+    "language": ["ita", "sub-ita"],
+    "active": false,
+    "thumbnail": "https://raw.githubusercontent.com/32Dexter/DexterRepo/master/media/guarda_serie.jpg",
+    "banner": "",
+    "categories": ["tvshow"],
+    "not_active": ["include_in_newest"],
+    "settings": []
+}
diff --git a/channels/guardaserieIcu.py b/channels/guardaserieIcu.py
new file mode 100644
index 00000000..fda9c818
--- /dev/null
+++ b/channels/guardaserieIcu.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Canale per 'Guarda_Serie'
+# By: Napster32
+# ------------------------------------------------------------
+# Rev: 0.0
+# Update 11-06-2020
+# fix:
+# 1. Emissione
+
+# possibilità di miglioramento: gestire le novità (sezione Ultimi episodi sul sito)
+
+from core.support import log
+from core import support
+from platformcode import config
+
+host = config.get_channel_url()
+headers = [['Referer', host]]
+
+
+
+
+@support.menu
+def mainlist(item):
+    tvshow = ['/serie']
+    return locals()
+
+@support.scrape
+def peliculas(item):
+    patronBlock = r'movies-list movies-list-full(?P<block>.*?)footer>'
+    patron = r'<div data-movie-id.*?a href="(?P<url>[^"]+).*?<img data-original="(?P<thumbnail>[^"]+).*?qtip-title">(?P<title>[^<]+).*?(?:rel="tag">(?P<year>[0-9]{4}))?</a>'
+    patronNext = '<li class=.active.>.*?href=.(.*?).>'
+    action = 'episodios'
+    return locals()
+
+@support.scrape
+def episodios(item):
+    patronBlock = r'<strong>Stagione (?P<season>[0-9]+)(?P<block>.*?)</div></div>'
+    patron = r'<a href="(?P<url>[^"]+)">\s*Episodio\s*(?P<episode>[0-9]+)'
+    return locals()
+
+def search(item, text):
+    log(text)
+    itemlist = []
+    text = text.replace(' ', '+')
+    item.url = host + "/?s=" + text
+    try:
+        item.args = 'search'
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            log("%s" % line)
+
+    return []
+
+def findvideos(item):
+    support.log('findvideos', item)
+    return support.server(item, headers=headers)
\ No newline at end of file
diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py
index 99380efd..e81dd22f 100644
--- a/channels/guardaserieclick.py
+++ b/channels/guardaserieclick.py
@@ -22,8 +22,6 @@ from core.support import log
 host = config.get_channel_url()
 headers = [['Referer', host]]
 
-list_servers = ['speedvideo', 'openload']
-list_quality = ['default']
 
 @support.menu
 def mainlist(item):
diff --git a/channels/hd4me.py b/channels/hd4me.py
index c3d22289..fc9666fc 100644
--- a/channels/hd4me.py
+++ b/channels/hd4me.py
@@ -9,8 +9,8 @@ from core import httptools, support
 host = support.config.get_channel_url()
 headers = [['Referer', host]]
 
-list_servers = ['mega']
-list_quality = ['default']
+
+
 
 @support.menu
 def mainlist(item):
diff --git a/channels/ilcorsaronero.py b/channels/ilcorsaronero.py
index db839bef..0a93287d 100644
--- a/channels/ilcorsaronero.py
+++ b/channels/ilcorsaronero.py
@@ -15,8 +15,8 @@ support.log('HOST',host)
 # host = 'https://ilcorsaronero.xyz'
 headers = [['Referer', host]]
 
-list_servers = ['torrent']
-list_quality = ['default']
+
+
 
 @support.menu
 def mainlist(item):
@@ -51,8 +51,7 @@ def peliculas(item):
     if item.args[1] in ['tvshow', 'anime', 'music', 'other']:
         patron = r'>[^"<]+'
     else:
-        patron = r'>(?P<quality>[^"<]+)'
-    patron += '</td> <TD[^>]+><A class="tab" HREF="(?P<url>[^"]+)"\s*>(?P<title>[^<]+)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<size>[^<]+)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<seed>[^<]+)'
+        patron = r'>(?P<quality>[^"<]+)</td> <TD[^>]+><A class="tab" HREF="(?P<url>[^"]+)"\s*>(?P<title>[^<]+)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<size>[^<]+)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<seed>[^<]+)'
     def itemHook(item):
         item.contentType = item.args[1]
 
@@ -62,21 +61,13 @@ def peliculas(item):
         def itemlistHook(itemlist):
             args = item.args
             args[0] += 1
-            itemlist.append(
-                support.Item(channel=item.channel,
-                            action = item.action,
-                            contentType=item.contentType,
-                            title=support.typo(support.config.get_localized_string(30992), 'color kod bold'),
-                            url=item.url,
-                            args=args,
-                            thumbnail=support.thumb()))
+            itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'), args=args, thumbnail=support.thumb()))
             return itemlist
     return locals()
 
 
 def search(item, text):
     support.log(item, text)
-    itemlist = []
     if 'all' in item.args:
         item.url += text
     else:
diff --git a/channels/ilgeniodellostreaming.json b/channels/ilgeniodellostreaming.json
index 61bc398b..f79c90f4 100644
--- a/channels/ilgeniodellostreaming.json
+++ b/channels/ilgeniodellostreaming.json
@@ -6,5 +6,5 @@
     "thumbnail": "ilgeniodellostreaming.png",
     "banner": "ilgeniodellostreaming.png",
     "categories": ["movie", "tvshow", "anime", "vos"],
-    "settings": []
+    "settings": ["include_in_newest_anime"]
 }
diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py
index 56414785..d061cd96 100644
--- a/channels/ilgeniodellostreaming.py
+++ b/channels/ilgeniodellostreaming.py
@@ -7,16 +7,12 @@
 
 import re
 
-from core import scrapertools, httptools, support
+from core import support
 from core.support import log
 from core.item import Item
 from platformcode import config
 
 host = config.get_channel_url()
-
-list_servers = ['verystream', 'openload', 'streamango']
-list_quality = ['default']
-
 headers = [['Referer', host]]
 
 @support.menu
diff --git a/channels/italiaserie.py b/channels/italiaserie.py
index 8269a6f1..d8622ad0 100644
--- a/channels/italiaserie.py
+++ b/channels/italiaserie.py
@@ -22,9 +22,6 @@ from platformcode import config
 host = config.get_channel_url()
 headers = [['Referer', host]]
 
-list_servers = ['speedvideo']
-list_quality = []
-
 
 @support.menu
 def mainlist(item):
diff --git a/channels/mediasetplay.json b/channels/mediasetplay.json
new file mode 100644
index 00000000..cec5e42b
--- /dev/null
+++ b/channels/mediasetplay.json
@@ -0,0 +1,13 @@
+{
+    "id": "mediasetplay",
+    "name": "Mediaset Play",
+    "active": false,
+    "language": ["ita"],
+    "thumbnail": "mediasetplay.png",
+    "banner": "mediasetplay.png",
+    "categories": ["movie", "tvshow", "documentary", "live"],
+    "not_active": ["include_in_newest"],
+    "default_off": ["include_in_global_search"],
+    "settings": [],
+    "cloudflare": true
+}
diff --git a/channels/mediasetplay.py b/channels/mediasetplay.py
new file mode 100644
index 00000000..dfee290c
--- /dev/null
+++ b/channels/mediasetplay.py
@@ -0,0 +1,230 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Canale per Mediaset Play
+# ------------------------------------------------------------
+
+import requests
+from core import support, httptools
+import sys
+if sys.version_info[0] >= 3:
+    from concurrent import futures
+    from urllib.parse import urlencode, quote
+else:
+    from concurrent_py2 import futures
+    from urllib import urlencode, quote
+
+current_session = requests.Session()
+data = {"cid": "dc4e7d82-89a5-4a96-acac-d3c7f2ca6d67", "platform": "pc", "appName": "web/mediasetplay-web/576ea90"}
+res = current_session.post("https://api-ott-prod-fe.mediaset.net/PROD/play/idm/anonymous/login/v1.0", json=data, verify=False)
+current_session.headers.update({'t-apigw': res.headers['t-apigw']})
+current_session.headers.update({'t-cts': res.headers['t-cts']})
+tracecid=res.json()['response']['traceCid']
+cwid=res.json()['response']['cwId']
+res = current_session.get("https://api.one.accedo.tv/session?appKey=59ad346f1de1c4000dfd09c5&uuid=sdd",verify=False)
+current_session.headers.update({'x-session': res.json()['sessionKey']})
+host = ''
+entry = 'https://api.one.accedo.tv/content/entry/{id}?locale=it'
+entries = 'https://api.one.accedo.tv/content/entries?id={id}&locale=it'
+
+
+@support.menu
+def mainlist(item):
+    top =  [('Dirette {bold}', ['https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-stations?sort=ShortTitle', 'live'])]
+
+    menu = [('Film {bullet bold}', ['5acfcbc423eec6000d64a6bb', 'menu', ['Tutti','all','Cinema']]),
+            ('Fiction / Serie TV {bullet bold}', ['5acfcb3c23eec6000d64a6a4', 'menu', ['Tutte','all','Fiction'], 'tvshow']),
+            ('Programmi TV{ bullet bold}', ['', 'menu', ['Tutti','all','Programmi Tv'], 'tvshow']),
+            ('Documentari {bullet bold}', ['5bfd17c423eec6001aec49f9', 'menu', ['Tutti','all','Documentari'], 'undefined']),
+            ('Kids {bullet bold}', ['5acfcb8323eec6000d64a6b3', 'menu',['Tutti','all','Kids'], 'undefined']),
+           ]
+
+    search = ''
+    return locals()
+
+
+
+def search(item, text):
+    support.log(text)
+    item.search = text
+    if not item.args:
+        item.contentType = 'undefined'
+        item.args=['','all','']
+    itemlist = []
+    try:
+        itemlist += peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            support.logger.error("%s" % line)
+    return itemlist
+
+def menu(item):
+    support.log()
+    itemlist = [item.clone(title=support.typo(item.args[0],'bullet bold'), url='', action='peliculas')]
+    if item.url:
+        json = get_from_id(item)
+        for it in json:
+            if 'uxReference' in it: itemlist.append(item.clone(title=support.typo(it['title'], 'submenu'), url=it['uxReference'], args = '', action='peliculas'))
+    itemlist.append(item.clone(title=support.typo('Cerca...','submenu bold'), url='', action ='search'))
+    return itemlist
+
+def live(item):
+    support.log()
+    itemlist = []
+    json = current_session.get(item.url).json()['entries']
+    for it in json:
+        urls = []
+        if it['tuningInstruction'] and not it['mediasetstation$digitalOnly']:
+            guide=current_session.get('https://static3.mediasetplay.mediaset.it/apigw/nownext/' + it['callSign'] + '.json').json()['response']
+            plot = support.typo(guide['currentListing']['mediasetlisting$epgTitle'],'bold') + '\n' + guide['currentListing']['mediasetlisting$shortDescription'] + '\n' + guide['currentListing']['description'] + '\n\n' + support.typo('A Seguire:' + guide['nextListing']['mediasetlisting$epgTitle'], 'bold')
+            for key in it['tuningInstruction']['urn:theplatform:tv:location:any']: urls += key['publicUrls']
+            itemlist.append(item.clone(title=support.typo(it['title'], 'bold'),
+                                       fulltitle=it['title'],
+                                       show=it['title'],
+                                       contentTitle=it['title'],
+                                       thumbnail=it['thumbnails']['channel_logo-100x100']['url'],
+                                       forcethumb = True,
+                                       url=urls,
+                                       plot=plot,
+                                       action='play'))
+    return itemlist
+
+def peliculas(item):
+    support.log()
+    itemlist = []
+    contentType = ''
+    json = get_programs(item)
+    for it in json:
+        if item.search.lower() in it['title'].lower():
+            if item.contentType == 'movie':
+                action = 'findvideos'
+                urls = []
+                if 'media' not in it: it = subBrand(it['mediasetprogram$brandId'])[-1]
+                if 'media' in it:
+                    for key in it['media']:
+                        urls.append(key['publicUrl'])
+            elif item.contentType == 'tvshow':
+                action = 'episodios'
+                urls = it['mediasetprogram$brandId']
+            else:
+                if 'media' in it:
+                    action = 'findvideos'
+                    contentType = 'movie'
+                    urls = []
+                    for key in it['media']:
+                        urls.append(key['publicUrl'])
+                else:
+                    action = 'episodios'
+                    contentType = 'tvshow'
+                    urls = it['mediasetprogram$brandId']
+            if urls:
+                itemlist.append(
+                    item.clone(channel=item.channel,
+                               action=action,
+                               title=support.typo(it['title'], 'bold'),
+                               fulltitle=it['title'],
+                               show=it['title'],
+                               contentType=contentType if contentType else item.contentType,
+                               contentTitle=it['title'] if 'movie' in [contentType, item.contentType] else '',
+                               contentSerieName=it['title'] if 'tvshow' in [contentType, item.contentType] else '',
+                               thumbnail=it['thumbnails']['image_vertical-264x396']['url'],
+                               fanart=it['thumbnails']['image_keyframe_poster-1280x720']['url'] if 'image_keyframe_poster-1280x720' in it['thumbnails'] else '',
+                               plot=it['longDescription'] if 'longDescription' in it else it['description'] if 'description' in it else '',
+                               url=urls))
+    return itemlist
+
+def episodios(item):
+    support.log()
+    itemlist = []
+    subBrandId = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-brands?byCustomValue={brandId}{' + item.url + '}').json()['entries'][-1]['mediasetprogram$subBrandId']
+    json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + subBrandId + '}').json()['entries']
+    for it in json:
+        urls = []
+        if 'media' in it:
+            for key in it['media']:
+                urls.append(key['publicUrl'])
+        if urls:
+            title = it['title'].split('-')[-1].strip()
+            if it['tvSeasonNumber'] and it['tvSeasonEpisodeNumber']:
+                item.infoLabels['season'] = it['tvSeasonNumber']
+                item.infoLabels['episode'] = it['tvSeasonEpisodeNumber']
+                episode = '%dx%02d - ' % (it['tvSeasonNumber'], it['tvSeasonEpisodeNumber'])
+            else: episode = ''
+            itemlist.append(
+                item.clone(action='findvideos',
+                           title=support.typo(episode + title, 'bold'),
+                           fulltitle=title,
+                           show=title,
+                           contentType='episode',
+                           contentSerieName = title,
+                           thumbnail=it['thumbnails']['image_vertical-264x396']['url'],
+                           fanart=it['thumbnails']['image_keyframe_poster-1280x720']['url'] if 'image_keyframe_poster-1280x720' in it['thumbnails'] else '',
+                           plot=it['longDescription'] if 'longDescription' in it else it['description'],
+                           url=urls))
+    support.videolibrary(itemlist, item)
+    return sorted(itemlist, key=lambda it: it.title)
+
+def findvideos(item):
+    support.log()
+    itemlist = []
+    itemlist.append(support.Item(server = 'directo', title = 'Direct', url = item.url, action = 'play'))
+    return support.server(item, itemlist=itemlist, Download=False)
+
+def play(item):
+    support.log()
+    for url in item.url:
+        url = httptools.downloadpage(url, allow_redirects=True).url
+        if '.mpd' in url: data = url
+    return support.servertools.find_video_items(item, data=data)
+
+def subBrand(json):
+    support.log()
+    subBrandId = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-brands?byCustomValue={brandId}{' + json + '}').json()['entries'][-1]['mediasetprogram$subBrandId']
+    json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + subBrandId + '}').json()['entries']
+    return json
+
+def get_from_id(item):
+    support.log()
+    json = current_session.get(entry.format(id=item.url)).json()
+    if 'components' in json:
+        id = quote(",".join(json["components"]))
+        json = current_session.get(entries.format(id=id)).json()
+    if 'entries' in json:
+        support.log(json['entries'])
+        return json['entries']
+    return {}
+
+def get_programs(item, ret=[], args={}):
+    support.log()
+    hasMore = False
+    if not args:
+        if item.url:
+            args['uxReference'] = item.url
+            args['platform'] = 'pc'
+        else:
+            args = {"query": "*:*"}
+            if item.args[2]:
+                args['categories'] = item.args[2]
+
+        args['cwId'] = cwid
+        args['traceCid'] = tracecid
+        args['hitsPerPage'] = 500
+        args['page'] = '0'
+
+    if 'all' in item.args: url = 'https://api-ott-prod-fe.mediaset.net/PROD/play/rec/azlisting/v1.0?' + urlencode(args)
+    else: url="https://api-ott-prod-fe.mediaset.net/PROD/play/rec/cataloguelisting/v1.0?" + urlencode(args)
+    json = current_session.get(url).json()
+    if 'response' in json:
+        json = json['response']
+    if 'hasMore' in json:
+        hasMore = json['hasMore']
+    if 'components' in json:
+        id = quote(",".join(json["components"]))
+        json = current_session.get(entries.format(id=id)).json()
+    if 'entries' in json:
+        ret += json['entries']
+    if hasMore:
+        args['page'] = str(int(args['page']) + 1)
+        return get_programs(item, ret, args)
+    else:
+        return ret
\ No newline at end of file
diff --git a/channels/metalvideo.py b/channels/metalvideo.py
index ec7d0a33..623672c6 100644
--- a/channels/metalvideo.py
+++ b/channels/metalvideo.py
@@ -14,8 +14,8 @@ from xml.dom import minidom
 host = 'https://metalvideo.com'
 headers={'X-Requested-With': 'XMLHttpRequest'}
 
-list_servers = ['youtube']
-list_quality = ['default']
+
+
 
 @support.scrape
 def mainlist(item):
@@ -38,8 +38,6 @@ def mainlist(item):
                 action='search',
                 thumbnail=support.thumb(thumb='search.png')))
 
-        support.autoplay.init(item.channel, list_servers, list_quality)
-        support.autoplay.show_option(item.channel, itemlist)
         support.channel_config(item, itemlist)
         return itemlist
     return locals()
diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py
index 9b6b0044..13997cd3 100644
--- a/channels/mondoserietv.py
+++ b/channels/mondoserietv.py
@@ -9,8 +9,8 @@ host = support.config.get_channel_url()
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
-list_servers = ['akstream', 'wstream', 'vidtome', 'backin', 'nowvideo', 'verystream']
-list_quality = ['default']
+
+
 
 headers = {'Referer': host}
 
diff --git a/channels/netfreex.py b/channels/netfreex.py
index 20c22627..df9f730b 100644
--- a/channels/netfreex.py
+++ b/channels/netfreex.py
@@ -7,16 +7,16 @@ from core import support
 from core.item import Item
 from platformcode import logger, config
 
-def findhost():
-    return 'https://' + support.match('https://netfreex.uno/', patron='value="site:([^"]+)"').match
+# def findhost():
+#     return 'https://' + support.match('https://netfreex.uno/', patron='value="site:([^"]+)"').match
 
-host = config.get_channel_url(findhost)
+host = config.get_channel_url()
 headers = ""
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
-list_servers = ['wstream']
-list_quality = ['1080p', 'HD', 'SD', 'CAM']
+
+
 
 
 @support.menu
@@ -59,15 +59,7 @@ def findvideos(item):
         if link['title'] != 'Guarda il trailer':
             logger.info(link['title'])
             itemlist.append(
-                Item(channel=item.channel,
-                     action="play",
-                     url=link['url'],
-                     fulltitle=item.fulltitle,
-                     thumbnail=item.thumbnail,
-                     show=item.show,
-                     quality=link['title'],
-                     contentType=item.contentType,
-                     folder=False))
+                item.clone(action="play", url=link['url'], quality=link['title']))
     return support.server(item, itemlist=itemlist)
 
 
diff --git a/channels/piratestreaming.py b/channels/piratestreaming.py
index 23f5a94f..ee67ed35 100644
--- a/channels/piratestreaming.py
+++ b/channels/piratestreaming.py
@@ -9,8 +9,8 @@ from core.support import config, log
 
 host = config.get_channel_url()
 
-list_servers = ['mixdrop', 'speedvideo', 'gounlimited', 'onlystream', 'youtube']
-list_quality = ['default']
+
+
 
 headers = [['Referer', host]]
 
diff --git a/channels/polpotv.py b/channels/polpotv.py
index 8198b3b5..faee84cf 100644
--- a/channels/polpotv.py
+++ b/channels/polpotv.py
@@ -13,8 +13,8 @@ host = config.get_channel_url()
 
 headers = [['Accept', 'application/ld+json']]
 
-list_servers = ['directo']
-list_quality = ['1080p','720p','480p','360p']
+
+
 
 @support.menu
 def mainlist(item):
@@ -90,18 +90,11 @@ def get_season(item, seas_url, seasonNumber):
     json_object = jsontools.load(data)
     for episode in json_object['hydra:member']:
         itemlist.append(
-            Item(channel=item.channel,
-                 action='findvideos',
-                 contentType='episode',
-                 fulltitle=item.fulltitle,
-                 show=item.show,
-                 contentSerieName=item.contentSerieName,
-                 title=str(seasonNumber)+"x"+str("%02d"%episode['episodeNumber']),
-                 url=seas_url,
-                 thumbnail=item.thumbnail,
-                 fanart=item.fanart,
-                 plot=item.plot,
-                 extra=str(len(json_object['hydra:member'])-episode['episodeNumber'])))
+            item.clone(action='findvideos',
+                       contentType='episode',
+                       title=str(seasonNumber)+"x"+str("%02d"%episode['episodeNumber']),
+                       url=seas_url,
+                       extra=str(len(json_object['hydra:member'])-episode['episodeNumber'])))
     return itemlist[::-1]
 
 def search(item, texto):
@@ -135,12 +128,10 @@ def search_movie_by_genre(item):
     json_object = jsontools.load(data)
     for genre in json_object['hydra:member']:
         itemlist.append(
-            Item(channel=item.channel,
-             action="peliculas",
-             title=support.typo(genre['name'],'bold'),
-             contentType='movie',
-             url="%s/api/movies?genres.id=%s" %(host,genre['id']),
-             extra=item.extra))
+            item.clone(action="peliculas",
+                       title=support.typo(genre['name'],'bold'),
+                       contentType='movie',
+                       url="%s/api/movies?genres.id=%s" %(host,genre['id'])))
     return support.thumb(itemlist, True)
 
 def search_movie_by_year(item):
@@ -150,12 +141,12 @@ def search_movie_by_year(item):
     itemlist = []
     for i in range(100):
         year_to_search = year - i
-        itemlist.append(Item(channel=item.channel,
-                           url="%s/api/movies?releaseDate=%s" %(host,year_to_search),
-                           plot="1",
-                           type="movie",
-                           title=support.typo(year_to_search,'bold'),
-                           action="peliculas"))
+        itemlist.append(
+            item.clone(channel=item.channel,url="%s/api/movies?releaseDate=%s" %(host,year_to_search),
+                       plot="1",
+                       type="movie",
+                       title=support.typo(year_to_search,'bold'),
+                       action="peliculas"))
     return itemlist
 
 def findvideos(item):
@@ -169,17 +160,12 @@ def findvideos(item):
             array_index=int(item.extra)
         for video in json_object['hydra:member'][array_index]['playlist']['videos']:
             itemlist.append(
-                Item(
-                    channel=item.channel,
-                    action="play",
-                    title='Direct',
-                    thumbnail=item.thumbnail,
-                    fulltitle = item.fulltitle,
-                    search = item.search,
-                    url=video['src'],
-                    server='directo',
-                    quality=str(video['size'])+ 'p',
-                    folder=False))
+                item.clone(action="play",
+                           title='Direct',
+                           url=video['src'],
+                           server='directo',
+                           quality=str(video['size'])+ 'p',
+                           folder=False))
     except:
         pass
     return support.server(item, itemlist=itemlist)
@@ -219,22 +205,19 @@ def get_itemlist_element(element,item):
         next_action='episodios'
         quality=''
         url="%s%s"
-    itemlist.append(
-        Item(channel=item.channel,
-             action=next_action,
-             title=support.typo(scrapedtitle,'bold') + quality,
-             fulltitle=scrapedtitle,
-             show=scrapedtitle,
-             plot=scrapedplot,
-             fanart=scrapedfanart,
-             thumbnail=scrapedthumbnail,
-             contentType=item.contentType,
-             contentTitle=scrapedtitle,
-             url=url %(host,element['@id'] ),
-             infoLabels=infoLabels,
-             extra=item.extra))
 
     if item.contentType=='movie':
-        for item in itemlist:
-            item= support.tmdb.find_and_set_infoLabels(item)
+        support.tmdb.set_infoLabels_itemlist(itemlist)
+    itemlist.append(
+        item.clone(action=next_action,
+                   title=support.typo(scrapedtitle, 'bold') + quality,
+                   fulltitle=scrapedtitle,
+                   show=scrapedtitle,
+                   plot=scrapedplot,
+                   fanart=scrapedfanart,
+                   thumbnail=scrapedthumbnail,
+                   contentTitle=scrapedtitle,
+                   url=url % (host, element['@id']),
+                   infoLabels=infoLabels))
+
     return itemlist
diff --git a/channels/pufimovies.json b/channels/pufimovies.json
index 91680914..64b72651 100644
--- a/channels/pufimovies.json
+++ b/channels/pufimovies.json
@@ -1,7 +1,7 @@
 {
   "id": "pufimovies",
   "name": "PufiMovies",
-  "active": true,
+  "active": false,
   "language": ["ita", "sub-ita"],
   "thumbnail": "pufimovies.png",
   "banner": "pufimovies.png",
diff --git a/channels/pufimovies.py b/channels/pufimovies.py
index 6c001c64..a9dddb44 100644
--- a/channels/pufimovies.py
+++ b/channels/pufimovies.py
@@ -7,8 +7,8 @@ from core import support
 
 host = support.config.get_channel_url()
 
-list_servers = ['mixdrop', 'wstream', 'vupplayer', 'supervideo', 'cloudvideo', 'gounlimited']
-list_quality = ['default','1080p', '720p', '480p', '360p']
+
+
 
 headers = [['Referer', host]]
 
@@ -77,7 +77,7 @@ def newest(categoria):
     except:
         import sys
         for line in sys.exc_info():
-            support.log({0}.format(line))
+            support.logger.error("%s" % line)
         return []
 
     return itemlist
diff --git a/channels/raiplay.json b/channels/raiplay.json
index 569776ca..ea50d4d5 100644
--- a/channels/raiplay.json
+++ b/channels/raiplay.json
@@ -7,6 +7,7 @@
     "banner": "raiplay.png",
     "categories": ["movie", "tvshow", "documentary", "live"],
     "not_active": ["include_in_newest"],
+    "default_off": ["include_in_global_search"],
     "settings": [],
     "cloudflare": true
 }
diff --git a/channels/raiplay.py b/channels/raiplay.py
index 6f64a539..83b92a87 100644
--- a/channels/raiplay.py
+++ b/channels/raiplay.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
-# Canale per SerieHD
+# Canale per Rai Play
 # ------------------------------------------------------------
 
 import requests
@@ -17,7 +17,7 @@ onair = host + '/palinsesto/onAir.json'
 
 @support.menu
 def mainlist(item):
-    top =  [('Dirette {bold}', ['/dl/RaiPlay/2016/PublishingBlock-9a2ff311-fcf0-4539-8f8f-c4fee2a71d58.html?json', 'dirette']),
+    top =  [('Dirette {bold}', ['/dl/RaiPlay/2016/PublishingBlock-9a2ff311-fcf0-4539-8f8f-c4fee2a71d58.html?json', 'live']),
             ('Replay {bold}', ['/dl/RaiPlay/2016/PublishingBlock-9a2ff311-fcf0-4539-8f8f-c4fee2a71d58.html?json', 'replay_menu'])]
 
     menu = [('Film {bullet bold}', ['/film/index.json', 'menu']),
@@ -39,16 +39,10 @@ def mainlist(item):
 
 def menu(item):
     support.log()
-    itemlist = [support.Item(channel= item.channel, title = support.typo('Tutti','bullet bold'),
-                             url = item.url, action = 'peliculas'),
-
-                support.Item(channel= item.channel, title = support.typo('Generi','submenu'),
-                             url = item.url, args = 'genre', action = 'submenu'),
-
-                support.Item(channel= item.channel, title = support.typo('A-Z','submenu'),
-                             url = item.url, args = 'az', action = 'submenu'),
-                support.Item(channel= item.channel, title = support.typo('Cerca','submenu'),
-                             url = item.url, action = 'search')]
+    itemlist = [item.clone(title = support.typo('Tutti','bullet bold'), action = 'peliculas'),
+                item.clone(title = support.typo('Generi','submenu'), args = 'genre', action = 'submenu'),
+                item.clone(title = support.typo('A-Z','submenu'), args = 'az', action = 'submenu'),
+                item.clone(title = support.typo('Cerca','submenu'), action = 'search')]
 
     return support.thumb(itemlist)
 
@@ -58,8 +52,8 @@ def learning(item):
     itemlist =[]
     json = current_session.get(item.url).json()['contents']
     for key in json:
-        itemlist.append(support.Item(channel = item.channel, title = support.typo(key['name'],'bold'), fulltitle = key['name'], show = key['name'],
-                                     url = key['contents'], thumbnail = item.thumbnail, action = 'peliculas', args = item.args))
+        itemlist.append(item.clone(title = support.typo(key['name'],'bold'), fulltitle = key['name'],
+                                   show = key['name'], url = key['contents'], action = 'peliculas'))
     return itemlist
 
 
@@ -71,12 +65,12 @@ def submenu(item):
         json_url = getUrl(json[-1]['path_id'])
         json = current_session.get(json_url).json()['contents']
         for key in json:
-            itemlist.append(support.Item(channel = item.channel, title = support.typo(key,'bold'), fulltitle = key, show = key,
-                                         url = json[key], thumbnail = item.thumbnail, action = 'peliculas', args = item.args))
+            itemlist.append(item.clone(title = support.typo(key,'bold'), fulltitle = key,
+                                       show = key, url = json[key], action = 'peliculas'))
     else:
         for key in json:
-            itemlist.append(support.Item(channel = item.channel, title = support.typo(key['name'],'bold'), fulltitle = key['name'], show = key['name'],
-                                         thumbnail = getUrl(key['image']), url = getUrl(key['path_id']), action = 'peliculas', args = item.args))
+            itemlist.append(item.clone(title = support.typo(key['name'],'bold'), fulltitle = key['name'], show = key['name'],
+                                       thumbnail = getUrl(key['image']), url = getUrl(key['path_id']), action = 'peliculas'))
         itemlist.pop(-1)
     return support.thumb(itemlist)
 
@@ -97,8 +91,9 @@ def replay_menu(item):
     today = datetime.date.today()
     for d in range(7):
         day = today - datetime.timedelta(days=d)
-        itemlist.append(support.Item(channel = item.channel, thumbnail = item.thumbnail, action = 'replay_channels', url = item.url, date = day.strftime("%d-%m-%Y"),
-                                     title = support.typo(days[int(day.strftime("%w"))] + " " + day.strftime("%d") + " " + months[int(day.strftime("%m"))-1], 'bold')))
+        support.log(day)
+        itemlist.append(item.clone(action = 'replay_channels', date = day.strftime("%d-%m-%Y"),
+                                   title = support.typo(days[int(day.strftime("%w"))] + " " + day.strftime("%d") + " " + months[int(day.strftime("%m"))-1], 'bold')))
     return itemlist
 
 
@@ -107,8 +102,8 @@ def replay_channels(item):
     itemlist = []
     json = current_session.get(item.url).json()['dirette']
     for key in json:
-        itemlist.append(support.Item(channel = item.channel, title = support.typo(key['channel'], 'bold'), fulltitle = key['channel'], show = key['channel'],plot = item.title, action = 'replay',
-                                     thumbnail = key['transparent-icon'].replace("[RESOLUTION]", "256x-"), url = '%s/palinsesto/app/old/%s/%s.json' % (host, key['channel'].lower().replace(' ','-'), item.date)))
+        itemlist.append(item.clone(title = support.typo(key['channel'], 'bold'), fulltitle = key['channel'], show = key['channel'], plot = item.title, action = 'replay',
+                                   thumbnail = key['transparent-icon'].replace("[RESOLUTION]", "256x-"), url = '%s/palinsesto/app/old/%s/%s.json' % (host, key['channel'].lower().replace(' ','-'), item.date)))
     return itemlist
 
 
@@ -118,15 +113,16 @@ def replay(item):
     json = current_session.get(item.url).json()[item.fulltitle][0]['palinsesto'][0]['programmi']
     for key in json:
         support.log('KEY=',key)
-        if key and key['pathID']: itemlist.append(support.Item(channel = item.channel, thumbnail = getUrl(key['images']['landscape']), fanart = getUrl(key['images']['landscape']), url = getUrl(key['pathID']),
-                                             title = support.typo(key['timePublished'], 'color kod bold') + support.typo(' | ' + key['name'], ' bold'), fulltitle = key['name'], show = key['name'], plot = key['testoBreve'], action = 'findvideos'))
+        if key and key['pathID']: itemlist.append(item.clone(thumbnail = getUrl(key['images']['landscape']), fanart = getUrl(key['images']['landscape']), url = getUrl(key['pathID']), fulltitle = key['name'], show = key['name'],
+                                                             title = support.typo(key['timePublished'], 'color kod bold') + support.typo(' | ' + key['name'], ' bold'), plot = key['testoBreve'], action = 'findvideos'))
     return itemlist
 
 def search(item, text):
+    # support.dbg()
     support.log()
     itemlist =[]
     try:
-        if item.url:
+        if item.url != host:
             item.search = text
             itemlist = peliculas(item)
         else:
@@ -134,9 +130,9 @@ def search(item, text):
             for key in json:
                 for key in json[key]:
                     if 'PathID' in key and (text.lower() in key['name'].lower()):
-                        itemlist.append(support.Item(channel = item.channel, title = support.typo(key['name'],'bold'), fulltitle = key['name'], show = key['name'], url = key['PathID'].replace('/?json', '.json'), action = 'Type',
-                                                     thumbnail = getUrl(key['images']['portrait'] if 'portrait' in key['images'] else key['images']['portrait43'] if 'portrait43' in key['images'] else key['images']['landscape']),
-                                                     fanart = getUrl(key['images']['landscape'] if 'landscape' in key['images'] else key['images']['landscape43'])))
+                        itemlist.append(item.clone(title = support.typo(key['name'],'bold'), fulltitle = key['name'], show = key['name'], url = key['PathID'].replace('/?json', '.json'), action = 'Type',
+                                                   thumbnail = getUrl(key['images']['portrait'] if 'portrait' in key['images'] else key['images']['portrait43'] if 'portrait43' in key['images'] else key['images']['landscape']),
+                                                   fanart = getUrl(key['images']['landscape'] if 'landscape' in key['images'] else key['images']['landscape43'])))
     except:
         import sys
         for line in sys.exc_info():
@@ -156,15 +152,15 @@ def Type(item):
         return select(item)
 
 
-def dirette(item):
+def live(item):
     support.log()
     itemlist =[]
     json = current_session.get(item.url).json()['dirette']
     onAir = current_session.get(onair).json()['on_air']
     for i, key in enumerate(json):
-        itemlist.append(support.Item(channel = item.channel, title = support.typo(key['channel'], 'bold'), fulltitle = key['channel'], show = key['channel'],
-                                     thumbnail = key['transparent-icon'].replace("[RESOLUTION]", "256x-"),forcethumb=True , fanart = getUrl(onAir[i]['currentItem']['image']), url = key['video']['contentUrl'],
-                                     plot = support.typo(onAir[i]['currentItem']['name'],'bold')+ '\n\n' + onAir[i]['currentItem']['description'], action = 'play'))
+        itemlist.append(item.clone(title = support.typo(key['channel'], 'bold'), fulltitle = key['channel'], show = key['channel'], url = key['video']['contentUrl'],
+                                   thumbnail = key['transparent-icon'].replace("[RESOLUTION]", "256x-"), forcethumb = True , fanart = getUrl(onAir[i]['currentItem']['image']),
+                                   plot = support.typo(onAir[i]['currentItem']['name'],'bold')+ '\n\n' + onAir[i]['currentItem']['description'], action = 'play'))
     return itemlist
 
 
@@ -212,10 +208,7 @@ def peliculas(item):
     itemlist = sorted(itemlist, key=lambda it: it.title)
 
     if len(keys) > pag * pagination and not item.search:
-        itemlist.append(support.Item(channel=item.channel, action = item.action, contentType=item.contentType,
-                                     title=support.typo(support.config.get_localized_string(30992), 'color kod bold'),
-                                     fulltitle= item.fulltitle, show= item.show, url=item.url, args=item.args, page=pag + 1,
-                                     thumbnail=support.thumb()))
+        itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'), page=pag + 1, thumbnail=support.thumb()))
     return itemlist
 
 
@@ -224,8 +217,7 @@ def select(item):
     itemlist = []
     json = current_session.get(item.url).json()['blocks']
     for key in json:
-        itemlist.append(support.Item(channel = item.channel, title = support.typo(key['name'],'bold'), fulltitle = item.fulltitle,
-                                     show = item.show, thumbnail = item.thumbnail, url = key['sets'], action = 'episodios', args = item.args))
+        itemlist.append(item.clone(title = support.typo(key['name'],'bold'), url = key['sets'], action = 'episodios'))
     if len(itemlist) == 1:
         return episodios(itemlist[0])
     else:
@@ -237,9 +229,7 @@ def episodios(item):
     itemlist = []
     if type(item.url) in [list, dict] and len(item.url) > 1 and ('name' in item.url[0] and 'stagione' not in item.url[0]['name'].lower()):
         for key in item.url:
-            itemlist.append(support.Item(channel = item.channel, title = support.typo(key['name'], 'bold'), fulltitle = item.fulltitle, show = item.show, thumbnail = item.thumbnail,
-                                        fanart = item.fanart, url = getUrl(key['path_id']), plot = item.plot, contentType = 'tvshow',
-                                        action = 'episodios'))
+            itemlist.append(item.clone(title = support.typo(key['name'], 'bold'), url = getUrl(key['path_id']), contentType = 'tvshow', action = 'episodios'))
 
     elif type(item.url) in [list, dict]:
         with futures.ThreadPoolExecutor() as executor:
@@ -269,9 +259,8 @@ def episodios(item):
             # title = key['subtitle'].strip()
             if not title:
                 title = key['name']
-            itemlist.append(support.Item(channel = item.channel, title = support.typo(title, 'bold'), fulltitle = item.fulltitle, show = item.show, thumbnail = item.thumbnail,
-                                        fanart = getUrl(key['images']['landscape']), url = key['video_url'], plot = key['description'], contentType = 'episode',
-                                        action = 'findvideos', VL=True if ep else False))
+            itemlist.append(item.clone(title = support.typo(title, 'bold'), action = 'findvideos', VL=True if ep else False, plot = key['description'],
+                                       fanart = getUrl(key['images']['landscape']), url = key['video_url'], contentType = 'episode'))
 
         if itemlist and itemlist[0].VL: support.videolibrary(itemlist, item)
     return itemlist
@@ -290,8 +279,7 @@ def findvideos(item):
     else:
         url = item.url
 
-    itemlist.append(support.Item(channel = item.channel, server = 'directo', title = 'Diretto', fulltitle = item.fulltitle,
-            show = item.show, thumbnail = item.thumbnail, fanart = item.json, url = getUrl(url), action = 'play' ))
+    itemlist.append(item.clone(server = 'directo', title = 'Diretto', fanart = item.json, url = getUrl(url), action = 'play' ))
     return support.server(item, itemlist=itemlist, Download=False)
 
 
@@ -321,8 +309,9 @@ def addinfo(key, item):
     support.log()
     info = current_session.get(getUrl(key['info_url'])).json()
     if not item.search or item.search.lower() in key['name'].lower():
-        it = support.Item( channel = item.channel, title = support.typo(key['name'],'bold'), fulltitle = key['name'], show = key['name'],
-                thumbnail = getUrl(key['images']['portrait_logo'] if key['images']['portrait_logo'] else key['images']['landscape']), fanart = getUrl(key['images']['landscape']), url = getUrl(key['path_id']), plot = info['description'])
+        it = item.clone(title = support.typo(key['name'],'bold'), fulltitle = key['name'], show = key['name'],
+                        thumbnail = getUrl(key['images']['portrait_logo'] if key['images']['portrait_logo'] else key['images']['landscape']),
+                        fanart = getUrl(key['images']['landscape']), url = getUrl(key['path_id']), plot = info['description'])
         if 'layout' not in key or key['layout'] == 'single':
             it.action = 'findvideos'
             it.contentType = 'movie'
@@ -351,9 +340,9 @@ def load_episodes(key, item):
         if not title:
             title = key['name']
 
-        itemlist.append(support.Item(channel = item.channel, title = support.typo(title, 'bold'), fulltitle = item.fulltitle, show = item.show, thumbnail = item.thumbnail,
-                                     fanart = getUrl(key['images']['landscape']), url = key['video_url'], plot = key['description'], contentType = 'episode',
-                                     action = 'findvideos', VL=True if ep else False, order=order))
+        itemlist.append(item.clone(title = support.typo(title, 'bold'), url = key['video_url'], contentType = 'episode',
+                                   fanart = getUrl(key['images']['landscape']), plot = key['description'],
+                                   action = 'findvideos', VL=True if ep else False, order=order))
     return itemlist
 
 
diff --git a/channels/seriehd.py b/channels/seriehd.py
index 2ed1a8cc..15b3b382 100644
--- a/channels/seriehd.py
+++ b/channels/seriehd.py
@@ -10,8 +10,8 @@ host = support.config.get_channel_url()
 headers = [['Referer', host]]
 
 
-list_servers = ['mixdrop', 'vidoza', 'vcstream', 'gounlimited']
-list_quality = ['1080p', '720p', '480p', '360']
+
+
 
 @support.menu
 def mainlist(item):
diff --git a/channels/serietvonline.py b/channels/serietvonline.py
index adae9c91..8b2f9729 100644
--- a/channels/serietvonline.py
+++ b/channels/serietvonline.py
@@ -28,8 +28,8 @@ def findhost():
 host = config.get_channel_url(findhost)
 headers = [['Referer', host]]
 
-list_servers = ['akvideo', 'wstream', 'backin', 'vidtome', 'nowvideo']
-list_quality = ['default']
+
+
 
 
 @support.menu
@@ -64,6 +64,7 @@ def peliculas(item):
     blacklist = ['DMCA', 'Contatti', 'Attenzione NON FARTI OSCURARE', 'Lista Cartoni Animati e Anime']
     patronBlock = r'<h1>.+?</h1>(?P<block>.*?)<div class="footer_c">'
     patronNext = r'<div class="siguiente"><a href="([^"]+)" >'
+    # debug = True
 
     if item.args == 'search':
         patronBlock = r'>Lista Serie Tv</a></li></ul></div><div id="box_movies">(?P<block>.*?)<div id="paginador">'
@@ -87,7 +88,7 @@ def peliculas(item):
         pagination = 25
 
         if item.args == 'lista':
-            patron = r'href="(?P<url>[^"]+)"[^>]+>(?P<title>.*?)[ ]?(?P<year>\d+)?(?: Streaming | MD iSTANCE )?<'
+            patron = r'href="(?P<url>[^"]+)"[^>]+>(?P<title>.*?)(?P<year>\d{4})?<'
             patronBlock = r'Lista dei film disponibili in streaming e anche in download\.</p>(?P<block>.*?)<div class="footer_c">'
         else:
             patron = r'<tr><td><a href="(?P<url>[^"]+)"(?:|.+?)?>(?:&nbsp;&nbsp;)?[ ]?(?P<title>.*?)[ ]?(?P<quality>HD)?[ ]?(?P<year>\d+)?(?: | HD | Streaming | MD(?: iSTANCE)? )?</a>'
@@ -183,17 +184,6 @@ def findvideos(item):
             series = support.typo(item.contentSerieName, ' bold color kod')
             itemlist = support.server(item, data=url_video)
 
-            itemlist.append(
-                Item(channel=item.channel,
-                        title=goseries + series,
-                        fulltitle=item.fulltitle,
-                        show=item.show,
-                        contentType='tvshow',
-                        contentSerieName=item.contentSerieName,
-                        url=url_serie,
-                        action='episodios',
-                        contentTitle=item.contentSerieName,
-                        plot = goseries + series + "con tutte le puntate",
-                        ))
+            itemlist.append(item.clone(title=goseries + series, contentType='tvshow', url=url_serie, action='episodios', plot = goseries + series + "con tutte le puntate"))
 
         return itemlist
diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py
index a18fd5fa..10729256 100644
--- a/channels/serietvsubita.py
+++ b/channels/serietvsubita.py
@@ -17,8 +17,8 @@ headers = [['Referer', host]]
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
-list_servers = ['gounlimited', 'rapidgator', 'uploadedto', 'vidtome']
-list_quality = ['default']
+
+
 
 @support.menu
 def mainlist(item):
@@ -42,7 +42,7 @@ def cleantitle(scrapedtitle):
     scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle.strip())
     scrapedtitle = scrapedtitle.replace('[HD]', '').replace('’', '\'').replace('×', 'x').replace('Game of Thrones –','')\
         .replace('In The Dark 2019', 'In The Dark (2019)').replace('"', "'").strip()
-    year = scrapertools.find_single_match(scrapedtitle, '\((\d{4})\)')
+    year = scrapertools.find_single_match(scrapedtitle, r'\((\d{4})\)')
     if year:
         scrapedtitle = scrapedtitle.replace('(' + year + ')', '')
 
@@ -58,7 +58,7 @@ def findvideos(item):
     data = re.sub(r'\n|\t|\s+', ' ', data)
     # recupero il blocco contenente i link
     blocco = scrapertools.find_single_match(data, r'<div class="entry">([\s\S.]*?)<div class="post').replace('..:: Episodio ', 'Episodio ').strip()
-    matches = scrapertools.find_multiple_matches(blocco, '(S(\d*)E(\d*))\s')
+    matches = scrapertools.find_multiple_matches(blocco, r'(S(\d*)E(\d*))\s')
     if len(matches) > 0:
         for fullseasonepisode, season, episode in matches:
             blocco = blocco.replace(fullseasonepisode + ' ', 'Episodio ' + episode + ' ')
@@ -74,7 +74,7 @@ def findvideos(item):
     if len(matches):
         data = matches[0][0]
 
-    patron = 'href="(https?://www\.keeplinks\.(?:co|eu)/p(?:[0-9]*)/([^"]+))"'
+    patron = r'href="(https?://www\.keeplinks\.(?:co|eu)/p(?:[0-9]*)/([^"]+))"'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for keeplinks, id in matches:
         headers2 = [['Cookie', 'flag[' + id + ']=1; defaults=1; nopopatall=' + str(int(time.time()))],
@@ -116,18 +116,15 @@ def lista_serie(item):
         if i >= p * PERPAGE: break
         title = cleantitle(scrapedtitle)
         itemlist.append(
-            Item(channel=item.channel,
-                 extra=item.extra,
-                 action="episodios",
-                 title=title,
-                 url=scrapedurl,
-                 thumbnail=scrapedthumbnail,
-                 fulltitle=title,
-                 show=title,
-                 plot=scrapedplot,
-                 contentType='episode',
-                 originalUrl=scrapedurl,
-                 folder=True))
+            item.clone(action="episodios",
+                       title=title,
+                       url=scrapedurl,
+                       thumbnail=scrapedthumbnail,
+                       fulltitle=title,
+                       show=title,
+                       plot=scrapedplot,
+                       contentType='episode',
+                       originalUrl=scrapedurl))
 
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
@@ -162,7 +159,7 @@ def episodios(item, itemlist=[]):
 
             # recupero la stagione
             season = scrapertools.find_single_match(scrapedtitle, 'Stagione ([0-9]*)')
-            blocco = scrapertools.find_single_match(data, '<div class="entry">[\s\S.]*?<div class="post')
+            blocco = scrapertools.find_single_match(data, r'<div class="entry">[\s\S.]*?<div class="post')
             blocco = blocco.replace('<strong>Episodio ', '<strong>Episodio ').replace(' </strong>', ' </strong>')
             blocco = blocco.replace('<strong>Episodio ', '<strong>S' + season.zfill(2) + 'E')
             matches = scrapertools.find_multiple_matches(blocco, r'(S(\d*)E(\d*))\s')
@@ -189,18 +186,15 @@ def episodios(item, itemlist=[]):
             infoLabels['episode'] = episode
             fullepisode += ' ' + support.typo("Sub-ITA", '_ [] color kod')
             itemlist.append(
-                Item(channel=item.channel,
-                     extra=item.extra,
-                     action="findvideos",
-                     fulltitle=scrapedtitle,
-                     show=scrapedtitle,
-                     title=fullepisode,
-                     url=scrapedurl,
-                     thumbnail=scrapedthumbnail,
-                     plot=scrapedplot,
-                     contentSerieName=title,
-                     infoLabels=infoLabels,
-                     folder=True))
+                item.clone(action="findvideos",
+                           fulltitle=scrapedtitle,
+                           show=scrapedtitle,
+                           title=fullepisode,
+                           url=scrapedurl,
+                           thumbnail=scrapedthumbnail,
+                           plot=scrapedplot,
+                           contentSerieName=title,
+                           infoLabels=infoLabels))
 
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
@@ -224,7 +218,7 @@ def peliculas_tv(item):
     log()
     itemlist = []
 
-    patron = '<div class="post-meta">\s*<a href="([^"]+)"\s*title="([^"]+)"\s*class=".*?"></a>'
+    patron = r'<div class="post-meta">\s*<a href="([^"]+)"\s*title="([^"]+)"\s*class=".*?"></a>'
 
     html = support.match(item, patron=patron, headers=headers)
     matches = html.matches
@@ -249,18 +243,16 @@ def peliculas_tv(item):
             infoLabels['episode'] = episode[2].zfill(2)
 
             itemlist.append(
-                Item(channel=item.channel,
-                     action="findvideos",
-                     fulltitle=scrapedtitle,
-                     show=scrapedtitle,
-                     title=title + " - " + episode[0] + " " + support.typo("Sub-ITA", '_ [] color kod'),
-                     url=scrapedurl,
-                     thumbnail=scrapedthumbnail,
-                     contentSerieName=title,
-                     contentLanguage='Sub-ITA',
-                     plot=scrapedplot,
-                     infoLabels=infoLabels,
-                     folder=True))
+                item.clone(action="findvideos",
+                           fulltitle=scrapedtitle,
+                           show=scrapedtitle,
+                           title=title + " - " + episode[0] + " " + support.typo("Sub-ITA", '_ [] color kod'),
+                           url=scrapedurl,
+                           thumbnail=scrapedthumbnail,
+                           contentSerieName=title,
+                           contentLanguage='Sub-ITA',
+                           plot=scrapedplot,
+                           infoLabels=infoLabels))
 
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
@@ -301,7 +293,7 @@ def search(item, texto):
     log(texto)
     itemlist = []
 
-    patron = '<li class="cat-item cat-item-\d+"><a href="([^"]+)"\s?>([^<]+)</a>'
+    patron = r'<li class="cat-item cat-item-\d+"><a href="([^"]+)"\s?>([^<]+)</a>'
     matches = support.match(item, patron=patron, headers=headers).matches
     for i, (scrapedurl, scrapedtitle) in enumerate(matches):
         if texto.upper() in scrapedtitle.upper():
@@ -309,18 +301,15 @@ def search(item, texto):
             scrapedplot = ""
             title = cleantitle(scrapedtitle)
             itemlist.append(
-                Item(channel=item.channel,
-                     extra=item.extra,
-                     action="episodios",
-                     title=title,
-                     url=scrapedurl,
-                     thumbnail=scrapedthumbnail,
-                     fulltitle=title,
-                     show=title,
-                     plot=scrapedplot,
-                     contentType='episode',
-                     originalUrl=scrapedurl,
-                     folder=True))
+                item.clone(action="episodios",
+                           title=title,
+                           url=scrapedurl,
+                           thumbnail=scrapedthumbnail,
+                           fulltitle=title,
+                           show=title,
+                           plot=scrapedplot,
+                           contentType='episode',
+                           originalUrl=scrapedurl))
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
     return itemlist
@@ -336,7 +325,7 @@ def list_az(item):
     itemlist = []
 
     alphabet = dict()
-    patron = '<li class="cat-item cat-item-\d+"><a href="([^"]+)"\s?>([^<]+)</a>'
+    patron = r'<li class="cat-item cat-item-\d+"><a href="([^"]+)"\s?>([^<]+)</a>'
     matches = support.match(item, patron=patron, headers=headers).matches
     for i, (scrapedurl, scrapedtitle) in enumerate(matches):
         letter = scrapedtitle[0].upper()
@@ -346,11 +335,10 @@ def list_az(item):
 
     for letter in sorted(alphabet):
         itemlist.append(
-            Item(channel=item.channel,
-                 action="lista_serie",
-                 url='\n\n'.join(alphabet[letter]),
-                 title=letter,
-                 fulltitle=letter))
+            item.clone(action="lista_serie",
+                       url='\n\n'.join(alphabet[letter]),
+                       title=letter,
+                       fulltitle=letter))
 
     return itemlist
 
diff --git a/channels/serietvu.py b/channels/serietvu.py
index ceb08318..4cc32596 100644
--- a/channels/serietvu.py
+++ b/channels/serietvu.py
@@ -16,8 +16,8 @@ from platformcode import config
 host = config.get_channel_url()
 headers = [['Referer', host]]
 
-list_servers = ['speedvideo']
-list_quality = ['default']
+
+
 
 
 @support.menu
@@ -122,14 +122,10 @@ def findvideos(item):
         itemlist = support.server(item, data=urls_video)
 
         itemlist.append(
-            Item(channel=item.channel,
-                 title=support.typo("Vai alla Serie Completa: " + item.fulltitle, ' bold'),
-                 fulltitle=item.fulltitle,
-                 show=item.show,
-                 contentType='tvshow',
-                 url=url_serie,
-                 action='episodios',
-                 thumbnail = support.thumb(thumb='tvshow.png')
-                ))
+            item.colone(title=support.typo("Vai alla Serie Completa: " + item.fulltitle, ' bold'),
+                        contentType='tvshow',
+                        url=url_serie,
+                        action='episodios',
+                        thumbnail = support.thumb(thumb='tvshow.png')))
 
         return itemlist
diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py
index 2994e52d..1eb9473d 100644
--- a/channels/streamingaltadefinizione.py
+++ b/channels/streamingaltadefinizione.py
@@ -13,8 +13,8 @@ else:
     from urllib import unquote
 
 
-list_servers = ['verystream', 'openload', 'wstream']
-list_quality = ['1080p', 'HD', 'DVDRIP', 'SD', 'CAM']
+
+
 
 def findhost():
     data = httptools.downloadpage('https://www.popcornstream-nuovo-indirizzo.online/').data
@@ -68,14 +68,8 @@ def findvideos(item):
     matches = support.match(item, patron=r'<a href="([^"]+)[^>]+>Download[^>]+>[^>]+>[^>]+><strong class="quality">([^<]+)<').matches
     for url, quality in matches:
         itemlist.append(
-            Item(channel=item.channel,
-                 action="play",
-                 url=unquote(support.match(url, patron=[r'dest=([^"]+)"',r'/(http[^"]+)">Click']).match),
-                 fulltitle=item.fulltitle,
-                 thumbnail=item.thumbnail,
-                 show=item.show,
-                 quality=quality,
-                 contentType=item.contentType,
-                 folder=False))
+            item.clone(caction="play",
+                       url=unquote(support.match(url, patron=[r'dest=([^"]+)"',r'/(http[^"]+)">Click']).match),
+                       quality=quality))
 
     return support.server(item, itemlist=itemlist)
diff --git a/channels/streamtime.py b/channels/streamtime.py
index e32056f3..439d3660 100644
--- a/channels/streamtime.py
+++ b/channels/streamtime.py
@@ -11,8 +11,8 @@ la lista delle pagine non sarà affatto 'uniforme' (a seconda di come viene pres
 
 host = config.get_channel_url()
 headers = [['Referer', 'org.telegram.messenger']]
-list_servers = ['directo']
-list_quality = ['default']
+
+
 
 downPrefix = 'https://stsh.ml/Down-'
 
@@ -122,17 +122,12 @@ def episodios(item):
             if '-' in season:  # vedi https://stpgs.ml/SerieTv/Atypical-S01-8-8.html
                 season = season.split('-')[0]
             itemlist.append(
-                Item(channel=item.channel,
-                     action="findvideos",
-                     title=str(int(season)) + 'x' + str(n) + support.typo(item.quality, '-- [] color kod'),
-                     url=url,
-                     fulltitle=item.fulltitle,
-                     thumbnail=item.thumbnail,
-                     show=item.show,
-                     quality=item.quality,
-                     contentType='episode',
-                     folder=True,
-                     args={'id': id, 'season': season, 'episode': episode}))
+                item.clone(action="findvideos",
+                           title=str(int(season)) + 'x' + str(n) + support.typo(item.quality, '-- [] color kod'),
+                           url=url,
+                           contentType='episode',
+                           folder=True,
+                           args={'id': id, 'season': season, 'episode': episode}))
 
     support.videolibrary(itemlist, item)
     return itemlist
@@ -154,21 +149,7 @@ def findvideos(item):
 
     if res:
         itemlist.append(
-            Item(channel=item.channel,
-                 action="play",
-                 title='contentful',
-                 url=res,
-                 server='directo',
-                 fulltitle=item.fulltitle,
-                 thumbnail=item.thumbnail,
-                 quality=item.quality,
-                 contentType=item.contentType))
-        # download = itemlist[0].clone()
-        # if item.contentType == 'movie':
-        #     download.url = downPrefix + id
-        # else:
-        #     download.url = downPrefix + id + '-S' + season + '-' + episode
-        # itemlist.append(download)
+            item.clone(action="play", title='contentful', url=res, server='directo'))
     else:
         # google drive...
         pass
diff --git a/channels/tantifilm.py b/channels/tantifilm.py
index d529fecf..a5cc940f 100644
--- a/channels/tantifilm.py
+++ b/channels/tantifilm.py
@@ -19,8 +19,8 @@ def findhost():
 
 host = config.get_channel_url(findhost)
 headers = [['Referer', host]]
-list_servers = ['verystream', 'openload', 'streamango', 'vidlox', 'youtube']
-list_quality = ['default']
+
+
 
 
 @support.menu
@@ -58,13 +58,13 @@ def peliculas(item):
         # support.regexDbg(item, patron, headers)
     else:
         patronNext = r'<a class="nextpostslink" rel="next" href="([^"]+)">'
-        patron = r'<div class="mediaWrap mediaWrapAlt">\s?<a href="(?P<url>[^"]+)"(?:[^>]+>|)>?\s?<img[^s]+src="([^"]+)"[^>]+>\s?<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?:[ ]<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>[\-\d+]+)\)).[^<]+[^>]+><\/a>.+?<p>\s*(?P<quality>[a-zA-Z-0-9\.]+)\s*<\/p>[^>]+>'
+        patron = r'<div class="mediaWrap mediaWrapAlt">\s?<a href="(?P<url>[^"]+)"(?:[^>]+>|)>?\s?<img[^s]+src="([^"]+)"[^>]+>\s?<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?P<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>\d{4})-?(?:\d{4})?)\).[^<]+[^>]+><\/a>.+?<p>\s*(?P<quality>[a-zA-Z-0-9\.]+)\s*<\/p>[^>]+>'
         patronBlock = r'<div id="main_col">(?P<block>.*?)<!\-\- main_col \-\->'
 
     # if item.args != 'all' and item.args != 'search':
     #     action = 'findvideos' if item.extra == 'movie' else 'episodios'
     #     item.contentType = 'movie' if item.extra == 'movie' else 'tvshow'
-    #debug = True
+    # debug = True
     return locals()
 
 
diff --git a/channels/toonitalia.py b/channels/toonitalia.py
index 582c259e..5f0cbca8 100644
--- a/channels/toonitalia.py
+++ b/channels/toonitalia.py
@@ -9,8 +9,8 @@ host = support.config.get_channel_url()
 
 headers = [['Referer', host]]
 
-list_servers = ['wstream', 'openload', 'streamango']
-list_quality = ['HD', 'default']
+
+
 
 
 @support.menu
diff --git a/channels/tunein.py b/channels/tunein.py
index 9e1a0d8b..10f161fe 100644
--- a/channels/tunein.py
+++ b/channels/tunein.py
@@ -13,8 +13,8 @@ from xml.dom import minidom
 
 host = 'http://api.radiotime.com'
 headers = [['Referer', host]]
-list_servers = ['directo']
-list_quality = ['default']
+
+
 
 @support.scrape
 def mainlist(item):
@@ -27,14 +27,7 @@ def mainlist(item):
         return item
     def itemlistHook(itemlist):
         itemlist.append(
-            support.Item(
-                channel=item.channel,
-                title=support.typo('Cerca...', 'bold color kod'),
-                url = item.url,
-                action='search',
-                thumbnail=support.thumb(thumb='search.png')))
-        support.autoplay.init(item.channel, list_servers, list_quality)
-        support.autoplay.show_option(item.channel, itemlist)
+            item.clone(title=support.typo('Cerca...', 'bold color kod'), action='search', thumbnail=support.thumb(thumb='search.png')))
         support.channel_config(item, itemlist)
         return itemlist
     return locals()
@@ -47,16 +40,12 @@ def radio(item):
     if data.matches:
         for title, location, url, quality, song, type, thumbnail in data.matches:
             itemlist.append(
-                support.Item(
-                    channel = item.channel,
-                    title = support.typo(title, 'bold') + support.typo(quality + ' kbps','_ [] bold color kod'),
-                    thumbnail = thumbnail,
-                    url = url,
-                    contentType = 'music',
-                    plot = support.typo(location, 'bold') + '\n' + song,
-                    action = 'findvideos'
-                )
-            )
+                item.clone(title = support.typo(title, 'bold') + support.typo(quality + ' kbps','_ [] bold color kod'),
+                           thumbnail = thumbnail,
+                           url = url,
+                           contentType = 'music',
+                           plot = support.typo(location, 'bold') + '\n' + song,
+                           action = 'findvideos'))
     else:
         matches = support.match(data.data, patron= r'text="(?P<title>[^\("]+)(?:\([^\)]+\))?" URL="(?P<url>[^"]+)" (?:guide_id="[^"]+" )?(?:stream_type="[^"]+" )?topic_duration="(?P<duration>[^"]+)" subtext="(?P<plot>[^"]+)" item="[^"]+" image="(?P<thumb>[^"]+)"').matches
         if matches:
@@ -64,29 +53,22 @@ def radio(item):
                 infoLabels={}
                 infoLabels['duration'] = duration
                 itemlist.append(
-                    support.Item(
-                        channel = item.channel,
-                        title = support.typo(title, 'bold'),
-                        thumbnail = thumbnail,
-                        infolLbels = infoLabels,
-                        url = url,
-                        contentType = 'music',
-                        plot = plot,
-                        action = 'findvideos'
-                    )
-                )
+                    item.clone(title = support.typo(title, 'bold'),
+                               thumbnail = thumbnail,
+                               infolLbels = infoLabels,
+                               url = url,
+                               contentType = 'music',
+                               plot = plot,
+                               action = 'findvideos'))
         else:
             matches = support.match(data.data, patron= r'text="(?P<title>[^"]+)" URL="(?P<url>[^"]+)"').matches
             for title, url in matches:
                 itemlist.append(
-                    support.Item(
-                        channel = item.channel,
-                        title = support.typo(title, 'bold'),
-                        thumbnail = item.thumbnail,
-                        url = url,
-                        action = 'radio'
-                    )
-                )
+                    item.clone(channel = item.channel,
+                               title = support.typo(title, 'bold'),
+                               thumbnail = item.thumbnail,
+                               url = url,
+                               action = 'radio'))
     return itemlist
 
 
diff --git a/channels/vedohd.py b/channels/vedohd.py
index 9ab91a48..1550d7b9 100644
--- a/channels/vedohd.py
+++ b/channels/vedohd.py
@@ -13,8 +13,8 @@ headers = ""
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
-list_servers = ['verystream', 'openload', 'streamango', 'wstream']
-list_quality = ['HD', 'SD']
+
+
 
 #esclusione degli articoli 'di servizio'
 blacklist = ['CB01.UNO &#x25b6; TROVA L&#8217;INDIRIZZO UFFICIALE ', 'AVVISO IMPORTANTE – CB01.UNO', 'GUIDA VEDOHD']
@@ -52,18 +52,7 @@ def findvideos(item):
                 title = server + " [COLOR blue][" + quality + "][/COLOR]"
             else:
                 title = server
-            itemlist.append(
-                Item(channel=item.channel,
-                     action="play",
-                     title=title,
-                     url=link['url'],
-                     server=server,
-                     fulltitle=item.fulltitle,
-                     thumbnail=item.thumbnail,
-                     show=item.show,
-                     quality=quality,
-                     contentType=item.contentType,
-                     folder=False))
+            itemlist.append(item.clone(action="play", title=title, url=link['url'], server=server, quality=quality,))
 
     autoplay.start(itemlist, item)
 
diff --git a/channels/vvvvid.py b/channels/vvvvid.py
index 8d686b0f..247686f7 100644
--- a/channels/vvvvid.py
+++ b/channels/vvvvid.py
@@ -30,8 +30,8 @@ except:
 
 main_host = host
 host += '/vvvvid/ondemand/'
-list_servers = ['vvvvid']
-list_quality = ['default']
+
+
 
 @support.menu
 def mainlist(item):
@@ -123,12 +123,10 @@ def peliculas(item):
         for key in keys:
             if key not in ['1','2']:
                 itemlist.append(
-                    Item(channel = item.channel,
-                        title = support.typo(key.upper() if Filter == 'filter' else key['name'], 'bold'),
-                        url =  item.url + item.args + (key if Filter == 'filter' else str(key['id'])),
-                        action = 'peliculas',
-                        args = 'filters',
-                        contentType = item.contentType))
+                    item.clone(title = support.typo(key.upper() if Filter == 'filter' else key['name'], 'bold'),
+                               url =  item.url + item.args + (key if Filter == 'filter' else str(key['id'])),
+                               action = 'peliculas',
+                               args = 'filters'))
 
     else :
         json_file=loadjs(item.url)
@@ -167,19 +165,10 @@ def episodios(item):
             if make_item == True:
                 if type(title) == tuple: title = title[0]
                 itemlist.append(
-                    Item(
-                        channel = item.channel,
-                        title = title,
-                        fulltitle= item.fulltitle,
-                        show= item.show,
-                        url=  host + show_id + '/season/' + str(key['season_id']) + '/',
-                        action= 'findvideos',
-                        video_id= key['video_id'],
-                        thumbnail= item.thumbnail,
-                        fanart = item.fanart,
-                        plot=item.plot,
-                        contentType = item.contentType
-                    ))
+                    item.clone(title = title,
+                               url=  host + show_id + '/season/' + str(key['season_id']) + '/',
+                               action= 'findvideos',
+                               video_id= key['video_id']))
     autorenumber.renumber(itemlist, item, 'bold')
     if autorenumber.check(item) == True \
         or support.match(itemlist[0].title, patron=r"(\d+x\d+)").match:
@@ -204,10 +193,10 @@ def findvideos(item):
                 url = support.match('https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/playlist.m3u').data
                 url = url.split()[-1]
                 itemlist.append(
-                    Item(action= 'play',
-                         title='direct',
-                         url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url,
-                         server= 'directo')
+                    item.clone(action= 'play',
+                               title='direct',
+                               url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url,
+                               server= 'directo')
                 )
     return support.server(item, itemlist=itemlist, Download=False)
 
@@ -220,18 +209,15 @@ def make_itemlist(itemlist, item, data):
             infoLabels['title'] = infoLabels['tvshowtitle'] = key['title']
             title = encode(key['title'])
             itemlist.append(
-                Item(
-                    channel = item.channel,
-                    title = support.typo(title, 'bold'),
-                    fulltitle= title,
-                    show= title,
-                    url= host + str(key['show_id']) + '/seasons/',
-                    action= 'findvideos' if item.contentType == 'movie' else 'episodios',
-                    contentType = item.contentType,
-                    contentSerieName= key['title'] if item.contentType != 'movie' else '',
-                    contentTitle= title if item.contentType == 'movie' else '',
-                    infoLabels=infoLabels
-            ))
+                item.clone(title = support.typo(title, 'bold'),
+                           fulltitle= title,
+                           show= title,
+                           url= host + str(key['show_id']) + '/seasons/',
+                           action= 'findvideos' if item.contentType == 'movie' else 'episodios',
+                           contentType = item.contentType,
+                           contentSerieName= key['title'] if item.contentType != 'movie' else '',
+                           contentTitle= title if item.contentType == 'movie' else '',
+                           infoLabels=infoLabels))
     return itemlist
 
 def loadjs(url):
diff --git a/channelselector.py b/channelselector.py
index 10452461..f8ea087d 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -76,7 +76,7 @@ def getchanneltypes(view="thumb_"):
     logger.info()
 
     # Category List
-    channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "direct", "live", "torrent",  "music"]
+    channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "live", "torrent",  "music"] #, "direct"
 
     # Channel Language
     channel_language = auto_filter()
@@ -218,31 +218,16 @@ def filterchannels(category, view="thumb_"):
     return channelslist
 
 
-def get_thumb(thumb_name, view="thumb_", auto=False):
-
-    if auto:
-        thumbnail = ''
-
-        thumb_name = unify.set_genre(unify.simplify(thumb_name))
-
-        if thumb_name in thumb_dict:
-            thumbnail = thumb_dict[thumb_name]
-        return thumbnail
-
+def get_thumb(thumb_name, view="thumb_"):
+    from core import filetools
+    if thumb_name.startswith('http'):
+        return thumb_name
+    elif config.get_setting('enable_custom_theme') and config.get_setting('custom_theme') and filetools.isfile(config.get_setting('custom_theme') + view + thumb_name):
+        media_path = config.get_setting('custom_theme')
     else:
         icon_pack_name = config.get_setting('icon_set', default="default")
-        media_path = os.path.join("https://raw.githubusercontent.com/kodiondemand/media/master/themes", icon_pack_name)
-
-        if config.get_setting('enable_custom_theme') and config.get_setting('custom_theme') and os.path.isfile(config.get_setting('custom_theme') + view + thumb_name):
-            media_path = config.get_setting('custom_theme')
-
-        if thumb_name.startswith('http'):
-            thumbnail = thumb_name
-        else:
-            thumbnail = os.path.join(media_path, view + thumb_name)
-        if 'http' in thumbnail:
-            thumbnail = thumbnail.replace('\\','/')
-        return thumbnail
+        media_path = filetools.join("https://raw.githubusercontent.com/kodiondemand/media/master/themes", icon_pack_name)
+    return filetools.join(media_path, view + thumb_name)
 
 
 def set_channel_info(parameters):
@@ -296,7 +281,7 @@ def thumb(item_or_itemlist=None, genre=False, thumb=''):
     import re
     icon_dict = {'movie':['film', 'movie'],
                  'tvshow':['serie','tv','episodi','episodio','fiction', 'show'],
-                 'documentary':['documentari','documentario', 'documentary'],
+                 'documentary':['documentari','documentario', 'documentary', 'documentaristico'],
                  'teenager':['ragazzi','teenager', 'teen'],
                  'learning':['learning'],
                  'all':['tutti', 'all'],
@@ -308,17 +293,17 @@ def thumb(item_or_itemlist=None, genre=False, thumb=''):
                  'action':['azione', 'arti marziali', 'action'],
                  'adventure': ['avventura', 'adventure'],
                  'biographical':['biografico', 'biographical'],
-                 'comedy':['comico', 'commedia', 'demenziale', 'comedy'],
+                 'comedy':['comico', 'commedia', 'demenziale', 'comedy', 'brillante'],
                  'adult':['erotico', 'hentai', 'harem', 'ecchi', 'adult'],
                  'drama':['drammatico', 'drama', 'dramma'],
                  'syfy':['fantascienza', 'science fiction', 'syfy', 'sci'],
-                 'fantasy':['fantasy', 'magia', 'magic'],
+                 'fantasy':['fantasy', 'magia', 'magic', 'fantastico'],
                  'crime':['gangster','poliziesco', 'crime', 'crimine'],
                  'grotesque':['grottesco', 'grotesque'],
                  'war':['guerra', 'war'],
                  'children':['bambini', 'kids'],
                  'horror':['horror'],
-                 'music':['musical', 'musica', 'music'],
+                 'music':['musical', 'musica', 'music', 'musicale'],
                  'mistery':['mistero', 'giallo', 'mystery'],
                  'noir':['noir'],
                  'popular' : ['popolari','popolare', 'più visti'],
diff --git a/core/channeltools.py b/core/channeltools.py
index 86d3757c..2c51ec1d 100644
--- a/core/channeltools.py
+++ b/core/channeltools.py
@@ -256,7 +256,7 @@ def get_channel_setting(name, channel, default=None):
     file_settings = filetools.join(config.get_data_path(), "settings_channels", channel + "_data.json")
     dict_settings = {}
     dict_file = {}
-    if channel not in ['trakt']: def_settings = get_default_settings(channel)
+    if channel not in ['trakt', 'autoplay']: def_settings = get_default_settings(channel)
 
     if filetools.exists(file_settings):
         # We get saved configuration from ../settings/channel_data.json
diff --git a/core/downloadtools.py b/core/downloadtools.py
index 313c1baa..1747b435 100644
--- a/core/downloadtools.py
+++ b/core/downloadtools.py
@@ -360,7 +360,7 @@ def downloadfile(url, nombrefichero, headers=None, silent=False, continuar=False
                                 tiempofalta = 0
                             # logger.info(sec_to_hms(tiempofalta))
                             if not silent:
-                                progreso.update(percent, "%.2fMB/%.2fMB (%d%%) %.2f Kb/s %s falta " %
+                                progreso.update(percent, "%.2fMB/%.2fMB (%d%%) %.2f Kb/s %s" %
                                                 (descargadosmb, totalmb, percent, old_div(velocidad, 1024),
                                                  sec_to_hms(tiempofalta)))
                         break
diff --git a/core/scrapertools.py b/core/scrapertools.py
index 0ab6440c..43631578 100644
--- a/core/scrapertools.py
+++ b/core/scrapertools.py
@@ -40,8 +40,20 @@ def printMatches(matches):
 
 def find_single_match(data, patron, index=0):
     try:
-        matches = re.findall(patron, data, flags=re.DOTALL)
-        return matches[index]
+        if index == 0:
+            matches = re.search(patron, data, flags=re.DOTALL)
+            if matches:
+                if len(matches.groups()) == 1:
+                    return matches.group(1)
+                elif len(matches.groups()) > 1:
+                    return matches.groups()
+                else:
+                    return matches.group()
+            else:
+                return ""
+        else:
+            matches = re.findall(patron, data, flags=re.DOTALL)
+            return matches[index]
     except:
         return ""
 
@@ -91,6 +103,8 @@ def unescape(text):
     from Fredrik Lundh
     http://effbot.org/zone/re-sub.htm#unescape-html
     """
+    if not ('&' in text and ';' in text):
+        return text
 
     def fixup(m):
         text = m.group(0)
@@ -418,7 +432,7 @@ def get_season_and_episode(title):
     """
     filename = ""
 
-    patrons = ["(\d+)\s*[x-]\s*(\d+)", "(\d+)\s*×\s*(\d+)", "(?:[Ss]|[Tt])(\d+)(?:[Ee]|Ep\.)(\d+)",
+    patrons = ["(\d+)\s*[x-]\s*(\d+)", "(\d+)\s*×\s*(\d+)", "(?:[Ss]|[Tt])(\d+)\s?(?:[Ee]|Ep\.?)(\d+)",
                "(?:[Ss]tag|[Ss]eason|[Ss]tagione\w*)\s*(\d+)\s*(?:[Ee]pi|[Ee]pisode|[Ee]pisodio\w*)\s*(\d+)"]
 
     for patron in patrons:
diff --git a/core/servertools.py b/core/servertools.py
index 7259a8bd..f076da1f 100644
--- a/core/servertools.py
+++ b/core/servertools.py
@@ -118,8 +118,6 @@ def get_servers_itemlist(itemlist, fnc=None, sort=False):
 
     # We remove the deactivated servers
     # itemlist = filter(lambda i: not i.server or is_server_enabled(i.server), itemlist)
-    # Filter if necessary
-    itemlist = filter_servers(itemlist)
 
     for item in itemlist:
         # We assign "direct" in case the server is not in KoD
@@ -152,23 +150,24 @@ def findvideos(data, skip=False):
     servers_list = list(get_servers_list().keys())
 
 
-    is_filter_servers = False
+    # is_filter_servers = False
 
     # Run findvideos on each active server
     for serverid in servers_list:
         '''if not is_server_enabled(serverid):
             continue'''
-        if config.get_setting("filter_servers") == True and config.get_setting("black_list", server=serverid):
-            is_filter_servers = True
+        if config.get_setting('servers_blacklist') and serverid not in config.get_setting("black_list", server='servers'):
+        # if config.get_setting("filter_servers") == True and config.get_setting("black_list", server=serverid):
+        #     is_filter_servers = True
             continue
         devuelve.extend(findvideosbyserver(data, serverid))
         if skip and len(devuelve) >= skip:
             devuelve = devuelve[:skip]
             break
-    if config.get_setting("filter_servers") == False:  is_filter_servers = False
-    if not devuelve and is_filter_servers:
-        platformtools.dialog_ok(config.get_localized_string(60000), config.get_localized_string(60001))
-
+    # if config.get_setting("filter_servers") == False:  is_filter_servers = False
+    # logger.info('DEVUELVE: ' + str(devuelve))
+    # if not devuelve and is_filter_servers:
+    #     platformtools.dialog_ok(config.get_localized_string(60000), config.get_localized_string(60001))
     return devuelve
 
 
@@ -214,8 +213,6 @@ def get_server_from_url(url):
     for serverid in servers_list:
         '''if not is_server_enabled(serverid):
             continue'''
-        if config.get_setting("filter_servers") == True and config.get_setting("black_list", server=serverid):
-            continue
         serverid = get_server_name(serverid)
         if not serverid:
             continue
@@ -535,35 +532,35 @@ def get_server_parameters(server):
     return dict_servers_parameters[server]
 
 
-def get_server_json(server_name):
-    # logger.info("server_name=" + server_name)
-    try:
-        server_path = filetools.join(config.get_runtime_path(), "servers", server_name + ".json")
-        if not filetools.exists(server_path):
-            server_path = filetools.join(config.get_runtime_path(), "servers", "debriders", server_name + ".json")
-
-        # logger.info("server_path=" + server_path)
-        server_json = jsontools.load(filetools.read(server_path))
-        # logger.info("server_json= %s" % server_json)
-
-    except Exception as ex:
-        template = "An exception of type %s occured. Arguments:\n%r"
-        message = template % (type(ex).__name__, ex.args)
-        logger.error(" %s" % message)
-        server_json = None
-
-    return server_json
+# def get_server_json(server_name):
+#     # logger.info("server_name=" + server_name)
+#     try:
+#         server_path = filetools.join(config.get_runtime_path(), "servers", server_name + ".json")
+#         if not filetools.exists(server_path):
+#             server_path = filetools.join(config.get_runtime_path(), "servers", "debriders", server_name + ".json")
+#
+#         # logger.info("server_path=" + server_path)
+#         server_json = jsontools.load(filetools.read(server_path))
+#         # logger.info("server_json= %s" % server_json)
+#
+#     except Exception as ex:
+#         template = "An exception of type %s occured. Arguments:\n%r"
+#         message = template % (type(ex).__name__, ex.args)
+#         logger.error(" %s" % message)
+#         server_json = None
+#
+#     return server_json
 
 
 def get_server_host(server_name):
     from core import scrapertools
-    return [scrapertools.get_domain_from_url(pattern['url']) for pattern in get_server_json(server_name)['find_videos']['patterns']]
+    return [scrapertools.get_domain_from_url(pattern['url']) for pattern in get_server_parameters(server_name)['find_videos']['patterns']]
 
 
 def get_server_controls_settings(server_name):
     dict_settings = {}
 
-    list_controls = get_server_json(server_name).get('settings', [])
+    list_controls = get_server_parameters(server_name).get('settings', [])
     import copy
     list_controls = copy.deepcopy(list_controls)
 
@@ -720,33 +717,7 @@ def sort_servers(servers_list):
     return servers_list
 
 
-def filter_servers(servers_list):
-    """
-    If the option "Filter by servers" is activated in the server configuration, removes the servers included in the Black List from the entry list.
-    :param servers_list: List of servers to filter. The items in the servers_list can be strings or Item objects. In which case it is necessary that they have an item.server attribute of type str.
-    :return: List of the same type of objects as servers_list filtered based on the Black List.
-    """
-    # We eliminate the inactive
-    if servers_list:
-        servers_list = [i for i in servers_list if not i.server or is_server_enabled(i.server)]
-
-
-    if servers_list and config.get_setting('filter_servers'):
-        if isinstance(servers_list[0], Item):
-            servers_list_filter = [x for x in servers_list if not config.get_setting("black_list", server=x.server)]
-        else:
-            servers_list_filter = [x for x in servers_list if not config.get_setting("black_list", server=x)]
-
-        # If there are no links after filtering
-        if servers_list_filter or not platformtools.dialog_yesno(config.get_localized_string(60000), config.get_localized_string(60010), config.get_localized_string(70281)):
-            servers_list = servers_list_filter
-
-    return servers_list
-
-
-
 # Checking links
-
 def check_list_links(itemlist, numero='', timeout=3):
     """
     Check a list of video links and return it by modifying the title with verification.
diff --git a/core/support.py b/core/support.py
index 40877d23..e19c3303 100755
--- a/core/support.py
+++ b/core/support.py
@@ -39,13 +39,8 @@ def hdpass_get_servers(item):
         for mir_url, srv in scrapertools.find_multiple_matches(mir, patron_option):
             mir_url = scrapertools.decodeHtmlentities(mir_url)
             log(mir_url)
-            it = Item(channel=item.channel,
-                            action="play",
-                            fulltitle=item.fulltitle,
+            it = item.clone(action="play",
                             quality=quality,
-                            show=item.show,
-                            thumbnail=item.thumbnail,
-                            contentType=item.contentType,
                             title=srv,
                             server=srv,
                             url= mir_url)
@@ -114,7 +109,7 @@ def search(channel, item, texto):
 
 def dbg():
     if config.dev_mode():
-        import web_pdb;
+        import web_pdb
         if not web_pdb.WebPdb.active_instance:
             import webbrowser
             webbrowser.open('http://127.0.0.1:5555')
@@ -128,7 +123,8 @@ def regexDbg(item, patron, headers, data=''):
 
         if not data:
             html = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data.replace("'", '"')
-            html = re.sub('\n|\t', ' ', html)
+            html = html.replace('\n', ' ')
+            html = html.replace('\t', ' ')
         else:
             html = data
         headers = {'content-type': 'application/json'}
@@ -168,6 +164,14 @@ def cleantitle(title):
     cleantitle = title.replace('"', "'").replace('×', 'x').replace('–', '-').strip()
     return cleantitle
 
+def unifyEp(ep):
+    # ep = re.sub(r'\s-\s|-|&#8211;|&#215;|×', 'x', scraped['episode'])
+    ep = ep.replace('-', 'x')
+    ep = ep.replace('&#8211;', 'x')
+    ep = ep.replace('&#215;', 'x')
+    ep = ep.replace('×', 'x')
+    return ep
+
 def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, typeContentDict, typeActionDict, blacklist, search, pag, function, lang, sceneTitle):
     itemlist = []
     log("scrapeBlock qui")
@@ -216,10 +220,10 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
 
         if scraped['season']:
             stagione = scraped['season']
-            ep = re.sub(r'\s-\s|-|x|&#8211|&#215;|×', 'x', scraped['episode'])
+            ep = unifyEp(scraped['episode'])
             if 'x' in ep:
-                episode = ep.split('x')[0]
-                second_episode = ep.split('x')[1]
+                episode = ep.split('x')[0].strip()
+                second_episode = ep.split('x')[1].strip()
             else:
                 episode = ep
                 second_episode = ''
@@ -234,7 +238,7 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
             item.news = 'season_completed'
             episode = ''
         else:
-            episode = re.sub(r'\s-\s|-|x|&#8211|&#215;|×', 'x', scraped['episode']) if scraped['episode'] else ''
+            episode = unifyEp(scraped['episode']) if scraped['episode'] else ''
             if 'x' in episode:
                 ep = episode.split('x')
                 episode = str(int(ep[0])).zfill(1) + 'x' + str(int(ep[1])).zfill(2)
@@ -292,7 +296,10 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
                     if parsedTitle.get('screen_size'):
                         quality += ' ' + str(parsedTitle.get('screen_size', ''))
                 if not scraped['year']:
-                    infolabels['year'] = parsedTitle.get('year', '')
+                    if type(parsedTitle.get('year', '')) == list:
+                        infolabels['year'] =parsedTitle.get('year', '')[0]
+                    else:
+                        infolabels['year'] = parsedTitle.get('year', '')
                 if parsedTitle.get('episode') and parsedTitle.get('season'):
                     longtitle = title + s
 
@@ -434,7 +441,8 @@ def scrape(func):
             if not data:
                 page = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True)
                 data = page.data.replace("'", '"')
-                data = re.sub('\n|\t', ' ', data)
+                data = data.replace('\n', ' ')
+                data = data.replace('\t', ' ')
                 data = re.sub(r'>\s+<', '> <', data)
                 # replace all ' with " and eliminate newline, so we don't need to worry about
             scrapingTime = time()
@@ -479,8 +487,8 @@ def scrape(func):
             else:
                 break
 
-        if (pagination and len(matches) <= pag * pagination) or not pagination: # next page with pagination
-            if patronNext and inspect.stack()[1][3] != 'newest':
+        if (pagination and len(matches) <= pag * pagination) or not pagination:  # next page with pagination
+            if patronNext and inspect.stack()[1][3] not in ['newest', 'search']:
                 nextPage(itemlist, item, data, patronNext, function)
 
         # next page for pagination
@@ -543,12 +551,13 @@ def dooplay_get_links(item, host):
     for type, post, nume, title, server in matches:
         postData = urlencode({
             "action": "doo_player_ajax",
-            "post": post,
+            "post": post, 
             "nume": nume,
             "type": type
         })
         dataAdmin = httptools.downloadpage(host + '/wp-admin/admin-ajax.php', post=postData,headers={'Referer': item.url}).data
-        link = scrapertools.find_single_match(dataAdmin, "<iframe.*src='([^']+)'")
+        link = scrapertools.find_single_match(dataAdmin, r"<iframe.*src='([^']+)'")
+        if not link: link = scrapertools.find_single_match(dataAdmin, r'"embed_url":"([^"]+)"').replace('\\','')
         ret.append({
             'url': link,
             'title': title,
@@ -785,8 +794,8 @@ def menu(func):
             menuItem(itemlist, filename, config.get_localized_string(70741) % '… {bold}', 'search', host + dictUrl['search'], style=not global_search)
 
         if not global_search:
-            autoplay.init(item.channel, list_servers, list_quality)
-            autoplay.show_option(item.channel, itemlist)
+            # autoplay.init(item.channel, list_servers, list_quality)
+            # autoplay.show_option(item.channel, itemlist)
             channel_config(item, itemlist)
 
             # Apply auto Thumbnails at the menus
@@ -915,8 +924,9 @@ def match(item_url_string, **args):
         data = httptools.downloadpage(url, **args).data.replace("'", '"')
 
     # format page data
-    data = re.sub(r'\n|\t', ' ', data)
-    data = re.sub(r'>\s\s*<', '><', data)
+    data = data.replace('\n', ' ')
+    data = data.replace('\t', ' ')
+    data = re.sub(r'>\s+<', '><', data)
 
     # collect blocks of a page
     if patronBlock:
@@ -1094,6 +1104,7 @@ def videolibrary(itemlist, item, typography='', function_level=1, function=''):
 def nextPage(itemlist, item, data='', patron='', function_or_level=1, next_page='', resub=[]):
     # Function_level is useful if the function is called by another function.
     # If the call is direct, leave it blank
+    log()
     action = inspect.stack()[function_or_level][3] if type(function_or_level) == int else function_or_level
     if next_page == '':
         next_page = scrapertools.find_single_match(data, patron)
@@ -1102,7 +1113,7 @@ def nextPage(itemlist, item, data='', patron='', function_or_level=1, next_page=
         if resub: next_page = re.sub(resub[0], resub[1], next_page)
         if 'http' not in next_page:
             next_page = scrapertools.find_single_match(item.url, 'https?://[a-z0-9.-]+') + (next_page if next_page.startswith('/') else '/' + next_page)
-        next_page = re.sub('&amp;', '&',next_page)
+        next_page = next_page.replace('&amp;', '&')
         log('NEXT= ', next_page)
         itemlist.append(
             Item(channel=item.channel,
@@ -1166,6 +1177,8 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
         videoitem.contentType = item.contentType
         videoitem.infoLabels = item.infoLabels
         videoitem.quality = quality
+        # videoitem.nfo = item.nfo
+        # videoitem.strm_path = item.strm_path
         return videoitem
 
     with futures.ThreadPoolExecutor() as executor:
@@ -1180,11 +1193,8 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
     if patronTag:
         addQualityTag(item, verifiedItemlist, data, patronTag)
 
-    # Auto Play & Hide Links
-    AP, HS = autoplay.get_channel_AP_HS(item)
-
     # Check Links
-    if not AP and not item.global_search and (config.get_setting('checklinks') or config.get_setting('checklinks', item.channel)):
+    if not item.global_search and (config.get_setting('checklinks') or config.get_setting('checklinks', item.channel)):
         if config.get_setting('checklinks', item.channel):
             checklinks_number = config.get_setting('checklinks_number', item.channel)
         elif config.get_setting('checklinks'):
@@ -1198,11 +1208,8 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
         videolibrary(verifiedItemlist, item)
     if Download:
         download(verifiedItemlist, item, function_level=3)
-
-    if not AP or not HS:
-        # for it in verifiedItemlist:
-        #     log(it)
-        return verifiedItemlist
+    # if item.contentChannel == 'videolibrary' or not config.get_setting('autoplay'):
+    return verifiedItemlist
 
 
 def filterLang(item, itemlist):
@@ -1213,12 +1220,12 @@ def filterLang(item, itemlist):
         itemlist = filtertools.get_links(itemlist, item, list_language)
     return itemlist
 
-def aplay(item, itemlist, list_servers='', list_quality=''):
-    if inspect.stack()[1][3] == 'mainlist':
-        autoplay.init(item.channel, list_servers, list_quality)
-        autoplay.show_option(item.channel, itemlist)
-    else:
-        autoplay.start(itemlist, item)
+# def aplay(item, itemlist, list_servers='', list_quality=''):
+#     if inspect.stack()[1][3] == 'mainlist':
+#         autoplay.init(item.channel, list_servers, list_quality)
+#         autoplay.show_option(item.channel, itemlist)
+#     else:
+#         autoplay.start(itemlist, item)
 
 
 def log(*args):
diff --git a/core/videolibrarytools.py b/core/videolibrarytools.py
index 736ced36..71f85fcc 100644
--- a/core/videolibrarytools.py
+++ b/core/videolibrarytools.py
@@ -135,7 +135,7 @@ def save_movie(item, silent=False):
 
     for raiz, subcarpetas, ficheros in filetools.walk(MOVIES_PATH):
         for c in subcarpetas:
-            code = scrapertools.find_single_match(c, '\[(.*?)\]')
+            code = scrapertools.find_single_match(c, r'\[(.*?)\]')
             if code and code in item.infoLabels['code']:
                 path = filetools.join(raiz, c)
                 _id = code
@@ -192,7 +192,7 @@ def save_movie(item, silent=False):
             headers = {}
             if item.headers:
                 headers = item.headers
-            channel = generictools.verify_channel(item.channel)
+            channel = item.channel
             if config.get_setting("emergency_urls", channel) in [1, 3]:
                 item = emergency_urls(item, None, json_path, headers=headers)
                 if item_nfo.emergency_urls and not isinstance(item_nfo.emergency_urls, dict):
@@ -364,7 +364,7 @@ def filter_list(episodelist, action=None, path=None):
         stop = False
         while not stop:
             for episode in episodelist:
-                title = scrapertools.find_single_match(episode.title, '(\d+x\d+)')
+                title = scrapertools.find_single_match(episode.title, r'(\d+x\d+)')
                 if not any(title in word for word in ep_list) and episode.contentLanguage == langs[count]:
                     ep_list.append(episode.title)
             if count < len(langs)-1: count += 1
@@ -386,14 +386,14 @@ def filter_list(episodelist, action=None, path=None):
         stop = False
         while not stop:
             for episode in episodelist:
-                title = scrapertools.find_single_match(episode.title, '(\d+x\d+)')
+                title = scrapertools.find_single_match(episode.title, r'(\d+x\d+)')
                 if not any(title in word for word in ep_list) and episode.quality.lower() in quality_dict[quality_list[selection]]:
                     ep_list.append(episode.title)
             if selection != 0: selection = selection - 1
             else: stop = True
             if quality_list[selection] == 'N/A':
                 for episode in episodelist:
-                    title = scrapertools.find_single_match(episode.title, '(\d+x\d+)')
+                    title = scrapertools.find_single_match(episode.title, r'(\d+x\d+)')
                     if not any(title in word for word in ep_list):
                         ep_list.append(episode.title)
 
@@ -473,7 +473,7 @@ def save_tvshow(item, episodelist, silent=False):
 
     for raiz, subcarpetas, ficheros in filetools.walk(TVSHOWS_PATH):
         for c in subcarpetas:
-            code = scrapertools.find_single_match(c, '\[(.*?)\]')
+            code = scrapertools.find_single_match(c, r'\[(.*?)\]')
             if code and code != 'None' and code in item.infoLabels['code']:
                 path = filetools.join(raiz, c)
                 _id = code
@@ -602,12 +602,12 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
         p_dialog = platformtools.dialog_progress(config.get_localized_string(20000), config.get_localized_string(60064))
         p_dialog.update(0, config.get_localized_string(60065))
 
-    channel_alt = generictools.verify_channel(serie.channel)            # We prepare to add the emergency urls
+    channel_alt = serie.channels                                                    # We prepare to add the emergency urls
     emergency_urls_stat = config.get_setting("emergency_urls", channel_alt)         # Does the channel want emergency urls?
     emergency_urls_succ = False
     try: channel = __import__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
     except: channel = __import__('channels.%s' % channel_alt, fromlist=["channels.%s" % channel_alt])
-    if serie.torrent_caching_fail:                              # If the conversion process has failed, they are not cached
+    if serie.torrent_caching_fail:                                                  # If the conversion process has failed, they are not cached
         emergency_urls_stat = 0
         del serie.torrent_caching_fail
 
@@ -679,8 +679,8 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
 
         high_sea = e.contentSeason
         high_epi = e.contentEpisodeNumber
-        if scrapertools.find_single_match(e.title, '[a|A][l|L]\s*(\d+)'):
-            high_epi = int(scrapertools.find_single_match(e.title, 'al\s*(\d+)'))
+        if scrapertools.find_single_match(e.title, r'[a|A][l|L]\s*(\d+)'):
+            high_epi = int(scrapertools.find_single_match(e.title, r'al\s*(\d+)'))
         max_sea = e.infoLabels["number_of_seasons"]
         max_epi = 0
         if e.infoLabels["number_of_seasons"] and (e.infoLabels["temporada_num_episodios"] or e.infoLabels["number_of_seasons"] == 1):
@@ -981,8 +981,8 @@ def add_tvshow(item, channel=None):
 
         if not channel:
             try:
-                # channel = __import__('channels.%s' % item.channel, fromlist=["channels.%s" % item.channel])
-                channel = __import__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
+                channel = __import__('channels.%s' % item.channel, fromlist=["channels.%s" % item.channel])
+                # channel = __import__('specials.%s' % item.channel, fromlist=["specials.%s" % item.channel])
             except ImportError:
                 exec("import channels." + item.channel + " as channel")
 
@@ -998,9 +998,8 @@ def add_tvshow(item, channel=None):
         #    del item.tmdb_stat          # We clean the status so that it is not recorded in the Video Library
 
         # Get the episode list
-
         itemlist = getattr(channel, item.action)(item)
-        if itemlist and not scrapertools.find_single_match(itemlist[0].title, r'(\d+.\d+)'):
+        if itemlist and not scrapertools.find_single_match(itemlist[0].title, r'(\d+x\d+)'):
             from specials.autorenumber import select_type, renumber, check
             if not check(item):
                 action = item.action
@@ -1066,7 +1065,7 @@ def emergency_urls(item, channel=None, path=None, headers={}):
     # we launched a "lookup" in the "findvideos" of the channel to obtain the emergency links
     try:
         if channel == None:                             # If the caller has not provided the channel structure, it is created
-            channel = generictools.verify_channel(item.channel)             # It is verified if it is a clone, which returns "newpct1"
+            channel = item.channel                      # It is verified if it is a clone, which returns "newpct1"
             #channel = __import__('channels.%s' % channel, fromlist=["channels.%s" % channel])
             channel = __import__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
         if hasattr(channel, 'findvideos'):                                  # If the channel has "findvideos" ...
@@ -1099,7 +1098,7 @@ def emergency_urls(item, channel=None, path=None, headers={}):
         try:
             referer = None
             post = None
-            channel_bis = generictools.verify_channel(item.channel)
+            channel_bis =item.channel
             if config.get_setting("emergency_urls_torrents", channel_bis) and item_res.emergency_urls and path != None:
                 videolibrary_path = config.get_videolibrary_path()          # we detect the absolute path of the title
                 movies = config.get_setting("folder_movies")
diff --git a/lib/generictools.py b/lib/generictools.py
index bca3395e..ffe77898 100644
--- a/lib/generictools.py
+++ b/lib/generictools.py
@@ -2,36 +2,23 @@
 # ------------------------------------------------------------
 # GenericTools
 # ------------------------------------------------------------
-# Código reusable de diferentes partes de los canales que pueden
-# ser llamadados desde otros canales, y así carificar el formato
-# y resultado de cada canal y reducir el costo su mantenimiento
+# Reusable code of different parts of channels that can
+# be called from other channels, and thus charify the format
+# and result of each channel and reduce the cost of its maintenance
 # ------------------------------------------------------------
 
-import re
-import os
-import sys
-import urllib
-try:
-    import urlparse
-except:
-    import urllib.parse as urlparse
-import datetime
-import time
-import traceback
+import re, os, sys, datetime, time, traceback
+try: import urlparse
+except: import urllib.parse as urlparse
 
 from channelselector import get_thumb
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import channeltools
-from core import filetools
+from core import httptools, scrapertools, servertools, channeltools, filetools, tmdb
 from core.item import Item
 from platformcode import config, logger, platformtools
-from core import tmdb
 from lib import jsunpack
 
 channel_py = "newpct1"
-intervenido_judicial = 'Dominio intervenido por la Autoridad Judicial'
+intervenido_judicial = 'Domain intervened by the Judicial Authority'
 intervenido_policia = 'Judicial_Policia_Nacional'
 intervenido_guardia = 'Judicial_Guardia_Civil'
 intervenido_sucuri = 'Access Denied - Sucuri Website Firewall'
@@ -39,57 +26,58 @@ intervenido_sucuri = 'Access Denied - Sucuri Website Firewall'
 
 def update_title(item):
     logger.info()
-    from core import scraper
+    from core import scraper,support
+
 
     """
-    Utilidad para desambiguar Títulos antes de añadirlos a la Videoteca.  Puede ser llamado desde Videolibrarytools
-    o desde Episodios en un Canal.  Si se llama desde un canal, la llamada sería así (incluida en post_tmdb_episodios(item, itemlist)):
-    
-        #Permitimos la actualización de los títulos, bien para uso inmediato, o para añadir a la videoteca
-        item.from_action = item.action      #Salvamos la acción...
-        item.from_title = item.title        #... y el título
-        itemlist.append(item.clone(title="** [COLOR limegreen]Actualizar Títulos - vista previa videoteca[/COLOR] **", action="actualizar_titulos", extra="episodios", tmdb_stat=False))
-    
-    El canal deberá añadir un método para poder recibir la llamada desde Kodi/Alfa, y poder llamar a este método:
-    
+    Utility to disambiguate Titles before adding them to the Video Library. Can be called from Videolibrarytools
+    or from Episodes on a Channel. If called from a channel, the call would be like this (included in post_tmdb_episodes (item, itemlist)):
+
+        # Allow the updating of titles, either for immediate use, or to add to the video library
+        item.from_action = item.action      # Save action
+        item.from_title = item.title        # Save Title
+        itemlist.append(item.clone(title="** [COLOR limegreen]Update Titles - video library preview[/COLOR] **", action="actualizar_titulos", extra="episodios", tmdb_stat=False))
+
+    The channel must add a method to be able to receive the call from Kodi / Alfa, and be able to call this method:
+
     def actualizar_titulos(item):
         logger.info()
         itemlist = []
         from lib import generictools
         from platformcode import launcher
-        
-        item = generictools.update_title(item) #Llamamos al método que actualiza el título con tmdb.find_and_set_infoLabels
-        
-        #Volvemos a la siguiente acción en el canal
+
+        item = generictools.update_title(item) # We call the method that updates the title with tmdb.find_and_set_infoLabels
+
+        # We return to the next action on the channel
         return launcher.run(item)
-    
-    Para desambiguar títulos, se provoca que TMDB pregunte por el título realmente deseado, borrando los IDs existentes
-    El usuario puede seleccionar el título entre los ofrecidos en la primera pantalla
-    o puede cancelar e introducir un nuevo título en la segunda pantalla
-    Si lo hace en "Introducir otro nombre", TMDB buscará automáticamente el nuevo título
-    Si lo hace en "Completar Información", cambia al nuevo título, pero no busca en TMDB.  Hay que hacerlo de nuevo
-    Si se cancela la segunda pantalla, la variable "scraper_return" estará en False.  El usuario no quiere seguir
+
+    To disambiguate titles, TMDB is caused to ask for the really desired title, deleting existing IDs
+    The user can select the title among those offered on the first screen
+    or you can cancel and enter a new title on the second screen
+    If you do it in "Enter another name", TMDB will automatically search for the new title
+    If you do this under "Complete Information", it changes to the new title, but does not search TMDB. We have to do it again
+    If the second screen is canceled, the variable "scraper_return" will be False. The user does not want to continue
     """
-    #logger.debug(item)
-    
-    #Restauramos y borramos las etiquetas intermedias (si se ha llamado desde el canal)
+    # logger.debug(item)
+
+    # We restore and delete intermediate labels (if called from the channel)
     if item.from_action:
         item.action = item.from_action
         del item.from_action
     if item.from_update:
-        if item.from_title_tmdb:            #Si se salvó el título del contenido devuelto por TMDB, se restaura.
+        if item.from_title_tmdb:            # If the title of the content returned by TMDB was saved, it is restored.
             item.title = item.from_title_tmdb
     else:
-        item.add_videolibrary = True        #Estamos Añadiendo a la Videoteca.  Indicador para control de uso de los Canales
+        item.add_videolibrary = True        # We are Adding to the Video Library. Indicator to control the use of Channels
     if item.add_videolibrary:
         if item.season_colapse: del item.season_colapse
         if item.from_num_season_colapse: del item.from_num_season_colapse
         if item.from_title_season_colapse: del item.from_title_season_colapse
         if item.contentType == "movie":
-            if item.from_title_tmdb:        #Si se salvó el título del contenido devuelto por TMDB, se restaura.
+            if item.from_title_tmdb:        # If the title of the content returned by TMDB was saved, it is restored.
                 item.title = item.from_title_tmdb
             del item.add_videolibrary
-        if item.channel_host:               #Borramos ya el indicador para que no se guarde en la Videoteca
+        if item.channel_host:               # We already delete the indicator so that it is not stored in the Video Library
             del item.channel_host
         if item.contentTitle:
             item.contentTitle = re.sub(r' -%s-' % item.category, '', item.contentTitle)
@@ -98,86 +86,86 @@ def update_title(item):
         from_title_tmdb = item.contentTitle
     else:
         from_title_tmdb = item.contentSerieName
-    
-    #Sólo ejecutamos este código si no se ha hecho antes en el Canal.  Por ejemplo, si se ha llamado desde Episodios o Findvideos,
-    #ya no se ejecutará al Añadia a Videoteca, aunque desde el canal se podrá llamar tantas veces como se quiera, 
-    #o hasta que encuentre un título no ambiguo
+
+    # We only execute this code if it has not been done before in the Channel. For example, if you have called from Episodes or Findvideos,
+    # The Add to Video Library will no longer be executed, although from the channel you can call as many times as you want,
+    # or until you find an unambiguous title
     if item.tmdb_stat:
         if item.from_title_tmdb: del item.from_title_tmdb
         if item.from_title: del item.from_title
         item.from_update = True
         del item.from_update
         if item.contentType == "movie":
-            if item.channel == channel_py:  #Si es una peli de NewPct1, ponemos el nombre del clone
-                item.channel = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/')
+            if item.channel == channel_py:  # If it is a NewPct1 movie, we put the name of the clone
+                item.channel = scrapertools.find_single_match(item.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/')
     else:
-        new_item = item.clone()             #Salvamos el Item inicial para restaurarlo si el usuario cancela
+        new_item = item.clone()             # We save the initial Item to restore it if the user cancels
         if item.contentType == "movie":
-            if item.channel == channel_py:  #Si es una peli de NewPct1, ponemos el nombre del clone
-                item.channel = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/')
-        #Borramos los IDs y el año para forzar a TMDB que nos pregunte
+            if item.channel == channel_py:  # If it is a NewPct1 movie, we put the name of the clone
+                item.channel = scrapertools.find_single_match(item.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/')
+        # We delete the IDs and the year to force TMDB to ask us
         if item.infoLabels['tmdb_id'] or item.infoLabels['tmdb_id'] == None: item.infoLabels['tmdb_id'] = ''
         if item.infoLabels['tvdb_id'] or item.infoLabels['tvdb_id'] == None: item.infoLabels['tvdb_id'] = ''
         if item.infoLabels['imdb_id'] or item.infoLabels['imdb_id'] == None: item.infoLabels['imdb_id'] = ''
-        if item.infoLabels['season']: del item.infoLabels['season'] #Funciona mal con num. de Temporada.  Luego lo restauramos
+        if item.infoLabels['season']: del item.infoLabels['season'] # It works wrong with num. seasonal. Then we restore it
         item.infoLabels['year'] = '-'
-        
+
         if item.from_title:
             if item.from_title_tmdb:
-                if scrapertools.find_single_match(item.from_title_tmdb, '^(?:\[COLOR \w+\])?(.*?)(?:\[)'):
-                    from_title_tmdb = scrapertools.find_single_match(item.from_title_tmdb, '^(?:\[COLOR \w+\])?(.*?)(?:\[)').strip()
+                if scrapertools.find_single_match(item.from_title_tmdb, r'^(?:\[COLOR \w+\])?(.*?)(?:\[)'):
+                    from_title_tmdb = scrapertools.find_single_match(item.from_title_tmdb, r'^(?:\[COLOR \w+\])?(.*?)(?:\[)').strip()
             item.title = item.title.replace(from_title_tmdb, item.from_title)
             item.infoLabels['title'] = item.from_title
-            
+
             if item.from_title_tmdb: del item.from_title_tmdb
         if not item.from_update and item.from_title: del item.from_title
 
-        if item.contentSerieName:           #Copiamos el título para que sirva de referencia en menú "Completar Información"
+        if item.contentSerieName:           # We copy the title to serve as a reference in the "Complete Information" menu
             item.infoLabels['originaltitle'] = item.contentSerieName
             item.contentTitle = item.contentSerieName
         else:
             item.infoLabels['originaltitle'] = item.contentTitle
-            
+
         scraper_return = scraper.find_and_set_infoLabels(item)
 
-        if not scraper_return:  #Si el usuario ha cancelado, restituimos los datos a la situación inicial y nos vamos
+        if not scraper_return:  # If the user has canceled, we restore the data to the initial situation and leave
             item = new_item.clone()
         else:
-            #Si el usuario ha cambiado los datos en "Completar Información" hay que ver el título definitivo en TMDB
+            # If the user has changed the data in "Complete Information" you must see the final title in TMDB
             if not item.infoLabels['tmdb_id']:
                 if item.contentSerieName:
-                    item.contentSerieName = item.contentTitle                       #Se pone título nuevo
-                item.infoLabels['noscrap_id'] = ''                                  #Se resetea, por si acaso
-                item.infoLabels['year'] = '-'                                       #Se resetea, por si acaso
-                scraper_return = scraper.find_and_set_infoLabels(item)              #Se intenta de nuevo
+                    item.contentSerieName = item.contentTitle                       # New title is put
+                item.infoLabels['noscrap_id'] = ''                                  # It resets, just in case
+                item.infoLabels['year'] = '-'                                       # It resets, just in case
+                scraper_return = scraper.find_and_set_infoLabels(item)              # Try again
 
-                #Parece que el usuario ha cancelado de nuevo.  Restituimos los datos a la situación inicial
+                # It seems the user has canceled again. We restore the data to the initial situation
                 if not scraper_return or not item.infoLabels['tmdb_id']:
                     item = new_item.clone()
                 else:
-                    item.tmdb_stat = True           #Marcamos Item como procesado correctamente por TMDB (pasada 2)
+                    item.tmdb_stat = True           # We mark Item as processed correctly by TMDB (pass 2)
             else:
-                item.tmdb_stat = True               #Marcamos Item como procesado correctamente por TMDB (pasada 1)
+                item.tmdb_stat = True               # We mark Item as successfully processed by TMDB (pass 1)
 
-            #Si el usuario ha seleccionado una opción distinta o cambiado algo, ajustamos los títulos
+            # If the user has selected a different option or changed something, we adjust the titles
             if item.contentType != 'movie' or item.from_update:
-                item.channel = new_item.channel     #Restuaramos el nombre del canal, por si lo habíamos cambiado
+                item.channel = new_item.channel     # Restoring the name of the channel, in case we had changed it
             if item.tmdb_stat == True:
-                if new_item.contentSerieName:       #Si es serie...
+                if new_item.contentSerieName:       # If it's serial ...
                     filter_languages =  config.get_setting("filter_languages", item.channel)
                     if filter_languages and filter_languages >= 0:
-                        item.title_from_channel = new_item.contentSerieName         #Guardo el título incial para Filtertools
-                        item.contentSerieName = new_item.contentSerieName           #Guardo el título incial para Filtertools
+                        item.title_from_channel = new_item.contentSerieName         # I keep the initial title for Filtertools
+                        item.contentSerieName = new_item.contentSerieName           # I keep the initial title for Filtertools
                     else:
                         item.title = item.title.replace(new_item.contentSerieName, item.contentTitle).replace(from_title_tmdb, item.contentTitle)
                         item.contentSerieName = item.contentTitle
-                    if new_item.contentSeason: item.contentSeason = new_item.contentSeason      #Restauramos Temporada
-                    if item.infoLabels['title']: del item.infoLabels['title']       #Borramos título de peli (es serie)
-                else:                                                               #Si es película...
+                    if new_item.contentSeason: item.contentSeason = new_item.contentSeason      # We restore Season
+                    if item.infoLabels['title']: del item.infoLabels['title']       # We delete movie title (it is series)
+                else:                                                               # If it's a movie ...
                     item.title = item.title.replace(new_item.contentTitle, item.contentTitle).replace(from_title_tmdb, item.contentTitle)
-                if new_item.infoLabels['year']:                                     #Actualizamos el Año en el título
+                if new_item.infoLabels['year']:                                     # We update the Year in the title
                     item.title = item.title.replace(str(new_item.infoLabels['year']), str(item.infoLabels['year']))
-                if new_item.infoLabels['rating']:                                   #Actualizamos en Rating en el título
+                if new_item.infoLabels['rating']:                                   # We update in Rating in the title
                     try:
                         rating_old = ''
                         if new_item.infoLabels['rating'] and new_item.infoLabels['rating'] != 0.0:
@@ -190,88 +178,88 @@ def update_title(item):
                         item.title = item.title.replace("[" + str(rating_old) + "]", "[" + str(rating_new) + "]")
                     except:
                         logger.error(traceback.format_exc())
-                if item.wanted:                                         #Actualizamos Wanted, si existe
+                if item.wanted:                                         # We update Wanted, if it exists
                     item.wanted = item.contentTitle
-                if new_item.contentSeason:                              #Restauramos el núm. de Temporada después de TMDB
+                if new_item.contentSeason:                              # We restore the no. Season after TMDB
                     item.contentSeason = new_item.contentSeason
-                    
-                if item.from_update:                                    #Si la llamda es desde el menú del canal...
-                    item.from_update = True 
+
+                if item.from_update:                                    # If the call is from the channel menu ...
+                    item.from_update = True
                     del item.from_update
-                    xlistitem = refresh_screen(item)                    #Refrescamos la pantallas con el nuevo Item
-                    
-        #Para evitar el "efecto memoria" de TMDB, se le llama con un título ficticio para que resetee los buffers
-        if item.contentSerieName:
-            new_item.infoLabels['tmdb_id'] = '289'                      #una serie no ambigua
-        else:
-            new_item.infoLabels['tmdb_id'] = '111'                      #una peli no ambigua
-        new_item.infoLabels['year'] = '-'
-        if new_item.contentSeason:
-            del new_item.infoLabels['season']                           #Funciona mal con num. de Temporada
-        scraper_return = scraper.find_and_set_infoLabels(new_item)
-        
+                    xlistitem = refresh_screen(item)                    # We refresh the screens with the new Item
+
+        # To avoid TMDB "memory effect", it is called with a dummy title to reset buffers
+        # if item.contentSerieName:
+        #     new_item.infoLabels['tmdb_id'] = '289'                      # an unambiguous series
+        # else:
+        #     new_item.infoLabels['tmdb_id'] = '111'                      # an unambiguous movie
+        # new_item.infoLabels['year'] = '-'
+        # if new_item.contentSeason:
+        #     del new_item.infoLabels['season']                           # It works wrong with num. seasonal
+        # support.dbg()
+        # scraper_return = scraper.find_and_set_infoLabels(new_item)
+
     #logger.debug(item)
-    
+
     return item
-    
+
 
 def refresh_screen(item):
     logger.info()
-    
+
     """
-    #### Compatibilidad con Kodi 18 ####
-    
-    Refresca la pantalla con el nuevo Item después que haber establecido un dialogo que ha causado el cambio de Item
-    Crea un xlistitem para engañar a Kodi con la función xbmcplugin.setResolvedUrl FALSE
-    
-    Entrada: item:          El Item actualizado
-    Salida: xlistitem       El xlistitem creado, por si resulta de alguna utilidad posterior
+    #### Kodi 18 compatibility ####
+
+    Refreshes the screen with the new Item after having established a dialog that has caused the change of Item
+    Create an xlistitem to trick Kodi with the xbmcplugin.setResolvedUrl function FALSE
+
+    Entry: item:    The updated Item
+    Output: xlistitem   The xlistitem created, in case it is of any later use
     """
 
     try:
         import xbmcplugin
         import xbmcgui
-        
-        xlistitem = xbmcgui.ListItem(path=item.url)                     #Creamos xlistitem por compatibilidad con Kodi 18
+
+        xlistitem = xbmcgui.ListItem(path=item.url)                     # We create xlistitem for compatibility with Kodi 18
         if config.get_platform(True)['num_version'] >= 16.0:
-            xlistitem.setArt({"thumb": item.contentThumbnail})          #Cargamos el thumb
+            xlistitem.setArt({"thumb": item.contentThumbnail})          # We load the thumb
         else:
             xlistitem.setThumbnailImage(item.contentThumbnail)
-        xlistitem.setInfo("video", item.infoLabels)                     #Copiamos infoLabel
+        xlistitem.setInfo("video", item.infoLabels)                     # We copy infoLabel
 
-        xbmcplugin.setResolvedUrl(int(sys.argv[1]), False, xlistitem)   #Preparamos el entorno para evitar error Kod1 18
-        time.sleep(1)                                                   #Dejamos tiempo para que se ejecute
+        xbmcplugin.setResolvedUrl(int(sys.argv[1]), False, xlistitem)   # We prepare the environment to avoid Kod1 error 18
+        time.sleep(1)                                                   # We leave time for it to run
     except:
         logger.error(traceback.format_exc())
-    
-    platformtools.itemlist_update(item)                                 #refrescamos la pantalla con el nuevo Item
-    
+
+    platformtools.itemlist_update(item)                                 # we refresh the screen with the new Item
+
     return xlistitem
-    
-    
+
+
 def post_tmdb_listado(item, itemlist):
     logger.info()
     itemlist_fo = []
-    
+
     """
-        
-    Pasada para maquillaje de los títulos obtenidos desde TMDB en Listado y Listado_Búsqueda.
-    
-    Toma de infoLabel todos los datos de interés y los va situando en diferentes variables, principalmente título
-    para que sea compatible con Unify, y si no se tienen Títulos Inteligentes, para que el formato sea lo más
-    parecido al de Unify.
-    
-    También restaura varios datos salvados desde el título antes de pasarlo por TMDB, ya que mantenerlos no habría encontrado el título (title_subs)
-    
-    La llamada al método desde Listado o Listado_Buscar, despues de pasar Itemlist pot TMDB, es:
-    
+
+   Last for makeup of the titles obtained from TMDB in List and List_Search.
+
+    InfoLabel takes all the data of interest and places them in different variables, mainly title
+    so that it is compatible with Unify, and if there are no Smart Titles, so that the format is the most
+    similar to Unify.
+
+    It also restores various saved data from the title before passing it through TMDB, as keeping them would not have found the title (title_subs)
+
+    The method call from Listing or Listing_Search, after passing Itemlist pot TMDB, is:
+
         from lib import generictools
-        item, itemlist = generictools.post_tmdb_listado(item, itemlist)
-    
+        item, itemlist = generictools.post_tmdb_listado (item, itemlist)
     """
-    #logger.debug(item)
-    
-    #Borramos valores si ha habido fail-over
+    # logger.debug(item)
+
+    # We delete values ​​if there has been a fail-over
     channel_alt = ''
     if item.channel_alt:
         channel_alt = item.channel_alt
@@ -279,23 +267,23 @@ def post_tmdb_listado(item, itemlist):
     if item.url_alt:
         del item.url_alt
 
-    #Ajustamos el nombre de la categoría
+    # We adjust the category name
     if not item.category_new:
         item.category_new = ''
 
-    for item_local in itemlist:                                 #Recorremos el Itemlist generado por el canal
+    for item_local in itemlist:                                 # We go through the Itemlist generated by the channel
         item_local.title = re.sub(r'(?i)online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title).strip()
-        #item_local.title = re.sub(r'online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title, flags=re.IGNORECASE).strip()
+        # item_local.title = re.sub(r'online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title, flags=re.IGNORECASE).strip()
         title = item_local.title
-        #logger.debug(item_local)
-        
-        item_local.last_page = 0
-        del item_local.last_page                                #Borramos restos de paginación
+        # logger.debug(item_local)
 
-        if item_local.contentSeason_save:                       #Restauramos el num. de Temporada
+        item_local.last_page = 0
+        del item_local.last_page                                # We delete traces of pagination
+
+        if item_local.contentSeason_save:                       # We restore the num. seasonal
             item_local.contentSeason = item_local.contentSeason_save
 
-        #Borramos valores para cada Contenido si ha habido fail-over
+        # We delete values ​​for each Content if there has been a fail-over
         if item_local.channel_alt:
             del item_local.channel_alt
         if item_local.url_alt:
@@ -306,29 +294,29 @@ def post_tmdb_listado(item, itemlist):
             del item_local.library_filter_show
         if item_local.channel_host:
             del item_local.channel_host
-        
-        #Ajustamos el nombre de la categoría
+
+        # We adjust the category name
         if item_local.channel == channel_py:
-            item_local.category = scrapertools.find_single_match(item_local.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
-        
-        #Restauramos la info adicional guarda en la lista title_subs, y la borramos de Item
+            item_local.category = scrapertools.find_single_match(item_local.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
+
+        # We restore the additional info saved in the title_subs list, and delete it from Item
         title_add = ' '
         if item_local.title_subs:
             for title_subs in item_local.title_subs:
-                if "audio" in title_subs.lower():                               #se restaura info de Audio
+                if "audio" in title_subs.lower():                               # restores Audio info
                     title_add += scrapertools.find_single_match(title_subs, r'[a|A]udio (.*?)')
                     continue
-                if scrapertools.find_single_match(title_subs, r'(\d{4})'):      #Se restaura el año, s no lo ha dado TMDB
+                if scrapertools.find_single_match(title_subs, r'(\d{4})'):      # The year is restored, if it has not been given by TMDB
                     if not item_local.infoLabels['year'] or item_local.infoLabels['year'] == "-":
                         item_local.infoLabels['year'] = scrapertools.find_single_match(title_subs, r'(\d{4})')
                     continue
 
                 title_add = title_add.rstrip()
-                title_add = '%s -%s-' % (title_add, title_subs)                 #se agregan el resto de etiquetas salvadas
+                title_add = '%s -%s-' % (title_add, title_subs)                 # all other saved tags are added
         item_local.title_subs = []
         del item_local.title_subs
 
-        #Preparamos el Rating del vídeo
+        # We prepare the video Rating
         rating = ''
         try:
             if item_local.infoLabels['rating'] and item_local.infoLabels['rating'] != 0.0:
@@ -339,37 +327,37 @@ def post_tmdb_listado(item, itemlist):
         except:
             logger.error(traceback.format_exc())
 
-        __modo_grafico__ = config.get_setting('modo_grafico', item.channel)    
-        
-        # Si TMDB no ha encontrado el vídeo limpiamos el año
+        __modo_grafico__ = config.get_setting('modo_grafico', item.channel)
+
+        # If TMDB has not found the video we clean the year
         if item_local.infoLabels['year'] == "-":
             item_local.infoLabels['year'] = ''
             item_local.infoLabels['aired'] = ''
-            
-        #Si traía el TMDB-ID, pero no ha funcionado, lo reseteamos e intentamos de nuevo
+
+        # If it brought the TMDB-ID, but it did not work, we reset it and tried again
         if item_local.infoLabels['tmdb_id'] and not item_local.infoLabels['originaltitle']:
-            logger.error("*** TMDB-ID erroneo, reseteamos y reintentamos ***")
+            logger.error("*** Wrong TMDB-ID, reset and retry ***")
             logger.error(item_local)
-            del item_local.infoLabels['tmdb_id']                #puede traer un TMDB-ID erroneo
+            del item_local.infoLabels['tmdb_id']                # you can bring a wrong TMDB-ID
             try:
-                tmdb.set_infoLabels(item_local, __modo_grafico__)       #pasamos otra vez por TMDB
+                tmdb.set_infoLabels(item_local, __modo_grafico__)       # we go through TMDB again
             except:
                 logger.error(traceback.format_exc())
             logger.error(item_local)
-        
-        # Si TMDB no ha encontrado nada y hemos usado el año de la web, lo intentamos sin año
+
+        # If TMDB has not found anything and we have used the year of the web, we try without year
         if not item_local.infoLabels['tmdb_id']:
-            if item_local.infoLabels['year']:                   #lo intentamos de nuevo solo si había año, puede que erroneo
-                year = item_local.infoLabels['year']            #salvamos el año por si no tiene éxito la nueva búsqueda
-                item_local.infoLabels['year'] = "-"             #reseteo el año
+            if item_local.infoLabels['year']:                   # We try again only if there was a year, I may be wrong
+                year = item_local.infoLabels['year']            # we save the year in case the new search is not successful
+                item_local.infoLabels['year'] = "-"             # reset the year
                 try:
-                    tmdb.set_infoLabels(item_local, __modo_grafico__)   #pasamos otra vez por TMDB
+                    tmdb.set_infoLabels(item_local, __modo_grafico__)   # we go through TMDB again
                 except:
                     logger.error(traceback.format_exc())
-                if not item_local.infoLabels['tmdb_id']:        #ha tenido éxito?
-                    item_local.infoLabels['year'] = year        #no, restauramos el año y lo dejamos ya
+                if not item_local.infoLabels['tmdb_id']:        # it has been successful?
+                    item_local.infoLabels['year'] = year        # no, we restore the year and leave it now
 
-        # Para Episodios, tomo el año de exposición y no el de inicio de la serie
+        # For Episodes, I take the year of exposure and not the year of beginning of the series
         if item_local.infoLabels['aired']:
             item_local.infoLabels['year'] = scrapertools.find_single_match(str(item_local.infoLabels['aired']), r'\/(\d{4})')
 
@@ -383,152 +371,152 @@ def post_tmdb_listado(item, itemlist):
                 item_local.title = item_local.from_title
             item_local.title = re.sub(r'(?i)online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title).strip()
             title = item_local.title
-        
-        #Limpiamos calidad de títulos originales que se hayan podido colar
+
+        # We clean quality of original titles that may have been cast
         if item_local.infoLabels['originaltitle'].lower() in item_local.quality.lower():
             item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality)
             #item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality, flags=re.IGNORECASE)
-        
-        # Preparamos el título para series, con los núm. de temporadas, si las hay
+
+        # We prepare the title for series, with no. of seasons, if any
         if item_local.contentType in ['season', 'tvshow', 'episode']:
             if item_local.contentType == "episode":
-                
-                #Si no está el título del episodio, pero sí está en "title", lo rescatamos
+
+                # If the title of the episode is not there, but it is in "title", we rescue it
                 if not item_local.infoLabels['episodio_titulo'] and item_local.infoLabels['title'].lower() != item_local.infoLabels['tvshowtitle'].lower():
                     item_local.infoLabels['episodio_titulo'] = item_local.infoLabels['title']
 
-                if "Temporada" in title:                    #Compatibilizamos "Temporada" con Unify
+                if "Temporada" in title:                    # We make "Season" compatible with Unify
                     title = '%sx%s al 99 -' % (str(item_local.contentSeason), str(item_local.contentEpisodeNumber))
-                if " al " in title:                         #Si son episodios múltiples, ponemos nombre de serie
-                    if " al 99" in title.lower():           #Temporada completa.  Buscamos num total de episodios
+                if " al " in title:                         # If they are multiple episodes, we put a series name
+                    if " al 99" in title.lower():           # Full season. We are looking for total number of episodes
                         title = title.replace("99", str(item_local.infoLabels['temporada_num_episodios']))
                     title = '%s %s' % (title, item_local.contentSerieName)
                     item_local.infoLabels['episodio_titulo'] = '%s - %s [%s] [%s]' % (scrapertools.find_single_match(title, r'(al \d+)'), item_local.contentSerieName, item_local.infoLabels['year'], rating)
-        
+
                 elif item_local.infoLabels['episodio_titulo']:
                     title = '%s %s, %s' % (title, item_local.infoLabels['episodio_titulo'], item_local.contentSerieName)
                     item_local.infoLabels['episodio_titulo'] = '%s, %s [%s] [%s]' % (item_local.infoLabels['episodio_titulo'], item_local.contentSerieName, item_local.infoLabels['year'], rating)
-                    
-                else:                                       #Si no hay título de episodio, ponermos el nombre de la serie
+
+                else:                                       # If there is no episode title, we will put the name of the series
                     if item_local.contentSerieName not in title:
                         title = '%s %s' % (title, item_local.contentSerieName)
                     item_local.infoLabels['episodio_titulo'] = '%s [%s] [%s]' % (item_local.contentSerieName, item_local.infoLabels['year'], rating)
-                    
+
                 if not item_local.contentSeason or not item_local.contentEpisodeNumber:
                     if "Episodio" in title_add:
-                        item_local.contentSeason, item_local.contentEpisodeNumber = scrapertools.find_single_match(title_add, 'Episodio (\d+)x(\d+)')
+                        item_local.contentSeason, item_local.contentEpisodeNumber = scrapertools.find_single_match(title_add, r'Episodio (\d+)x(\d+)')
                         title = '%s [%s] [%s]' % (title, item_local.infoLabels['year'], rating)
 
             elif item_local.contentType == "season":
                 if not item_local.contentSeason:
-                    item_local.contentSeason = scrapertools.find_single_match(item_local.url, '-(\d+)x')
+                    item_local.contentSeason = scrapertools.find_single_match(item_local.url, r'-(\d+)x')
                 if not item_local.contentSeason:
-                    item_local.contentSeason = scrapertools.find_single_match(item_local.url, '-temporadas?-(\d+)')
+                    item_local.contentSeason = scrapertools.find_single_match(item_local.url, r'-temporadas?-(\d+)')
                 if item_local.contentSeason:
                     title = '%s -Temporada %s' % (title, str(item_local.contentSeason))
-                    if not item_local.contentSeason_save:                           #Restauramos el num. de Temporada
-                        item_local.contentSeason_save = item_local.contentSeason    #Y lo volvemos a salvar
-                    del item_local.infoLabels['season']         #Funciona mal con num. de Temporada.  Luego lo restauramos
+                    if not item_local.contentSeason_save:                           # We restore the num. seasonal
+                        item_local.contentSeason_save = item_local.contentSeason    # And we save him again
+                    del item_local.infoLabels['season']         # It works wrong with num. seasonal. Then we restore it
                 else:
                     title = '%s -Temporada !!!' % (title)
 
             elif item.action == "search" or item.extra == "search":
                 title += " -Serie-"
-        
+
         if (item_local.extra == "varios" or item_local.extra == "documentales") and (item.action == "search" or item.extra == "search" or item.action == "listado_busqueda"):
             title += " -Varios-"
             item_local.contentTitle += " -Varios-"
-        
-        title += title_add                          #Se añaden etiquetas adicionales, si las hay
 
-        #Ahora maquillamos un poco los titulos dependiendo de si se han seleccionado títulos inteleigentes o no
-        if not config.get_setting("unify"):         #Si Titulos Inteligentes NO seleccionados:
+        title += title_add                          # Additional tags are added, if any
+
+        # Now we make up the titles a bit depending on whether smart titles have been selected or not
+        if not config.get_setting("unify"):         # If Smart Titles NOT selected:
             title = '%s [COLOR yellow][%s][/COLOR] [%s] [COLOR limegreen][%s][/COLOR] [COLOR red]%s[/COLOR]' % (title, str(item_local.infoLabels['year']), rating, item_local.quality, str(item_local.language))
 
-        else:                                       #Si Titulos Inteligentes SÍ seleccionados:
+        else:                                       # If Smart Titles YES selected:
             title = title.replace("[", "-").replace("]", "-").replace(".", ",").replace("GB", "G B").replace("Gb", "G b").replace("gb", "g b").replace("MB", "M B").replace("Mb", "M b").replace("mb", "m b")
-        
-        #Limpiamos las etiquetas vacías
+
+        # We clean the empty labels
         if item_local.infoLabels['episodio_titulo']:
             item_local.infoLabels['episodio_titulo'] = item_local.infoLabels['episodio_titulo'].replace(" []", "").strip()
         title = title.replace("--", "").replace(" []", "").replace("()", "").replace("(/)", "").replace("[/]", "").strip()
         title = re.sub(r'\s?\[COLOR \w+\]\[\[?\s?\]?\]\[\/COLOR\]', '', title).strip()
         title = re.sub(r'\s?\[COLOR \w+\]\s?\[\/COLOR\]', '', title).strip()
-    
-        if item.category_new == "newest":           #Viene de Novedades.  Marcamos el título con el nombre del canal
-            if scrapertools.find_single_match(item_local.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/'):
-                title += ' -%s-' % scrapertools.find_single_match(item_local.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
+
+        if item.category_new == "newest":           # It comes from News. We mark the title with the name of the channel
+            if scrapertools.find_single_match(item_local.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/'):
+                title += ' -%s-' % scrapertools.find_single_match(item_local.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
             else:
                 title += ' -%s-' % item_local.channel.capitalize()
             if item_local.contentType == "movie":
-                if scrapertools.find_single_match(item_local.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/'):
-                    item_local.contentTitle += ' -%s-' % scrapertools.find_single_match(item_local.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
+                if scrapertools.find_single_match(item_local.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/'):
+                    item_local.contentTitle += ' -%s-' % scrapertools.find_single_match(item_local.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
                 else:
                     item_local.contentTitle += ' -%s-' % item_local.channel.capitalize()
             elif "Episodio " in title:
                 if not item_local.contentSeason or not item_local.contentEpisodeNumber:
-                    item_local.contentSeason, item_local.contentEpisodeNumber = scrapertools.find_single_match(title_add, 'Episodio (\d+)x(\d+)')
+                    item_local.contentSeason, item_local.contentEpisodeNumber = scrapertools.find_single_match(title_add, r'Episodio (\d+)x(\d+)')
 
         item_local.title = title
-        
+
         #logger.debug("url: " + item_local.url + " / title: " + item_local.title + " / content title: " + item_local.contentTitle + "/" + item_local.contentSerieName + " / calidad: " + item_local.quality + "[" + str(item_local.language) + "]" + " / year: " + str(item_local.infoLabels['year']))
-        
+
         #logger.debug(item_local)
-    
-    #Si intervención judicial, alerto!!!
+
+    # If judicial intervention, I warn !!!
     if item.intervencion:
         for clone_inter, autoridad in item.intervencion:
             thumb_intervenido = get_thumb(autoridad)
             itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + clone_inter.capitalize() + ': [/COLOR]' + intervenido_judicial + '. Reportar el problema en el foro', thumbnail=thumb_intervenido))
         del item.intervencion
-    
-    #Si ha habido fail-over, lo comento
+
+    # If there has been a fail-over, I will comment
     if channel_alt and item.category_new != "newest":
         itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + item.category + '[/COLOR] [ALT ] en uso'))
         itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + channel_alt.capitalize() + '[/COLOR] inaccesible'))
-    
+
     if len(itemlist_fo) > 0:
         itemlist = itemlist_fo + itemlist
-        
+
     del item.category_new
-        
+
     return (item, itemlist)
 
 
 def post_tmdb_seasons(item, itemlist):
     logger.info()
-    
+
     """
-        
-    Pasada para gestión del menú de Temporadas de una Serie
-    
-    La clave de activación de este método es la variable item.season_colapse que pone el canal en el Item de Listado.
-    Esta variable tendrá que desaparecer cuando se añada a la Videoteca para que se analicen los episodios de la forma tradicional
-    
-    Repasa todos los episodios producidos en itemlist por "episodios" del canal para extraer las temporadas.  Pone un título para Todas la Temps.
-    Crea un menú con las diferentes temporadas, así como con los títulos de Actualización de Título y de Añadir a Videoteca
-    Si ha habido un Fail-over o una Intervención Judicial, también lo anuncia
-    
-    La llamada al método desde Episodios, antes de pasar Itemlist pot TMDB, es:
-    
+
+    Past to manage the Seasons menu of a Series
+
+    The activation key for this method is the variable item.season_colapse that puts the channel in the Listing Item.
+    This variable will have to disappear when it is added to the Video Library so that episodes are analyzed in the traditional way.
+
+    Review all the episodes produced in itemlist by "episodes" of the channel to extract the seasons. Puts a title for All Temps.
+    Create a menu with the different seasons, as well as the titles of Title Update and Add to Video Library
+    If there has been a Fail-over or a Judicial Intervention, it also announces it
+
+    The method call from Episodes, before passing Itemlist pot TMDB, is:
+
         from lib import generictools
-        item, itemlist = generictools.post_tmdb_seasons(item, itemlist)
-        
-    Si solo hay una temporada, devuelte el itemlist original para que se pinten los episodios de la forma tradicional
-    
+        item, itemlist = generictools.post_tmdb_seasons (item, itemlist)
+
+    If there is only one season, please return the original itemlist so that the episodes are painted the traditional way
+
     """
-    #logger.debug(item)
-    
+    # logger.debug(item)
+
     season = 0
     itemlist_temporadas = []
     itemlist_fo = []
-    
-    if config.get_setting("no_pile_on_seasons", 'videolibrary') == 2:           #Si no se quiere mostrar por temporadas, nos vamos...
-        if item.season_colapse:                                                 #Quitamos el indicador de listado por Temporadas
+
+    if config.get_setting("no_pile_on_seasons", 'videolibrary') == 2:           # If you do not want to show seasonally, we are leaving ...
+        if item.season_colapse:                                                 # We remove the indicator from the list by Seasons
             del item.season_colapse
         return (item, itemlist)
-    
-    #Restauramos valores si ha habido fail-over
+
+    # We restore values ​​if there has been a fail-over
     channel_alt = ''
     if item.channel == channel_py:
         if item.channel_alt:
@@ -544,22 +532,22 @@ def post_tmdb_seasons(item, itemlist):
     if item.url_alt:
         item.url = item.url_alt
         del item.url_alt
-    
-    # Primero creamos un título para TODAS las Temporadas
-    # Pasada por TMDB a Serie, para datos adicionales
+
+    # First we create a title for ALL Seasons
+    # Passed by TMDB to Serial, for additional data
     try:
-        tmdb.set_infoLabels(item, True)                     #TMDB de cada Temp
+        tmdb.set_infoLabels(item, True)                     # TMDB of each Temp
     except:
         logger.error(traceback.format_exc())
-    
+
     item_season = item.clone()
-    if item_season.season_colapse:                          #Quitamos el indicador de listado por Temporadas
+    if item_season.season_colapse:                          # We remove the indicator from the list by Seasons
         del item_season.season_colapse
-    title = '** Todas las Temporadas'                       #Agregamos título de TODAS las Temporadas (modo tradicional)
-    if item_season.infoLabels['number_of_episodes']:        #Ponemos el núm de episodios de la Serie
+    title = '** Todas las Temporadas'                       # We add title of ALL Seasons (traditional way)
+    if item_season.infoLabels['number_of_episodes']:        # We put the number of episodes of the Series
         title += ' [%sx%s epi]' % (str(item_season.infoLabels['number_of_seasons']), str(item_season.infoLabels['number_of_episodes']))
-    
-    rating = ''                                             #Ponemos el rating, si es diferente del de la Serie
+
+    rating = ''                                             # We put the rating, if it is different from that of the Series
     if item_season.infoLabels['rating'] and item_season.infoLabels['rating'] != 0.0:
         try:
             rating = float(item_season.infoLabels['rating'])
@@ -568,41 +556,41 @@ def post_tmdb_seasons(item, itemlist):
             logger.error(traceback.format_exc())
     if rating and rating == 0.0:
         rating = ''
-    
-    if not config.get_setting("unify"):                     #Si Titulos Inteligentes NO seleccionados:
+
+    if not config.get_setting("unify"):                     # If Smart Titles NOT selected:
         title = '%s [COLOR yellow][%s][/COLOR] [%s] [COLOR limegreen][%s][/COLOR] [COLOR red]%s[/COLOR]' % (title, str(item_season.infoLabels['year']), rating, item_season.quality, str(item_season.language))
-    else:                                                   #Lo arreglamos un poco para Unify
+    else:                                                   # We fixed it a bit for Unify
         title = title.replace('[', '-').replace(']', '-').replace('.', ',').strip()
     title = title.replace("--", "").replace("[]", "").replace("()", "").replace("(/)", "").replace("[/]", "").strip()
-    
+
     if config.get_setting("show_all_seasons", 'videolibrary'):
         itemlist_temporadas.append(item_season.clone(title=title, from_title_season_colapse=item.title))
-    
-    #Repasamos todos los episodios para detectar las diferentes temporadas
+
+    # We review all the episodes to detect the different seasons
     for item_local in itemlist:
         if item_local.contentSeason != season:
-            season = item_local.contentSeason                       #Si se detecta una temporada distinta se prepara un título
+            season = item_local.contentSeason                       # If a different season is detected a title is prepared
             item_season = item.clone()
-            item_season.contentSeason = item_local.contentSeason    #Se pone el núm de Temporada para obtener mejores datos de TMDB
+            item_season.contentSeason = item_local.contentSeason    # Season number is set to get better TMDB data
             item_season.title = 'Temporada %s' % item_season.contentSeason
             itemlist_temporadas.append(item_season.clone(from_title_season_colapse=item.title))
-            
-    #Si hay más de una temporada se sigue, o se ha forzado a listar por temporadas, si no se devuelve el Itemlist original
+
+    # If there is more than one season it is followed, or it has been forced to list by seasons, if the original Itemlist is not returned
     if len(itemlist_temporadas) > 2 or config.get_setting("no_pile_on_seasons", 'videolibrary') == 0:
         for item_local in itemlist_temporadas:
-            if "** Todas las Temporadas" in item_local.title:       #Si es el título de TODAS las Temporadas, lo ignoramos
+            if "** Todas las Temporadas" in item_local.title:       # If it's the title of ALL Seasons, we ignore it
                 continue
-            
-            # Pasada por TMDB a las Temporada
+
+            # Passed by TMDB to the Seasons
             try:
-                tmdb.set_infoLabels(item_local, True)               #TMDB de cada Temp
+                tmdb.set_infoLabels(item_local, True)               # TMDB of each Temp
             except:
                 logger.error(traceback.format_exc())
-        
-            if item_local.infoLabels['temporada_air_date']:         #Fecha de emisión de la Temp
+
+            if item_local.infoLabels['temporada_air_date']:         # Temp issue date
                 item_local.title += ' [%s]' % str(scrapertools.find_single_match(str(item_local.infoLabels['temporada_air_date']), r'\/(\d{4})'))
-            
-            #rating = ''                                            #Ponemos el rating, si es diferente del de la Serie
+
+            #rating = ''                                            # We put the rating, if it is different from that of the Series
             #if item_local.infoLabels['rating'] and item_local.infoLabels['rating'] != 0.0:
             #    try:
             #        rating = float(item_local.infoLabels['rating'])
@@ -611,72 +599,72 @@ def post_tmdb_seasons(item, itemlist):
             #        logger.error(traceback.format_exc())
             #if rating and rating > 0.0:
             #    item_local.title += ' [%s]' % str(rating)
-            
-            if item_local.infoLabels['temporada_num_episodios']:    #Núm. de episodios de la Temp
+
+            if item_local.infoLabels['temporada_num_episodios']:    # No. of Temp Episodes
                 item_local.title += ' [%s epi]' % str(item_local.infoLabels['temporada_num_episodios'])
-                
-            if not config.get_setting("unify"):                     #Si Titulos Inteligentes NO seleccionados:
+
+            if not config.get_setting("unify"):                     # If Smart Titles NOT selected:
                 item_local.title = '%s [COLOR limegreen][%s][/COLOR] [COLOR red]%s[/COLOR]' % (item_local.title, item_local.quality, str(item_local.language))
-            else:                                                   #Lo arreglamos un poco para Unify
+            else:                                                   # We fixed it a bit for Unify
                 item_local.title = item_local.title.replace("[", "-").replace("]", "-").replace(".", ",").replace("GB", "G B").replace("Gb", "G b").replace("gb", "g b").replace("MB", "M B").replace("Mb", "M b").replace("mb", "m b")
             item_local.title = item_local.title.replace("--", "").replace("[]", "").replace("()", "").replace("(/)", "").replace("[/]", "").strip()
-            
+
             #logger.debug(item_local)
-        
-    else:                                   #Si hay más de una temporada se sigue, si no se devuelve el Itemlist original
+
+    else:                                   # If there is more than one season it is followed, if the original Itemlist is not returned
         if item.season_colapse:
             del item.season_colapse
         return (item, itemlist)
-    
-    #Permitimos la actualización de los títulos, bien para uso inmediato, o para añadir a la videoteca
+
+    # We allow the updating of titles, either for immediate use, or to add to the video library
     itemlist_temporadas.append(item.clone(title="** [COLOR yelow]Actualizar Títulos - vista previa videoteca[/COLOR] **", action="actualizar_titulos", tmdb_stat=False, from_action=item.action, from_title_tmdb=item.title, from_update=True))
-    
-    #Es un canal estándar, sólo una linea de Añadir a Videoteca
+
+    # It is a standard channel, just a line of Add to Video Library
     title = ''
     if item.infoLabels['status'] and item.infoLabels['status'].lower() == "ended":
         title += ' [TERMINADA]'
     itemlist_temporadas.append(item_season.clone(title="[COLOR yellow]Añadir esta serie a videoteca-[/COLOR]" + title, action="add_serie_to_library", extra="episodios", add_menu=True))
 
-    #Si intervención judicial, alerto!!!
+    # If judicial intervention, I warn !!!
     if item.intervencion:
         for clone_inter, autoridad in item.intervencion:
             thumb_intervenido = get_thumb(autoridad)
             itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + clone_inter.capitalize() + ': [/COLOR]' + intervenido_judicial + '. Reportar el problema en el foro', thumbnail=thumb_intervenido))
         del item.intervencion
-    
-    #Si ha habido fail-over, lo comento
+
+    # If there has been a fail-over, I will comment
     if channel_alt:
         itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + channel_alt.capitalize() + '[/COLOR] [ALT ] en uso'))
         itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + item.category.capitalize() + '[/COLOR] inaccesible'))
-    
+
     if len(itemlist_fo) > 0:
         itemlist_temporadas = itemlist_fo + itemlist_temporadas
-    
+
     return (item, itemlist_temporadas)
-    
-    
+
+
 def post_tmdb_episodios(item, itemlist):
     logger.info()
     itemlist_fo = []
-        
-    """
-        
-    Pasada para maquillaje de los títulos obtenidos desde TMDB en Episodios.
-    
-    Toma de infoLabel todos los datos de interés y los va situando en diferentes variables, principalmente título
-    para que sea compatible con Unify, y si no se tienen Títulos Inteligentes, para que el formato sea lo más
-    parecido al de Unify.
 
-    Lleva un control del num. de episodios por temporada, tratando de arreglar los errores de la Web y de TMDB
-    
-    La llamada al método desde Episodios, despues de pasar Itemlist pot TMDB, es:
-    
-        from lib import generictools
-        item, itemlist = generictools.post_tmdb_episodios(item, itemlist)
-    
     """
-    #logger.debug(item)
-    
+
+   Last for makeup of the titles obtained from TMDB in Episodes.
+
+    InfoLabel takes all the data of interest and places them in different variables, mainly title
+    so that it is compatible with Unify, and if there are no Smart Titles, so that the format is the most
+    similar to Unify.
+
+    Keep track of the num. of episodes per season, trying to fix Web and TMDB errors
+
+    The method call from Episodes, after passing Itemlist pot TMDB, is:
+
+        from lib import generictools
+        item, itemlist = generictools.post_tmdb_episodes (item, itemlist)
+
+    """
+    # logger.debug(item)
+
     modo_serie_temp = ''
     if config.get_setting('seleccionar_serie_temporada', item.channel) >= 0:
         modo_serie_temp = config.get_setting('seleccionar_serie_temporada', item.channel)
@@ -684,26 +672,26 @@ def post_tmdb_episodios(item, itemlist):
     if config.get_setting('seleccionar_ult_temporadda_activa', item.channel) is True or config.get_setting('seleccionar_ult_temporadda_activa', item.channel) is False:
         modo_ultima_temp = config.get_setting('seleccionar_ult_temporadda_activa', item.channel)
 
-    #Inicia variables para el control del núm de episodios por temporada
+    # Initiates variables to control the number of episodes per season
     num_episodios = 1
     num_episodios_lista = []
     for i in range(0, 50):  num_episodios_lista += [0]
     num_temporada = 1
     num_temporada_max = 99
     num_episodios_flag = True
-    
-    #Restauramos el num de Temporada para hacer más flexible la elección de Videoteca
+
+    # We restore the Season number to make the choice of Video Library more flexible
     contentSeason = item.contentSeason
     if item.contentSeason_save:
         contentSeason = item.contentSeason_save
         item.contentSeason = item.contentSeason_save
         del item.contentSeason_save
 
-    #Ajustamos el nombre de la categoría
+    # We adjust the category name
     if item.channel == channel_py:
-        item.category = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
-    
-    #Restauramos valores si ha habido fail-over
+        item.category = scrapertools.find_single_match(item.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
+
+    # We restore values ​​if there has been a fail-over
     channel_alt = ''
     if item.channel == channel_py:
         if item.channel_alt:
@@ -733,8 +721,8 @@ def post_tmdb_episodios(item, itemlist):
         del item.library_filter_show
     if item.channel_host:
         del item.channel_host
-        
-    for item_local in itemlist:                             #Recorremos el Itemlist generado por el canal
+
+    for item_local in itemlist:                             # We go through the Itemlist generated by the channel
         if item_local.add_videolibrary:
             del item_local.add_videolibrary
         if item_local.add_menu:
@@ -784,14 +772,14 @@ def post_tmdb_episodios(item, itemlist):
         item_local.unify = 'xyz'
         del item_local.unify
         item_local.title = re.sub(r'(?i)online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title).strip()
-        
-        #logger.debug(item_local)
-        
-        #Ajustamos el nombre de la categoría si es un clone de NewPct1
+
+        # logger.debug(item_local)
+
+        # We adjust the category name if it is a clone of NewPct1
         if item_local.channel == channel_py:
-            item_local.category = scrapertools.find_single_match(item_local.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
-        
-        #Restauramos valores para cada Episodio si ha habido fail-over de un clone de NewPct1
+            item_local.category = scrapertools.find_single_match(item_local.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
+
+        # We restore values ​​for each Episode if there has been a fail-over of a NewPct1 clone
         if item_local.channel == channel_py:
             if item_local.channel_alt:
                 item_local.category = item_local.channel_alt
@@ -801,33 +789,33 @@ def post_tmdb_episodios(item, itemlist):
                 item_local.channel = item_local.channel_alt
                 del item_local.channel_alt
         if item_local.url_alt:
-            host_act = scrapertools.find_single_match(item_local.url, ':\/\/(.*?)\/')
-            host_org = scrapertools.find_single_match(item_local.url_alt, ':\/\/(.*?)\/')
+            host_act = scrapertools.find_single_match(item_local.url, r':\/\/(.*?)\/')
+            host_org = scrapertools.find_single_match(item_local.url_alt, r':\/\/(.*?)\/')
             item_local.url = item_local.url.replace(host_act, host_org)
             del item_local.url_alt
-            
-        #Si está actualizando videoteca de una serie NewPct1, restauramos el channel con el nombre del clone
+
+        # If you are updating video library of a NewPct1 series, we restore the channel with the name of the clone
         if item_local.channel == channel_py and (item.library_playcounts or item.add_videolibrary):
-            item_local.channel = scrapertools.find_single_match(item_local.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/')
-        
-        #Si el título de la serie está verificado en TMDB, se intenta descubrir los eisodios fuera de rango,
-        #que son probables errores de la Web
+            item_local.channel = scrapertools.find_single_match(item_local.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/')
+
+        # If the series title is verified in TMDB, it tries to discover the out of range episodes,
+        # which are probable errors of the Web
         if item.tmdb_stat:
             if item_local.infoLabels['number_of_seasons']:
-                #Si el num de temporada está fuera de control, se pone 0, y se reclasifica itemlist
+                # If the season num is out of control, it gets 0, and itemlist is reclassified
                 if item_local.contentSeason > item_local.infoLabels['number_of_seasons'] + 1:
-                    logger.error("ERROR 07: EPISODIOS: Num. de Temporada fuera de rango " + " / TEMPORADA: " + str(item_local.contentSeason) + " / " + str(item_local.contentEpisodeNumber) + " / MAX_TEMPORADAS: " + str(item_local.infoLabels['number_of_seasons']) + " / LISTA_TEMPORADAS: " + str(num_episodios_lista))
+                    logger.error("ERROR 07: EPISODES: Season number out of range " + " / SEASON: " + str(item_local.contentSeason) + " / " + str(item_local.contentEpisodeNumber) + " / MAX_SEASONS: " + str(item_local.infoLabels['number_of_seasons']) + " / SEASON_LIST: " + str(num_episodios_lista))
                     item_local.contentSeason = 0
                     itemlist = sorted(itemlist, key=lambda it: (int(it.contentSeason), int(it.contentEpisodeNumber)))
                 else:
                     num_temporada_max = item_local.infoLabels['number_of_seasons']
             else:
                 if item_local.contentSeason > num_temporada_max + 1:
-                    logger.error("ERROR 07: EPISODIOS: Num. de Temporada fuera de rango " + " / TEMPORADA: " + str(item_local.contentSeason) + " / " + str(item_local.contentEpisodeNumber) + " / MAX_TEMPORADAS: " + str(num_temporada_max) + " / LISTA_TEMPORADAS: " + str(num_episodios_lista))
+                    logger.error("ERROR 07: EPISODES: Season number out of range " + " / SEASON: " + str(item_local.contentSeason) + " / " + str(item_local.contentEpisodeNumber) + " / MAX_SEASONS: " + str(num_temporada_max) + " / SEASON_LIST: " + str(num_episodios_lista))
                     item_local.contentSeason = 0
                     itemlist = sorted(itemlist, key=lambda it: (int(it.contentSeason), int(it.contentEpisodeNumber)))
-        
-        #Salvamos en número de episodios de la temporada
+
+        # We save in number of episodes of the season
         try:
             if num_temporada != item_local.contentSeason:
                 num_temporada = item_local.contentSeason
@@ -837,8 +825,8 @@ def post_tmdb_episodios(item, itemlist):
         except:
             num_episodios = 0
             logger.error(traceback.format_exc())
-        
-        #Preparamos el Rating del vídeo
+
+        # We prepare the video Rating
         rating = ''
         try:
             if item_local.infoLabels['rating'] and item_local.infoLabels['rating'] != 0.0:
@@ -848,56 +836,56 @@ def post_tmdb_episodios(item, itemlist):
                     rating = ''
         except:
             logger.error(traceback.format_exc())
-        
-        # Si TMDB no ha encontrado el vídeo limpiamos el año
+
+        # If TMDB has not found the video we clean the year
         if item_local.infoLabels['year'] == "-":
             item_local.infoLabels['year'] = ''
             item_local.infoLabels['aired'] = ''
-        # Para Episodios, tomo el año de exposición y no el de inicio de la serie
+        # For Episodes, I take the year of exposure and not the year of beginning of the series
         elif item_local.infoLabels['aired']:
             item_local.infoLabels['year'] = scrapertools.find_single_match(str(item_local.infoLabels['aired']), r'\/(\d{4})')
 
-        #Limpiamos calidad de títulos originales que se hayan podido colar
+        # We clean quality of original titles that may have been cast
         if item_local.infoLabels['originaltitle'].lower() in item_local.quality.lower():
             item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality)
-            #item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality, flags=re.IGNORECASE)
-        
-        #Si no está el título del episodio, pero sí está en "title", lo rescatamos
+            # item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality, flags=re.IGNORECASE)
+
+        # If the title of the episode is not there, but it is in "title", we rescue it
         if not item_local.infoLabels['episodio_titulo'] and item_local.infoLabels['title'].lower() != item_local.infoLabels['tvshowtitle'].lower():
             item_local.infoLabels['episodio_titulo'] = item_local.infoLabels['title']
         item_local.infoLabels['episodio_titulo'] = item_local.infoLabels['episodio_titulo'].replace('GB', 'G B').replace('MB', 'M B')
-        
-        #Preparamos el título para que sea compatible con Añadir Serie a Videoteca
-        if "Temporada" in item_local.title:             #Compatibilizamos "Temporada" con Unify
+
+        # We prepare the title to be compatible with Add Series to Video Library
+        if "Temporada" in item_local.title:             # We make "Season" compatible with Unify
             item_local.title = '%sx%s al 99 -' % (str(item_local.contentSeason), str(item_local.contentEpisodeNumber))
-        if " al " in item_local.title:                  #Si son episodios múltiples, ponemos nombre de serie
-            if " al 99" in item_local.title.lower():    #Temporada completa.  Buscamos num total de episodios de la temporada
+        if " al " in item_local.title:                  # If they are multiple episodes, we put a series name
+            if " al 99" in item_local.title.lower():    # Full season. We are looking for the total number of episodes of the season
                 item_local.title = item_local.title.replace("99", str(num_episodios))
             item_local.title = '%s %s' % (item_local.title, item_local.contentSerieName)
             item_local.infoLabels['episodio_titulo'] = '%s - %s [%s] [%s]' % (scrapertools.find_single_match(item_local.title, r'(al \d+)'), item_local.contentSerieName, item_local.infoLabels['year'], rating)
-        
+
         elif item_local.infoLabels['episodio_titulo']:
-            item_local.title = '%s %s' % (item_local.title, item_local.infoLabels['episodio_titulo']) 
+            item_local.title = '%s %s' % (item_local.title, item_local.infoLabels['episodio_titulo'])
             item_local.infoLabels['episodio_titulo'] = '%s [%s] [%s]' % (item_local.infoLabels['episodio_titulo'], item_local.infoLabels['year'], rating)
-            
-        else:                                           #Si no hay título de episodio, ponermos el nombre de la serie
+
+        else:                                           # If there is no episode title, we will put the name of the series
             item_local.title = '%s %s' % (item_local.title, item_local.contentSerieName)
             item_local.infoLabels['episodio_titulo'] = '%s [%s] [%s]' % (item_local.contentSerieName, item_local.infoLabels['year'], rating)
-        
-        #Componemos el título final, aunque con Unify usará infoLabels['episodio_titulo']
+
+        # We compose the final title, although with Unify you will use infoLabels ['episode_title']
         item_local.infoLabels['title'] = item_local.infoLabels['episodio_titulo']
         item_local.title = item_local.title.replace("[", "-").replace("]", "-")
         item_local.title = '%s [%s] [%s] [COLOR limegreen][%s][/COLOR] [COLOR red]%s[/COLOR]' % (item_local.title, item_local.infoLabels['year'], rating, item_local.quality, str(item_local.language))
-    
-        #Quitamos campos vacíos
+
+        # We remove empty fields
         item_local.infoLabels['episodio_titulo'] = item_local.infoLabels['episodio_titulo'].replace("[]", "").strip()
         item_local.infoLabels['title'] = item_local.infoLabels['title'].replace("[]", "").strip()
         item_local.title = item_local.title.replace("[]", "").strip()
         item_local.title = re.sub(r'\s?\[COLOR \w+\]\[\[?-?\s?\]?\]\[\/COLOR\]', '', item_local.title).strip()
         item_local.title = re.sub(r'\s?\[COLOR \w+\]-?\s?\[\/COLOR\]', '', item_local.title).strip()
         item_local.title = item_local.title.replace(".", ",").replace("GB", "G B").replace("Gb", "G b").replace("gb", "g b").replace("MB", "M B").replace("Mb", "M b").replace("mb", "m b")
-        
-        #Si la información de num. total de episodios de TMDB no es correcta, tratamos de calcularla
+
+        # If the information of num. total episodes of TMDB is not correct, we try to calculate it
         if num_episodios < item_local.contentEpisodeNumber:
             num_episodios = item_local.contentEpisodeNumber
         if num_episodios > item_local.contentEpisodeNumber:
@@ -913,120 +901,120 @@ def post_tmdb_episodios(item, itemlist):
 
         #logger.debug("title: " + item_local.title + " / url: " + item_local.url + " / calidad: " + item_local.quality + " / Season: " + str(item_local.contentSeason) + " / EpisodeNumber: " + str(item_local.contentEpisodeNumber) + " / num_episodios_lista: " + str(num_episodios_lista) + str(num_episodios_flag))
         #logger.debug(item_local)
-    
-    #Si está actualizando videoteca de una serie NewPct1, restauramos el channel con el nombre del clone
+
+    # If you are updating video library of a NewPct1 series, we restore the channel with the name of the clone
     if item.channel == channel_py and (item.library_playcounts or item.add_videolibrary):
-        item.channel = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/')
-    
-    #Terminado el repaso de cada episodio, cerramos con el pié de página
-    #En primer lugar actualizamos todos los episodios con su núm máximo de episodios por temporada
+        item.channel = scrapertools.find_single_match(item.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/')
+
+    # After reviewing each episode, we close with the footer
+    # First we update all episodes with their maximum number of episodes per season
     try:
-        if not num_episodios_flag:  #Si el num de episodios no está informado, acualizamos episodios de toda la serie
+        if not num_episodios_flag:  # If the number of episodes is not reported, we update episodes of the entire series
             for item_local in itemlist:
                 item_local.infoLabels['temporada_num_episodios'] = int(num_episodios_lista[item_local.contentSeason])
     except:
-        logger.error("ERROR 07: EPISODIOS: Num de Temporada fuera de rango " + " / TEMPORADA: " + str(item_local.contentSeason) + " / " + str(item_local.contentEpisodeNumber) + " / MAX_TEMPORADAS: " + str(num_temporada_max) + " / LISTA_TEMPORADAS: " + str(num_episodios_lista))
+        logger.error("ERROR 07: EPISODES: Season number out of range" + " / SEASON: " + str(item_local.contentSeason) + " / " + str(item_local.contentEpisodeNumber) + " / MAX_SEASONS: " + str(num_temporada_max) + " / SEASON_LIST: " + str(num_episodios_lista))
         logger.error(traceback.format_exc())
-    
-    #Permitimos la actualización de los títulos, bien para uso inmediato, o para añadir a la videoteca
-    itemlist.append(item.clone(title="** [COLOR yelow]Actualizar Títulos - vista previa videoteca[/COLOR] **", action="actualizar_titulos", tmdb_stat=False, from_action=item.action, from_title_tmdb=item.title, from_update=True))
-    
-    #Borro num. Temporada si no viene de menú de Añadir a Videoteca y no está actualizando la Videoteca
-    if not item.library_playcounts:                         #si no está actualizando la Videoteca
-        if modo_serie_temp != '':                           #y puede cambiara a serie-temporada
-            if item.contentSeason and not item.add_menu:
-                del item.infoLabels['season']               #La decisión de ponerlo o no se toma en la zona de menús
 
-    #Ponemos el título de Añadir a la Videoteca, con el núm. de episodios de la última temporada y el estado de la Serie
+    # We allow the updating of titles, either for immediate use, or to add to the video library
+    itemlist.append(item.clone(title="** Update Titles - video library preview **", action="actualizar_titulos", tmdb_stat=False, from_action=item.action, from_title_tmdb=item.title, from_update=True))
+
+    # Delete num. Season if you do not come from the Add to Video Library menu and you are not updating the Video Library
+    if not item.library_playcounts:                         # if you are not updating the Video Library
+        if modo_serie_temp != '':                           # and can change to series-season
+            if item.contentSeason and not item.add_menu:
+                del item.infoLabels['season']               # The decision to put it or not is made in the menu area
+
+    # We put the title of Add to the Video Library, with the no. of episodes from the last season and the status of the Series
     if config.get_videolibrary_support() and len(itemlist) > 1:
         item_local = itemlist[-2]
         title = ''
-        
+
         if item_local.infoLabels['temporada_num_episodios']:
             title += ' [Temp. de %s ep.]' % item_local.infoLabels['temporada_num_episodios']
-            
+
         if item_local.infoLabels['status'] and item_local.infoLabels['status'].lower() == "ended":
             title += ' [TERMINADA]'
-            
-        if item_local.quality:      #La Videoteca no toma la calidad del episodio, sino de la serie.  Pongo del episodio
+
+        if item_local.quality:      #L The Video Library does not take the quality of the episode, but of the series. I put of the episode
             item.quality = item_local.quality
-        
+
         if modo_serie_temp != '':
-            #Estamos en un canal que puede seleccionar entre gestionar Series completas o por Temporadas
-            #Tendrá una línea para Añadir la Serie completa y otra para Añadir sólo la Temporada actual
+            # We are in a channel that can select between managing complete Series or by Season
+            # It will have a line to Add the complete Series and another to Add only the current Season
 
-            if item.action == 'get_seasons':                    #si es actualización desde videoteca, título estándar
-                #Si hay una nueva Temporada, se activa como la actual
+            if item.action == 'get_seasons':                    # if it is update from video library, standard title
+                # If there is a new Season, it is activated as the current one
                 if item.library_urls[item.channel] != item.url and (item.contentType == "season" or modo_ultima_temp):
-                    item.library_urls[item.channel] = item.url  #Se actualiza la url apuntando a la última Temporada
+                    item.library_urls[item.channel] = item.url  # The url is updated pointing to the last Season
                     try:
-                        from core import videolibrarytools      #Se fuerza la actualización de la url en el .nfo
-                        itemlist_fake = []                      #Se crea un Itemlist vacio para actualizar solo el .nfo
-                        videolibrarytools.save_tvshow(item, itemlist_fake)      #Se actualiza el .nfo
+                        from core import videolibrarytools      # Update url in .nfo is forced
+                        itemlist_fake = []                      # An empty Itemlist is created to update only the .nfo
+                        videolibrarytools.save_tvshow(item, itemlist_fake)      # The .nfo is updated
                     except:
-                        logger.error("ERROR 08: EPISODIOS: No se ha podido actualizar la URL a la nueva Temporada")
+                        logger.error("ERROR 08: EPISODES: Unable to update the URL to the new Season")
                         logger.error(traceback.format_exc())
-                itemlist.append(item.clone(title="[COLOR yellow]Añadir esta Serie a Videoteca-[/COLOR]" + title, action="add_serie_to_library"))
-                
-            elif modo_serie_temp == 1:      #si es Serie damos la opción de guardar la última temporada o la serie completa
-                itemlist.append(item.clone(title="[COLOR yellow]Añadir última Temp. a Videoteca-[/COLOR]" + title, action="add_serie_to_library", contentType="season", contentSeason=contentSeason, url=item_local.url, add_menu=True))
-                itemlist.append(item.clone(title="[COLOR yellow]Añadir esta Serie a Videoteca-[/COLOR]" + title, action="add_serie_to_library", contentType="tvshow", add_menu=True))
+                itemlist.append(item.clone(title="[COLOR yellow]Add this Series to Video Library-[/COLOR]" + title, action="add_serie_to_library"))
 
-            else:                           #si no, damos la opción de guardar la temporada actual o la serie completa
-                itemlist.append(item.clone(title="[COLOR yellow]Añadir esta Serie a Videoteca-[/COLOR]" + title, action="add_serie_to_library", contentType="tvshow", add_menu=True))
+            elif modo_serie_temp == 1:      # if it is Series we give the option to save the last season or the complete series
+                itemlist.append(item.clone(title="[COLOR yellow]Add last Temp. to Video Library-[/COLOR]" + title, action="add_serie_to_library", contentType="season", contentSeason=contentSeason, url=item_local.url, add_menu=True))
+                itemlist.append(item.clone(title="[COLOR yellow]Add this Series to Video Library-[/COLOR]" + title, action="add_serie_to_library", contentType="tvshow", add_menu=True))
+
+            else:                           # if not, we give the option to save the current season or the complete series
+                itemlist.append(item.clone(title="[COLOR yellow]Add this Series to Video Library-[/COLOR]" + title, action="add_serie_to_library", contentType="tvshow", add_menu=True))
                 if item.add_videolibrary and not item.add_menu:
                     item.contentSeason = contentSeason
-                itemlist.append(item.clone(title="[COLOR yellow]Añadir esta Temp. a Videoteca-[/COLOR]" + title, action="add_serie_to_library", contentType="season", contentSeason=contentSeason, add_menu=True))
+                itemlist.append(item.clone(title="[COLOR yellow]Aadd this Temp. to Video Library-[/COLOR]" + title, action="add_serie_to_library", contentType="season", contentSeason=contentSeason, add_menu=True))
 
-        else:   #Es un canal estándar, sólo una linea de Añadir a Videoteca
-            itemlist.append(item.clone(title="[COLOR yellow]Añadir esta serie a videoteca-[/COLOR]" + title, action="add_serie_to_library", extra="episodios", add_menu=True))
-        
-    #Si intervención judicial, alerto!!!
+        else:   # It is a standard channel, just a line of Add to Video Library
+            itemlist.append(item.clone(title="[COLOR yellow]Add this series to video library-[/COLOR]" + title, action="add_serie_to_library", extra="episodios", add_menu=True))
+
+    # If judicial intervention, I warn !!!
     if item.intervencion:
         for clone_inter, autoridad in item.intervencion:
             thumb_intervenido = get_thumb(autoridad)
-            itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + clone_inter.capitalize() + ': [/COLOR]' + intervenido_judicial + '. Reportar el problema en el foro', thumbnail=thumb_intervenido))
+            itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + clone_inter.capitalize() + ': [/COLOR]' + intervenido_judicial + '. Report the problem in the forum', thumbnail=thumb_intervenido))
         del item.intervencion
-    
-    #Si ha habido fail-over, lo comento
+
+    # If there has been a fail-over, I will comment
     if channel_alt:
-        itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + channel_alt.capitalize() + '[/COLOR] [ALT ] en uso'))
-        itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + item.category.capitalize() + '[/COLOR] inaccesible'))
-    
+        itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + channel_alt.capitalize() + '[/COLOR] [ALT ] In use'))
+        itemlist_fo.append(item.clone(action='', title="[COLOR yellow]" + item.category.capitalize() + '[/COLOR] Inaccessible'))
+
     if len(itemlist_fo) > 0:
         itemlist = itemlist_fo + itemlist
 
-    if item.add_videolibrary:                               #Estamos Añadiendo a la Videoteca.
-        del item.add_videolibrary                           #Borramos ya el indicador
-        if item.add_menu:                                   #Opción que avisa si se ha añadido a la Videoteca 
-            del item.add_menu                               #desde la página de Episodios o desde Menú Contextual   
+    if item.add_videolibrary:                               # We are Adding to the Video Library.
+        del item.add_videolibrary                           # We already delete the indicator
+        if item.add_menu:                                   # Option that warns if it has been added to the Video Library
+            del item.add_menu                               # from the Episodes page or from the Contextual Menu
+
+    # logger.debug(item)
 
-    #logger.debug(item)
-    
     return (item, itemlist)
-    
-    
+
+
 def post_tmdb_findvideos(item, itemlist):
     logger.info()
-    
+
     """
-        
-    Llamada para crear un pseudo título con todos los datos relevantes del vídeo.
-    
-    Toma de infoLabel todos los datos de interés y los va situando en diferentes variables, principalmente título. Lleva un control del num. de episodios por temporada
-    
-    La llamada al método desde Findvideos, al principio, es:
-    
+
+    Call to create a pseudo title with all the relevant data from the video.
+
+    InfoLabel takes all the data of interest and places them in different variables, mainly the title. Keep track of the num. of episodes per season
+
+    The call to the method from Findvideos, at the beginning, is:
+
         from lib import generictools
-        item, itemlist = generictools.post_tmdb_findvideos(item, itemlist)
-        
-    En Itemlist devuelve un Item con el pseudotítulo.  Ahí el canal irá agregando el resto.
-    
+        item, itemlist = generictools.post_tmdb_findvideos (item, itemlist)
+
+    In Itemlist it returns an Item with the pseudo title. There the channel will add the rest.
+
     """
-    #logger.debug(item)
-    
-    # Saber si estamos en una ventana emergente lanzada desde una viñeta del menú principal,
-    # con la función "play_from_library"
+    # logger.debug(item)
+
+    # Know if we are in a popup window launched from a bullet in the main menu,
+    # with the function "play_from_library"
     item.unify = False
     Window_IsMedia = False
     try:
@@ -1037,29 +1025,29 @@ def post_tmdb_findvideos(item, itemlist):
     except:
         item.unify = config.get_setting("unify")
         logger.error(traceback.format_exc())
-    
-    if item.contentSeason_save:                                 #Restauramos el num. de Temporada
+
+    if item.contentSeason_save:                                 # We restore the num. seasonal
         item.contentSeason = item.contentSeason_save
         del item.contentSeason_save
-    
+
     if item.library_filter_show:
         del item.library_filter_show
 
-    #Salvamos la información de max num. de episodios por temporada para despues de TMDB
+    # We save the information of max num. of episodes per season after TMDB
     num_episodios = item.contentEpisodeNumber
     if item.infoLabels['temporada_num_episodios'] and item.contentEpisodeNumber <= item.infoLabels['temporada_num_episodios']:
         num_episodios = item.infoLabels['temporada_num_episodios']
 
-    # Obtener la información actualizada del vídeo.  En una segunda lectura de TMDB da más información que en la primera
+    # Get updated video information. In a second TMDB reading it gives more information than in the first
     #if not item.infoLabels['tmdb_id'] or (not item.infoLabels['episodio_titulo'] and item.contentType == 'episode'):
     #    tmdb.set_infoLabels(item, True)
     #elif (not item.infoLabels['tvdb_id'] and item.contentType == 'episode') or item.contentChannel == "videolibrary":
     #    tmdb.set_infoLabels(item, True)
     try:
-        tmdb.set_infoLabels(item, True)                         #TMDB de cada Temp
+        tmdb.set_infoLabels(item, True)                         # TMDB of each Temp
     except:
         logger.error(traceback.format_exc())
-    #Restauramos la información de max num. de episodios por temporada despues de TMDB
+    # We restore the information of max num. of episodes per season after TMDB
     try:
         if item.infoLabels['temporada_num_episodios']:
             if int(num_episodios) > int(item.infoLabels['temporada_num_episodios']):
@@ -1069,21 +1057,21 @@ def post_tmdb_findvideos(item, itemlist):
     except:
         logger.error(traceback.format_exc())
 
-    #Ajustamos el nombre de la categoría
+    # We adjust the category name
     if item.channel == channel_py:
-        category = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
+        category = scrapertools.find_single_match(item.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
         if category:
             item.category = category
-    
+
     if item.armagedon:                                          #Es una situación catastrófica?
-        itemlist.append(item.clone(action='', title=item.category + ': [COLOR hotpink]Usando enlaces de emergencia[/COLOR]'))
-    
-    #Quitamos el la categoría o nombre del título, si lo tiene
+        itemlist.append(item.clone(action='', title=item.category + ': [COLOR hotpink]Using emergency links[/COLOR]'))
+
+    # We remove the category or title name, if you have it
     if item.contentTitle:
         item.contentTitle = re.sub(r' -%s-' % item.category, '', item.contentTitle)
         item.title = re.sub(r' -%s-' % item.category, '', item.title)
-    
-    #Limpiamos de año y rating de episodios
+
+    # We clean up the year and episode ratings
     if item.infoLabels['episodio_titulo']:
         item.infoLabels['episodio_titulo'] = re.sub(r'\s?\[.*?\]', '', item.infoLabels['episodio_titulo'])
         item.infoLabels['episodio_titulo'] = re.sub(r'\s?\(.*?\)', '', item.infoLabels['episodio_titulo'])
@@ -1091,7 +1079,7 @@ def post_tmdb_findvideos(item, itemlist):
     if item.infoLabels['aired'] and item.contentType == "episode":
         item.infoLabels['year'] = scrapertools.find_single_match(str(item.infoLabels['aired']), r'\/(\d{4})')
 
-    rating = ''     #Ponemos el rating
+    rating = ''     # We put the rating
     try:
         if item.infoLabels['rating'] and item.infoLabels['rating'] != 0.0:
             rating = float(item.infoLabels['rating'])
@@ -1104,7 +1092,7 @@ def post_tmdb_findvideos(item, itemlist):
     if item.quality.lower() in ['gb', 'mb']:
         item.quality = item.quality.replace('GB', 'G B').replace('Gb', 'G b').replace('MB', 'M B').replace('Mb', 'M b')
 
-    #busco "duration" en infoLabels
+    # I'm looking for "duration" in infoLabels
     tiempo = 0
     if item.infoLabels['duration']:
         try:
@@ -1117,313 +1105,136 @@ def post_tmdb_findvideos(item, itemlist):
         except:
             tiempo = item.infoLabels['duration']
             logger.error(traceback.format_exc())
-    
-    elif item.contentChannel == 'videolibrary':                         #No hay, viene de la Videoteca? buscamos en la DB
-    #Leo de la BD de Kodi la duración de la película o episodio.  En "from_fields" se pueden poner las columnas que se quiera
+
+    elif item.contentChannel == 'videolibrary':                         # No, does it come from the Video Library? we look in the DB
+    # I read from the Kodi BD the length of the movie or episode. In "from_fields" you can put the columns you want
         nun_records = 0
         try:
             if item.contentType == 'movie':
-                nun_records, records = get_field_from_kodi_DB(item, from_fields='c11')  #Leo de la BD de Kodi la duración de la película
+                nun_records, records = get_field_from_kodi_DB(item, from_fields='c11')  # Leo from BD Kodi movie length
             else:
-                nun_records, records = get_field_from_kodi_DB(item, from_fields='c09')  #Leo de la BD de Kodi la duración del episodio
+                nun_records, records = get_field_from_kodi_DB(item, from_fields='c09')  # Leo from BD Kodi episode length
         except:
             logger.error(traceback.format_exc())
-        if nun_records > 0:                                                         #Hay registros?
-            #Es un array, busco el campo del registro: añadir en el FOR un fieldX por nueva columna
-            for strFileName, field1 in records: 
+        if nun_records > 0:                                                         # Are there records?
+            # It is an array, I look for the record field: add in the FOR a fieldX for a new column
+            for strFileName, field1 in records:
                 tiempo = field1
 
-    try:                                                                            #calculamos el timepo en hh:mm
-        tiempo_final = int(tiempo)                                                  #lo convierto a int, pero puede se null
-        if tiempo_final > 0:                                                        #Si el tiempo está a 0, pasamos
-            if tiempo_final > 700:                                                  #Si está en segundos
-                tiempo_final = tiempo_final / 60                                    #Lo transformo a minutos
-            horas = tiempo_final / 60                                               #Lo transformo a horas
-            resto = tiempo_final - (horas * 60)                                     #guardo el resto de minutos de la hora
-            if not scrapertools.find_single_match(item.quality, '(\[\d+:\d+)'):     #si ya tiene la duración, pasamos
-                item.quality += ' [/COLOR][COLOR white][%s:%s h]' % (str(horas).zfill(2), str(resto).zfill(2))     #Lo agrego a Calidad del Servidor
+    try:                                                                            # we calculate the time in hh: mm
+        tiempo_final = int(tiempo)                                                  # I convert it to int, but it can be null
+        if tiempo_final > 0:                                                        # If the time is 0, we pass
+            if tiempo_final > 700:                                                  # If it's in seconds
+                tiempo_final = tiempo_final / 60                                    # I transform it into minutes
+            horas = tiempo_final / 60                                               # I transform it into hours
+            resto = tiempo_final - (horas * 60)                                     # I keep the remaining minutes of the hour
+            if not scrapertools.find_single_match(item.quality, r'(\[\d+:\d+)'):     # if it already has the duration, we pass
+                item.quality += ' [/COLOR][COLOR white][%s:%s h]' % (str(horas).zfill(2), str(resto).zfill(2))     # I add it to Server Quality
     except:
         logger.error(traceback.format_exc())
-        
-    #Ajustamos el nombre de la categoría
+
+    # We adjust the category name
     if item.channel != channel_py:
         item.category = item.channel.capitalize()
-    
-    #Formateamos de forma especial el título para un episodio
+
+    # We specially format the title for an episode
     title = ''
     title_gen = ''
-    if item.contentType == "episode":                   #Series
-        title = '%sx%s' % (str(item.contentSeason), str(item.contentEpisodeNumber).zfill(2))    #Temporada y Episodio
+    if item.contentType == "episode":                   # Series
+        title = '%sx%s' % (str(item.contentSeason), str(item.contentEpisodeNumber).zfill(2))    # Season and Episode
         if item.infoLabels['temporada_num_episodios']:
-            title = '%s (de %s)' % (title, str(item.infoLabels['temporada_num_episodios']))     #Total Episodios
-        
-        #Si son episodios múltiples, y viene de Videoteca, ponemos nombre de serie        
-        if (" al " in item.title or " Al " in item.title) and not "al " in item.infoLabels['episodio_titulo']: 
-            title = '%s al %s - ' % (title, scrapertools.find_single_match(item.title, '[al|Al] (\d+)'))
+            title = '%s (de %s)' % (title, str(item.infoLabels['temporada_num_episodios']))     # Total Episodes
+
+        # If they are multiple episodes, and it comes from Video Library, we put series name
+        if (" al " in item.title or " Al " in item.title) and not "al " in item.infoLabels['episodio_titulo']:
+            title = '%s al %s - ' % (title, scrapertools.find_single_match(item.title, r'[al|Al] (\d+)'))
         else:
-            title = '%s %s' % (title, item.infoLabels['episodio_titulo'])               #Título Episodio
+            title = '%s %s' % (title, item.infoLabels['episodio_titulo'])               # Title Episode
         title_gen = '%s, ' % title
-        
-    if item.contentType == "episode" or item.contentType == "season":                   #Series o Temporadas
-        title_gen += '%s [COLOR yellow][%s][/COLOR] [%s] [COLOR limegreen][%s][/COLOR] [COLOR red]%s[/COLOR] [%s]' % (item.contentSerieName, item.infoLabels['year'], rating, item.quality, str(item.language), scrapertools.find_single_match(item.title, '\s\[(\d+,?\d*?\s\w[b|B])\]'))                                      #Rating, Calidad, Idioma, Tamaño
+
+    if item.contentType == "episode" or item.contentType == "season":                   # Series or Seasons
+        title_gen += '%s [COLOR yellow][%s][/COLOR] [%s] [COLOR limegreen][%s][/COLOR] [COLOR red]%s[/COLOR] [%s]' % (item.contentSerieName, item.infoLabels['year'], rating, item.quality, str(item.language), scrapertools.find_single_match(item.title, r'\s\[(\d+,?\d*?\s\w[b|B])\]'))                                      # Rating, Quality, Language, Size
         if item.infoLabels['status'] and item.infoLabels['status'].lower() == "ended":
-            title_gen = '[TERM.] %s' % title_gen        #Marca cuando la Serie está terminada y no va a haber más producción
+            title_gen = '[TERM.] %s' % title_gen        # It marks when the Series is finished and there will be no more production
         item.title = title_gen
 
-    else:                                               #Películas
+    else:                                               # Films
         title = item.title
         title_gen = item.title
 
-    #Limpiamos etiquetas vacías
-    title_gen = re.sub(r'\s?\[COLOR \w+\]\[\[?\s?\]?\]\[\/COLOR\]', '', title_gen).strip()  #Quitamos etiquetas vacías
-    title_gen = re.sub(r'\s?\[COLOR \w+\]\s?\[\/COLOR\]', '', title_gen).strip()            #Quitamos colores vacíos
-    title_gen = title_gen.replace(" []", "").strip()                                    #Quitamos etiquetas vacías
-    title_videoteca = title_gen                                                         #Salvamos el título para Videoteca
+    # We clean empty labels
+    title_gen = re.sub(r'\s?\[COLOR \w+\]\[\[?\s?\]?\]\[\/COLOR\]', '', title_gen).strip()  # We remove empty labels
+    title_gen = re.sub(r'\s?\[COLOR \w+\]\s?\[\/COLOR\]', '', title_gen).strip()            # We remove empty colors
+    title_gen = title_gen.replace(" []", "").strip()                                    # We remove empty labels
+    title_videoteca = title_gen                                                         # We save the title for Video Library
 
-    if not item.unify:                                                      #Si Titulos Inteligentes NO seleccionados:
+    if not item.unify:                                                      # If Smart Titles NOT selected:
         title_gen = '**- [COLOR gold]Enlaces Ver: [/COLOR]%s[COLOR gold] -**[/COLOR]' % (title_gen)
-    else:                                                                   #Si Titulos Inteligentes SÍ seleccionados:
-        title_gen = '[COLOR gold]Enlaces Ver: [/COLOR]%s' % (title_gen)    
+    else:                                                                   # If Smart Titles YES selected:
+        title_gen = '[COLOR gold]Enlaces Ver: [/COLOR]%s' % (title_gen)
 
     if item.channel_alt:
         title_gen = '[COLOR yellow]%s [/COLOR][ALT]: %s' % (item.category.capitalize(), title_gen)
-    #elif (config.get_setting("quit_channel_name", "videolibrary") == 1 or item.channel == channel_py) and item.contentChannel == "videolibrary":
+    # elif (config.get_setting("quit_channel_name", "videolibrary") == 1 or item.channel == channel_py) and item.contentChannel == "videolibrary":
     else:
         title_gen = '[COLOR white]%s: %s' % (item.category.capitalize(), title_gen)
 
-    #Si intervención judicial, alerto!!!
+    # If judicial intervention, I warn !!!
     if item.intervencion:
         for clone_inter, autoridad in item.intervencion:
             thumb_intervenido = get_thumb(autoridad)
             itemlist.append(item.clone(action='', title="[COLOR yellow]" + clone_inter.capitalize() + ': [/COLOR]' + intervenido_judicial + '. Reportar el problema en el foro', thumbnail=thumb_intervenido))
         del item.intervencion
-    
-    #Pintamos el pseudo-título con toda la información disponible del vídeo
-    itemlist.append(item.clone(action="", server = "", title=title_gen))		#Título con todos los datos del vídeo
-    
-    if item.action == 'show_result':                                            #Viene de una búsqueda global
+
+    # We paint the pseudo-title with all the information available from the video
+    itemlist.append(item.clone(action="", server = "", title=title_gen))		# Title with all the data of the video
+
+    if item.action == 'show_result':                                            # Comes from a global search
         channel = item.channel.capitalize()
         if item.from_channel == channel_py or item.channel == channel_py:
             channel = item.category
         elif item.from_channel:
             channel = item.from_channel.capitalize()
         item.quality = '[COLOR yellow][%s][/COLOR] %s' % (channel, item.quality)
-    
-    #agregamos la opción de Añadir a Videoteca para péliculas (no series)
+
+    # we added the option to Add to Video Library for movies (no series)
     if (item.contentType == 'movie' or item.contentType == 'season') and item.contentChannel != "videolibrary":
-        #Permitimos la actualización de los títulos, bien para uso inmediato, o para añadir a la videoteca
+        # We allow the updating of titles, either for immediate use, or to add to the video library
         itemlist.append(item.clone(title="** [COLOR yelow]Actualizar Títulos - vista previa videoteca[/COLOR] **", action="actualizar_titulos", extra="peliculas", tmdb_stat=False, from_action=item.action, from_title_tmdb=item.title, from_update=True))
-        
+
     if item.contentType == 'movie' and item.contentChannel != "videolibrary":
         itemlist.append(item.clone(title="**-[COLOR yellow] Añadir a la videoteca [/COLOR]-**", action="add_pelicula_to_library", extra="peliculas", from_action=item.action, from_title_tmdb=item.title))
-    
-    #Añadimos la opción de ver trailers
+
+    # We added the option to watch trailers
     if item.contentChannel != "videolibrary":
         itemlist.append(item.clone(channel="trailertools", title="**-[COLOR magenta] Buscar Trailer [/COLOR]-**", action="buscartrailer", context=""))
-    
-    #logger.debug(item)
-    
+
+    # logger.debug(item)
+
     return (item, itemlist)
-    
-    
-def get_torrent_size(url, referer=None, post=None, torrents_path=None, data_torrent=False, \
-                        timeout=5, file_list=False, lookup=True, local_torr=None, headers={}, short_pad=False):
-    logger.info()
-    from servers import torrent
-    
-    """
-    
-    Módulo extraido del antiguo canal ZenTorrent
-    
-    Calcula el tamaño de los archivos que contienen un .torrent.  Descarga el archivo .torrent en una carpeta,
-    lo lee y descodifica.  Si contiene múltiples archivos, suma el tamaño de todos ellos
-    
-    Llamada:            generictools.get_torrent_size(url, data_torrent=False)
-    Entrada: url:       url del archivo .torrent
-    Entrada: referer:   url de referer en caso de llamada con post
-    Entrada: post:      contenido del post en caso de llamada con post
-    Entrada: data_torrent:  Flag por si se quiere el contenido del .torretn de vuelta
-    Salida: size:       str con el tamaño y tipo de medida ( MB, GB, etc)
-    Salida: torrent_f:  dict() con el contenido del .torrent (opcional)
-    Salida: files:      dict() con los nombres de los archivos del torrent y su tamaño (opcional)
-    
-    """
-    
-    def convert_size(size):
-        import math
-        if (size == 0):
-            return '0B'
-        size_name = ("B", "KB", "M·B", "G·B", "TB", "PB", "EB", "ZB", "YB")
-        i = int(math.floor(math.log(size, 1024)))
-        p = math.pow(1024, i)
-        #s = round(size / p, 2)
-        s = round(old_div(size, p), 2)
-        return '%s %s' % (s, size_name[i])
-    
-    def decode(text):
-        try:
-            src = tokenize(text)
-            if not PY3:
-                data = decode_item(src.next, src.next())                        #Py2
-            else:
-                data = decode_item(src.__next__, next(src))                     #Py3
-            for token in src:                                                   # look for more tokens
-                raise SyntaxError("trailing junk")
-        except (AttributeError, ValueError, StopIteration):
-            try:
-                data = data
-            except:
-                data = src
 
-        return data
-        
-    def tokenize(text, match=re.compile("([idel])|(\d+):|(-?\d+)").match):
-        i = 0
-        while i < len(text):
-            m = match(text, i)
-            s = m.group(m.lastindex)
-            i = m.end()
-            if m.lastindex == 2:
-                yield "s"
-                yield text[i:i + int(s)]
-                i = i + int(s)
-            else:
-                yield s
 
-    def decode_item(next, token):
-        if token == "i":
-            # integer: "i" value "e"
-            data = int(next())
-            if next() != "e":
-                raise ValueError
-        elif token == "s":
-            # string: "s" value (virtual tokens)
-            data = next()
-        elif token == "l" or token == "d":
-            # container: "l" (or "d") values "e"
-            data = []
-            tok = next()
-            while tok != "e":
-                data.append(decode_item(next, tok))
-                tok = next()
-            if token == "d":
-                #data = dict(zip(data[0::2], data[1::2]))
-                data = dict(list(zip(data[0::2], data[1::2])))
-        else:
-            raise ValueError
-        return data
-        
-    
-    #Móludo principal
-    size = ''
-    torrent_f = ''
-    torrent_file = ''
-    files = {}
-    try:
-        #torrents_path = config.get_videolibrary_path() + '/torrents'            #path para dejar el .torrent
-
-        #if not os.path.exists(torrents_path):
-        #    os.mkdir(torrents_path)                                             #si no está la carpeta la creamos
-        
-        #urllib.URLopener.version = 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.153 Safari/537.36 SE 2.X MetaSr 1.0'
-        #urllib.urlretrieve(url, torrents_path + "/generictools.torrent")        #desacargamos el .torrent a la carpeta
-        #torrent_file = open(torrents_path + "/generictools.torrent", "rb").read()   #leemos el .torrent
-
-        if ((url and not local_torr) or url.startswith('magnet')):
-            torrents_path, torrent_file = torrent.caching_torrents(url, \
-                        referer=referer, post=post, torrents_path=torrents_path, \
-                        timeout=timeout, lookup=lookup, data_torrent=True, headers=headers)
-        elif local_torr:
-            torrent_file = filetools.read(local_torr)
-        if not torrent_file:
-            if not lookup:
-                return (size, torrents_path, torrent_f, files)
-            elif file_list and data_torrent:
-                return (size, torrent_f, files)
-            elif file_list:
-                return (size, files)
-            elif data_torrent:
-                return (size, torrent_f)
-            return size                                         #Si hay un error, devolvemos el "size" y "torrent" vacíos
-
-        torrent_f = decode(torrent_file)                                        #decodificamos el .torrent
-
-        #si sólo tiene un archivo, tomamos la longitud y la convertimos a una unidad legible, si no dará error
-        try:
-            sizet = torrent_f["info"]['length']
-            size = convert_size(sizet)
-            
-            files = torrent_f["info"].copy()
-            if 'path' not in files: files.update({'path': ['']})
-            if 'piece length' in files: del files['piece length']
-            if 'pieces' in files: del files['pieces']
-            if 'name' in files: del files['name']
-            files = [files]
-            files.append({"__name": torrent_f["info"]["name"], 'length': 0})
-        except:
-            pass
-            
-        #si tiene múltiples archivos sumamos la longitud de todos
-        if not size:
-            try:
-                check_video = scrapertools.find_multiple_matches(str(torrent_f["info"]["files"]), "'length': (\d+).*?}")
-                sizet = sum([int(i) for i in check_video])
-                size = convert_size(sizet)
-                
-                files = torrent_f["info"]["files"][:]
-                files.append({"__name": torrent_f["info"]["name"], 'length': 0})
-                
-            except:
-                size = 'ERROR'
-
-    except:
-        size = 'ERROR'
-        logger.error('ERROR al buscar el tamaño de un .Torrent: ' + str(url))
-        logger.error(traceback.format_exc())
-        
-    #try:
-    #    os.remove(torrents_path + "/generictools.torrent")                      #borramos el .torrent
-    #except:
-    #    pass
-
-    if '.rar' in str(files):
-        size = '[COLOR magenta][B]RAR-[/B][/COLOR]%s' % size
-        
-    #logger.debug(str(url))
-    logger.info(str(size))
-    
-    if not lookup:
-        return (size, torrents_path, torrent_f, files)
-    elif file_list and data_torrent:
-        return (size, torrent_f, files)
-    elif file_list:
-        return (size, files)
-    elif data_torrent:
-        return (size, torrent_f)
-    return size 
-
-    
 def get_field_from_kodi_DB(item, from_fields='*', files='file'):
     logger.info()
     """
-        
-    Llamada para leer de la DB de Kodi los campos que se reciben de entrada (from_fields, por defecto "*") del vídeo señalado en Item
-    Obviamente esto solo funciona con Kodi y si la película o serie está catalogada en las Videotecas de Alfa y Kodi
-    Se puede pedir que la búdqueda se haga por archivos (defecto), o por carpeta (series)
-    
-    La llamada es:
-        nun_records, records = generictools.get_field_from_kodi_DB(item, from_fields='cXX[, cYY,...]'[, files = 'file|folder'])
-    
-    Devuelve el num de registros encontrados y los registros.  Es importante que el llamador verifique que "nun_records > 0" antes de tratar "records"
-    
+
+   Call to read from the Kodi DB the input fields received (from_fields, by default "*") of the video indicated in Item
+    Obviously this only works with Kodi and if the movie or series is listed in the Alpha and Kodi Video Libraries.
+    You can request that the search be done by files (default), or by folder (series)
+
+    The call is:
+        nun_records, records = generictools.get_field_from_kodi_DB (item, from_fields = 'cXX [, cYY, ...]' [, files = 'file | folder'])
+
+    Returns the num of records found and the records. It is important for the caller to verify that "nun_records> 0" before processing "records"
+
     """
 
     FOLDER_MOVIES = config.get_setting("folder_movies")
     FOLDER_TVSHOWS = config.get_setting("folder_tvshows")
     VIDEOLIBRARY_PATH = config.get_videolibrary_config_path()
     VIDEOLIBRARY_REAL_PATH = config.get_videolibrary_path()
-    
-    if item.contentType == 'movie':                             #Agrego la carpeta correspondiente al path de la Videoteca
+
+    if item.contentType == 'movie':                             # I add the folder corresponding to the path of the Video Library
         path = filetools.join(VIDEOLIBRARY_REAL_PATH, FOLDER_MOVIES)
         path2 = filetools.join(VIDEOLIBRARY_PATH, FOLDER_MOVIES)
         folder = FOLDER_MOVIES
@@ -1432,152 +1243,152 @@ def get_field_from_kodi_DB(item, from_fields='*', files='file'):
         path2 = filetools.join(VIDEOLIBRARY_PATH, FOLDER_TVSHOWS)
         folder = FOLDER_TVSHOWS
 
-    raiz, carpetas, ficheros = filetools.walk(path).next()      #listo las series o películas en la Videoteca
-    carpetas = [filetools.join(path, f) for f in carpetas]      #agrego la carpeta del contenido al path
-    for carpeta in carpetas:                                    #busco el contenido seleccionado en la lista de carpetas
-        if item.contentType == 'movie' and (item.contentTitle.lower() in carpeta or item.contentTitle in carpeta):                                                        #Películas?
+    raiz, carpetas, ficheros = filetools.walk(path).next()      # ready the series or movies in the Video Library
+    carpetas = [filetools.join(path, f) for f in carpetas]      # I add the content folder to the path
+    for carpeta in carpetas:                                    # I search the selected content in the folder list
+        if item.contentType == 'movie' and (item.contentTitle.lower() in carpeta or item.contentTitle in carpeta):                                                        # Films?
+            path = carpeta                                      # We store the folder in the path
+            break
+        elif item.contentType in ['tvshow', 'season', 'episode'] and (item.contentSerieName.lower() in carpeta or item.contentSerieName in carpeta):                           # Series?
             path = carpeta                                      #Almacenamos la carpeta en el path
             break
-        elif item.contentType in ['tvshow', 'season', 'episode'] and (item.contentSerieName.lower() in carpeta or item.contentSerieName in carpeta):                           #Series?
-            path = carpeta                                      #Almacenamos la carpeta en el path
-            break
-    
-    path2 += '/%s/' % scrapertools.find_single_match(path, '%s.(.*?\s\[.*?\])' % folder) #Agregamos la carpeta de la Serie o Películas, formato Android
-    file_search = '%'                                           #Por defecto busca todos los archivos de la carpeta
-    if files == 'file':                                         #Si se ha pedido son un archivo (defecto), se busca
-        if item.contentType == 'episode':                       #Si es episodio, se pone el nombre, si no de deja %
-            file_search = '%sx%s.strm' % (item.contentSeason, str(item.contentEpisodeNumber).zfill(2))  #Nombre para episodios
 
-    if "\\" in path:                                            #Ajustamos los / en función de la plataforma
+    path2 += '/%s/' % scrapertools.find_single_match(path, r'%s.(.*?\s\[.*?\])' % folder) # We add the Series or Movies folder, Android format
+    file_search = '%'                                           # By default it looks for all the files in the folder
+    if files == 'file':                                         # If a file is requested (default), it is searched
+        if item.contentType == 'episode':                       # If it is an episode, put the name, if not leave%
+            file_search = '%sx%s.strm' % (item.contentSeason, str(item.contentEpisodeNumber).zfill(2))  # Name for episodes
+
+    if "\\" in path:                                            # We adjust the / depending on the platform
         path = path.replace("/", "\\")
-        path += "\\"                                            #Terminamos el path con un /
+        path += "\\"                                            # We end the path with a /
     else:
         path += "/"
 
-    if FOLDER_TVSHOWS in path:                                  #Compruebo si es CINE o SERIE
-        contentType = "episode_view"                            #Marco la tabla de BBDD de Kodi Video
+    if FOLDER_TVSHOWS in path:                                  # I check if it is CINEMA or SERIES
+        contentType = "episode_view"                            # I mark the Kodi Video BBDD table
     else:
-        contentType = "movie_view"                              #Marco la tabla de BBDD de Kodi Video
-    path1 = path.replace("\\\\", "\\")                          #para la SQL solo necesito la carpeta
-    path2 = path2.replace("\\", "/")                            #Formato no Windows
+        contentType = "movie_view"                              # I mark the Kodi Video BBDD table
+    path1 = path.replace("\\\\", "\\")                          # for SQL I just need the folder
+    path2 = path2.replace("\\", "/")                            # Format no Windows
 
-    #Ejecutmos la sentencia SQL
+    # Let's execute the SQL statement
     if not from_fields:
         from_fields = '*'
     else:
-        from_fields = 'strFileName, %s' % from_fields           #al menos dos campos, porque uno solo genera cosas raras
+        from_fields = 'strFileName, %s' % from_fields           # at least two fields, because one only generates strange things
     sql = 'select %s from %s where (strPath like "%s" or strPath like "%s") and strFileName like "%s"' % (from_fields, contentType, path1, path2, file_search)
     nun_records = 0
     records = None
     try:
         if config.is_xbmc():
             from platformcode import xbmc_videolibrary
-            nun_records, records = xbmc_videolibrary.execute_sql_kodi(sql)      #ejecución de la SQL
-            if nun_records == 0:                                                #hay error?
-                logger.error("Error en la SQL: " + sql + ": 0 registros")       #No estará catalogada o hay un error en el SQL
+            nun_records, records = xbmc_videolibrary.execute_sql_kodi(sql)      # SQL execution
+            if nun_records == 0:                                                # is there an error?
+                logger.error("SQL error: " + sql + ": 0 records")       # It will not be listed or there is an error in the SQL
     except:
         logger.error(traceback.format_exc())
-             
+
     return (nun_records, records)
-    
-    
+
+
 def fail_over_newpct1(item, patron, patron2=None, timeout=None):
     logger.info()
     import ast
-    
+
     """
-        
-    Llamada para encontrar una web alternativa a un canal caído, clone de NewPct1
-    
-    Creamos una array con los datos de los canales alternativos.  Los datos de la tupla son:
-    
-        - active = 0,1      Indica si el canal no está activo o sí lo está
-        - channel           nombre del canal alternativo
-        - channel_host      host del canal alternativo, utilizado para el reemplazo de parte de la url
-        - contentType       indica que tipo de contenido que soporta el nuevo canal en fail-overs
-        - action_excluded   lista las acciones que está excluidas para ese canal
-    
-    La llamada al método desde el principio de Submenu, Listado_Búsqueda, Episodios y Findvideos, es:
-    
+
+    Call to find an alternative website to a downed channel, clone of NewPct1
+
+    We create an array with the data of the alternative channels. The tuple data is:
+
+        - active = 0.1 Indicates if the channel is not active or if it is
+        - channel name of the alternative channel
+        - channel_host host of the alternative channel, used to replace part of the url
+        - contentType indicates what type of content the new channel supports in fail-overs
+        - action_excluded lists the actions that are excluded for that channel
+
+    The method call from the beginning of Submenu, Search_List, Episodes and Findvideos, is:
+
         from lib import generictools
-        item, data = generictools.fail_over_newpct1(item, patron[, patron2=][, timeout=])
-        
-        - Entrada:  patron: con este patron permite verificar si los datos de la nueva web son buenos
-        - Entrada (opcional): patron2: segundo patron opcional
-        - Entrada (opcional): timeout: valor de espera máximo en download de página.  Por defecto 3
-        - Entrada (opcional): patron=True: pide que sólo verifique si el canal en uso está activo, si no, ofrece otro
-        - Salida:   data:   devuelve los datos del la nueva web.  Si vuelve vacía es que no se ha encontrado alternativa
-    
+        item, data = generictools.fail_over_newpct1 (item, pattern [, pattern2 =] [, timeout =])
+
+        - Entry: pattern: with this pattern it is possible to verify if the data of the new website is good
+        - Input (optional): pattern 2: optional second pattern
+        - Entry (optional): timeout: maximum wait value in page download. Default 3
+        - Input (optional): pattern = True: asks to only verify if the channel in use is active, if not, offers another
+        - Output: data: returns the data of the new website. If it returns empty it is that no alternative was found
+
     """
-    #logger.debug(item)
-    
+    # logger.debug(item)
+
     if timeout == None:
-        timeout = config.get_setting('clonenewpct1_timeout_downloadpage', channel_py)           #Timeout downloadpage
+        timeout = config.get_setting('clonenewpct1_timeout_downloadpage', channel_py)           # Timeout downloadpage
     if timeout == 0: timeout = None
-    if item.action == "search" or item.action == "listado_busqueda": timeout = timeout * 2      #Mas tiempo para búsquedas
-    
+    if item.action == "search" or item.action == "listado_busqueda": timeout = timeout * 2      # More time for searches
+
     data = ''
     channel_failed = ''
     url_alt = []
-    item.category = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
+    item.category = scrapertools.find_single_match(item.url, r'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
     if not item.extra2:
         item.extra2 = 'z9z8z7z6z5'
 
     patron_alt = ''
     verify_torrent = ''
-    if patron is not True and '|' in patron:                            #Comprobamos si hay dos patrones alternativos
+    if patron is not True and '|' in patron:                            # We check if there are two alternative patterns
         try:
-            verify_torrent, patron1, patron_alt = patron.split('|')     #Si es así, los separamos y los tratamos
+            verify_torrent, patron1, patron_alt = patron.split('|')     # If so, we separate them and treat them
             patron = patron1
         except:
             logger.error(traceback.format_exc())
-        
-    #Array con los datos de los canales alternativos
-    #Cargamos en .json del canal para ver las listas de valores en settings
+
+    # Array with the data of the alternative channels
+    # We load in .json of the channel to see the lists of values ​​in settings
     fail_over = channeltools.get_channel_json(channel_py)
-    for settings in fail_over['settings']:                              #Se recorren todos los settings
-        if settings['id'] == "clonenewpct1_channels_list":              #Encontramos en setting
-            fail_over = settings['default']                             #Carga lista de clones
+    for settings in fail_over['settings']:                              # All settings are scrolled
+        if settings['id'] == "clonenewpct1_channels_list":              # We found in setting
+            fail_over = settings['default']                             # Load list of clones
             break
     fail_over_list = ast.literal_eval(fail_over)
-    #logger.debug(str(fail_over_list))
+    # logger.debug(str(fail_over_list))
 
     if item.from_channel and item.from_channel != 'videolibrary': #Desde search puede venir con el nombre de canal equivocado
         item.channel = item.from_channel
-    #Recorremos el Array identificando el canal que falla
+    # We walk the Array identifying the channel that fails
     for active, channel, channel_host, contentType, action_excluded in fail_over_list:
         if item.channel == channel_py:
-            if channel != item.category.lower():                        #es el canal/categoría que falla?
+            if channel != item.category.lower():                        # is the channel / category failing?
                 continue
         else:
-            if channel != item.channel:                                 #es el canal que falla?
+            if channel != item.channel:                                 # is the channel failing?
                 continue
-        channel_failed = channel                                        #salvamos el nombre del canal o categoría
-        channel_host_failed = channel_host                              #salvamos el nombre del host
-        channel_url_failed = item.url                                   #salvamos la url
+        channel_failed = channel                                        # we save the name of the channel or category
+        channel_host_failed = channel_host                              # we save the hostname
+        channel_url_failed = item.url                                   # we save the url
         #logger.debug(channel_failed + ' / ' + channel_host_failed)
-        
-        if patron == True and active == '1':                            #solo nos han pedido verificar el clone
-            return (item, data)                                         #nos vamos, con el mismo clone, si está activo
-        if (item.action == 'episodios' or item.action == "update_tvshow" or item.action == "get_seasons" or item.action == 'findvideos') and item.contentType not in contentType:          #soporta el fail_over de este contenido?
-            logger.error("ERROR 99: " + item.action.upper() + ": Acción no soportada para Fail-Over en canal: " + item.url)
-            return (item, data)                         #no soporta el fail_over de este contenido, no podemos hacer nada
-        break
-        
-    if not channel_failed:
-        logger.error('Patrón: ' + str(patron) + ' / fail_over_list: ' + str(fail_over_list))
-        logger.error(item)
-        return (item, data)                                             #Algo no ha funcionado, no podemos hacer nada
 
-    #Recorremos el Array identificando canales activos que funcionen, distintos del caído, que soporten el contenido
+        if patron == True and active == '1':                            # we have only been asked to verify the clone
+            return (item, data)                                         # we leave, with the same clone, if it is active
+        if (item.action == 'episodios' or item.action == "update_tvshow" or item.action == "get_seasons" or item.action == 'findvideos') and item.contentType not in contentType:          # supports fail_over of this content?
+            logger.error("ERROR 99: " + item.action.upper() + ": Unsupported Action for Channel Fail-Over: " + item.url)
+            return (item, data)                         # does not support fail_over of this content, we can not do anything
+        break
+
+    if not channel_failed:
+        logger.error('Pattern: ' + str(patron) + ' / fail_over_list: ' + str(fail_over_list))
+        logger.error(item)
+        return (item, data)                                             # Something has not worked, we can not do anything
+
+    # We go through the Array identifying active channels that work, other than the fallen one, that support the content
     for active, channel, channel_host, contentType, action_excluded in fail_over_list:
         data_alt = ''
-        if channel == channel_failed or active == '0' or item.action in action_excluded or item.extra2 in action_excluded:  #es válido el nuevo canal?
+        if channel == channel_failed or active == '0' or item.action in action_excluded or item.extra2 in action_excluded:  # is the new channel valid?
             continue
-        if (item.action == 'episodios' or item.action == "update_tvshow" or item.action == "get_seasons" or item.action == 'findvideos') and item.contentType not in contentType:          #soporta el contenido?
+        if (item.action == 'episodios' or item.action == "update_tvshow" or item.action == "get_seasons" or item.action == 'findvideos') and item.contentType not in contentType:          # does it support content?
             continue
-        
-        #Hacemos el cambio de nombre de canal y url, conservando las anteriores como ALT
+
+        # We make the channel and url name change, keeping the previous ones as ALT
         item.channel_alt = channel_failed
         if item.channel != channel_py:
             item.channel = channel
@@ -1587,37 +1398,37 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
         channel_host_bis = re.sub(r'(?i)http.*://', '', channel_host)
         channel_host_failed_bis = re.sub(r'(?i)http.*://', '', channel_host_failed)
         item.url = item.url.replace(channel_host_failed_bis, channel_host_bis)
-        
-        url_alt += [item.url]                               #salvamos la url para el bucle
+
+        url_alt += [item.url]                               # we save the url for the loop
         item.channel_host = channel_host
-        #logger.debug(str(url_alt))
-        
-        #quitamos el código de series, porque puede variar entre webs
+        # logger.debug(str(url_alt))
+
+        # We remove the series code, because it can vary between websites
         if item.action == "episodios" or item.action == "get_seasons" or item.action == "update_tvshow":
-            item.url = re.sub(r'\/\d+\/?$', '', item.url)   #parece que con el título solo ecuentra la serie, normalmente...
-            url_alt = [item.url]    #salvamos la url para el bucle, pero de momento ignoramos la inicial con código de serie
-        
-        #si es un episodio, generalizamos la url para que se pueda encontrar en otro clone.  Quitamos la calidad del final de la url
+            item.url = re.sub(r'\/\d+\/?$', '', item.url)   # it seems that with the title only finds the series, usually ...
+            url_alt = [item.url]    # we save the url for the loop, but for now we ignore the initial with serial code
+
+        # if it is an episode, we generalize the url so that it can be found in another clone. We remove the quality from the end of the url
         elif item.action == "findvideos" and item.contentType == "episode":
             try:
-                #quitamos el 0 a la izquierda del episodio.  Algunos clones no lo aceptan
-                inter1, inter2, inter3 = scrapertools.find_single_match(item.url, '(http.*?\/temporada-\d+.*?\/capitulo.?-)(\d+)(.*?\/)')
+                # We remove the 0 to the left of the episode. Some clones do not accept it
+                inter1, inter2, inter3 = scrapertools.find_single_match(item.url, r'(http.*?\/temporada-\d+.*?\/capitulo.?-)(\d+)(.*?\/)')
                 inter2 = re.sub(r'^0', '', inter2)
                 if inter1 + inter2 + inter3 not in url_alt:
                     url_alt += [inter1 + inter2 + inter3]
-                
-                #en este formato solo quitamos la calidad del final de la url
-                if scrapertools.find_single_match(item.url, 'http.*?\/temporada-\d+.*?\/capitulo.?-\d+.*?\/') not in url_alt:
-                    url_alt += [scrapertools.find_single_match(item.url, 'http.*?\/temporada-\d+.*?\/capitulo.?-\d+.*?\/')]
-            except:
-                logger.error("ERROR 88: " + item.action + ": Error al convertir la url: " + item.url)
-                logger.error(traceback.format_exc())
-            logger.debug('URLs convertidas: ' + str(url_alt))
 
-        if patron == True:                                  #solo nos han pedido verificar el clone
-            return (item, data)                             #nos vamos, con un nuevo clone
-        
-        #Leemos la nueva url.. Puede haber varias alternativas a la url original
+                # in this format we only remove the quality from the end of the url
+                if scrapertools.find_single_match(item.url, r'http.*?\/temporada-\d+.*?\/capitulo.?-\d+.*?\/') not in url_alt:
+                    url_alt += [scrapertools.find_single_match(item.url, r'http.*?\/temporada-\d+.*?\/capitulo.?-\d+.*?\/')]
+            except:
+                logger.error("ERROR 88: " + item.action + ": Error converting url: " + item.url)
+                logger.error(traceback.format_exc())
+            logger.debug('Converted URLs: ' + str(url_alt))
+
+        if patron == True:                                  # we have only been asked to verify the clone
+            return (item, data)                             # we leave, with a new clone
+
+        # We read the new url .. There may be several alternatives to the original url
         for url in url_alt:
             try:
                 if item.post:
@@ -1628,12 +1439,12 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
             except:
                 data = ''
                 logger.error(traceback.format_exc())
-            if not data:                                    #no ha habido suerte, probamos con la siguiente url
-                logger.error("ERROR 01: " + item.action + ": La Web no responde o la URL es erronea: " + url)
+            if not data:                                    # no luck, we try the following url
+                logger.error("ERROR 01: " + item.action + ": The Web does not respond or the URL is wrong: " + url)
                 continue
-        
-            #Hemos logrado leer la web, validamos si encontramos un línk válido en esta estructura
-            #Evitar páginas engañosas que puede meter al canal en un loop infinito
+
+            # We have managed to read the web, we validate if we find a valid link in this structure
+            # Avoid misleading pages that can put the channel in an infinite loop
             if (not ".com/images/no_imagen.jpg" in data and not ".com/images/imagen-no-disponible.jpg" in data) or item.action != "episodios":
                 if patron:
                     data_alt = scrapertools.find_single_match(data, patron)
@@ -1645,38 +1456,25 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
                                 data_alt = scrapertools.find_single_match(data_comillas, patron_alt)
                     if patron2 != None:
                         data_alt = scrapertools.find_single_match(data_alt, patron2)
-                if not data_alt:                            #no ha habido suerte, probamos con el siguiente canal
-                    logger.error("ERROR 02: " + item.action + ": Ha cambiado la estructura de la Web: " + url + " / Patron: " + patron + " / " +patron_alt)
+                if not data_alt:                            # no luck, we tried the next channel
+                    logger.error("ERROR 02: " + item.action + ": The structure of the Web has changed: " + url + " / Patron: " + patron + " / " +patron_alt)
                     web_intervenida(item, data)
                     data = ''
                     continue
-                else:
-                    #Función especial para encontrar en otro clone un .torrent válido
-                    if verify_torrent == 'torrent:check:status':
-                        from core import videolibrarytools
-                        if not data_alt.startswith("http"):                     #Si le falta el http.: lo ponemos
-                            data_alt = scrapertools.find_single_match(item.channel_host, '(\w+:)//') + data_alt
-                        if videolibrarytools.verify_url_torrent(data_alt):      #verificamos si el .torrent existe
-                            item.url = url                                      #guardamos la url que funciona
-                            break                           #nos vamos, con la nueva url del .torrent verificada
-                        data = ''
-                        continue                                                #no vale el .torrent, continuamos
-                    item.url = url                          #guardamos la url que funciona, sin verificar
-                    break                                   #por fin !!!  Este canal parece que funciona
             else:
-                logger.error("ERROR 02: " + item.action + ": Ha cambiado la estructura de la Web: " + url + " / Patron: " + patron + " / " +patron_alt)
+                logger.error("ERROR 02: " + item.action + ": The structure of the Web has changed: " + url + " / Patron: " + patron + " / " +patron_alt)
                 web_intervenida(item, data)
                 data = ''
                 continue
-                
-        if not data:                                        #no ha habido suerte, probamos con el siguiente clone
+
+        if not data:                                        # no luck, we tried the following clone
             url_alt = []
             continue
         else:
             break
-    
-    del item.extra2                                         #Borramos acción temporal excluyente
-    if not data:                                            #Si no ha logrado encontrar nada, salimos limpiando variables
+
+    del item.extra2                                         # We delete exclusive temporary action
+    if not data:                                            # If you have not found anything, we leave cleaning variables
         if item.channel == channel_py:
             if item.channel_alt:
                 item.category = item.channel_alt.capitalize()
@@ -1685,861 +1483,270 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
             if item.channel_alt:
                 item.channel = item.channel_alt
                 del item.channel_alt
-        if item.url_alt: 
+        if item.url_alt:
             item.url = item.url_alt
             del item.url_alt
         item.channel_host = channel_host_failed
-    
-    #logger.debug(item)
-    
+
+    # logger.debug(item)
+
     return (item, data)
 
-    
-def verify_channel(channel):
-    return channel
-    #Lista con los datos de los canales alternativos
-    #Cargamos en .json del canal para ver las listas de valores en settings
-    # clones = channeltools.get_channel_json(channel_py)
-    # for settings in clones['settings']:                             #Se recorren todos los settings
-    #     if settings['id'] == "clonenewpct1_channels_list":          #Encontramos en setting
-    #         clones = settings['default']                            #Carga lista de clones
-    #         channel_alt = "'%s'" % channel
-    #         if channel_alt in clones:                               #Si es un clon se pone como canal newpct1, si no se deja
-    #             channel = channel_py
-    #         return channel
-    
-    
+
 def web_intervenida(item, data, desactivar=True):
     logger.info()
-    
+
     """
-        
-    Llamada para verificar si la caída de un clone de Newpct1 es debido a una intervención judicial
-    
-    La llamada al método desde  es:
-    
+
+    Call to verify if the crash of a Newpct1 clone is due to judicial intervention
+
+    The method call from is:
+
         from lib import generictools
-        item = generictools.web_intervenida(item, data[, desactivar=True])
-        
-        - Entrada:  data: resultado de la descarga.  Nos permite analizar si se trata de una intervención
-        - Entrada:  desactivar=True:  indica que desactiva el canal o clone en caso de intervención judicial
-        - Salida:   item.intervencion: devuele un array con el nombre del clone intervenido y el thumb de la autoridad que interviene.  El canal puede anunciarlo.
-        - Salida:   Si es un clone de Newpct1, se desactiva el clone en el .json del Canal.  Si es otro canal, se desactiva el canal en su .json.
-    
+        item = generictools.web_intervened (item, data [, disable = True])
+
+        - Entry: data: result of the download. It allows us to analyze if it is an intervention
+        - Input: disable = True: indicates that you disable the channel or clone in case of judicial intervention
+        - Output: item.intervention: return an array with the name of the intervened clone and the thumb of the intervening authority. The channel can announce it.
+        - Output: If it is a clone of Newpct1, the clone is disabled in the Channel's .json. If it's another channel, the channel in your .json is disabled.
+
     """
-    
+
     intervencion = ()
     judicial = ''
 
-    #Verificamos que sea una intervención judicial
+    # We verify that it is a judicial intervention
     if intervenido_policia in data or intervenido_guardia in data or intervenido_sucuri in data:
         if intervenido_guardia in data:
-            judicial = 'intervenido_gc.png'                             #thumb de la Benemérita
+            judicial = 'intervenido_gc.png'                             # thumb of the Benemérita
         if intervenido_policia in data:
-            judicial = 'intervenido_pn.jpeg'                            #thumb de la Policia Nacional
+            judicial = 'intervenido_pn.jpeg'                            # thumb of the National Police
         if intervenido_sucuri in data:
-            judicial = 'intervenido_sucuri.png'                         #thumb de Sucuri
+            judicial = 'intervenido_sucuri.png'                         # thumb of Juices
         category = item.category
         if not item.category:
             category = item.channel
-        intervencion = (category, judicial)                     #Guardamos el nombre canal/categoría y el thumb judicial
+        intervencion = (category, judicial)                     # We keep the channel / category name and the judicial thumb
         if not item.intervencion:
-            item.intervencion = []                                      #Si no existe el array, lo creamos
-        item.intervencion += [intervencion]                             #Añadimos esta intervención al array
-        
-        logger.error("ERROR 99: " + category + ": " + judicial + ": " + item.url + ": DESACTIVADO=" + str(desactivar) + " / DATA: " + data)
-        
-        if desactivar == False:                                         #Si no queremos desactivar el canal, nos vamos
+            item.intervencion = []                                      # If the array does not exist, we create it
+        item.intervencion += [intervencion]                             # We add this intervention to the array
+
+        logger.error("ERROR 99: " + category + ": " + judicial + ": " + item.url + ": DISABLED=" + str(desactivar) + " / DATA: " + data)
+
+        if desactivar == False:                                         # If we don't want to disable the channel, we go
             return item
-        
-        #Cargamos en .json del canal para ver las listas de valores en settings.  Carga las claves desordenadas !!!
+
+        # We load in .json of the channel to see the lists of values ​​in settings. Load the cluttered keys !!!
         from core import filetools
         import json
         json_data = channeltools.get_channel_json(item.channel)
-        
-        if item.channel == channel_py:                                  #Si es un clone de Newpct1, lo desactivamos
-            for settings in json_data['settings']:                      #Se recorren todos los settings
-                if settings['id'] == "clonenewpct1_channels_list":      #Encontramos en setting
-                    action_excluded = scrapertools.find_single_match(settings['default'], "\('\d', '%s', '[^']+', '[^']*', '([^']*)'\)" % item.category.lower())               #extraemos el valor de action_excluded
+
+        if item.channel == channel_py:                                  # If it's a clone of Newpct1, we disable it
+            for settings in json_data['settings']:                      # All settings are scrolled
+                if settings['id'] == "clonenewpct1_channels_list":      # We found in setting
+                    action_excluded = scrapertools.find_single_match(settings['default'], r"\('\d', '%s', '[^']+', '[^']*', '([^']*)'\)" % item.category.lower())               #extraemos el valor de action_excluded
                     if action_excluded:
                         if "intervenido" not in action_excluded:
-                            action_excluded += ', %s' % judicial        #Agregamos el thumb de la autoridad judicial
+                            action_excluded += ', %s' % judicial        # We add the thumb of the judicial authority
                     else:
                         action_excluded = '%s' % judicial
-                        
-                    #Reemplazamos el estado a desactivado y agregamos el thumb de la autoridad judicial
+
+                    # We replace the status to disabled and add the thumb of the judicial authority
                     settings['default'] = re.sub(r"\('\d', '%s', ('[^']+', '[^']*'), '[^']*'\)" % item.category.lower(),  r"('0', '%s', \1, '%s')" % (item.category.lower(), action_excluded), settings['default'])
 
                     break
         else:
-            #json_data['active'] = False                                 #Se desactiva el canal
-            json_data['thumbnail'] = ', thumb_%s' % judicial            #Guardamos el thumb de la autoridad judicial
+            # json_data['active'] = False                               # Channel is disabled
+            json_data['thumbnail'] = ', thumb_%s' % judicial            # We keep the thumb of the judicial authority
 
-        #Guardamos los cambios hechos en el .json
+        # We save the changes made in the .json
         try:
             if item.channel != channel_py:
-                disabled = config.set_setting('enabled', False, item.channel)           #Desactivamos el canal
-                disabled = config.set_setting('include_in_global_search', False, item.channel)      #Lo sacamos de las búquedas globales
+                disabled = config.set_setting('enabled', False, item.channel)           # We deactivate the channel
+                disabled = config.set_setting('include_in_global_search', False, item.channel)      # We get it out of global searches
             channel_path = filetools.join(config.get_runtime_path(), "channels", item.channel + ".json")
-            with open(channel_path, 'w') as outfile:                                    #Grabamos el .json actualizado
+            with open(channel_path, 'w') as outfile:                                    # We record the updated .json
                 json.dump(json_data, outfile, sort_keys = True, indent = 2, ensure_ascii = False)
         except:
-            logger.error("ERROR 98 al salvar el archivo: %s" % channel_path)
+            logger.error("ERROR 98 when saving the file: %s" % channel_path)
             logger.error(traceback.format_exc())
 
-    #logger.debug(item)
-    
+    # logger.debug(item)
+
     return item
 
-    
-def redirect_clone_newpct1(item, head_nfo=None, it=None, path=False, overwrite=False, lookup=False):
-    # logger.info()
-    #
-    # """
-    #
-    # Llamada para redirigir cualquier llamada a un clone de NewPct1 a NewPct1.py, o de una url de un canal caido a una alternativa
-    # Incluye las llamadas estándar del canal y la llamadas externas:
-    #     - Play fron Library
-    #     - Videolibrary Update
-    #
-    # La lógica es reemplazar item.channel por "newpct1" y dejar el nombre del clone en item.category.
-    # De esta forma utiliza siempre el código de NewPct1.py, aunque con las urls y apariencia del clone seleccionado por el usuario.
-    #
-    # En el caso de un canal/clone caído o intervenido judicialmente, puede reemplazar el canal en item.channel, o el clone en item.category, y la parte de item.url que se introduzca en una tabla.  Esta conversión sólo se realiza si el canal original está inactivo, pero lo realiza siempre para los clones, o si el canal de origen y destino son los mismos.
-    #
-    # Este método interroga el .json de NewPct1 para extraer la lista de canales clones.  Si item.channel es un clone de NewPct1 y está en esa lista, actualiza item.channel='newpct1'
-    #
-    # También en este .json está la tabla para la conversión de canales y urls:
-    #     - activo:       está o no activa esta entrada
-    #     - canal_org:    canal o clone de origen
-    #     - canal_des:    canal o clone de destino (puede ser el mismo)
-    #     - url_org:      parte de la url a sustituir de canal o clone de origen
-    #     - url_des:      parte de la url a sustituir de canal o clone de destino
-    #     - patron1:      expresión Regex aplicable a la url (opcional)
-    #     - patron2:      expresión Regex aplicable a la url (opcional)
-    #     - patron3:      expresión Regex aplicable a la url (opcional)
-    #     - patron4:      expresión Regex aplicable a la url (opcional)
-    #     - patron5:      expresión Regex aplicable a la url (opcional)
-    #     - content_inc:  contenido al que aplica esta entrada, o * (item.contentType o item.extra)
-    #     - content_exc:  contenido que se excluye de esta entrada (item.contentType) (opcional).  opción para 'emerg'
-    #     - ow_force:     indicador para la acción de "service.py".  Puede crear la variable item.ow_force:
-    #                         - force:    indica al canal que analize toda la serie y que service la reescriba
-    #                         - auto:     indica a service que la reescriba
-    #                         - no:       no acción para service, solo redirige en visionado de videolibrary
-    #                         - del:      borra las estrucuturas de un determinado canal en service, quizás creadas por errores de un canal
-    #                         - emerg:    funcionalidad muy similar a la de "del".  se general dinámicamente cada vez que entra un canal con el estado activado en el .json de "emergency_urls".  Permite cargar las urls de emergencia en todos los elementos existentes de la Videoteca para canal afectado
-    #     ejemplos:
-    #     ('1', 'mejortorrent', 'mejortorrent1', 'http://www.mejortorrent.com/', 'https://mejortorrent1.com/', '(http.?:\/\/.*?\/)', 'http.?:\/\/.*?\/.*?-torrent.?-[^-]+-(?:[^-]+-)([^0-9]+-)', 'http.?:\/\/.*?\/.*?-torrent.?-[^-]+-(?:[^-]+-)[^0-9]+-\\d+-(Temporada-).html', 'http.?:\/\/.*?\/.*?-torrent.?-[^-]+-(?:[^-]+-)[^0-9]+-(\\d+)-', '', 'tvshow, season', '', 'force'),
-    #     ('1', 'mejortorrent', 'mejortorrent1', 'http://www.mejortorrent.com/', 'https://mejortorrent1.com/', '(http.?:\/\/.*?\/)', 'http.?:\/\/.*?\/.*?-torrent.?-[^-]+-([^.]+).html', '', '', '', 'movie', '', 'force')",
-    #     ('1', 'torrentrapid', 'torrentlocura', 'http://torrentrapid.com/', 'http://torrentlocura.com/', '', '', '', '', '', '*', '', 'no'),
-    #     ('1', 'newpct1', '', '', '', '', '', '', '', '', '*', '', 'del'),
-    #     ('1', 'torrentrapid', 'torrentrapid', '', '', '', '', '', '', '', '*', '1 ó 2', 'emerg'),
-    #
-    # La llamada recibe el parámetro Item, el .nfo y los devuleve actualizados, así como opcionalmente el parámetro "overwrite· que puede forzar la reescritura de todos los archivos de la serie, y el parámetro "path" si viene de service.  Por último, recibe opcionalmente el parámetro "lookup" si se quiere solo averigurar si habrá migración para ese título, pero sin realizarla.
-    #
-    # """
-    # #logger.debug(item)
-    # #if it != None: logger.debug(it)
-    # if not it:
-    #     it = Item()
-    # item_back = item.clone()
-    # it_back = item.clone()
-    # ow_force_param = True
-    # update_stat = 0
-    # delete_stat = 0
-    # canal_org_des_list = []
-    # json_path_list = []
-    # emergency_urls_force = False
-    # status_migration =  False
-    #
-    # #if item.ow_force == '1':                                       #Ha podido qudar activado de una pasada anteriores
-    # #    del item.ow_force
-    # #    logger.error('** item.ow_force: ' + item.path)             #aviso que ha habido una incidencia
-    # if it.ow_force == '1':                                          #Ha podido quedar activado de una pasada anterior
-    #     del it.ow_force
-    #     if path and it.infoLabels['mediatype'] == 'tvshow':
-    #         try:
-    #             nfo = filetools.join(path, '/tvshow.nfo')
-    #             filetools.write(nfo, head_nfo + it.tojson())                #escribo el .nfo de la peli por si aborta update
-    #             logger.error('** .nfo ACTUALIZADO: it.ow_force: ' + nfo)    #aviso que ha habido una incidencia
-    #         except:
-    #             logger.error('** .nfo ERROR actualizar: it.ow_force: ' + nfo)   #aviso que ha habido una incidencia
-    #             logger.error(traceback.format_exc())
-    #
-    # #Array con los datos de los canales alternativos
-    # #Cargamos en .json de Newpct1 para ver las listas de valores en settings
-    # fail_over_list = channeltools.get_channel_json(channel_py)
-    # for settings in fail_over_list['settings']:                             #Se recorren todos los settings
-    #     if settings['id'] == "clonenewpct1_channels_list":                  #Encontramos en setting
-    #         fail_over_list = settings['default']                            #Carga lista de clones
-    #     if settings['id'] == "intervenidos_channels_list":                  #Encontramos en setting
-    #         intervencion = settings['default']                              #Carga lista de clones y canales intervenidos
-    #
-    # #primero tratamos los clones de Newpct1
-    # channel_alt = item.channel
-    # #if item.url and not it.library_urls:
-    # #    channel_alt = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').lower()     #Salvamos en nombre del canal o clone
-    # #    if not channel_alt:
-    # #        channel_alt = item.channel
-    # channel = "'%s'" % channel_alt
-    # category = ''
-    # if channel_alt != 'videolibrary':
-    #     item.category = channel_alt.capitalize()
-    #     category = "'%s'" % channel_alt
-    # channel_py_alt = 'xyz123'
-    # if channel in fail_over_list :                      #Si es un clone de Newpct1, se actualiza el canal y la categoría
-    #     item.channel = channel_py
-    #     channel_py_alt = "'%s'" % channel_py
-    #     if item.channel_host:                                               #y se borran resto de pasadas anteriores
-    #         del item.channel_host
-    #
-    # if it.emergency_urls:
-    #     item.emergency_urls = it.emergency_urls                             #Refrescar desde el .nfo
-    #
-    # #Analizamos si hay series o películas que migrar, debido a que se ha activado en el .json del canal la opción "guardar"
-    # #"emergency_urls = 1", y hay que calcularla para todos los episodios y película existentes en la Videoteca.
-    # #Si "emergency_urls" está activada para uno o más canales, se verifica en el .nfo del vídeo si ya se ha realizado
-    # #la carga de las urls de emergencia.  Sí se ha hecho, se ignora el proceso de conversión.  Si no, se convierte por el
-    # #canal en curso cuando hay item.url, o para todos los canales en item.library_urls si no hay un canal específico en curso.
-    # #El mecanismo consiste en generar una regla temporal de migración para cada canal activado.  Esta regla actua borrando
-    # #todos los .json de la serie/película.  En el caso de la serie, el proceso de actualización de la videoteca los regenerará
-    # #automáticamente.  En el caso de peliculas, se general aquí el json actualizado y se marca el .nfo como actualizado.
-    # #Cuando en el .json se activa "Borrar", "emergency_urls = 2", se borran todos los enlaces existentes
-    # #Cuando en el .json se activa "Actualizar", "emergency_urls = 3", se actualizan todos los enlaces existentes
-    #
-    # """
-    # status_migration = regenerate_clones()                          #TEMPORAL: Reparación de Videoteca con Newpct1
-    #
-    # verify_cached_torrents()                                        #TEMPORAL: verificamos si los .torrents son correctos
-    # try:                                                            #Si ha habido errores, vemos la lista y los reparamos
-    #     json_error_path = filetools.join(config.get_runtime_path(), 'error_cached_torrents.json')
-    #     if filetools.exists(json_error_path):                               #hay erroer que hay que reparar?
-    #         from core import jsontools
-    #         json_error_file = jsontools.load(filetools.read(json_error_path))   #Leemos la lista de errores
-    #         if not json_error_file:
-    #             filetools.remove(json_error_path)                           #si ya no quedan errores, borramos el .json
-    #         elif path in json_error_file:                                   #está este títu,o en la lista de errores?
-    #             json_error_file.pop(path)                                   #sí.  Lo quitamos
-    #             if not json_error_file:
-    #                 filetools.remove(json_error_path)                       #si ya no quedan errores, borramos el .json
-    #             else:
-    #                 filetools.write(json_error_path, jsontools.dump(json_error_file))   #si quedan, actualizamos el .json
-    #             if item.contentType == 'movie':                             #si es una pelicula, forzamos su actualización
-    #                 emergency_urls_force = True
-    #             else:                                                       #si es una serie, que regenere los episodios que faltan (en error)
-    #                 item.ow_force = '1'                                     #... de todas las temporadas
-    # except:
-    #     logger.error('Error en el proceso de REPARACION de vídeos con .torrents dañados')
-    #     logger.error(traceback.format_exc())
-    #
-    # #Arreglo temporal para Newpct1
-    # try:
-    #     if channel in fail_over_list or channel_alt == 'videolibrary':
-    #         channel_bis = channel_py
-    #         if not item.url and it.library_urls and channel_alt == 'videolibrary':
-    #             for canal_vid, url_vid in it.library_urls.items():              #Se recorre "item.library_urls" para buscar canales candidatos
-    #                 canal_vid_alt = "'%s'" % canal_vid
-    #                 if canal_vid_alt in fail_over_list:                         #Se busca si es un clone de newpct1
-    #                     channel_bis = channel_py
-    #                     channel_alt = canal_vid
-    #                     channel = "'%s'" % channel_alt
-    #                     break
-    #                 else:
-    #                     channel_bis = canal_vid
-    #         if channel_bis == channel_py and config.get_setting("emergency_urls", channel_bis) == 1 and config.get_setting("emergency_urls_torrents", channel_bis) and item.emergency_urls and item.emergency_urls.get(channel_alt, False):
-    #             raiz, carpetas_series, ficheros = filetools.walk(path).next()
-    #             objetivo = '[%s]_01.torrent' % channel_alt
-    #             encontrado = False
-    #             for fichero in ficheros:
-    #                 if objetivo in fichero:
-    #                     encontrado = True
-    #                     break
-    #             if not encontrado:
-    #                 logger.error('REGENERANDO: ' + str(item.emergency_urls))
-    #                 item.emergency_urls.pop(channel_alt, None)
-    #     except:
-    #     logger.error('Error en el proceso de RECARGA de URLs de Emergencia')
-    #     logger.error(traceback.format_exc())
-    # """
-    #
-    # try:
-    #     if item.url and not channel_py in item.url and it.emergency_urls:       #Viene de actualización de videoteca de series
-    #         #Analizamos si el canal ya tiene las urls de emergencia: guardar o borrar
-    #         if (config.get_setting("emergency_urls", item.channel) == 1 and (not item.emergency_urls or (item.emergency_urls and not item.emergency_urls.get(channel_alt, False)))) or (config.get_setting("emergency_urls", item.channel) == 2 and item.emergency_urls.get(channel_alt, False)) or config.get_setting("emergency_urls", item.channel) == 3 or emergency_urls_force:
-    #             intervencion += ", ('1', '%s', '%s', '', '', '', '', '', '', '', '*', '%s', 'emerg')" % (channel_alt, channel_alt, config.get_setting("emergency_urls", item.channel))
-    #
-    #     elif it.library_urls:                                                   #Viene de "listar peliculas´"
-    #         for canal_vid, url_vid in it.library_urls.items():                  #Se recorre "item.library_urls" para buscar canales candidatos
-    #             if canal_vid == channel_py:                                     #Si tiene Newcpt1 en canal, es un error
-    #                 continue
-    #             canal_vid_alt = "'%s'" % canal_vid
-    #             if canal_vid_alt in fail_over_list:                             #Se busca si es un clone de newpct1
-    #                 channel_bis = channel_py
-    #             else:
-    #                 channel_bis = canal_vid
-    #             #Analizamos si el canal ya tiene las urls de emergencia: guardar o borrar
-    #             if (config.get_setting("emergency_urls", channel_bis) == 1 and (not it.emergency_urls or (it.emergency_urls and not it.emergency_urls.get(canal_vid, False)))) or (config.get_setting("emergency_urls", channel_bis) == 2 and it.emergency_urls.get(canal_vid, False)) or config.get_setting("emergency_urls", channel_bis) == 3 or emergency_urls_force:
-    #                 intervencion += ", ('1', '%s', '%s', '', '', '', '', '', '', '', '*', '%s', 'emerg')" % (canal_vid, canal_vid, config.get_setting("emergency_urls", channel_bis))
-    # except:
-    #     logger.error('Error en el proceso de ALMACENAMIENTO de URLs de Emergencia')
-    #     logger.error(traceback.format_exc())
-    #
-    # #Ahora tratamos las webs intervenidas, tranformamos la url, el nfo y borramos los archivos obsoletos de la serie
-    # if (channel not in intervencion and channel_py_alt not in intervencion and category not in intervencion and channel_alt != 'videolibrary') or not item.infoLabels or status_migration:          #lookup o migración
-    #     return (item, it, overwrite)                                        #... el canal/clone está listado
-    #
-    # import ast
-    # intervencion_list = ast.literal_eval(intervencion)                      #Convertir a Array el string
-    # #logger.debug(intervencion_list)
-    #
-    # if lookup == True:
-    #     overwrite = False                                                   #Solo avisamos si hay cambios
-    # i = 0
-    # for activo, canal_org, canal_des, url_org, url_des, patron1, patron2, patron3, patron4, patron5, content_inc, content_exc, ow_force in intervencion_list:
-    #     i += 1
-    #     opt = ''
-    #     #Es esta nuestra entrada?
-    #     if activo == '1' and (canal_org == channel_alt or canal_org == item.category.lower() or channel_alt == 'videolibrary' or ow_force == 'del' or ow_force == 'emerg'):
-    #
-    #         if item.url:
-    #             logger.debug('INTERV. LIST: ' + str(intervencion_list[i-1]) + ' / CHANNEL: ' + str(channel_alt) + ' / URL: ' + str(item.url))
-    #
-    #         if ow_force == 'del' or ow_force == 'emerg':    #Si es un borrado de estructuras erroneas, hacemos un proceso aparte
-    #             canal_des_def = canal_des                   #Si hay canal de sustitución para item.library_urls, lo usamos
-    #             if not canal_des_def and canal_org in item.library_urls and len(item.library_urls) == 1:    #Si no, lo extraemos de la url
-    #                 canal_des_def = scrapertools.find_single_match(item.library_urls[canal_org], 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').lower()            #salvamos la url actual de la estructura a borrar
-    #             url_total = ''
-    #             if item.url:
-    #                 url_total = item.url                                    #Si existe item.url, lo salvamos para futuro uso
-    #             if item.library_urls and canal_org in item.library_urls:    #Si existe una entrada con el canal a borrar, lo procesamos
-    #                 if lookup == True:                                      #Queremos que el canal solo visualice sin migración?
-    #                     overwrite = True                                    #Avisamos que hay cambios
-    #                     continue
-    #                 logger.error('** REGLA: ' + canal_org + ', ' + canal_des+ ', ' + ow_force)
-    #                 logger.error('item.library_urls PREVIA: ' + str(item.library_urls))
-    #                 url_total = item.library_urls[canal_org]                #salvamos la url actual de la estructura a borrar
-    #                 url_total_status = False
-    #                 if len(item.library_urls) == 1 or canal_des:            #si el nuevo canal no existe ya...
-    #                     item.library_urls.update({canal_des_def: url_total})    #restauramos la url con el nuevo canal
-    #                     url_total_status = True                             #marcamos esta url como válida
-    #                     overwrite = True                                    #Le decimos que sobreescriba todos los .jsons
-    #                     item.ow_force = '1'                                 #Le decimos que revise todas las temporadas
-    #                 if len(item.library_urls) > 1 and ow_force == 'del':
-    #                     item.library_urls.pop(canal_org, None)              #borramos la url del canal a borrar
-    #                     overwrite = True                                    #Le decimos que sobreescriba todos los .jsons
-    #                     item.ow_force = '1'                                 #Le decimos que revise todas las temporadas
-    #                 if it.library_urls:
-    #                     it.library_urls = item.library_urls                 #lo salvamos en el .nfo, si lo hay
-    #
-    #                 if item.url and item.url == url_total and url_total_status == False:    #si la url es la del canal borrado...
-    #                     for canal_vid, url_vid in item.library_urls.items():
-    #                         canal_vid_alt = "'%s'" % canal_vid
-    #                         if canal_vid_alt not in intervencion:           #... la sustituimos por la primera válida
-    #                             item.url = url_vid
-    #                             break
-    #                     if canal_vid_alt in fail_over_list:         #Si es un clone de Newpct1, salvamos la nueva categoría
-    #                         item.category = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').lower()                                              #Salvamos categoría
-    #                     else:
-    #                         item.category = canal_vid.capitalize()          #si no, salvamos nueva categoría
-    #                 logger.error('item.library_urls ACTUALIZADA: ' + str(item.library_urls))
-    #
-    #             if lookup == False:                                         #si es migración completa...
-    #                 delete_stat += 1                                        #Ya hemos actualizado algo, o habrá que hacerlo...
-    #                 if ow_force == 'emerg': opt = content_exc               #Salvamos la opción de Guardar o Borrar enlaces
-    #                 canal_org_des_list += [(canal_org, canal_des, url_total, opt, ow_force)]     #salvamos el resultado para su proceso
-    #
-    #         else:
-    #             if channel_alt == 'videolibrary':                           #Viene de videolibrary.list_movies: IMPRESCINDIBLE
-    #                 for canal_vid, url_vid in item.library_urls.items():
-    #                     if canal_org != canal_vid:              #Miramos si canal_org de la regla está en item.library_urls
-    #                         continue
-    #                     else:
-    #                         channel_alt = canal_org                         #Sí, ponermos el nombre del canal de origen
-    #                         channel_b = "'%s'" % canal_org
-    #                         if channel_b in fail_over_list:                 #Si es un clone de Newpct1, se actualiza a newpct1
-    #                             channel_alt = channel_py
-    #                 if channel_alt == 'videolibrary':
-    #                     continue
-    #             if item.contentType == "list":                      #Si viene de Videolibrary, le cambiamos ya el canal
-    #                 if item.channel != channel_py:
-    #                     item.channel = canal_des                    #Cambiamos el canal.  Si es clone, lo hace el canal
-    #                     continue                                    #Salimos sin hacer nada más. item está casi vacío
-    #             if item.contentType not in content_inc and "*" not in content_inc:  #Está el contenido el la lista de incluidos
-    #                 continue
-    #             if item.contentType in content_exc:                         #Está el contenido excluido?
-    #                 continue
-    #             channel_enabled = 0
-    #             channel_enabled_alt = 1
-    #             if item.channel != channel_py:
-    #                 try:
-    #                     if channeltools.is_enabled(channel_alt): channel_enabled = 1    #Verificamos que el canal esté inactivo
-    #                     if config.get_setting('enabled', channel_alt) == False: channel_enabled_alt = 0
-    #                     channel_enabled = channel_enabled * channel_enabled_alt         #Si está inactivo en algún sitio, tomamos eso
-    #                 except:
-    #                     pass
-    #             if channel_enabled == 1 and canal_org != canal_des:         #Si el canal está activo, puede ser solo...
-    #                 continue                                                #... una intervención que afecte solo a una región
-    #             if ow_force == 'no' and it.library_urls:                    #Esta regla solo vale para findvideos...
-    #                 continue                                                #... salidmos si estamos actualizando
-    #             if lookup == True:                                  #Queremos que el canal solo visualice sin migración?
-    #                 if ow_force != 'no':
-    #                     overwrite = True                                    #Avisamos que hay cambios
-    #                 continue                                                #Salimos sin tocar archivos
-    #             url_total = ''
-    #             if item.url:
-    #                 url_total = item.url
-    #             elif not item.url and item.library_urls:
-    #                 url_total = item.library_urls[canal_org]
-    #             url_total = url_total.replace(url_org, url_des)                 #reemplazamos una parte de url
-    #             url = ''
-    #             if patron1:                                                     #Hay expresión regex?
-    #                 url += scrapertools.find_single_match(url_total, patron1)   #La aplicamos a url
-    #             if patron2:                                                     #Hay más expresión regex?
-    #                 url += scrapertools.find_single_match(url_total, patron2)   #La aplicamos a url
-    #             if patron3:                                                     #Hay más expresión regex?
-    #                 url += scrapertools.find_single_match(url_total, patron3)   #La aplicamos a url
-    #             if patron4:                                                     #Hay más expresión regex?
-    #                 url += scrapertools.find_single_match(url_total, patron4)   #La aplicamos a url
-    #             if patron5:                                                     #Hay más expresión regex?
-    #                 url += scrapertools.find_single_match(url_total, patron5)   #La aplicamos a url
-    #             if url:
-    #                 url_total = url                                     #Guardamos la suma de los resultados intermedios
-    #             if item.channel == channel_py or channel in fail_over_list:     #Si es Newpct1...
-    #                 if item.contentType == "tvshow":
-    #                     url_total = re.sub(r'\/\d+\/?$', '', url_total)         #parece que con el título encuentra la serie, normalmente...
-    #             update_stat += 1                                                #Ya hemos actualizado algo
-    #             canal_org_des_list += [(canal_org, canal_des, url_total, opt, ow_force)]   #salvamos el resultado para su proceso
-    #
-    # if update_stat > 0 or delete_stat > 0:                  #Ha habido alguna actualización o borrado?  Entonces salvamos
-    #     if (update_stat > 0 and path != False) or item.ow_force == '1':
-    #         logger.error('** Lista de Actualizaciones a realizar: ' + str(canal_org_des_list))
-    #     for canal_org_def, canal_des_def, url_total, opt_def, ow_force_def in canal_org_des_list:   #pasamos por todas las "parejas" cambiadas
-    #         url_total_def = url_total
-    #         if ow_force_def != 'del' and ow_force_def != 'emerg':
-    #             if item.url:
-    #                 item.url = url_total                                        #Salvamos la url convertida
-    #             if item.library_urls:
-    #                 item.library_urls.pop(canal_org_def, None)
-    #                 item.library_urls.update({canal_des_def: url_total})
-    #                 it.library_urls = item.library_urls
-    #             if item.channel != channel_py and item.channel != 'videolibrary':
-    #                 item.channel = canal_des_def                    #Cambiamos el canal.  Si es clone, lo hace el canal
-    #                 if channel_alt == item.category.lower():                    #Actualizamos la Categoría y si la tenía
-    #                     item.category = item.channel.capitalize()
-    #             if ow_force_def == 'force' and item.contentType != 'movie':     #Queremos que el canal revise la serie entera?
-    #                 item.ow_force = '1'                                         #Se lo decimos
-    #             if ow_force_def in ['force', 'auto']:                           #Sobreescribir la series?
-    #                 overwrite = True                                            #Sí, lo marcamos
-    #
-    #     if it.library_urls and path != False and ow_force_def != 'no':          #Continuamos si hay .nfo, path, y queremos actualizarlo
-    #         item.update_next = '1'
-    #         del item.update_next                                    #Borramos estos campos para forzar la actualización ya
-    #         it.update_next = '1'
-    #         del it.update_next
-    #
-    #         #Verificamos que las webs de los canales estén activas antes de borrar los .json, para asegurar que se pueden regenerar
-    #         i = 0
-    #         canal_org_des_list_ALT = []                                         #Creamos esta lista para salvar las parejas
-    #         canal_org_des_list_ALT.extend(canal_org_des_list)                   #... y borrar de la original las web caidas
-    #         for canal_org_def, canal_des_def, url_total, opt_def, ow_force_def in canal_org_des_list_ALT: #pasamos por las "parejas" a borrar
-    #             if "magnet:" in url_total or type(url_total) != str:    #Si la url es un Magnet, o es una lista, pasamos
-    #                 i += 1
-    #                 continue
-    #             try:
-    #                 response = httptools.downloadpage(url_total)
-    #             except:
-    #                 logger.error(traceback.format_exc())
-    #                 logger.error('Web ' + canal_des_def.upper() + ' ERROR.  Regla no procesada: ' + str(canal_org_des_list[i]))
-    #                 del canal_org_des_list[i]                                   #Borro regla
-    #                 continue                                                    #... y paso a la siguiente
-    #             if not response:
-    #                 logger.error('Web ' + canal_des_def.upper() + ' INACTIVA.  Regla no procesada: ' + str(canal_org_des_list[i]))
-    #                 del canal_org_des_list[i]                                   #Borro regla
-    #                 continue                                                    #... y paso a la siguiente
-    #             i += 1
-    #         if i == 0:
-    #             item = item_back.clone()                                        #Restauro las imágenes inciales
-    #             it = it_back.clone()
-    #             item.torrent_caching_fail = True                                #Marcamos el proceso como fallido
-    #             return (item, it, False)
-    #
-    #         # Listamos todos los ficheros de la serie, asi evitamos tener que comprobar si existe uno por uno
-    #         canal_erase_list = []
-    #         from core import videolibrarytools
-    #         raiz, carpetas_series, ficheros = filetools.walk(path).next()
-    #         ficheros = [filetools.join(path, f) for f in ficheros]      #Almacenamos la lista de archivos de la carpeta
-    #         #logger.error(ficheros)
-    #         for archivo in ficheros:
-    #             for canal_org_def, canal_des_def, url_total, opt_def, ow_force_def in canal_org_des_list: #pasamos por las "parejas" a borrar
-    #                 canal_erase = '[%s]' % canal_org_def
-    #                 canal_erase_alt = "'%s'" % canal_org_def
-    #                 canal_new = '[%s]' % canal_des_def
-    #                 archivo_alt = "'%s'" % scrapertools.find_single_match(archivo, '\[(\w+)\].json')
-    #                 if archivo_alt == "''": archivo_alt = "'xyz123'"
-    #                 #logger.error(canal_erase + canal_new + archivo + archivo_alt)
-    #                 #Borramos los .json que sean de los canal afectados, incluidos todos los de los clones de newpct1 si éste es el canal
-    #                 if canal_erase in archivo or (ow_force_def == 'emerg' and canal_erase_alt in fail_over_list and archivo_alt in fail_over_list and it.contentType != 'movie'):
-    #                     if canal_des_def and it.contentType == 'movie' and not '.torrent' in archivo:   #Si es película ...
-    #                         item_json = ''
-    #                         item_json = Item().fromjson(filetools.read(archivo))    #leemos el .json ante de borrarlo para salvar...
-    #                         if not item_json:                                   #error al leer el .json.  Algo no funciona...
-    #                             continue
-    #                         title = item_json.title                             #... el título con su formato
-    #                         language = item_json.language                       #... los idiomas, que no están en el .nfo
-    #                         wanted = item_json.wanted                           #... y wanted con el título original
-    #                         json_path = archivo.replace(canal_erase, canal_new) #Salvamos el path del .json para luego crearlo
-    #                         json_path_list += [(canal_org_def, canal_des_def, url_total, json_path, title, language, wanted, ow_force_def, opt_def, archivo)]
-    #                     filetools.remove(archivo)                               #Borramos el .json y el .torrent
-    #                     logger.error('** BORRAMOS: ' + str(archivo))
-    #                     if ow_force_def == 'del' or ow_force_def == 'emerg':    #Si la función es 'del' or 'emerg' ...
-    #                         overwrite = True                                    #Le decimos que sobreescriba todos los .jsons
-    #                         item.ow_force = '1'                                 #Le decimos que revise todas las temporadas
-    #
-    #             #Si se ha cambiado algo, se actualizan los .nfo
-    #             if it.nfo: del it.nfo                                           #Borramos variables innecesarias
-    #             if it.path: del it.path                                         #Borramos variables innecesarias
-    #             if it.text_color: del it.text_color                             #Borramos variables innecesarias
-    #             if item.contentType == "movie" and ".nfo" in archivo:           #Para películas
-    #                 archivo_nfo = archivo                                       #Guardamos el path del .nfo para futuro uso
-    #                 if it.ow_force: del it.ow_force
-    #                 filetools.write(archivo, head_nfo + it.tojson())            #escribo el .nfo de la peli
-    #             if item.contentType != "movie" and "tvshow.nfo" in archivo:
-    #                 archivo_nfo = archivo                                       #Guardamos el path del .nfo para futuro uso
-    #                 filetools.write(archivo, head_nfo + it.tojson())            #escribo el tvshow.nfo por si aborta update
-    #
-    #         #Aquí convertimos las películas.  Después de borrado el .json, dejamos que videolibrarytools lo regenere
-    #         if item.contentType == "movie":                                     #Dejamos que regenere el archivo .json
-    #             item_movie = item.clone()
-    #             if item_movie.ow_force: del item_movie.ow_force
-    #             item_movie.update_last = '1'
-    #             if item_movie.update_last: del item_movie.update_last
-    #             if item_movie.library_playcounts: del item_movie.library_playcounts     #Borramos lo que no es necesario en el .json
-    #             if item_movie.library_urls: del item_movie.library_urls
-    #             if item_movie.nfo: del item_movie.nfo
-    #             if item_movie.path: del item_movie.path
-    #             if item_movie.strm_path: del item_movie.strm_path
-    #             if item_movie.text_color: del item_movie.text_color
-    #             if item_movie.channel_host: del item_movie.channel_host
-    #             if not item_movie.context: item_movie.context = "['buscar_trailer']"
-    #             if not item_movie.extra: item_movie.extra = "peliculas"
-    #
-    #             if json_path_list:
-    #                 logger.error('** .json LIST: ' + str(json_path_list))
-    #             for canal_org_def, canal_des_def, url_total, json_path, title, language, wanted, ow_force_def, opt_def, archivo in json_path_list:                                      #pasamos por todos canales
-    #                 logger.error('** ESCRIBIMOS: ' + json_path)
-    #                 item_movie.emergency_urls = False
-    #                 del item_movie.emergency_urls
-    #                 item_movie.channel = canal_des_def                          #mombre del canal migrado
-    #                 if not item_movie.category: item_movie.category = canal_des_def.capitalize()        #categoría
-    #                 item_movie.url = url_total                                  #url migrada
-    #                 if title: item_movie.title = title                          #restaurmos el título con formato
-    #                 if language: item_movie.language = language                 #restaurmos los idiomas
-    #                 if wanted: item_movie.wanted = wanted                       #restaurmos wanted
-    #                 item_movie.added_replacing = canal_org_def                  #guardamos la traza del canal reemplazado
-    #
-    #                 if ow_force_def == 'emerg' and opt_def in ['1', '3']:       #Si era una op. para añadir/actualizar urls de emergencia ...
-    #                     item_movie = videolibrarytools.emergency_urls(item_movie, None, archivo)   #... ejecutamos "findvideos" del canal para obtenerlas
-    #                     if item_movie.channel_host: del item_movie.channel_host
-    #                     if item_movie.unify: del item_movie.unify
-    #                     if item_movie.extra2: del item_movie.extra2
-    #                     if item_movie.emergency_urls:                           #... si las hay ...
-    #                         if it.emergency_urls and not isinstance(it.emergency_urls, dict):
-    #                             del it.emergency_urls
-    #                         if not it.emergency_urls:                           #... lo actualizamos en el .nfo
-    #                             it.emergency_urls = dict()                      #... iniciamos la variable si no existe
-    #                         it.emergency_urls.update({canal_des_def: True})     #... se marca como activo
-    #                         if it.ow_force: del it.ow_force
-    #                         filetools.write(archivo_nfo, head_nfo + it.tojson())        #actualizo el .nfo de la peli
-    #                     else:
-    #                         logger.error('Error en FINDVIDEOS: ' + archivo + ' / Regla: ' + canal_org_def + ', ' + opt_def + ', ' + ow_force_def)
-    #
-    #                 if ow_force_def == 'emerg' and opt_def == '2':  #Si era una operación para borrar urls de emergencia ...
-    #                     if it.emergency_urls and not isinstance(it.emergency_urls, dict):
-    #                         del it.emergency_urls
-    #                     if it.emergency_urls and it.emergency_urls.get(item_movie.channel, False):
-    #                         it.emergency_urls.pop(item_movie.channel, None)     #borramos la entrada del .nfo
-    #                         if it.ow_force: del it.ow_force
-    #                         filetools.write(archivo_nfo, head_nfo + it.tojson())        #actualizo el .nfo de la peli
-    #
-    #                 filetools.write(json_path, item_movie.tojson())             #Salvamos el nuevo .json de la película
-    #
-    # if (update_stat > 0 and path != False and ow_force_def in ['force', 'auto']) or item.ow_force == '1' or len(json_path_list) > 0:
-    #     logger.error('ITEM cambiado')
-    #     if it.emergency_urls:
-    #         logger.error(it.emergency_urls)
-    #     logger.error(item)
-    #
-    # return (item, it, overwrite)
-    return item, item, False
-    
-
-def verify_cached_torrents():
-    logger.info()
-    import json
-    
-    """
-    Verifica que todos los archivos .torrent estén descomprimidos.  Si no lo están, los descomprime y regraba
-    
-    Método para uso temporal y controlado
-    
-    Deja el archivo verify_cached_torrents.json como marca de que se ha ejecutado para esa versión de Alfa
-    """
-    
-    try:
-        #Localiza los paths donde dejar el archivo .json de control, y de la Videoteca
-        json_path = filetools.exists(filetools.join(config.get_runtime_path(), 'verify_cached_torrents.json'))
-        if json_path:
-            logger.info('Torrents verificados anteriormente: NOS VAMOS')
-            return
-        json_path = filetools.join(config.get_runtime_path(), 'verify_cached_torrents.json')
-        json_error_path = filetools.join(config.get_runtime_path(), 'error_cached_torrents.json')
-        json_error_path_BK = filetools.join(config.get_runtime_path(), 'error_cached_torrents_BK.json')
-            
-        videolibrary_path = config.get_videolibrary_path()          #Calculamos el path absoluto a partir de la Videoteca
-        movies = config.get_setting("folder_movies")
-        series = config.get_setting("folder_tvshows")
-        torrents_movies = filetools.join(videolibrary_path, config.get_setting("folder_movies"))    #path de CINE
-        torrents_series = filetools.join(videolibrary_path, config.get_setting("folder_tvshows"))   #path de SERIES
-        
-        #Inicializa variables
-        torren_list = []
-        torren_list.append(torrents_movies)
-        torren_list.append(torrents_series)
-        i = 0
-        j = 0
-        k = 0
-        descomprimidos = []
-        errores = []
-        json_data = dict()
-        
-        #Recorre las carpetas de CINE y SERIES de la Videoteca, leyendo, descomprimiendo y regrabando los archivos .torrent
-        for contentType in torren_list:
-            for root, folders, files in filetools.walk(contentType):
-                for file in files:
-                    if not '.torrent' in file:
-                        continue
-                    i += 1
-                    torrent_file = ''
-                    torrent_path = filetools.join(root, file)
-                    torrent_file = filetools.read(torrent_path)
-                    if not scrapertools.find_single_match(torrent_file, '^d\d+:\w+\d+:'):
-                        logger.debug('Torrent comprimido: DESCOMPRIMIENDO: ' + str(torrent_path))
-                        try:
-                            torrent_file_deco = ''
-                            import zlib
-                            torrent_file_deco = zlib.decompressobj(16 + zlib.MAX_WBITS).decompress(torrent_file)
-                        except:
-                            k += 1
-                            errores += [torrent_path]
-                            logger.error(traceback.format_exc())
-                            logger.error('No es un archivo TORRENT. Archivo borrado: ' + str(torrent_path))
-                            if not json_data.get(root, False):
-                                json_data[root] = 'ERROR'
-                            if scrapertools.find_single_match(file, '^\d+x\d+'):
-                                torrent_json = re.sub(r'\]_\d+.torrent$', '].json', torrent_path)
-                                filetools.remove(torrent_json)
-                            filetools.remove(torrent_path)
-                            continue
-                                                
-                        if not scrapertools.find_single_match(torrent_file_deco, '^d\d+:\w+\d+:'):
-                            logger.error('Error de DESCOMPRESIÓN: ' + str(torrent_path))
-                            k += 1
-                            errores += [torrent_path]
-                        else:
-                            filetools.write(torrent_path, torrent_file_deco)
-                            j += 1
-                            descomprimidos += [torrent_path]
-                    else:
-                        #logger.info('Torrent OK.  No hace falta descompresión: ' + str(torrent_path))
-                        h = 0
-
-        if json_data:
-            filetools.write(json_error_path, json.dumps(json_data))
-        filetools.write(json_error_path_BK, json.dumps(json_data))
-        filetools.write(json_path, json.dumps({"torrent_verify": True}))
-    except:
-        logger.error('Error en el proceso de VERIFICACIÓN de los .torrents')
-        logger.error(traceback.format_exc())
-        
-    logger.error(str(i) + ' archivos .torrent revisados. / ' + str(j) + ' descomporimidos / ' + str(k) + ' errores')
-    if descomprimidos:
-        logger.error('Lista de .torrents DESCOMPRIMIDOS: ' + str(descomprimidos))
-    if errores:
-        logger.error('Lista de .torrents en ERROR: ' + str(errores))
-
 
 def regenerate_clones():
     logger.info()
     import json
     from core import videolibrarytools
-    
+
     """
-    Regenera los archivos .json que ha sido machacado con la migración.  También borrar los archivos tvshow.nfo en
-    películas.
-    
-    Método para uso temporal y controlado
+    Regenerate .json files that have been crushed with migration. Also delete tvshow.nfo files in films.
+
+    Temporary and controlled use method
     """
-    
+
     try:
-        #Localiza los paths donde dejar el archivo .json de control, y de la Videoteca
+        # Find the paths where to leave the control .json file, and the Video Library
         json_path = filetools.exists(filetools.join(config.get_runtime_path(), 'verify_cached_torrents.json'))
         if json_path:
-            logger.info('Videoteca reparada anteriormente: NOS VAMOS')
+            logger.info('Previously repaired video library: WE ARE GOING')
             return False
         json_path = filetools.join(config.get_runtime_path(), 'verify_cached_torrents.json')
-        filetools.write(json_path, json.dumps({"CINE_verify": True}))   #Evita que se lance otro proceso simultaneo
+        filetools.write(json_path, json.dumps({"CINE_verify": True}))   # Prevents another simultaneous process from being launched
         json_error_path = filetools.join(config.get_runtime_path(), 'error_cached_torrents.json')
         json_error_path_BK = filetools.join(config.get_runtime_path(), 'error_cached_torrents_BK.json')
-            
-        videolibrary_path = config.get_videolibrary_path()          #Calculamos el path absoluto a partir de la Videoteca
+
+        videolibrary_path = config.get_videolibrary_path()          # We calculate the absolute path from the Video Library
         movies = config.get_setting("folder_movies")
         series = config.get_setting("folder_tvshows")
-        torrents_movies = filetools.join(videolibrary_path, config.get_setting("folder_movies"))    #path de CINE
-        torrents_series = filetools.join(videolibrary_path, config.get_setting("folder_tvshows"))   #path de SERIES
-        
-        #Cargamos en .json de Newpct1 para ver las listas de valores en settings
+        torrents_movies = filetools.join(videolibrary_path, config.get_setting("folder_movies"))    # path of CINE
+        torrents_series = filetools.join(videolibrary_path, config.get_setting("folder_tvshows"))   # path the SERIES
+
+        # We load in .json from Newpct1 to see the lists of values ​​in settings
         fail_over_list = channeltools.get_channel_json(channel_py)
-        for settings in fail_over_list['settings']:                             #Se recorren todos los settings
-            if settings['id'] == "clonenewpct1_channels_list":                  #Encontramos en setting
-                fail_over_list = settings['default']                            #Carga lista de clones
-        
+        for settings in fail_over_list['settings']:                             # All settings are scrolled
+            if settings['id'] == "clonenewpct1_channels_list":                  # We found in setting
+                fail_over_list = settings['default']                            # Load list of clones
+
         #Inicializa variables
         torren_list = []
         torren_list.append(torrents_movies)
-        #torren_list.append(torrents_series)
+        # torren_list.append(torrents_series)
         i = 0
         j = 0
         k = 0
         descomprimidos = []
         errores = []
         json_data = dict()
-        
-        #Recorre las carpetas de CINE y SERIES de la Videoteca, leyendo, descomprimiendo y regrabando los archivos .torrent
+
+        # Browse the FILM and SERIES folders of the Video Library, reading, unzipping and rewriting the .torrent files
         for contentType in torren_list:
             for root, folders, files in filetools.walk(contentType):
                 nfo = ''
                 newpct1 = False
                 file_list = str(files)
                 logger.error(file_list)
-                
-                #Borra los archivos Tvshow.nfo y verifica si el .nfo tiene más de un canal y uno es clone Newpct1
+
+                # Delete the Tvshow.nfo files and check if the .nfo has more than one channel and one is clone Newpct1
                 for file in files:
-                    #logger.info('file - nfos: ' + file)
+                    # logger.info('file - nfos: ' + file)
                     if 'tvshow.nfo' in file:
                         file_path = filetools.join(root, 'tvshow.nfo')
                         filetools.remove(file_path)
                         continue
-                    
+
                     if '.nfo' in file:
                         peli_name = file.replace('.nfo', '')
                         nfo = ''
                         try:
                             head_nfo, nfo = videolibrarytools.read_nfo(filetools.join(root, file))
                         except:
-                            logger.error('** NFO: error de lectura en: ' + file)
+                            logger.error('** NFO: read error in: ' + file)
                             break
                         if not nfo:
-                            logger.error('** NFO: error de lectura en: ' + file)
+                            logger.error('** NFO: read error in: ' + file)
                             break
-                        if nfo.ow_force:                #Si tiene ow_force lo quitamos para evitar futuros problemas
+                        if nfo.ow_force:                # If you have ow_force we remove it to avoid future problems
                             del nfo.ow_force
                             try:
-                                filetools.write(filetools.join(root, file), head_nfo + nfo.tojson())    #actualizo el .nfo
+                                filetools.write(filetools.join(root, file), head_nfo + nfo.tojson())    # I update the .nfo
                             except:
-                                logger.error('** NFO: error de escritura en: ' + file)
+                                logger.error('** NFO: typing error in: ' + file)
                                 break
-                        
+
                         if '.torrent' not in file_list and nfo.emergency_urls:
-                            del nfo.emergency_urls                              #Si tiene emergency_urls, lo reseteamos
+                            del nfo.emergency_urls                              # If you have emergency_urls, we reset it
                             try:
-                                filetools.write(filetools.join(root, file), head_nfo + nfo.tojson())    #actualizo el .nfo
+                                filetools.write(filetools.join(root, file), head_nfo + nfo.tojson())    # I update the .nfo
                             except:
-                                logger.error('** NFO: error de escritura en: ' + file)
+                                logger.error('** NFO: typing error in: ' + file)
                                 break
-                            newpct1 = True                                      #marcamos par a resetar los .jsons
-                        
-                        if len(nfo.library_urls) > 1:                           #Tiene más de un canal?
+                            newpct1 = True                                      # we set to reset the .jsons
+
+                        if len(nfo.library_urls) > 1:                           # Do you have more than one channel?
                             for canal, url in nfo.library_urls.items():
                                 canal_json = "[%s].json" % canal
-                                if canal_json not in file_list:                 #Canal zomby, lo borramos
+                                if canal_json not in file_list:                 # Zombie channel, we delete it
                                     logger.error('pop: ' + canal)
                                     nfo.library_urls.pop(canal, None)
                                     if nfo.emergency_urls:
-                                        del nfo.emergency_urls                  #Si tiene emergency_urls, lo reseteamos
+                                        del nfo.emergency_urls                  # If you have emergency_urls, we reset it
                                     try:
-                                        filetools.write(filetools.join(root, file), head_nfo + nfo.tojson())    #actualizo el .nfo
+                                        filetools.write(filetools.join(root, file), head_nfo + nfo.tojson())    # I update the .nfo
                                     except:
-                                        logger.error('** NFO: error de escritura en: ' + file)
+                                        logger.error('** NFO: typing error in: ' + file)
                                         break
-                                    newpct1 = True                              #marcamos par a resetar los .jsons
-                                
+                                    newpct1 = True                              # we set to reset the .jsons
+
                                 canal_nwepct1 = "'%s'" % canal
-                                if canal_nwepct1 in fail_over_list:             #Algún canal es clone de Newpct1
-                                    newpct1 = True                              #Si es que sí, lo marcamos
+                                if canal_nwepct1 in fail_over_list:             # Some channel is clone of Newpct1
+                                    newpct1 = True                              # If yes, we mark it
                                     if nfo.emergency_urls:
-                                        del nfo.emergency_urls                  #Si tiene emergency_urls, lo reseteamos
+                                        del nfo.emergency_urls                  # If you have emergency_urls, we reset it
                                         try:
-                                            filetools.write(filetools.join(root, file), head_nfo + nfo.tojson())    #actualizo el .nfo
+                                            filetools.write(filetools.join(root, file), head_nfo + nfo.tojson())    # I update the .nfo
                                         except:
-                                            logger.error('** NFO: error de escritura en: ' + file)
+                                            logger.error('** NFO: typing error in: ' + file)
                                             break
 
-                #Zona para arrelgar los archivos .json
+                # Area to fill the .json files
                 if not newpct1:
                     continue
                 for file in files:
                     file_path = filetools.join(root, file)
                     if '.json' in file:
                         logger.info('** file: ' + file)
-                        canal_json = scrapertools.find_single_match(file, '\[(\w+)\].json')
+                        canal_json = scrapertools.find_single_match(file, r'\[(\w+)\].json')
                         if canal_json not in nfo.library_urls:
-                            filetools.remove(file_path)                             #borramos el .json es un zomby
+                            filetools.remove(file_path)                             # we delete the .json is a zombie
                         item_movie = ''
                         try:
-                            item_movie = Item().fromjson(filetools.read(file_path)) #leemos el .json
+                            item_movie = Item().fromjson(filetools.read(file_path)) # we read the .json
                         except:
-                            logger.error('** JSON: error de lectura en: ' + file)
+                            logger.error('** JSON: read error in: ' + file)
                             continue
                         if not item_movie:
-                            logger.error('** JSON: error de lectura en: ' + file)
+                            logger.error('** JSON: read error in: ' + file)
                             continue
                         if item_movie.emergency_urls: del item_movie.emergency_urls
-                        item_movie.channel = canal_json                             #mombre del canal
-                        item_movie.category = canal_json.capitalize()               #categoría
-                        item_movie.url = nfo.library_urls[canal_json]               #url
-                        if scrapertools.find_single_match(item_movie.title, '(.*?)\[\d+.\d+\s*.\s*B\]'):
-                            item_movie.title = scrapertools.find_single_match(item_movie.title, '(.*?)\[\d+.\d+\s*.\s*B\]').strip()                                                 #quitamos Size
-                        if item_movie.added_replacing: del item_movie.added_replacing   #quitamos traza del canal reemplazado
+                        item_movie.channel = canal_json                             # channel name
+                        item_movie.category = canal_json.capitalize()               # category
+                        item_movie.url = nfo.library_urls[canal_json]               # url
+                        if scrapertools.find_single_match(item_movie.title, r'(.*?)\[\d+.\d+\s*.\s*B\]'):
+                            item_movie.title = scrapertools.find_single_match(item_movie.title, r'(.*?)\[\d+.\d+\s*.\s*B\]').strip()    # we remove Size
+                        if item_movie.added_replacing: del item_movie.added_replacing   # remove trace from the replaced channel
                         try:
-                            filetools.write(file_path, item_movie.tojson())         #Salvamos el nuevo .json de la película
+                            filetools.write(file_path, item_movie.tojson())         # We save the new .json from the movie
                         except:
-                            logger.error('** JSON: error de escritura en: ' + file)
+                            logger.error('** JSON: typing error in: ' + file)
                         else:
                             errores += [file]
                     if '.torrent' in file:
-                        filetools.remove(file_path)                                 #borramos los .torrent salvados
-                        
-                            
-        logger.error('** Lista de peliculas reparadas: ' + str(errores))
+                        filetools.remove(file_path)                                 # we delete the saved .torrent
+
+
+        logger.error('** List of movies repaireds: ' + str(errores))
         filetools.write(json_error_path, json.dumps(json_data))
         filetools.write(json_error_path_BK, json.dumps(json_data))
-        filetools.write(json_path, json.dumps({"CINE_verify": True}))                        
+        filetools.write(json_path, json.dumps({"CINE_verify": True}))
     except:
-        filetools.remove(json_path)                             #borramos el bloqueo para que se pueda lanzar de nuevo
-        logger.error('Error en el proceso de REPARACIÓN de Videoteca de CINE')
+        filetools.remove(json_path)                             # we delete the lock so that it can be launched again
+        logger.error('CINEMA Video Library REPAIR process error')
         logger.error(traceback.format_exc())
-    
+
     return True
 
-                            
+
 def dejuice(data):
     logger.info()
-    # Metodo para desobfuscar datos de JuicyCodes
-    
+    # Method to unobtrusive JuicyCodes data
+
     import base64
     from lib import jsunpack
 
-    juiced = scrapertools.find_single_match(data, 'JuicyCodes.Run\((.*?)\);')
+    juiced = scrapertools.find_single_match(data, r'JuicyCodes.Run\((.*?)\);')
     b64_data = juiced.replace('+', '').replace('"', '')
     b64_decode = base64.b64decode(b64_data)
     dejuiced = jsunpack.unpack(b64_decode)
@@ -2551,10 +1758,10 @@ def privatedecrypt(url, headers=None):
 
     data = httptools.downloadpage(url, headers=headers, follow_redirects=False).data
     data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    packed = scrapertools.find_single_match(data, '(eval\(.*?);var')
+    packed = scrapertools.find_single_match(data, r'(eval\(.*?);var')
     unpacked = jsunpack.unpack(packed)
-    server = scrapertools.find_single_match(unpacked, "src:.'(http://\D+)/")
-    id = scrapertools.find_single_match(unpacked, "src:.'http://\D+/.*?description:.'(.*?).'")
+    server = scrapertools.find_single_match(unpacked, r"src:.'(http://\D+)/")
+    id = scrapertools.find_single_match(unpacked, r"src:.'http://\D+/.*?description:.'(.*?).'")
     if server == '':
         if 'powvideo' in unpacked:
             id = scrapertools.find_single_match(unpacked, ",description:.'(.*?).'")
diff --git a/lib/unshortenit.py b/lib/unshortenit.py
index 68533247..19b60efe 100644
--- a/lib/unshortenit.py
+++ b/lib/unshortenit.py
@@ -577,6 +577,11 @@ class UnshortenIt(object):
             if not r:
                 r = httptools.downloadpage(uri, follow_redirect=True, timeout=self._timeout, cookies=False)
                 uri = r.url
+            if "4snip" in uri:
+                if 'out_generator' in uri:
+                    uri = re.findall('url=(.*)$', uri)[0]
+                elif '/decode/' in uri:
+                    uri = httptools.downloadpage(uri, follow_redirects=True).url
             return uri, r.code
 
         except Exception as e:
diff --git a/platformcode/config.py b/platformcode/config.py
index af2f0c2f..6bc4c661 100644
--- a/platformcode/config.py
+++ b/platformcode/config.py
@@ -462,3 +462,7 @@ def verify_directories_created():
         import traceback
         logger.error("When checking or creating the resolution folder")
         logger.error(traceback.format_exc())
+
+
+def get_online_server_thumb(server):
+    return "https://raw.github.com/kodiondemand/media/master/resources/servers/" + server.lower() + '.png'
\ No newline at end of file
diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index 07664798..ecf9a451 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -3,19 +3,9 @@
 # XBMC Launcher (xbmc / kodi)
 # ------------------------------------------------------------
 
-#from future import standard_library
-#standard_library.install_aliases()
-#from builtins import str
-import sys
+import sys, os
 PY3 = False
-if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
-
-# if PY3:
-#     import urllib.error as urllib2                              # It is very slow in PY2. In PY3 it is native
-# else:
-#     import urllib2                                              # We use the native of PY2 which is faster
-
-import os
+if sys.version_info[0] >= 3:PY3 = True; unicode = str; unichr = chr; long = int
 
 from core.item import Item
 from platformcode import config, logger, platformtools
@@ -65,11 +55,7 @@ def run(item=None):
                         config.get_localized_string(70137): 'peliculas',
                         config.get_localized_string(30123): 'series',
                         config.get_localized_string(30124): 'anime',
-                        config.get_localized_string(70018): 'infantiles',
                         config.get_localized_string(60513): 'documentales',
-                        config.get_localized_string(70013): 'terror',
-                        config.get_localized_string(70014): 'castellano',
-                        config.get_localized_string(59976): 'latino',
                         config.get_localized_string(70171): 'torrent',
                     }
                     if not config.get_setting("category") in dictCategory.keys():
@@ -142,7 +128,6 @@ def run(item=None):
             if tmdb.drop_bd():
                 platformtools.dialog_notification(config.get_localized_string(20000), config.get_localized_string(60011), time=2000, sound=False)
         elif item.action == "itemInfo":
-            import base64
             platformtools.dialog_textviewer('Item info', item.parent)
         elif item.action == "open_browser":
             import webbrowser
@@ -155,18 +140,10 @@ def run(item=None):
                         import urllib.request as urllib
                     except ImportError:
                         import urllib
-                    short = urllib.urlopen(
-                        'https://u.nu/api.php?action=shorturl&format=simple&url=' + item.url).read().decode('utf-8')
-                    platformtools.dialog_ok(config.get_localized_string(20000),
-                                            config.get_localized_string(70740) % short)
+                    short = urllib.urlopen('https://u.nu/api.php?action=shorturl&format=simple&url=' + item.url).read().decode('utf-8')
+                    platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(70740) % short)
         # Action in certain channel specified in "action" and "channel" parameters
         else:
-            # # Actualiza el canal individual
-            # if (item.action == "mainlist" and item.channel != "channelselector" and
-            #             config.get_setting("check_for_channel_updates") == True):
-            #     from core import updater
-            #     updater.update_channel(item.channel)
-
             # Checks if channel exists
             if os.path.isfile(os.path.join(config.get_runtime_path(), 'channels', item.channel + ".py")):
                 CHANNELS = 'channels'
@@ -181,8 +158,7 @@ def run(item=None):
 
             if os.path.exists(channel_file):
                 try:
-                    channel = __import__('%s.%s' % (CHANNELS, item.channel), None,
-                                         None, ['%s.%s' % (CHANNELS, item.channel)])
+                    channel = __import__('%s.%s' % (CHANNELS, item.channel), None, None, ['%s.%s' % (CHANNELS, item.channel)])
                 except ImportError:
                     exec("import " + CHANNELS + "." + item.channel + " as channel")
 
@@ -211,7 +187,7 @@ def run(item=None):
                             item.isFavourite = True
                         platformtools.play_video(item)
 
-                    # Permitir varias calidades desde play en el canal
+                    # Permitir varias calidades desde play en el Channel
                     elif len(itemlist) > 0 and isinstance(itemlist[0], list):
                         item.video_urls = itemlist
                         platformtools.play_video(item)
@@ -232,7 +208,6 @@ def run(item=None):
                 # First checks if channel has a "findvideos" function
                 if hasattr(channel, 'findvideos'):
                     itemlist = getattr(channel, item.action)(item)
-                    itemlist = servertools.filter_servers(itemlist)
 
                 # If not, uses the generic findvideos function
                 else:
@@ -310,32 +285,18 @@ def run(item=None):
 
                 platformtools.render_items(itemlist, item)
 
-    # except urllib2.URLError as e:
-    #     import traceback
-    #     logger.error(traceback.format_exc())
-    #
-    #     # Grab inner and third party errors
-    #     if hasattr(e, 'reason'):
-    #         logger.error("Reason for the error, code: %s | Reason: %s" % (str(e.reason[0]), str(e.reason[1])))
-    #         texto = config.get_localized_string(30050)  # "No se puede conectar con el sitio web"
-    #         platformtools.dialog_ok(config.get_localized_string(20000), texto)
-    #
-    #     # Grab server response errors
-    #     elif hasattr(e, 'code'):
-    #         logger.error("HTTP error code: %d" % e.code)
-    #         # "El sitio web no funciona correctamente (error http %d)"
-    #         platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(30051) % e.code)
+
     except WebErrorException as e:
         import traceback
         from core import scrapertools
 
         logger.error(traceback.format_exc())
 
-        patron = 'File "' + os.path.join(config.get_runtime_path(), "channels", "").replace("\\", "\\\\") + '([^.]+)\.py"'
-        canal = scrapertools.find_single_match(traceback.format_exc(), patron)
+        patron = 'File "' + os.path.join(config.get_runtime_path(), "channels", "").replace("\\", "\\\\") + r'([^.]+)\.py"'
+        Channel = scrapertools.find_single_match(traceback.format_exc(), patron)
 
         platformtools.dialog_ok(
-            config.get_localized_string(59985) + canal,
+            config.get_localized_string(59985) + Channel,
             config.get_localized_string(60013) %(e))
     except:
         import traceback
@@ -343,8 +304,8 @@ def run(item=None):
 
         logger.error(traceback.format_exc())
 
-        patron = 'File "' + os.path.join(config.get_runtime_path(), "channels", "").replace("\\", "\\\\") + '([^.]+)\.py"'
-        canal = scrapertools.find_single_match(traceback.format_exc(), patron)
+        patron = 'File "' + os.path.join(config.get_runtime_path(), "channels", "").replace("\\", "\\\\") + r'([^.]+)\.py"'
+        Channel = scrapertools.find_single_match(traceback.format_exc(), patron)
 
         try:
             import xbmc
@@ -356,15 +317,12 @@ def run(item=None):
         except:
             log_message = ""
 
-        if canal:
+        if Channel:
             if item.url:
-                if platformtools.dialog_yesno(config.get_localized_string(60087) % canal, config.get_localized_string(60014),
-                        log_message, nolabel='ok', yeslabel=config.get_localized_string(70739)):
+                if platformtools.dialog_yesno(config.get_localized_string(60087) % Channel, config.get_localized_string(60014), log_message, nolabel='ok', yeslabel=config.get_localized_string(70739)):
                     run(Item(action="open_browser", url=item.url))
             else:
-                platformtools.dialog_ok(config.get_localized_string(60087) % canal,
-                                           config.get_localized_string(60014),
-                                           log_message)
+                platformtools.dialog_ok(config.get_localized_string(60087) % Channel, config.get_localized_string(60014), log_message)
         else:
             platformtools.dialog_ok(
                 config.get_localized_string(60038),
@@ -384,8 +342,7 @@ def reorder_itemlist(itemlist):
     modified = 0
     not_modified = 0
 
-    to_change = [[config.get_localized_string(60335), '[V]'],
-                 [config.get_localized_string(60336), '[D]']]
+    to_change = [[config.get_localized_string(60335), '[V]'], [config.get_localized_string(60336), '[D]']]
 
     for item in itemlist:
         if not PY3:
@@ -441,7 +398,6 @@ def limit_itemlist(itemlist):
 
 
 def play_from_library(item):
-    itemlist=[]
     """
         The .strm files when played from kodi, this expects it to be a "playable" file so it cannot contain
         more items, at most a selection dialog can be placed.
@@ -452,115 +408,67 @@ def play_from_library(item):
         @type item: item
         @param item: item with information
     """
+    import xbmcgui, xbmcplugin, xbmc
+    from time import sleep
+
+    itemlist=[]
     item.fromLibrary = True
     logger.info()
     # logger.debug("item: \n" + item.tostring('\n'))
 
-    import xbmcgui
-    import xbmcplugin
-    import xbmc
-    from time import sleep, time
-    from specials import nextep
-
-    # We try to reproduce an image (this does nothing and also does not give an error)
+    # Try to reproduce an image (this does nothing and also does not give an error)
     xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(path=os.path.join(config.get_runtime_path(), "resources", "kod.mp4")))
-
-    # Just in case the image did (in future versions) we give stop to stop the reproduction
-    # sleep(0.5)              ### If you don't put this on you crash Kodi
     xbmc.Player().stop()
 
-    # we modify the action (currently the video library needs "findvideos" since this is where the sources are searched
+    # Modify the action (currently the video library needs "findvideos" since this is where the sources are searched
     item.action = "findvideos"
-    check_next_ep = nextep.check(item)
-
 
     window_type = config.get_setting("window_type", "videolibrary")
-
-    # and we launch kodi again
+    # and launch kodi again
     if xbmc.getCondVisibility('Window.IsMedia') and not window_type == 1:
         # Conventional window
         xbmc.executebuiltin("Container.Update(" + sys.argv[0] + "?" + item.tourl() + ")")
 
     else:
-
         # Pop-up window
-        item.show_server = True
-
-        from specials import videolibrary, autoplay
+        from specials import videolibrary
         p_dialog = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(60683))
         p_dialog.update(0, '')
-
+        item.play_from = 'window'
         itemlist = videolibrary.findvideos(item)
+        p_dialog.update(100, ''); sleep(0.5); p_dialog.close()
+        while platformtools.is_playing(): # Conventional window
+            sleep(1)
+        play_time = platformtools.resume_playback(item, True)
+        if not play_time and config.get_setting('autoplay'):
+            return
 
-        if check_next_ep and autoplay.is_active(item.contentChannel):
-            p_dialog.update(100, '')
-            sleep(0.5)
-            p_dialog.close()
-            item = nextep.return_item(item)
-            if item.next_ep:
-                return play_from_library(item)
+        # The number of links to show is limited
+        if config.get_setting("max_links", "videolibrary") != 0: itemlist = limit_itemlist(itemlist)
+        # The list of links is slightly "cleaned"
+        if config.get_setting("replace_VD", "videolibrary") == 1: itemlist = reorder_itemlist(itemlist)
 
-        else:
-            while platformtools.is_playing():
-                    # Conventional window
-                    sleep(5)
-            p_dialog.update(50, '')
-
-        it = item
-        if item.show_server or not check_next_ep:
-
-            # The links are filtered according to the blacklist
-            # if config.get_setting('filter_servers', "servers"):
-            #     itemlist = servertools.filter_servers(itemlist)
-
-            # The number of links to show is limited
-            if config.get_setting("max_links", "videolibrary") != 0:
-                itemlist = limit_itemlist(itemlist)
-
-            # The list of links is slightly "cleaned"
-            if config.get_setting("replace_VD", "videolibrary") == 1:
-                itemlist = reorder_itemlist(itemlist)
-
-
-            p_dialog.update(100, '')
-            sleep(0.5)
-            p_dialog.close()
-
-
-            if len(itemlist) > 0:
-                while not xbmc.Monitor().abortRequested():
-                    # The user chooses the mirror
-                    opciones = []
-                    for item in itemlist:
-                        opciones.append(item.title)
-
-                    # The selection window opens
-                    if (item.contentSerieName != "" and
-                                item.contentSeason != "" and
-                                item.contentEpisodeNumber != ""):
-                        cabecera = ("%s - %sx%s -- %s" %
-                                    (item.contentSerieName,
-                                    item.contentSeason,
-                                    item.contentEpisodeNumber,
-                                    config.get_localized_string(30163)))
+        if len(itemlist) > 0:
+            while not xbmc.Monitor().abortRequested():
+                # The user chooses the mirror
+                options = []
+                selection_implementation = 0
+                for item in itemlist:
+                    item.thumbnail = config.get_online_server_thumb(item.server)
+                    quality = '[B][' + item.quality + '][/B]' if item.quality else ''
+                    if item.server:
+                        it = xbmcgui.ListItem('\n[B]%s[/B] %s - %s' % (item.server, quality, item.contentTitle))
+                        it.setArt({'thumb':item.thumbnail})
+                        options.append(it)
                     else:
-                        cabecera = config.get_localized_string(30163)
-
-
-                    seleccion = platformtools.dialog_select(cabecera, opciones)
-
-                    if seleccion == -1:
-                        return
-                    else:
-                        item = videolibrary.play(itemlist[seleccion])[0]
-                        item.play_from = 'window'
-                        platformtools.play_video(item)
-
-                    if (platformtools.is_playing() and item.action) or item.server == 'torrent' or autoplay.is_active(item.contentChannel):
-                        break
-
-        if it.show_server and check_next_ep:
-            nextep.run(it)
-            sleep(0.5)
-            p_dialog.close()
-
+                        selection_implementation += 1
+                # The selection window opens
+                if (item.contentSerieName and item.contentSeason and item.contentEpisodeNumber): head = ("%s - %sx%s | %s" % (item.contentSerieName, item.contentSeason, item.contentEpisodeNumber, config.get_localized_string(30163)))
+                else: head = config.get_localized_string(30163)
+                selection = platformtools.dialog_select(head, options, preselect= -1, useDetails=True)
+                if selection == -1:
+                    return
+                else:
+                    item = videolibrary.play(itemlist[selection  + selection_implementation])[0]
+                    platformtools.play_video(item)
+                if (platformtools.is_playing() and item.action) or item.server == 'torrent' or config.get_setting('autoplay'): break
\ No newline at end of file
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index f820ccf6..d02cba3c 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -6,24 +6,18 @@
 # version 2.0
 # ------------------------------------------------------------
 
-from __future__ import division
-from __future__ import absolute_import
-from past.utils import old_div
 import sys
-PY3 = False
-if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
-
-if PY3:
+if sys.version_info[0] >= 3:
     import urllib.parse as urllib
 else:
     import urllib
 
 import os, xbmc, xbmcgui, xbmcplugin
-
+from past.utils import old_div
 from channelselector import get_thumb
-from core import channeltools, trakt_tools, scrapertools
+from core import trakt_tools, scrapertools
 from core.item import Item
-from platformcode import logger, config, unify
+from platformcode import logger, config
 
 addon = config.__settings__
 addon_icon = os.path.join( addon.getAddonInfo( "path" ), "logo.png" )
@@ -73,8 +67,8 @@ def dialog_yesno(heading, line1, line2="", line3="", nolabel="No", yeslabel="Si"
             return dialog.yesno(heading, makeMessage(line1, line2, line3), nolabel=nolabel, yeslabel=yeslabel)
 
 
-def dialog_select(heading, _list, preselect=0):
-    return xbmcgui.Dialog().select(heading, _list, preselect=preselect)
+def dialog_select(heading, _list, preselect=0, useDetails=False):
+    return xbmcgui.Dialog().select(heading, _list, preselect=preselect, useDetails=useDetails)
 
 
 def dialog_multiselect(heading, _list, autoclose=0, preselect=[], useDetails=False):
@@ -122,15 +116,15 @@ def dialog_browse(_type, heading, default=""):
 
 
 def itemlist_refresh():
-    pos = Item().fromurl(xbmc.getInfoLabel('ListItem.FileNameAndPath')).itemlistPosition
-    logger.info('Current position: ' + str(pos))
+    # pos = Item().fromurl(xbmc.getInfoLabel('ListItem.FileNameAndPath')).itemlistPosition
+    # logger.info('Current position: ' + str(pos))
     xbmc.executebuiltin("Container.Refresh")
 
-    while Item().fromurl(xbmc.getInfoLabel('ListItem.FileNameAndPath')).itemlistPosition != pos:
-        win = xbmcgui.Window(xbmcgui.getCurrentWindowId())
-        cid = win.getFocusId()
-        ctl = win.getControl(cid)
-        ctl.selectItem(pos)
+    # while Item().fromurl(xbmc.getInfoLabel('ListItem.FileNameAndPath')).itemlistPosition != pos:
+    #     win = xbmcgui.Window(xbmcgui.getCurrentWindowId())
+    #     cid = win.getFocusId()
+    #     ctl = win.getControl(cid)
+    #     ctl.selectItem(pos)
 
 
 def itemlist_update(item, replace=False):
@@ -168,7 +162,7 @@ def render_items(itemlist, parent_item):
 
     dirItems = []
     for n, item in enumerate(itemlist):
-        item.itemlistPosition = n + 1
+        # item.itemlistPosition = n + 1
         item_url = item.tourl()
 
         if item.category == "":
@@ -181,7 +175,7 @@ def render_items(itemlist, parent_item):
         if item.fanart == "":
             item.fanart = parent_item.fanart
         if item.action == 'play' and thumb_type == 1 and not item.forcethumb:
-            item.thumbnail = "https://github.com/kodiondemand/media/raw/master/resources/servers/" + item.server.lower() + '.png'
+            item.thumbnail = config.get_online_server_thumb(item.server)
 
         # if cloudflare and cloudscraper is used, cookies are needed to display images taken from site
         # before checking domain (time consuming), checking if tmdb failed (so, images scraped from website are used)
@@ -198,7 +192,7 @@ def render_items(itemlist, parent_item):
         listitem.setArt({'icon': icon_image, 'thumb': item.thumbnail, 'poster': item.thumbnail,
                          'fanart': item.fanart if item.fanart else default_fanart})
 
-        if config.get_setting("player_mode") == 1 and item.action == "play":
+        if config.get_setting("player_mode") == 1 and item.action == "play" and not item.nfo:
             listitem.setProperty('IsPlayable', 'true')
 
         set_infolabels(listitem, item)
@@ -254,7 +248,7 @@ def getCurrentView(item=None, parent_item=None):
     elif (item.contentType in ['movie'] and parent_item.action in parent_actions) \
             or (item.channel in ['videolibrary'] and parent_item.action in ['list_movies']) \
             or (parent_item.channel in ['favorites'] and parent_item.action in ['mainlist']) \
-            or parent_item.action in ['now_on_tv', 'now_on_misc', 'now_on_misc_film', 'mostrar_perfil']:
+            or parent_item.action in ['now_on_tv', 'now_on_misc', 'now_on_misc_film', 'mostrar_perfil', 'live']:
         return 'movie', 'movies'
 
     elif (item.contentType in ['tvshow'] and parent_item.action in parent_actions) \
@@ -293,255 +287,6 @@ def set_view_mode(item, parent_item):
         logger.info('TYPE: ' + Type + ' - ' + 'CONTENT: ' + content)
 
 
-# def render_items_old(itemlist, parent_item):
-#     """
-#     Function responsible for displaying the itemlist in kodi, the itemlist and the item it comes from are passed as parameters
-#     @type itemlist: list
-#     @param itemlist: list of elements to show
-
-#     @type parent_item: item
-#     @param parent_item: parent element
-#     """
-#     logger.info('START render_items')
-#     from core import httptools
-
-#     # If the itemlist is not a list we leave
-#     if not isinstance(itemlist, list):
-#         return
-
-#     if parent_item.start:
-#         menu_icon = get_thumb('menu.png')
-#         menu = Item(channel="channelselector", action="getmainlist", viewmode="movie", thumbnail=menu_icon, title='Menu')
-#         itemlist.insert(0, menu)
-
-#     # If there is no item, we show a notice
-#     if not len(itemlist):
-#         itemlist.append(Item(title=config.get_localized_string(60347), thumbnail=get_thumb('nofolder.png')))
-
-#     genre = False
-#     if 'nero' in parent_item.title:
-#         genre = True
-#         anime = False
-#         if 'anime' in channeltools.get_channel_parameters(parent_item.channel)['categories']:
-#             anime = True
-#     # try:
-#     #     force_unify = channeltools.get_channel_parameters(parent_item.channel)['force_unify']
-#     # except:
-#     force_unify = False
-
-#     unify_enabled = False
-
-#     has_extendedinfo = xbmc.getCondVisibility('System.HasAddon(script.extendedinfo)')
-
-#     # Add SuperFavourites to context menu (1.0.53 or higher required)
-#     sf_file_path = xbmc.translatePath("special://home/addons/plugin.program.super.favourites/LaunchSFMenu.py")
-#     check_sf = os.path.exists(sf_file_path)
-#     superfavourites = check_sf and xbmc.getCondVisibility('System.HasAddon("plugin.program.super.favourites")')
-#     # try:
-#     #     if channeltools.get_channel_parameters(parent_item.channel)['adult']:
-#     #         unify_enabled = False
-#     # except:
-#     #     pass
-#     # logger.debug('unify_enabled: %s' % unify_enabled)
-
-#     # We go through the itemlist
-#     for item in itemlist:
-#         # logger.debug(item)
-#         # If the item does not contain a category, we will add the parent item
-#         item_url = item.tourl()
-#         if item.category == "":
-#             item.category = parent_item.category
-
-#         # If title does not exist, we start it as str, to avoid "NoType" mistakes
-#         if not item.title:
-#             item.title = ''
-
-#         # If there is no action or it is findvideos / play, folder = False because no listing will be returned
-#         if item.action in ['play', '']:
-#             item.folder = False
-
-#         # If the item does not contain fanart, we put the one of the parent item
-#         if item.fanart == "":
-#             item.fanart = parent_item.fanart
-
-#         if genre:
-#             valid_genre = True
-#             thumb = get_thumb(item.title, auto=True)
-#             if thumb != '':
-#                 item.thumbnail = thumb
-#                 valid_genre = True
-#             elif anime:
-#                 valid_genre = True
-#         elif (('siguiente' in item.title.lower() and '>' in item.title) or ('pagina:' in item.title.lower())):
-#             item.thumbnail = get_thumb("next.png")
-#         elif 'add' in item.action:
-#             if 'pelicula' in item.action:
-#                 item.thumbnail = get_thumb("add_to_videolibrary.png")
-#             elif 'serie' in item.action:
-#                 item.thumbnail = get_thumb("add_to_videolibrary.png")
-
-#         if (unify_enabled or force_unify) and parent_item.channel not in ['kodfavourites']:
-#             # Format title with unify
-#             item = unify.title_format(item)
-#         else:
-#             # Format title method old school
-#             if item.text_color:
-#                 item.title = '[COLOR %s]%s[/COLOR]' % (item.text_color, item.title)
-#             if item.text_bold:
-#                 item.title = '[B]%s[/B]' % item.title
-#             if item.text_italic:
-#                 item.title = '[I]%s[/I]' % item.title
-
-#         # Add headers to images if they are on a server with cloudflare
-#         if item.action == 'play':
-#             item.thumbnail = unify.thumbnail_type(item)
-#         else:
-#             item.thumbnail = httptools.get_url_headers(item.thumbnail)
-#         item.fanart = httptools.get_url_headers(item.fanart)
-
-#         # Icon Image for folder and video
-#         if item.folder:
-#             icon_image = "DefaultFolder.png"
-#         else:
-#             icon_image = "DefaultVideo.png"
-
-#         # fanart
-#         if item.fanart:
-#             fanart = item.fanart
-#         else:
-#             fanart = config.get_fanart()
-
-#         # Create listitem
-#         listitem = xbmcgui.ListItem(item.title)
-
-#         # values icon, thumb or poster are skin dependent.. so we set all to avoid problems
-#         # if not exists thumb it's used icon value
-#         if config.get_platform(True)['num_version'] >= 16.0:
-#             listitem.setArt({'icon': icon_image, 'thumb': item.thumbnail, 'poster': item.thumbnail,
-#                              'fanart': fanart})
-#         else:
-#             listitem.setIconImage(icon_image)
-#             listitem.setThumbnailImage(item.thumbnail)
-#             listitem.setProperty('fanart_image', fanart)
-
-#         # No need it, use fanart instead
-#         # xbmcplugin.setPluginFanart(int(sys.argv[1]), os.path.join(config.get_runtime_path(), "fanart.jpg"))
-
-#         # This option is to be able to use the xbmcplugin.setResolvedUrl()
-#         # if item.isPlayable == True or (config.get_setting("player_mode") == 1 and item.action == "play"):
-#         if config.get_setting("player_mode") == 1 and item.action == "play":
-#             listitem.setProperty('IsPlayable', 'true')
-
-#         # Add infoLabels
-#         set_infolabels(listitem, item)
-
-#         # Do not drag plot if it is not a movie / series / season / episode
-#         if item.plot and item.contentType not in ['movie', 'tvshow', 'season', 'episode']:
-#             item.__dict__['infoLabels'].pop('plot')
-
-#         # Mount context menu
-#         if parent_item.channel != 'special':
-#             context_commands = set_context_commands(item, item_url, parent_item, has_extendedinfo=has_extendedinfo, superfavourites=superfavourites)
-#         else:
-#             context_commands = []
-#         # Add context menu
-#         if config.get_platform(True)['num_version'] >= 17.0 and parent_item.list_type == '':
-#             listitem.addContextMenuItems(context_commands)
-#         elif parent_item.list_type == '':
-#             listitem.addContextMenuItems(context_commands, replaceItems=True)
-
-#         from specials import shortcuts
-#         context_commands += shortcuts.context()
-
-#         if not item.totalItems:
-#             item.totalItems = 0
-#         xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url='%s?%s' % (sys.argv[0], item_url),
-#                                     listitem=listitem, isFolder=item.folder,
-#                                     totalItems=item.totalItems)
-
-#     # Set types of views ...
-#     if config.get_setting("forceview"):                                         # ...force according to the viewcontent
-#         xbmcplugin.setContent(int(sys.argv[1]), parent_item.viewcontent)
-
-#     elif parent_item.channel not in ["channelselector", "", "kodfavourites"]:     # ... or according to the channel
-#         xbmcplugin.setContent(int(sys.argv[1]), "movies")
-
-#     elif parent_item.channel == "kodfavourites" and parent_item.action == 'mostrar_perfil':
-#         xbmcplugin.setContent(int(sys.argv[1]), "movies")
-
-#     # set "breadcrumb"
-#     if parent_item.list_type == '':
-#         breadcrumb = parent_item.category.capitalize()
-#     else:
-#         if 'similar' in parent_item.list_type:
-#             if parent_item.contentTitle != '':
-#                 breadcrumb = config.get_localized_string(70693) + parent_item.contentTitle
-#             else:
-#                 breadcrumb = config.get_localized_string(70693) + parent_item.contentSerieName
-#         else:
-#             breadcrumb = config.get_localized_string(70693)
-
-#     xbmcplugin.setPluginCategory(handle=int(sys.argv[1]), category=breadcrumb)
-
-#     # Do not sort items
-#     xbmcplugin.addSortMethod(handle=int(sys.argv[1]), sortMethod=xbmcplugin.SORT_METHOD_NONE)
-
-#     # We close the directory
-#     xbmcplugin.endOfDirectory(handle=int(sys.argv[1]), succeeded=True)
-
-#     # Fix the view
-#     # if config.get_setting("forceview"):
-#     #     viewmode_id = get_viewmode_id(parent_item)
-#     #     xbmc.executebuiltin("Container.SetViewMode(%s)" % viewmode_id)
-#     # if parent_item.mode in ['silent', 'get_cached', 'set_cache', 'finish']:
-#     #     xbmc.executebuiltin("Container.SetViewMode(500)")
-
-#     logger.info('END render_items')
-
-
-# def get_viewmode_id(parent_item):
-#     # viewmode_json would have to save it in a file and create a method for the user to set their preferences in:
-#     # user_files, user_movies, user_tvshows, user_season and user_episodes.
-#     viewmode_json = {'skin.confluence': {'default_files': 50,
-#                                          'default_movies': 515,
-#                                          'default_tvshows': 508,
-#                                          'default_seasons': 503,
-#                                          'default_episodes': 504,
-#                                          'view_list': 50,
-#                                          'view_thumbnails': 500,
-#                                          'view_movie_with_plot': 503},
-#                      'skin.estuary': {'default_files': 50,
-#                                       'default_movies': 54,
-#                                       'default_tvshows': 502,
-#                                       'default_seasons': 500,
-#                                       'default_episodes': 53,
-#                                       'view_list': 50,
-#                                       'view_thumbnails': 500,
-#                                       'view_movie_with_plot': 54}}
-
-#     # If the parent_item had a viewmode set we use that view ...
-#     if parent_item.viewmode == 'movie':
-#         # We replace the old viewmode 'movie' with 'thumbnails'
-#         parent_item.viewmode = 'thumbnails'
-
-#     if parent_item.viewmode in ["list", "movie_with_plot", "thumbnails"]:
-#         view_name = "view_" + parent_item.viewmode
-
-#         '''elif isinstance(parent_item.viewmode, int):
-#             # only for debug
-#             viewName = parent_item.viewmode'''
-
-#     # ...otherwise we put the default view according to the viewcontent
-#     else:
-#         view_name = "default_" + parent_item.viewcontent
-
-#     skin_name = xbmc.getSkinDir()
-#     if skin_name not in viewmode_json:
-#         skin_name = 'skin.confluence'
-#     view_skin = viewmode_json[skin_name]
-#     return view_skin.get(view_name, 50)
-
-
 def set_infolabels(listitem, item, player=False):
     """
     Method to pass the information to the listitem (see tmdb.set_InfoLabels())
@@ -582,32 +327,6 @@ def set_infolabels(listitem, item, player=False):
             listitem.setInfo("video", item.infoLabels)
             # logger.error(item.infoLabels)
 
-    # if item.infoLabels:
-    #     if 'mediatype' not in item.infoLabels:
-    #         item.infoLabels['mediatype'] = item.contentType
-    #
-    #     try:
-    #         for label_tag, label_value in list(item.infoLabels.items()):
-    #             try:
-    #                 # logger.debug(str(label_tag) + ': ' + str(infoLabels_dict[label_tag]))
-    #                 if infoLabels_dict[label_tag] != 'None':
-    #                     infoLabels_kodi.update({infoLabels_dict[label_tag]: item.infoLabels[label_tag]})
-    #             except:
-    #                 continue
-    #
-    #         listitem.setInfo("video", infoLabels_kodi)
-    #
-    #     except:
-    #         listitem.setInfo("video", item.infoLabels)
-    #         logger.error(item.infoLabels)
-    #         logger.error(infoLabels_kodi)
-    #
-    # if player and not item.contentTitle:
-    #     listitem.setInfo("video", {"Title": item.title})
-    #
-    # elif not player:
-    #     listitem.setInfo("video", {"Title": item.title})
-
 
 def set_context_commands(item, item_url, parent_item, **kwargs):
     """
@@ -686,17 +405,12 @@ def set_context_commands(item, item_url, parent_item, **kwargs):
         # ExtendedInfo: If the addon is installed and a series of conditions are met
         if kwargs.get('has_extendedinfo') \
                 and config.get_setting("extended_info") == True:
-            if item.contentType == "episode" and item.contentEpisodeNumber and item.contentSeason \
-                    and (item.infoLabels['tmdb_id'] or item.contentSerieName):
-                param = "tvshow_id =%s, tvshow=%s, season=%s, episode=%s" \
-                        % (item.infoLabels['tmdb_id'], item.contentSerieName, item.contentSeason,
-                           item.contentEpisodeNumber)
+            if item.contentType == "episode" and item.contentEpisodeNumber and item.contentSeason and (item.infoLabels['tmdb_id'] or item.contentSerieName):
+                param = "tvshow_id =%s, tvshow=%s, season=%s, episode=%s" % (item.infoLabels['tmdb_id'], item.contentSerieName, item.contentSeason, item.contentEpisodeNumber)
                 context_commands.append(("ExtendedInfo", "XBMC.RunScript(script.extendedinfo,info=extendedepisodeinfo,%s)" % param))
 
-            elif item.contentType == "season" and item.contentSeason \
-                    and (item.infoLabels['tmdb_id'] or item.contentSerieName):
-                param = "tvshow_id =%s,tvshow=%s, season=%s" \
-                        % (item.infoLabels['tmdb_id'], item.contentSerieName, item.contentSeason)
+            elif item.contentType == "season" and item.contentSeason and (item.infoLabels['tmdb_id'] or item.contentSerieName):
+                param = "tvshow_id =%s,tvshow=%s, season=%s" % (item.infoLabels['tmdb_id'], item.contentSerieName, item.contentSeason)
                 context_commands.append(("ExtendedInfo", "XBMC.RunScript(script.extendedinfo,info=seasoninfo,%s)" % param))
 
             elif item.contentType == "tvshow" and (item.infoLabels['tmdb_id'] or item.infoLabels['tvdb_id'] or item.infoLabels['imdb_id'] or item.contentSerieName):
@@ -705,15 +419,14 @@ def set_context_commands(item, item_url, parent_item, **kwargs):
 
             elif item.contentType == "movie" and (item.infoLabels['tmdb_id'] or item.infoLabels['imdb_id'] or item.contentTitle):
                 param = "id =%s,imdb_id=%s,name=%s" % (item.infoLabels['tmdb_id'], item.infoLabels['imdb_id'], item.contentTitle)
-
                 context_commands.append(("ExtendedInfo", "XBMC.RunScript(script.extendedinfo,info=extendedinfo,%s)" % param))
-                # InfoPlus
+
+        # InfoPlus
         if config.get_setting("infoplus"):
             #if item.infoLabels['tmdb_id'] or item.infoLabels['imdb_id'] or item.infoLabels['tvdb_id'] or \
             #        (item.contentTitle and item.infoLabels["year"]) or item.contentSerieName:
             if item.infoLabels['tmdb_id'] or item.infoLabels['imdb_id'] or item.infoLabels['tvdb_id']:
-                context_commands.append(("InfoPlus", "XBMC.RunPlugin(%s?%s&%s)" % (sys.argv[0], item_url,
-                            'channel=infoplus&action=start&from_channel=' + item.channel)))
+                context_commands.append(("InfoPlus", "XBMC.RunPlugin(%s?%s&%s)" % (sys.argv[0], item_url, 'channel=infoplus&action=start&from_channel=' + item.channel)))
 
         # Go to the Main Menu (channel.mainlist)
         if parent_item.channel not in ["news", "channelselector", "downloads"] and item.action != "mainlist":
@@ -721,13 +434,6 @@ def set_context_commands(item, item_url, parent_item, **kwargs):
                 context_commands.insert(0, (config.get_localized_string(60349), "XBMC.Container.Refresh (%s?%s)" % (sys.argv[0], Item(channel=item.channel, action="mainlist").tourl())))
             context_commands.insert(1, (config.get_localized_string(70739), "XBMC.Container.Update (%s?%s)" % (sys.argv[0], Item(action="open_browser", url=item.url).tourl())))
 
-        # Add to Favorites
-        # if num_version_xbmc < 17.0 and \
-        #         ((item.channel not in ["favorites", "videolibrary", "help", ""]
-        #           or item.action in ["update_videolibrary"]) and parent_item.channel != "favorites"):
-        #     context_commands.append((config.get_localized_string(30155), "XBMC.RunPlugin(%s?%s&%s)" %
-        #                              (sys.argv[0], item_url, 'channel=favorites&action=addFavourite&from_channel=' + item.channel + '&from_action=' + item.action)))
-
         # Add to kodfavoritos (My links)
         if item.channel not in ["favorites", "videolibrary", "help", ""] and parent_item.channel != "favorites":
             context_commands.append( (config.get_localized_string(70557), "XBMC.RunPlugin(%s?%s&%s)" % (sys.argv[0], item_url, urllib.urlencode({'channel': "kodfavorites", 'action': "addFavourite", 'from_channel': item.channel, 'from_action': item.action}))))
@@ -748,6 +454,7 @@ def set_context_commands(item, item_url, parent_item, **kwargs):
             context_commands.append((config.get_localized_string(60350), "XBMC.Container.Update (%s?%s&%s)" % (sys.argv[0], item_url, urllib.urlencode({'channel': 'search', 'action': "from_context", 'from_channel': item.channel, 'contextual': True, 'text': item.wanted}))))
 
             context_commands.append( (config.get_localized_string(70561), "XBMC.Container.Update (%s?%s&%s)" % (sys.argv[0], item_url, 'channel=search&action=from_context&search_type=list&page=1&list_type=%s/%s/similar' % (mediatype, item.infoLabels['tmdb_id']))))
+
         # Set as Home Page
         if config.get_setting('start_page'):
             if item.action not in ['episodios', 'seasons', 'findvideos', 'play']:
@@ -780,11 +487,6 @@ def set_context_commands(item, item_url, parent_item, **kwargs):
                 elif item.contentType == "season":
                     context_commands.append((config.get_localized_string(60357), "XBMC.RunPlugin(%s?%s&%s)" % (sys.argv[0], item_url, 'channel=downloads&action=save_download&download=season&from_channel=' + item.channel + '&from_action=' + item.action)))
 
-        # # Open settings
-        # if parent_item.channel not in ["setting", "news", "search"] and item.action == "play":
-        #     context_commands.append((config.get_localized_string(60358), "XBMC.Container.Update(%s?%s)" %
-        #                              (sys.argv[0], Item(channel="setting", action="mainlist").tourl())))
-
         # Open settings...
         if item.action in ["findvideos", 'episodios', 'check', 'new_search'] or "buscar_trailer" in context:
             context_commands.append((config.get_localized_string(60359), "XBMC.RunPlugin(%s?%s)" % (sys.argv[0], urllib.urlencode({ 'channel': "trailertools", 'action': "buscartrailer", 'search_title': item.contentTitle if item.contentTitle else item.fulltitle, 'contextual': True}))))
@@ -792,14 +494,6 @@ def set_context_commands(item, item_url, parent_item, **kwargs):
         if kwargs.get('superfavourites'):
             context_commands.append((config.get_localized_string(60361), "XBMC.RunScript(special://home/addons/plugin.program.super.favourites/LaunchSFMenu.py)"))
 
-    # context_commands = sorted(context_commands, key=lambda comand: comand[0])
-
-    # Quick Menu
-    # context_commands.insert(0, (config.get_localized_string(60360),
-    #                             "XBMC.Container.Update (%s?%s)" % (sys.argv[0], Item(channel='side_menu',
-    #                                                                                  action="open_menu",
-    #                                                                                  parent=parent_item.tourl()).tourl(
-    #                             ))))
     if config.dev_mode():
         context_commands.insert(0, ("item info", "XBMC.Container.Update (%s?%s)" % (sys.argv[0], Item(action="itemInfo", parent=item.tojson()).tourl())))
     return context_commands
@@ -812,19 +506,12 @@ def is_playing():
 def play_video(item, strm=False, force_direct=False, autoplay=False):
     logger.info()
     # logger.debug(item.tostring('\n'))
-    logger.debug('item play: %s' % item)
-    xbmc_player = XBMCPlayer()
     if item.channel == 'downloads':
-        logger.info("Reproducir video local: %s [%s]" % (item.title, item.url))
+        logger.info("Play local video: %s [%s]" % (item.title, item.url))
         xlistitem = xbmcgui.ListItem(path=item.url)
-        if config.get_platform(True)['num_version'] >= 16.0:
-            xlistitem.setArt({"thumb": item.thumbnail})
-        else:
-            xlistitem.setThumbnailImage(item.thumbnail)
-
+        xlistitem.setArt({"thumb": item.thumbnail})
         set_infolabels(xlistitem, item, True)
         set_player(item, xlistitem, item.url, True, None) # Fix Play From Download Section
-        # xbmc_player.play(item.url, xlistitem)
         return
 
     default_action = config.get_setting("default_action")
@@ -832,13 +519,11 @@ def play_video(item, strm=False, force_direct=False, autoplay=False):
 
     # Open the selection dialog to see the available options
     opciones, video_urls, seleccion, salir = get_dialogo_opciones(item, default_action, strm, autoplay)
-    if salir:
-        return
+    if salir: return
 
     # get default option of addon configuration
     seleccion = get_seleccion(default_action, opciones, seleccion, video_urls)
-    if seleccion < 0:  # Canceled box
-        return
+    if seleccion < 0: return # Canceled box
 
     logger.info("selection=%d" % seleccion)
     logger.info("selection=%s" % opciones[seleccion])
@@ -850,42 +535,25 @@ def play_video(item, strm=False, force_direct=False, autoplay=False):
 
     # we get the selected video
     mediaurl, view, mpd = get_video_seleccionado(item, seleccion, video_urls)
-    if mediaurl == "":
-        return
-    # # no certificate verification
-    # mediaurl = mediaurl.replace('https://', 'http://')
+    if not mediaurl: return
 
     # video information is obtained.
-    if not item.contentThumbnail:
-        thumb = item.thumbnail
-    else:
-        thumb = item.contentThumbnail
-
     xlistitem = xbmcgui.ListItem(path=item.url)
-    if config.get_platform(True)['num_version'] >= 16.0:
-        xlistitem.setArt({"thumb": thumb})
-    else:
-        xlistitem.setThumbnailImage(thumb)
-
+    xlistitem.setArt({"thumb": item.contentThumbnail if item.contentThumbnail else item.thumbnail})
     set_infolabels(xlistitem, item, True)
 
-    # if it is a video in mpd format, the listitem is configured to play it
-    # with the inpustreamaddon addon implemented in Kodi 17
+    # if it is a video in mpd format, the listitem is configured to play it ith the inpustreamaddon addon implemented in Kodi 17
+    # from core.support import dbg;dbg()
     if mpd:
+        if not os.path.exists(os.path.join(xbmc.translatePath('special://home/addons/'),'inputstream.adaptive')): install_inputstream()
         xlistitem.setProperty('inputstreamaddon', 'inputstream.adaptive')
         xlistitem.setProperty('inputstream.adaptive.manifest_type', 'mpd')
 
-    # player launches
-    if force_direct:  # when it comes from a window and not directly from the addon base
-        # We add the listitem to a playlist
-        playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
-        playlist.clear()
-        playlist.add(mediaurl, xlistitem)
+    if force_direct: item.play_from = 'window'
 
-        # Reproduce
-        xbmc_player.play(playlist, xlistitem)
-    else:
-        set_player(item, xlistitem, mediaurl, view, strm)
+
+    item, nfo_path, head_nfo, item_nfo = resume_playback(item)
+    set_player(item, xlistitem, mediaurl, view, strm, nfo_path, head_nfo, item_nfo)
 
 
 def stop_video():
@@ -1196,6 +864,9 @@ def get_video_seleccionado(item, seleccion, video_urls):
             wait_time = video_urls[seleccion][2]
         view = True
 
+    if 'mpd' in video_urls[seleccion][0]:
+        mpd = True
+
     # If there is no mediaurl it is because the video is not there :)
     logger.info("mediaurl=" + mediaurl)
     if mediaurl == "":
@@ -1213,68 +884,64 @@ def get_video_seleccionado(item, seleccion, video_urls):
     return mediaurl, view, mpd
 
 
-def set_player(item, xlistitem, mediaurl, view, strm):
+def set_player(item, xlistitem, mediaurl, view, strm, nfo_path=None, head_nfo=None, item_nfo=None):
     logger.info()
-    logger.debug("item:\n" + item.tostring('\n'))
+    # logger.debug("item:\n" + item.tostring('\n'))
     # Moved del conector "torrent" here
     if item.server == "torrent":
         play_torrent(item, xlistitem, mediaurl)
         return
-
     # If it is a strm file, play is not necessary
     elif strm:
         xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xlistitem)
-        if item.subtitle != "":
+        if item.subtitle:
             xbmc.sleep(2000)
             xbmc_player.setSubtitles(item.subtitle)
 
     else:
-        logger.info("player_mode=%s" % config.get_setting("player_mode"))
+        player_mode = config.get_setting("player_mode")
+        if (player_mode == 3 and mediaurl.startswith("rtmp")) or item.play_from == 'window' or item.nfo: player_mode = 0
+        elif "megacrypter.com" in mediaurl: player_mode = 3
         logger.info("mediaurl=" + mediaurl)
-        if config.get_setting("player_mode") == 3 or "megacrypter.com" in mediaurl:
-            from platformcode import download_and_play
-            download_and_play.download_and_play(mediaurl, "download_and_play.tmp", config.get_setting("downloadpath"))
-            return
 
-        elif config.get_setting("player_mode") == 0 or item.play_from == 'window' or \
-                (config.get_setting("player_mode") == 3 and mediaurl.startswith("rtmp")):
-            # We add the listitem to a playlist
+        if player_mode == 0:
+            logger.info('Player Mode: Direct')
+            # Add the listitem to a playlist
             playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
             playlist.clear()
             playlist.add(mediaurl, xlistitem)
 
             # Reproduce
-            # xbmc_player = xbmc_player
             xbmc_player.play(playlist, xlistitem)
             if config.get_setting('trakt_sync'):
                 trakt_tools.wait_for_update_trakt()
 
-        # elif config.get_setting("player_mode") == 1 or item.isPlayable:
-        elif config.get_setting("player_mode") == 1:
-            logger.info("Tras setResolvedUrl")
-            # if it is a video library file send to mark as seen
-
-            if strm or item.strm_path:
-                from platformcode import xbmc_videolibrary
-                xbmc_videolibrary.mark_auto_as_watched(item)
-            logger.debug(item)
+        elif player_mode == 1:
+            logger.info('Player Mode: setResolvedUrl')
             xlistitem.setPath(mediaurl)
             xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xlistitem)
             xbmc.sleep(2500)
 
-        elif config.get_setting("player_mode") == 2:
+        elif player_mode == 2:
+            logger.info('Player Mode: Built-In')
             xbmc.executebuiltin("PlayMedia(" + mediaurl + ")")
 
+        elif player_mode == 3:
+            logger.info('Player Mode: Download and Play')
+            from platformcode import download_and_play
+            download_and_play.download_and_play(mediaurl, "download_and_play.tmp", config.get_setting("downloadpath"))
+            return
+
     # ALL LOOKING TO REMOVE VIEW
-    if item.subtitle != "" and view:
-        logger.info("Subtítulos externos: " + item.subtitle)
+    if item.subtitle and view:
+        logger.info("External subtitles: " + item.subtitle)
         xbmc.sleep(2000)
         xbmc_player.setSubtitles(item.subtitle)
 
     # if it is a video library file send to mark as seen
     if strm or item.strm_path:
         from platformcode import xbmc_videolibrary
-        xbmc_videolibrary.mark_auto_as_watched(item)
+        xbmc_videolibrary.mark_auto_as_watched(item, nfo_path, head_nfo, item_nfo)
 
 
 def torrent_client_installed(show_tuple=False):
@@ -1334,4 +1001,83 @@ def play_torrent(item, xlistitem, mediaurl):
 
 
 def log(texto):
-    xbmc.log(texto, xbmc.LOGNOTICE)
\ No newline at end of file
+    xbmc.log(texto, xbmc.LOGNOTICE)
+
+def resume_playback(item, return_played_time=False):
+    class ResumePlayback(xbmcgui.WindowXMLDialog):
+        Close = False
+        Resume = False
+
+        def __init__(self, *args, **kwargs):
+            self.action_exitkeys_id = [xbmcgui.ACTION_BACKSPACE, xbmcgui.ACTION_PREVIOUS_MENU, xbmcgui.ACTION_NAV_BACK]
+            self.progress_control = None
+            self.item = kwargs.get('item')
+            m, s = divmod(float(self.item.played_time), 60)
+            h, m = divmod(m, 60)
+            self.setProperty("time", '%02d:%02d:%02d' % (h, m, s))
+
+        def set_values(self, value):
+            self.Resume = value
+            self.Close = True
+
+        def is_close(self):
+            return self.Close
+
+        def onClick(self, controlId):
+            if controlId == 3012:  # Resume
+                self.set_values(True)
+                self.close()
+            elif controlId == 3013:  # Cancel
+                self.set_values(False)
+                self.close()
+
+        def onAction(self, action):
+            if action in self.action_exitkeys_id:
+                self.set_values(False)
+                self.close()
+
+
+    from core import videolibrarytools, filetools
+
+    # Read NFO FILE
+    if item.contentType == 'movie':
+        nfo_path = item.nfo
+    else:
+        nfo_path = item.strm_path.replace('strm','nfo')
+
+    if filetools.isfile(nfo_path):
+        head_nfo, item_nfo = videolibrarytools.read_nfo(nfo_path)
+
+        if return_played_time:
+            return item_nfo.played_time
+        # Show Window
+        elif (config.get_setting("player_mode") not in [3] or item.play_from == 'window') and item_nfo.played_time:
+            Dialog = ResumePlayback('ResumePlayback.xml', config.get_runtime_path(), item=item_nfo)
+            Dialog.show()
+            t = 0
+            while not Dialog.is_close() and t < 100:
+                t += 1
+                xbmc.sleep(100)
+            if not Dialog.Resume: item_nfo.played_time = 0
+        else:
+            item_nfo.played_time = 0
+
+        return item, nfo_path, head_nfo, item_nfo
+    else:
+        item.nfo = item.strm_path = ""
+        return item, None, None, None
+
+def install_inputstream():
+    from xbmcaddon import Addon
+    try:
+        # See if there's an installed repo that has it
+        xbmc.executebuiltin('InstallAddon(inputstream.adaptive)', wait=True)
+
+        # Check if InputStream add-on exists!
+        Addon('inputstream.adaptive')
+
+        logger.info('InputStream add-on installed from repo.')
+        return True
+    except RuntimeError:
+        logger.info('InputStream add-on not installed.')
+        return False
\ No newline at end of file
diff --git a/platformcode/xbmc_config_menu.py b/platformcode/xbmc_config_menu.py
index 98a11e9b..37a557fb 100644
--- a/platformcode/xbmc_config_menu.py
+++ b/platformcode/xbmc_config_menu.py
@@ -184,7 +184,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog):
                 # The call is made from a channel
                 self.list_controls, default_values = servertools.get_server_controls_settings(self.channel)
                 self.kwargs = {"server": self.channel}
-                self.channelName = servertools.get_server_json(self.channel)['name']
+                self.channelName = servertools.get_server_parameters(self.channel)['name']
 
             # Else Exit
             else:
@@ -378,8 +378,8 @@ class SettingsWindow(xbmcgui.WindowXMLDialog):
                                          textColor=c["color"], font=self.font, isPassword=c["hidden"], window=self)
 
         else:
-            control = xbmcgui.ControlEdit(0, -100, self.controls_width - 5, self.height_control,
-                                          c["label"], self.font, c["color"], '', 4, isPassword=c["hidden"],
+            control = xbmcgui.ControlEdit(0, -100, self.controls_width, self.height_control,
+                                          c["label"], self.font, c["color"], '', 1 | 4, isPassword=c["hidden"],
                                           focusTexture=os.path.join(self.mediapath, 'Controls', 'MenuItemFO.png'),
                                           noFocusTexture=os.path.join(self.mediapath, 'Controls', 'MenuItemNF.png'))
 
@@ -393,7 +393,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog):
             s = ''
         control.setText(s)
         # control.setText(self.values[c["id"]])
-        control.setWidth(self.controls_width - 5)
+        control.setWidth(self.controls_width + 10)
         control.setHeight(self.height_control)
 
         c["control"] = control
@@ -446,8 +446,8 @@ class SettingsWindow(xbmcgui.WindowXMLDialog):
                 self.getControl(10006).setLabel(self.custom_button['label'])
             else:
                 self.getControl(10006).setVisible(False)
-                self.getControl(10004).setPosition(self.getControl(10004).getPosition()[0] + 80, self.getControl(10004).getPosition()[1])
-                self.getControl(10005).setPosition(self.getControl(10005).getPosition()[0] + 80, self.getControl(10005).getPosition()[1])
+                # self.getControl(10004).setPosition(self.getControl(10004).getPosition()[0], self.getControl(10004).getPosition()[1])
+                # self.getControl(10005).setPosition(self.getControl(10005).getPosition()[0], self.getControl(10005).getPosition()[1])
 
         # Control Area Dimensions
         self.controls_width = self.getControl(10007).getWidth() - 30
@@ -506,7 +506,6 @@ class SettingsWindow(xbmcgui.WindowXMLDialog):
             elif c["type"] == 'text': self.add_control_text(c)
             elif c["type"] == 'list': self.add_control_list(c)
             elif c["type"] == 'label': self.add_control_label(c)
-
         self.list_controls = [c for c in self.list_controls if "control" in c]
 
         self.evaluate_conditions()
diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py
index 1aac5828..807baa8a 100644
--- a/platformcode/xbmc_videolibrary.py
+++ b/platformcode/xbmc_videolibrary.py
@@ -5,7 +5,7 @@
 from future import standard_library
 standard_library.install_aliases()
 #from builtins import str
-import sys, os, threading, time, re, math, xbmc
+import sys, os, threading, time, re, math, xbmc, xbmcgui
 PY3 = False
 if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
 
@@ -15,73 +15,84 @@ from core import scrapertools
 from xml.dom import minidom
 
 
-def mark_auto_as_watched(item):
-    def mark_as_watched_subThread(item):
+def mark_auto_as_watched(item, nfo_path=None, head_nfo=None, item_nfo=None):
+    def mark_as_watched_subThread(item, nfo_path, head_nfo, item_nfo):
         logger.info()
         # logger.debug("item:\n" + item.tostring('\n'))
-        # if nfo and strm_path not exist
-        if not item.nfo:
-            if item.contentType == 'movie':
-                vl = xbmc.translatePath(filetools.join(config.get_setting("videolibrarypath"), config.get_setting("folder_movies")))
-                path = '%s [%s]' % (item.contentTitle, item.infoLabels['IMDBNumber'])
-                item.nfo = filetools.join(vl, path, path + '.nfo')
-                item.strm_path = filetools.join(path, item.contentTitle + '.strm')
-            else:
-                vl = xbmc.translatePath(filetools.join(config.get_setting("videolibrarypath"), config.get_setting("folder_tvshows")))
-                path = '%s [%s]' % (item.contentSerieName, item.infoLabels['IMDBNumber'])
-                item.nfo = filetools.join(vl, path, 'tvshow.nfo')
-                if item.contentSeason and item.contentEpisodeNumber:
-                    title = str(item.contentSeason) + 'x' + str(item.contentEpisodeNumber).zfill(2)
-                else:
-                    season, episode = scrapertools.find_single_match(item.title, r'(\d+)x(\d+)')
-                    title = season + 'x' + episode.zfill(2)
-                item.strm_path = filetools.join(path, title + '.strm')
-        condicion = config.get_setting("watched_setting", "videolibrary")
 
         time_limit = time.time() + 30
         while not platformtools.is_playing() and time.time() < time_limit:
             time.sleep(1)
 
-        sync_with_trakt = False
+        marked = False
+        next_episode = None
+        show_server = True
+
+        percentage = float(config.get_setting("watched_setting")) / 100
+        time_from_end = config.get_setting('next_ep_seconds')
+        if item.contentType != 'movie' and config.get_setting('next_ep'):
+            next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml']
+            next_ep_type = config.get_setting('next_ep_type')
+            ND = next_dialogs[next_ep_type]
+            next_episode = next_ep(item)
 
         while platformtools.is_playing():
-            tiempo_actual = xbmc.Player().getTime()
-            totaltime = xbmc.Player().getTotalTime()
+            actual_time = xbmc.Player().getTime()
+            total_time = xbmc.Player().getTotalTime()
+            if item_nfo.played_time and item_nfo.played_time > actual_time > 1:
+                xbmc.Player().seekTime(item_nfo.played_time)
+                item_nfo.played_time = 0 # Fix for Slow Devices
 
-            mark_time = 0
-            if condicion == 0:  # '5 minutos'
-                mark_time = 300
-            elif condicion == 1:  # '30%'
-                mark_time = totaltime * 0.3
-            elif condicion == 2:  # '50%'
-                mark_time = totaltime * 0.5
-            elif condicion == 3:  # '80%'
-                mark_time = totaltime * 0.8
-            elif condicion == 4:  # '0 seg'
-                mark_time = -1
+            mark_time = total_time * percentage
+            difference = total_time - actual_time
 
-            # logger.debug(str(tiempo_actual))
-            # logger.debug(str(mark_time))
-
-            if tiempo_actual > mark_time:
+            # Mark as Watched
+            if actual_time > mark_time and not marked:
                 logger.debug("Marked as Watched")
                 item.playcount = 1
-                sync_with_trakt = True
+                marked = True
+                show_server = False
                 from specials import videolibrary
                 videolibrary.mark_content_as_watched2(item)
-                break
+                if not next_episode:
+                    break
 
-            time.sleep(5)
+            # check for next Episode
+            if next_episode and marked and time_from_end >= difference:
+                nextdialog = NextDialog(ND, config.get_runtime_path())
+                nextdialog.show()
+                while platformtools.is_playing() and not nextdialog.is_exit():
+                    xbmc.sleep(100)
+                if nextdialog.continuewatching:
+                    next_episode.next_ep = True
+                    xbmc.Player().stop()
+                nextdialog.close()
+                break
+            xbmc.sleep(1000)
+
+        # Set played time
+        item_nfo.played_time = int(actual_time) if not marked and actual_time > 120 else 0
+        filetools.write(nfo_path, head_nfo + item_nfo.tojson())
 
         # Silent sync with Trakt
-        if sync_with_trakt and config.get_setting("trakt_sync"):
-            sync_trakt_kodi()
+        if marked and config.get_setting("trakt_sync"): sync_trakt_kodi()
 
-            # logger.debug("Fin del hilo")
+        while platformtools.is_playing():
+            xbmc.sleep(100)
+        if not show_server and item.play_from != 'window':
+            xbmc.sleep(700)
+            xbmc.executebuiltin('Action(Back)')
+            xbmc.sleep(500)
+        if next_episode and next_episode.next_ep:
+                from platformcode.launcher import play_from_library
+                return play_from_library(next_episode)
 
     # If it is configured to mark as seen
     if config.get_setting("mark_as_watched", "videolibrary"):
-        threading.Thread(target=mark_as_watched_subThread, args=[item]).start()
+        threading.Thread(target=mark_as_watched_subThread, args=[item, nfo_path, head_nfo, item_nfo]).start()
+
+
+
 
 
 def sync_trakt_addon(path_folder):
@@ -110,7 +121,7 @@ def sync_trakt_addon(path_folder):
         shows = list(shows.items())
 
         # we get the series id to compare
-        _id = re.findall("\[(.*?)\]", path_folder, flags=re.DOTALL)[0]
+        _id = re.findall(r"\[(.*?)\]", path_folder, flags=re.DOTALL)[0]
         logger.debug("the id is %s" % _id)
 
         if "tt" in _id:
@@ -152,7 +163,7 @@ def sync_trakt_addon(path_folder):
                         logger.debug("dict_trakt_show %s " % dict_trakt_show)
 
                         # we get the keys that are episodes
-                        regex_epi = re.compile('\d+x\d+')
+                        regex_epi = re.compile(r'\d+x\d+')
                         keys_episodes = [key for key in serie.library_playcounts if regex_epi.match(key)]
                         # we get the keys that are seasons
                         keys_seasons = [key for key in serie.library_playcounts if 'season ' in key]
@@ -210,14 +221,14 @@ def sync_trakt_kodi(silent=True):
     # So that the synchronization is not silent it is worth with silent = False
     if xbmc.getCondVisibility('System.HasAddon("script.trakt")'):
         notificacion = True
-        if (not config.get_setting("sync_trakt_notification", "videolibrary") and platformtools.is_playing()):
+        if not config.get_setting("sync_trakt_notification", "videolibrary") and platformtools.is_playing():
             notificacion = False
 
         xbmc.executebuiltin('RunScript(script.trakt,action=sync,silent=%s)' % silent)
         logger.info("Synchronization with Trakt started")
 
         if notificacion:
-            platformtools.dialog_notification(config.get_localized_string(20000), config.get_localized_string(60045), time=2000)
+            platformtools.dialog_notification(config.get_localized_string(20000), config.get_localized_string(60045), sound=False, time=2000)
 
 
 def mark_content_as_watched_on_kodi(item, value=1):
@@ -276,7 +287,6 @@ def mark_content_as_watched_on_kodi(item, value=1):
             path = filetools.join(tail, filename)
 
             for d in data['result']['episodes']:
-
                 if d['file'].replace("/", "\\").endswith(path.replace("/", "\\")):
                     # logger.debug("I mark the episode as seen")
                     episodeid = d['episodeid']
@@ -376,7 +386,7 @@ def mark_content_as_watched_on_kod(path):
         path1 = path.replace("\\\\", "\\")                              # Windows format
         if not path2:
             path2 = path1.replace("\\", "/")                            # Format no Windows
-        nfo_name = scrapertools.find_single_match(path2, '\]\/(.*?)$')  # I build the name of the .nfo
+        nfo_name = scrapertools.find_single_match(path2, r'\]\/(.*?)$')  # I build the name of the .nfo
         path1 = path1.replace(nfo_name, '')                             # for SQL I just need the folder
         path2 = path2.replace(nfo_name, '')                             # for SQL I just need the folder
     path2 = filetools.remove_smb_credential(path2)                      # If the file is on an SMB server, we remove the credentials
@@ -394,7 +404,7 @@ def mark_content_as_watched_on_kod(path):
         if contentType == "episode_view":
             title_plain = title.replace('.strm', '')                    # If it is Serial, we remove the suffix .strm
         else:
-            title_plain = scrapertools.find_single_match(item.strm_path, '.(.*?\s\[.*?\])') # if it's a movie, we remove the title
+            title_plain = scrapertools.find_single_match(item.strm_path, r'.(.*?\s\[.*?\])') # if it's a movie, we remove the title
         if playCount is None or playCount == 0:                         # not yet seen, we set it to 0
             playCount_final = 0
         elif playCount >= 1:
@@ -409,7 +419,7 @@ def mark_content_as_watched_on_kod(path):
     if item.infoLabels['mediatype'] == "tvshow":                        # We update the Season and Series playCounts
         for season in item.library_playcounts:
             if "season" in season:                                      # we look for the tags "season" inside playCounts
-                season_num = int(scrapertools.find_single_match(season, 'season (\d+)'))    # we save the season number
+                season_num = int(scrapertools.find_single_match(season, r'season (\d+)'))    # we save the season number
                 item = videolibrary.check_season_playcount(item, season_num)    # We call the method that updates Temps. and series
 
     filetools.write(path, head_nfo + item.tojson())
@@ -497,7 +507,7 @@ def update(folder_content=config.get_setting("folder_tvshows"), folder=""):
             # update_path = filetools.join(videolibrarypath, folder_content, folder) + "/"   # Encoder problems in "folder"
             update_path = filetools.join(videolibrarypath, folder_content, ' ').rstrip()
 
-        if videolibrarypath.startswith("special:") or not scrapertools.find_single_match(update_path, '(^\w+:\/\/)'):
+        if videolibrarypath.startswith("special:") or not scrapertools.find_single_match(update_path, r'(^\w+:\/\/)'):
             payload["params"] = {"directory": update_path}
 
     while xbmc.getCondVisibility('Library.IsScanningVideo()'):
@@ -539,7 +549,7 @@ def set_content(content_type, silent=False, custom=False):
             if not xbmc.getCondVisibility('System.HasAddon(metadata.themoviedb.org)'):
                 if not silent:
                     # Ask if we want to install metadata.themoviedb.org
-                    install = platformtools.dialog_yesno(config.get_localized_string(60046))
+                    install = platformtools.dialog_yesno(config.get_localized_string(60046),'')
                 else:
                     install = True
 
@@ -563,7 +573,7 @@ def set_content(content_type, silent=False, custom=False):
                 continuar = False
                 if not silent:
                     # Ask if we want to install metadata.universal
-                    install = platformtools.dialog_yesno(config.get_localized_string(70095))
+                    install = platformtools.dialog_yesno(config.get_localized_string(70095),'')
                 else:
                     install = True
 
@@ -593,7 +603,7 @@ def set_content(content_type, silent=False, custom=False):
             if not xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)'):
                 if not silent:
                     #Ask if we want to install metadata.tvdb.com
-                    install = platformtools.dialog_yesno(config.get_localized_string(60048))
+                    install = platformtools.dialog_yesno(config.get_localized_string(60048),'')
                 else:
                     install = True
 
@@ -617,7 +627,7 @@ def set_content(content_type, silent=False, custom=False):
                 continuar = False
                 if not silent:
                     # Ask if we want to install metadata.tvshows.themoviedb.org
-                    install = platformtools.dialog_yesno(config.get_localized_string(60050))
+                    install = platformtools.dialog_yesno(config.get_localized_string(60050),'')
                 else:
                     install = True
 
@@ -651,7 +661,7 @@ def set_content(content_type, silent=False, custom=False):
         if sql_videolibrarypath.startswith("special://"):
             sql_videolibrarypath = sql_videolibrarypath.replace('/profile/', '/%/').replace('/home/userdata/', '/%/')
             sep = '/'
-        elif scrapertools.find_single_match(sql_videolibrarypath, '(^\w+:\/\/)'):
+        elif scrapertools.find_single_match(sql_videolibrarypath, r'(^\w+:\/\/)'):
             sep = '/'
         else:
             sep = os.sep
@@ -1228,4 +1238,110 @@ def ask_set_content(silent=False):
     # configuration from the settings menu
     else:
         platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80023))
-        do_config(True)
\ No newline at end of file
+        do_config(True)
+
+
+def next_ep(item):
+    from core.item import Item
+    logger.info()
+    item.next_ep = False
+
+    # check if next file exist
+    current_filename = filetools.basename(item.strm_path)
+    base_path = filetools.basename(filetools.dirname(item.strm_path))
+    path = filetools.join(config.get_videolibrary_path(), config.get_setting("folder_tvshows"),base_path)
+    fileList = []
+    for file in filetools.listdir(path):
+        if file.endswith('.strm'):
+            fileList.append(file)
+    fileList.sort()
+
+    nextIndex = fileList.index(current_filename) + 1
+    if nextIndex == 0 or nextIndex == len(fileList): next_file = None
+    else: next_file = fileList[nextIndex]
+    logger.info('Next File:' + str(next_file))
+
+    # start next episode window afther x time
+    if next_file:
+        season_ep = next_file.split('.')[0]
+        season = season_ep.split('x')[0]
+        episode = season_ep.split('x')[1]
+        next_ep = '%sx%s' % (season, episode)
+        item = Item(
+            action= 'play_from_library',
+            channel= 'videolibrary',
+            contentEpisodeNumber= episode,
+            contentSeason= season,
+            contentTitle= next_ep,
+            contentType= 'episode',
+            infoLabels= {'episode': episode, 'mediatype': 'episode', 'season': season, 'title': next_ep},
+            strm_path= filetools.join(base_path, next_file),
+            play_from = item.play_from)
+
+        global INFO
+        INFO = filetools.join(path, next_file.replace("strm", "nfo"))
+    else:
+        item=None
+
+    return item
+
+
+class NextDialog(xbmcgui.WindowXMLDialog):
+    item = None
+    cancel = False
+    EXIT = False
+    continuewatching = True
+
+    def __init__(self, *args, **kwargs):
+        self.action_exitkeys_id = [xbmcgui.ACTION_STOP, xbmcgui.ACTION_BACKSPACE, xbmcgui.ACTION_PREVIOUS_MENU, xbmcgui.ACTION_NAV_BACK]
+        self.progress_control = None
+
+        # set info
+        f = filetools.file_open(INFO, 'r')
+        full_info = f.read().split('\n')
+        full_info = full_info[1:]
+        f.close()
+        full_info = "".join(full_info)
+        info = jsontools.load(full_info)
+        if "thumbnail" in info:
+            img = info["thumbnail"]
+        else:
+            img = filetools.join(config.get_runtime_path(), "resources", "noimage.png")
+        self.setProperty("next_img", img)
+        info = info["infoLabels"]
+        self.setProperty("title", info["tvshowtitle"])
+        self.setProperty("ep_title", "%dx%02d - %s" % (info["season"], info["episode"], info["title"]))
+
+    def set_exit(self, EXIT):
+        self.EXIT = EXIT
+
+    def set_continue_watching(self, continuewatching):
+        self.continuewatching = continuewatching
+
+    def is_exit(self):
+        return self.EXIT
+
+    def onFocus(self, controlId):
+        pass
+
+    def doAction(self):
+        pass
+
+    def closeDialog(self):
+        self.close()
+
+    def onClick(self, controlId):
+        if controlId == 3012:  # Still watching
+            self.set_exit(True)
+            self.set_continue_watching(True)
+            self.close()
+        elif controlId == 3013:  # Cancel
+            self.set_exit(True)
+            self.set_continue_watching(False)
+            self.close()
+
+    def onAction(self, action):
+        if action in self.action_exitkeys_id:
+            self.set_exit(True)
+            self.set_continue_watching(False)
+            self.close()
\ No newline at end of file
diff --git a/resources/language/English/strings.po b/resources/language/resource.language.en_gb/strings.po
similarity index 99%
rename from resources/language/English/strings.po
rename to resources/language/resource.language.en_gb/strings.po
index 14ff4e04..c4f3db0d 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -191,6 +191,14 @@ msgctxt "#30044"
 msgid "Play mode"
 msgstr ""
 
+msgctxt "#30045"
+msgid "Resume from:"
+msgstr ""
+
+msgctxt "#30046"
+msgid "Resume from start"
+msgstr ""
+
 msgctxt "#30050"
 msgid "Server connection error"
 msgstr ""
@@ -223,6 +231,10 @@ msgctxt "#30068"
 msgid "Filter by servers"
 msgstr ""
 
+msgctxt "#30069"
+msgid "Priority to quality"
+msgstr ""
+
 msgctxt "#30100"
 msgid "Settings"
 msgstr ""
diff --git a/resources/language/Italian/strings.po b/resources/language/resource.language.it_it/strings.po
similarity index 99%
rename from resources/language/Italian/strings.po
rename to resources/language/resource.language.it_it/strings.po
index da8273c8..d444157b 100644
--- a/resources/language/Italian/strings.po
+++ b/resources/language/resource.language.it_it/strings.po
@@ -191,6 +191,14 @@ msgctxt "#30044"
 msgid "Play mode"
 msgstr "Modalità di riproduzione"
 
+msgctxt "#30045"
+msgid "Resume from:"
+msgstr "Riprendi da:"
+
+msgctxt "#30046"
+msgid "Resume from start"
+msgstr "Riprendi dall'inizio"
+
 msgctxt "#30050"
 msgid "Server connection error"
 msgstr "Errore connessione server"
@@ -223,6 +231,10 @@ msgctxt "#30068"
 msgid "Filter by servers"
 msgstr "Filtra per server"
 
+msgctxt "#30069"
+msgid "Priority to quality"
+msgstr "Priorità alla qualità"
+
 msgctxt "#30100"
 msgid "Settings"
 msgstr "Impostazioni"
diff --git a/resources/settings.xml b/resources/settings.xml
index 68732e9c..f5bcae06 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -20,7 +20,10 @@
         <setting id="player_mode" type="select" lvalues="30026|30027|30028|30029" label="30044" default="1"/>
         <setting id="default_action" type="select" lvalues="30006|30007|30008" label="30005" default="0"/>
         <setting id="autoplay" type="bool" label="70562" default="false" visible="true"/>
-        <setting id="hide_servers" type="bool" label="70747" default="false" visible="eq(-1,true)" subsetting="true"/>
+        <setting id="servers_favorites" visible="eq(-1,true)" subsetting="true" type="action" label="60551" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAic2VydmVyc19mYXZvcml0ZXMiLA0KICAgICJjaGFubmVsIjogInNldHRpbmciDQp9==)"/>
+        <setting id="servers_blacklist" visible="eq(-2,true)" subsetting="true" type="action" label="60550" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAic2VydmVyc19ibGFja2xpc3QiLA0KICAgICJjaGFubmVsIjogInNldHRpbmciDQp9==)"/>
+
+        <!-- <setting id="hide_servers" type="bool" label="70747" default="false" visible="eq(-1,true)" subsetting="true"/> -->
         <setting id="checklinks" type="bool" label="30020" default="false"/>
         <setting id="checklinks_number" type="slider" option="int" range="5,5,20" label="30021" default="5" visible="eq(-1,true)" subsetting="true"/>
     </category>
@@ -35,9 +38,10 @@
         <setting id="videolibrary_kodi" type="bool" label="70120" default="false"/>
         <setting label="59997" type="lsep"/>
         <setting id="videolibrary_max_quality" type="bool" label="70729" default="false" visible="true"/>
-        <setting id="next_ep" type="select" label="70746" lvalues="70752|70747|70748" default="0"/>
-        <setting id="next_ep_type" type="select" label="70754" lvalues="70755|70756|70757" default="0" visible="eq(-1,2)" subsetting="true"/>
-        <setting id="next_ep_seconds" type="slider" option="int" range="20,10,120" label="70749" default="40" visible="!eq(-2,0)" subsetting="true"/>
+        <setting id="next_ep" type="bool" label="70748" default="true"/>
+        <setting id="next_ep_type" type="select" label="70754" lvalues="70755|70756|70757" default="0" visible="eq(-1,true)" subsetting="true"/>
+        <setting id="next_ep_seconds" type="slider" option="int" range="20,10,240" label="70749" default="40" visible="eq(-2,true)" subsetting="true"/>
+        <setting id="watched_setting" type="slider" option="int" range="20,5,90" label="60634" default="80"/>
         <setting id="trakt_sync" type="bool" label="70109" default="false"/>
         <setting label="30030" type="lsep"/>
         <setting id="vidolibrary_preferences" type="action" label="60542" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAiY2hhbm5lbF9jb25maWciLA0KICAgICJjaGFubmVsIjogInZpZGVvbGlicmFyeSINCn0==)"/>
@@ -63,8 +67,9 @@
         <setting id="hidepremium" type="bool" label="70112" default="false"/>
         <setting id="httptools_timeout" type="slider" option="int" range="0,5,120" label="70580" default="15"/>
         <setting label="70145" type="lsep"/>
-        <setting id="servers_favorites" type="action" label="60551" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAic2VydmVyc19mYXZvcml0ZXMiLA0KICAgICJjaGFubmVsIjogInNldHRpbmciDQp9==)"/>
-        <setting id="servers_blacklist" type="action" label="60550" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAic2VydmVyc19ibGFja2xpc3QiLA0KICAgICJjaGFubmVsIjogInNldHRpbmciDQp9==)"/>
+        <setting id="favorites_servers" type="bool" label="60551" default="false" visible="false"/>
+        <setting id="quality_priority" type="bool" label="30069" default="false" visible="false"/>
+
         <setting id="servers_config" type="action" label="60538" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAic2VydmVyc19tZW51IiwNCiAgICAiY2hhbm5lbCI6ICJzaG9ydGN1dHMiDQp9==)"/>
         <setting id="debriders_config" type="action" label="60552" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAic2VydmVyc19tZW51IiwNCiAgICAiY2hhbm5lbCI6ICJzaG9ydGN1dHMiLA0KCSJ0eXBlIjogImRlYnJpZGVycyINCn0==)"/>
         <setting label="70578" type="lsep"/>
@@ -158,7 +163,7 @@
         <!-- <setting id="category" type="select" label="70124" lvalues="70137|30123|30124|60513" default="Film" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/> -->
 		<!-- Others -->
         <setting label="70149" type="lsep"/>
-        <setting id="icon_set" type="select" label="70108" values="default|light|dark|alfa|mike" default="default"/>
+        <setting id="icon_set" type="select" label="70108" values="default|light|dark|mike" default="default"/>
         <setting id="only_channel_icons" type="bool" label="30009" default="false"/>
         <setting id="enable_custom_theme" type="bool" label="70564" default="false"/>
         <setting id="custom_theme" type="folder" label="70565" default="" visible="eq(-1,true)"/>
diff --git a/resources/skins/Default/720p/ChannelSettings.xml b/resources/skins/Default/720p/ChannelSettings.xml
index e1e5c565..ebb5d276 100644
--- a/resources/skins/Default/720p/ChannelSettings.xml
+++ b/resources/skins/Default/720p/ChannelSettings.xml
@@ -19,7 +19,7 @@
         <control type="image">
           <width>100%</width>
           <height>100%</height>
-          <texture colordiffuse="FF232323">Shortcut/white.png</texture>
+          <texture colordiffuse="FF232323">white.png</texture>
         </control>
         <!-- Divider -->
         <control type="image">
@@ -27,7 +27,7 @@
           <right>0</right>
           <width>100%</width>
           <height>1</height>
-          <texture colordiffuse="33FFFFFF">Shortcut/white.png</texture>
+          <texture colordiffuse="33FFFFFF">white.png</texture>
         </control>
         <!-- Header -->
         <control type="label" id="10002">
@@ -47,8 +47,8 @@
           <top>25</top>
           <width>30</width>
           <height>30</height>
-          <texturefocus colordiffuse="FFFFFFFF">Controls/DialogCloseButton-focus.png</texturefocus>
-          <texturenofocus colordiffuse="55FFFFFF">Controls/DialogCloseButton-focus.png</texturenofocus>
+          <texturefocus colordiffuse="FFFFFFFF">close.png</texturefocus>
+          <texturenofocus colordiffuse="55FFFFFF">close.png</texturenofocus>
         </control>
         <!-- OK -->
         <control type="button" id="10004">
@@ -58,8 +58,8 @@
           <height>60</height>
           <textwidth>110</textwidth>
           <textcolor>FFFFFFFF</textcolor>
-          <texturefocus colordiffuse="FF0081C2">Shortcut/white.png</texturefocus>
-          <texturenofocus colordiffuse="FF191919">Shortcut/white.png</texturenofocus>
+          <texturefocus colordiffuse="FF0081C2">white.png</texturefocus>
+          <texturenofocus colordiffuse="FF191919">white.png</texturenofocus>
           <align>center</align>
           <aligny>center</aligny>
           <label>$ADDON[plugin.video.kod 70001]</label>
@@ -72,8 +72,8 @@
           <height>60</height>
           <textwidth>110</textwidth>
           <textcolor>FFFFFFFF</textcolor>
-          <texturefocus colordiffuse="FF0081C2">Shortcut/white.png</texturefocus>
-          <texturenofocus colordiffuse="FF191919">Shortcut/white.png</texturenofocus>
+          <texturefocus colordiffuse="FF0081C2">white.png</texturefocus>
+          <texturenofocus colordiffuse="FF191919">white.png</texturenofocus>
           <align>center</align>
           <aligny>center</aligny>
           <label>$ADDON[plugin.video.kod 70002]</label>
@@ -86,8 +86,8 @@
           <height>60</height>
           <textwidth>110</textwidth>
           <textcolor>FFFFFFFF</textcolor>
-          <texturefocus colordiffuse="FF0081C2">Shortcut/white.png</texturefocus>
-          <texturenofocus colordiffuse="FF191919">Shortcut/white.png</texturenofocus>
+          <texturefocus colordiffuse="FF0081C2">white.png</texturefocus>
+          <texturenofocus colordiffuse="FF191919">white.png</texturenofocus>
           <align>center</align>
           <aligny>center</aligny>
           <label>$ADDON[plugin.video.kod 70003]</label>
@@ -102,7 +102,7 @@
             <top>0</top>
             <left>0</left>
             <width>900</width>
-            <height>680</height>
+            <height>580</height>
             <font>font20</font>
             <textcolor>FFFFFFFF</textcolor>
             <align>center</align>
@@ -116,14 +116,14 @@
           <right>0</right>
           <width>10</width>
           <height>540</height>
-          <texture border="2" colordiffuse="FF232323">Shortcut/white.png</texture>
+          <texture border="2" colordiffuse="FF232323">white.png</texture>
         </control>
         <control type="image" id="10009">
           <top>120</top>
           <right>0</right>
           <width>10</width>
           <height>540</height>
-          <texture border="2" colordiffuse="33FFFFFF">Shortcut/white.png</texture>
+          <texture border="2" colordiffuse="33FFFFFF">white.png</texture>
         </control>
       </control>
     </controls>
diff --git a/resources/skins/Default/720p/DarkShortCutMenu.xml b/resources/skins/Default/720p/DarkShortCutMenu.xml
index cee155c4..037af2a7 100644
--- a/resources/skins/Default/720p/DarkShortCutMenu.xml
+++ b/resources/skins/Default/720p/DarkShortCutMenu.xml
@@ -12,8 +12,8 @@
 			<top>0</top>
 			<width>100%</width>
 			<height>100%</height>
-			<texturefocus colordiffuse="80DCDCDC">Shortcut/white.png</texturefocus>
-			<texturenofocus colordiffuse="80DCDCDC">Shortcut/white.png</texturenofocus>
+			<texturefocus colordiffuse="80DCDCDC">white.png</texturefocus>
+			<texturenofocus colordiffuse="80DCDCDC">white.png</texturenofocus>
 			<animation effect="fade" time="200">WindowOpen</animation>
 			<animation effect="fade" time="200">WindowClose</animation>
 			<onclick>Action(close)</onclick>
@@ -39,9 +39,9 @@
 				<top>219</top>
 				<width>1100</width>
 				<height>10</height>
-				<texturesliderbackground colordiffuse="FFDCDCDC">Shortcut/white.png</texturesliderbackground>
-				<texturesliderbar colordiffuse="FF1f1f1f">Shortcut/white.png</texturesliderbar>
-				<texturesliderbarfocus colordiffuse="FF0082C2">Shortcut/white.png</texturesliderbarfocus>
+				<texturesliderbackground colordiffuse="FFDCDCDC">white.png</texturesliderbackground>
+				<texturesliderbar colordiffuse="FF1f1f1f">white.png</texturesliderbar>
+				<texturesliderbarfocus colordiffuse="FF0082C2">white.png</texturesliderbarfocus>
 				<showonepage>false</showonepage>
 				<orientation>horizontal</orientation>
 				<ondown>32500</ondown>
@@ -50,7 +50,7 @@
 			<control type="image">
 				<width>1100</width>
 				<height>218</height>
-				<texture colordiffuse="FFDCDCDC">Shortcut/white.png</texture>
+				<texture colordiffuse="FFDCDCDC">white.png</texture>
 			</control>
 			<control type="list" id="32500">
 				<left>-130</left>
@@ -78,7 +78,7 @@
 						<top>1</top>
 						<width>220</width>
 						<height>218</height>
-						<texture colordiffuse="FF0082C2">Shortcut/white.png</texture>
+						<texture colordiffuse="FF0082C2">white.png</texture>
 					</control>
 					<control type="textbox">
 						<left>0</left>
diff --git a/resources/skins/Default/720p/InfoWindow.xml b/resources/skins/Default/720p/InfoWindow.xml
index d971eff0..27045eb4 100644
--- a/resources/skins/Default/720p/InfoWindow.xml
+++ b/resources/skins/Default/720p/InfoWindow.xml
@@ -18,7 +18,7 @@
         <control type="image">
           <width>100%</width>
           <height>100%</height>
-          <texture colordiffuse="FF232323">Shortcut/white.png</texture>
+          <texture colordiffuse="FF232323">white.png</texture>
         </control>
         <!-- FANART -->
         <control type="image" id="10004">
@@ -47,8 +47,8 @@
           <top>25</top>
           <width>30</width>
           <height>30</height>
-          <texturefocus colordiffuse="FFFFFFFF">Controls/DialogCloseButton-focus.png</texturefocus>
-          <texturenofocus colordiffuse="55FFFFFF">Controls/DialogCloseButton-focus.png</texturenofocus>
+          <texturefocus colordiffuse="FFFFFFFF">close.png</texturefocus>
+          <texturenofocus colordiffuse="55FFFFFF">close.png</texturenofocus>
         </control>
         <!-- LOCANDINA -->
         <control type="image" id="10005"> 
@@ -315,8 +315,8 @@
             <width>200</width>
             <height>50</height>
             <textwidth>110</textwidth>
-            <texturefocus colordiffuse="FF0081C2">Shortcut/white.png</texturefocus>
-            <texturenofocus colordiffuse="000081C2">Shortcut/white.png</texturenofocus>
+            <texturefocus colordiffuse="FF0081C2">white.png</texturefocus>
+            <texturenofocus colordiffuse="000081C2">white.png</texturenofocus>
             <align>center</align>
             <aligny>center</aligny>
             <label>$ADDON[plugin.video.kod 70005]</label>
@@ -327,8 +327,8 @@
             <width>200</width>
             <height>50</height>
             <textwidth>110</textwidth>
-            <texturefocus colordiffuse="FF0081C2">Shortcut/white.png</texturefocus>
-            <texturenofocus colordiffuse="000081C2">Shortcut/white.png</texturenofocus>
+            <texturefocus colordiffuse="FF0081C2">white.png</texturefocus>
+            <texturenofocus colordiffuse="000081C2">white.png</texturenofocus>
             <align>center</align>
             <aligny>center</aligny>
             <label>$ADDON[plugin.video.kod 70006]</label>
@@ -339,8 +339,8 @@
             <width>200</width>
             <height>50</height>
             <textwidth>110</textwidth>
-            <texturefocus colordiffuse="FF0081C2">Shortcut/white.png</texturefocus>
-            <texturenofocus colordiffuse="000081C2">Shortcut/white.png</texturenofocus>
+            <texturefocus colordiffuse="FF0081C2">white.png</texturefocus>
+            <texturenofocus colordiffuse="000081C2">white.png</texturenofocus>
             <align>center</align>
             <aligny>center</aligny>
             <label>$ADDON[plugin.video.kod 70002]</label>
@@ -351,8 +351,8 @@
             <width>200</width>
             <height>50</height>
             <textwidth>110</textwidth>
-            <texturefocus colordiffuse="FF0081C2">Shortcut/white.png</texturefocus>
-            <texturenofocus colordiffuse="000081C2">Shortcut/white.png</texturenofocus>
+            <texturefocus colordiffuse="FF0081C2">white.png</texturefocus>
+            <texturenofocus colordiffuse="000081C2">white.png</texturenofocus>
             <align>center</align>
             <aligny>center</aligny>
             <label>$ADDON[plugin.video.kod 70007]</label>
diff --git a/resources/skins/Default/720p/NextDialog.xml b/resources/skins/Default/720p/NextDialog.xml
index 4b5fbbb9..fd1e5a83 100644
--- a/resources/skins/Default/720p/NextDialog.xml
+++ b/resources/skins/Default/720p/NextDialog.xml
@@ -5,82 +5,60 @@
     <onload>Dialog.Close(videoosd,true)</onload>
     <controls>
         <control type="group">
+            <top>0</top>
+            <right>0</right>
+            <width>100%</width>
             <animation type="WindowOpen" reversible="false">
-                <effect type="fade" start="0" end="100" time="600" />
-                <effect type="slide" start="115,0" end="0,0" time="600" />
+                <effect type="fade" start="0" end="100" time="400" />
+                <effect type="slide" start="115,0" end="0,0" time="400" />
             </animation>
             <animation type="WindowClose" reversible="false">
-                <effect type="fade" start="100" end="0" time="400" />
-                <effect type="slide" start="0,0" end="115,0" time="400" />
+                <effect type="fade" start="100" end="0" time="300" />
+                <effect type="slide" start="0,0" end="115,0" time="300" />
             </animation>
-            <control type="group">
-                <right>0</right>
+            <control type="grouplist" id="20">
+                <orientation>horizontal</orientation>
                 <top>15</top>
                 <height>40</height>
-                <width>100%</width>
-                <!-- Background -->
-                <control type="image">
-                    <top>0</top>
-                    <width>100%</width>
+                <itemgap>0</itemgap>
+                <align>right</align>
+                <control type="button" id="3012">
+                    <label>$INFO[Window.Property(title)] - $INFO[Window.Property(ep_title)] | $INFO[Player.TimeRemaining(secs),,]</label>
                     <height>40</height>
-                    <texture colordiffuse="00111111">NextDialog/background-diffuse.png</texture>
+                    <width min="50">auto</width>
+                    <font>font30_title</font>
+                    <textoffsetx>20</textoffsetx>
+                    <textcolor>80FFFFFF</textcolor>
+                    <focusedcolor>FFFFFFFF</focusedcolor>
+                    <selectedcolor>80FFFFFF</selectedcolor>
+                    <shadowcolor>22000000</shadowcolor>
+                    <aligny>center</aligny>
+                    <align>center</align>
+                    <texturefocus border="10" colordiffuse="88232323">white.png</texturefocus>
+                    <texturenofocus border="10" colordiffuse="88232323">white.png</texturenofocus>
+                    <pulseonselect>no</pulseonselect>
                 </control>
-                <control type="group">
+                <control type="button" id="3013">
+                    <label>$ADDON[plugin.video.kod  60396]</label>
+                    <height>40</height>
+                    <width min="50">auto</width>
+                    <font>font30_title</font>
+                    <textoffsetx>20</textoffsetx>
+                    <textcolor>80FFFFFF</textcolor>
+                    <focusedcolor>FFFFFFFF</focusedcolor>
+                    <selectedcolor>80FFFFFF</selectedcolor>
+                    <shadowcolor>22000000</shadowcolor>
+                    <aligny>center</aligny>
+                    <align>center</align>
+                    <texturefocus border="10" colordiffuse="88232323">white.png</texturefocus>
+                    <texturenofocus border="10" colordiffuse="88232323">white.png</texturenofocus>
+                    <pulseonselect>no</pulseonselect>
+                </control>
+                    <control type="image">
                     <top>0</top>
-                    <right>0</right>
-                    <width>100%</width>
-                    <!-- buttons -->
-                    <control type="button" id="3012">
-                        <left>-1000</left>
-                        <top>-1000</top>
-                        <height>1</height>
-                        <width>1</width>
-                    </control>
-                    <control type="grouplist" id="20">
-                        <orientation>horizontal</orientation>
-                        <height>40</height>
-                        <itemgap>0</itemgap>
-                        <align>right</align>
-                        <control type="button" id="11">
-                            <label>$INFO[Window.Property(title)] | $INFO[Window.Property(ep_title)] | $INFO[Player.TimeRemaining(secs),,]</label>
-                            <onclick>SendClick(3012)</onclick>
-                            <height>40</height>
-                            <width min="50">auto</width>
-                            <font>font30_title</font>
-                            <textoffsetx>20</textoffsetx>
-                            <textcolor>80FFFFFF</textcolor>
-                            <focusedcolor>FFFFFFFF</focusedcolor>
-                            <selectedcolor>80FFFFFF</selectedcolor>
-                            <shadowcolor>22000000</shadowcolor>
-                            <aligny>center</aligny>
-                            <align>center</align>
-                            <texturefocus border="10" colordiffuse="88232323">NextDialog/background-diffuse.png</texturefocus>
-                            <texturenofocus border="10" colordiffuse="88232323">NextDialog/background-diffuse.png</texturenofocus>
-                            <pulseonselect>no</pulseonselect>
-                        </control>
-                        <control type="button" id="3013">
-                            <label>$ADDON[plugin.video.kod  60396]</label>
-                            <height>40</height>
-                            <width min="50">auto</width>
-                            <font>font30_title</font>
-                            <textoffsetx>20</textoffsetx>
-                            <textcolor>80FFFFFF</textcolor>
-                            <focusedcolor>FFFFFFFF</focusedcolor>
-                            <selectedcolor>80FFFFFF</selectedcolor>
-                            <shadowcolor>22000000</shadowcolor>
-                            <aligny>center</aligny>
-                            <align>center</align>
-                            <texturefocus border="10" colordiffuse="88232323">NextDialog/background-diffuse.png</texturefocus>
-                            <texturenofocus border="10" colordiffuse="88232323">NextDialog/background-diffuse.png</texturenofocus>
-                            <pulseonselect>no</pulseonselect>
-                        </control>
-                            <control type="image">
-                            <top>0</top>
-                            <width>30</width>
-                            <height>40</height>
-                            <texture colordiffuse="88232323">NextDialog/background-diffuse.png</texture>
-                        </control>
-                    </control>
+                    <width>30</width>
+                    <height>40</height>
+                    <texture colordiffuse="88232323">white.png</texture>
                 </control>
             </control>
         </control>
diff --git a/resources/skins/Default/720p/NextDialogCompact.xml b/resources/skins/Default/720p/NextDialogCompact.xml
index dd348317..740f674b 100644
--- a/resources/skins/Default/720p/NextDialogCompact.xml
+++ b/resources/skins/Default/720p/NextDialogCompact.xml
@@ -5,83 +5,63 @@
     <onload>Dialog.Close(videoosd,true)</onload>
     <controls>
         <control type="group">
+            <top>15</top>
+            <right>0</right>
+            <width>140</width>
+            <height>40</height>
             <animation type="WindowOpen" reversible="false">
-                <effect type="fade" start="0" end="100" time="600" />
-                <effect type="slide" start="115,0" end="0,0" time="600" />
+                <effect type="fade" start="0" end="100" time="400" />
+                <effect type="slide" start="115,0" end="0,0" time="400" />
             </animation>
             <animation type="WindowClose" reversible="false">
-                <effect type="fade" start="100" end="0" time="400" />
-                <effect type="slide" start="0,0" end="115,0" time="400" />
+                <effect type="fade" start="100" end="0" time="300" />
+                <effect type="slide" start="0,0" end="115,0" time="300" />
             </animation>
-            <control type="group">
+            <control type="image">
+                <top>0</top>
                 <right>0</right>
-                <top>15</top>
-                <height>50</height>
                 <width>100%</width>
-                <!-- Background -->
-                <control type="image">
-                    <top>0</top>
-                    <width>100%</width>
+                <height>100%</height>
+                <texture colordiffuse="80232323">white.png</texture>
+            </control>
+            <control type="grouplist" id="20">
+                <orientation>horizontal</orientation>
+                <top>0</top>
+                <right>20</right>
+                <height>40</height>
+                <itemgap>0</itemgap>
+                <align>right</align>
+                <control type="button" id="3012">
+                    <label>[B]$INFO[Player.TimeRemaining(secs),,][/B]</label>
                     <height>40</height>
-                    <!-- <texture colordiffuse="00111111">NextDialog/button-bg.png</texture> -->
+                    <width>80</width>
+                    <font>font30_title</font>
+                    <textoffsetx>10</textoffsetx>
+                    <textcolor>80FFFFFF</textcolor>
+                    <focusedcolor>FFFFFFFF</focusedcolor>
+                    <selectedcolor>80FFFFFF</selectedcolor>
+                    <shadowcolor>22000000</shadowcolor>
+                    <aligny>center</aligny>
+                    <align>left</align>
+                    <texturefocus border="0" colordiffuse="FFFFFFFF">NextDialog/play.png</texturefocus>
+                    <texturenofocus border="0" colordiffuse="80FFFFFF">NextDialog/play.png</texturenofocus>
+                    <pulseonselect>no</pulseonselect>
                 </control>
-                <control type="group">
-                    <top>0</top>
-                    <right>0</right>
-                    <width>100%</width>
-                    <!-- buttons -->
-                    <control type="button" id="3012">
-                        <left>-1000</left>
-                        <top>-1000</top>
-                        <height>1</height>
-                        <width>1</width>
-                    </control>
-                    <control type="grouplist" id="20">
-                        <orientation>horizontal</orientation>
-                        <height>40</height>
-                        <itemgap>0</itemgap>
-                        <align>right</align>
-                        <control type="button" id="11">
-                            <label>[B]$INFO[Player.TimeRemaining(secs),,][/B]</label>
-                            <onclick>SendClick(3012)</onclick>
-                            <!-- <visible>!Integer.IsGreater(Player.TimeRemaining,59)</visible> -->
-                            <height>40</height>
-                            <width>100</width>
-                            <font>font30_title</font>
-                            <textoffsetx>12</textoffsetx>
-                            <textcolor>80FFFFFF</textcolor>
-                            <focusedcolor>FFFFFFFF</focusedcolor>
-                            <selectedcolor>80FFFFFF</selectedcolor>
-                            <shadowcolor>22000000</shadowcolor>
-                            <aligny>center</aligny>
-                            <align>left</align>
-                            <texturefocus border="10">NextDialog/play-fo.png</texturefocus>
-                            <texturenofocus border="10">NextDialog/play-nf.png</texturenofocus>
-                            <pulseonselect>no</pulseonselect>
-                        </control>
-                        <control type="button" id="3013">
-                            <label></label>
-                            <height>40</height>
-                            <width>40</width>
-                            <font>font30_title</font>
-                            <textoffsetx>30</textoffsetx>
-                            <textcolor>80FFFFFF</textcolor>
-                            <focusedcolor>FFFFFFFF</focusedcolor>
-                            <selectedcolor>80FFFFFF</selectedcolor>
-                            <shadowcolor>22000000</shadowcolor>
-                            <aligny>center</aligny>
-                            <align>center</align>
-                            <texturefocus border="10">NextDialog/close-fo.png</texturefocus>
-                            <texturenofocus border="10">NextDialog/close-nf.png</texturenofocus>
-                            <pulseonselect>no</pulseonselect>
-                        </control>
-                            <control type="image">
-                            <top>0</top>
-                            <width>20</width>
-                            <height>40</height>
-                            <texture>NextDialog/background.png</texture>
-                        </control>
-                    </control>
+                <control type="button" id="3013">
+                    <label></label>
+                    <height>40</height>
+                    <width>40</width>
+                    <font>font30_title</font>
+                    <textoffsetx>30</textoffsetx>
+                    <textcolor>80FFFFFF</textcolor>
+                    <focusedcolor>FFFFFFFF</focusedcolor>
+                    <selectedcolor>80FFFFFF</selectedcolor>
+                    <shadowcolor>22000000</shadowcolor>
+                    <aligny>center</aligny>
+                    <align>center</align>
+                    <texturefocus border="10" colordiffuse="FFFFFFFF">NextDialog/close.png</texturefocus>
+                    <texturenofocus border="10" colordiffuse="80FFFFFF">NextDialog/close.png</texturenofocus>
+                    <pulseonselect>no</pulseonselect>
                 </control>
             </control>
         </control>
diff --git a/resources/skins/Default/720p/NextDialogExtended.xml b/resources/skins/Default/720p/NextDialogExtended.xml
index 22bf4c44..54b8d906 100644
--- a/resources/skins/Default/720p/NextDialogExtended.xml
+++ b/resources/skins/Default/720p/NextDialogExtended.xml
@@ -6,12 +6,12 @@
     <controls>
         <control type="group">
             <animation type="WindowOpen" reversible="false">
-                <effect type="fade" start="0" end="100" time="600" />
-                <effect type="slide" start="115,0" end="0,0" time="600" />
+                <effect type="fade" start="0" end="100" time="400" />
+                <effect type="slide" start="115,0" end="0,0" time="400" />
             </animation>
             <animation type="WindowClose" reversible="false">
-                <effect type="fade" start="100" end="0" time="400" />
-                <effect type="slide" start="0,0" end="115,0" time="400" />
+                <effect type="fade" start="100" end="0" time="300" />
+                <effect type="slide" start="0,0" end="115,0" time="300" />
             </animation>
             <control type="group">
                 <right>30</right>
@@ -26,59 +26,47 @@
                     <height>180</height>
                     <texture>$INFO[Window.Property(next_img)]</texture>
                 </control>
-                <control type="group">
-                    <top>0</top>
+                <control type="grouplist" id="20">
+                    <orientation>vertical</orientation>
+                    <height>220</height>
+                    <width>326</width>
+                    <itemgap>0</itemgap>
                     <right>0</right>
-                    <width>100%</width>
-                    <!-- buttons -->
                     <control type="button" id="3012">
-                        <left>-1000</left>
-                        <top>-1000</top>
-                        <height>1</height>
-                        <width>1</width>
-                    </control>
-                    <control type="grouplist" id="20">
-                        <orientation>vertical</orientation>
-                        <height>220</height>
-						<width>326</width>
-                        <itemgap>0</itemgap>
+                        <label></label>
+                        <height>180</height>
+                        <width>326</width>
                         <right>0</right>
-                        <control type="button" id="11">
-                            <label></label>
-                            <onclick>SendClick(3012)</onclick>
-                            <height>180</height>
-                            <width>326</width>
-							<right>0</right>
-                            <font>font30_title</font>
-                            <textoffsety>20</textoffsety>
-                            <textcolor>FFFFFFFF</textcolor>
-                            <focusedcolor>FFFFFFFF</focusedcolor>
-                            <selectedcolor>FFFFFFFF</selectedcolor>
-                            <shadowcolor>22000000</shadowcolor>
-                            <aligny>top</aligny>
-                            <align>center</align>
-                            <texturefocus border="10">NextDialog/background-play.png</texturefocus>
-                            <texturenofocus border="10" colordiffuse="00232323">NextDialog/background-diffuse.png</texturenofocus>
-                            <pulseonselect>no</pulseonselect>
-                        </control>
-                        <control type="button" id="3013">
-                            <label>$ADDON[plugin.video.kod  60396]</label>
-                            <height>40</height>
-                            <width>326</width>
-                            <font>font30_title</font>
-                            <textoffsetx>20</textoffsetx>
-                            <textcolor>80FFFFFF</textcolor>
-                            <focusedcolor>FFFFFFFF</focusedcolor>
-                            <selectedcolor>80FFFFFF</selectedcolor>
-                            <shadowcolor>22000000</shadowcolor>
-                            <aligny>center</aligny>
-                            <align>center</align>
-                            <texturefocus border="10" colordiffuse="88232323">NextDialog/background-diffuse.png</texturefocus>
-                            <texturenofocus border="10" colordiffuse="88232323">NextDialog/background-diffuse.png</texturenofocus>
-                            <pulseonselect>no</pulseonselect>
-                        </control>
+                        <font>font30_title</font>
+                        <textoffsety>20</textoffsety>
+                        <textcolor>FFFFFFFF</textcolor>
+                        <focusedcolor>FFFFFFFF</focusedcolor>
+                        <selectedcolor>FFFFFFFF</selectedcolor>
+                        <shadowcolor>22000000</shadowcolor>
+                        <aligny>top</aligny>
+                        <align>center</align>
+                        <texturefocus border="10">NextDialog/background-play.png</texturefocus>
+                        <texturenofocus border="10" colordiffuse="00232323">white.png</texturenofocus>
+                        <pulseonselect>no</pulseonselect>
                     </control>
-					<control type="label">
+                    <control type="button" id="3013">
+                        <label>$ADDON[plugin.video.kod  60396]</label>
+                        <height>40</height>
+                        <width>326</width>
+                        <font>font30_title</font>
+                        <textoffsetx>20</textoffsetx>
+                        <textcolor>80FFFFFF</textcolor>
+                        <focusedcolor>FFFFFFFF</focusedcolor>
+                        <selectedcolor>FFFFFFFF</selectedcolor>
+                        <shadowcolor>22000000</shadowcolor>
+                        <aligny>center</aligny>
+                        <align>center</align>
+                        <texturefocus border="10" colordiffuse="FF0082C2">white.png</texturefocus>
+                        <texturenofocus border="10"  colordiffuse="FF232323">white.png</texturenofocus>
+                        <pulseonselect>no</pulseonselect>
+                    </control>
+                </control>
+                    <control type="label">
                     <bottom>60</bottom>
                     <height>40</height>
                     <aligny>center</aligny>
@@ -86,12 +74,12 @@
                     <align>center</align>
                     <scroll>true</scroll>
                     <scrollspeed>50</scrollspeed>
-					<textcolor>FFFFFFFF</textcolor>
-					<shadowcolor>ff000000</shadowcolor>
+                    <textcolor>FFFFFFFF</textcolor>
+                    <shadowcolor>FF000000</shadowcolor>
                     <info>Window.Property(title)</info>
                     <font>font30_title</font>
                 </control>
-				<control type="label">
+                <control type="label">
                     <bottom>40</bottom>
                     <height>40</height>
                     <aligny>center</aligny>
@@ -99,26 +87,25 @@
                     <align>center</align>
                     <scroll>true</scroll>
                     <scrollspeed>50</scrollspeed>
-					<textcolor>FFFFFFFF</textcolor>
-					<shadowcolor>ff000000</shadowcolor>
+                    <textcolor>FFFFFFFF</textcolor>
+                    <shadowcolor>FF000000</shadowcolor>
                     <info>Window.Property(ep_title)</info>
                     <font>font20_title</font>
                 </control>
-				<control type="label">
+                <control type="label">
                     <top>20</top>
-					<right>25</right>
+                    <right>25</right>
                     <height>auto</height>
                     <aligny>top</aligny>
                     <visible>true</visible>
                     <align>right</align>
                     <scroll>true</scroll>
                     <scrollspeed>50</scrollspeed>
-					<textcolor>FFFFFFFF</textcolor>
-					<shadowcolor>ff000000</shadowcolor>
+                    <textcolor>FFFFFFFF</textcolor>
+                    <shadowcolor>FF000000</shadowcolor>
                     <info>Player.TimeRemaining(secs),,</info>
                     <font>font30_title</font>
                 </control>
-                </control>
             </control>
         </control>
     </controls>
diff --git a/resources/skins/Default/720p/Recaptcha.xml b/resources/skins/Default/720p/Recaptcha.xml
index cc552796..4168b44e 100644
--- a/resources/skins/Default/720p/Recaptcha.xml
+++ b/resources/skins/Default/720p/Recaptcha.xml
@@ -19,7 +19,7 @@
 			<width>510</width>
 			<height>640</height>
             <left>45</left>
-			<texture>Shortcut/dialog-bg-solid.png</texture>
+			<texture>Controls/dialog-bg-solid.png</texture>
         </control>
 		<control type="textbox" id="10000">
           <top>30</top>
@@ -39,8 +39,8 @@
             <textwidth>110</textwidth>
             <textcolor>FFFFFFFF</textcolor>
             <focusedcolor>FFFFFFFF</focusedcolor>
-            <texturefocus>Controls/KeyboardKey.png</texturefocus>
-            <texturenofocus>Controls/KeyboardKeyNF.png</texturenofocus>
+            <texturefocus colordiffuse="FF0082C2">white.png</texturefocus>
+            <texturenofocus colordiffuse="000082C2">white.png</texturenofocus>
             <align>center</align>
             <aligny>center</aligny>
             <label>$ADDON[plugin.video.kod 70007]</label>
@@ -57,8 +57,8 @@
             <textwidth>110</textwidth>
             <textcolor>FFFFFFFF</textcolor>
             <focusedcolor>FFFFFFFF</focusedcolor>
-            <texturefocus>Controls/KeyboardKey.png</texturefocus>
-            <texturenofocus>Controls/KeyboardKeyNF.png</texturenofocus>
+            <texturefocus colordiffuse="FF0082C2">white.png</texturefocus>
+            <texturenofocus colordiffuse="000082C2">white.png</texturenofocus>
             <align>center</align>
             <aligny>center</aligny>
             <label>$ADDON[plugin.video.kod 707433]</label>
@@ -75,8 +75,8 @@
             <textwidth>110</textwidth>
             <textcolor>FFFFFFFF</textcolor>
             <focusedcolor>FFFFFFFF</focusedcolor>
-            <texturefocus>Controls/KeyboardKey.png</texturefocus>
-            <texturenofocus>Controls/KeyboardKeyNF.png</texturenofocus>
+            <texturefocus colordiffuse="FF0082C2">white.png</texturefocus>
+            <texturenofocus colordiffuse="000082C2">white.png</texturenofocus>
             <align>center</align>
             <aligny>center</aligny>
             <label>$ADDON[plugin.video.kod 70008]</label>
@@ -96,9 +96,9 @@
             <left>75</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10002</onup>
 			<ondown>10008</ondown>
@@ -110,9 +110,9 @@
             <left>225</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10003</onup>
 			<ondown>10009</ondown>
@@ -124,9 +124,9 @@
             <left>375</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10004</onup>
 			<ondown>10010</ondown>
@@ -138,9 +138,9 @@
             <left>75</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10005</onup>
 			<ondown>10011</ondown>
@@ -152,9 +152,9 @@
             <left>225</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10006</onup>
 			<ondown>10012</ondown>
@@ -166,9 +166,9 @@
             <left>375</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10007</onup>
 			<ondown>10013</ondown>
@@ -180,9 +180,9 @@
             <left>75</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10008</onup>
 			<ondown>10002</ondown>
@@ -194,9 +194,9 @@
             <left>225</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10009</onup>
 			<ondown>10003</ondown>
@@ -208,9 +208,9 @@
             <left>375</left>
             <width>150</width>
             <height>150</height>
-            <texturefocus colordiffuse="AA232323">Controls/background-diffuse.png</texturefocus>
-            <texturenofocus colordiffuse="00232323">Controls/background-diffuse.png</texturenofocus>
-		    <alttexturefocus colordiffuse="FF232323">Controls/check_mark.png</alttexturefocus>
+            <texturefocus colordiffuse="AA232323">white.png</texturefocus>
+            <texturenofocus colordiffuse="00232323">white.png</texturenofocus>
+		    <alttexturefocus colordiffuse="FF0082C2">Controls/check_mark.png</alttexturefocus>
 		    <alttexturenofocus colordiffuse="FFFFFFFF">Controls/check_mark.png</alttexturenofocus>
 			<onup>10010</onup>
 			<ondown>10004</ondown>
diff --git a/resources/skins/Default/720p/ResumePlayback.xml b/resources/skins/Default/720p/ResumePlayback.xml
new file mode 100644
index 00000000..3f6830cb
--- /dev/null
+++ b/resources/skins/Default/720p/ResumePlayback.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+    <defaultcontrol always="true">20</defaultcontrol>
+    <onload>Dialog.Close(fullscreeninfo,true)</onload>
+    <onload>Dialog.Close(videoosd,true)</onload>
+    <controls>
+        <control type="group">
+            <animation type="WindowOpen" reversible="false">
+                <effect type="fade" start="0" end="100" time="300" />
+            </animation>
+            <animation type="WindowClose" reversible="false">
+                <effect type="fade" start="100" end="0" time="300" />
+            </animation>
+            <right>440</right>
+            <top>320</top>
+            <height>40</height>
+            <width>400</width>
+            <control type="grouplist" id="20">
+                <orientation>vertical</orientation>
+                <height>80</height>
+                <itemgap>0</itemgap>
+                <align>center</align>
+                <control type="button" id="3012">
+                    <label>$ADDON[plugin.video.kod 30045] $INFO[Window.Property(time)]</label>
+                    <onclick>SendClick(3012)</onclick>
+                    <height>40</height>
+                    <width>400</width>
+                    <font>font30_title</font>
+                    <textoffsetx>20</textoffsetx>
+                    <textcolor>FFFFFFFF</textcolor>
+                    <aligny>center</aligny>
+                    <align>center</align>
+                    <texturefocus border="10" colordiffuse="FF0082C2">white.png</texturefocus>
+                    <texturenofocus border="10" colordiffuse="FF232323">white.png</texturenofocus>
+                    <pulseonselect>no</pulseonselect>
+                </control>
+                <control type="button" id="3013">
+                    <label>$ADDON[plugin.video.kod 30046]</label>
+                    <height>40</height>
+                    <width>400</width>
+                    <font>font30_title</font>
+                    <textoffsetx>20</textoffsetx>
+                    <textcolor>FFFFFFFF</textcolor>
+                    <aligny>center</aligny>
+                    <align>center</align>
+                    <texturefocus border="10" colordiffuse="FF0082C2">white.png</texturefocus>
+                    <texturenofocus border="10" colordiffuse="FF232323">white.png</texturenofocus>
+                    <pulseonselect>no</pulseonselect>
+                </control>
+            </control>
+        </control>
+    </controls>
+</window>
\ No newline at end of file
diff --git a/resources/skins/Default/720p/ShortCutMenu.xml b/resources/skins/Default/720p/ShortCutMenu.xml
index dfb2a0eb..bc93587d 100644
--- a/resources/skins/Default/720p/ShortCutMenu.xml
+++ b/resources/skins/Default/720p/ShortCutMenu.xml
@@ -12,8 +12,8 @@
 			<top>0</top>
 			<width>100%</width>
 			<height>100%</height>
-			<texturefocus colordiffuse="80232323">Shortcut/white.png</texturefocus>
-			<texturenofocus colordiffuse="80232323">Shortcut/white.png</texturenofocus>
+			<texturefocus colordiffuse="80232323">white.png</texturefocus>
+			<texturenofocus colordiffuse="80232323">white.png</texturenofocus>
 			<animation effect="fade" time="200">WindowOpen</animation>
 			<animation effect="fade" time="200">WindowClose</animation>
 			<onclick>Action(close)</onclick>
@@ -39,9 +39,9 @@
 				<top>219</top>
 				<width>1100</width>
 				<height>10</height>
-				<texturesliderbackground colordiffuse="FF232323">Shortcut/white.png</texturesliderbackground>
-				<texturesliderbar colordiffuse="FF1f1f1f">Shortcut/white.png</texturesliderbar>
-				<texturesliderbarfocus colordiffuse="FF0082C2">Shortcut/white.png</texturesliderbarfocus>
+				<texturesliderbackground colordiffuse="FF232323">white.png</texturesliderbackground>
+				<texturesliderbar colordiffuse="FF1f1f1f">white.png</texturesliderbar>
+				<texturesliderbarfocus colordiffuse="FF0082C2">white.png</texturesliderbarfocus>
 				<showonepage>false</showonepage>
 				<orientation>horizontal</orientation>
 				<ondown>32500</ondown>
@@ -50,7 +50,7 @@
 			<control type="image">
 				<width>1100</width>
 				<height>218</height>
-				<texture colordiffuse="FF232323">Shortcut/white.png</texture>
+				<texture colordiffuse="FF232323">white.png</texture>
 			</control>
 			<control type="list" id="32500">
 				<left>-130</left>
@@ -78,7 +78,7 @@
 						<top>1</top>
 						<width>220</width>
 						<height>218</height>
-						<texture colordiffuse="FF0082C2">Shortcut/white.png</texture>
+						<texture colordiffuse="FF0082C2">white.png</texture>
 					</control>
 					<control type="textbox">
 						<left>0</left>
diff --git a/resources/skins/Default/media/Controls/DialogCloseButton.png b/resources/skins/Default/media/Controls/DialogCloseButton.png
deleted file mode 100644
index cd9e52f0dfcf2958c56c540db058265c10eb79a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1471
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fF#gXBi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}6yY17;GAES
zs$i;Ts%M~N$E9FXl#*r@<l+X^4CL7=Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s
z=>k>g7FXt#Bv$C=6)S^`fSBQuTAW;zSx}OhpQivaGchT@w8U0P2`H}sH9WBt=r*X~
zdBsrQ1H(Z-wIVZ3-%!s$AE-hfSqDhMH3F_FIkO;9FRK8d9$9TkW*WlnD8_?iz{Z1>
z1MRT#NzE&Ux(#9lSj0C!B{c^s4ANuenVXoN3RIh3l3}Z4Yy{ShkO<FA0g0QLDCvU&
zQXd+Uz$np&#|e-FkJZ#XU{n?X<4pYQZ8>04Xv%bU4k!+CcT(_lbv84!G&9pR(lcaW
z(3n^{alf}ypvZCitiTzG0nW|M9j2jE8n0YhFopH%0=B<VU!L|KknjIKWx}-up&A`g
zzf7;h2V`H6VR037@%Anb^gjA}kI0l0#g^Y|-hIDUyyJV!1~+4`uzabOoOKIYof*IX
zIkaf^)0t^8H$Fb-(cEPvJhS7{1-o|}W_(<Bf6dh&clKY~HtB-shAmwEnybPD=84RU
z(_W#L&t0zh@<!K(l?C(F#6|X*eywPY_wft;aXLj;imz#_^NqQy9#_a}XX<L}=pUbb
zR%Gg{+B4HFgm&)iaOvN{J=Z{yX~)c@ISO@c5>s#b+uO0FxHkVec>ho2r%9_%tO;^T
zo+^^b^`$dv$}7%J&x^uFMpMrG`~P<JJehBytE`zW{7I3>x4p25^?vH%A2udE@0B;$
z9&%kbZN7cO#PW-$P0#M;KgVmadrjs?S&REE@7PV39j#NHy~A{7%XQ(5_=a=Y8}vh~
z!tOr*A-CxDr_k^XyV>^^-P`$xIf5zue#V;xXMwqov%n*=n1O*?7=#%aX3dcRM$rvV
z7srr{#<#Pqiw+qGwCy+LHE-~AovIvo@TJGmi9vye1<fXj!3wHe9yh9HMoiw{xH0l=
zom<>mIe`hQ&V`nW?y}z&Qo3~2=L>)J5=_{)9dHYc&t^3bQETJfz<aRc_z9;yGrZ>?
zh;zA@&HBrOEs6KcnWf4bgeUTUFE2_i;ZFQ2BEjEsRkp{%O_5`DV4|Eu#NQ^t<SXon
zrd($jI9BINbT({Q#U;#`Sjti+yMaYaa9`SiU2bOH4Gr0EPW!p=9hmoevfQdi2Au-i
z%4P0Mw_Uz)O<vfc@43HZWtUCyzu#aX<>MJ&uCP?LCFEAS_>#88w{qDXvn<zqZIEl4
zQWo<${vE5PsKeXuc>*4J3eT#qJ~5PFnUtva?6P$yw}#bR_eKXJpPos_mShO5;F=tx
zs?z8nI%7?cx+F{2p%n4?kqQAU%RE?RCwuNOVtn)Sq@UrgfQ)T3c|V0u;eAxHcFHy@
zuCpfp<G-n0$`@u%5?1vRc1;#etq~Spt+s5Jua2F`Mwu%|m|}&!m-*@>nQvVC!G~k@
z9f>1z@@_0K6G*(gnrFs#J`2X@9*4DNFFd!!GEMpe&zxH~=auy=uTMB&IPaez-|>oH
w?O8I(+?yYC3i#QGJ?mj#biN{p{ro<LCA;76Z=LjY7pUCzboFyt=akR{0LP_7-~a#s

diff --git a/resources/skins/Default/media/Controls/KeyboardKey.png b/resources/skins/Default/media/Controls/KeyboardKey.png
deleted file mode 100644
index eaba2e98a2b30b655909c9c5394efc4e3f6e8740..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1162
zcmeAS@N?(olHy`uVBq!ia0vp^^MTlkg9%6~u8?`fz`(?i84^(v;p=0SoS&<gn3A8A
zs#lR)0F-B7u(7WwNKDR7Em25HP0!4;ReHaBzmh^`img((sjq==fpcm`rbks#YH*cb
zNODznvSo^ry&acLg%!|%+|-gpg^Jvqyke^gTP3i$RzNmLSYJs2tfVB{Rw=?aK*2e`
zC{@8!&s5Jq$&O3GrYI%ND#*nRsu{?$RmvzSDX`MlFE20GD>v55FG|-pw6wI;H!#vS
zGSUUA&@HaaD@m--%_~+0838fFCAB!YD6^m>Ge1uOWM*PgerbuVk`ho}0cv<jW*Wlu
zyke;LfdQcplF>KRGtfs?o?4Na<{ANaPI6{JqFz>kK1ditZDJ|V+fa9-m<(49Q~@y^
zWS5m^Zen_>PikIzNrtVGsRh_tghY5|3P{}0)DkQKaflUAd9iPPN@@<&S3ncNVnD7w
zC?xfvK?#f#eR!k*Iq+yr%>%||5irtRc53x8FfcY{Iy(mx2e~^bc)B{98Csf|=^E)7
zGB9XNES<R1+u2c|eZS14iiHbWn_MSkBu|l0%t)U2fHiBP%ZIE<>3oXEAMa)1+}5;q
zfx@i{(O=>j+7aAMi#U>!lh<Y}{xm0@NzicfnRDCs-<2#&KPcs?EqV7{tB=|G)?-ZT
zZtkp{{+QGHt;NfQW~*Mj3aK!03a#FMH0jvuxXoc-i~mRc4T=dr@JK{1EJRn|M$cyF
zq;TJRLV2M<7gZk$C-$p}i|jM}8qqo5*KgX7%PG1-TuoaeZ%qAjbYuLQC0lwn?2#!~
ziw!vS-7x-=!1;46s%2f}3xtz;81&R66g%eEwWWN!+}&>%8K`>y_hfrtzar6@p<Nj|
zlT}>h`d6^7l$$<7z*bM$_u`xX_xHW(WQ<=~<;;*J$NP9Ix6JGhTN5SZ+1oyra%^L_
zI3M<@__x6iwO?+o#qS+2OU;Q3*>b~d&RXZ&d!?=}vY+I8XO_o-(}pJJ98Zg0(VbEi
zcJKKMKBd*4LZ@%o%zd|LU*<>Y!1(k#spiTbf!U9<z$3Dlfq`2Xgc%uT&5-~KF7kA7
z45^s&_97!Eg95_=gRMKS`lN9Qo}2dIgXK3#m$mm9ZJy-K+@1Pv+Ro@_1HmX`oZrv5
U{m&7*XiyR2>FVdQ&MBb@055dNGynhq

diff --git a/resources/skins/Default/media/Controls/KeyboardKeyNF.png b/resources/skins/Default/media/Controls/KeyboardKeyNF.png
deleted file mode 100644
index 877b11b6d7beedd683f6f37b798d73949d140d5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1059
zcmeAS@N?(olHy`uVBq!ia0vp^^MTlkgAGWoJJr3Hfq{u3GbExU!q>+tIX_n~F(p4K
zRj(qq04UGEU}IlVkeHmETB4AYnx2_wtMq>NekFy>6kDZmQ(pt$0_W6>OpmIf)Zi+=
zkmRcDWXlvKdpj<h3M-%ixv3?I3Kh9IdBs*0wn|`gt$=Khu)dN4SV>8?tx|+<fP!;=
zQL2Keo~fRJk{y?VO;JjkRgjAtR5OrgtCUevQedU8UtV6WS8lAAUzDzIXlZGwZ(yWv
zWTXpJp<7&;SCUwvn^&w1G6G_TOKNd)QD#9&W`3Rm$jro~{L&IzB_*J|0@U!5%ru1Q
zdBsrg0|P=IB%^PrXP}R)JhdV-%{2n<oaD@cM7^v6eULDQ+Qd?zx1sJvF&VBJr~+a-
z$Sy0-+{E-$pVYkck_=lVQwy-Q2#N5_6p*-~sU=tf;t(sK@?ziol++xkuYe|k#eiIW
zP)O=SgAy1g`tV2ra^TULng@)_B4DJs?9}RGU|?*@baoCX4sv%=@N{)HGqf}_(>2mF
zWMI&kSUPd1x3i-_`+k{86$=-%Hn~p7NS-30n2|j30c+Momk(K!()kpRKi<p2xvgpK
z0)<-@qQAs5v?I8i7I7pcC$G&|{Ao@)lc3?|Gv~JNzbjdmeo)F&Tk`I^Rv)wVt;d+w
z-P~C@{V}KYTZ@+q%~rj56;fg16k5IiXwtFQaht=w7XOd>8x#|M;E{-2SctB^jh@ZU
zN#VZtgz`dzE~-8hPV83`7ujd{HKKFAuivyEms50wxSF;`-kAF5=*IXpOSbfE*dtS}
z78`KtyJ7q#f%E5DRLi=`7YHZyFzBgCD0a-RYfJfdxx3#kGEnvY@5%PQenp})L%T9`
zCabv0^{-%EDK~wFfUTag@5ML&@9%rn$r!(~%9$Zcj`#6aZkgF1wkAr*v$uUL<=Dn<
zaX#!*@o$44YQNlEi{Cq5mYNe6vgL-^oVCuk_exz|WIxIG&Mc1urwvWcIi421qC2H3
z?B4Sid`hc7g-+kFnfq?hzRZu(f$`~gQq7e=0<#}yfk$L90|U1(2s1Lwnj--ewDxpy
v45^s&_MjmnkauXoSN~kL`UOBHA<%H2VL}iC<EM)nJ|Lx@u6{1-oD!M<c;<5`

diff --git a/resources/skins/Default/media/Controls/KeyboardKeyWhite.png b/resources/skins/Default/media/Controls/KeyboardKeyWhite.png
deleted file mode 100644
index 6a34a4b816fa8b9cf5df4339fb5eec7270bc5cdb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1183
zcmeAS@N?(olHy`uVBq!ia0vp^^MTlkg9%6~u8?`fz`!J)84^(v;p=0SoS&<gn3A8A
zs#lR)0F-B7u(7WwNKDR7Em25HP0!4;ReHaBzmh^`img((sjq==fpcm`rbks#YH*cb
zNODznvSo^ry&acLg%!|%+|-gpg^Jvqyke^gTP3i$RzNmLSYJs2tfVB{Rw=?aK*2e`
zC{@8!&s5Jq$&O3GrYI%ND#*nRsu{?$RmvzSDX`MlFE20GD>v55FG|-pw6wI;H!#vS
zGSUUA&@HaaD@m--%_~+0838fFCAB!YD6^m>Ge1uOWM*PgerbuVk`ho}0cv<^MP{07
z1l;`O%z{L{tO9+Iu)d+5fj+X@lFT%OOY(}LK?MvneUJ=>^2Ac0x1sJvQ4Kd7r~+aE
z#1&TViMhFnwn~PE`leuep~60?dBwi@DXBS7r-N*>^2|+4PX)@Pmt@!~nOcC=BP7Bz
zQ$XT|rj}p{phZ?7Q-B8Og92C|8p6P+(uc<tkOPnH)I4Am7Xjmv<%fqQ0|R4Irn7TE
zage){f~TvqnW3ebnXZwZAp?WP#L|g7y`3Ee+V{&$s#v(7waIltM)DL1#f;>M4_LD%
zx_ro*l+LGk{PA8E&TUO=7bx7S5d9^dp&h~9w1^`qIeBfy;!ktZnFI|tpE<XE|6R$l
z^n+5K+LCwQwfdN?Z#~Ae?&i+Q>5n<B-&(v}XtwIbtB?v4r_k#CN0W}dj@umewfKM3
z-=LWA1CK=H!a{WQZS-t*P73$ECzKZ&bW!!8aALojxX3=kuMwT|ef_5WxSXOZ#MQJl
z^2XFZM>oc=S+b>P!ycJ(wb+1D-woq037kLIqFUBfzCbvshe1zGLa}3hU0cex%iaBU
zk%6lBe^0je^(zvc8QPVhGg-w|u73sVO1bGX1Z?$`eJ{TGe}CVrPR96^Rn81qa=eeX
za?8yAur*Oap1tj3DaST;i}PWhihmpYQ2XWPTKwMevecZokS#aN=B#zTy;th$BKt|c
zcV>AUIBjTh&hfP972PRSVfUWD;8R-tDRlaV&D?j3_GNyQ4vbH~lWMN~5tu7E3p^r=
z85p>QL70(Y)*K0--~vw<$B>FSZ!a=(GAIZfaM)V^+`N_JvEIRi>NK&y=j9CiJENcF
g&D@>(ZrXq_Vi$8U7hcv3cLJ3wp00i_>zopr02o)w)Bpeg

diff --git a/resources/skins/Default/media/Controls/ScrollBack.png b/resources/skins/Default/media/Controls/ScrollBack.png
deleted file mode 100644
index 07f88c5c31a1daaae4a6a697ace49918b14adf2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1208
zcmeAS@N?(olHy`uVBq!ia0vp^k_-$?3><7gR{8qlU`}R8L`j6Nk5zJhu3lnFep0Gl
zMQ#C5o`J!}zM>#8IXksPAt^OIGtXA({qFrr3YjUkO5vuy2EGN(sTr9bRYj@6RemAK
zRoTgwDN6QsTs9R}Km&49OA-|-a&z*EttxDlz~)*3*&tzkB?YjOl5AV02;Tq&=lr5n
z1yem!Jp&~>E(M#Slr*a#7dNP8AkS7Qqokz3N?*Ucyj-u`STDaQUEk2s(o)~RNZ-gv
z7pOwFxH7LKu|hYmSQ%sl#0;0z;^d;tf|AVqJOz-MiAnjTCALaRKzRkI;fbX{w?Pfh
zD~9?W7!LZW6`5)JhI$72Ko$DPIzSSx5pYe(nFWb@Sp^97$ZAV6(-3Y)F&-oXHXf`T
zXor<gYF;taZ4fKKBEI=4sX0(#kRB_~+{E-$pxX433|l2rLnE+$giLs53P{4pR7oEc
zlKRk~1jdOzJW_xhc(kVG0pqd=7-?~5W9Kq3Fg9g6I|md8xjQL%x;mQ~TAG>Z8tEA_
zFlbCHow(oIDNy9NeOBO%!~o~!<_^=)DUDYyEttZ3bphMos4q|Z56Jg_pEBXvf>4c)
zs9&a6;sdfT$gsEyx_EmR2YMfUy+>rqiDJv|HSfOPE8g)vW`motS6IGOOU}9lt<H?!
z{~TJh`{~TIm>VA-^l0v~5}w&{>4M$64KqG2yT9h@k30LXZJTsKbi)>|e$7>30`o-X
z#c8il%jYiFe0ihm!^(pBYT_dMOutsN#{2k%{y3eYE5+Be)%nKURgWuVwKH|Kb@Y$V
zJ}WZyRqdJS7D79BcDVHK;GS!s$h2c-(j0}lHi@Y>{q618Qe2z=9K8Q0^3$Z%C)NZx
zB~KN}<oePXHRTm&r{_gsBcmy2{{4TudY;U;&{ft<7yhJ3<lA1@#CkvV@DCf4p7+Wd
zY!A7vn>OFRVPg5k)23&4^Pl6j*u5t6qpZdKmUrx?%Z}Em&fZ}<v*o&QMtsA$><#*%
zRbh9Z|Bzes`cr85hTZIYi|+0G!yLhsem~>Qg0sNv$64SJS<Jw|cLanPr)u*_0|hU5
zx;TbZ%z1m(k(a@MgT<ijqo;ky2Zc=DFRDMcuG!Aq>7q2zLq%waP}3(d-ulK~b6|nU
QUQmJK>FVdQ&MBb@042P*rvLx|

diff --git a/resources/skins/Default/media/Controls/ScrollBar.png b/resources/skins/Default/media/Controls/ScrollBar.png
deleted file mode 100644
index ce738d65fdba973310fd22735e0598a25e664159..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1162
zcmeAS@N?(olHy`uVBq!ia0vp^k_-$?3>-{A){nCRejrX}NJL45ua8x7ey(0(N`6wR
zUPW#JP@aLo#=fE;F*!T6L?J0PJu}Z%>HY5gN(z}Nwo2iqz6QPp&Z!xh9#uuD!Bu`C
z$yM3OmMKd1c3d_URzL%CQ%e#RDspr3imfVamB8j&0ofp7eI*63l9Fs&r3l{u1?T*t
zR0UH#Q#}JEJ1zyAqLehNAQv~NW+2a2DWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7
zNEfI=x41H|B(Xv_uUHvm1jG!N)Z*l#%z~24{5%DanTbjHr6smXN<eu9sNp4<X$aHv
zilN>I282FHM&D4+Kp$CoYDH$6YXsam$(aR-dRYbfAYlx(iKReqL*0#HGF&xK1;lia
zT~?mCiRr06sd?!o8MaEMhDKm}5i;SKDIf_WQ?NM1Ayz=;#lHC|sX0(z0Zjyp0lE61
zkkp3;B`{9(;gJI5z@s%a4;Yt4z({)$)Y8Pjz}S@O>>N-W<nE;4>FR7|XlZ7qYouq$
zz@Ra)bmC5LXGekd{W6m(7A|OQa-EQoJVin=BYENj)~tyxAF?K;^C=#GyqAS@ThrPF
z3b!gme~D*kM{qYS;z&wPUYoJ_)0}iBLBq{w&TZd+SF$Yqpp>V!<lT3zK4$A%k1?&g
zxwCTmV@~V07B3f?t$Oh)q{750w0i&1q+_q+HivyJ{vY)>C?@>CBN4f<5M6y6J)51A
z!hP=v<%I@aRDCF%*smrovd{2qMCW{8ziB@%r|1fCHEoT&G4;>Ujqz)iZ0XssN2XjY
zHsI8E!}v=A=g+mMmUWdc5Kii0&{LC8?3iEImh$a#cfVa^pz8hKlkI)|ibQ9Ic4g>H
zR&kZ<U%|RkZu$%XTRmmpi*Nql-}kDMF@9y0Geedf@8hl9GP6HyO_Y#lZ~Iuvv5np0
zeAuVr-v&R_e!008zjwSWH771)%MG(RYn^ZJmAbmfev<E<Ssn*Y8=9PRJS}=fcS=>*
zz2`6ZlvaNVoxWi+_uZm>nIEMC<J0e?nk#<<W<SmXkH}&M2EHR8%s5q>PZ}t=$kW9!
zq+-t7Glq-|3@i)=F5<pMiWb`$PQU0>|0=pOMsND*r$qxvm2MHd%Ie}Ie_sVugm}98
KxvX<aXaWFE1-|b9

diff --git a/resources/skins/Default/media/Controls/background-diffuse.png b/resources/skins/Default/media/Controls/background-diffuse.png
deleted file mode 100644
index f636860396124eee9d8e0ad0a22357ac4938892c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1627
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51SA=YQ-3iqF#pR8i71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}6yY17;GAES
zs$i;Ts%M~N$E9FXl#*r@<l+X^4CL7=Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s
z=>k>g7FXt#Bv$C=6)S^`fSBQuTAW;zSx}OhpQivaGchT@w8U0P2`H}sHM}G<4Pkm-
zG1U9OfY1lY=o{)8=p!o!dJFCr6x9`p1=tk(`r=ofn~P$6aY;}r4(GruC=RJCNYxKY
zEzU13N=^kTS4MVUYDH$6YXscR<jjIZy{rO#kT8bx5=(*60u5Ibzra-kRY05v3JWXG
z+{E-$pVYkck_=lV3j?sV2#N5_6eMwAI9WLtr6!i-7lq{K=h!Maf|8X&Kt_H^esM;A
zfr4|enSzFIVsd64NI(;87*Lb1ua!%Fa%paAUWuoRtrAc~FC{a@%F)ur$jr>u($Lby
z(9qD;%+kWi!o|ed+0xm~)WyWu6-m2iUU5lcUUDi-dnQ7=1zzotptAycu-G?0B^Bsq
zu&KZ>0E+>+pme2R19fF;QD#|cid#{BE;u!TW6mlCx7*F}TCM=mpNZS?W;pfhgVVb{
zD1jp-cu+n9ivcqdFh}acvm}rM&(x`Tz?@tJ%(A=J$sPli2ThsI&H=?i?oJAxuFgOk
z&CGO-^b8poG$xi#-0$raD019BD{w|)fOB(mhiT}P#w(W=OkuscfbDP8m#6&)<omx*
znQ(1Es76QBFVidW0ofO1SX>2NyuFJ9y^p@$BQoVgvE}!gci-<7@Aw|G!Ohq!EMKZ6
zXWfEUXU6Y;4lUaKbY@!2jgJp{G<R7E&+NE#!S3CL86TJ3Uvu@xo&DFgO}ZeuVGCEk
z=BhA(c_Q=Tv{$I*bC+wrywUYxWx;$kaglwdUn^SUef&ayoKDe|;%nOKd}Hpa#}%^L
znY!9K`p0LV6`A^~_RMq(p`ANBT>5u#&oxkF+A%X}jzV3V#MGPq_I7M3uFZcA-v1N%
zY0~NwYl57Tr;229ed&yv@`|(5^P;ek(Udd){=Z#4Pv%?bDr=?-e^Mm!Z7*zMy`Osc
zhmA?kd*uzbhg{c9n{VGRvHap`)3dwz&+%I9UX%Gz*5ZE4J9g7$N9$B)?=YR&a$Pth
zzTsT<2K~^gu)EKH$Sr#PDKvb;ZuY%J_jdkaj$lf^pYdkFSzzJIS>O>_%)r1c48n{I
zv*t(u1xr0$978JRygkpz%b+N5V8ipj)pjusMp3M{XU%-C`u}aiWuEJj>x^U4cbqGj
i`_SreY1?bc1*BiSW1f3Jq&N;#CwRL0xvX<aXaWFyCQNJq

diff --git a/resources/skins/Default/media/Controls/check_mark.png b/resources/skins/Default/media/Controls/check_mark.png
index 76b618bdf2828e1bdb2d6e7a9499260d72e3a009..c94dd025cdc966f0e806c0305a01e6f64332abde 100644
GIT binary patch
literal 2461
zcmai04Ny~87Jl*@f*^mEEF$}Sz-&j!FM{ToAee-|8liv^q$7mnC3zvqi^&5X2#V}L
z0d*CTQg_f&!PZ@As{<{?)(WFyJ5YXX*D`~vao4RbQ%hMDqprC3B@}RF-I=`H-1~j!
zyXT&B?s=(8-;(6R3}HeL<dc#t%>ZK+cq$nl;QPwJ*=Y!JUx#NYNQHbesv?XWrJ5+f
zIF!*0a0n7@q|8cHAx6Rlm=-sQk;yMEATX{LBiS)>p4=?Kba--^1<NeklBFsuR0-9{
z#yF;kLV<u0Bb6{^G?=U?B}N>&DELh;a}n4<Aq&NbLY@vw2nz<saAG(-B#sG-ENTs!
zAx)e$1~W0DBS|yL<(8C`a7v;%ghk8c3xz^1Prwxj*nq*dmYPT<#Wq>PX$hx>6tk)<
zxS7NW6HIF=3y308j35AqXT_C8z_(d(lXdp=AP!uN!ZlnzhsOmB?m`P1kSXSjRJd8m
z(VOS_3%Mk&nfLt#c^YxZFQn7bbHXps=e$`+H|q$Ju<8i&;x=>eOZ$N2EN((6&5M!c
z@>kQ1#up-FC1u4R%!@_!*A1*$rDlwqfmw+niwct!V<s}(aWoKZbTekM&SuFOY{!b6
zP-BMKWjcCjiczV>09Q-u#0X!o-eEtFWaDZF5Y3wh=nV};bUkb};lM?~JfxV%#K<}U
zs6@I-9CA5}LbPjWI!<8*g%mdemw_tqV|KfFG-n|?>!kyg5C+1M39c6g%pAMTWejy-
z^ohkt^nXDq5=pv+(BKAuSu>J0!6`CHEMFKK%NB5)G9bMuu*Ef{QY8sk0-k`!=Ebu4
z>$CVVD36Z{qSx>QD9?FB2OHc;wUSi+KR$i4U=gs8%h6=qN)nb*$CC59Wnw#>Gw0NR
zJMI|_JL&;ds_3|j5wnF*7pX9{<5)n>iCPH_S)#OH30hDJVkAMM!9j*f;dHvjVLoR)
z#~Ft?gAyGE#QyiuxU-IN>5KoXXCm%PzKa}$1)T!eIoCi30<DZY*UP|Ut{Y+|&;l)>
z*L~1=H5r1I{2m8cc_|wZ^m;>4L(dzM1i!a0MChgA_1hH+w*%YisLCW&gUwyvAm!;B
zMOKC|Y%((W%yNUf`)L2^kqhy;ecSzlWPWSB3uP;s?tB^H=N~=rQ~A^JW6F}(I{MlV
zUp-y6s%c0+<MoL(uFKZ7F;f!lTXT2mnsaC%Ygxu<+|Os;o$6Oz`*Zovd8hOKFu_#l
ztCN;*9bl$0(>~E`ZS1bjZIV(s_N=jwzHzT6<l>Cm!Hs{H%?NV5pH$=<1B(0i?7SVk
z#)};p#l6y$`s0zS6@$&|PyDl|@{;dVG5PP!w#(lHsqC!wgZ@W7r$*8acAPqNGxzKF
zBEx&?2UnM_-B#NO@5}wZCF@}7{<^THh6rN%Ig$5pEPl_~a~Hk;l2$Wy&3&3}zp-}z
zu;ijW&SgCOt@eS(M_pOFgDW~adZypsxpIgzuwCsrw667Df=}VCDs^CYf59(hE<USt
zJvHYp7YwI94ZSHb%fFgn7C&mu9a_hE2DP8pxhVE!YQbyE%bc8Jg&^-h`dI?~v4sUe
zE)^-#ge<D%-q;tW@8g3iZ+SI`9j^?l+rai=2XsS`MIj-nepf{<k;_*GBpf+1vZ-$c
zJUZ&{vXXIVcYVjnT0_A2hUudZXKuPuKejxJoHV5#j!1dMXV;Ps_sVU7zl2e4p$ETe
zPISBOy8G-8o;LM^XKSl+-1gj&j@Wfe13j;cBV1JPp7Zr*UCeq|+spbuvzM`7xw>+L
zcj5@;-60!p3u7jZd>$bFuHmkC)QWuZ$p?ayWS33FeXV>Ow`Qa-s_NUU*s3ELPu{eb
zhA_|UuosQky;|yzr?CeSdvv@TwCu#4Oz+-%OTxb%z5gfo@KX%459RTtN0{sH644(R
zdMMQO_;AkOf^Glm)!r0TF$WQ<s8?{owb=t5XXr<es=fkVRVrEAde$fCaklU0b^e#y
zcDWs>R`oI_;-51@#(S%eYgZ(&D?fC9=Z4V3=8>50Y1`cQk3FtK-6EjxVhEb?^F6Tl
z7-M&ETz5m#_P=(e$GMHw-MSuk=QjxlUVo||Gwyp{0DY`-dw627`Eu!Jm7Sf@`&)~n
zX6{eHd3)bx^;z=AST%>+9>u0aWiJ($<u&$OE*)xn)D>`QLrv)U_nI~x<KMn}z9V9y
zepS+>>g1bAfV3?27Fc}z=^N=_V)~YE0mF`!`Ry#rgBHEg28Qy9{8li$HSxX~U}5Z5
zn(4dzO#V{glbO}0v|zXq5`P6yDq>pS0b;xKZk?<hKLz$R-hGNodqd2>r98_$Za~>>
hlaa3~g~J~AmxU(Q)(s1vU8Db1rO38OKi-sI^&d|Wd$a%m

delta 1908
zcmV-)2aEWf6ZjI4BLV^eu_b{4ldu9+0WXs>1ulPYY^kpR00Dw&Lqkw=Qb$4{Nkv08
zF*!CiEix`K001bFb&<bILQxdQKWb5!VNgSZgNQX%l!4UJpp*sGpa%U~^yQDhACLEx
zkk+78D2Q76HPl~FYtS47MG-_xOLI|6#p}Ejl*n^A_k8a6-gCJ3T(CwnN>*<gglw*$
zg+qS<_x!@5yXBc?T-fp8j48T06Pbw8&_3?4nDM6HtkwA3zt*;r&=s(>3XdtORuG;P
zo?a`cCT|OODe2gX@TqX0CKnXGHT8IfUrbI__{(H18V-WBL)e|F<9Hn_X)P-(FUOnB
z6qV|I%$GP4xw(i$kGKn+Fd+iCnPQwEeujS-mDx`}J_ck(gZ#nY{8{pntH`WULSvN_
zX$tg-T9oPuiAm8DGBT9R{{QW(o*ed7syhPE{A3t!J<zfR-(|!2JT#2&Bd|TfMXr{g
zKY)>U(aSZ>yARF{IJ>NA@f|qdgzg75rp10Go47TZgx3>jUx3bQurF15R^8|L9-@Ei
z@>N%`y9d2;-nsk(SORC?XzZZP00009a7bBm000XU000XU0RWnu7ytkTk4Z#9RCt{2
z-Aj)YRUC%#r!X=`7lNQ*a2UWl-T<SC8>1T*F4UDDKob{!3QgRan7Co#CG2$L!o-#0
znCMCeQG<esV3bST5pRj{_PVI9p_zZ_ndz>oQ|Fwj_gONb&wnbvboF#~p91HcbIv*E
zoO8}O=bUrSIp>^n&N=6t3sn(&05@Hd4gk*phk%2?ufTC&33#I@ic1m4bD@*8S<=gr
z{?^)El=NimSzVwc-7M*=bpWjFh@?%i=XNbNLU4Kp1XXVuLr-dez!>_Hq@8~a5g0@6
zwTQqNaxDM?W5}%$f>Qwy7(*^~fWR11uR{dJkZL0Y-*$+=7*b2pjz|cMA(aw9P<15s
zu^4Ph2SL?S)oi{D-BFTu0E@ugv1b|UXJCI(6qkIS=%5jTk4Osvz)s+K07D3zq?;%a
z?2kRm8a)h#5VR43Mbbq8@DP6(La;JH0I&rNAxIe^0Qdq7q4hF&O|Y`h!4O()48c9I
zXPL5pfp@?VT1(Q6<b?p>m7*w?z;7tE(g?vKc_BCj94d<9Pw+EB<1$5X1~^<H07Gb0
zrl*55z+**GoFD&3pBid5hTz`Vv&_&$1YiiY>Kg)R`P3k3lca0fe9V8;8X-7Fj}Sl$
z5F{-~dR5Y=l;6<(UD8QOM<pF@`uHg&X*(r?`(n>BLmMJ!l%zt^3zB}@;KL7ZN!k)*
zhz^sqUDDUBd>o{^zL#`M$b&K`>Ae{SIw$GQU;_nCMlkW9%t?B`#$XpE-4SfCK*<Ou
z9+bKWsxBxa3@Q=KvOj-83MG%A>Vl-(gALkJGJ=T*r7Z+i=Ox`1Y~Y4T+9o4dbx_(y
zP?aPG8NtMZ5(+_8QW!K~1Z%#bBxw$K7kHxSBI~pZSd?^Yz%`~y(l*LBi|&s-%M7*l
zX3@lJ4ILpE?>yx%bf%;Au4oLw12NXGS*!0Du7VH&LDf0RU+jNumx~%f*%haThzJ1Y
zfsZBa>uSLff)5!u0$BYT;cem|sG6sI&9FE0LXvKvL~tPVS}hjr0@5-BNzVdLx4l4(
zc2hnx1j8^wa10|@t^km<3-|`OKExt5`w@7&D2gB2d{85pT=k6b9BCl{SfD&j>}l%(
zjbQC62oHu_q(OfRl&6V3O&`dw3Dz%l2yhw0Lfr=#LvXOQslwM80=Nv}>Mj;*P;CrG
zFkKad6J0IXpgokY8Fo+mAB<r7DhS8BT(m)ZDW4fO#2{%aMlf~NpO1F|UjlPo4^XqS
zlz&?OH0g(92o7~RRkNZYfYCETQ52_v7h?=ivwf7OiTQt(KQMxNEnjq!bQSOk@JOs-
zYIK(J0G@+o1Rs$0UqLI2jsR9%ea!hl0)LR{?6DER<jc^xV)zB04r;g72UBvykW)z^
zfOWnNZ4ALm4gqZNwRmG_y(AI96#F9>Lu)0A0H)k1!x$QuGy<4m#}s3zUGfNE#;tRV
zVdk<x05yO1P%?(8%LW0|+)T?DHY_Uy&|p_JV_3875J1E2^^9RvSt5WI_E|KB<+4Qp
zEp51I40$7f7I$79Fox_AK+9Y34iG~x5I}&vm<NQRHwYlmrrZO-&?^KGaCi0|W9S_M
z2)s>y4>9x-0d#P`h8|()EduE1#vMJt&}#(H;T?ZmGRDw*1kmxVd@{r^2m}z}o=zEI
z7z_f4baSr^FboO-M7+ye!WagJ03zS+FF_20L;wlg_c0+1gGG=`lD0}(s=ZNt^TOWm
zz)fF73`USz5il4*s&$CL2vV;D3`USk0WlasZUw+#1i98C1|!J57BCn=UuuBC2>R9t
z!)IJGAo$J*dYYuol3tSZ*E#_Hlk}RT>tfIA0w?K!q}L^#7@_z_(n(22B|RE@J{KXC
u_prV;_8iVR=bUrSIp>^n&N=7Y0Q(=rd7el$`je&r0000<MNUMnLSTZ+bx(%?

diff --git a/resources/skins/Default/media/Shortcut/dialog-bg-solid.png b/resources/skins/Default/media/Controls/dialog-bg-solid.png
similarity index 100%
rename from resources/skins/Default/media/Shortcut/dialog-bg-solid.png
rename to resources/skins/Default/media/Controls/dialog-bg-solid.png
diff --git a/resources/skins/Default/media/Controls/dialogheader.png b/resources/skins/Default/media/Controls/dialogheader.png
deleted file mode 100644
index 25f5333faa6c9d23ff16159bd471592b85f3ab8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1086
zcmeAS@N?(olHy`uVBq!ia0y~yU;;836gb#`WQzBJryzmMkcg59UmvUF{9L`nl>DSr
zy^7odkTM1v`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+8u%7Cr)Fe&R28KLSNVk`
zS7j$#rYPClaoJQ@0S(AaElE_U$j!+swyLmI0-I|EWP^nDl@!2AO0sR0B76fBob!uP
z6-@O^^$e8kxD;%PQqrt~T->0VfjnEKjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(y
zU7!lx;>x^|#0uTKVr7sK5Hnm-i<65o3raHc^Atd4CMM;Vme?vO0p%5-hL>cfAxzIJ
zhI$_u5c(h)eM3D1ePrdS6`5(S5pd@uXBH&tWfkaygfY}6mIA#EbvKI1aMeH+5Ys_+
zS$XCrrl<O(=B1Zp*eV$tfvrVIglDFJ#7zw$5)g-20hJf~=BK3QKz#)?5iADe>Vra3
z9~zXvIMIhk3XlVj*3>*;TowT%?eB4EX$A(yrc7t&fZ`x`Ck0PeXEQ@fGc#QyJwpZt
zjftfbcX~TJ3bgN+nN+cGL2HxigpA}V5{eng6Cbc<O?3H?H7T7>@%ZDtES%e#)-F)E
zRU!IIJVQHzyJ-<eQgZUzjK!bkq%#Q`Za#Bv`~JI<W$6c{Jhdh7zH9X{Ti<$&Y2D48
zmD3+{TEDe;xzKFYi&r5PCQhN%`;R6admXnq>}&D=sJ}rm;Rhax$c2UI>f7kq?3@(t
zdrv4YH0Yx0L*c}JHF1%BhF>E(=ll9i`*Ar%SBR@=Yvhfoe~xa9U$bOO&xSoR<!Z43
zr@kA;UlKTfu0^%1t9*fQQV)ZknuKD<{JOT3Z<o9K?IHtJ@Bf}`@9S42Iy1B@Luayz
zt6cvI)|GP8X9(EpDf?c0^Z)+7SDlRUE32FtvgCLlZ{?Pm{b6gOggkrO$5M`M>=x(4
zJ{A8q_@Va8&9(Tw<7KHiaUol7n9W)1e0#6d)kXG`eDBQiIB?p~<ecMa(JQ)Bs>1F)
zf5E4;`cvri4V$^|7VXRYC><D|ekavj`6Dp<aTa()7BevL9RXp+soH$NC}Ifnba4!+
unDh2vBPfR+Uhp$m{vlH+BZxyjIAG48&%ikK*Ni(LGdx}WT-G@yGywn*Gjk{a

diff --git a/resources/skins/Default/media/Controls/spinDown-Focus.png b/resources/skins/Default/media/Controls/spinDown-Focus.png
deleted file mode 100644
index 31d02daee46ed4394169bca918ed892b6f2f4abe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 866
zcmeAS@N?(olHy`uVBq!ia0vp^azM<_!3HEh@2a1}z`!V-84^(v;p=0SoS&<gn3A8A
zs#lR)0F-B7u(7WwNKDR7Em25HP0!4;ReHaBzmh^`img((sjq==fpcm`rbks#YH*cb
zNODznvSo^ry&acLg%!|%+|-gpg^Jvqyke^gTP3i$RzNmLSYJs2tfVB{Rw=?aK*2e`
zC{@8!&s5Jq$&O3GrYI%ND#*nRsu{?$RmvzSDX`MlFE20GD>v55FG|-pw6wI;H!#vS
zGSUUA&@HaaD@m--%_~+0838fFCAB!YD6^m>Ge1uOWM*PgerbuVl9E2i5`CyGK<Dbi
z-3#QveVm#H^kxyzKT=++Ujc)uDbv|Gpg73gNx{?A+04+=%uLrv&yayZV`AyV{oYQ2
zBFF8s0%s%!I5#(Un1)ViymD#56xOQ?*#1U+dD?$KzW@7_3D*{cYIH>XGQAQXkbOah
z#Z}P7+q*c>`{?UEB2!KjTYj&3_x)b+j_)xW+>E`#@}*jG)-7mtX8iu=(4yT>XQsv6
z`1qhlbC;Fy%#KSJ?A~pd@p0MxHCKP!*?(=@qzj@Ows7@pt_l;FCo(Tidxcs)ce&=v
z8(kk(7R*-@7ujd}wW2lN$1n89=@eZlzNW3tH|DN-Tp_ESsjID{e|+{?k*Tk0&rG)v
z+PSmCrGE$aTmwa>9W#^WDAct{OugxEZ^xG6+WhC>{XdbPCapfPCdesysz@f+m(Hju
zuQ)qBFA5tOO*!-L|J&8`WWI&2vSzyQCq*LP_QEFC`>BV2*qHRZSKeTI$aUSc`SuMH
z%P*cbJ-eI#9IwUhHJKk}E$+9xV>exPv`%&Q4%3+}*M&3U8_s2K&=0K&yZiiy+@jZ?
zLc=%gX5U+MZ|5K82&VM=8E+Px1*S~S0*}aI1_r((Aj~*bn@<`j81L!g7-G@8_v~rT
z0|o-jfzzLFiYd!`?9HUOp~C*wnaD@H35n&5#VpLv{%(yrAJDe@;`N0+?SZWG+_Wns
z&pt3RX*zw8VV(Qj3jSF~Ofv+oFY?>NZu?;GipKxVbstQ2F+M8(y?OG}#Wz7&!_(Ez
JWt~$(695frVbK5p

diff --git a/resources/skins/Default/media/Controls/spinDown-noFocus.png b/resources/skins/Default/media/Controls/spinDown-noFocus.png
deleted file mode 100644
index 4987fbbc60fccd63946c8942f49ef0f789fa4d07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcmeAS@N?(olHy`uVBq!ia0vp^azM<_!3HEh@2a1}z`!V-84^(v;p=0SoS&<gn3A8A
zs#lR)0F-B7u(7WwNKDR7Em25HP0!4;ReHaBzmh^`img((sjq==fpcm`rbks#YH*cb
zNODznvSo^ry&acLg%!|%+|-gpg^Jvqyke^gTP3i$RzNmLSYJs2tfVB{Rw=?aK*2e`
zC{@8!&s5Jq$&O3GrYI%ND#*nRsu{?$RmvzSDX`MlFE20GD>v55FG|-pw6wI;H!#vS
zGSUUA&@HaaD@m--%_~+0838fFCAB!YD6^m>Ge1uOWM*PgerbuVl9E2i5`CyGK<Dbi
z-3#QveVm#H^kxyzKT=++Ujc)uDbv|Gpg73gNx{?A+04+=%uLrv&yayZV`AyV{oYQ2
zBFF8s0%s%!I5#(Un1)ViymD#56xOQ?*#1U+dD?$KzW@7_3D*{cYIH>XGQAQXkbOah
z#Z}P7+q*c>`{?UEB2!KjTYj&3_x)b+j_)xW+>E`#@}*jG)-7mtX8iu=(4yT>XQsv6
z`1qhlbC;Fy%#KSJ?A~pd@p0MxHCKP!*?(=@qzj@Ows7@pt_l;FCo(Tidxcs)ce&=v
z8(kk(7R*-@7ujd}wW2lN$1n89=@eZlzNW3tH|DN-Tp_ESsjID{e|+{?k*Tk0&rG)v
z+PSmCrGE$aTmwa>9W#^WDAct{OugxEZ^xG6+WhC>{XdbPCapfPCdesysz@f+m(Hju
zuQ)qBFA5tOO*!-L|J&8`WWI&2vSzyQCq*LP_QEFC`>BV2*qHRZSKeTI$aUSc`SuMH
z%P*cbJ-eI#9IwUhHJKk}E$+9xV>exPv`%&Q4%3+}*M&3U8_s2K&=0K&yZiiy+@jZ?
zLc=%gX5U+MZ|5K82&VM=8E+Px1*S~S0*}aI1_r((Aj~*bn@<`j*z4)y7-G@8_S`{U
zCPM+|!00Vb@;Q=IJS21EZ*v(<mkCokc}w`8<|&^qPM*>Y?7wOm_ISuOSDJg4Gx#%X
zKX~fgwjbtqoKBki^G_=jXJwd|AO3;mZ{zBUuCj+B>lZlRIC|UCZTW`I#Z7UC*zB^p
zq6!%IyX0CN&^2k|z2lZ#(d3@N`R;+?t|?2_)-Jdr&iu3J*z&vYyg?bs)78&qol`;+
E03W?^M*si-

diff --git a/resources/skins/Default/media/Controls/spinUp-Focus.png b/resources/skins/Default/media/Controls/spinUp-Focus.png
deleted file mode 100644
index 0ce1fcc5ab4477e0c8ceac7a83b8e7a344a3b394..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 863
zcmeAS@N?(olHy`uVBq!ia0vp^azM<_!3HEh@2a1}z`!V-84^(v;p=0SoS&<gn3A8A
zs#lR)0F-B7u(7WwNKDR7Em25HP0!4;ReHaBzmh^`img((sjq==fpcm`rbks#YH*cb
zNODznvSo^ry&acLg%!|%+|-gpg^Jvqyke^gTP3i$RzNmLSYJs2tfVB{Rw=?aK*2e`
zC{@8!&s5Jq$&O3GrYI%ND#*nRsu{?$RmvzSDX`MlFE20GD>v55FG|-pw6wI;H!#vS
zGSUUA&@HaaD@m--%_~+0838fFCAB!YD6^m>Ge1uOWM*PgerbuVl9E2i5`CyGK<Dbi
z-3#QveVm#H^kxyzKT=++Ujc)uDbv|Gpg73gNx{?A+04+=%uLrv&yayZV`AyV{oYQ2
zBFF8s0%s%!I5#(Un1)ViymD#56xOQ?*#1U+dD?$KzW@7_3D*{cYIH>XGQAQXkbOah
z#Z}P7+q*c>`{?UEB2!KjTYj&3_x)b+j_)xW+>E`#@}*jG)-7mtX8iu=(4yT>XQsv6
z`1qhlbC;Fy%#KSJ?A~pd@p0MxHCKP!*?(=@qzj@Ows7@pt_l;FCo(Tidxcs)ce&=v
z8(kk(7R*-@7ujd}wW2lN$1n89=@eZlzNW3tH|DN-Tp_ESsjID{e|+{?k*Tk0&rG)v
z+PSmCrGE$aTmwa>9W#^WDAct{OugxEZ^xG6+WhC>{XdbPCapfPCdesysz@f+m(Hju
zuQ)qBFA5tOO*!-L|J&8`WWI&2vSzyQCq*LP_QEFC`>BV2*qHRZSKeTI$aUSc`SuMH
z%P*cbJ-eI#9IwUhHJKk}E$+9xV>exPv`%&Q4%3+}*M&3U8_s2K&=0K&yZiiy+@jZ?
zLc=%gX5U+MZ|5K82&VM=8E+Px1*S~S0*}aI1_r((Aj~*bn@<`j7~|>U7-G@8_v~p-
z1_d7GfaAq$`rhisX>}-kn=Exg_u*DC9tK8*i}h@=Kbz%W$p2}&_K1HAoB5)cJDo)z
z*sZq2+-WG&<=?*G_O#~e04X`g%N1<Ak9n^28VB;*F-F_|-uz9Vxf*B>gQu&X%Q~lo
FCII9%S_=RG

diff --git a/resources/skins/Default/media/Controls/spinUp-noFocus.png b/resources/skins/Default/media/Controls/spinUp-noFocus.png
deleted file mode 100644
index cbbc1b7039d3ae753d004666e3797cd1c54d5515..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 902
zcmeAS@N?(olHy`uVBq!ia0vp^azM<_!3HEh@2a1}z`!V-84^(v;p=0SoS&<gn3A8A
zs#lR)0F-B7u(7WwNKDR7Em25HP0!4;ReHaBzmh^`img((sjq==fpcm`rbks#YH*cb
zNODznvSo^ry&acLg%!|%+|-gpg^Jvqyke^gTP3i$RzNmLSYJs2tfVB{Rw=?aK*2e`
zC{@8!&s5Jq$&O3GrYI%ND#*nRsu{?$RmvzSDX`MlFE20GD>v55FG|-pw6wI;H!#vS
zGSUUA&@HaaD@m--%_~+0838fFCAB!YD6^m>Ge1uOWM*PgerbuVl9E2i5`CyGK<Dbi
z-3#QveVm#H^kxyzKT=++Ujc)uDbv|Gpg73gNx{?A+04+=%uLrv&yayZV`AyV{oYQ2
zBFF8s0%s%!I5#(Un1)ViymD#56xOQ?*#1U+dD?$KzW@7_3D*{cYIH>XGQAQXkbOah
z#Z}P7+q*c>`{?UEB2!KjTYj&3_x)b+j_)xW+>E`#@}*jG)-7mtX8iu=(4yT>XQsv6
z`1qhlbC;Fy%#KSJ?A~pd@p0MxHCKP!*?(=@qzj@Ows7@pt_l;FCo(Tidxcs)ce&=v
z8(kk(7R*-@7ujd}wW2lN$1n89=@eZlzNW3tH|DN-Tp_ESsjID{e|+{?k*Tk0&rG)v
z+PSmCrGE$aTmwa>9W#^WDAct{OugxEZ^xG6+WhC>{XdbPCapfPCdesysz@f+m(Hju
zuQ)qBFA5tOO*!-L|J&8`WWI&2vSzyQCq*LP_QEFC`>BV2*qHRZSKeTI$aUSc`SuMH
z%P*cbJ-eI#9IwUhHJKk}E$+9xV>exPv`%&Q4%3+}*M&3U8_s2K&=0K&yZiiy+@jZ?
zLc=%gX5U+MZ|5K82&VM=8E+Px1*S~S0*}aI1_r((Aj~*bn@<`j*zD=z7-G@8_Uu94
z1_K`E0}%#X)dwVcPDpHEU%lYN$^gMB$MpWG^joB>9lNVuKL1MH`bBAG%kDC)dBeYD
zL8O`3@&`;>4-<DZU8>;VTO<<K>S@wbe@OI;$L8P<N-_@9x18tt$K@WtP`yi5<PW29
v#<hhXrPnObsynE=qUo{zl%pTjPd!lQ=q_dTnfdA>DEoN2`njxgN@xNAMJI0h

diff --git a/resources/skins/Default/media/NextDialog/background-diffuse.png b/resources/skins/Default/media/NextDialog/background-diffuse.png
deleted file mode 100644
index f636860396124eee9d8e0ad0a22357ac4938892c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1627
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51SA=YQ-3iqF#pR8i71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}6yY17;GAES
zs$i;Ts%M~N$E9FXl#*r@<l+X^4CL7=Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s
z=>k>g7FXt#Bv$C=6)S^`fSBQuTAW;zSx}OhpQivaGchT@w8U0P2`H}sHM}G<4Pkm-
zG1U9OfY1lY=o{)8=p!o!dJFCr6x9`p1=tk(`r=ofn~P$6aY;}r4(GruC=RJCNYxKY
zEzU13N=^kTS4MVUYDH$6YXscR<jjIZy{rO#kT8bx5=(*60u5Ibzra-kRY05v3JWXG
z+{E-$pVYkck_=lV3j?sV2#N5_6eMwAI9WLtr6!i-7lq{K=h!Maf|8X&Kt_H^esM;A
zfr4|enSzFIVsd64NI(;87*Lb1ua!%Fa%paAUWuoRtrAc~FC{a@%F)ur$jr>u($Lby
z(9qD;%+kWi!o|ed+0xm~)WyWu6-m2iUU5lcUUDi-dnQ7=1zzotptAycu-G?0B^Bsq
zu&KZ>0E+>+pme2R19fF;QD#|cid#{BE;u!TW6mlCx7*F}TCM=mpNZS?W;pfhgVVb{
zD1jp-cu+n9ivcqdFh}acvm}rM&(x`Tz?@tJ%(A=J$sPli2ThsI&H=?i?oJAxuFgOk
z&CGO-^b8poG$xi#-0$raD019BD{w|)fOB(mhiT}P#w(W=OkuscfbDP8m#6&)<omx*
znQ(1Es76QBFVidW0ofO1SX>2NyuFJ9y^p@$BQoVgvE}!gci-<7@Aw|G!Ohq!EMKZ6
zXWfEUXU6Y;4lUaKbY@!2jgJp{G<R7E&+NE#!S3CL86TJ3Uvu@xo&DFgO}ZeuVGCEk
z=BhA(c_Q=Tv{$I*bC+wrywUYxWx;$kaglwdUn^SUef&ayoKDe|;%nOKd}Hpa#}%^L
znY!9K`p0LV6`A^~_RMq(p`ANBT>5u#&oxkF+A%X}jzV3V#MGPq_I7M3uFZcA-v1N%
zY0~NwYl57Tr;229ed&yv@`|(5^P;ek(Udd){=Z#4Pv%?bDr=?-e^Mm!Z7*zMy`Osc
zhmA?kd*uzbhg{c9n{VGRvHap`)3dwz&+%I9UX%Gz*5ZE4J9g7$N9$B)?=YR&a$Pth
zzTsT<2K~^gu)EKH$Sr#PDKvb;ZuY%J_jdkaj$lf^pYdkFSzzJIS>O>_%)r1c48n{I
zv*t(u1xr0$978JRygkpz%b+N5V8ipj)pjusMp3M{XU%-C`u}aiWuEJj>x^U4cbqGj
i`_SreY1?bc1*BiSW1f3Jq&N;#CwRL0xvX<aXaWFyCQNJq

diff --git a/resources/skins/Default/media/NextDialog/background-play.png b/resources/skins/Default/media/NextDialog/background-play.png
index f5a4b8c1541d80816e7f67767fe94822107e72d6..063d94a98551b0f7a660dca5c4e0da0fd6b6d677 100644
GIT binary patch
delta 1768
zcmZWpc~Fz*6AnidL4=BxAjlzja3>)ghTDK35K==lK&0WmA|!xd<jB{eNEPJzq$tE<
zg`yxBQD_=8<Oc}K4~xPeB1kxj0zncY1R`g@&h(E?`_Ak;JNxcDyU*@3Z{NN@^oooX
zx1}~7L@9s)ism3u!2)C{qQUbDeMVuaOsrp2Vv6&D1FD9GhEdG8Xe^F?mYy8I2#bhv
zK7azFl|8`@MJ=#Z83*<&wu9|TT3U9NC<hYC4vRryQ5bV18jD1NSCw=%{~ZTEC}o2R
za633Nfq}<^PH>&Sy<oV--(DX42zUe@px^*z!u9?Oa1TyXdH1kc0)r`B1a-IR0z6-w
zyJoJyB;LdLYH(nn^0m`fnBRFt6pzE>i#?F>pi_#<QGLll?}uNXg~R*0?!OkeQQCqv
z_jqcWtI<4lOQ)ZjXntkW^C@#}<W|`Ez4dL?CH?o)jY@mtH+OJST$;w4Tmx`6yDrb{
zG;hIbAvB16F5-tbq+Jn%b(v!7eSlgZQVopH@%s8yk19cxz==Kua&su99?T#)X{eza
zo<qkw6Q{JnKRh?lL29d6p$WUwx`3o9ZSx(L2Q93hm->9X-k<fd%;C-~@4IKaq-p2Y
z{l+`H_e97M)rDW(+%A1hD6GF%G)8$*dC-`5^`+Sb%;_IM!#v6Wn^fqN4_whNEjFPq
zZ_%l;Avd70r9<rv;j(lPzHBKMV)9?%I^-^jBgSW{d%oOMLa?;69@q1he@@!pYt<7R
zxxLr^_Po0~Z6Z5Ti`x~xkglk16wABZ(i#5BXH9Pm$H2FWRMS>&Q+n;KHel8KSjE7+
zfEXAIwu9jvlmdgPX~6*KQh=4S5ir;`_z4ep5|ceYx<&gjWB>Cc$zwboA2n6h@201E
zH%ZeJ<D;VEd8KX2?f>7qGlonZue!=R4r%4iD4&c}y@PZQ`@!Mlp%!r!v+~I?pO+Vp
z#UY(`S9=wF^a~hCiV<#*o>hpHla_fLTH$l*!s^6icc+YJrTO3(4u_johHcI^4=BOv
zu7Oe&U67%|hRg)Wzfx0EbJQmK<vm}%(x!I%iyN_ti7Y<JtbraE7w64~yW}C!(b2u^
zps{!F-X*Ut&Dv{Q24gH``f|dhViY&ByTpEVZO#5%S{kbgf+|Ya@M!nm4IaXmzwhsV
z)Iu`jj}8oA4nz6mc5mY1^s7ohzA#a_w6v7TX>A2q;UZ^bST>RfSIudsnUf!^5B}m?
zCQL|32w|sds2HD$fJ)j74-X5m8OxuBySln&Ygdr09mc2bHa1FS0eAfqW<;XZ=#Y?G
zwCkwpJ5^?QwnNh7a5GInwJM{K8-it}0~rYFrQ$lf^Wyi`k}-imHq;p5dc!$mxq1M|
zKo~$z<Rg1j%}>_{vZRxp>bmxc>%l*NvmiFEG!HYeslit)cj7DTHey3V#~YyLdj0sh
z>${JmW1!?bf3|~E{F8G=tMi4=Q{@90FATy=z<3&MZm>RRaWt8??w^vfNDhz~K^^#2
z*wO~s{EU^>taZ86ptr(a0;tul6lt`3TUk(B*XKIJlR7^BUNOdS=-Bc_bYC+KsPPLC
zur?~Rt<J;-{dzViOXM6`hAeSZg91Y%BWsVvVzI>U7Pi?=rvJzb(fvz#dHL|0`(%zq
zS&wT7H*qu@>S%A6$y?FfoS-RXy4PSuCbP8;d>HBjAzehG0jsC!GBcSn`q`p(@_b*F
z7a-))$G(7v37aU{-bXkHvahd?kk>iM!D6wjjrA{!1c(gfQt^8p1eZ(UChq?&T_*ZQ
zWElw}OLVQjead7l&GfCbJb408Ye{Ahy%31r8D8>-U<!pYE97SYzWkg|TF24z6CJsL
zfken(%LIU}N+R9J6`IjL9UYyce{Jg5gpsr;CX<Pg>3{Y_bhF!_Q&3P)NreVtUCS*Z
zw0lQ8L7L!r73i7jJ24kDc9G>ykT5vJT9OsDHM6;)VSZz~hJI#Ay2h8o`K0Ex6$#Kp
zd;4IqGhA9VKtVv|fV!p6A9@JA?4ygD%kv|EBN{!4i|M+KB&H?`pI)H#{Aei|ZAqPr
z6Itd%1>Z0sHG;U@UFwj2ch(5o<%jZ3$hD+zOM5<yHF3FH$+59BQ6gu<e3R4_@#quB
zv`-FXvr-p-K77+1aUvX|^BadFA(F{&w^vnF2~V7?u2V6N5O-bE70~E(0b^}>KBkuY
zKY?+6{>|rw1{(Vv7@@bh+?9?2%DBK3gTb7u(RbgpwYB}7mo`8A8rsuwBK`YUlLf`7
t2}X{Ew9E}`+j#*rRNwax+p|~hh<@X0+JfSSLthi@gr~p9gJYrDe*!_#Spxt7

delta 1579
zcmV+`2GsfE9MKw(BLW5Lu_ZA9lZ62&ljZ@+lS=_MldS<V3So74I!tA5b3G!H4FepL
za09*xZ)9m^c|>7!Ws{Hv925#5ARu^ca5_z8bYWy+bYVncbY+u}1ss!u1b&m!0z{L;
z0uz%d14EMm1vZny1w@m31q%gpbVYV_lZyo?lRgGue^+nXQvd(~f@woTP;*j8LLf;+
zLpCuvHa0CXE-?TAD3NuM&nrYx6vsaXjTjBFu#hGV3(aVZn%G#37z&Fq%3w3|%nvm`
zUhmDM$yV7;QDWoQg1>;RvQ~;n$;!f-*r4Y;Gc}Sqw{y?ue(yb}d(Q<+D5a$JIuE2X
zIV~9Qe>>*G3l8fO7VNarMPEeG)#=&s5LNB{mKrl&yUkkF&;4sn%Q0Pnng-z!Mb&b`
z6T(xgIo0GX;dUh%Sr$GKc4=}!;TuzrmiXD^M2SC5)<VHiu(Sv}62Cb5i<P977M7Re
zOsDcn`99`LY_ZJTti*2dPIQ6<@Z(^TF-Gw*f55QJKHPZemlaj=JwN#~WF=RTS*3u+
z3JH?raEY3i>M@CN(PJ`F6wLnr?W-Oi^p>jI{80aB7_U8G-Gr~AVSF4I#@8X#KEQdV
zlAqm&p*PWs70tN^_H{VDsA$n`INN}Zdo`j(exzD)OFRxQ$Iu*xwkv2{EcL9s&(R%(
z71rddE@5XEdgZ)*=^J>NXYK?wFp`ro2p4|^e@R3^RCt{2-M?$pcO1v@<PuMl8Z=65
ztyP0jBZ7lCxQL5`gM%PS7DYHE2#Rn^2A6;+4hlM`gNhI&pyV7}1Q!Q!5!6WpHMUJD
zN+S~DZxfSrYLPc~tM~bS?;el8;5B@B!rkWs-^Q-4uKNuD{Hu_906^9VBS0XG0D+Sz
z34oJ82~mGi6@`MMMt(T0RK?PzON+;kAOA%l$pfd9s_E(J`SH@FODkGhTAVvF%>kvV
zHgDeCe(l<|)r%G_YEHcc{);eDb!*qI{o(rc>ub8ZyXU0d0^cHxB(Zq$;@MZPUhUqr
zY17=)TOblfl4)yeYrb&d!s=bScD1M80$&qGk}7`|i;X8voLEsVmw#$(Y)m}|8X6je
zk&HNa@ZgeDr%o+vZf;gbk`qQUWBc~)9RmXcU32HobuLND0VGp4ZrnJpQmJ$=S+ZnS
z>MhhSVI*@_u3Xt#sZ`diTeq$y^%m-rFp^0f9UaBN!NKk=Teh^N-a`EmMl!3lwYBN|
z`SX9P_UzfSF!dJdi!hRDO-)UW{r&x&M~)o%*>fJMMHtD2QmM4~?Af!O#bQw%`R;^~
z+}OHx>%zgo!By?;?M<n-P}_u&Tv@+<eOskc>F(_8ET-N<?Gi?EXZiBwEki>?Yc_1y
z(3*M+wMiJsrS|srSpx$D-P^Wpo0obEwMTy#$*nna<`hn!KE1NHx3?qp7HW$yl52%R
zp`ov@Z`skKM}1F*|BaJGt(ZwYfZE}^8|2#b^mN0?lPCYUc=6(^)LW<>!bom?`t)hK
zudnadn>TNcr`|$s5k_)pY;0`uz<~q94<0=Dka`QXM;OVSk&%&)rBZ2lWMpI_^%j3>
zlgk%!<>AAJZ+Gn2@kA8)o`jLyxOMB+>)pF|KN}w(pGv)j+9r(T!sW}CUmQAg==X_<
z3D0u)?)=9{rcF&v%^W*+Y~;$7E3Z>;p?(M>nf3nt`>Ard{QUOq+iz2Ep}q(snKU{&
zI?>zPJN)R;qmQY#P=ADx%o!dY{!o7^m4;uucrlrJ3-!t63z>57-o5diJ9j=2MN$$*
zGULXL8?W~6-TVCAyLZ#6w@}~wlqM6-ojdpEnKNhpnwjw$hxCMzq$VaNX8Qa4e;XPa
z8cV$e{vnJc^XAQ)FNY5wet!4v-FK<Cz}JM4BwoIJ`FY>Ieb1ggefl}|7KmGfk*a(A
z`0@Mw`}Yrzj*fmwy#>C-tu$42=gyt6o}QkkqDYoCEm*LiH}wc=-~9RWn`Y0R-B2!<
zM<ypHT|JX&ja^+`_fwCc_7w_+hUsa~6UhfZrKt*0Bu|r}4Xl$u4h@q)4h@q)4h@q)
d4h9#3zX2jF{+&MTmn8rI002ovPDHLkV1i}-3OxV-

diff --git a/resources/skins/Default/media/NextDialog/background.png b/resources/skins/Default/media/NextDialog/background.png
deleted file mode 100644
index bdd2689e824baa75c9db0f00698dfc74b2216577..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2088
zcma)7Yi!e26n4kTqo`t9%Zm8HjEfMD#gDW}iIvc$cG_m(5}H8MjtN}bX)bN-U^^r&
z3~gmRI`OLL7(-0FhQvc`ViJ2WMmtys6Qb1^ph-xeiiu5Ifq}%v7>HdvX;PrD{cvL6
z?>pZ;=R4QOZN93C+???_2!iB#E7@xJZ#Axw!{P6Q(zS;XB>Nf&1oa>{n--J^&WlRD
zgeM|Vh$D!zG!f;6MoCBOr3N6ou$y0XVki(@SdEP%xhNxrL1l|7`CF<2LQA9I5V6vk
zInD$P1tOBpqlrk9tkDS<X6n-L-dH9u)THQ*E-c9TP)1QD)P~z|5}TQWI#n@5SF`1*
zVEE+1!nz)%2_hbk<MAR~Q5y)#;cyV7m9SbZkYUl9Wt~r0WUbJUNNTW>Ca55)14Tv+
zO}<`<=`IX|IGPgYV=%XrxU8kBhdvNe0)z+(Cke<P21gixCzuWrK$OQ9M>G7vTpffm
zxj!OrAg26aIy5b<`v^P1M~5PF+_UMC$Rn9+x@RdYf2e8)HqZjiQHiLQG$p1Al4q$T
z>xF|eG>RWuA??>-dNi!)iWXL$QdSzy6bId=XG^k{>Qd5dbA?kxsVTK=xJP><e1inJ
z4SLvx*+_HW3{V5a$JdRrnqtOjm?r~hgf$Zq%wR68#0t-$aYjtF+94s>Dw<IxURTtB
zqQJb|#(RVM1`0+Qza5>z@dA(y2d0{OMi49mgqm4imtX><m9&tQg|Y`Ik|s&I$UdE<
z;7x`NUlx(q`Txo1IGR<2SOm7s%epYQA1(rsb~{+B-R^Nv4wj-QkKHk&YzAA*Fb<~N
z#ugWO2DXFYURl$5S&#<8K_-00GsBHe(LRunnu08V324yfbXziD?NdNTX;M@_oHfuE
z%FHKyIA{|y+V8@O9)r9L<5QIoXo8qlT~UU5J&c`l*zFc8PML!MbwU?lVU<9Gy=pdQ
zLuxwsr6tLy<gjQ0CWNBqYeMsaaZp@XR8_>7Ac^M2Ff@s3N=T3Ms^o5fR>S6pLI57A
z=4Ag-3NOKvnWh8cVF`*oz2QVEF~XQr1DQFACvtb1gh7K1#wFL_z=V^RNRM9lkRINW
z3@5e<NAsGJE$<>oRx5zMJ>eIEOlgm`cg`xCn}4cwaeGI#k7ZWAV*?%T^XGPUWM9}h
zyw-B>cE!#=6LUs^+`3h*`}Qtm9%LUGe%9^FcNg1=3yuVi_5Ap1oAdo;H-1@h)3Ih*
zZ+7FPJ>s3!S*NevuAA~}{A@+R0<Je0KDl9Y&(_@si~8C|#;#wj+TAT53mv+*<YC<z
zwXCMAzF>ksU?H4SonLRM;V!>)!*}km)aU0nPA<qlZo89MwQzRTyt`*a%ZoX09pQd@
z??7K7cRH|4e}y>p;o1C-EB|aImP}GLzIK_obWa|(_T>Wqy1YeO-R0e5u69>+_V3$V
z>g(Ad%~QwTn&v5<U)er+W5xN_z?{?D@?8@PnIHNeUOE2T_Y)WHJ$iD?`Z=p_T^!B5
z{>K~Eb-m2VyEC7=RJh>h1AiYJLEgq&_8<82uU)ZWJ@~=8<s*7ZcKz;N4-S7SZU)@s
zzB|uvpBwI6eXaYo-W9!$<7-YIU4CI~{|)z!Z$HN$AbBerx~3h{--I98QPIj;4M9fd
z8CMpvZTmR5Sm$Nkf$-bcd$UG$kuP+0eK!B{rTeq?wS9Bq3;(A651KEI+5X9}%k>|9
rSGm4@e4(v;@w)Tl_EXiue=cZQn}n>Q6ZhS7jSsxnQ^kH<wy5=AQIo*F

diff --git a/resources/skins/Default/media/NextDialog/close-fo.png b/resources/skins/Default/media/NextDialog/close-fo.png
deleted file mode 100644
index b6e4ece7835837b3bd8bff583cf180f42f752848..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11255
zcma)iWk4L=vh4stf(Ew`V1VH6?ykYz2bY1tU4pwi1h)V|f+jd5xVtmBC%8ZIednHY
z&z1MykM5bhSJmpORkf@CbcBkMG#WAyG5`QTla-NBefg#Nb0HzT+@qhG?E!#Seb(yQ
zF4~F;d}faJOeW@zrXVH{d+-Ym00;<sfKAM7K`vybAWLfpLEvdy2awF#To9<msmP)T
z76(~b%Xm41)V!3`&Ae>Qc+G*rLdXIhd@ls{AQuxd4|_WY2%m=_@GoAzm;ZmZnSo?~
znYh>r0<{%Y$iy9;L1dgvoJ=f0A!ITEXLAcaRSBtoIKQj}fmSXqU_NGMcXxLtcXlR6
zXG>;QUS3{i7B*%!HpUkVMu?|_i-`xL1BBua#ortfAc&c>HQ2@4(Shs_r-`YftBW8I
z_=1!DgB;{x{V#S0$UoA55rX*-!pzFV!u+4jU92ts7xO>Je=`SLIl4GPtQ^7rOyJ)h
z@lW`_IljpEKf8FCfd40BMaBQSxxM|rr2%n~bbArvAEN$SO#kr!h`J{j#H<Q}IJ!EU
zfh65P4lWdbDe*@aJ{4;Zke#-KwLQoI@}jOFkb~vFfI9yRDDG(I=&bhAR3Jeh7bhn>
z=U;w*)Z>%2H?ah1S)039{gdxs`wAcj%l``eiO$aTPkA*QtY7kB`xlq?zc4`{H`_~N
z{VDoibUObd^v_!G{S~32qxnmK?0<Rv3z8KVS8;Z<u(o@_R7BZ0xQx_5_Fy|}Gmw!4
z7pD;$3o8!`Ckrnt4+krgwVC~2-Y=!(dttM-@RTrddGTXoVPj!rVP$0HQfKAiW98yw
z<D_R{<zx9f!oRFvPKddQi^>1X{!gEi3A}hHD)Px#LtGr4J^$MJyZO~XPJgfdUfNmz
z)%9d#f7PDP#O#l3f<Umdqq(aY$o#KRU+DfuA&wR<?k3J4QOlRI3j#$gEUaGy_9RpJ
z)6ZnAOx#R=EAvkWcPr2f+5esz^FIP({&NifBQgQz{}#KzUk3l_+`jnzz4tN?UIq*E
zKPSt};-9k#<nS_(oL?r7)1`bW06<x6{Zgm@kNN-rR)NKtAbs_Txl;^rib<+TRq-Dx
zlPfD^D}o<gn#x>c<z>P+Cd&gjXvlM5#obpwJdZ)vmUmb2-N!7)ZgXAz>aSKUs}{V+
zEYShu;%^zVmqmF1>sv<~CFJy?#ifoSA*~2xaC-psPMGx!oo4YAPEZ5j&6#j=6e*xP
z4~lb0YV@3R;7`Mos(FG32q1&sb;N75cuArABYPD5^a$MO1Gwbkcfga0AP+WAyIWmw
zJ(Scf*d1@Q%YS}{l=|7^++Y8<R$(#u>)l3S`-KPSssH=~>GNGrE*_Wv!zmm9xvi)P
z6&LU+2?mgnmz<pW9xz_q!?~xV#B|m^f!m!iF)-MJI_m#0|8)4gCRX`=6n=wqqQN<c
zZ&61(L+01-bg&cnH{=YA1pY0~vv9<a{bak`5I{tR4u*LXfX@QM0Yl&UIsi5{fW#Qa
z5?ch>VK<PpWu0~X)y>AKz!}|H8u^)fW5?jL+x4^2a#c&q6D({$8{m_JfKcv77=Sac
zK%-Dx9Cu4xTpZe&92(%e%R9~0cm73*Oe&<@{KR?~bb^{_{226jbe@(dT!5P-@#k;d
z5I7H?kGrAs{!6eZYcM7qSpj=0UC&iRz3_k*ly&9!=cV^VXn+((fXL!QhrN0CnMxUq
z2qd}BmV4~kg#@Pe72vt%+@JMHS@a_{15yiC3%)1b?HhQJE^!mF1kqa22uW*6UI~zd
ztBAdrcaTNM6>bikASskr>I(agnlXJbeNH*5Hu}rJ7kqG?Q_L@#v(z&PQZ&-QYky1-
zHgS?llAUlR`K5QYjFgg_%&K&P?7mX5h@!l&($qCDVKy9H!Ch*t?<{r#F#M|Bgvesl
z#K|(nve2~6G;h6Z%V!8QRs}HG?%HlyH&{R1WX25l->0ymqhv<K%*XNtdNDNug%~Di
zZa*A+Z>Wim`P`V@AW#Dvyvbf%I*2rwMi*AWZ$o@gNi>u>q&u`|%cs|R@3o5%K)yqd
zMZsql9uZxhpV8(SEtv}{oGH7EWh@~1`aL{2zpzQI?%Xo%!(Je9BY#`ifvx4(wV}o;
zRA|?4>>&hB0X8`JcW_6Te#mzut=O~32LjGJ1RRPpyu0eXNBy@J-(-TkO`RrdaE{b#
zIjp=^!v++J7*_2Lv$vM3zZE{<!+V7|MlA{*r^Tloq=HhEHL$eywJfI@W`Yh4=iE7f
z+ymSlwuFvUR#W!Mhv_F?i;Q#Fi%YZae4RHM&r5Axf%!j9A1Ig#L(EXH&6A|mNK5DZ
zRh~Jr74xzTJ0FX`5PVUueXzaU&m3<(mRh!$nq5TicdRx@`o8x_G{4;Sh}l=W6>)5R
zq|<YI)Hj2>aXCa>zf{&%ckhT%8HfK9<)_}y`=8X$VK-U%7KKdt69u9ZUK0c3j}vn&
z(<}(NGQzj9x5($4*6&jVW+~h#V&RwwPu}Dr3c)`C0@=yQO%M~%Secxd2M#Tx$NUoB
z3u?U=r#_^(E?zI;`NU9KS6ouMT6BBS9h(|*6<?jZ8Yh~FndF4<knnntp-Zf@Ze(#Z
zwfkh4d`NcW_UG5`6_|moUmG(}=+2LIqc>%KgtRwu;nD<p9?DylR{7fD&E+4PDPwTz
zrgJYE6iV${mJx5ck=rAc<nRWi=nyKrY`hNch`ciIbo&=I`BV&;1%-V{;kd<jwUnfo
z`c<$k)eza`A!;aU@+kD)w%o-2ODt{fSNrJ2vByfn*%<j{)msh^C#~=NYR(12zF+yo
z`_Mjqd_aT!28SKQ76cJP7OU)T?Y5*)D#(=xUZd%4ZXfaGCb_3nViTgtr+>|<LtjjJ
zNoTMlF4wP=s_mvZs+c=0o%awSmJPgArtPaQo(CmvKj9kDomNuW0EIB7^XDqLw>aK$
zp)^YP5!zBXx*rpq6de1lu#Zbmo(iy>#n_DdmHFMcNjPvoj_kx7*xV0HrOu_H41M~&
z4_pG+6{!)L4_f}!=bh)qpe#q~lk3skBfkZhyZqx1&#z~!#}^hujzCW{GckAeGlHYR
zbI`%O{Z~S172TFA9-nXn$XUpE$T$L7MBP5IN|5*JQgRjXnSa=l#gU#aEkm=y+w0v+
zB6zLr!fMSDmv?1aY`V08v|g|tyHUJ;h%G>^O*Tx)Mp;6>N=ECsBQvPvb@we|I8HzM
zA<#5{EmkfqGtw)q<U|rsg-XJ-!hDAnIv1U2EO5rBCJ4caf}!UpW?KS!!%4p_g-d(O
zP4eoM&i4KW<5tv``x_Pi0cIK6j|>ge0!))+ndEqs4z&4X1GJJ1mo(oQ*_oDrT4bas
zao=MStLr`^chG6aD3D0QNkR?JRS&g^OV0J&)g0yh=ho-XW|8^`=C)dBzY{jKq=#e{
zN2DZu%^M+JQg0Kx_X-pGVO@&0%T7~3-%gy<77#XRi><6x!*Z&gC$}crF#_lnIUxIG
zycFL%9{c4xQnyS3&EcNA<ALeUD$MD=>GtLk)C`LbOF9u<HMfMVc%Vqn2Wf=n=h3L{
zX!`)w1Mzc1&`I}q<&S*@RHMZ@An|Rj6c-JmnJ&&eVaI9AnIX;_&RMQ5-Sm$6uYNXq
zr=Lz5_U@*?FAc5kuC6`cZe(p5PmVvh4`M=Ye7^9C@>>g~us=c(XO&wP;#+2K>y3`0
znB-H25G%87s}DJezc7Z{LvxbXdb~gR`lX+XZfq>GK1KYtp4Pd(J*K)&d3^R2<QP}e
zysNqF;YUfePritxX8k>R9{EMEvp7(`9w%#s_?I{SyC5<wMDF*b?auTTJ+Po7CPy!o
z(x}m~kMN~-k7;n)zsJH@We3&kj7kEk8WV9MB~F-JBbq?`B!d1-$rwNS&<$(wqwPjV
zrn|T_Xa`7Z^nTEA%>@T3wHDghZ94NiTup>4MoUV*a&)h5WM_|ns%uD9N>vK7yV^@Y
zVn`2sVTpBbmkjJ(A_y}tY3j7-=e+HsWAv{IU{A+fnTN85@HGgpLh2t$EhkeUCri3F
za0g3Ee6JQm@P10vXnkR>gXHwzC>Sy_Vwy=G8rDTI@s&5Ldseu;%8Aj}Zp%A9I$|_j
z{(SlVbt^+7bbB=?M<*{7#c_~G%`h(>-?td=(PgeJY@|Y-$@$Uyu)mge{T%ur$iPH>
z_6siKOv@*|>>d;_-u_TdqF}L5Td{a!oP50tzJe}z#ZQ$%Vx8Phy!0I})20Gn6Kwx}
z47uI!t##O$Hq<?od7d4Z9hr$Oqq`Sv8`jdnCcn8^>ofE+V1JccJ?l$!I6Sy-hjKHc
z%jn#J*YtoCMb~_a+REwfh`RU2P}`8iq`4&ra%iXscH?dTAzYNw?@c#0!g~og*}EXt
z2^IQEc#xn<0DG!s#LU3=YL-W&F)3tf3m8huMxz!L;;Up(%YTg$SIRV>7V6+k4Um(W
zYlTy3I^$#(CypD<&{1H2FWs41mAezjB_^vX0S%xM5g9cns|xNYCA1a8Lq%5>Bxa~O
zE}$+zt@5C#u+lZaW8Rd+=_O^ni+wcdnC0dsjcN43Vn#Z6wE5^2@cu(noM6sxxPG{i
z`J$&_M;}WD?|4|^52&Ip0Y0=Vh0r*V%nfm7cnG%LzB!5lvTdsTYM5Dt^iymb5}Wx|
zSBT?BCBhbZvN-dR{lzp4JWJKzcsmb6&^wHd@^|DU?upfH*+#<-o#@Nl7P*WD7-cT~
zc0!RDV}oF6+R4^4!%~C@AM6-2e+B=PGF-a0IJcE%OvDrNuL4CI&MH14_g3$mJ5pDr
zX}8F|vhmzFeZF!v22NSgb4E!b(tb+b<(cPfOZ5qk^v(7vRz4?`z=kByImawJxx03+
z=KQXL#h^UQ{w32VWkA8)Z`Xg|^4QJ3$z#q8a{DD!Wku+d{GNeAHGQXsC5|xKtcc}H
zP-Lf!)pXlibcvc!+5X7v=e?8tk7R&El5CE4@@bCRq)RMmP9)1mW8PXZIfH(tSSIww
z$>zQ}PMf!bT`Te*RY@tD`&zsGO+ziKLQs|D1m){WdU#Lq#OCU<$HC<0`5N70&^@Z;
z@2bN7S0M?Pw8w5puy<`uC5wa!RwN_pUimpCf@1tBT|Y71$bbx7M5vm9bx5-5sYD!7
zObfK6nVHBzjzn>iWTeB_^=mj1oghj&ZEXYG5A(kq#t`q0zMziB{<;$uOtC6tOyoms
z6P6Rz=1o5P!HcyDYkZ8P8bV9y8Q1czf@1eH$rlNe>@}sE<LOr?6E=z^mpdl*7!N!;
zgIUT41v9^?X(lQqNKB>iVVd0?^H*)g<e?J$iG`5lGZ-Z&WxDt`N^yyTN!sZJok70g
zi?et;++653f~c)nM_06STyK>$YK5w_7`kv9D+B!m7&wR&z71mWt=^Y^N^c#xOXQAd
zOxq1`a=GJ5@!V1>liG8AM@|c@C_3tel~BqUZ%eO^C0QWUwsGiNjNt{wclV<9lt{OV
z*5us=exfF`m#LeH4z#Mlsu20|wun?#;cLjdY$dKv;+$$~cedUjgp-2<`D@aT#b9(&
zDPy^k>A_<Q;kD@S-(8;wii=Sgd!4@I0h5!ZX(9r!5NMT5MvsM{TCgctM~NN$`}??J
zoffkc=q9}wJMxW<%6=hAaNW$2S3lR${Y+!hQVqf7Rw^n0V8OiD_4^N6L~?jf8mtKS
z8f%xY_*&pnb?UjsZM1M&3~R%U<Y1a&Akh(*&I~YAJEN<{&pWK+W#oZDfxU#EOLd}#
z5tiWPxre$@+IDJ&amXJi5T$+M88Iswro$YF?4=G$nwZ=3u_)xU<^-N}CCmeT!hX~>
zRUKyTA&Ppv4}D8aZu_b~6HB#)%~=uoLYHB=Apzr(xGW6?W=hZ}1ll`X)|fkAq4^6=
z$P@#=4w9VSUpWz1&mB@OFX1dfS#CV#6126;K*LVo%6hV=Vcm=;am(ITa~H>yK<{$l
zgI{)WdC{n#H9(1b)nZ+CtS%BZ0KwCKm9X7!>`Ezdy{PDb^Iaa=@CuH|WQ+Q{j9aBa
zIc=lS8%jBui8r6a!W$2hz)nf524BkNg&KpxkyIyUZpuT!m9}LxGWH9rDSn?#s4m~R
zJ7}m-3-3uyhKI5-uDXX@fys?2$>ohrg|C(0UW<H=gE~`jj1{muqlsaP_tKY1bQBB)
zrgU~tXp+Ga>cZCdHF0wc6VTgImBeN$6kiVhTD8uG)y;1h+DgzQw;&Dp`Q=*5PP1jr
zK!r-^K+w$l*YR$prwc#*ruzn_12&=sRPYQTk7asPEwi{(u7Mx{+uYxN`&b)oNL{Ob
zb@p?{0wod;4*(OhxZsep5HsD+k67oUb1I~Ck2WDcziWEs!u)+_@K)?5844&hzZN0$
z-P=HKL{u<LIW^Iu!_d#~D-L_Hes20cs3I6}2e-I{mO(A}Y$zy%-^(+2>w}3N@JpWE
zIxm+jIH!nBGEecZ0BB}7DPnm$N?~;AA<@x(AgVmYZ^$398WRG$!+)o+0~4w}oXew$
zkT3i>eG_et(n7H?F&CpGM6RlkurX~Pe9{Xp-Qw38sN=PFqz6&M9%z#Axy4TygNwF+
z+DMoYfz3G;@)5dfZ?dj*-tFvLQOpbm<>9J(;xw7AnKp@&4hM-_kl1+@cfTcg9kgsn
zVCz1mD*r1212Vv59WHv0vFS8n$ef0aoo})cHN&%S^`<rmEgBX6*D?EHSEH3QJBv&+
zKGN|XZf?<$ubY-t6Cu)6<_1?#xN5U(T4PRz7hAmE&xti<Axo-m+}c#ID;JrfY+RmE
zc_lxyb}akI)$1vjK7Jol34iG?v2(gR#1+?tdd@${zlI<ZJe$W{6x&8}E?Oul7!bBo
z(S$Mc-1`{>+^JzLfj@7%M<b!+eL5!p;HxZ|6z*OdyhlOi6JsI&`#7l-bQSe#3Nn3`
z{=h~4MD5J5YmQlq4iB44kwGN?B_t}pe=i3pfV~eXT^otX5R3Id1BNe8bP{)CD*ke*
z2+}bHXRcnlaksXm_HB}1X-!L#v~xcvY87HFCxMC@roDSSh~Qw`!EcL$<5y5(!V{1v
zWpk<b6BO?w4l%JGMdqOR$$3*nqJx(0lKQl<ESv*rfd|cLOYY<YuVrXYOA`$HO_O<M
zbh0vA9_OP9&}l4P%?F{>zv@y?Uo!+L(3F#qLns7r4DU+nYt`51z;Cc>Ua40XYRfmY
zcI3@WJpEE!8L4RvHFO(zlVTTm8@AE2_Mz@*bE9ynRshq8qpQSH#b^X-hqG?dC)z(6
zRaEYy2rXWMKk$qQmwJoJxjQ!(ujMCpW*0Te@*M2fiE|JX{jH!`d$JSEZ=whup&73?
z+ED3Z@9aS)@7-^l;}x}3sdU7D_a*J^=g0hMXItNux2Pkq-S_O1KJh$3^mTX^eub#+
zE|+N`Q_^y6Bb>98Yz&CuklKX!1(zyqzjezot5WDFrPJr({(QQ`!pb+;l_np5y3+T#
zoRMFWhgDH@F>h!&JGXzg)4@?405-%+i!I3L__%o+BPmrAnt6QJS5S(^jlu|Nl{<G#
zA2U|v4*7uF)bf@^fy1w+5!E%>KT_Gde&dJAm({6b<Zc`D*Z1W`N?AJ**s*x#&gQ?C
zRx`9)w~BR8k1=|+{Fbnu)oJkd9(P=pBrjXT*Zh2bKonw4GVX!maXU8mw@(W$Z51AU
zzA!z5gSwId!LWoHdK6wyL9B8zd5+5BlOH3oH+OH}-6dAMe}k#S;Kw3u!n-#e!bE4f
zaY-yaD=L-Oq>s|=8Y=)ew&~GeJYJB0ul7;HPrbpE$a{kz4@eB${}!ziDJo?l9A#ZX
z!&J`GF*hXn+^<cs6Nqrkj#NnKdP~`LOSSKc=H1bYguy!VG2aFRc^nwEb6-C|eg!iF
zuJA0Lq;XBd`MMJlC91$DmLT-bp)VXUrd$u-93PL1YQhY$Td%^;p7Xt`LJ0(#|075B
z!$p+4mNM!2QWmwC0LBnZMlOQ$!=R~P6X5_cJVk&n6PgmSsrq$_b#o7_>i%#lvjrJa
zpY5%u0A?(*A4{?vcY?sGGX#}OS5{EE2rRUrrzzT~1izwxFSBimsMkG?4b?*MBHF#C
zvmb0(E){vSMNYU+sVB$s6M(By-$7q7rW-bx{Sp3!mXhs<!b}m?QA|@p-WQEo7Njg!
zX#q5jW!^wB5+bU{u8*@e)0-W9siM}Rp)A}kRkuw@kGYM^CqkqbBbMZp(Ujv%+Ql~d
z=<2DeINhhxp6pSD0h0rinq^tUIidOmmCls|x}QW?(7y9&4lz!+3gTp9z76#eEgch>
zW{0+YvmX?%t{M4hg<L3C=hLlsij}P~9Vzy)bn_iXF}M25Tlnb)RVOdEA76GkH`~Tg
z*Jq7YDZ|PH+?o>=m%|kmIH(X$=tE?c$kNjzT^5RM?aT0{rGv$?Qt>S`dCr~wl%8M`
z4`bvt`fjaA##b$|`w8t|8?O<vbbX7DFcM3SuFLPOJoQ-m_uvqoV#3eVD0Nd$<~fI{
z&^F?vdI@|i7#sCU>gM7Nzm~nS%PAzKg7>?tiSE162z)0{IHMvJ>L4cRfU1(w%o6s>
zK>fpZAh{oYow`nJqE{Q{bb6lA*Gl4;Ng%=kCm58eI5C+okObOV={5b_i)5My^&RDC
z`!v2*gd-*b0jE?KoszQ&uo_d4DN=3_SRo-viOz@07=dMRv>M>WA?sOqBJo)VCF7;x
z!P-)R@<#DXfp)AYChGYK0enLCUW6GrbWt$c$K6EXV$ADFUoB5mBcHuo7fj_~YB4K!
z3AR=mr-J=x0mttz))D81Nv8%2g{zgB5_Vk2z8YWZ@n|M(>!nhB?wUrW)qAM0UHWu(
zk7ofRdL=bg{-A!dA?WLsyS;g>`+L7%YVrnuDis0wc+lqVVdN|YNMcg18D0cmQt;Vm
zpGP0%tB+rD?QC*_R(S4Zq1uvuUd1i{_;=xjz-q1!Foi$tC)7qWO*r@7?xJDrXMjwd
z#fkXha7htd^#aF%2ExMNF-fo2LNk3jQj_O*c6NX)WM-=~qv4ovu5I2QcX3LfHx@GK
zp@mr=2-c>@Cb&>@(luYh+5g7A*j{WxzC}k2`3xo}BTU7>?Bq&+#hU4lxPeD>;m-Bb
zcA-t6N^k4+_Y||uH+trKcXM<!7pg`Z-WQv&QeZpyjoqUO<>8;3wpQ5#UKe&mXEB8Y
z7jSQE@I<)Qlkrb~wR`h*Cj<gQ_LfEODAEyVf92>y7gSsMFo}qL${kqZ=F1o<NZ$&N
z^K*3Hy+!Mxlkp6cL0Ln5d1Za<!Ply=p!&q0DZbivep7`$aD<Y~Ikkz=G^MeJDa$EK
ze7wN4hL>eG2^0%WU@=;OuN!3wfXuRGjA+KEx^x_BU2^PSt&_F-m8ME$8%mtenI+*i
zOIq4BszXJJodrza*S|m5Yps3F4Bb*g4f&Q0-ijS(x&-#HaE$MWbf#lPJRH5#&Dcc`
zo=?WGA){TK5VYm)n%!`>GR#7g*}N<_l|uyPF?d%)&BTr&b3z|;L(lG8?GEDhL=D;e
zNYHG1wLb7PQ1ajDTOb!0i<eDQ$EBHBTWf7$B30|+-g8A8yIE75lrV9jNjhZ3wvA&k
z2lD&$l-s}RmLMWm>y?JGd0(4a#}brwtuVfiD<?==jy`tP$3f3$%EuZfjTOP`xl3+a
zJCBj3NOpev3E8ZXF_va)_a@#Ts<+Xdz&3wH@l%*};SDsBc%Xa+C`?9nNfa2d(2r+d
z#XxTtEY1MqTva?0DC67)><hv174$O>l3i>jHy{qzYn{iMGs<)hHZf$HskS}0Z)3pm
z75Ki{p0L7G9`3gaJ|uJ%`{1<wN!(V2*OTHhD?L{=Z0O5K7e})Lbxu*RT;!yHrk@a~
zE-a>jP=Ai#+AJbbXrIxpbnCFS6ffv%NO_OH9z{AT%$gxLl^FTR?^~V0EIN<<H^V{O
zqM)vNkYpyJD9N`DR7<b;pzD~R8Ziym+@g`NWTr~2(Nxy=&9}Z%w+m@Vx&>Mczb=R-
zy{-aRr`awRY&ut`6620d<n4_0jaW}T3FWz!4Sk&gJX^nuXy=TwQSiJg>GysrDfroQ
zRoA}%);f^e!|l!#;QWvS9wQK5OS5L3@|OID+LLKx*7JeugFB^V7dfY{)67mg1ylRe
zZFOLNEv!K_kw-$y4I1_(jw+8%UcYp)Xp`N1>44R#M6P)Of<)CYxbA_aYrek%!{`Pn
zp2Rhm4rUFjuJMv`xH4?Qms#0zm=J6fZ-b<(*~Ei|i#ilG%!So-TPqx<YwJz{Z#j}d
zf|-&3t<24<t1Xgl>twHPv@x*ofj2ov{Mv$na)<s^LO1iY@HW=Mag>y_T&f0(XwxNe
zI%{rhnP9~g(Y9}P+!j5Fhc+!L{B72Zke*)m;+U$nZBt2n^>15SY#9zjw7EHMt|bia
zcjy94rHw?RUq~-URvEE3;eA^gf7^bOI`&-V(-@J#!OaXOJiTzb55-yc<7H3vc75h@
z=UwM1zqWTE&MA22ZSgQW(P7F}#8mrK4Lw%PQ@$(TTH<5+rex6qNaM`+t+hnZp*7T!
znqKm|S+W>fg4*KV3x*LS54Eu5d*L|;XXBL97mm?4$u3P(6(R6`9M+P09d%Y8m#Wz)
z#D`38i0KwK$ooVkcoro<yks~j6;{E!;&fyte2scqA>(#B@s*&UNn!pgVw^z9fb$1N
zS&%all;L~GQJ7L&vRB7U4yAGI0NuUH)<VL~UN}`XFgfVQ8_(Q!0=0N3R)Ir+J%zc{
z=Azt`P@zmZ;%o6z9+8w&EAJLg)N_^mA~w&D5vi-rR|M~-`z&M-jBkH#c1zV73Obn>
zg!F2FX)B3%Aq$N`-!dYDe2)k=ht55+3dGP6_;M9VYfU4QBF%%Uy1SLd=J}@*d1)gA
zbq1yemXH?O*A6&1CX=vsnU#VyK5jU4t!;1Th|%=R7xt#_17EHC{n%&++dbckJtdY#
zkQ5XKY*fRX&PXRIZg*TEY}NJotW9op|Dfrg+^&qg={A&&(cIg0Tg{sflH7^VcKZG0
z_9<#bt3Y~y0GT<2fH*V)|7!X42WLjQA8Cq$RtBGDTwYjtswU3WtRmfdHO2(N04%L|
zBy-3-{nzFS?GmG~$`n85qwQSPH`=6Z+=+d%gsOhDy;{6z<)#_FBtrRI)TAJ_>`C@`
z;0h7F)F9<zhnKz9^pVY1-Af>^s_4oLe?P!|&RbTUUZ{lIPFJ)#P`(GFFkdr@p)@?G
z>;`xk_{HNmyu)M-N}iSWqsLVD7!5nMBDD_3)00wyp0lLM;VyoDC%`dFr^G)6a_!6`
zTZr8SNTcOas+wYn`zH9|hp>gOff_4wMP#jra+NcMXF$G3hA%_BVN^!xUh~EEcG6u?
zDLbp2+iGfim#SY8ws@r5YX24TJ6K^j*>tpvuG1elU!3efEoi-66nn_S9xVJi7O6lO
zcK&^_jZ(KP$u}(bQ&JSP7FR$|QV$ha3Ua;@<daXd!OV;;)2C`e+2+1s41`vi3e?iL
z{)t=omn>m>+8AA@1e^WKz5FCY`K$P9;WFoHtk1QRqso%cl8QYKEPOgBt;%9z+1;w1
zTNI5y!CP-q2k}D}<a!e1wJYKu$_*B-w`j7IW1Q<Ef907be_n@%r?oz^l&7dv;1o6(
zQkE_}N1zPf3mu0z%gw6vAxJP|7997hr}2O)h08f%@XJ5r57^@2LIOk9N?B=2x6nye
zX1I6#dztBSrhQVA#6{WP-MlV19GPC?r;_CtPH4tWV2`S*h>WqNrq7tbf^Hn!2HY>X
zfD<M8JDMEmP?=<7%`^3LZWxu|>ecKBexF@k#c2Je$eFD7qNUWo9VrxAR+4Ocb5gBk
z;|H{jvX=9osb*Y=RctFl=Qw6$`Knp1X{Rxnb5kB3CE}@F)hVaL8pImR;xEF=?kYpl
z&2TRi6USLRKFdGR2@}Sz@hMTFb<R{5%i0fUK+Wf$;+019jtbtQJc1${lKl}y#$-@h
z@ARi|&PB$gNO*(<qi9Oa82nU*en-SIlN8Bk=Jg_W(YOdx8c|6{nm3==yJ8{|8LdBE
zqtL4oPNNy<Nv?51gBGk=qDZyKei7tR-e0rtyum|7-KErIzf#^-&U%^^kfr_2B|`;5
zQ{79aBv2dIFI6L+9x<BoH(LuGD01kNNKnhH&4G<Ddm1TKX-$nLEag4cE=E4*PEZ_|
zRo3TJOQ-hFvZi>CD6FWcKf{bN?%i|0+?6kzM4c(?cNUJfU@mmXH*Pa0|0bM4R-s>g
z27J?M>s=|0em*U(RSG9OM9UCZ#^(QUxxayL7sl)_6D%+BA&1|$>esXdVQ6q_T>b!6
z0j2+vf|(^CIx8ZzTThV7tb!Ss6Ng2Nqp&*ScO<{iE~ajeQfGDh_zeQ-6%DiZyJ`2?
zy1qTzOl`Seo;i?=BK!6EQ(EyDSIdsmq+lKeKeG|Nox|<KJ;eLRr1)|6-i%=V!0)?#
z8M#h5wc4@>o=p7TxJR2sH!fR;lFK_g_Ft{;@t<Sw*Rn?A(0SeG9GYz1Everr#)-4{
zAj*3?Dl1Qg<A<K+aWgtHXuf~7V$rnIn0v>|Y<4H)<@(nDo5tl?Vnu0)kghGMhChja
zu2WO?a=+fW)ud-D^sCN*rLWqp*Hen@eT^N#k=`d&Jw556w4EgbIm~B-4rpbE|G?4k
zg^^>f-m<}<AFjdE%+B$tTb<U*tz;7}7hAl&dGZXGE#=WJbpJ`H%=^63?l4?r6q5Y;
z2-rP8A2q~$UF*d3HeSR(uN5yL>yaO0`bo>az9yQM{>m95At`CNdOV;076<-TLa5_O
z=Mn4x#kenTW637OzxQrI^RIeh-9NtantU7!xYArh-vB+&rl!VMAMorZ91k|zVsu<j
zQ;$Keyn<mz$1@je^bd6<+iwuO^c9~O9CEzcw8)5?YSfOMMIQzSeUqB2&j+gqC^y-z
z^Q$i9=d2w%SDtj9WvH@#>NkcP83(WRRXnVks{Oc3z+%6eK&#z*)LjM}>gmaMDo3US
z|JEm@h<rpF>?}0I$H%=|J_^nb5HZry3jU<taleZAe06f1-Px9WY=fIN(J9m4uz>}w
zhd%N2xEF%9k9=}s3$1&ej_(U%d=zPBMJw5N@%0oHk3c@zgP)m>oP=tE&`<N4NJ}p?
zNWF4U1*rV&%^MnORF5aStf$@LGO|*#Ag8X+wj1MOw4aI}wPw4-?M2LnMh13%-gb|*
z5gx)M)mA8V-LJ6-*@eXF`5g51MG=O&RI@VlR>n{@1bPHcPC-SdX&&21agSkk*|{o!
zTD|VO1-qQ%koAt-np?FeLHCPirc^h)=gSOXWt)vodc<#7ot4x6NB*%m{zd+ri2=mM
z@aZt`0#LGhVQ3zTALcgEzdd=6U^%$L4#V*C@WZ`(7I<QQc+UY38a?lQ`ONY)SVji|
z0H9$1xnKa9*#rOpEVZnJsJeE@@q9<rqA>yD8MQS}P)Wli>TJ;X;TcyXqqBB$kV7$D
zHT-LXL%(Mc>b`O?4?Z1LQsQ?YOjMS8(y}ThIz%fB6;H27e5pxIZhbh8yJnJj^_1ZE
z@5i(D0c@nOH(qeuJP*$ZHz6?AJpm0SB8x0!_F{1GqU*3}XFluRHC1T!Wvb<r{m@@a
zHec^Ln*w%Q3~R1+ry8_OS{(-Jd?X@mzv})-q+Fp-k&`a5&K<L;KQ(N2;d>NFka>%T
z91>oAxa$qK$nycm5e|S91YQqy**vl}iI<Sh9@<VUpphH3eYuTToX>kMFM-_>2ev45
zQZa(uu#VTQI9j8BKr7YhE?)tj1aC%jvd4CXm%*tZgR%;*I(;Vp6L=(mF+u2l$mbaw
z3{0`HWpGrVsraNc>V<f}Y3+SmcL;(PxqCz*EMNQ@j-=<H(_BpD%z^E9Lw|fcM3LKa
zsAsMk&Ni4B9YBT^u{>bT#+n&B&cDYgcjPfL@E!I$n7|BtLc^FyuoqI#aM;Zft&Eh<
z(L5}xN{Km+QCe{z+p+e%$vrF^FVU$~dd`+N)&cHWaIBomX26TmF_;r}<jPv(M^q}E
zs&sC7;30}xb?sSL2<;_!p5Qo!8ndtjyJ5l19bVRKfITcI9z(xiN3iy<I9&U-tq7ql
zN~5{}>lf@ACaiqUh`YI**)kMloB)8g_ns1j2t{aclc9fAtmRi{2b_dZJ}F#)&Y$mf
NWhIp)s>O_h{ttfX@I(Lr

diff --git a/resources/skins/Default/media/NextDialog/close-nf.png b/resources/skins/Default/media/NextDialog/close.png
similarity index 91%
rename from resources/skins/Default/media/NextDialog/close-nf.png
rename to resources/skins/Default/media/NextDialog/close.png
index aa61c1eb808c378969e88f3532bade5eee5326db..cd19c599a5af672b5fce9ab873fd4171d9b04358 100644
GIT binary patch
delta 446
zcmcZ=-XAtWnTa)EqpB9;<T^&n$^MM`leaT2m^_h5Y;q8j)nrZP$jSSe<R-6Sl9+s#
z$!GEgW(i?4T_ej7LrW_YBP$aVZ381K1B1!6%+dnr;*)PMTPauM7Wn#FB_@|-=I7Ze
z6%^&ClqRR9C~+x(0a$jjDT|IeL|u7CDo~Y?fsui(fuXLUS%{&9m7$rHk*T(UA<!Bn
z{mFlsBXuqGj9~^8m$;UdSRre}a78mqHp}iS8+12+VmYBw&#=YQ#W5tJ_3brBu4V%P
zw?x7IM}d3(v))O&D7>Rq&uW^PiCV6&QS1LkZT3%&Drpi^g1lDhF$VYE^kx!EV13qf
z^Jdy~v2D!T3-#wH@`~q_t?uh7n4_pHb9Lf@l<2SP#8a5cw}kyxGv;Qmo<DbGleWvf
zH!qvDUA`TyZOrNK_MWg(_vpR9Ez;``?K=HctiB<;|ICA5a>kM|_nT+g|GfHhua3%u
see0qHFFkMlnwhviyl&}~pjQ|99<7Sg@ZaokkpT!iUHx3vIVCg!07KED<p2Nx

delta 710
zcmeAVyA?h`nTh4-MpZ4w$sLUPll>VjCvRt5Fu91ybaD`r^khk9*~zTTl9SDteI_qw
zik!TOSxm@K*U&7)(89{l%*xO}+rZGuU~&z!oB+D;<QvRZljpLy=$h*pD{(1+L2-#|
zS&3D7Mrxj|l97Rtfvy3DE<V<5md`<@i#OM@o=~Z0;_`HH42fucd&9r`mV*S_hjNpt
zIVGBm3(dAFnK&l#yV<;58-L{WqKc2n8ascR+EjdebkbX#Q+Mj3iql7(k0)I?yzcd;
z%a?UB4eQkwm+*g<X>a*{oTrklNo(pU-93+%{4-b3Vmcws_@tNNlN&?jWQiGGN9#ou
zr<C{@Ey$d8y?$@pd+)7Ld;6-y6j|=(ZNK)i#7=$Y)N{{2^M=LjzPs<_)1vTcshR6u
z|2rgM-}cbw@}CF|kt;zfzoePXe%Q^Z={M~u4?}~B=Szhp^6u9sDa`DPxc+s!h`aLX
zqGeaJ?*8ciEz;+9*(5Y@O39s>KGr*;)|O3Dxhvfk_+kC;@}kW*>uuN`8XTLKd%OJi
z-+wQa92gp&7D;w((eXCrdF(83?(-hy(>7@dB0-^7@9Zq-Y)m{+{Afo5gZ>Hj*z5P_
zYCV2iw)_3}-|>?lF<7j(Y7v-nI@R>WvH%g+YbL(WW=^bNKfJ0%ZH>A<7tdiqr+>Su
zD<__DmuWjJQ9b$Oljr+iFF$2dpEsk-fGhp>x4Dlk_Afp)CsloB!`Zapd=shpO$A@F
zd0(H5TKlceYVNM%k0;KNeX;A^y14bvH{X17db;G5;^h-s1dOD5>vY7rV}ZUqaQNYe
zHx}n+DJ}N8(XY}n;bFm#TpPLdkIyBu{hD|*$<SDWXP^6216N?+nribgFm%p$pQ9q^
maF0VFpJjqM(}~&P{C}8@e;Bj;zZYc100f?{elF{r5}E*Uk~;|i

diff --git a/resources/skins/Default/media/NextDialog/play-fo.png b/resources/skins/Default/media/NextDialog/play-fo.png
deleted file mode 100644
index 1f82754c78558a4bd1fbd5ab06356ad990f68ea2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2012
zcmb7F4Qvx-7``eSY-2J4gDPWmw}>FLch}Lu&K|S0qaChW**e$7sN8yA+hc97ySvdJ
z$Dd9JKVgVJ_=Ae_;|7EgV}t^RX@-md0tyL8#vlwNI9Oan7!2{dw(JLn#!Ig4_dU=1
ze((F-b8lBz3XRE$&m<xUlALcc6vJ-@-jjw6fuCPit#3h)I4x_ni8gZqY3DpDn&B#d
zD&X-!96_|X0UvFz1frq>I9V@+cJ4cXDp-a>%QR-(?9&4mYYOq8Bvfd%hbrwk44OML
zQ5zs(0uK;rMZn|s3S@vnBY8>qTiV7@MT8<&QmD;rQRq1yC^RaK3P)!qDzrS~Ad3yN
zW5IAmp)OJMkr?Lp`&Ird6~{X<A}1#Y!_}Btt%MAv5cG<4K<O1Sr4-Q|1|ZmZ)+e%@
zS0Ux3E4XTrLQ#k-V#z^(?aS^JV(mjAFbTm36^`|%`&^vJ2`<jpThV}+Uigtfk##)g
z90_@Z4&@vCgaGXujBGalJKf_M(1sx9Er3GAL><t=g98L>&<C($AaK>Z9po(lUNJMG
zgrp0p=iD4$0<8fkG+U#|()2+VHUQi<1M2}^0SZr{1dcz1miI%aMZsR>qN&Xs12Yqm
zxIQRfueb1=gLOm9$b+C@r`<qd&_q*6LX!C&+6fAP*D1OvG?u#$C}SCE|3O6&Kx)xl
zEqSEW%R*7qkwYVptq-Hn>1yas$vF|Id{78JHqs3J&CnukphZ}w8du{=T&={jtV9ku
zjUd%IQ*eTeNfP064C@H~7hCeQLJRq3GihQ4k>i7rt*FsUKvi@VUAozb!zGVPeA+H`
zN1;BRW2)_diF6Tp10+=79HO7*fzAmZF@@?J4i@SVR9GadD+tweRo1`&zYD-*(Z&cR
zk!>YrkVF=VYhsOIgO(Dp++$0LqW`0mXh8o`2GclJiWZaJ{s$syu}5T#68en`*g|v<
zjv+YDu-<_N7ri49c;Ou6;lL|x!b{+=Y-OQ82lx^}<nLEoijrh=(>8!32X*|q_9rc`
zj0>;qh+Cdl9(EtU^KR?S(7tt@mp_^GdDF?WXSIiQJ@d~OG`1bBOrJM(*2rhK#u=)%
zrR~0SY=2Pc*T<KSo||`m?25ECcSrSndMI_-m6!C+du?}fuBc5zx(mLkwNCCX9KNPu
zbM~*NwzM{1FCI~!G&hjKH7?RjX#Rx=7g#U6n9-DwFr=pTl;+P9wKr~^bADHo*%6)`
zn6o$aTbuo@(bebEKin$3+}N?C;kkRpw$?3;Jw@ABdvay9htw<Q?>crAHk#lwl?w=x
zG)lT<$j2Mx2qJqm-=MSF-nO4I+2v!Fup7s}sKl?m^L_kmN`0oO-WWeleskEuB`Mp}
z##TK)G;G{FqpWPNDP<GC_Kn)5ON(~wRu|Rn+N<jv86Tg$=ID-w&k9!GE=`uz;qW5k
z+@_J>&{vEr0J*x;%)*8+?(NRF1j+Q-r%My&?_rj&HOl2P0&|jH7{BYc4>B%8XyU{J
zEvYB9Q*F%EPWharJFj0sl{3YY8CM~eaQR?qMpu1>{^!i$@VbBEwypTwg`wCD$MHRX
zC6u~{h1$C=Zccsu?~SXTBI<hX?hfXi{$lZc0xWyaxTxkM+<wv1!RuQxxd~&7a=XW@
z?^yds%k`|ot6sa`tjwLJ?ONRV<Nony`1mJ=%j$aW5YC_4kJMU|Lv=Nwa>{c&>4$6b
zp|@Q7Q>KjgeG}JQpVm%v-MF={t+^rXYmZWVNVn{C8L~|`n+Rv5XG(v{`FVwgowMe>
F`40+cwDAA{

diff --git a/resources/skins/Default/media/NextDialog/play-nf.png b/resources/skins/Default/media/NextDialog/play-nf.png
deleted file mode 100644
index 64531f6bac97f3e2d970b02dd554242db7864fc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2007
zcmb7E4NMbf7(RmdgRo)L$);jGVnngMyO!d5>+#o?mPu>DI?Lu_kM>&5{#>~`Y)jPW
ztfJ0oCefLx8Clf%lMNStHm2LyL}fwUjJn7iU_f1FRGgD2f^OekD?byr?2_yC`=0lG
zzW06Zxp$q}q)&{0B_4vH!~%o17(5-|P8&H4{C-^iK_djkscDOqw;Bs^JL8p+4yKfn
z1-*WNLy$T<=qK%NikFm9F4{-HoyWd~CA5Qp7buOW(XXM(XhS7S&8sw7?3Hf2$^mC*
z#jArjAn;N=DG7Q#J`N8Ou*i#p|H3u`OT-Y~O~6*8S)yTBN}`l0Whk5#FHy4&Ctj@0
zk0yf^0hjT-A4iZtARr4UWDM&<FqKM$pmIbmmx2f>7xM9BQ0n7S1&RoVmg4Lz?dNI6
zClNTwQl^3@U>M+%C^;3R``LY5w0$51A|MDRLy>{u{xXJVxH87ySJ9xHKKPkLo_0Rx
z907SI9LP8H2|?07RIt(b@8MqWpf)&Ow*&|g6?ISxPY>WMAwPu_Qyf#l+9}-<%EzaQ
zN(j2(8pgx0^MExd0?t$_70Q0dOb02CRZDv*9|wddU<^h7ftCzFGa_K0auI4H;{eQ<
znAZ;#Xf$S)anc@u=~*ho*+~y2(JCVpf{=KDmvm8ul+VSN5pa~dA6P&;g#D)#iGa|e
zr$X?^d>;)&k&B0lkhLEp;MsEEPQf`MR5Bz4UK?%%{&tW&sU>+(rW}={QdBNQ6&6f|
zXJEJ@BOS%?s3c-M<Di|P|B4noEm4DbqY*dI9M7;JaVui<c~p616<K;{(cyx}g?Q2~
zbVtB`mT^?rDTmmF_yq_k$2j=_$x^v4@QMjI*Xg8z4k3wIu(|}3&6X(!Cj`nUKo)5X
zlVX_`>{T37;BqY57&2rjqUD}jN(B8Mr9=`2mNJya(Nffi@by0xNsT-sV<cd}xBx9g
z_P`hd^9<=5XkgJd5-A^;gDe<$%MNCq0K>9{2L2r6O9)EdQemDuI;LpS4yx&7F1z_!
ztof~pb?a}%Rq0CVJU>3FZt1E#wz>2A_Oy@c&o?)#f5`1!+*(-McE+7zo0T_a+MYOV
z`Tj{?beugNk_I%xOU4!HS|_ZVw6SMw@6OZX*W8$+aXoJ9QQeRmhIJPn4qIk)n-Vte
z+m-pt#oa9pw~JrgJGv;C#MCZVPHDJ+)fHN<=1i?0HEP(>@I~eQpTc(@TycH9H1$^9
zjNt2EjX!F&uNqg;nzC&V_eSll75k<?*0;6nuI-(BV1qY1CVX1He(}MxXF#K){Du+^
zf<})O?ilF99mx<BV=d6;TCA(>7Y+90msZd<lXIl#&G)|>o=?ax*YDL2pP1Y=av3zD
z8cHvpIigPgu*B`Lgw__R8j0`g>zj5m9cd<OOU;9kv9alM!t{=rQ|D{yQxm}T^Gzy$
z;hBe)gfW{?G;PkMH=Ee@tyAPFq%EmE{fKhHscEl;)qvyNR@<2UE8g}QLgAGw*PYi*
zU$iOl-2+wI^vU2ld~NY8UGsTeRSj4+#HD+?;>;)4>=LmjkM-9NC2UZn#UgEUv;KTE
zegEa8`;ABR7ixPSRmt!M^}Wu&TGQPrrPVJNr*wC_e{Zg4K5t5#y6JdN#_jtZonJbt
zHt6qUZD;?uvgp@)nub)pZ`L=f7M)DG+t``yJ~uh2GhC{9(D+I1AyeCvJnQ6+t10jO
zW^1=Sxw}1i%PMvL^4^}6MP1|w&CyR+zc4_qMqBKOQ>oBSQx4glm$MKE4;AQ4+RyTA
G@B9tB!@Ge1

diff --git a/resources/skins/Default/media/NextDialog/play.png b/resources/skins/Default/media/NextDialog/play.png
new file mode 100644
index 0000000000000000000000000000000000000000..70d3cbb6224ff7a2e2918decbe2a9b589a3c65c0
GIT binary patch
literal 2117
zcmc&#ZEO=|9KUV6%n~9-7N%jzapQw-wD;28ST8+BX~#BQN8P%uQ$dg3)Aq9VuDiRg
z?Shyf^M!~ePDRFyfH91Wh(x#HTtH>YKA0(CqL^g{LRgqCxP|yONPO<D?8OcEWc+aL
zJ<sp|{GR{+_y67VyyB@WU2b~VgdoWB@-kNy{P)1;k<3N#_l(fB2SJv21g}r^xhojI
z6tQr;v>jLyktoCw#9o|;a{dOOqT4}G5LxW{XQwe#;90DWb`$QX6NH4aW*JmBS9<-;
z4SpMs6>l)v6AUDX0F^@%k+7&R2^Q0N8ThVE;~1)ks0}RUb9+#yBm<PT&=vyQU_$LO
zA7H9nn^TM7h{Zyx8f9=i9*<k%R*NJDanfe9;RJ<Klo>{tm87V03A3o=Y7_>C3n+eB
zh^m4lq8cZ+U5cqJhCv)nk%NRV!!9bR@}Us8hTx=yz-Na?Ly{^fAt^eY(VR8Y@Vtep
z5V*rW8Zs{&%D3<i2`;)&u-kq2@JM7%8H!rc1cgY6I;Vu&8z|mn6yQ}rkz%qRlr#ZR
z&DE9AbYYxQSdy!uH2{kh(zKPHfjmM2gncd{0z?H0&tgTyzrgxgV1WTn3uiF9B_0x!
z`nnmY-0AelQa}hptW*X`#m|KS>Y@z_O-H6Y!UaJE5QA!n#ZufeK%KyA^QnaNd9A>3
zOmj$$C_qUleNP?o&0s9Ho`T-ge4|743qr7Ij2pU}=Ty$csW3~5pa?TjXr^pl(#8}}
zjMbJ;Pz+&E>G2XT1d{iP)*Ox6VZ7VTlnII|$w__6uz59TG)BfSEa?8$9InN4eyutd
zi^>uo^8;S5LifLhDpEj=b24xQVS`!B5eNuSha~FJjE<6)^%m>g1@RDoWJY16nJn~@
zMGR?W2s)o2wZicKCl$&}Sapp_hJqUZ$Eg(EO_f43S>z>YhAv_Xtf_V{tcv~_-myUj
zdank}O2t?(yFm*%FO`ZN*G|OS*0JOB%w+`3IznM%jX8KU!!sVAKIGwG`kDYDyc=YA
z3G|+>T?sFcVF7-$b3RrC$$l&5*|IFnvHH3E#>Ru~uJI=hzd2CTzj$fwnthRD#TP+a
zj&ORPba+R4X)q|QT{_XZ{yKeY<iH4W;mcKy?BnTQZ0j89pbrdQZJK;>k!j%I%Wvdw
zvSr6}ZoYdq>+MUAf5qSWdCE5N!79__{!r%8g1;(nY<aTkDfif~gAa8bof^9KdGVf}
zANtxRe{UsirB}|qu<NDFHH)79bEuH%ICEoayz|r!=jxM>CLZg}>h}3F_EOU86;@kk
zUH93cft%;z@oRa1oX@N6WYaGGMtysXUbh0)d0(`wUO|v$4{A>u($=00CqFKCIlR7>
z@e3y&a5z?Oz691%N8d^B*to3uyA0NoL3`4(`j%YTM5QTf?b7JD`1dnccTOw`27=c|
zR<tXFpT5`s+Ns_{nH|}k`6lEfSr_LgP8>QSmS6s*-?O!K<N22Ty+>MpY|YAvRqyW3
z$cWWAu@!?A-*4^W(c$|3(cZScb?IZfd%nrqGPJeJH8L`poBZe#d*Idk$KD@5E=H2|
sCx6=3lec+nPkQ&)bvsAfmFF)nRwvRf6z(k<hUp{aC6%rZH$A)SAH*BIF8}}l

literal 0
HcmV?d00001

diff --git a/resources/skins/Default/media/Controls/DialogCloseButton-focus.png b/resources/skins/Default/media/close.png
similarity index 100%
rename from resources/skins/Default/media/Controls/DialogCloseButton-focus.png
rename to resources/skins/Default/media/close.png
diff --git a/resources/skins/Default/media/white.png b/resources/skins/Default/media/white.png
new file mode 100644
index 0000000000000000000000000000000000000000..528c66f6e8ed820dff50fb927f805aebd269327b
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^EFjDXBp4dI7GDNZ3dtTpz6=aiY77hwEes65fI<x~
z7#K<o7#Ln9FfdrnU|<k0n6oR;1}MRl<n8Xlz<9SycnOflS>O>_%)r1c48n{Iv*t(u
z1=&kHeO=k_bFwnXa0y>fiUJDpc)B=-a9mIRae$$XfuDo<U|jU$gFtZxPgg&ebxsLQ
E0Oo5Y8vp<R

literal 0
HcmV?d00001

diff --git a/servers/akvideo.json b/servers/akvideo.json
index 1a75b82c..337ca196 100644
--- a/servers/akvideo.json
+++ b/servers/akvideo.json
@@ -46,6 +46,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_akvideo.png",
   "cloudflare": true
 }
diff --git a/servers/anavids.json b/servers/anavids.json
index 90ffd75f..bdc73b86 100644
--- a/servers/anavids.json
+++ b/servers/anavids.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://supervideo.tv/images/logo-player.png"
+  ]
 }
diff --git a/servers/animeid.json b/servers/animeid.json
index 3c27c843..21086eba 100644
--- a/servers/animeid.json
+++ b/servers/animeid.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "animeid",
-  "name": "animeid",
+  "name": "AnimeID",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/animeworld_server.json b/servers/animeworld_server.json
index 5cd743d4..63aba311 100644
--- a/servers/animeworld_server.json
+++ b/servers/animeworld_server.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/anonfile.json b/servers/anonfile.json
index 4e18d4f5..5a7cd15a 100644
--- a/servers/anonfile.json
+++ b/servers/anonfile.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "anonfile",
-  "name": "anonfile",
+  "name": "AnonFile",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://anonfile.com/img/logo/logo-anonfile.png"
+  ]
 }
diff --git a/servers/archiveorg.json b/servers/archiveorg.json
index 73f07ffa..ef60d243 100644
--- a/servers/archiveorg.json
+++ b/servers/archiveorg.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://i.postimg.cc/P5ZYJM4L/archiveorg.png"
+  ]
 }
diff --git a/servers/backin.json b/servers/backin.json
index e61cc7bb..050a3e71 100644
--- a/servers/backin.json
+++ b/servers/backin.json
@@ -15,7 +15,7 @@
   },
   "free": true,
   "id": "backin",
-  "name": "backin",
+  "name": "Backin",
   "settings": [
     {
       "default": false,
diff --git a/servers/badshare.json b/servers/badshare.json
index 78624986..ae4265e9 100644
--- a/servers/badshare.json
+++ b/servers/badshare.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "badshare",
-  "name": "badshare",
+  "name": "BadShare",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://badshare.io/badshare_logo.png"
+  ]
 }
diff --git a/servers/bdupload.json b/servers/bdupload.json
index 8bb33b1b..c9708b6b 100644
--- a/servers/bdupload.json
+++ b/servers/bdupload.json
@@ -15,7 +15,7 @@
   },
   "free": true,
   "id": "bdupload",
-  "name": "bdupload",
+  "name": "BDUpload",
   "settings": [
     {
       "default": false,
@@ -42,6 +42,6 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s18.postimg.cc/68colqvyx/logo-bdupload.png",
+  
   "version": 1
 }
diff --git a/servers/bitertv.json b/servers/bitertv.json
deleted file mode 100644
index 9a4caa4c..00000000
--- a/servers/bitertv.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(http://b.ter.tv/v/[A-z0-9]+)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://byter.tv/v/[A-z0-9]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "bitertv",
-  "name": "Bitertv",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://s18.postimg.cc/f56rayqq1/logo-bitertv.png",
-  "version": 1
-}
diff --git a/servers/bitertv.py b/servers/bitertv.py
deleted file mode 100644
index 9e898962..00000000
--- a/servers/bitertv.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36'}
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "Archive no Encontrado" in data or  "File has been removed" in data:
-        return False,  config.get_localized_string(70449) % "bitertv"
-    return True, ""
-
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    patron = "(?s)file: '([^']+)"
-    file = scrapertools.find_single_match(data, patron)
-    video_urls.append([".MP4 [bitertv]", file])
-    return video_urls
diff --git a/servers/bitshare.json b/servers/bitshare.json
deleted file mode 100644
index 52d1cae9..00000000
--- a/servers/bitshare.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(bitshare.com/files/[^/]+/[\\w.+\\-_]+)",
-        "url": "http://\\1"
-      },
-      {
-        "pattern": "(bitshare.com/files/[a-z0-9]+)[^/a-z0-9]",
-        "url": "http://\\1"
-      },
-      {
-        "pattern": "(bitshare.com/\\?f=[\\w+]+)",
-        "url": "http://\\1"
-      }
-    ]
-  },
-  "free": false,
-  "id": "bitshare",
-  "name": "bitshare",
-  "premium": [
-    "realdebrid",
-    "alldebrid"
-  ],
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ]
-}
\ No newline at end of file
diff --git a/servers/bitshare.py b/servers/bitshare.py
deleted file mode 100644
index 08acfe94..00000000
--- a/servers/bitshare.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import httptools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "Error - Archivo no disponible" in data or "Por favor seleccione el archivo a cargar" in data:
-        return False, "Archivo no encontrado"
-    patron = '<b>()'
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    return video_urls
diff --git a/servers/cinemaupload.json b/servers/cinemaupload.json
index 34350d1e..448525a8 100644
--- a/servers/cinemaupload.json
+++ b/servers/cinemaupload.json
@@ -15,7 +15,7 @@
   },
   "free": true,
   "id": "cinemaupload",
-  "name": "cinemaupload",
+  "name": "CinemaUpload",
   "settings": [
     {
       "default": false,
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://cinemaupload.com/static/img/logo1.png"
+  ]
 }
diff --git a/servers/clicknupload.json b/servers/clicknupload.json
index a3ccd30e..068bd3e5 100644
--- a/servers/clicknupload.json
+++ b/servers/clicknupload.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "clicknupload",
-  "name": "clicknupload",
+  "name": "Clicknupload",
   "premium": [
     "realdebrid",
     "alldebrid"
diff --git a/servers/clipwatching.json b/servers/clipwatching.json
index 4d455db9..87c03421 100644
--- a/servers/clipwatching.json
+++ b/servers/clipwatching.json
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_clipwatching.png"
+  ]
 }
diff --git a/servers/cloudvideo.json b/servers/cloudvideo.json
index 974dea77..6016fbdd 100644
--- a/servers/cloudvideo.json
+++ b/servers/cloudvideo.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "cloudvideo",
-  "name": "cloudvideo",
+  "name": "Cloudvideo",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,6 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_cloudvideo.png"
+  ]
 }
+  
diff --git a/servers/crunchyroll.json b/servers/crunchyroll.json
index 330afc53..895e132e 100644
--- a/servers/crunchyroll.json
+++ b/servers/crunchyroll.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://i.imgur.com/SglkLAb.png?1"
+  ]
 }
\ No newline at end of file
diff --git a/servers/dailymotion.json b/servers/dailymotion.json
index a7b7c161..25e8b935 100644
--- a/servers/dailymotion.json
+++ b/servers/dailymotion.json
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_dailymotion.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/deltabit.json b/servers/deltabit.json
index f1f5a56d..f392a7d1 100644
--- a/servers/deltabit.json
+++ b/servers/deltabit.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "deltabit",
-  "name": "deltabit",
+  "name": "Deltabit",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://deltabit.co/img/logo.png"
+  ]
 }
diff --git a/servers/deltabit.py b/servers/deltabit.py
index b1288073..ad811ae0 100644
--- a/servers/deltabit.py
+++ b/servers/deltabit.py
@@ -1,40 +1,36 @@
 # -*- coding: utf-8 -*-
 
-import time
-import urllib
+import time, sys
+if sys.version_info[0] >= 3:
+    import urllib.parse as urllib
+else:
+    import urllib
 
-from core import httptools
-from core import scrapertools
+from core import httptools, scrapertools
 from lib import jsunpack
 from platformcode import logger, config
 
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
+    global data
+    data = httptools.downloadpage(page_url).data.replace('"', "'")
     if "Not Found" in data or "File Does not Exist" in data:
-        return False, config.get_localized_string(70449) % "Deltabit"
+        return False, config.get_localized_string(70449) % "DeltaBit"
     return True, ""
-    pass
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(deltabit page_url='%s')" % page_url)
     video_urls = []
-    data = httptools.downloadpage(page_url).data
-    data = data.replace('"', "'")
+    global data
 
-    page_url_post = scrapertools.find_single_match(data, "<Form method='POST' action='([^']+)'>")
-    imhuman = ''
-    post = urllib.urlencode({k: v for k, v in scrapertools.find_multiple_matches(data, "name='([^']+)' value='([^']*)'")})+ imhuman
-    time.sleep(6)
+    post = urllib.urlencode({k: v for k, v in scrapertools.find_multiple_matches(data, "name='([^']+)' value='([^']*)'")})
+    time.sleep(2.1)
     data = httptools.downloadpage(page_url, post=post).data
 
     videos_packed = scrapertools.find_single_match(data, r"</div>\s*<script type='text/javascript'>(eval.function.p,a,c,k,e,.*?)\s*</script>")
 
     video_unpacked = jsunpack.unpack(videos_packed)
-    videos_urls = []
     videos = scrapertools.find_single_match(video_unpacked, r'sources:\["([^"]+)"\]')
-    video_urls.append(['[DeltaBit]', videos.replace('https:','http:')])
-
-    logger.info("videos_urls #### {}".format(video_urls))
+    video_urls.append([videos.split('.')[-1] + ' [DeltaBit]', videos.replace('https:','http:')])
     return video_urls
diff --git a/servers/directo.json b/servers/directo.json
index 8e43c420..353db2af 100644
--- a/servers/directo.json
+++ b/servers/directo.json
@@ -4,10 +4,14 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "((?:http://|https://).*?m3u8[^\"'\n]+)",
+        "pattern": "((?:http://|https://).*?m3u8[^\"'\n]*)",
         "url": "\\1"
 
       },
+      {
+        "pattern": "((?:http://|https://).*?.mpd[^\"'\n]*)",
+        "url": "\\1"
+      },
       {
         "pattern": "(http://[a-zA-Z0-9]+\\.mysites\\.com\\/get_file\\/.*?\\.mp4)",
         "url": "\\1"
diff --git a/servers/dostream.json b/servers/dostream.json
index cab92b60..4c9745bd 100644
--- a/servers/dostream.json
+++ b/servers/dostream.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "dostream",
-  "name": "dostream",
+  "name": "DoStream",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s14.postimg.cc/lczc08bsx/dostream.png"
+  ]
 }
diff --git a/servers/downace.json b/servers/downace.json
index 64795d93..721dd84e 100644
--- a/servers/downace.json
+++ b/servers/downace.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "downace",
-  "name": "downace",
+  "name": "Downace",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s12.postimg.cc/4n9fmdy7x/logo-downace.png"
+  ]
 }
diff --git a/servers/estream.json b/servers/estream.json
deleted file mode 100644
index dfcae14c..00000000
--- a/servers/estream.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://estream.to/embed-([a-z0-9]+).html",
-        "url": "https://estream.to/\\1.html"
-      },
-      {
-        "pattern": "https://estream.xyz/embed-([a-z0-9]+).html",
-        "url": "https://estream.to/\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "estream",
-  "name": "estream",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://s14.postimg.cc/ibd54ayf5/estream.png"
-}
diff --git a/servers/estream.py b/servers/estream.py
deleted file mode 100644
index 24c63a34..00000000
--- a/servers/estream.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector Estream By Alfa development Group
-# --------------------------------------------------------
-import re
-
-from core import httptools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url)
-
-    if data.code == 404:
-        return False,  config.get_localized_string(70449) % "Estream"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    patron = "<source src=([^ ]+) type='video/mp4' label='.*?x(.*?)'"
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for url, quality in matches:
-        video_urls.append(["%sp [estream]" % quality, url])
-
-    return video_urls
diff --git a/servers/fastplay.json b/servers/fastplay.json
index 274c91e6..411c2f40 100755
--- a/servers/fastplay.json
+++ b/servers/fastplay.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "fastplay",
-  "name": "fastplay",
+  "name": "FastPlay",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://i.imgur.com/vHDcd6Y.png?1"
+  ]
 }
\ No newline at end of file
diff --git a/servers/fembed.json b/servers/fembed.json
index 070ab7cd..918c62ed 100644
--- a/servers/fembed.json
+++ b/servers/fembed.json
@@ -38,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_fembed.png",
   "version": 1
 }
diff --git a/servers/fex.json b/servers/fex.json
index 936e48cc..a22348de 100644
--- a/servers/fex.json
+++ b/servers/fex.json
@@ -38,6 +38,6 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://i.postimg.cc/pdswzj8G/fex.png",
+  
   "version": 1
 }
diff --git a/servers/filebebo.json b/servers/filebebo.json
deleted file mode 100644
index e9cd089e..00000000
--- a/servers/filebebo.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://filebebo.com/(?:e|d)/[a-zA-Z0-9]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "filebebo",
-  "name": "filebebo",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://filebebo.com/images/logo.png"
-}
diff --git a/servers/filebebo.py b/servers/filebebo.py
deleted file mode 100644
index d7b21c6c..00000000
--- a/servers/filebebo.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- Server Filebebo -*-
-# -*- Created for Alfa-addon -*-
-# -*- By the Alfa Develop Group -*-
-import re
-
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def get_source(url):
-    logger.info()
-    data = httptools.downloadpage(url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    return data
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = get_source(page_url)
-
-    if "File was deleted" in data or "File Not Found" in data:
-        return False,  config.get_localized_string(70449) % "Filebebo"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-    data = get_source(page_url)
-    url = scrapertools.find_single_match(data, "<source src=(.*?) type='video/.*?'")
-    video_urls.append(['Filebebo', url])
-
-    return video_urls
diff --git a/servers/filefactory.json b/servers/filefactory.json
index 277e1f52..99b7b565 100644
--- a/servers/filefactory.json
+++ b/servers/filefactory.json
@@ -11,7 +11,7 @@
   },
   "free": false,
   "id": "filefactory",
-  "name": "filefactory",
+  "name": "FileFactory",
   "premium": [
     "realdebrid",
     "alldebrid"
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_filefactory.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/filepup.json b/servers/filepup.json
index 35f9e32a..945f5994 100644
--- a/servers/filepup.json
+++ b/servers/filepup.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "filepup",
-  "name": "filepup",
+  "name": "FilePup",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://static.filepup.net/fplogoV2s.png"
+  ]
 }
diff --git a/servers/filescdn.json b/servers/filescdn.json
index 273cd598..c1810508 100644
--- a/servers/filescdn.json
+++ b/servers/filescdn.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "filescdn",
-  "name": "filescdn",
+  "name": "Files CDN",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s31.postimg.cc/ijne6piij/filescdn.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/filevideo.json b/servers/filevideo.json
deleted file mode 100644
index b6ea10ff..00000000
--- a/servers/filevideo.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://www.filevideo.net/embed-(?:embed-|)([A-z0-9]+)",
-        "url": "http://filevideo.net/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "filevideo",
-  "name": "filevideo",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://s15.postimg.cc/b7jj9dbbf/filevideo.png"
-}
\ No newline at end of file
diff --git a/servers/filevideo.py b/servers/filevideo.py
deleted file mode 100644
index 2bd1ad53..00000000
--- a/servers/filevideo.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import logger, config
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url).data
-
-    if "Not Found" in data or "File was deleted" in data:
-        return False, config.get_localized_string(70449) % "Filevideo"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-
-    data = httptools.downloadpage(page_url).data
-    enc_data = scrapertools.find_single_match(data, "type='text/javascript'>(eval.*?)\s*</script>")
-    dec_data = jsunpack.unpack(enc_data)
-
-    video_urls = []
-    media_urls = scrapertools.find_multiple_matches(dec_data, '\{file\s*:\s*"([^"]+)",label\s*:\s*"([^"]+)"\}')
-    for media_url, label in media_urls:
-        ext = scrapertools.get_filename_from_url(media_url)[-4:]
-        video_urls.append(["%s %sp [filevideo]" % (ext, label), media_url])
-
-    video_urls.reverse()
-    m3u8 = scrapertools.find_single_match(dec_data, '\{file\:"(.*?.m3u8)"\}')
-    if m3u8:
-        title = video_urls[-1][0].split(" ", 1)[1]
-        video_urls.insert(0, [".m3u8 %s" % title, m3u8])
-
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-
-    return video_urls
diff --git a/servers/flashx.json b/servers/flashx.json
index ef08a819..b1a9e13d 100644
--- a/servers/flashx.json
+++ b/servers/flashx.json
@@ -15,7 +15,7 @@
   },
   "free": true,
   "id": "flashx",
-  "name": "flashx",
+  "name": "FlashX",
   "premium": [
     "realdebrid"
   ],
@@ -44,6 +44,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_flashx.png"
+  ]
 }
diff --git a/servers/flix555.json b/servers/flix555.json
deleted file mode 100644
index f642474c..00000000
--- a/servers/flix555.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "flix555.com/(?:embed-|)([A-z0-9]+)",
-        "url": "https://flix555.com/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "flix555",
-  "name": "flix555",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://flix555.com/img/logo.png"
-}
diff --git a/servers/flix555.py b/servers/flix555.py
deleted file mode 100644
index 87484ada..00000000
--- a/servers/flix555.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-import re
-
-from core import httptools, scrapertools
-from lib import jsunpack
-from platformcode import config
-from platformcode import logger
-
-data = ""
-def test_video_exists(page_url):
-    resp = httptools.downloadpage(page_url)
-    global data
-    data = resp.data
-    if resp.code == 404 or '<b>File Not Found</b>' in resp.data or "<b>File is no longer available" in resp.data:
-        return False,  config.get_localized_string(70449) % "flix555"
-    return True, ""
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    itemlist = []
-
-    packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
-    unpacked = jsunpack.unpack(packed)
-    # ~ logger.info(unpacked)
-    unpacked = re.sub(r'\n|\r|\t|\s{2,}', "", unpacked)
-    subtitles =  scrapertools.find_single_match(unpacked, r'tracks:\s*\[\{\s*file\s*:\s*"([^"]*)"\s*,\s*label')
-    if "empty." in subtitles: subtitles = ""
-    matches = scrapertools.find_multiple_matches(unpacked, 'file\s*:\s*"([^"]*)"\s*,\s*label\s*:\s*"([^"]*)"')
-    if matches:
-        for url, lbl in matches:
-            
-            if url.endswith('.srt') or url.endswith('.vtt'):
-                #subtitles += url
-                continue
-            
-            itemlist.append(['.mp4 (%s) [flix555]' % lbl, url, 0, subtitles])
-
-    url = scrapertools.find_single_match(unpacked, 'file\s*:\s*"([^"]*)"\s*')
-    if url:            
-        if not url.endswith('.srt') or not url.endswith('.vtt'):
-            itemlist.append(['.m3u8 [flix555]', url, 0, subtitles])
-
-    return itemlist
-
diff --git a/servers/fourshared.json b/servers/fourshared.json
index 2ae11d2b..4b60a6e5 100644
--- a/servers/fourshared.json
+++ b/servers/fourshared.json
@@ -21,7 +21,7 @@
   },
   "free": true,
   "id": "fourshared",
-  "name": "fourshared",
+  "name": "4shared",
   "premium": [
     "realdebrid",
     "alldebrid"
diff --git a/servers/freakshare.json b/servers/freakshare.json
deleted file mode 100644
index 4b2575b0..00000000
--- a/servers/freakshare.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(freakshare.com/files/[^/]+/[^\"'\\n ]+)",
-        "url": "http://\\1"
-      }
-    ]
-  },
-  "free": false,
-  "id": "freakshare",
-  "name": "freakshare",
-  "premium": [
-    "realdebrid",
-    "alldebrid"
-  ],
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ]
-}
\ No newline at end of file
diff --git a/servers/freakshare.py b/servers/freakshare.py
deleted file mode 100644
index 92f9f92f..00000000
--- a/servers/freakshare.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import httptools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "Este archivo no existe" in data:
-        return False, "Archivo no existe"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    return video_urls
diff --git a/servers/gamovideo.json b/servers/gamovideo.json
index 510e6307..5432f2fc 100755
--- a/servers/gamovideo.json
+++ b/servers/gamovideo.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "gamovideo",
-  "name": "gamovideo",
+  "name": "GamoVideo",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_gamovideo.png"
+  ]
 }
diff --git a/servers/gigasize.json b/servers/gigasize.json
index 605c7826..0b2b0576 100644
--- a/servers/gigasize.json
+++ b/servers/gigasize.json
@@ -15,7 +15,7 @@
   },
   "free": false,
   "id": "gigasize",
-  "name": "gigasize",
+  "name": "GigaSize",
   "premium": [
     "realdebrid",
     "alldebrid"
diff --git a/servers/googlevideo.json b/servers/googlevideo.json
index 8709259c..8886b7d5 100644
--- a/servers/googlevideo.json
+++ b/servers/googlevideo.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "googlevideo",
-  "name": "googlevideo",
+  "name": "Google Video",
   "settings": [
     {
       "default": false,
diff --git a/servers/gounlimited.json b/servers/gounlimited.json
index 704f516a..d2b5fec0 100644
--- a/servers/gounlimited.json
+++ b/servers/gounlimited.json
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_gounlimited.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/gvideo.json b/servers/gvideo.json
index 0ebb89cc..22fc4bb3 100644
--- a/servers/gvideo.json
+++ b/servers/gvideo.json
@@ -27,7 +27,7 @@
   },
   "free": true,
   "id": "gvideo",
-  "name": "gvideo",
+  "name": "G Video",
   "premium": [
     "realdebrid",
     "alldebrid"
@@ -57,6 +57,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s11.postimg.cc/giobzkprz/logo-google1.png"
+  ]
 }
diff --git a/servers/hdload.json b/servers/hdload.json
index cc927016..167caf95 100644
--- a/servers/hdload.json
+++ b/servers/hdload.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_hdload"
+  ]
 }
diff --git a/servers/hdmario.json b/servers/hdmario.json
index c2f2c2ad..3fb9ec50 100644
--- a/servers/hdmario.json
+++ b/servers/hdmario.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/hdplayer.json b/servers/hdplayer.json
index 070aa43f..1353ffba 100644
--- a/servers/hdplayer.json
+++ b/servers/hdplayer.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_hdload"
+  ]
 }
diff --git a/servers/hugefiles.json b/servers/hugefiles.json
index 4656c17e..6be802b5 100644
--- a/servers/hugefiles.json
+++ b/servers/hugefiles.json
@@ -11,7 +11,7 @@
   },
   "free": false,
   "id": "hugefiles",
-  "name": "hugefiles",
+  "name": "Huge Files",
   "premium": [
     "realdebrid"
   ],
@@ -40,6 +40,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_hugefiles.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/idtbox.json b/servers/idtbox.json
index 53accbfe..0dea7d55 100644
--- a/servers/idtbox.json
+++ b/servers/idtbox.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "idtbox",
-  "name": "idtbox",
+  "name": "ID Tbox",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://idtbox.com/img/idtbox.png"
+  ]
 }
diff --git a/servers/jawcloud.json b/servers/jawcloud.json
index 3214a828..975bc12e 100644
--- a/servers/jawcloud.json
+++ b/servers/jawcloud.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "jawcloud",
-  "name": "jawcloud",
+  "name": "JawCloud",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s8.postimg.cc/b64mzlgxh/jawcloud1.png"
+  ]
 }
diff --git a/servers/jetload.json b/servers/jetload.json
index 9c480a48..447cbe94 100644
--- a/servers/jetload.json
+++ b/servers/jetload.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "jetload",
-  "name": "jetload",
+  "name": "Jetload",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://jetload.net/jetlogo.png"
+  ]
 }
diff --git a/servers/jplayer.json b/servers/jplayer.json
deleted file mode 100644
index ff1281c4..00000000
--- a/servers/jplayer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "jplayer.net/v/([A-z0-9_-]+)",
-        "url": "https://www.jplayer.net/api/source/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "jplayer",
-  "name": "jplayer",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/jplayer.py b/servers/jplayer.py
deleted file mode 100644
index 19048363..00000000
--- a/servers/jplayer.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector jplayer By Alfa development Group
-# --------------------------------------------------------
-import sys
-
-from platformcode import config
-
-PY3 = False
-if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
-
-if PY3:
-    #from future import standard_library
-    #standard_library.install_aliases()
-    import urllib.parse as urllib                               # Es muy lento en PY2.  En PY3 es nativo
-else:
-    import urllib                                               # Usamos el nativo de PY2 que es más rápido
-
-from core import httptools
-from core import jsontools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "no longer exists" in data or "to copyright issues" in data:
-        return False,  config.get_localized_string(70449) % "jplayer"
-    return True, ""
-
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    post = urllib.urlencode({"r":"", "d":"www.jplayer.net"})
-    data = httptools.downloadpage(page_url, post=post).data
-    json = jsontools.load(data)["data"]
-    for _url in json:
-        url = _url["file"]
-        label = _url["label"]
-        video_urls.append([label +" [jplayer]", url])
-
-    return video_urls
diff --git a/servers/mailru.json b/servers/mailru.json
index 655860c2..624d731d 100644
--- a/servers/mailru.json
+++ b/servers/mailru.json
@@ -15,7 +15,7 @@
   },
   "free": true,
   "id": "mailru",
-  "name": "mailru",
+  "name": "Mailru",
   "settings": [
     {
       "default": false,
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s26.postimg.cc/6ebn509jd/mailru1.png"
+  ]
 }
diff --git a/servers/mangoplay.json b/servers/mangoplay.json
deleted file mode 100644
index 7951e921..00000000
--- a/servers/mangoplay.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(mangoplay.net(?://|/)embed.php\\?data=[A-z0-9_-]+)",
-        "url": "https://\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "mangoplay",
-  "name": "mangoplay",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/mangoplay.py b/servers/mangoplay.py
deleted file mode 100644
index 1373175e..00000000
--- a/servers/mangoplay.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector mangoplay By Alfa development Group
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "no longer exists" in data or "to copyright issues" in data:
-        return False,  config.get_localized_string(70449) % "mangoplay"
-    return True, ""
-
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    url = scrapertools.find_single_match(data, 'shareId = "([^"]+)')
-    url = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers.get("location", "")
-    url = url.replace(" ","%20")
-    video_urls.append([".MP4 [mangoplay]", url])
-
-    return video_urls
diff --git a/servers/manyvideos.json b/servers/manyvideos.json
deleted file mode 100644
index 81cbe42e..00000000
--- a/servers/manyvideos.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://manyvideos.xyz/embed/([A-z0-9]+)",
-        "url": "https://manyvideos.xyz/embed/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "manyvideos",
-  "name": "manyvideos",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/manyvideos.py b/servers/manyvideos.py
deleted file mode 100644
index 971e2a22..00000000
--- a/servers/manyvideos.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector manyvideos By Alfa development Group
-# --------------------------------------------------------
-import base64
-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-
-    response = httptools.downloadpage(page_url)
-
-    if not response.sucess or \
-       "Not Found" in response.data \
-       or "File was deleted" in response.data \
-       or "is no longer available" in response.data:
-        return False,  config.get_localized_string(70449) % "manyvideos"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    data = scrapertools.find_single_match(data, 'JuicyCodes.Run\(([^\)]+)\)')
-    data = data.replace("+", "")
-    data = base64.b64decode(data)
-    unpack = jsunpack.unpack(data)
-    matches = scrapertools.find_multiple_matches(unpack, '"file":"([^"]+)","label":"([^"]+)"')
-    for url,quality in matches:
-        url = url.replace("v2.", "v1.")
-        video_urls.append(["[manyvideos] %s" % quality, url])
-    return video_urls
diff --git a/servers/mediafire.json b/servers/mediafire.json
index 0af59303..8abc34ee 100644
--- a/servers/mediafire.json
+++ b/servers/mediafire.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "mediafire",
-  "name": "mediafire",
+  "name": "MediaFire",
   "premium": [
     "realdebrid",
     "alldebrid"
diff --git a/servers/mega.json b/servers/mega.json
index cc848a3e..af59ebaf 100644
--- a/servers/mega.json
+++ b/servers/mega.json
@@ -27,7 +27,7 @@
   },
   "free": true,
   "id": "mega",
-  "name": "mega",
+  "name": "Mega",
   "premium": [
     "realdebrid"
   ],
@@ -56,6 +56,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_mega.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/megadrive.json b/servers/megadrive.json
deleted file mode 100644
index da5d8b62..00000000
--- a/servers/megadrive.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "megadrive.co/embed/([A-z0-9]+)",
-        "url": "https://megadrive.co/embed/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "megadrive",
-  "name": "megadrive",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://s8.postimg.cc/kr5olxmad/megadrive1.png"
-}
diff --git a/servers/megadrive.py b/servers/megadrive.py
deleted file mode 100644
index c6974984..00000000
--- a/servers/megadrive.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "no longer exists" in data or "to copyright issues" in data:
-        return False, "[Megadrive] El video ha sido borrado"
-    if "please+try+again+later." in data:
-        return False, "[Megadrive] Error de Megadrive, no se puede generar el enlace al video"
-    if "File has been removed due to inactivity" in data:
-        return False,  config.get_localized_string(70449) % "Megadrive"
-    return True, ""
-
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    video_urls = []
-    videourl = scrapertools.find_single_match(data, "<source.*?src='([^']+)")
-    video_urls.append([".MP4 [megadrive]", videourl])
-
-    return video_urls
diff --git a/servers/mixdrop.json b/servers/mixdrop.json
index 7ddb6d83..b63ebd24 100644
--- a/servers/mixdrop.json
+++ b/servers/mixdrop.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "mixdrop.png"
+  ]
 }
diff --git a/servers/mydaddy.json b/servers/mydaddy.json
index 36c9425b..671b9418 100644
--- a/servers/mydaddy.json
+++ b/servers/mydaddy.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/mystream.json b/servers/mystream.json
index 08717fd8..6344989c 100644
--- a/servers/mystream.json
+++ b/servers/mystream.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "mystream",
-  "name": "mystream",
+  "name": "MyStream",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://i.postimg.cc/t43grQdh/mystream1.png"
+  ]
 }
diff --git a/servers/myupload.json b/servers/myupload.json
index ef42645b..fdd2bcc8 100644
--- a/servers/myupload.json
+++ b/servers/myupload.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "myupload",
-  "name": "myupload",
+  "name": "myUpload",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/netutv.json b/servers/netutv.json
index 8a7f1836..c8124fc6 100755
--- a/servers/netutv.json
+++ b/servers/netutv.json
@@ -56,6 +56,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_netutv.png"
+  ]
 }
diff --git a/servers/nofile.json b/servers/nofile.json
deleted file mode 100644
index ac6349b2..00000000
--- a/servers/nofile.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://nofile.io/f/\\w+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "nofile",
-  "name": "nofile",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://nofile.io/img/icons/icon-128.png"
-}
diff --git a/servers/nofile.py b/servers/nofile.py
deleted file mode 100644
index 977a10bc..00000000
--- a/servers/nofile.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector nofile By Alfa development Group
-# --------------------------------------------------------
-
-from core import httptools
-from core import scrapertools
-from platformcode import logger, config
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    response = httptools.downloadpage(page_url)
-    if not response.sucess or "Not Found" in response.data or "File was deleted" in response.data or "is no longer available" in response.data:
-        return False, config.get_localized_string(70449) % "nofile"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    url = scrapertools.find_single_match(data, '<source src="([^"]+)')
-    url = httptools.downloadpage("https://nofile.io" + url, follow_redirects=False, only_headers=True).headers.get("location", "")
-    title = "mp4 [nofile]"
-    video_urls.append([title, url])
-    return video_urls
diff --git a/servers/nowvideo.json b/servers/nowvideo.json
index c9a8bdb6..5a39d41c 100644
--- a/servers/nowvideo.json
+++ b/servers/nowvideo.json
@@ -2,7 +2,7 @@
   "id": "nowvideo",
   "name": "nowvideo",
   "active": true,
-  "thumbnail": "http://nowvideo.club/images/logo.png", 
+  
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -13,7 +13,7 @@
       {
         "pattern": "nowvideo.club/(?:videos|play/)([A-z0-9]+)",
         "url": "http:\/\/nowvideo.club\/videos/\\1"
-      }      
+      }
     ]
   },
   "free": true,
diff --git a/servers/okru.json b/servers/okru.json
index c40c65d0..dcc42f28 100644
--- a/servers/okru.json
+++ b/servers/okru.json
@@ -42,6 +42,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_okru.png"
+  ]
 }
diff --git a/servers/onefichier.json b/servers/onefichier.json
index 9e76d1bd..1f0b14d2 100644
--- a/servers/onefichier.json
+++ b/servers/onefichier.json
@@ -71,6 +71,5 @@
       "type": "text",
       "visible": true
     }
-  ],
-  "thumbnail": "server_onefichier.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/onlystream.json b/servers/onlystream.json
index d7814107..4129e9cd 100644
--- a/servers/onlystream.json
+++ b/servers/onlystream.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://supervideo.tv/images/logo-player.png"
+  ]
 }
diff --git a/servers/openload.json b/servers/openload.json
deleted file mode 100644
index 8ab879a2..00000000
--- a/servers/openload.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(?:openload|oload|openloads)[^/]+/(?:embed|f|e|f[0-9]|c|c[0-9])?/([0-9a-zA-Z-_]+)",
-        "url": "https://oload.stream/f/\\1/"
-      }
-    ]
-  },
-  "free": true,
-  "id": "openload",
-  "name": "openload",
-  "premium": [
-    "realdebrid"
-  ],
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "server_openload.png"
-}
diff --git a/servers/openload.py b/servers/openload.py
deleted file mode 100644
index 0b392675..00000000
--- a/servers/openload.py
+++ /dev/null
@@ -1,183 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import httptools
-from core import jsontools
-from core import scrapertools
-from core.servertools import get_server_host
-from platformcode import config, logger
-
-host = "https://" + get_server_host('openload')[0]
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    header = {}
-    if "|" in page_url:
-        page_url, referer = page_url.split("|", 1)
-        header = {'Referer': referer}
-    data = httptools.downloadpage(page_url, headers=header, cookies=False).data
-    if 'We’re Sorry!' in data:
-        data = httptools.downloadpage(page_url.replace("/embed/", "/f/"), headers=header, cookies=False).data
-        if 'We’re Sorry!' in data:
-            return False, config.get_localized_string(70449) % "Openload"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    itemlist = []
-
-    header = {}
-    if "|" in page_url:
-        page_url, referer = page_url.split("|", 1)
-        header = {'Referer': referer}
-
-    data = httptools.downloadpage(page_url, cookies=False, headers=header).data
-    logger.info('OP DATA= ' + data)
-    subtitle = scrapertools.find_single_match(data, '<track kind="captions" src="([^"]+)" srclang="es"')
-
-    try:
-        code = scrapertools.find_single_match(data, '<p style="" id="[^"]+">(.*?)</p>' )
-        if not code or code == "" or code is None:
-            code = scrapertools.find_single_match(data, '<p id="[^"]+" style="">(.*?)</p>' )
-        _0x59ce16 = eval(scrapertools.find_single_match(data, '_0x59ce16=([^;]+)').replace('parseInt', 'int'))
-        _1x4bfb36 = eval(scrapertools.find_single_match(data, '_1x4bfb36=([^;]+)').replace('parseInt', 'int'))
-        parseInt  = eval(scrapertools.find_single_match(data, '_0x30725e,(\(parseInt.*?)\),').replace('parseInt', 'int'))
-        url = decode(code, parseInt, _0x59ce16, _1x4bfb36)
-        url = httptools.downloadpage(url, only_headers=True, follow_redirects=False).headers.get('location')
-        extension = scrapertools.find_single_match(url, '(\..{,3})\?')
-        itemlist.append([extension, url, 0,subtitle])
-
-    except Exception:
-        logger.info()
-        if config.get_setting('api', __file__):
-            url = get_link_api(page_url)
-            extension = scrapertools.find_single_match(url, '(\..{,3})\?')
-            if url:
-                itemlist.append([extension, url, 0,subtitle])
-    logger.debug(itemlist)
-
-    return itemlist
-
-
-def decode(code, parseInt, _0x59ce16, _1x4bfb36):
-    logger.info()
-    import math
-
-    _0x1bf6e5 = ''
-    ke = []
-
-    for i in range(0, len(code[0:9*8]),8):
-        ke.append(int(code[i:i+8],16))
-
-    _0x439a49 = 0
-    _0x145894 = 0
-
-    while _0x439a49 < len(code[9*8:]):
-        _0x5eb93a = 64
-        _0x896767 = 0
-        _0x1a873b = 0
-        _0x3c9d8e = 0
-        while True:
-            if _0x439a49 + 1 >= len(code[9*8:]):
-                _0x5eb93a = 143;
-
-            _0x3c9d8e = int(code[9*8+_0x439a49:9*8+_0x439a49+2], 16)
-            _0x439a49 +=2
-
-            if _0x1a873b < 6*5:
-                _0x332549 = _0x3c9d8e & 63
-                _0x896767 += _0x332549 << _0x1a873b
-            else:
-                _0x332549 = _0x3c9d8e & 63
-                _0x896767 += int(_0x332549 * math.pow(2, _0x1a873b))
-
-            _0x1a873b += 6
-            if not _0x3c9d8e >= _0x5eb93a: break
-
-        # _0x30725e = _0x896767 ^ ke[_0x145894 % 9] ^ _0x59ce16 ^ parseInt ^ _1x4bfb36
-        _0x30725e = _0x896767 ^ ke[_0x145894 % 9] ^ parseInt ^ _1x4bfb36
-        _0x2de433 = _0x5eb93a * 2 + 127
-
-        for i in range(4):
-            _0x3fa834 = chr(((_0x30725e & _0x2de433) >> (9*8/ 9)* i) - 1)
-            if _0x3fa834 != '$':
-                _0x1bf6e5 += _0x3fa834
-            _0x2de433 = (_0x2de433 << (9*8/ 9))
-
-        _0x145894 += 1
-
-    url = host + "/stream/%s?mime=true" % _0x1bf6e5
-    return url
-
-
-def login():
-    logger.info()
-    data = httptools.downloadpage(host).data
-    _csrf = scrapertools.find_single_match(data, '<input type="hidden" name="_csrf" value="([^"]+)">')
-
-    post = {
-                'LoginForm[email]'      : config.get_setting('user', __file__),
-                'LoginForm[password]'	: config.get_setting('passowrd', __file__),
-                'LoginForm[rememberMe]' : 1,
-                '_csrf'                 : _csrf
-            }
-    data = httptools.downloadpage(host + '/login', post = post).data
-
-    if 'Login key has already been sent.' in data:
-        while True :
-            if 'Invalid login key.' in data:
-                platformtools.dialog_ok('openload', 'El código introducido no es válido\nrevisa tu correo e introduce el código correcto')
-
-            code = platformtools.dialog_input(  post.get('LoginForm[loginkey]', ''),
-                                                'Introduzca el código que ha sido enviado a \'%s\'' % 'r_dav'
-                                              )
-            if not code:
-                break
-            else:
-                post['LoginForm[loginkey]'] = code
-                data = httptools.downloadpage(host + '/login', post = post).data
-
-                if 'Welcome back,' in data: break
-
-
-def get_api_keys():
-    logger.info()
-    api_login = config.get_setting('api_login', __file__)
-    api_key = config.get_setting('api_key', __file__)
-    if not api_key or not api_login:
-        login()
-        data = httptools.downloadpage(host + '/account').data
-        post = {
-                    'FTPKey[password]'      : config.get_setting('password', __file__),
-                    '_csrf'                 : scrapertools.find_single_match(data, '<input type="hidden" name="_csrf" value="([^"]+)">')
-                }
-
-
-        data = httptools.downloadpage(host + '/account', post = post).data
-        api_login = scrapertools.find_single_match(data, '<tr><td>ID:</td><td>([^<]+)</td></tr>')
-        api_key = scrapertools.find_single_match(data, 'Your FTP Password/API Key is: ([^<]+) </div>')
-        config.set_setting('api_login', api_login, __file__)
-        config.set_setting('api_key', api_key, __file__)
-
-    return api_login, api_key
-
-
-def get_link_api(page_url):
-    logger.info()
-
-    api_login, api_key = get_api_keys()
-
-    file_id = scrapertools.find_single_match(page_url, '(?:embed|f)/([0-9a-zA-Z-_]+)')
-
-    data = httptools.downloadpage(host + "/api/1/file/dlticket?file=%s&login=%s&key=%s" % (file_id, api_login, api_key)).data
-    data = jsontools.load_json(data)
-    # logger.info(data)
-    if data["status"] == 200:
-        ticket = data["result"]["ticket"]
-        data = httptools.downloadpage(host + "/api/1/file/dl?file=%s&ticket=%s" % (file_id, ticket)).data
-        data = jsontools.load(data)
-
-        return data['result']['url'].replace("https", "http")
diff --git a/servers/oprem.json b/servers/oprem.json
deleted file mode 100644
index de4d90e8..00000000
--- a/servers/oprem.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://[a-zA-Z0-9]+\\.openloadpremium\\.com\\/m3u8\\/.*?\\.m3u8)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://[a-zA-Z0-9]+\\.pelisplay\\.tv/.*?m3u8.php\\?id=\\d+)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "streamium\\.xyz/.*?hash=([a-zA-Z0-9]+)",
-        "url": "http://streamium.xyz/files/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "oprem",
-  "name": "oprem",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ]
-}
\ No newline at end of file
diff --git a/servers/oprem.py b/servers/oprem.py
deleted file mode 100644
index feb2cd92..00000000
--- a/servers/oprem.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector Oprem By Alfa development Group
-# --------------------------------------------------------
-
-import os
-
-from core import httptools
-from platformcode import logger, config
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url).data
-    if 'peliculonhd' in page_url:
-        import re
-        patron = r'/mpegTS/([^/]+)/([^\s]+)'
-        matches = re.compile(patron, re.DOTALL).findall(data)
-        for _id, quota in matches:
-            old = '/mpegTS/%s/%s' % (_id, quota)
-            gurl = 'https://lh3.googleusercontent.com/d/%s?quotaUser=%s'
-            new = gurl % (_id, quota)
-            data = data.replace(old, new)
-    data = data.replace('s://lh3.googleusercontent.com', '://localhost:8781')
-    
-    
-    m3u8 = os.path.join(config.get_data_path(), "op_master.m3u8")
-    outfile = open(m3u8, 'wb')
-    outfile.write(data)
-    outfile.close()
-    page_url = m3u8
-    from lib import servop
-    servop.start()
-
-    video_urls = [["%s [Oprem]" % page_url[-4:], page_url]]
-
-    return video_urls
diff --git a/servers/powvideo.json b/servers/powvideo.json
deleted file mode 100755
index bb8a041e..00000000
--- a/servers/powvideo.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(?:powvideo|povw1deo|powvldeo).(?:net|xyz|com|cc)/(?:embed-|iframe-|preview-|)([a-z0-9]+)",
-        "url": "https://powvldeo.cc/iframe-\\1-920x360.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "powvideo",
-  "name": "powvideo",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "server_powvideo.png"
-}
\ No newline at end of file
diff --git a/servers/powvideo.py b/servers/powvideo.py
deleted file mode 100644
index b372c796..00000000
--- a/servers/powvideo.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-
-from platformcode import config
-
-PY3 = False
-if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import logger
-
-headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/20100101 Firefox/53.0']]
-
-
-def test_video_exists(page_url):
-    referer = page_url.replace('iframe', 'preview')
-
-    httptools.downloadpage(referer)
-    
-    global data
-    data = httptools.downloadpage(page_url, headers={'referer': referer}).data
-
-    if data == "File was deleted" or data == '':
-        return False, "[powvideo] El video ha sido borrado"
-    if 'function(p,a,c,k,e,' not in data:
-        return False,  config.get_localized_string(70449) % "powvideo"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    itemlist = []
-
-    packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
-    unpacked = jsunpack.unpack(packed)
-    
-    url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'")
-    if not PY3: from lib import alfaresolver
-    else: from lib import alfaresolver_py3 as alfaresolver
-    url = alfaresolver.decode_video_url(url, data, 2)
-    itemlist.append([".mp4" + " [powvideo]", url])
-
-    itemlist.sort(key=lambda x: x[0], reverse=True)
-    return itemlist
\ No newline at end of file
diff --git a/servers/prostream.json b/servers/prostream.json
deleted file mode 100644
index 8ec79476..00000000
--- a/servers/prostream.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "prostream.to/(?:embed-|)([A-z0-9]+)",
-        "url": "https://prostream.to/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "prostream",
-  "name": "prostream",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://prostream.to/assets/img/logo.png"
-}
diff --git a/servers/prostream.py b/servers/prostream.py
deleted file mode 100644
index 4ad2b859..00000000
--- a/servers/prostream.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector Prostream By Alfa development Group
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    global data
-    data = httptools.downloadpage(page_url).data
-    if "File is no longer available" in data:
-        return False,  config.get_localized_string(70449) % "Prostream"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-    ext = 'mp4'
-
-    packed = scrapertools.find_single_match(data, "text/javascript'>(eval.*?)\s*</script>")
-    unpacked = jsunpack.unpack(packed)
-    media_url = scrapertools.find_single_match(unpacked, r'sources:\s*\["([^"]+)"')
-    
-    ext = media_url[-4:]
-    video_urls.append(["%s [Prostream]" % (ext), media_url])
-
-    return video_urls
diff --git a/servers/rapidgator.json b/servers/rapidgator.json
index 48f3a43e..3448d62f 100644
--- a/servers/rapidgator.json
+++ b/servers/rapidgator.json
@@ -11,7 +11,7 @@
   },
   "free": false,
   "id": "rapidgator",
-  "name": "rapidgator",
+  "name": "Rapid Gator",
   "premium": [
     "realdebrid",
     "alldebrid"
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_rapidgator.png"
+  ]
 }
diff --git a/servers/rapidvideo.json b/servers/rapidvideo.json
deleted file mode 100755
index f6f6bf5a..00000000
--- a/servers/rapidvideo.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(?:rapidvideo|rapidvid).(?:org|com|to|is)/(?:\\?v=|e/|embed/|v/|d/)([A-z0-9]+)",
-        "url": "https://www.rapidvideo.com/e/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "rapidvideo",
-  "name": "rapidvideo",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://s26.postimg.cc/y5arjad1l/rapidvideo1.png"
-}
diff --git a/servers/rapidvideo.py b/servers/rapidvideo.py
deleted file mode 100755
index 7031d40f..00000000
--- a/servers/rapidvideo.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import httptools
-from core import scrapertools
-from platformcode import config, logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    response = httptools.downloadpage(page_url)
-    if response.code == 404:
-        return False, config.get_localized_string(70449) % "RapidVideo"
-    if not response.data or "urlopen error [Errno 1]" in str(response.code):
-        if config.is_xbmc():
-            return False, config.get_localized_string(70302) % "RapidVideo"
-        elif config.get_platform() == "plex":
-            return False, config.get_localized_string(70303) % "RapidVideo"
-        elif config.get_platform() == "mediaserver":
-            return False, config.get_localized_string(70304) % "RapidVideo"
-    if "Object not found" in response.data:
-        return False, config.get_localized_string(70449) % "RapidVideo"
-    if response.code == 500:
-        return False, config.get_localized_string(70524) % "RapidVideo"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    post = "confirm.x=77&confirm.y=76&block=1"
-    if "Please click on this button to open this video" in data:
-        data = httptools.downloadpage(page_url, post=post).data
-    patron = 'https://www.rapidvideo.com/e/[^"]+'
-    match = scrapertools.find_multiple_matches(data, patron)
-    if match:
-        for url1 in match:
-            res = scrapertools.find_single_match(url1, '=(\w+)')
-            data = httptools.downloadpage(url1).data
-            if "Please click on this button to open this video" in data:
-                data = httptools.downloadpage(url1, post=post).data
-            url = scrapertools.find_single_match(data, 'source src="([^"]+)')
-            ext = scrapertools.get_filename_from_url(url)[-4:]
-            video_urls.append(['%s %s [rapidvideo]' % (ext, res), url])
-    else:
-        patron = 'src="([^"]+)" type="video/([^"]+)" label="([^"]+)"'
-        match = scrapertools.find_multiple_matches(data, patron)
-        if match:
-            for url, ext, res in match:
-                video_urls.append(['.%s %s [Rapidvideo]' % (ext, res), url])
-
-    return video_urls
diff --git a/servers/rcdnme.json b/servers/rcdnme.json
index ba2d24a6..6f8f4771 100644
--- a/servers/rcdnme.json
+++ b/servers/rcdnme.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "rcdnme",
-  "name": "rcdnme",
+  "name": "RCDN",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://i.imgur.com/NErNgTg.jpg"
+  ]
 }
\ No newline at end of file
diff --git a/servers/rutube.json b/servers/rutube.json
index 9c42fb2e..1079f56a 100644
--- a/servers/rutube.json
+++ b/servers/rutube.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "rutube",
-  "name": "rutube",
+  "name": "RUTube",
   "premium": [
     "alldebrid"
   ],
@@ -40,6 +40,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://www.cubancouncil.com/uploads/project_images/rutube_branding_black.png.648x0_q90_replace_alpha.jpg"
+  ]
 }
diff --git a/servers/samaup.json b/servers/samaup.json
index c3feac6c..d1c2187b 100644
--- a/servers/samaup.json
+++ b/servers/samaup.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "samaup",
-  "name": "samaup",
+  "name": "Sama Up",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://www.samaup.co/samaup_style/images/logo.png"
+  ]
 }
diff --git a/servers/speedvideo.json b/servers/speedvideo.json
index b0a52d79..c91a0a27 100644
--- a/servers/speedvideo.json
+++ b/servers/speedvideo.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_speedvideo.png"
+  ]
 }
diff --git a/servers/streamango.json b/servers/streamango.json
deleted file mode 100644
index ff06ea3b..00000000
--- a/servers/streamango.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "streamango.com/(?:embed|f)/([A-z0-9]+)",
-        "url": "http://streamango.com/embed/\\1"
-      },
-      {
-        "pattern": "https://fruitadblock.net/embed/([A-z0-9]+)",
-        "url": "http://streamango.com/embed/\\1"
-      },
-      {
-        "pattern": "https://streamangos.com/e/([A-z0-9]+)",
-        "url": "http://streamango.com/embed/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "streamango",
-  "name": "streamango",
-  "premium": [
-    "realdebrid",
-    "alldebrid"
-  ],
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "http://i.imgur.com/o8XR8fL.png"
-}
diff --git a/servers/streamango.py b/servers/streamango.py
deleted file mode 100644
index cc5e48cc..00000000
--- a/servers/streamango.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import httptools
-from core import scrapertools
-from platformcode import config, logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url).data
-    if "We are unable to find the video" in data:
-        return False, config.get_localized_string(70449) % "Streamango"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url).data
-
-    video_urls = []
-
-    matches = scrapertools.find_multiple_matches(data, "type:\"video/([^\"]+)\",src:d\('([^']+)',(.*?)\).+?height:(\d+)")
-
-    for ext, encoded, code, quality in matches:
-
-        media_url = decode(encoded, int(code))
-        media_url = media_url.replace("@","")
-        if not media_url.startswith("http"):
-            media_url = "http:" + media_url
-        video_urls.append([".%s %sp [streamango]" % (ext, quality), media_url])
-
-    video_urls.reverse()
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-
-    return video_urls
-
-
-def decode(encoded, code):
-    logger.info("encoded '%s', code '%s'" % (encoded, code))
-
-    _0x59b81a = ""
-    k = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
-    k = k[::-1]
-
-    count = 0
-
-    for index in range(0, len(encoded) - 1):
-        while count <= len(encoded) - 1:
-            _0x4a2f3a = k.index(encoded[count])
-            count += 1
-            _0x29d5bf = k.index(encoded[count])
-            count += 1
-            _0x3b6833 = k.index(encoded[count])
-            count += 1
-            _0x426d70 = k.index(encoded[count])
-            count += 1
-
-            _0x2e4782 = ((_0x4a2f3a << 2) | (_0x29d5bf >> 4))
-            _0x2c0540 = (((_0x29d5bf & 15) << 4) | (_0x3b6833 >> 2))
-            _0x5a46ef = ((_0x3b6833 & 3) << 6) | _0x426d70
-            _0x2e4782 = _0x2e4782 ^ code
-
-            _0x59b81a = str(_0x59b81a) + chr(_0x2e4782)
-
-            if _0x3b6833 != 64:
-                _0x59b81a = str(_0x59b81a) + chr(_0x2c0540)
-            if _0x3b6833 != 64:
-                _0x59b81a = str(_0x59b81a) + chr(_0x5a46ef)
-
-    return _0x59b81a
diff --git a/servers/streamcherry.json b/servers/streamcherry.json
deleted file mode 100644
index e9c41dbf..00000000
--- a/servers/streamcherry.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "streamcherry.com/(?:embed|f)/([A-z0-9]+)",
-        "url": "http://streamcherry.com/embed/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "streamcherry",
-  "name": "streamcherry",
-  "premium": [
-    "realdebrid"
-  ],
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "http://i.imgur.com/l45Tk0G.png"
-}
diff --git a/servers/streamcherry.py b/servers/streamcherry.py
deleted file mode 100644
index 3cff360e..00000000
--- a/servers/streamcherry.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector para streamcherry
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url).data
-    if "We are unable to find the video" in data:
-        return False,  config.get_localized_string(70449) % "streamcherry"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url).data
-
-    video_urls = []
-
-    matches = scrapertools.find_multiple_matches(data, "type:\"video/([^\"]+)\",src:d\('([^']+)',(.*?)\).+?height:(\d+)")
-
-    for ext, encoded, code, quality in matches:
-
-        media_url = decode(encoded, int(code))
-        media_url = media_url.replace("@","")
-        if not media_url.startswith("http"):
-            media_url = "http:" + media_url
-        video_urls.append([".%s %sp [streamcherry]" % (ext, quality), media_url])
-
-    video_urls.reverse()
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-
-    return video_urls
-
-
-def decode(encoded, code):
-    logger.info("encoded '%s', code '%s'" % (encoded, code))
-
-    _0x59b81a = ""
-    k = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
-    k = k[::-1]
-
-    count = 0
-
-    for index in range(0, len(encoded) - 1):
-        while count <= len(encoded) - 1:
-            _0x4a2f3a = k.index(encoded[count])
-            count += 1
-            _0x29d5bf = k.index(encoded[count])
-            count += 1
-            _0x3b6833 = k.index(encoded[count])
-            count += 1
-            _0x426d70 = k.index(encoded[count])
-            count += 1
-
-            _0x2e4782 = ((_0x4a2f3a << 2) | (_0x29d5bf >> 4))
-            _0x2c0540 = (((_0x29d5bf & 15) << 4) | (_0x3b6833 >> 2))
-            _0x5a46ef = ((_0x3b6833 & 3) << 6) | _0x426d70
-            _0x2e4782 = _0x2e4782 ^ code
-
-            _0x59b81a = str(_0x59b81a) + chr(_0x2e4782)
-
-            if _0x3b6833 != 64:
-                _0x59b81a = str(_0x59b81a) + chr(_0x2c0540)
-            if _0x3b6833 != 64:
-                _0x59b81a = str(_0x59b81a) + chr(_0x5a46ef)
-
-    return _0x59b81a
diff --git a/servers/streamcloud.json b/servers/streamcloud.json
deleted file mode 100755
index ca902581..00000000
--- a/servers/streamcloud.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [
-      "http://streamcloud.eu/stylesheets",
-      "http://streamcloud.eu/control",
-      "http://streamcloud.eu/xupload",
-      "http://streamcloud.eu/js",
-      "http://streamcloud.eu/favicon",
-      "http://streamcloud.eu/reward",
-      "http://streamcloud.eu/login",
-      "http://streamcloud.eu/deliver",
-      "http://streamcloud.eu/faq",
-      "http://streamcloud.eu/tos",
-      "http://streamcloud.eu/checkfiles",
-      "http://streamcloud.eu/contact",
-      "http://streamcloud.eu/serve"
-    ],
-    "patterns": [
-      {
-        "pattern": "(streamcloud.eu/[a-z0-9]+)",
-        "url": "http://\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "streamcloud",
-  "name": "streamcloud",
-  "premium": [
-    "alldebrid"
-  ],
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "server_streamcloud.png"
-}
diff --git a/servers/streamcloud.py b/servers/streamcloud.py
deleted file mode 100755
index f7828b66..00000000
--- a/servers/streamcloud.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import print_function
-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("page_url='%s')" % page_url)
-    data = httptools.downloadpage(url=page_url).data
-    if "<h1>404 Not Found</h1>" in data:
-        return False, "El archivo no existe<br/>en streamcloud o ha sido borrado."
-    elif "<h1>File Not Found</h1>" in data:
-        return False, "El archivo no existe<br/>en streamcloud o ha sido borrado."
-    elif "<h1>Archivo no encontrado</h1>" in data:
-        return False, "El archivo no existe<br/>en streamcloud o ha sido borrado."
-    else:
-        return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    # Lo pide una vez
-    headers = [
-        ['User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14']]
-    data = httptools.downloadpage(page_url, headers=headers).data
-
-    media_url = scrapertools.find_single_match(data, 'file\: "([^"]+)"')
-
-    if len(media_url) == 0:
-        post = ""
-        matches = scrapertools.find_multiple_matches(data, '<input.*?name="([^"]+)".*?value="([^"]*)">')
-        for inputname, inputvalue in matches:
-            post += inputname + "=" + inputvalue + "&"
-        post = post.replace("op=download1", "op=download2")
-        data = httptools.downloadpage(page_url, post=post).data
-        if 'id="justanotice"' in data:
-            logger.info("data=" + data)
-            logger.info("Ha saltado el detector de adblock")
-            return []
-        # Extrae la URL
-        media_url = scrapertools.find_single_match(data, 'file\: "([^"]+)"')
-    video_urls = []
-    video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [streamcloud]", media_url+"|Referer="+page_url])
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-    return video_urls
-
-
-if __name__ == "__main__":
-    import getopt
-    import sys
-    options, arguments = getopt.getopt(sys.argv[1:], "", ["video_url=", "login=", "password="])
-    video_url = ""
-    login = ""
-    password = ""
-    logger.info("%s %s" % (str(options), str(arguments)))
-    for option, argument in options:
-        print(option, argument)
-        if option == "--video_url":
-            video_url = argument
-        elif option == "--login":
-            login = argument
-        elif option == "--password":
-            password = argument
-        else:
-            assert False, "Opcion desconocida"
-    if video_url == "":
-        print("ejemplo de invocacion")
-        print("streamcloud --video_url http://xxx --login usuario --password secreto")
-    else:
-        if login != "":
-            premium = True
-        else:
-            premium = False
-        print(get_video_url(video_url, premium, login, password))
diff --git a/servers/streamplay.json b/servers/streamplay.json
deleted file mode 100755
index 0e465b19..00000000
--- a/servers/streamplay.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(?:streamplay|streamp1ay).(?:to|me)/(?:embed-|player-|)([a-z0-9]+)(?:.html|)",
-        "url": "https://steamplay.me/player-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "streamplay",
-  "name": "streamplay",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://s1.postimg.cc/912d5vxmv3/streamplay1.png"
-}
diff --git a/servers/streamplay.py b/servers/streamplay.py
deleted file mode 100644
index 55cdbb21..00000000
--- a/servers/streamplay.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-
-from platformcode import config
-
-PY3 = False
-if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
-
-import re
-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    referer = re.sub(r"player-", "embed-", page_url)
-    global data
-    data = httptools.downloadpage(page_url, headers={'Referer': referer}).data
-    if data == "File was deleted":
-        return False, config.get_localized_string(70449) % "Streamplay"
-    elif "Video is processing now" in data:
-        return False,  config.get_localized_string(70449) % "Streamplay"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    video_urls = []
-
-    packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
-    unpacked = jsunpack.unpack(packed)
-
-    sources = eval(scrapertools.find_single_match(unpacked, "sources=(\[[^\]]+\])"))
-    for video_url in sources:
-        
-        if not PY3: from lib import alfaresolver
-        else: from lib import alfaresolver_py3 as alfaresolver
-        video_url = alfaresolver.decode_video_url(video_url, data, 2)
-        filename = scrapertools.get_filename_from_url(video_url)[-4:]
-        if not video_url.endswith(".mpd"):
-            video_urls.append([filename + " [streamplay]", video_url])
-
-    video_urls.sort(key=lambda x: x[0], reverse=True)
-
-    return video_urls
\ No newline at end of file
diff --git a/servers/streamtape.json b/servers/streamtape.json
index 749961b7..2168c016 100644
--- a/servers/streamtape.json
+++ b/servers/streamtape.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/streamty.json b/servers/streamty.json
deleted file mode 100644
index 3221ef81..00000000
--- a/servers/streamty.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "streamty.com/(?:embed-|)([A-z0-9]+)",
-        "url": "http://streamty.com/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "streamty",
-  "name": "streamty",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://streamty.com/img/logo.png"
-}
\ No newline at end of file
diff --git a/servers/streamty.py b/servers/streamty.py
deleted file mode 100644
index d7a792e8..00000000
--- a/servers/streamty.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector Streamty By Alfa development Group
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    global data
-    data = httptools.downloadpage(page_url).data
-    if "Not Found" in data or "File was deleted" in data:
-        return False,  config.get_localized_string(70449) % "Streamty"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-
-    packed = scrapertools.find_single_match(data, "text/javascript'>(eval.*?)\s*</script>")
-    unpacked = jsunpack.unpack(packed)
-    
-    media_url = scrapertools.find_single_match(unpacked, 'file:"([^"]+)"')
-    #media_url += "|Referer=%s" %page_url
-    if "m3u8" in media_url:
-        ext = "m3u8"
-    video_urls.append(["%s [streamty]" % (ext), media_url])
-
-    return video_urls
diff --git a/servers/streamz.json b/servers/streamz.json
index 541a9431..9d893927 100644
--- a/servers/streamz.json
+++ b/servers/streamz.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "streamz",
-  "name": "streamz",
+  "name": "streamZ",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/supervideo.json b/servers/supervideo.json
index 8f266b75..0434ee84 100644
--- a/servers/supervideo.json
+++ b/servers/supervideo.json
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_supervideo.png"
+  ]
 }
diff --git a/servers/thevid.json b/servers/thevid.json
index 574cb21a..0da109c9 100644
--- a/servers/thevid.json
+++ b/servers/thevid.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "thevid",
-  "name": "thevid",
+  "name": "TheVid",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://thevid.net/imgs/thevid.png"
+  ]
 }
diff --git a/servers/thevideobee.json b/servers/thevideobee.json
index 3e1fb059..45ccb4da 100644
--- a/servers/thevideobee.json
+++ b/servers/thevideobee.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "thevideobee",
-  "name": "thevideobee",
+  "name": "The Videobee",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://thevideobee.to/img/logo.png"
+  ]
 }
diff --git a/servers/thevideome.json b/servers/thevideome.json
deleted file mode 100755
index 77103016..00000000
--- a/servers/thevideome.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(?:thevideo.me|tvad.me|thevideo.ch|thevideo.us)/(?:embed-|)([A-z0-9]+)",
-        "url": "https://thevideo.me/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "thevideome",
-  "name": "thevideome",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://s26.postimg.cc/fzmu2c761/thevideo.me1.png"
-}
diff --git a/servers/thevideome.py b/servers/thevideome.py
deleted file mode 100755
index 89308046..00000000
--- a/servers/thevideome.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import sys
-PY3 = False
-if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
-
-if PY3:
-    #from future import standard_library
-    #standard_library.install_aliases()
-    import urllib.parse as urllib                               # Es muy lento en PY2.  En PY3 es nativo
-else:
-    import urllib                                               # Usamos el nativo de PY2 que es más rápido
-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    #Deshabilitamos el server hasta nueva orden
-    return False, "[Thevideo.me] Servidor deshabilitado"
-    
-    page_url = httptools.downloadpage(page_url, follow_redirects=False, only_headers=True).headers.get("location", "")
-    data = httptools.downloadpage(page_url).data
-    if "File was deleted" in data or "Page Cannot Be Found" in data or "<title>Video not found" in data:
-        return False, "[thevideo.me] El archivo ha sido eliminado o no existe"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-    post = {}
-    post = urllib.urlencode(post)
-    if not "embed" in page_url:
-        page_url = page_url.replace("https://thevideo.me/", "https://thevideo.me/embed-") + ".html"
-    url = httptools.downloadpage(page_url, follow_redirects=False, only_headers=True).headers.get("location", "")
-    data = httptools.downloadpage("https://vev.io/api/serve/video/" + scrapertools.find_single_match(url, "embed/([A-z0-9]+)"), post=post).data
-    bloque = scrapertools.find_single_match(data, 'qualities":\{(.*?)\}')
-    matches = scrapertools.find_multiple_matches(bloque, '"([^"]+)":"([^"]+)')
-    for res, media_url in matches:
-        video_urls.append(
-            [scrapertools.get_filename_from_url(media_url)[-4:] + " (" + res + ") [thevideo.me]", media_url])
-    return video_urls
diff --git a/servers/thevideos.py b/servers/thevideos.py
deleted file mode 100644
index a6e0fce7..00000000
--- a/servers/thevideos.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import logger
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-
-    data = httptools.downloadpage(page_url).data
-
-    match = scrapertools.find_single_match(data, "<script type='text/javascript'>(.*?)</script>")
-    if match.startswith("eval"):
-        match = jsunpack.unpack(match)
-
-    # Extrae la URL
-    # {file:"http://95.211.81.229/kj2vy4rle46vtaw52bsj4ooof6meikcbmwimkrthrahbmy4re3eqg3buhoza/v.mp4",label:"240p"
-    video_urls = []
-    media_urls = scrapertools.find_multiple_matches(match, '\{file\:"([^"]+)",label:"([^"]+)"')
-    subtitle = scrapertools.find_single_match(match, 'tracks: \[\{file: "([^"]+)", label: "Spanish"')
-    for media_url, quality in media_urls:
-        video_urls.append([media_url[-4:] + " [thevideos] " + quality, media_url, 0, subtitle])
-
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-
-    return video_urls
diff --git a/servers/thevimeo.json b/servers/thevimeo.json
deleted file mode 100644
index 360159ff..00000000
--- a/servers/thevimeo.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://thevimeo.pw/[a-zA-Z0-9]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "thevimeo",
-  "name": "thevimeo",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://smmsquare.com/wp-content/uploads/2017/12/Vimeo_smmsquare.png"
-}
diff --git a/servers/thevimeo.py b/servers/thevimeo.py
deleted file mode 100644
index 85f0eb7e..00000000
--- a/servers/thevimeo.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- Server Thevimeo -*-
-import re
-
-from core import httptools
-from platformcode import config
-
-
-def get_source(url):
-    #logger.info()
-    data = httptools.downloadpage(url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    return data
-
-def test_video_exists(page_url):
-    #logger.info("(page_url='%s')" % page_url)
-    data = get_source(page_url)
-
-    if "File was deleted" in data or "File Not Found" in data:
-        return False,  config.get_localized_string(70449) % "Thevimeo"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    #logger.info("url=" + page_url)
-    video_urls = []
-    data = get_source(page_url)
-    #logger.debug(data)
-    patron = "{file:(.*?),label:(.*?),"
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    #url = scrapertools.find_single_match(data, "sources.*?{file:(.*?),")
-    for url, qual in matches:
-        url = url.replace("\/", "/")
-        qual = qual.replace("M\u00f3vil","360")
-        video_urls.append([qual+"p [Thevimeo]", url])
-    video_urls.sort(key=lambda it: int(it[0].split("p ", 1)[0]))
-
-    return video_urls
diff --git a/servers/tiwikiwi.json b/servers/tiwikiwi.json
deleted file mode 100644
index 570eee61..00000000
--- a/servers/tiwikiwi.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://tiwi.kiwi/embed-([a-z0-9]+).html",
-        "url": "https://tiwi.kiwi/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "tiwikiwi",
-  "name": "tiwikiwi",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://i.postimg.cc/CxdyWRcN/tiwikiwi.png"
-}
diff --git a/servers/tiwikiwi.py b/servers/tiwikiwi.py
deleted file mode 100644
index d82f43d9..00000000
--- a/servers/tiwikiwi.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Conector vidcloud By Alfa development Group
-# --------------------------------------------------------
-import re
-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url)
-    if data.code == 404:
-        return False,  config.get_localized_string(70449) % "Cloud"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    enc_data = scrapertools.find_single_match(data, "type='text/javascript'>(eval.*?)?\s+</script>")
-    dec_data = jsunpack.unpack(enc_data)
-    sources = 'file:"([^"]+)",label:"([^"]+)"'
-    matches = re.compile(sources, re.DOTALL).findall(dec_data)
-    for url, quality in matches:
-        video_url = url
-        video_urls.append(['tiwi.kiwi [%s]' % quality, video_url])
-    return video_urls
\ No newline at end of file
diff --git a/servers/torrent.json b/servers/torrent.json
index b46cf37b..12b59037 100644
--- a/servers/torrent.json
+++ b/servers/torrent.json
@@ -56,7 +56,7 @@
   },
   "free": true,
   "id": "torrent",
-  "name": "torrent",
+  "name": "Torrent",
   "settings": [
     {
       "default": false,
diff --git a/servers/turbobit.json b/servers/turbobit.json
index a5ae92f5..693b9a81 100644
--- a/servers/turbobit.json
+++ b/servers/turbobit.json
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_turbobit.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/turbovid.json b/servers/turbovid.json
index 0871ca45..54cc8057 100644
--- a/servers/turbovid.json
+++ b/servers/turbovid.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_turbovid.png"
+  ]
 }
diff --git a/servers/tusfiles.json b/servers/tusfiles.json
index 1221c6a9..0dcf9cd5 100644
--- a/servers/tusfiles.json
+++ b/servers/tusfiles.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "tusfiles",
-  "name": "tusfiles",
+  "name": "TusFiles",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://tusfiles.com/i/TFLOGO.png"
+  ]
 }
diff --git a/servers/unsupported.json b/servers/unsupported.json
index fba25216..066467c3 100644
--- a/servers/unsupported.json
+++ b/servers/unsupported.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
\ No newline at end of file
diff --git a/servers/uploadedto.json b/servers/uploadedto.json
index 9d893f98..5097d423 100644
--- a/servers/uploadedto.json
+++ b/servers/uploadedto.json
@@ -23,7 +23,7 @@
       "uploaded"
     ]
   },
-  "name": "uploadedto",
+  "name": "Uploaded",
   "premium": [
     "uploadedto",
     "realdebrid",
@@ -79,6 +79,5 @@
       "type": "text",
       "visible": true
     }
-  ],
-  "thumbnail": "server_uploadedto.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/uploadmp4.json b/servers/uploadmp4.json
deleted file mode 100644
index f2c448f3..00000000
--- a/servers/uploadmp4.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://(?:www\\.|)uploadmp4.com/embed/[A-z0-9]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "uploadmp4",
-  "name": "uploadmp4",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://www.uploadmp4.com/themes/flow/images/main_logo.png"
-}
diff --git a/servers/uploadmp4.py b/servers/uploadmp4.py
deleted file mode 100644
index 577a778b..00000000
--- a/servers/uploadmp4.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector uploadmp4 By Alfa development Group
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "no longer exists" in data:
-        return False,  config.get_localized_string(70449) % "uploadmp4"
-    return True, ""
-
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    video_urls = []
-    videos_url = scrapertools.find_multiple_matches(data, 'label":"([^"]+).*?file":"([^"]+)')
-    for quality, video in videos_url:
-        video_urls.append(["%s [uploadmp4]" %quality, video])
-
-    return video_urls
diff --git a/servers/uppom.json b/servers/uppom.json
index ac606e28..fe9b3bea 100644
--- a/servers/uppom.json
+++ b/servers/uppom.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "uppom",
-  "name": "uppom",
+  "name": "Uppom",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://uppom.live/images/logo.png"
+  ]
 }
diff --git a/servers/upstream.json b/servers/upstream.json
index ee3e9685..0172432b 100644
--- a/servers/upstream.json
+++ b/servers/upstream.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "upstream.png"
+  ]
 }
diff --git a/servers/uptobox.json b/servers/uptobox.json
index 1e35957d..c30d430d 100644
--- a/servers/uptobox.json
+++ b/servers/uptobox.json
@@ -45,6 +45,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_uptobox.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/upvid.json b/servers/upvid.json
index 6c22e0b4..b5122e69 100644
--- a/servers/upvid.json
+++ b/servers/upvid.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "upvid",
-  "name": "upvid",
+  "name": "Upvid",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s15.postimg.cc/gz0tee0gb/zt_Oi_E6_S-_400x400.jpg"
+  ]
 }
diff --git a/servers/uqload.json b/servers/uqload.json
index 600c0b58..505e4d85 100644
--- a/servers/uqload.json
+++ b/servers/uqload.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "uqload",
-  "name": "uqload",
+  "name": "UQLoad",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://uqload.com/img/logo.png?v=0"
+  ]
 }
\ No newline at end of file
diff --git a/servers/userscloud.json b/servers/userscloud.json
index a52644ee..3205bd9c 100644
--- a/servers/userscloud.json
+++ b/servers/userscloud.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "userscloud",
-  "name": "userscloud",
+  "name": "Userscloud",
   "premium": [
     "realdebrid",
     "alldebrid"
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://i.imgur.com/u4W2DgA.png?1"
+  ]
 }
diff --git a/servers/verystream.json b/servers/verystream.json
deleted file mode 100644
index a7b506ed..00000000
--- a/servers/verystream.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "active": false,
-    "find_videos": {
-      "ignore_urls": [],
-      "patterns": [
-        {
-          "pattern": "(?:verystream|woof.tube).*?/(?:e|stream)/([0-9a-zA-Z-_]+)",
-          "url": "https://verystream.com/e/\\1/"
-        }
-      ]
-    },
-    "free": true,
-    "id": "verystream",
-    "name": "verystream",
-    "premium": [
-      "realdebrid"
-    ],
-    "settings": [
-      {
-        "default": false,
-        "enabled": true,
-        "id": "black_list",
-        "label": "@60654",
-        "type": "bool",
-        "visible": true
-      },
-      {
-        "default": 0,
-        "enabled": true,
-        "id": "favorites_servers_list",
-        "label": "@60655",
-        "lvalues": [
-          "No",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5"
-        ],
-        "type": "list",
-        "visible": false
-      }
-    ],
-    "thumbnail": "server_verystream.png"
-  }
\ No newline at end of file
diff --git a/servers/verystream.py b/servers/verystream.py
deleted file mode 100644
index 92a3510b..00000000
--- a/servers/verystream.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-# Verystream server tool
-# Developed by KOD for KOD
-# KOD - Kodi on Demand Team
-
-from core import httptools
-from core import scrapertools
-from platformcode import config, logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    header = {}
-    if "|" in page_url:
-        page_url, referer = page_url.split("|", 1)
-        header = {'Referer': referer}
-    data = httptools.downloadpage(page_url, headers=header, cookies=False).data
-    if 'not found!' in data:
-        data = httptools.downloadpage(page_url.replace("/e/", "/stream/"), headers=header, cookies=False).data
-        if 'not found!' in data:
-            return False, config.get_localized_string(70449) % "Verystream"
-
-    return True, ""
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    itemlist = []
-
-    header = {}
-    if "|" in page_url:
-        page_url, referer = page_url.split("|", 1)
-        header = {'Referer': referer}
-
-    data = httptools.downloadpage(page_url, cookies=False, headers=header).data
-    subtitle = scrapertools.find_single_match(data, '<track kind="captions" src="([^"]+)" srclang="it"')
-
-    try:
-        code = scrapertools.find_single_match(data, '<p style="" class="" id="videolink">(.*?)</p>' )
-        url = "https://verystream.com/gettoken/" + code + "?mime=true"
-        url = httptools.downloadpage(url, only_headers=True, follow_redirects=False).headers.get('location')
-        extension = scrapertools.find_single_match(url, '(\..{,3})\?')
-        itemlist.append([extension, url, 0,subtitle])
-
-    except Exception:
-        logger.info()
-        if config.get_setting('api', __file__):
-            url = get_link_api(page_url)
-            extension = scrapertools.find_single_match(url, '(\..{,3})\?')
-            if url:
-                itemlist.append([extension, url, 0,subtitle])
-    logger.debug(itemlist)
-
-    return itemlist
-
diff --git a/servers/vevio.json b/servers/vevio.json
index 6da14811..d8bd1f45 100644
--- a/servers/vevio.json
+++ b/servers/vevio.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "vevio",
-  "name": "vevio",
+  "name": "VEVio",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s8.postimg.cc/opp2c3p6d/vevio1.png"
+  ]
 }
diff --git a/servers/vidbull.json b/servers/vidbull.json
deleted file mode 100644
index 4cf37869..00000000
--- a/servers/vidbull.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://(?:www|).vidbull.tv/embed/\\w+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "vidbull",
-  "name": "vidbull",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/vidbull.py b/servers/vidbull.py
deleted file mode 100644
index efda325e..00000000
--- a/servers/vidbull.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector vidbull By Alfa development Group
-# --------------------------------------------------------
-from lib.kt_player import decode
-
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-
-    response = httptools.downloadpage(page_url)
-
-    if not response.sucess or \
-       "Not Found" in response.data \
-       or "File was deleted" in response.data \
-       or "is no longer available" in response.data:
-        return False,  config.get_localized_string(70449) % "vidbull"
-
-    global video_url, license_code
-    video_url = scrapertools.find_single_match(response.data, "video_url: '([^']+)'")
-    license_code = scrapertools.find_single_match(response.data, "license_code: '([^']+)'")
-
-    return True, ""
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    return [["[vidbull]", decode(video_url, license_code)]]
\ No newline at end of file
diff --git a/servers/vidcloud.json b/servers/vidcloud.json
index f8b992cf..3e974588 100644
--- a/servers/vidcloud.json
+++ b/servers/vidcloud.json
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_vidcloud.png"
+  ]
 }
diff --git a/servers/videobb.json b/servers/videobb.json
deleted file mode 100644
index 705551bc..00000000
--- a/servers/videobb.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "videobb.(?:ru|site)/v/([A-z0-9_-]+)",
-        "url": "https://videobb.ru/api/source/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "videobb",
-  "name": "videobb",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://www.cinetux.to/videobb/logo.jpg"
-}
diff --git a/servers/videobb.py b/servers/videobb.py
deleted file mode 100644
index 8439e4cc..00000000
--- a/servers/videobb.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector videobb By Alfa development Group
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "no longer exists" in data:
-        return False,  config.get_localized_string(70449) % "videobb"
-    return True, ""
-
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    id = scrapertools.find_single_match("v/(\w+)", page_url)
-    post = "r=&d=videobb.ru"
-    headers = {"x-requested-with":"XMLHttpRequest"}
-    data = httptools.downloadpage(page_url, post=post, headers=headers).json
-    for url in data["data"]:
-        video_urls.append([url["label"] + " [videobb]", url["file"]])
-    #logger.info("Intel11 %s" %data)
-
-    return video_urls
diff --git a/servers/videobin.json b/servers/videobin.json
index e9e09c2e..57209c51 100644
--- a/servers/videobin.json
+++ b/servers/videobin.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "videobin",
-  "name": "videobin",
+  "name": "VideoBin",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/videofiles.json b/servers/videofiles.json
deleted file mode 100644
index aa4890cb..00000000
--- a/servers/videofiles.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": false,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://videofiles.net/(?:embed-|)([A-z0-9]+)",
-        "url": "https://videofiles.net/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "videofiles",
-  "name": "videofiles",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://videofiles.net/img/logo.png"
-}
\ No newline at end of file
diff --git a/servers/videofiles.py b/servers/videofiles.py
deleted file mode 100644
index 89562b2f..00000000
--- a/servers/videofiles.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector Videofiles By Alfa development Group
-# --------------------------------------------------------
-import re
-
-from core import httptools
-from platformcode import config
-from platformcode import logger
-
-data = ""
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url)
-
-    if not data.sucess or "Not Found" in data.data or "File was deleted" in data.data or "is no longer available" in data.data:
-        return False,  config.get_localized_string(70449) % "Videofiles"
-    global data
-    data = data.data
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-
-    video_urls = []
-    patron = 'src: "([^"]+)", type: "([^"]+)", res: (\d+),'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for url, ext, res in matches:
-        res = res+'p'
-        try:
-            ext = ext.split("/")[1]
-        except:
-            pass
-        video_urls.append(["%s (%s) [videofiles]" % (ext, res), url])
-
-    return video_urls
diff --git a/servers/videomega.json b/servers/videomega.json
index f00b7337..5dd00bec 100644
--- a/servers/videomega.json
+++ b/servers/videomega.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "videomega",
-  "name": "videomega",
+  "name": "VideoMega",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/videoz.json b/servers/videoz.json
deleted file mode 100644
index 0440df47..00000000
--- a/servers/videoz.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "videoz.me/(?:embed-|)([A-z0-9]+)",
-        "url": "https://videoz.me/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "videoz",
-  "name": "videoz",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://i.imgur.com/FAPDkF6.png"
-}
\ No newline at end of file
diff --git a/servers/videoz.py b/servers/videoz.py
deleted file mode 100644
index a5ba7645..00000000
--- a/servers/videoz.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector Videoz By Alfa development Group
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    global data
-    data = httptools.downloadpage(page_url).data
-    if "Not Found" in data or "File was deleted" in data:
-        return False,  config.get_localized_string(70449) % "Videoz"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-
-    packed = scrapertools.find_single_match(data, "text/javascript'>(eval.*?)\s*</script>")
-    unpacked = jsunpack.unpack(packed)
-    
-    media_url = scrapertools.find_single_match(unpacked, 'file:"([^"]+)"')
-    #media_url += "|Referer=%s" %page_url
-    if "m3u8" in media_url:
-        ext = "m3u8"
-    video_urls.append(["%s [videoz]" % (ext), media_url])
-
-    return video_urls
diff --git a/servers/vidfast.json b/servers/vidfast.json
index 2efe5199..9bfee90e 100644
--- a/servers/vidfast.json
+++ b/servers/vidfast.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "vidfast",
-  "name": "vidfast",
+  "name": "VidFast",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://i.postimg.cc/jdnS13jQ/vidfast.jpg"
+  ]
 }
diff --git a/servers/vidgot.json b/servers/vidgot.json
deleted file mode 100644
index 407ef006..00000000
--- a/servers/vidgot.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "vidgot.com/(?:embed-|)([A-z0-9]+)",
-        "url": "http://www.vidgot.com/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "vidgot",
-  "name": "vidgot",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "http://i.imgur.com/tAI34bF.png?1"
-}
\ No newline at end of file
diff --git a/servers/vidlox.json b/servers/vidlox.json
index c54fb1e0..d4f6a88d 100644
--- a/servers/vidlox.json
+++ b/servers/vidlox.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "vidlox",
-  "name": "vidlox",
+  "name": "Vidlox",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s1.postimg.cc/wathgtvin/logo-vidlox1.png"
+  ]
 }
diff --git a/servers/vidmoly.json b/servers/vidmoly.json
index 51cc5efd..c1b5c1c0 100644
--- a/servers/vidmoly.json
+++ b/servers/vidmoly.json
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/vidoza.json b/servers/vidoza.json
index ef91ffb4..05c1a3a8 100644
--- a/servers/vidoza.json
+++ b/servers/vidoza.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "vidoza",
-  "name": "vidoza",
+  "name": "Vidoza",
   "premium": [
     "realdebrid"
   ],
@@ -40,6 +40,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_vidoza.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/vidtodo.json b/servers/vidtodo.json
index 7ed2cd77..6ceeedf0 100755
--- a/servers/vidtodo.json
+++ b/servers/vidtodo.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "vidtodo",
-  "name": "vidtodo",
+  "name": "VidToDo",
   "settings": [
     {
       "default": false,
diff --git a/servers/vidtome.json b/servers/vidtome.json
old mode 100755
new mode 100644
index f6bb5618..b404034a
--- a/servers/vidtome.json
+++ b/servers/vidtome.json
@@ -4,14 +4,18 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "vidto.me/(?:embed-|)([A-z0-9]+)",
-        "url": "http://vidto.me/embed-\\1.html"
+        "pattern": "(?:vidtome.stream|vidto.me)/(?!api)(?:embed-)?([A-z0-9]+)",
+        "url": "http://vidtome.stream/\\1.html"
+      },
+      {
+        "pattern": "vidtome.stream/api/fastredirect/streaming\\.php\\?file_real=([A-z0-9]+)",
+        "url": "http://vidtome.stream/api/fastredirect/streaming.php?file_real=\\1"
       }
     ]
   },
   "free": true,
   "id": "vidtome",
-  "name": "vidtome",
+  "name": "Vidto.me",
   "settings": [
     {
       "default": false,
diff --git a/servers/vidtome.py b/servers/vidtome.py
index ff1b3eb6..9f1eeafc 100644
--- a/servers/vidtome.py
+++ b/servers/vidtome.py
@@ -1,31 +1,31 @@
 # -*- coding: utf-8 -*-
 
-from core import httptools
-from core import scrapertools
+from core import httptools, scrapertools
 from platformcode import logger, config
+from lib import jsunpack
 
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
+    global data
     data = httptools.downloadpage(page_url).data
     if "Not Found" in data or "File Does not Exist" in data:
-        return False, config.get_localized_string(70292) % 'vidto.me'
+        return False, config.get_localized_string(70292) % 'Vidto.me'
     return True, ""
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("url=" + page_url)
-    data = httptools.downloadpage(page_url).data
+    global data
+    video_urls = []
     code = scrapertools.find_single_match(data, 'name="code" value="([^"]+)')
     hash = scrapertools.find_single_match(data, 'name="hash" value="([^"]+)')
     post = "op=download1&code=%s&hash=%s&imhuman=Proceed+to+video" %(code, hash)
-    data1 = httptools.downloadpage("http://m.vidtome.stream/playvideo/%s" %code, post=post).data
-    video_urls = []
-    media_urls = scrapertools.find_multiple_matches(data1, 'file: "([^"]+)')
-    for media_url in media_urls:
-        ext = scrapertools.get_filename_from_url(media_url)[-4:]
-        video_urls.append(["%s [vidto.me]" % (ext), media_url])
-    video_urls.reverse()
-    for video_url in video_urls:
-        logger.info("%s" % (video_url[0]))
+    data = httptools.downloadpage("http://vidtome.co/playvideos/%s" %code, post=post).data
+    packed = scrapertools.find_multiple_matches(data, r'(eval\s?\(function\(p,a,c,k,e,d\).*?\n)')
+    for p in packed:
+        data = jsunpack.unpack(p)
+        media_url = scrapertools.find_single_match(data, r"source:\\'([^\\']+)")
+        if media_url:
+            video_urls.append([media_url.split('.')[-1] + ' [Vidto.me]', media_url])
     return video_urls
diff --git a/servers/vidup.json b/servers/vidup.json
index f6821286..e1297257 100755
--- a/servers/vidup.json
+++ b/servers/vidup.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "vidup",
-  "name": "vidup",
+  "name": "ViduP",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://i.imgur.com/sZvy8IC.png?1"
+  ]
 }
diff --git a/servers/vidzi.json b/servers/vidzi.json
deleted file mode 100644
index a2ab07cd..00000000
--- a/servers/vidzi.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "vidzi.tv/embed-([a-z0-9A-Z]+)",
-        "url": "http://vidzi.tv/embed-\\1.html"
-      },
-      {
-        "pattern": "vidzi.tv/([a-z0-9A-Z]+)",
-        "url": "http://vidzi.tv/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "vidzi",
-  "name": "vidzi",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://s1.postimg.cc/597or3a31b/vidzi1.png"
-}
diff --git a/servers/vidzi.py b/servers/vidzi.py
deleted file mode 100644
index c04e20e0..00000000
--- a/servers/vidzi.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    response = httptools.downloadpage(page_url)
-    if not response.sucess:
-        return False,  config.get_localized_string(70449) % "Vidzi"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    if not "embed" in page_url:
-        page_url = page_url.replace("http://vidzi.tv/", "http://vidzi.tv/embed-") + ".html"
-
-    data = httptools.downloadpage(page_url).data
-    media_urls = scrapertools.find_multiple_matches(data, 'file\s*:\s*"([^"]+)"')
-
-    if not media_urls:
-        data = scrapertools.find_single_match(data,
-                                              "<script type='text/javascript'>(eval\(function\(p,a,c,k,e,d.*?)</script>")
-        data = jsunpack.unpack(data)
-        media_urls = scrapertools.find_multiple_matches(data, 'file\s*:\s*"([^"]+)"')
-
-    video_urls = []
-    for media_url in media_urls:
-        ext = scrapertools.get_filename_from_url(media_url)[-4:]
-        if not media_url.endswith("vtt"):
-            video_urls.append(["%s [vidzi]" % ext, media_url])
-
-    return video_urls
diff --git a/servers/vimeo.json b/servers/vimeo.json
index ab870ed1..2b0d433a 100644
--- a/servers/vimeo.json
+++ b/servers/vimeo.json
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s26.postimg.cc/vo685y2bt/vimeo1.png"
+  ]
 }
diff --git a/servers/vimpleru.json b/servers/vimpleru.json
index 6a1e93d3..d89ce595 100644
--- a/servers/vimpleru.json
+++ b/servers/vimpleru.json
@@ -42,6 +42,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_vimpleru.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/vivo.json b/servers/vivo.json
index 7183ea8b..58ac6202 100644
--- a/servers/vivo.json
+++ b/servers/vivo.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "vivo",
-  "name": "vivo",
+  "name": "VIVO",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "https://s15.postimg.cc/oiyhtpdqj/vivo.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/vk.json b/servers/vk.json
index 6017efe2..e50928ef 100755
--- a/servers/vk.json
+++ b/servers/vk.json
@@ -15,7 +15,7 @@
   },
   "free": true,
   "id": "vk",
-  "name": "vk",
+  "name": "VK",
   "premium": [
     "realdebrid"
   ],
@@ -59,6 +59,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_vk.png"
+  ]
 }
diff --git a/servers/vshare.json b/servers/vshare.json
index 72ebe973..e1488ee6 100644
--- a/servers/vshare.json
+++ b/servers/vshare.json
@@ -46,6 +46,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_vshare.png"
+  ]
 }
diff --git a/servers/thevideos.json b/servers/vudeo.json
similarity index 67%
rename from servers/thevideos.json
rename to servers/vudeo.json
index 7776a6ac..21c6c02a 100644
--- a/servers/thevideos.json
+++ b/servers/vudeo.json
@@ -3,15 +3,19 @@
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
+       {
+        "pattern": "https?://vudeo.net/embed-([a-z0-9-.]+)\\.html",
+        "url": "https://vudeo.net/embed-\\1.html"
+      },
       {
-        "pattern": "thevideos.tv/(?:embed-|)([a-z0-9A-Z]+)",
-        "url": "http://thevideos.tv/embed-\\1.html"
+        "pattern": "https?://vudeo.net/([a-z0-9-.]+)",
+        "url": "https://vudeo.net/embed-\\1.html"
       }
     ]
   },
   "free": true,
-  "id": "thevideos",
-  "name": "thevideos",
+  "id": "vudeo",
+  "name": "vudeo",
   "settings": [
     {
       "default": false,
@@ -38,4 +42,4 @@
       "visible": false
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/servers/vudeo.py b/servers/vudeo.py
new file mode 100644
index 00000000..b5986b72
--- /dev/null
+++ b/servers/vudeo.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from core import httptools, support
+from platformcode import logger
+
+data = ""
+
+def test_video_exists(page_url):
+    global data
+    logger.info("(page_url='%s')" % page_url)
+    response = httptools.downloadpage(page_url)
+
+    if response.code == 404:
+        return False, support.config.get_localized_string(70449) % "vudeo"
+    else:
+        data = response.data
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    global data
+    logger.info("url=" + page_url)
+    return support.get_jwplayer_mediaurl(data, 'vudeo')
diff --git a/servers/vupplayer.json b/servers/vupplayer.json
index d0b39cdf..fe4e5c6f 100644
--- a/servers/vupplayer.json
+++ b/servers/vupplayer.json
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_vupplayer.png"
+  ]
 }
diff --git a/servers/vvvvid.json b/servers/vvvvid.json
index d3205cfb..42be33e2 100644
--- a/servers/vvvvid.json
+++ b/servers/vvvvid.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "vvvvid",
-  "name": "vvvvid",
+  "name": "VVVVID",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/watchanimestream.json b/servers/watchanimestream.json
index 2118566b..8fe58ba7 100644
--- a/servers/watchanimestream.json
+++ b/servers/watchanimestream.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "watchanimestream",
-  "name": "watchanimestream",
+  "name": "Watchanimestream",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/watchvideo.json b/servers/watchvideo.json
index c865296a..a6bc4c1b 100644
--- a/servers/watchvideo.json
+++ b/servers/watchvideo.json
@@ -15,7 +15,7 @@
   },
   "free": true,
   "id": "watchvideo",
-  "name": "watchvideo",
+  "name": "WatchVideo",
   "settings": [
     {
       "default": false,
@@ -41,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "http://i.imgur.com/vDev2I6.png?1"
+  ]
 }
\ No newline at end of file
diff --git a/servers/wstream.json b/servers/wstream.json
index 517b6ce0..5f7cd897 100644
--- a/servers/wstream.json
+++ b/servers/wstream.json
@@ -3,7 +3,7 @@
     "name": "Wstream",
     "active": true,
     "free": true,
-    "thumbnail": "server_wstream.png",
+    
     "find_videos": {
         "patterns": [
             {
diff --git a/servers/wstream.py b/servers/wstream.py
index 7550ca74..3bf79834 100644
--- a/servers/wstream.py
+++ b/servers/wstream.py
@@ -7,6 +7,7 @@ import re
 
 try:
     import urllib.parse as urllib
+    # unichr = chr
 except ImportError:
     import urllib
 
@@ -32,6 +33,21 @@ def test_video_exists(page_url):
         page_url = 'https://116.202.226.34/video.php?file_code=' + code
         data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True, verify=False).data
 
+    if 'nored.icu' in str(headers):
+        var = scrapertools.find_single_match(data, r'var [a-zA-Z0-9]+ = \[([^\]]+).*?')
+        value = scrapertools.find_single_match(data, r'String\.fromCharCode\(parseInt\(value\) \D (\d+)')
+        if var and value:
+            dec = ''
+            for v in var.split(','):
+                dec += chr(int(v) - int(value))
+            page_url = 'https://116.202.226.34/video.php?file_code=' + scrapertools.find_single_match(dec, "src='([^']+)").split('/')[-1].replace('.html','')
+            headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0'],['Host', 'wstream.video']]
+            # from core.support import dbg;dbg()
+            new_data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True, verify=False).data
+            logger.info('NEW DATA: \n' + new_data)
+            if new_data:
+                data = new_data
+
     real_url = page_url
     if "Not Found" in data or "File was deleted" in data or 'Video is processing' in data or 'Sorry this video is unavailable' in data:
         return False, config.get_localized_string(70449) % 'Wstream'
@@ -80,7 +96,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     video_urls = []
     global data, real_url, headers
     # from core.support import dbg;dbg()
-    logger.info(data)
+    # logger.info(data)
 
     sitekey = scrapertools.find_multiple_matches(data, """data-sitekey=['"] *([^"']+)""")
     if sitekey: sitekey = sitekey[-1]
@@ -103,7 +119,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     headers.append(['Referer', real_url.replace('116.202.226.34', headers[1][1])])
     _headers = urllib.urlencode(dict(headers))
 
-    post_data = scrapertools.find_single_match(data, r"</div>\s*<script type='text/javascript'>(eval.function.p,a,c,k,e,.*?)\s*</script>")
+    post_data = scrapertools.find_single_match(data, r"<script type='text/javascript'>(eval.function.p,a,c,k,e,.*?)\s*</script>")
     if post_data != "":
         from lib import jsunpack
         data = jsunpack.unpack(post_data)
diff --git a/servers/youdbox.json b/servers/youdbox.json
index a595cdff..ab9e3263 100644
--- a/servers/youdbox.json
+++ b/servers/youdbox.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "youdbox",
-  "name": "youdbox",
+  "name": "YouDbox",
   "settings": [
     {
       "default": false,
@@ -37,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": ""
+  ]
 }
diff --git a/servers/yourupload.json b/servers/yourupload.json
index cda4fab8..9c61f454 100755
--- a/servers/yourupload.json
+++ b/servers/yourupload.json
@@ -21,7 +21,7 @@
   },
   "free": true,
   "id": "yourupload",
-  "name": "yourupload",
+  "name": "YourUpload",
   "settings": [
     {
       "default": false,
@@ -47,6 +47,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail" : "https://s1.postimg.cc/4wje61el4f/yourupload1.png"
+  ]
 }
diff --git a/servers/youtube.json b/servers/youtube.json
index 6adf5925..34a81972 100755
--- a/servers/youtube.json
+++ b/servers/youtube.json
@@ -15,7 +15,7 @@
   },
   "free": true,
   "id": "youtube",
-  "name": "youtube",
+  "name": "YouTube",
   "premium": [
     "realdebrid",
     "alldebrid"
@@ -45,6 +45,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "thumbnail": "server_youtube.png"
+  ]
 }
\ No newline at end of file
diff --git a/servers/youwatch.json b/servers/youwatch.json
index 43644659..1c4bc87a 100644
--- a/servers/youwatch.json
+++ b/servers/youwatch.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "youwatch",
-  "name": "youwatch",
+  "name": "You watch",
   "premium": [
     "realdebrid"
   ],
diff --git a/servers/zippyshare.json b/servers/zippyshare.json
index dbf11475..48df2b5a 100644
--- a/servers/zippyshare.json
+++ b/servers/zippyshare.json
@@ -11,7 +11,7 @@
   },
   "free": true,
   "id": "zippyshare",
-  "name": "zippyshare",
+  "name": "Zippyshare",
   "premium": [
     "realdebrid",
     "alldebrid"
diff --git a/service.py b/service.py
index de18c897..a12dda24 100644
--- a/service.py
+++ b/service.py
@@ -266,8 +266,7 @@ def viewmodeMonitor():
         currentModeName = xbmc.getInfoLabel('Container.Viewmode')
         win = xbmcgui.Window(xbmcgui.getCurrentWindowId())
         currentMode = int(win.getFocusId())
-        if currentModeName and 'plugin.video.kod' in xbmc.getInfoLabel(
-                'Container.FolderPath') and currentMode < 1000 and currentMode > 50:  # inside addon and in itemlist view
+        if currentModeName and 'plugin.video.kod' in xbmc.getInfoLabel('Container.FolderPath') and currentMode < 1000 and currentMode >= 50:  # inside addon and in itemlist view
             content, Type = platformtools.getCurrentView()
             if content:
                 defaultMode = int(config.get_setting('view_mode_%s' % content).split(',')[-1])
diff --git a/specials/autoplay.py b/specials/autoplay.py
index 71e588af..68377cff 100644
--- a/specials/autoplay.py
+++ b/specials/autoplay.py
@@ -1,83 +1,19 @@
 # -*- coding: utf-8 -*-
 
-#from builtins import str
-import sys
-PY3 = False
-if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
-from builtins import range
-
-import os
-
-from core import channeltools, jsontools
+from core import filetools, jsontools
 from core.item import Item
-from platformcode import config, logger, platformtools, launcher
+from platformcode import config, logger, platformtools
 from time import sleep
-from platformcode.config import get_setting
 
 __channel__ = "autoplay"
 
 PLAYED = False
 
-autoplay_node = {}
-
-colorKOD = '0xFF65B3DA'
-
-
-def context():
-    '''
-    Add the Configure AutoPlay option to the context menu
-
-    :return:
-    '''
-
-    _context = ""
-
-    if config.is_xbmc():
-        _context = [{"title": config.get_localized_string(60071),
-                     "action": "autoplay_config",
-                     "channel": "autoplay"}]
-    return _context
-
-
-context = context()
-
-
-def show_option(channel, itemlist, text_color=colorKOD, thumbnail=None, fanart=None):
-    '''
-    Add the option Configure AutoPlay in the received list
-
-    :param channel: str
-    :param itemlist: list (lista donde se desea integrar la opcion de configurar AutoPlay)
-    :param text_color: str (color for the text of the option Configure Autoplay)
-    :param thumbnail: str (address where the thumbnail is for the Configure Autoplay option)
-    :return:
-    '''
-    from channelselector import get_thumb
-    from core.support import typo
-    logger.info()
-
-    if not config.is_xbmc():
-        return itemlist
-
-    if thumbnail == None:
-        thumbnail = get_thumb('autoplay.png')
-    # if fanart == None:
-    #     fanart = get_thumb('autoplay.png')
-
-    plot_autoplay = config.get_localized_string(60399)
-    itemlist.append(
-        Item(channel=__channel__,
-             title=typo(config.get_localized_string(60071), 'bold color kod'),
-             action="autoplay_config",
-             text_color=text_color,
-             text_bold=True,
-             thumbnail=thumbnail,
-            #  fanart=fanart,
-             plot=plot_autoplay,
-             from_channel=channel,
-             folder=False
-             ))
-    return itemlist
+quality_list = ['4k', '2160p', '2160', '4k2160p', '4k2160', '4k 2160p', '4k 2160', '2k',
+                'fullhd', 'fullhd 1080', 'fullhd 1080p', 'full hd', 'full hd 1080', 'full hd 1080p', 'hd1080', 'hd1080p', 'hd 1080', 'hd 1080p', '1080', '1080p',
+                'hd', 'hd720', 'hd720p', 'hd 720', 'hd 720p', '720', '720p', 'hdtv',
+                'sd', '480p', '480', '360p', '360', '240p', '240',
+                'default']
 
 
 def start(itemlist, item):
@@ -90,68 +26,49 @@ def start(itemlist, item):
     :param item: item (the main item of the channel)
     :return: try to auto-reproduce, in case of failure it returns the itemlist that it received in the beginning
     '''
+
     if item.global_search:
         return itemlist
     logger.info()
 
     global PLAYED
-    global autoplay_node
     PLAYED = False
 
     base_item = item
 
-    
     if not config.is_xbmc():
-        # platformtools.dialog_notification('AutoPlay ERROR', 'Sólo disponible para XBMC/Kodi')
         return itemlist
 
-    if not autoplay_node:
-        # Get AUTOPLAY node from json
-        autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
-
     channel_id = item.channel
     if item.channel == 'videolibrary':
-        autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
         channel_id = item.contentChannel
-    # try:
-    #     active = autoplay_node['status']
-    # except:
-    #     active = is_active(item.channel)
 
-    if not channel_id in autoplay_node: # or not active:
-        return itemlist
 
-    # Add servers and qualities not listed to autoplay_node
-    new_options = check_value(channel_id, itemlist)
-
-    # Get the channel node from autoplay_node
-    channel_node = autoplay_node.get(channel_id, {})
-    # Get the autoplay settings for this channel
-    settings_node = channel_node.get('settings', {})
-
-    if get_setting('autoplay') or settings_node['active']:
+    if config.get_setting('autoplay'):
         url_list_valid = []
         autoplay_list = []
         autoplay_b = []
-        favorite_langs = []
-        favorite_servers = []
         favorite_quality = []
 
-        # 2nd lang, see if you want to filter or not
-        status_language = config.get_setting("filter_languages", channel_id)
-
+        blacklisted_servers = config.get_setting('black_list', server='servers')
+        if not blacklisted_servers:
+            config.set_setting('black_list', [], server='servers')
+            blacklisted_servers = []
+        favorite_servers = config.get_setting('favorites_servers_list', server='servers')
+        if not favorite_servers:
+            config.set_setting('favorites_servers_list', [], server='servers')
+            favorite_servers = []
+        else:
+            favorite_servers = list(set(favorite_servers) - set(blacklisted_servers))
 
         # Save the current value of "Action and Player Mode" in preferences
         user_config_setting_action = config.get_setting("default_action")
         user_config_setting_player = config.get_setting("player_mode")
-        # Enable the "View in high quality" action (if the server returns more than one quality, eg gdrive)
-        if user_config_setting_action != 2:
-            config.set_setting("default_action", 2)
-        if user_config_setting_player != 0:
-            config.set_setting("player_mode", 0)
 
-        # Report that AutoPlay is active
-        # platformtools.dialog_notification('AutoPlay Activo', '', sound=False)
+        # Enable the "View in high quality" action (if the server returns more than one quality, eg gdrive)
+        if not user_config_setting_action: config.set_setting("default_action", 2)
+
+        if user_config_setting_player != 0: config.set_setting("player_mode", 0)
 
         # Priorities when ordering itemlist:
         #       0: Servers and qualities
@@ -159,131 +76,121 @@ def start(itemlist, item):
         #       2: Servers only
         #       3: Only qualities
         #       4: Do not order
-        if (settings_node['custom_servers'] and settings_node['custom_quality']) or get_setting('autoplay'):
-            priority = settings_node['priority']  # 0: Servers and qualities or 1: Qualities and servers
-        elif settings_node['custom_servers']:
+        if config.get_setting('favorites_servers') and favorite_servers and config.get_setting('default_action'):
+            priority = 0  # 0: Servers and qualities or 1: Qualities and servers
+        elif config.get_setting('favorites_servers') and favorite_servers:
             priority = 2  # Servers only
-        elif settings_node['custom_quality']:
+        elif config.get_setting('default_action'):
             priority = 3  # Only qualities
         else:
             priority = 4  # Do not order
 
-        # Get server lists, qualities available from AutoPlay json node
-        server_list = channel_node.get('servers', [])
-        for server in server_list:
-            server = server.lower()
-        quality_list = channel_node.get('quality', [])
+        if config.get_setting('default_action') == 1:
+            quality_list.reverse()
+        favorite_quality = quality_list
 
-        # If no qualities are defined, default is assigned as unique quality.
-        if len(quality_list) == 0:
-            quality_list =['default']
-
-        # The texts of each server and quality are stored in lists, e.g. favorite_servers = ['verystream', 'openload', 'streamcloud']
-        for num in range(1, 4):
-            favorite_servers.append(channel_node['servers'][settings_node['server_%s' % num]].lower())
-            favorite_quality.append(channel_node['quality'][settings_node['quality_%s' % num]])
-
-        # Itemlist links are filtered and correspond to autoplay values
-        for n, item in enumerate(itemlist):
+        for item in itemlist:
             autoplay_elem = dict()
             b_dict = dict()
 
             # We check that it is a video item
             if 'server' not in item:
                 continue
-            # 2nd lang language list
-            if item.language not in favorite_langs:
-                favorite_langs.append(item.language)
 
-            # Add the option to configure AutoPlay to the context menu
-            if 'context' not in item:
-                item.context = list()
-            if not [x for x in context if x['action'] == 'autoplay_config']:
-                item.context.append({"title": config.get_localized_string(60071),
-                                     "action": "autoplay_config",
-                                     "channel": "autoplay",
-                                     "from_channel": channel_id})
+            if item.server.lower() in blacklisted_servers:
+                continue
 
             # If it does not have a defined quality, it assigns a 'default' quality.
-            if item.quality == '':
+            if item.quality not in quality_list:
                 item.quality = 'default'
-
             # The list for custom settings is created
+
             if priority < 2:  # 0: Servers and qualities or 1: Qualities and servers
 
                 # if the server and the quality are not in the favorites lists or the url is repeated, we discard the item
-                if item.server.lower() not in favorite_servers or item.quality not in favorite_quality \
-                        or item.url in url_list_valid:
+                if item.server.lower() not in favorite_servers or item.quality.lower() not in favorite_quality or item.url in url_list_valid:
                     item.type_b = True
+                    item.play_from = base_item.play_from
                     b_dict['videoitem']= item
                     autoplay_b.append(b_dict)
                     continue
-                autoplay_elem["indice_lang"] = favorite_langs.index(item.language)
                 autoplay_elem["indice_server"] = favorite_servers.index(item.server.lower())
-                autoplay_elem["indice_quality"] = favorite_quality.index(item.quality)
+                autoplay_elem["indice_quality"] = favorite_quality.index(item.quality.lower())
 
             elif priority == 2:  # Servers only
 
                 # if the server is not in the favorites list or the url is repeated, we discard the item
                 if item.server.lower() not in favorite_servers or item.url in url_list_valid:
                     item.type_b = True
+                    item.play_from = base_item.play_from
                     b_dict['videoitem'] = item
                     autoplay_b.append(b_dict)
                     continue
-                autoplay_elem["indice_lang"] = favorite_langs.index(item.language)
                 autoplay_elem["indice_server"] = favorite_servers.index(item.server.lower())
 
-            elif priority == 3:  # Solo calidades
+            elif priority == 3:  # Only qualities
 
                 # if the quality is not in the favorites list or the url is repeated, we discard the item
-                if item.quality not in favorite_quality or item.url in url_list_valid:
+                if item.quality.lower() not in favorite_quality or item.url in url_list_valid:
                     item.type_b = True
+                    item.play_from = base_item.play_from
                     b_dict['videoitem'] = item
                     autoplay_b.append(b_dict)
                     continue
-                autoplay_elem["indice_lang"] = favorite_langs.index(item.language)
-                autoplay_elem["indice_quality"] = favorite_quality.index(item.quality)
+                autoplay_elem["indice_quality"] = favorite_quality.index(item.quality.lower())
 
             else:  # Do not order
 
                 # if the url is repeated, we discard the item
+                item.play_from = base_item.play_from
                 if item.url in url_list_valid:
                     continue
 
             # If the item reaches here we add it to the list of valid urls and to autoplay_list
             url_list_valid.append(item.url)
             item.plan_b=True
+            item.play_from = base_item.play_from
             autoplay_elem['videoitem'] = item
-            # autoplay_elem['server'] = item.server
-            # autoplay_elem['quality'] = item.quality
             autoplay_list.append(autoplay_elem)
 
         # We order according to priority
-        if priority == 0:  # Servers and qualities
-            autoplay_list.sort(key=lambda orden: (orden['indice_lang'], orden['indice_server'], orden['indice_quality']))
+        if priority == 0: autoplay_list.sort(key=lambda orden: (orden['indice_quality'], orden['indice_server'])) # Servers and qualities
+        elif priority == 1: autoplay_list.sort(key=lambda orden: (orden['indice_quality'], orden['indice_server'])) # Qualities and servers
+        elif priority == 2: autoplay_list.sort(key=lambda orden: (orden['indice_server'])) # Servers only
+        elif priority == 3: autoplay_list.sort(key=lambda orden: (orden['indice_quality'])) # Only qualities
 
-        elif priority == 1:  # Qualities and servers
-            autoplay_list.sort(key=lambda orden: (orden['indice_lang'], orden['indice_quality'], orden['indice_server']))
+        # if quality priority is active
+        if priority == 0 and config.get_setting('quality_priority'):
+            max_quality = autoplay_list[0]["indice_quality"] if autoplay_list and "indice_quality" in autoplay_list[0] else 0
+            for n, item in enumerate(itemlist):
+                if 'server' not in item:
+                    continue
 
-        elif priority == 2:  # Servers only
-            autoplay_list.sort(key=lambda orden: (orden['indice_lang'], orden['indice_server']))
+                if item.server.lower() in blacklisted_servers:
+                    continue
 
-        elif priority == 3:  # Only qualities
-            autoplay_list.sort(key=lambda orden: (orden['indice_lang'], orden['indice_quality']))
+                # If it does not have a defined quality, it assigns a 'default' quality.
+                if item.quality == '':
+                    item.quality = 'default'
+
+                if favorite_quality.index(item.quality.lower()) < max_quality:
+                    item.type_b = False
+                    autoplay_elem["indice_server"] = n
+                    autoplay_elem["indice_quality"] = favorite_quality.index(item.quality.lower())
+                    autoplay_elem['videoitem'] = item
+                    autoplay_list.append(autoplay_elem)
+            autoplay_list.sort(key=lambda orden: (orden['indice_quality'], orden['indice_server']))
 
         # Plan b is prepared, in case it is active the non-favorite elements are added at the end
-        try:
-            plan_b = settings_node['plan_b']
-        except:
-            plan_b = True
+        # try: plan_b = settings_node['plan_b']
+        # except: 
+        plan_b = True
         text_b = ''
-        if plan_b:
-            autoplay_list.extend(autoplay_b)
+        if plan_b: autoplay_list.extend(autoplay_b)
         # If there are elements in the autoplay list, an attempt is made to reproduce each element, until one is found or all fail.
 
         if autoplay_list or (plan_b and autoplay_b):
 
-            # played = False
             max_intentos = 5
             max_intentos_servers = {}
 
@@ -309,35 +216,25 @@ def start(itemlist, item):
                     lang = " "
                     if hasattr(videoitem, 'language') and videoitem.language != "":
                         lang = " '%s' " % videoitem.language
-
-                    platformtools.dialog_notification("AutoPlay %s" %text_b, "%s%s%s" % (
-                        videoitem.server.upper(), lang, videoitem.quality.upper()), sound=False)
-                    # TODO videoitem.server is the id of the server, but it might not be the name !!!
+                    name = servername(videoitem.server)
+                    platformtools.dialog_notification("AutoPlay %s" %text_b, "%s%s%s" % (name, lang, videoitem.quality.upper()), sound=False)
 
                     # Try to play the links If the channel has its own play method, use it
-                    try:
-                        channel = __import__('channels.%s' % channel_id, None, None, ["channels.%s" % channel_id])
-                    except:
-                        channel = __import__('specials.%s' % channel_id, None, None, ["specials.%s" % channel_id])
+                    try: channel = __import__('channels.%s' % channel_id, None, None, ["channels.%s" % channel_id])
+                    except: channel = __import__('specials.%s' % channel_id, None, None, ["specials.%s" % channel_id])
                     if hasattr(channel, 'play'):
                         resolved_item = getattr(channel, 'play')(videoitem)
                         if len(resolved_item) > 0:
-                            if isinstance(resolved_item[0], list):
-                                videoitem.video_urls = resolved_item
-                            else:
-                                videoitem = resolved_item[0]
+                            if isinstance(resolved_item[0], list): videoitem.video_urls = resolved_item
+                            else: videoitem = resolved_item[0]
 
                     # If not directly reproduce and mark as seen
-
-                    #Check if the item comes from the video library
+                    # Check if the item comes from the video library
                     try:
-                        if base_item.contentChannel =='videolibrary':
-                            # Mark as seen
-                            from platformcode import xbmc_videolibrary
-                            xbmc_videolibrary.mark_auto_as_watched(base_item)
+                        if base_item.contentChannel == 'videolibrary' or base_item.nfo:
                             # Fill the video with the data of the main item and play
-                            play_item = base_item.clone(url=videoitem)
-                            platformtools.play_video(play_item.url, autoplay=True)
+                            play_item = base_item.clone(**videoitem.__dict__)
+                            platformtools.play_video(play_item, autoplay=True)
                         else:
                             # If it doesn't come from the video library, just play
                             platformtools.play_video(videoitem, autoplay=True)
@@ -356,400 +253,31 @@ def start(itemlist, item):
 
                     # If the maximum number of attempts of this server has been reached, ask if we want to continue testing or ignore it.
                     if max_intentos_servers[videoitem.server.lower()] == 0:
-                        text = config.get_localized_string(60072) % videoitem.server.upper()
+                        text = config.get_localized_string(60072) % name
                         if not platformtools.dialog_yesno("AutoPlay", text, config.get_localized_string(60073)):
                             max_intentos_servers[videoitem.server.lower()] = max_intentos
 
                     # If there are no items in the list, it is reported
                     if autoplay_elem == autoplay_list[-1]:
-                         platformtools.dialog_notification('AutoPlay', config.get_localized_string(60072) % videoitem.server.upper())
+                        platformtools.dialog_notification('AutoPlay', config.get_localized_string(60072) % name)
 
         else:
             platformtools.dialog_notification(config.get_localized_string(60074), config.get_localized_string(60075))
-        if new_options:
-            platformtools.dialog_notification("AutoPlay", config.get_localized_string(60076), sound=False)
 
         # Restore if necessary the previous value of "Action and Player Mode" in preferences
-        if user_config_setting_action != 2:
-            config.set_setting("default_action", user_config_setting_action)
-        if user_config_setting_player != 0:
-            config.set_setting("player_mode", user_config_setting_player)
+        if not user_config_setting_action: config.set_setting("default_action", user_config_setting_action)
+        if user_config_setting_player != 0: config.set_setting("player_mode", user_config_setting_player)
 
     return itemlist
 
 
-def init(channel, list_servers, list_quality, reset=False):
-    '''
-    Check the existence of a channel in the Autoplay configuration file and if it does not exist, add it.
-    It is necessary to call this function when entering any channel that includes the Autoplay function.
-
-    :param channel: (str) channel id
-    :param list_servers: (list) initial list of valid servers for the channel. It is not necessary to include them all,
-        since the list of valid servers will be updated dynamically.
-    :param list_quality: (list) initial list of valid qualities for the channel. It is not necessary to include them all,
-        since the list of valid qualities will be updated dynamically.
-    :return: (bool) True if the initialization was successful.
-    '''
-    logger.info()
-    change = False
-    result = True
-
-
-    if not config.is_xbmc():
-        # platformtools.dialog_notification('AutoPlay ERROR', 'Sólo disponible para XBMC/Kodi')
-        result = False
-    else:
-        autoplay_path = os.path.join(config.get_data_path(), "settings_channels", 'autoplay_data.json')
-        if os.path.exists(autoplay_path):
-            autoplay_node = jsontools.get_node_from_file('autoplay', "AUTOPLAY")
-        else:
-            change = True
-            autoplay_node = {"AUTOPLAY": {}}
-
-        if channel not in autoplay_node or reset:
-            change = True
-
-            # It is verified that there are no duplicate qualities or servers
-            if 'default' not in list_quality:
-                list_quality.append('default')
-            # list_servers = list(set(list_servers))
-            # list_quality = list(set(list_quality))
-
-            # We create the channel node and add it
-            channel_node = {"servers": list_servers,
-                            "quality": list_quality,
-                            "settings": {
-                                "active": False,
-                                "hide_servers": False,
-                                "plan_b": True,
-                                "custom_servers": False,
-                                "custom_quality": False,
-                                "priority": 0}}
-            for n in range(1, 4):
-                s = c = 0
-                if len(list_servers) >= n:
-                    s = n - 1
-                if len(list_quality) >= n:
-                    c = n - 1
-
-                channel_node["settings"]["server_%s" % n] = s
-                channel_node["settings"]["quality_%s" % n] = c
-            autoplay_node[channel] = channel_node
-
-        if change:
-            result, json_data = jsontools.update_node(autoplay_node, 'autoplay', 'AUTOPLAY')
-
-            if not result:
-                heading = config.get_localized_string(60077)
-                msj = config.get_localized_string(60078)
-
-                platformtools.dialog_notification(heading, msj, sound=False)
-
-    return result
-
-
-def check_value(channel, itemlist):
-    ''' 
-    checks the existence of a value in the list of servers or qualities if it does not exist adds them to the list in the json
-
-    :param channel: str
-    :param values: list (one of servers or qualities)
-    :param value_type: str (server o quality)
-    :return: list
-    '''
-    logger.info()
-    global autoplay_node
-    change = False
-
-    if not autoplay_node:
-        # Get AUTOPLAY node from json
-        autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
-
-    channel_node = autoplay_node.get(channel)
-
-    server_list = channel_node.get('servers')
-    if not server_list:
-        server_list = channel_node['servers'] = list()
-
-    quality_list = channel_node.get('quality')
-    if not quality_list:
-        quality_list = channel_node['quality'] = list()
-
-    for item in itemlist:
-        if item.server.lower() not in server_list and item.server !='':
-            server_list.append(item.server.lower())
-            change = True
-        if item.quality not in quality_list and item.quality !='':
-            quality_list.append(item.quality)
-            change = True
-
-    if change:
-        change, json_data = jsontools.update_node(autoplay_node, 'autoplay', 'AUTOPLAY')
-
-    return change
-
-
-def autoplay_config(item):
-    logger.info()
-    global autoplay_node
-    dict_values = {}
-    list_controls = []
-    channel_parameters = channeltools.get_channel_parameters(item.from_channel)
-    channel_name = channel_parameters['title']
-
-    if not autoplay_node:
-        # Get AUTOPLAY node from json
-        autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
-
-    channel_node = autoplay_node.get(item.from_channel, {})
-    settings_node = channel_node.get('settings', {})
-
-    allow_option = True
-
-    active_settings = {"id": "active", "label": config.get_localized_string(60079), "type": "bool",
-                       "default": False, "enabled": allow_option, "visible": allow_option}
-
-    list_controls.append(active_settings)
-    dict_values['active'] = settings_node.get('active', False)
-
-    hide_servers = {"id": "hide_servers", "label": config.get_localized_string(70747), "type": "bool",
-                    "default": False, "enabled": "eq(-" + str(len(list_controls)) + ",true)", "visible": allow_option}
-
-    list_controls.append(hide_servers)
-    dict_values['hide_servers'] = settings_node.get('hide_servers', False)
-
-    # Language
-    status_language = config.get_setting("filter_languages", item.from_channel)
-    if not status_language:
-        status_language = 0
-
-    set_language = {"id": "language", "label": config.get_localized_string(60080),
-                    "type": "list", "default": 0, "enabled": "eq(-" + str(len(list_controls)) + ",true)", "visible": True,
-                    "lvalues": get_languages(item.from_channel)}
-
-    list_controls.append(set_language)
-    dict_values['language'] = status_language
-
-    separador = {"id": "label", "label": "         "
-                                         "_________________________________________________________________________________________",
-                 "type": "label", "enabled": True, "visible": True}
-    list_controls.append(separador)
-
-    # Favorite servers section
-    server_list = channel_node.get("servers", [])
-    if not server_list:
-        enabled = False
-        server_list = ["No disponible"]
-    else:
-        enabled = "eq(-" + str(len(list_controls)) + ",true)"
-
-    custom_servers_settings = {"id": "custom_servers", "label": config.get_localized_string(60081),
-                               "type": "bool", "default": False, "enabled": enabled, "visible": True}
-    custom_servers_pos = len(list_controls)
-    list_controls.append(custom_servers_settings)
-    if dict_values['active'] and enabled:
-        dict_values['custom_servers'] = settings_node.get('custom_servers', False)
-    else:
-        dict_values['custom_servers'] = False
-
-    for num in range(1, 4):
-        pos1 = num + custom_servers_pos
-        default = num - 1
-        if default > len(server_list) - 1:
-            default = 0
-        set_servers = {"id": "server_%s" % num, "label": u"          \u2665" + config.get_localized_string(60082) % num,
-                       "type": "list", "default": default,
-                       "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True,
-                       "lvalues": server_list}
-        list_controls.append(set_servers)
-
-        dict_values["server_%s" % num] = settings_node.get("server_%s" % num, 0)
-        if settings_node.get("server_%s" % num, 0) > len(server_list) - 1:
-            dict_values["server_%s" % num] = 0
-
-    # Favorite Qualities Section
-    quality_list = channel_node.get("quality", [])
-    if not quality_list:
-        enabled = False
-        quality_list = ["No disponible"]
-    else:
-        enabled = "eq(-" + str(len(list_controls)) + ",true)"
-
-    custom_quality_settings = {"id": "custom_quality", "label": config.get_localized_string(60083), "type": "bool", "default": False, "enabled": enabled, "visible": True}
-    custom_quality_pos = len(list_controls)
-    list_controls.append(custom_quality_settings)
-    if dict_values['active'] and enabled:
-        dict_values['custom_quality'] = settings_node.get('custom_quality', False)
-    else:
-        dict_values['custom_quality'] = False
-
-    for num in range(1, 4):
-        pos1 = num + custom_quality_pos
-        default = num - 1
-        if default > len(quality_list) - 1:
-            default = 0
-
-        set_quality = {"id": "quality_%s" % num, "label": u"          \u2665 " + config.get_localized_string(707417) + " %s" % num,
-                       "type": "list", "default": default,
-                       "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True,
-                       "lvalues": quality_list}
-        list_controls.append(set_quality)
-        dict_values["quality_%s" % num] = settings_node.get("quality_%s" % num, 0)
-        if settings_node.get("quality_%s" % num, 0) > len(quality_list) - 1:
-            dict_values["quality_%s" % num] = 0
-
-    # Plan B
-    dict_values['plan_b'] = settings_node.get('plan_b', False)
-    enabled = "eq(-" + str(custom_servers_pos) + ",true)|eq(-" + str(custom_quality_pos) + ",true)"
-    plan_b = {"id": "plan_b", "label": config.get_localized_string(70172),"type": "bool", "default": False, "enabled": enabled, "visible": True}
-    list_controls.append(plan_b)
-
-
-    # Priorities Section
-    priority_list = [config.get_localized_string(70174), config.get_localized_string(70175)]
-    set_priority = {"id": "priority", "label": config.get_localized_string(60085), "type": "list", "default": 0,
-                    "enabled": True, "visible": "eq(-5,true)+eq(-9,true)+eq(-12,true)", "lvalues": priority_list}
-    list_controls.append(set_priority)
-    dict_values["priority"] = settings_node.get("priority", 0)
-
-
-
-    # Open dialog box
-    platformtools.show_channel_settings(list_controls=list_controls, dict_values=dict_values, callback='save',
-                                        item=item, caption='%s - AutoPlay' % channel_name,
-                                        custom_button={'visible': True,
-                                                       'function': "reset",
-                                                        'close': True,
-                                                        'label': 'Reset'})
-
-
-def save(item, dict_data_saved):
-    '''
-    Save the data from the configuration window
-
-    :param item: item
-    :param dict_data_saved: dict
-    :return:
-    '''
-    logger.info()
-    global autoplay_node
-
-    if not autoplay_node:
-        # Get AUTOPLAY node from json
-        autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
-
-    new_config = dict_data_saved
-    if not new_config['active']:
-        new_config['language']=0
-    channel_node = autoplay_node.get(item.from_channel)
-    config.set_setting("filter_languages", dict_data_saved.pop("language"), item.from_channel)
-    channel_node['settings'] = dict_data_saved
-
-    result, json_data = jsontools.update_node(autoplay_node, 'autoplay', 'AUTOPLAY')
-
-
-    return result
-
-
-def get_languages(channel):
-    '''
-    Get the languages ​​from the channel's json
-
-    :param channel: str
-    :return: list
-    '''
-    logger.info()
-    list_language = ['Non filtrare']
-    list_controls, dict_settings = channeltools.get_channel_controls_settings(channel)
-    for control in list_controls:
-        try:
-            if control["id"] == 'filter_languages':
-                list_language = control["lvalues"]
-        except:
-            pass
-
-    return list_language
-
-
-def is_active(channel):
-    '''
-    Returns a boolean that indicates whether or not autoplay is active on the channel from which it is called
-
-    :return:True if autoplay is active for the channel from which it is called, False otherwise.
-    '''
-    logger.info()
-    global autoplay_node
-
-    if not config.is_xbmc():
-        return False
-
-    if not autoplay_node:
-        # Get AUTOPLAY node from json
-        autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
-
-        # Get the channel from which the call is made
-        #import inspect
-        #module = inspect.getmodule(inspect.currentframe().f_back)
-        #canal = module.__name__.split('.')[1]
-    canal = channel
-
-    # Get the channel node from autoplay_node
-    channel_node = autoplay_node.get(canal, {})
-    # Get the autoplay settings for this channel
-    settings_node = channel_node.get('settings', {})
-
-    return settings_node.get('active', False) or get_setting('autoplay')
-
-
-def reset(item, dict):
-
-    channel_name = item.from_channel
-    channel = __import__('channels.%s' % channel_name, fromlist=["channels.%s" % channel_name])
-    list_servers = channel.list_servers
-    list_quality = channel.list_quality
-
-    init(channel_name, list_servers, list_quality, reset=True)
-    platformtools.dialog_notification('AutoPlay', config.get_localized_string(70523) % item.category)
-
-    return
-
-# def set_status(status):
-#     logger.info()
-#     # Get AUTOPLAY node from json
-#     autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
-#     autoplay_node['status'] = status
-#
-#     result, json_data = jsontools.update_node(autoplay_node, 'autoplay', 'AUTOPLAY')
-
-# return if item channel has autoplay and hideserver enabled
-def get_channel_AP_HS(item):
-    autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
-    channel_node = autoplay_node.get(item.channel, {})
-    if not channel_node:  # never opened the channel menu so in autoplay_data.json there is no key
-        try:
-            channelFile = __import__('channels.' + item.channel, fromlist=["channels.%s" % item.channel])
-        except:
-            channelFile = __import__('specials.' + item.channel, fromlist=["specials.%s" % item.channel])
-        if hasattr(channelFile, 'list_servers') and hasattr(channelFile, 'list_quality'):
-            init(item.channel, channelFile.list_servers, channelFile.list_quality)
-
-    autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
-    channel_node = autoplay_node.get(item.channel, {})
-    settings_node = channel_node.get('settings', {})
-    AP = get_setting('autoplay') or (settings_node['active'] if 'active' in settings_node else False)
-    HS = config.get_setting('hide_servers') or (
-        settings_node['hide_servers'] if 'hide_server' in settings_node else False)
-
-    return AP, HS
-
 def play_multi_channel(item, itemlist):
     logger.info()
     global PLAYED
     video_dict = dict()
-    # set_status(True)
 
     for video_item in itemlist:
-        if is_active(video_item.contentChannel):
+        if config.get_setting('autoplay'):
             if video_item.contentChannel not in video_dict.keys():
                 video_dict[video_item.contentChannel] = [video_item]
             else:
@@ -762,5 +290,6 @@ def play_multi_channel(item, itemlist):
         else:
             break
 
-    AP, HS = get_channel_AP_HS(item)
-    return HS
\ No newline at end of file
+def servername(server):
+    path = filetools.join(config.get_runtime_path(), 'servers', server.lower() + '.json')
+    return jsontools.load(open(path, "r").read())['name'].upper()
\ No newline at end of file
diff --git a/specials/backup.py b/specials/backup.py
index 824c3f10..b1cc88b5 100644
--- a/specials/backup.py
+++ b/specials/backup.py
@@ -3,7 +3,7 @@
 # Backup and restore video library
 # ------------------------------------------------------------
 
-import datetime, xbmc
+import datetime,  xbmc
 
 from core import ziptools, videolibrarytools, filetools
 from platformcode import logger, config, platformtools, xbmc_videolibrary
diff --git a/specials/community.py b/specials/community.py
index 6fa1b6dc..b7ca1ba5 100644
--- a/specials/community.py
+++ b/specials/community.py
@@ -174,7 +174,7 @@ def peliculas(item, json='', key='', itemlist=[]):
     infoLabels = item.infoLabels if item.infoLabels else {}
     contentType = 'tvshow' if 'tvshow' in key else 'movie'
     itlist = filterkey = []
-    action = 'show_menu'
+    action = 'findvideos'
 
     if inspect.stack()[1][3] not in ['add_tvshow', 'get_episodes', 'update', 'find_episodes', 'search'] and not item.filterkey and not item.disable_pagination:
         Pagination = int(defp) if defp.isdigit() else ''
@@ -192,8 +192,8 @@ def peliculas(item, json='', key='', itemlist=[]):
 
         title = option['title'] if 'title' in option else ''
 
-        # if 'tvshows_list' in key and 'links' not in option:
-        #     action = 'episodios'
+        if 'tvshows_list' in key and 'links' not in option:
+            action = 'episodios'
 
         # filter elements
         if (not item.filter or item.filter.lower() in filterkey) and item.search.lower() in title.lower() and title:
@@ -236,8 +236,9 @@ def get_seasons(item):
     support.log()
     itemlist = []
     infoLabels = item.infoLabels
-    json = item.url['seasons_list'] if type(item.url) == dict else item.url
-
+    json = item.url if type(item.url) == dict else item.url
+    if 'seasons_list' in json: json = json['seasons_list']
+    elif 'tvshows_list' in json: return show_menu(item)
     for option in json:
         infoLabels['season'] = option['season']
         title = config.get_localized_string(60027) % option['season']
@@ -275,11 +276,20 @@ def episodios(item, json ='', key='', itemlist =[]):
     if type(item.url) == dict:
         if 'seasons_list' in item.url:
             return get_seasons(item)
+        elif 'tvshows_list' in item.url:
+            return peliculas(item, item.url, 'tvshows_list')
         else:
             json = {}
             json = item.url['episodes_list']
     else:
-        json = load_json(item)['episodes_list']
+        json = load_json(item)
+        if 'episodes_list' in json:
+            json = json['episodes_list']
+        elif 'seasons_list' in json:
+            item.url = json['episodes_list']
+            return get_seasons(item)
+        elif 'tvshows_list' in json:
+            return peliculas(item, json, 'tvshows_list')
 
     # set variable
     ep = 1
diff --git a/specials/downloads.json b/specials/downloads.json
index 1044ac8a..afb3db46 100644
--- a/specials/downloads.json
+++ b/specials/downloads.json
@@ -1,6 +1,6 @@
 {
   "id": "downloads",
-  "name": "Descargas",
+  "name": "Download",
   "active": false,
   "language": ["*"],
   "categories": [
@@ -84,38 +84,6 @@
       "default": 5,
       "enabled": true,
       "visible": true
-    },
-    {
-      "type": "label",
-      "label": "@70237",
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "server_reorder",
-      "type": "list",
-      "label": "@70238",
-      "lvalues": [
-        "@70244",
-        "@70245"
-      ],
-      "default": 0,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "language",
-      "type": "list",
-      "label": "@70246",
-      "lvalues": [
-        "Ita, Sub, Eng",
-        "Eng, Ita, Sub",
-        "Sub, Ita, Eng",
-        "Eng, Sub, Ita"
-      ],
-      "default": 0,
-      "enabled": "eq(-1,'@70245')",
-      "visible": "eq(-1,'@70245')"
-    }    
+    }
   ]
 }
diff --git a/specials/downloads.py b/specials/downloads.py
index 2467b63d..455a2ac1 100644
--- a/specials/downloads.py
+++ b/specials/downloads.py
@@ -539,10 +539,10 @@ def get_match_list(data, match_list, order_list=None, only_ascii=False, ignoreca
 
 def sort_method(item):
     """
-    Puntua cada item en funcion de varios parametros:
+    Score each item based on various parameters:
     @type item: item
-    @param item: elemento que se va a valorar.
-    @return:  puntuacion otenida
+    @param item: item to be valued.
+    @return:  punctuation obtained
     @rtype: int
     """
     lang_orders = {}
diff --git a/specials/filmontv.py b/specials/filmontv.py
index 53339eab..506d5876 100644
--- a/specials/filmontv.py
+++ b/specials/filmontv.py
@@ -2,226 +2,314 @@
 # ------------------------------------------------------------
 # Canale film in tv
 # ------------------------------------------------------------
-
-import re
-import urllib
-from channelselector import get_thumb
-from core import httptools, scrapertools, support, tmdb, filetools
+from datetime import datetime
+import glob, time, gzip, xbmc
+from core import filetools, downloadtools, support, scrapertools
 from core.item import Item
-from platformcode import logger, config, platformtools
+from platformcode import logger
 
-host = "https://www.superguidatv.it"
-
-TIMEOUT_TOTAL = 60
+host = "http://epg-guide.com/kltv.gz"
+blacklisted_genres = ['attualita', 'scienza', 'religione', 'cucina', 'notiziario', 'altro', 'soap opera', 'viaggi',  'economia', 'tecnologia', 'magazine', 'show', 'reality show', 'lifestyle', 'societa', 'wrestling', 'azione', 'Musica', 'real life', 'real adventure', 'dplay original', 'natura', 'news', 'food', 'sport', 'moda', 'arte e cultura', 'crime', 'box set e serie tv', 'casa', 'storia', 'talk show', 'motori', 'attualit\xc3\xa0 e inchiesta', 'documentari', 'musica', 'spettacolo', 'medical', 'talent show', 'sex and love', 'beauty and style', 'news/current affairs', "children's/youth programmes", 'leisure hobbies', 'social/political issues/economics', 'education/science/factual topics', 'undefined content', 'show/game show', 'music/ballet/dance', 'sports', 'arts/culture', 'biografico', 'informazione', 'documentario']
 
 
 def mainlist(item):
-    logger.info(" mainlist")
-    itemlist = [#Item(channel="search", action='discover_list', title=config.get_localized_string(70309),
-               #search_type='list', list_type='movie/now_playing',
-               #          thumbnail=get_thumb("now_playing.png")),
-               #Item(channel="search", action='discover_list', title=config.get_localized_string(70312),
-               #          search_type='list', list_type='tv/on_the_air', thumbnail=get_thumb("on_the_air.png")),
-            Item(channel=item.channel,
-                     title=config.get_setting("film1", channel="filmontv"),
-                     action="now_on_tv",
-                     url="%s/film-in-tv/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("film2", channel="filmontv"),
-                     action="now_on_tv",
-                     url="%s/film-in-tv/oggi/premium/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("film3", channel="filmontv"),
-                     action="now_on_tv",
-                     url="%s/film-in-tv/oggi/sky-intrattenimento/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("film4", channel="filmontv"),
-                     action="now_on_tv",
-                     url="%s/film-in-tv/oggi/sky-cinema/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("film5", channel="filmontv"),
-                     action="now_on_tv",
-                     url="%s/film-in-tv/oggi/sky-primafila/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("now1", channel="filmontv"),
-                     action="now_on_misc",
-                     url="%s/ora-in-onda/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("now2", channel="filmontv"),
-                     action="now_on_misc",
-                     url="%s/ora-in-onda/premium/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("now3", channel="filmontv"),
-                     action="now_on_misc",
-                     url="%s/ora-in-onda/sky-intrattenimento/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("now4", channel="filmontv"),
-                     action="now_on_misc",
-                     url="%s/ora-in-onda/sky-doc-e-lifestyle/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel,
-                     title=config.get_setting("now5", channel="filmontv"),
-                     action="now_on_misc_film",
-                     url="%s/ora-in-onda/sky-cinema/" % host,
-                     thumbnail=item.thumbnail),
-            Item(channel=item.channel, 
-                    title="Personalizza Oggi in TV",
-                    action="server_config", 
-                    config="filmontv", 
-                    folder=False, 
-                    thumbnail=item.thumbnail)]
+    support.log()
+
+    itemlist = [Item(title=support.typo('Film in onda oggi', 'bold'), channel=item.channel, action='category', contentType='movie', thumbnail=support.thumb(thumb='movie.png')),
+                Item(title=support.typo('Serie Tv in onda oggi', 'bold'), channel=item.channel, action='peliculas', contentType='tvshow', thumbnail=support.thumb(thumb='tvshow.png')),
+                Item(title=support.typo('Guida tv per canale', 'bold'), channel=item.channel, action='listaCanali', thumbnail=support.thumb(thumb='on_the_air.png')),
+                Item(title=support.typo('Canali live', 'bold'), channel=item.channel, action='live', thumbnail=support.thumb(thumb='tvshow_on_the_air.png'))]
 
     return itemlist
 
-def server_config(item):
-    return platformtools.show_channel_settings(channelpath=filetools.join(config.get_runtime_path(), "server", item.config))
 
-def now_on_misc_film(item):
-    logger.info("filmontv tvoggi")
+def getEpg():
+    now = datetime.now()
+    fileName = support.config.get_temp_file('guidatv-') + now.strftime('%Y %m %d')
+    archiveName = fileName + '.gz'
+    xmlName = fileName + '.xml'
+    if not filetools.exists(archiveName):
+        support.log('downloading epg')
+        # cancello quelli vecchi
+        for f in glob.glob(support.config.get_temp_file('guidatv-') + '*'):
+            filetools.remove(f, silent=True)
+        # inmemory = io.BytesIO(httptools.downloadpage(host).data)
+        downloadtools.downloadfile(host, archiveName)
+        support.log('opening gzip and writing xml')
+        fStream = gzip.GzipFile(archiveName, mode='rb')
+        guide = fStream.read().replace('\n', ' ').replace('><', '>\n<')
+        with open(xmlName, 'w') as f:
+            f.write(guide)
+    # else:
+    guide = open(xmlName)
+    return guide
+
+
+def category(item):
+    itemlist = [Item(title="Tutti", all=True, channel=item.channel, action='peliculas', contentType=item.contentType)]
+    category = ['Animazione', 'Avventura', 'Azione', 'Biografico', 'Brillante', 'Comico', 'Commedia', 'Crime', 'Documentario', 'Documentaristico', 'Drammatico', 'Famiglia', 'Fantascienza', 'Fantastico', 'Giallo', 'Guerra', 'Horror', 'Mistero', 'Musicale', 'Poliziesco', 'Sexy', 'Storico', 'Thriller', 'Western']
+
+    for cat in category:
+        itemlist.append(Item(title=cat, category=cat, channel=item.channel, action='peliculas', contentType=item.contentType))
+    return support.thumb(itemlist)
+
+
+def peliculas(item, f=None, ):
+    f = getEpg()
+    titles = [item.lastTitle] if not item.titles else item.titles
     itemlist = []
+    pag = item.pag if item.pag else 0
 
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url).data
-    #patron = r'spanTitleMovie">([A-Za-z À-ÖØ-öø-ÿ\-\']*)[a-z \n<>\/="_\-:0-9;A-Z.]*GenresMovie">([\-\'A-Za-z À-ÖØ-öø-ÿ\/]*)[a-z \n<>\/="_\-:0-9;A-Z.%]*src="([a-zA-Z:\/\.0-9?]*)[a-z \n<>\/="_\-:0-9;A-Z.%\-\']*Year">([A-Z 0-9a-z]*)'
-    patron = r'table-cell[;" ]*alt="([^"]+)".*?backdrop" alt="([^"]+)"[ ]*src="([^"]+)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedchannel, scrapedtitle, scrapedthumbnail in matches:
-    # for scrapedthumbnail, scrapedtitle, scrapedtv in matches:
-        scrapedurl = ""
-        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip()
-        infoLabels = {}
-        #infoLabels["year"] = ""
-        infoLabels['title'] = "movie"
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="new_search",
-                 extra=urllib.quote_plus(scrapedtitle) + '{}' + 'movie',
-                 title="[B]" + scrapedtitle + "[/B] - " + scrapedchannel,
-                 fulltitle=scrapedtitle,
-                 mode='all',
-                 search_text=scrapedtitle,
-                 url=scrapedurl,
-                 thumbnail=scrapedthumbnail.replace("?width=320", "?width=640"),
-                 contentTitle=scrapedtitle,
-                 contentType='movie',
-                 infoLabels=infoLabels,
-                 folder=True))
+    channel = ''
+    title = ''
+    episode = ''
+    plot = ''
+    thumbnail = ''
+    actors = []
+    director = ''
+    year = ''
+    genres = []
+    genre = ''
+    country = ''
+    skip = False
 
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    f.seek(pag)
+    line = True
+    while line:
+        line = f.readline()
+        if '<programme' in line:
+            channel = scrapertools.find_single_match(line, r'channel="([^"]+)"')
+        elif '<title' in line:
+            title = scrapertools.find_single_match(line, r'>([^<]+?)(?: - (?:1\s*\^\s*TV|Prima\s*T[Vv]))?<')
+            if not title or title in titles or title == 'EPG non disponibile':
+                skip = True
+        elif not skip and '<desc' in line:
+            genre, episode, plot = scrapertools.find_single_match(line, r'>(?:\[([^\]]+)\])?(S[0-9]+\s*Ep?[0-9]+)?(?:\s*-\s*)?([^<]+)')
+            if plot:
+                CY = scrapertools.find_single_match(plot, r'(\D{3}) (\d{4})')
+                if CY: country, year = CY
+                director = scrapertools.find_single_match(plot, r'Regia di ([^;|<]+)')
+            if episode and item.contentType == 'movie': skip = True
+        elif not skip and '<category' in line:
+            genre = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<actor' in line:
+        #     match = scrapertools.find_single_match(line, r'(?:role="([^"]*)")?>([^<]+)<')
+        #     actors.append([match[1], match[0]])
+        # elif not skip and '<director' in line:
+        #     director = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<date' in line:
+        #     year = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<country' in line:
+        #     country = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<episode-num' in line:
+        #     episode = scrapertools.find_single_match(line, r'>([^<]+)<')
+        #     if item.contentType == 'movie':
+        #         skip = True
+        # elif not skip and '<icon' in line:
+        #     thumbnail = scrapertools.find_single_match(line, r'src="([^"]+)"')
+        elif '</programme' in line:
+            if genre in blacklisted_genres: skip = True
+            elif genre: genres = genre.split('/')
+            if not skip:
+                titles.append(title)
+                if (item.contentType == 'movie' and genres and (item.category in genres or item.all == True)) or (item.contentType == 'tvshow' and episode):
+                    if episode:
+                        episode = scrapertools.get_season_and_episode(episode)
+                        se, ep = episode.split('x')
+                    else:
+                        se, ep = ('', '')
+                    itemlist.append(Item(
+                        channel=item.channel,
+                        action='new_search',
+                        title=support.typo(title + (' - ' + episode if episode else ''), 'bold'),
+                        contentTitle=title if item.contentType == 'movie' else '',
+                        contentSerieName=title if item.contentType == 'tvshow' else '',
+                        contentSeason=se,
+                        contentEpisodeNumber=ep,
+                        fulltitle=title,
+                        search_text=title,
+                        mode=item.contentType,
+                        thumbnail=thumbnail if thumbnail else item.thumbnail,
+                        contentType=item.contentType,
+                        channel_name=channel,
+                        plot=plot,
+                        infoLabels={
+                            'director': director,
+                            'genre': genres,
+                            'country': country,
+                            'year': year,
+                            'season': se,
+                            'episode': ep
+                        }
+                    ))
 
+            channel = ''
+            title = ''
+            episode = ''
+            plot = ''
+            thumbnail = ''
+            actors = []
+            director = ''
+            year = ''
+            genres = []
+            genre = ''
+            country = ''
+            skip = False
+
+            if len(itemlist) >= 40:
+                itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'), pag= f.tell(), thumbnail=support.thumb(), lastTitle=titles[-1]))
+                break
+    support.tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    f.close()
     return itemlist
 
-def now_on_misc(item):
-    logger.info("filmontv tvoggi")
+def listaCanali(item):
     itemlist = []
+    f = getEpg()
+    thumbnail = None
+    skip = False
+    line = True
+    while line:
+        line = f.readline()
+        if '<channel' in line:
+            channelID = scrapertools.find_single_match(line, r'id="([^"]+)"')
+        elif '<display-name' in line:
+            channelName = scrapertools.find_single_match(line, r'>([^<]+)<')
+        elif not skip and '<icon' in line:
+            thumbnail = scrapertools.find_single_match(line, r'src="([^"]+)"')
+        elif not skip and '<programme' in line:
+            break
+        if '</channel' in line:
+            if not skip and thumbnail: #and 'channel="' + channel + '"' in f:
+                itemlist.append(Item(
+                    channel=item.channel,
+                    action='guidatv',
+                    title=support.typo(channelName, 'bold'),
+                    channelID=channelID,
+                    thumbnail=thumbnail
+                ))
+            thumbnail = None
+            skip = False
+    # return itemlist
+    # logger.info([i.title for i in itemlist])
+    f.close()
+    return sorted(itemlist, key=lambda x: x.title)
 
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url).data
-    #patron = r'spanTitleMovie">([A-Za-z À-ÖØ-öø-ÿ\-\']*)[a-z \n<>\/="_\-:0-9;A-Z.]*GenresMovie">([\-\'A-Za-z À-ÖØ-öø-ÿ\/]*)[a-z \n<>\/="_\-:0-9;A-Z.%]*src="([a-zA-Z:\/\.0-9?]*)[a-z \n<>\/="_\-:0-9;A-Z.%\-\']*Year">([A-Z 0-9a-z]*)'
-    patron = r'table-cell[;" ]*alt="([^"]+)".*?backdrop" alt="([^"]+)"[ ]*src="([^"]+)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedchannel, scrapedtitle, scrapedthumbnail in matches:
-    # for scrapedthumbnail, scrapedtitle, scrapedtv in matches:
-        scrapedurl = ""
-        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip()
-        infoLabels = {}
-        infoLabels["year"] = ""
-        infoLabels['tvshowtitle'] = scrapedtitle
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="new_search",
-                 extra=urllib.quote_plus(scrapedtitle) + '{}' + 'tvshow',
-                 title="[B]" + scrapedtitle + "[/B] - " + scrapedchannel,
-                 fulltitle=scrapedtitle,
-                 mode='all',
-                 search_text=scrapedtitle,
-                 url=scrapedurl,
-                 thumbnail=scrapedthumbnail.replace("?width=320", "?width=640"),
-                 contentTitle=scrapedtitle,
-                 contentType='tvshow',
-                 infoLabels=infoLabels,
-                 folder=True))
 
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-    return itemlist
-
-def now_on_tv(item):
-    logger.info("filmontv tvoggi")
+def guidatv(item):
     itemlist = []
+    f = getEpg()
+    days = []
+    for day in range(11, 18):days.append(xbmc.getLocalizedString(day))
 
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url).data.replace('\n','')
-    #patron = r'spanTitleMovie">([A-Za-z À-ÖØ-öø-ÿ\-\']*)[a-z \n<>\/="_\-:0-9;A-Z.]*GenresMovie">([\-\'A-Za-z À-ÖØ-öø-ÿ\/]*)[a-z \n<>\/="_\-:0-9;A-Z.%]*src="([a-zA-Z:\/\.0-9?]*)[a-z \n<>\/="_\-:0-9;A-Z.%\-\']*Year">([A-Z 0-9a-z]*)'
-    patron = r'alt="([a-zA-Z 0-9]*)".*?spanMovieDuration">([^<]+).*?spanTitleMovie">([A-Za-z ,0-9\.À-ÖØ-öø-ÿ\-\']*).*?GenresMovie">([\-\'A-Za-z À-ÖØ-öø-ÿ\/]*).*?src="([a-zA-Z:\/\.0-9?]*).*?Year">([A-Z 0-9a-z]*)'    
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedchannel, scrapedduration, scrapedtitle, scrapedgender, scrapedthumbnail, scrapedyear in matches:
-    # for scrapedthumbnail, scrapedtitle, scrapedtv in matches:
-        scrapedurl = ""
-        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip()
-        infoLabels = {}
-        infoLabels["year"] = scrapedyear
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="new_search",
-                 extra=urllib.quote_plus(scrapedtitle) + '{}' + 'movie',
-                 title="[B]" + scrapedtitle + "[/B] - " + scrapedchannel + " - " + scrapedduration,
-                 fulltitle="[B]" + scrapedtitle + "[/B] - " + scrapedchannel+ " - " + scrapedduration,
-                 url=scrapedurl,
-                 mode='all',
-                 search_text=scrapedtitle,
-                 thumbnail=scrapedthumbnail.replace("?width=240", "?width=480"),
-                 contentTitle=scrapedtitle,
-                 contentType='movie',
-                 infoLabels=infoLabels,
-                 folder=True))
+    channel = ''
+    title = ''
+    episode = ''
+    plot = ''
+    thumbnail = ''
+    actors = []
+    director = ''
+    year = ''
+    genres = []
+    country = ''
+    start = ''
+    stop = ''
+    skip = False
 
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    line = True
+    while line:
+        line = f.readline()
+        if '<programme' in line:
+            start, stop, channel = scrapertools.find_single_match(line,r'start="([^"]*)" stop="([^"]*)" channel="([^"]+)"')
+            if channel != item.channelID:
+                skip = True
+        elif not skip and '<title' in line:
+            title = scrapertools.find_single_match(line, r'>([^<]+?)<')
+            if title == 'EPG non disponibile':
+                skip = True
+        elif not skip and '<desc' in line:
+            genre, episode, plot = scrapertools.find_single_match(line, r'>(?:\[([^\]]+)\])?(S[0-9]+\s*Ep?[0-9]+)?(?:\s*-\s*)?([^<]+)')
+            if plot:
+                CY = scrapertools.find_single_match(plot, r'(\D{3}) (\d{4})')
+                if CY: country, year = CY
+                director = scrapertools.find_single_match(plot, r'Regia di ([^;|<]+)')
+            if genre: genres.append(genre)
+            if episode and item.contentType == 'movie':skip = True
+        elif not skip and '<category' in line:
+            genre = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<actor' in line:
+        #     match = scrapertools.find_single_match(line, r'(?:role="([^"]*)")?>([^<]+)<')
+        #     actors.append([match[1], match[0]])
+        # elif not skip and '<director' in line:
+        #     director = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<date' in line:
+        #     year = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<category' in line:
+        #     genres.append(scrapertools.find_single_match(line, r'>([^<]+)<'))
+        # elif not skip and '<country' in line:
+        #     country = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<episode-num' in line:
+        #     episode = scrapertools.find_single_match(line, r'>([^<]+)<')
+        # elif not skip and '<icon' in line:
+        #     thumbnail = scrapertools.find_single_match(line, r'src="([^"]+)"')
+        elif '</programme' in line:
+            if not skip:
+                if genre: genres = genre.split('/')
+                tzHour = int(start.split('+')[1][:2])
+                start = time.strptime(start.split(' ')[0], '%Y%m%d%H%M%S')
+                stop = time.strptime(stop.split(' ')[0], '%Y%m%d%H%M%S')
+                duration = days[start.tm_wday] + ' alle ' + str(start.tm_hour + tzHour).zfill(2) + ':' + str(start.tm_min).zfill(2) + ' - ' + str(stop.tm_hour + tzHour).zfill(2) + ':' + str(stop.tm_min).zfill(2) + ' - '
+                itemlist.append(Item(
+                    channel=item.channel,
+                    action='new_search',
+                    title=duration + support.typo(title + (' - ' + episode if episode else ''), 'bold'),
+                    fulltitle=title,
+                    search_text=title,
+                    mode=item.contentType,
+                    thumbnail=thumbnail if thumbnail else item.thumbnail,
+                    contentType=item.contentType,
+                    channel_name=channel,
+                    infoLabels={
+                        'title': title,
+                        'plot': plot,
+                        'castandrole': actors,
+                        'director': director,
+                        'genre': genres,
+                        'country': country,
+                        'year': year
+                    }
+                ))
 
+            channel = ''
+            title = ''
+            episode = ''
+            plot = ''
+            thumbnail = ''
+            actors = []
+            director = ''
+            year = ''
+            genres = []
+            country = ''
+            start = ''
+            stop = ''
+            skip = False
+    f.close()
     return itemlist
 
-def primafila(item):
-    logger.info("filmontv tvoggi")
-    itemlist = []
-
-    # Carica la pagina 
-    data = httptools.downloadpage(item.url).data
-    #patron = r'spanTitleMovie">([A-Za-z À-ÖØ-öø-ÿ]*)[a-z \n<>\/="_\-:0-9;A-Z.]*GenresMovie">([A-Za-z À-ÖØ-öø-ÿ\/]*)[a-z \n<>\/="_\-:0-9;A-Z.%]*src="([a-zA-Z:\/\.0-9?=]*)'
-    patron = r'spanTitleMovie">([A-Za-z À-ÖØ-öø-ÿ\-\']*)[a-z \n<>\/="_\-:0-9;A-Z.]*GenresMovie">([\-\'A-Za-z À-ÖØ-öø-ÿ\/]*)[a-z \n<>\/="_\-:0-9;A-Z.%]*src="([a-zA-Z:\/\.0-9?]*)[a-z \n<>\/="_\-:0-9;A-Z.%\-\']*Year">([A-Z 0-9a-z]*)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedtitle, scrapedgender, scrapedthumbnail, scrapedyear in matches:
-    # for scrapedthumbnail, scrapedtitle, scrapedtv in matches:
-        scrapedurl = ""
-        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip()
-        infoLabels = {}
-        infoLabels["year"] = scrapedyear
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="new_search",
-                 extra=urllib.quote_plus(scrapedtitle) + '{}' + 'movie',
-                 title=scrapedtitle,
-                 fulltitle=scrapedtitle,
-                 url=scrapedurl,
-                 mode='all',
-                 search_text=scrapedtitle,
-                 thumbnail=scrapedthumbnail.replace("?width=240", "?width=480"),
-                 contentTitle=scrapedtitle,
-                 contentType='movie',
-                 infoLabels=infoLabels,
-                 folder=True))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-    return itemlist
 
 def new_search(item):
     from specials import search
-    return search.new_search(item)
+    item.channel = 'search'
+    # se risultato certo, vai dritto alla ricerca per id
+    if item.infoLabels['tmdb_id']:
+        return search.channel_search(item)
+    else:
+        return search.new_search(item)
+
+
+def live(item):
+    itemlist = []
+    from channels import raiplay#, mediasetplay
+    itemlist += raiplay.live(raiplay.mainlist(Item())[0])
+    # itemlist += mediasetplay.live(mediasetplay.mainlist(Item())[0])
+    return itemlist
diff --git a/specials/filtertools.py b/specials/filtertools.py
index 8dae6e0d..c03ffe28 100644
--- a/specials/filtertools.py
+++ b/specials/filtertools.py
@@ -288,10 +288,6 @@ def get_links(list_item, item, list_language, list_quality=None, global_filter_l
 
     second_lang = config.get_setting('second_language')
 
-    # Sort by favorite servers, delete blacklist servers and disabled
-    from core import servertools
-    list_item= servertools.filter_servers(list_item)
-
     logger.debug("total de items : %s" % len(list_item))
 
     new_itemlist = []
diff --git a/specials/news.py b/specials/news.py
index f4a4b225..870731df 100644
--- a/specials/news.py
+++ b/specials/news.py
@@ -124,7 +124,7 @@ def set_category_context(item):
                      "extra": item.extra,
                      "action": "setting_channel",
                      "channel": item.channel}]
-    item.category = config.get_localized_string(60679) % item.extra
+    item.category = config.get_localized_string(60679) % re.sub('\[[^\]]+\]','',item.title).strip()
 
 
 def get_channels_list():
diff --git a/specials/nextep.py b/specials/nextep.py
deleted file mode 100644
index b8f5945c..00000000
--- a/specials/nextep.py
+++ /dev/null
@@ -1,207 +0,0 @@
-# -*- coding: utf-8 -*-
-import xbmc, xbmcgui
-from platformcode import config, platformtools
-from time import time, sleep
-from core import jsontools, filetools
-from core.support import log
-from core.item import Item
-from platformcode.launcher import play_from_library
-
-import sys
-if sys.version_info[0] >= 3:
-    from concurrent import futures
-else:
-    from concurrent_py2 import futures
-
-next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml']
-next_ep_type = config.get_setting('next_ep_type')
-
-# compatibility with previous version
-if type(next_ep_type) == bool:
-    ND = 'NextDialogCompact.xml' if config.get_setting('next_ep_type') else 'NextDialog.xml'
-else:
-    ND = next_dialogs[next_ep_type]
-
-def check(item):
-    return True if config.get_setting('next_ep') > 0 and item.contentType != 'movie' else False
-
-
-def return_item(item):
-    log()
-    with futures.ThreadPoolExecutor() as executor:
-        future = executor.submit(next_ep, item)
-        item = future.result()
-    return item
-
-def run(item):
-    log()
-    with futures.ThreadPoolExecutor() as executor:
-        future = executor.submit(next_ep, item)
-        item = future.result()
-    if item.next_ep:
-        return play_from_library(item)
-
-
-def videolibrary(item):
-    from threading import Thread
-    item.videolibrary = True
-    Thread(target=next_ep, args=[item]).start()
-
-
-def next_ep(item):
-    log()
-    condition = config.get_setting('next_ep')
-    item.next_ep = False
-    item.show_server = True
-
-    VL = True if item.videolibrary else False
-
-    time_over = False
-    time_limit = time() + 30
-    time_setting = config.get_setting('next_ep_seconds')
-    TimeFromEnd = time_setting
-
-    # wait until the video plays
-    while not platformtools.is_playing() and time() < time_limit:
-        sleep(1)
-
-    while platformtools.is_playing() and not time_over:
-        try:
-            Total = xbmc.Player().getTotalTime()
-            Actual = xbmc.Player().getTime()
-            Difference = Total - Actual
-            if Total > TimeFromEnd >= Difference:
-                time_over = True
-        except:
-            break
-
-    if time_over:
-        if condition == 1: # hide server afther x second
-            item.show_server = False
-        elif condition == 2: # play next file if exist
-
-            # check if next file exist
-            current_filename = filetools.basename(item.strm_path)
-            base_path = filetools.basename(filetools.dirname(item.strm_path))
-            path = filetools.join(config.get_videolibrary_path(), config.get_setting("folder_tvshows"),base_path)
-            fileList = []
-            for file in filetools.listdir(path):
-                if file.endswith('.strm'):
-                    fileList.append(file)
-
-            fileList.sort()
-
-            nextIndex = fileList.index(current_filename) + 1
-            if nextIndex == 0 or nextIndex == len(fileList):
-                next_file = None
-            else:
-                next_file = fileList[nextIndex]
-                log('Next File:', next_file)
-
-            # start next episode window afther x time
-            if next_file:
-                season_ep = next_file.split('.')[0]
-                season = season_ep.split('x')[0]
-                episode = season_ep.split('x')[1]
-                next_ep = '%sx%s' % (season, episode)
-                item = Item(
-                    action= 'play_from_library',
-                    channel= 'videolibrary',
-                    contentEpisodeNumber= episode,
-                    contentSeason= season,
-                    contentTitle= next_ep,
-                    contentType= 'episode',
-                    infoLabels= {'episode': episode, 'mediatype': 'episode', 'season': season, 'title': next_ep},
-                    strm_path= filetools.join(base_path, next_file))
-
-                global INFO
-                INFO = filetools.join(path, next_file.replace("strm", "nfo"))
-                log('Next Info:',INFO)
-
-                nextDialog = NextDialog(ND, config.get_runtime_path())
-                nextDialog.show()
-                while platformtools.is_playing() and not nextDialog.is_still_watching():
-                    xbmc.sleep(100)
-                    pass
-
-                nextDialog.close()
-                log('Next Episode:', nextDialog.stillwatching)
-
-                if nextDialog.stillwatching or nextDialog.continuewatching:
-                    item.next_ep = True
-                    xbmc.Player().stop()
-                    if VL:
-                        sleep(1)
-                        xbmc.executebuiltin('Action(Back)')
-                        sleep(0.5)
-                        return play_from_library(item)
-                else:
-                    item.show_server = False
-                    if VL:
-                        sleep(1)
-                        xbmc.executebuiltin('Action(Back)')
-                        sleep(0.5)
-                        return None
-
-    return item
-
-
-class NextDialog(xbmcgui.WindowXMLDialog):
-    item = None
-    cancel = False
-    stillwatching = False
-    continuewatching = True
-
-    def __init__(self, *args, **kwargs):
-        log()
-        self.action_exitkeys_id = [xbmcgui.ACTION_STOP, xbmcgui.ACTION_BACKSPACE, xbmcgui.ACTION_PREVIOUS_MENU, xbmcgui.ACTION_NAV_BACK]
-        self.progress_control = None
-
-        # set info
-        f = filetools.file_open(INFO, 'r')
-        full_info = f.read().split('\n')
-        full_info = full_info[1:]
-        f.close()
-        full_info = "".join(full_info)
-        info = jsontools.load(full_info)
-        info = info["infoLabels"]
-        self.setProperty("title", info["tvshowtitle"])
-        self.setProperty("ep_title", "%dx%02d - %s" % (info["season"], info["episode"], info["title"]))
-        if "episodio_imagen" in info:
-            img = info["episodio_imagen"]
-        else:
-            img = filetools.join(config.get_runtime_path(), "resources", "noimage.png")
-        self.setProperty("next_img", img)
-
-    def set_still_watching(self, stillwatching):
-        self.stillwatching = stillwatching
-
-    def set_continue_watching(self, continuewatching):
-        self.continuewatching = continuewatching
-
-    def is_still_watching(self):
-        return self.stillwatching
-
-    def onFocus(self, controlId):
-        pass
-
-    def doAction(self):
-        pass
-
-    def closeDialog(self):
-        self.close()
-
-    def onClick(self, controlId):
-        if controlId == 3012:  # Still watching
-            self.set_still_watching(True)
-            self.set_continue_watching(False)
-            self.close()
-        elif controlId == 3013:  # Cancel
-            self.set_continue_watching(False)
-            self.close()
-
-    def onAction(self, action):
-        log()
-        if action in self.action_exitkeys_id:
-            self.set_continue_watching(False)
-            self.close()
diff --git a/specials/search.py b/specials/search.py
index 0b2fa194..4b38c996 100644
--- a/specials/search.py
+++ b/specials/search.py
@@ -520,7 +520,7 @@ def setting_channel_new(item):
                 preselect.append(i)
 
     # Dialog to select
-    ret = xbmcgui.Dialog().multiselect(config.get_localized_string(59994), lista, preselect=preselect, useDetails=True)
+    ret = platformtools.dialog_multiselect(config.get_localized_string(59994), lista, preselect=preselect, useDetails=True)
     if not ret:
         return False  # order cancel
     seleccionados = [ids[i] for i in ret]
diff --git a/specials/setting.py b/specials/setting.py
index 1a886e70..86e6c53e 100644
--- a/specials/setting.py
+++ b/specials/setting.py
@@ -292,52 +292,42 @@ def server_debrid_config(item):
 
 def servers_blacklist(item):
     server_list = servertools.get_servers_list()
-    dict_values = {}
+    blacklisted = []
+
+    list_controls = []
+    list_servers = []
 
-    list_controls = [{"id": "filter_servers",
-                      "type": "bool",
-                      "label": "@30068",
-                      "default": False,
-                      "enabled": True,
-                      "visible": True}]
-    dict_values['filter_servers'] = config.get_setting('filter_servers')
-    if dict_values['filter_servers'] == None:
-        dict_values['filter_servers'] = False
     for i, server in enumerate(sorted(server_list.keys())):
         server_parameters = server_list[server]
-        controls, defaults = servertools.get_server_controls_settings(server)
-        dict_values[server] = config.get_setting("black_list", server=server)
+        defaults = servertools.get_server_parameters(server)
+
+        control = server_parameters["name"]
+        # control.setArt({'thumb:': server_parameters['thumb'] if 'thumb' in server_parameters else config.get_online_server_thumb(server)})
+        if defaults.get("black_list", False) or config.get_setting("black_list", server=server):
+            blacklisted.append(i)
 
-        control = {"id": server,
-                   "type": "bool",
-                   "label": '    %s' % server_parameters["name"],
-                   "default": defaults.get("black_list", False),
-                   "enabled": "eq(-%s,True)" % (i + 1),
-                   "visible": True}
         list_controls.append(control)
-
-    return platformtools.show_channel_settings(list_controls=list_controls, dict_values=dict_values,
-                                               caption=config.get_localized_string(60550), callback="cb_servers_blacklist")
+        list_servers.append(server)
+    ris = platformtools.dialog_multiselect(config.get_localized_string(60550), list_controls, preselect=blacklisted)
+    if ris is not None:
+        cb_servers_blacklist({list_servers[n]: True if n in ris else False for n, it in enumerate(list_controls)})
+    # return platformtools.show_channel_settings(list_controls=list_controls, dict_values=dict_values, caption=config.get_localized_string(60550), callback="cb_servers_blacklist")
 
 
-def cb_servers_blacklist(item, dict_values):
-    f = False
+def cb_servers_blacklist(dict_values):
+    blaklisted = []
     progreso = platformtools.dialog_progress(config.get_localized_string(60557), config.get_localized_string(60558))
     n = len(dict_values)
     i = 1
     for k, v in list(dict_values.items()):
-        if k == 'filter_servers':
-            config.set_setting('filter_servers', v)
-        else:
-            config.set_setting("black_list", v, server=k)
-            if v:  # If the server is blacklisted it cannot be in the favorites list
-                config.set_setting("favorites_servers_list", 100, server=k)
-                f = True
-                progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % k)
+        config.set_setting("black_list", v, server=k)
+        if v:  # If the server is blacklisted it cannot be in the favorites list
+            config.set_setting("favorites_servers_list", 0, server=k)
+            blaklisted.append(k)
+            f = True
+            progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % k)
         i += 1
-
-    if not f:  # If there is no server in the list, deactivate it
-        config.set_setting('filter_servers', False)
+    config.set_setting("black_list", blaklisted, server='servers')
 
     progreso.close()
 
@@ -347,12 +337,19 @@ def servers_favorites(item):
     dict_values = {}
 
     list_controls = [{'id': 'favorites_servers',
-                      'type': "bool",
+                      'type': 'bool',
                       'label': config.get_localized_string(60577),
                       'default': False,
                       'enabled': True,
+                      'visible': True},
+                     {'id': 'quality_priority',
+                      'type': 'bool',
+                      'label': config.get_localized_string(30069),
+                      'default': False,
+                      'enabled': 'eq(-1,True)',
                       'visible': True}]
     dict_values['favorites_servers'] = config.get_setting('favorites_servers')
+    dict_values['quality_priority'] = config.get_setting('quality_priority')
     if dict_values['favorites_servers'] == None:
         dict_values['favorites_servers'] = False
 
@@ -369,13 +366,13 @@ def servers_favorites(item):
         if orden > 0:
             dict_values[orden] = len(server_names) - 1
 
-    for x in range(1, 6):
+    for x in range(1, 12):
         control = {'id': x,
-                   'type': "list",
+                   'type': 'list',
                    'label': config.get_localized_string(60597) % x,
                    'lvalues': server_names,
                    'default': 0,
-                   'enabled': "eq(-%s,True)" % x,
+                   'enabled': 'eq(-%s,True)' % str(x + 1),
                    'visible': True}
         list_controls.append(control)
 
@@ -385,11 +382,14 @@ def servers_favorites(item):
 
 def cb_servers_favorites(server_names, dict_values):
     dict_name = {}
+    dict_favorites = {}
     progreso = platformtools.dialog_progress(config.get_localized_string(60557), config.get_localized_string(60558))
 
     for i, v in list(dict_values.items()):
         if i == "favorites_servers":
             config.set_setting("favorites_servers", v)
+        elif i == "quality_priority":
+            config.set_setting("quality_priority", v)
         elif int(v) > 0:
             dict_name[server_names[v]] = int(i)
 
@@ -398,12 +398,20 @@ def cb_servers_favorites(server_names, dict_values):
     i = 1
     for server, server_parameters in servers_list:
         if server_parameters['name'] in list(dict_name.keys()):
+            dict_favorites[dict_name[server_parameters['name']]] = server
             config.set_setting("favorites_servers_list", dict_name[server_parameters['name']], server=server)
         else:
             config.set_setting("favorites_servers_list", 0, server=server)
         progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % server_parameters['name'])
         i += 1
 
+    c = 2
+    favorites_servers_list = []
+    while c in dict_favorites:
+        favorites_servers_list.append(dict_favorites[c])
+        c += 1
+    config.set_setting("favorites_servers_list", favorites_servers_list, server='servers')
+
     if not dict_name:  # If there is no server in the list, deactivate it
         config.set_setting("favorites_servers", False)
 
@@ -716,7 +724,7 @@ def channels_onoff(item):
 
     # Dialog to select
     # ------------------------
-    ret = xbmcgui.Dialog().multiselect(config.get_localized_string(60545), lista, preselect=preselect, useDetails=True)
+    ret = platformtools.dialog_multiselect(config.get_localized_string(60545), lista, preselect=preselect, useDetails=True)
     if ret == None: return False # order cancel
     seleccionados = [ids[i] for i in ret]
 
diff --git a/specials/videolibrary.json b/specials/videolibrary.json
index 20d3056f..67036c14 100644
--- a/specials/videolibrary.json
+++ b/specials/videolibrary.json
@@ -209,21 +209,6 @@
       "enabled": true,
       "visible": true
     },
-    {
-      "id": "watched_setting",
-      "type": "list",
-      "label": "@60635",
-      "default": 3,
-      "visible": true,
-      "enabled": "eq(-1,true)",
-      "lvalues": [
-        "5 min",
-        "30%",
-        "50%",
-        "80%",
-        "@60636"
-      ]
-    },
     {
       "id": "sync_trakt",
       "type": "label",
diff --git a/specials/videolibrary.py b/specials/videolibrary.py
index 07ed8c9c..08790bfb 100644
--- a/specials/videolibrary.py
+++ b/specials/videolibrary.py
@@ -78,7 +78,7 @@ def list_movies(item, silent=False):
                 # Verify the existence of the channels. If the channel does not exist, ask yourself if you want to remove the links from that channel.
 
                 for canal_org in new_item.library_urls:
-                    canal = generictools.verify_channel(canal_org)
+                    canal = canal_org
                     try:
                         if canal in ['community', 'downloads']:
                             channel_verify = __import__('specials.%s' % canal, fromlist=["channels.%s" % canal])
@@ -202,7 +202,6 @@ def list_tvshows(item):
                 # Verify the existence of the channels. If the channel does not exist, ask yourself if you want to remove the links from that channel.
 
                 for canal in item_tvshow.library_urls:
-                    canal = generictools.verify_channel(canal)
                     try:
                         if canal in ['community', 'downloads']:
                             channel_verify = __import__('specials.%s' % canal, fromlist=["channels.%s" % canal])
@@ -339,7 +338,7 @@ def configure_update_videolibrary(item):
             preselect.append(i)
 
     # Select Dialog
-    ret = xbmcgui.Dialog().multiselect(config.get_localized_string(60601), lista, preselect=preselect, useDetails=True)
+    ret = platformtools.dialog_multiselect(config.get_localized_string(60601), lista, preselect=preselect, useDetails=True)
     if ret < 0:
         return False  # order cancel
     seleccionados = [ids[i] for i in ret]
@@ -567,6 +566,7 @@ def findvideos(item):
 
         item_json = Item().fromjson(filetools.read(json_path))
         list_servers = []
+        # from core.support import dbg;dbg()
 
         try:
             # FILTERTOOLS
@@ -578,12 +578,14 @@ def findvideos(item):
 
             # We run find_videos, from the channel or common
             item_json.contentChannel = 'videolibrary'
+            item_json.play_from = item.play_from
+            item_json.nfo = item.nfo
+            item_json.strm_path = item.strm_path
             if hasattr(channel, 'findvideos'):
                 from core import servertools
                 if item_json.videolibray_emergency_urls:
                     del item_json.videolibray_emergency_urls
                 list_servers = getattr(channel, 'findvideos')(item_json)
-                list_servers = servertools.filter_servers(list_servers)
             elif item_json.action == 'play':
                 from platformcode import platformtools
                 # autoplay.set_status(True)
@@ -625,10 +627,7 @@ def findvideos(item):
 
     if autoplay.play_multi_channel(item, itemlist):  # hideserver
         return []
-    from inspect import stack
-    from specials import nextep
-    if nextep.check(item) and stack()[1][3] == 'run':
-        nextep.videolibrary(item)
+
     add_download_items(item, itemlist)
     return itemlist
 
diff --git a/tests.py b/tests.py
new file mode 100644
index 00000000..b541662d
--- /dev/null
+++ b/tests.py
@@ -0,0 +1,216 @@
+# -*- coding: utf-8 -*-
+import os
+import sys
+import unittest
+import parameterized
+
+from platformcode import config
+
+librerias = os.path.join(config.get_runtime_path(), 'lib')
+sys.path.insert(0, librerias)
+from core.support import typo
+from core.item import Item
+import channelselector
+from core import servertools
+import re
+
+validUrlRegex = re.compile(
+    r'^(?:http|ftp)s?://'  # http:// or https://
+    r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|'  # domain...
+    r'localhost|'  # localhost...
+    r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'  # ...or ip
+    r'(?::\d+)?'  # optional port
+    r'(?:/?|[/?]\S+)$', re.IGNORECASE)
+
+chBlackList = ['url']
+chNumRis = {
+    'altadefinizione01': {
+        'Film': 20
+    },
+    'altadefinizione01_link': {
+        'Film': 16,
+        'Serie TV': 16,
+    },
+    'altadefinizioneclick': {
+        'Film': 36,
+        'Serie TV': 12,
+    },
+    'casacinema': {
+        'Film': 10,
+        'Serie TV': 10,
+    },
+    'cineblog01': {
+        'Film': 12,
+        'Serie TV': 13
+    },
+    'cinemalibero': {
+        'Film': 20,
+        'Serie TV': 20,
+    },
+    'cinetecadibologna': {
+        'Film': 10
+    },
+    'eurostreaming': {
+        'Serie TV': 18
+    },
+    'Filmpertutti': {
+        'Film': 24,
+        'Serie TV': 24,
+    },
+    'guardaSerie TVclick': {
+        'da controllare': 0
+    },
+    'hd4me': {
+        'Film': 10
+    },
+    'ilgeniodellostreaming': {
+        'Film': 30,
+        'Serie TV': 30
+    },
+    'italiaserie': {
+        'Serie TV': 20
+    },
+    'casacinemaInfo': {
+        'Film': 150
+    },
+    'netfreex': {
+        'Film': 30,
+        'Serie TV': 30
+    },
+    'piratestreaming': {
+        'Film': 24,
+        'Serie TV': 24
+    },
+    'polpotv': {
+        'Film': 12,
+        'Serie TV': 12
+    },
+    'streamingaltadefinizione': {
+        'Film': 30,
+        'Serie TV': 30
+    },
+    'seriehd': {
+        'Serie TV': 12
+    },
+    'serietvonline': {
+        'Film': 35,
+        'Serie TV': 35
+    },
+    'tantifilm': {
+        'Film': 20,
+        'Serie TV': 20
+    },
+}
+
+
+def getChannels():
+    channel_list = channelselector.filterchannels("all")
+    ret = []
+    for chItem in channel_list:
+        ch = chItem.channel
+        if ch not in chBlackList:
+            ret.append({'ch': ch})
+    return ret
+
+
+from specials import news
+
+dictNewsChannels, any_active = news.get_channels_list()
+
+srvLinkDict = {
+    "wstream": ["https://wstream.video/video6zvimpy52/dvvwxyfs32ab"],
+    "akvideo": ["https://akvideo.stream/video.php?file_code=23god95lrtqv"]
+}
+
+
+def getServers():
+    server_list = servertools.get_servers_list()
+    ret = []
+    for srv in server_list:
+        if srv in srvLinkDict:
+            ret.append({'srv': srv})
+    return ret
+
+
+@parameterized.parameterized_class(getChannels())
+class GenericChannelTest(unittest.TestCase):
+    def __init__(self, *args):
+        self.module = __import__('channels.%s' % self.ch, fromlist=["channels.%s" % self.ch])
+        super(GenericChannelTest, self).__init__(*args)
+
+    def test_menuitems(self):
+        hasChannelConfig = False
+        mainlist = self.module.mainlist(Item())
+        self.assertTrue(mainlist, 'channel ' + self.ch + ' has no menu')
+
+        for it in mainlist:
+            it.title = it.title.decode('ascii', 'ignore')
+            if it.action == 'channel_config':
+                hasChannelConfig = True
+                continue
+            if it.action == 'search':  # channel specific
+                continue
+            itemlist = getattr(self.module, it.action)(it)
+            self.assertTrue(itemlist, 'channel ' + self.ch + ' -> ' + it.title + ' is empty')
+            if self.ch in chNumRis:  # so a priori quanti risultati dovrebbe dare
+                for content in chNumRis[self.ch]:
+                    if content in it.title:
+                        risNum = len(itemlist) - 1  # - nextpage
+                        self.assertEqual(chNumRis[self.ch][content], risNum,
+                                         'channel ' + self.ch + ' -> ' + it.title + ' returned wrong number of results')
+                        break
+
+            for resIt in itemlist:
+                self.assertLess(len(resIt.fulltitle), 100,
+                                'channel ' + self.ch + ' -> ' + it.title + ' might contain wrong titles\n' + resIt.fulltitle)
+                if resIt.url:
+                    self.assertIsNotNone(re.match(validUrlRegex, resIt.url),
+                                         'channel ' + self.ch + ' -> ' + it.title + ' -> ' + resIt.title + ' might contain wrong url\n' + resIt.url)
+                if 'year' in resIt.infoLabels and resIt.infoLabels['year']:
+                    msgYear = 'channel ' + self.ch + ' -> ' + it.title + ' might contain wrong infolabels year\n' + str(
+                        resIt.infoLabels['year'])
+                    self.assert_(type(resIt.infoLabels['year']) is int or resIt.infoLabels['year'].isdigit(), msgYear)
+                    self.assert_(int(resIt.infoLabels['year']) > 1900 and int(resIt.infoLabels['year']) < 2100, msgYear)
+
+                if resIt.title == typo(config.get_localized_string(30992), 'color kod bold'):  # next page
+                    nextPageItemlist = getattr(self.module, resIt.action)(resIt)
+                    self.assertTrue(nextPageItemlist,
+                                    'channel ' + self.ch + ' -> ' + it.title + ' has nextpage not working')
+        self.assertTrue(hasChannelConfig, 'channel ' + self.ch + ' has no channel config')
+
+    def test_newest(self):
+        for cat in dictNewsChannels:
+            for ch in dictNewsChannels[cat]:
+                if self.ch == ch[0]:
+                    itemlist = self.module.newest(cat)
+                    self.assertTrue(itemlist, 'channel ' + self.ch + ' returned no news for category ' + cat)
+                    break
+
+
+#
+# @parameterized.parameterized_class(getServers())
+# class GenericServerTest(unittest.TestCase):
+#     def __init__(self, *args):
+#         self.module = __import__('servers.%s' % self.srv, fromlist=["servers.%s" % self.srv])
+#         super(GenericServerTest, self).__init__(*args)
+#
+#     def test_resolve(self):
+#         for link in srvLinkDict[self.srv]:
+#             find = servertools.findvideosbyserver(link, self.srv)
+#             self.assertTrue(find, 'link ' + link + ' not recognised')
+#             page_url = find[0][1]
+#             if self.module.test_video_exists(page_url)[0]:
+#                 urls = self.module.get_video_url(page_url)
+#                 print urls
+#                 for u in urls:
+#                     directUrl, headersUrl = u[1].split('|')
+#                     headers = {}
+#                     for name in headersUrl.split('&'):
+#                         h, v = name.split('=')
+#                         headers[h] = v
+#                     print headers
+#                     self.assertEqual(requests.head(directUrl, headers=headers, timeout=15).status_code, 200, self.srv + ' scraper did not return valid url for link ' + link)
+
+if __name__ == '__main__':
+    config.set_setting('tmdb_active', False)
+    unittest.main()