diff --git a/.github/ISSUE_TEMPLATE/test-canale.md b/.github/ISSUE_TEMPLATE/test-canale.md
deleted file mode 100644
index e00347dd..00000000
--- a/.github/ISSUE_TEMPLATE/test-canale.md
+++ /dev/null
@@ -1,228 +0,0 @@
----
-name: Test Canale
-about: Pagina per il test di un canale
-title: ''
-labels: Test Canale
-assignees: ''
-
----
-
-Di ogni test mantieni la voce dell'esito e cancella le altre, dove occorre aggiungi informazioni. Specifica, dove possibile, il tipo di problema che incontri in quel test.
-Se hai suggerimenti/consigli/dubbi sui test...Proponili e/o chiedi!
- 
-***
-
-Test N°.1: Lista Canali
-
-Cosa serve: il file .json
-
-1. Verifica del canale nelle sezioni indicate nel file .json, voce "categories".
-
-- [ ] Tutte
-- [ ] Alcune - Indicare le sezioni dove manca il canale
-- [ ] Nessuna - Voce Canale mancante nella lista. In questo caso non puoi continuare il test.
-
-2. Icone del canale [ ]
-
-- [ ] Presenti
-- [ ] Non Presenti
-
-***
-
-Test N°.2: Configura Canale 
-
-1. Presenza della voce "Configura Canale"
-
-- [Si] 
-- [No]
-
-2. Voci presenti in Configura Canale
-
-a. Cerca Informazioni extra (Default: Attivo)
-
-- [Si] 
-- [No]
-
-b. Includi in Novità (Default: Attivo)
-
-- [Si] 
-- [No]
-
-c. Includi in Novità - Italiano (Default: Attivo)
-
-- [Si] 
-- [No]
-
-d. Includi in ricerca globale (Default: Attivo)
-
-- [Si] 
-- [No]
-
-e. Verifica se i link esistono (Default: Attivo)
-
-- [Si] 
-- [No]
-
-f. Numero de link da verificare (Default: 10)
-
-- [Si] 
-- [No]
-
-g. Mostra link in lingua (Default: Non filtrare)
-
-- [Si] 
-- [No]
-
-***
-
-Test N°.3: Voci menu nella pagina del Canale
-
-1. Configurazione Autoplay
-
-- [Si] 
-- [No]
-
-2. Configurazione Canale
-
-- [Si] 
-- [No]
-
-***
-
-Test N°.4: Confronto Sito - Pagina Canale
-
-Cosa serve: il file .py, consultare la def mainlist()
-
-Promemoria: 
-della mainlist la struttura è:
-
-( 'Voce menu1', ['/url/', etc, etc])
-( 'Voce menu2', ['', etc, etc])
-Dove url è una stringa aggiuntiva da aggiungere all'url principale, se in url appare '' allora corrisponde all'indirizzo principale del sito.
-
-Questo Test confronta i titoli che trovi accedendo alle voci di menu del canale con quello che vedi nella corrispettiva pagina del sito.
-
-- [Voce menu con problemi - Tipo di problema] ( copiare per tutte le voci che non hanno corrispondenza )
-Tipo di problema = mancano dei titoli, i titoli sono errati, ai titoli corrispondono locandine errate o altro
-
-
-I test successivi sono divisi a seconda si tratta di film, serie tv o anime.
-Cancella le sezioni non interessate dal canale. Verificale dalla voce "categories" del file .json.
-
-**Sezione FILM
-
-Test da effettuare mentre sei nella pagina dei titoli. Per ogni titolo verfica ci siano le voci nel menu contestuale.
-
-1. Aggiungi Film in videoteca
-
-- [Si] 
-- [No]
-
-Aggiungi 2-3 titoli in videoteca. Verificheremo successivamente la videoteca.
-- [Aggiunti correttamente]
-- [Indica eventuali problemi] (copia-incolla per tutti i titoli con cui hai avuto il problema)
-
-2. Scarica Film
-
-- [Si] 
-- [No]
-
-3. Paginazione ( cliccare sulla voce "Successivo" e verifica la 2° pagina nello stesso modo in cui lo hai fatto per la 1°)
-
-- [Ok] 
-- [X - indica il tipo di problema]
-
-4. Cerca o Cerca Film...
-Cerca un titolo a caso in KOD e lo stesso titolo sul sito. Confronta i risultati.
-
-- [Ok]
-- [X - indica il tipo di problema]
-
-5. Entra nella pagina del titolo, verifica che come ultima voce ci sia "Aggiungi in videoteca":
-
-- [Si, appare]
-- [Non appare]
-
-6. Eventuali problemi riscontrati
-- [ scrivi qui il problema/i ]
-
-**Sezione Serie TV
-
-Test da effettuare mentre sei nella pagina dei titoli. Per ogni titolo verfica ci siano le voci nel menu contestuale.
-
-1. Aggiungi Serie in videoteca
-
-- [Si] 
-- [No]
-
-2. Aggiungi 2-3 titoli in videoteca. Verificheremo successivamente la videoteca.
-- [Aggiunti correttamente]
-- [Indica eventuali problemi] (copia-incolla per tutti i titoli con cui hai avuto il problema)
-
-3. Scarica Serie
-
-- [Si] 
-- [No]
-
-4. Cerca o Cerca Serie...
-Cerca un titolo a caso in KOD e lo stesso titolo sul sito. Confronta i risultati.
-
-- [Ok]
-- [X - indica il tipo di problema]
-
-5. Entra nella pagina della serie,  verifica che come ultima voce ci sia "Aggiungi in videoteca":
-
-- [Non appare]
-- [Si, appare]
-
-6. Entra nella pagina dell'episodio, NON deve apparire la voce "Aggiungi in videoteca":
-
-- [Non appare]
-- [Si, appare]
-
-7. Eventuali problemi riscontrati
-- [ scrivi qui il problema/i ]
-
-**Sezione Anime
-
-Test da effettuare mentre sei nella pagina dei titoli. Per ogni titolo verfica ci siano le voci nel menu contestuale.
-
-1. Aggiungi Serie in videoteca
-
-- [Si] 
-- [No]
-
-2. Aggiungi 2-3 titoli in videoteca. Verificheremo successivamente la videoteca.
-- [Aggiunti correttamente]
-- [Indica eventuali problemi] (copia-incolla per tutti i titoli con cui hai avuto il problema)
-
-3. Scarica Serie
-
-- [Si] 
-- [No]
-
-4. Rinumerazione
-
-- [Si] 
-- [No]
-
-5. Cerca o Cerca Serie...
-Cerca un titolo a caso in KOD e lo stesso titolo sul sito. Confronta i risultati.
-
-- [Ok]
-- [X - indica il tipo di problema]
-
-6. Entra nella pagina della serie,  verifica che come ultima voce ci sia "Aggiungi in videoteca":
-
-- [Si, appare]
-- [Non appare]
-
-7. Entra nella pagina dell'episodio, NON deve apparire la voce "Aggiungi in videoteca":
-
-- [Non appare]
-- [Si, appare]
-
-8. Eventuali problemi riscontrati
-- [ scrivi qui il problema/i ]
-
-**Fine test del canale preso singolarmente!!!
diff --git a/addon.xml b/addon.xml
index 1d9ef2c2..3af6a6dc 100644
--- a/addon.xml
+++ b/addon.xml
@@ -5,9 +5,8 @@
     <import addon="script.module.libtorrent" optional="true"/>
     <import addon="metadata.themoviedb.org"/>
     <import addon="metadata.tvdb.com"/>
-    
   </requires>
-  <extension library="default.py" point="xbmc.python.pluginsource">
+  <extension point="xbmc.python.pluginsource" library="default.py">
     <provides>video</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
@@ -20,9 +19,7 @@
       <screenshot>resources/media/themes/ss/2.png</screenshot>
       <screenshot>resources/media/themes/ss/3.png</screenshot>
     </assets>
-      <news>KoD 0.5
-          -riscritti molti canali per cambiamenti nella struttura stessa di kod
-          -altre robe carine</news>
+      <news>Benvenuto su KOD!</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>
@@ -32,6 +29,6 @@
     <forum>https://t.me/kodiondemand</forum>
     <source>https://github.com/kodiondemand/addon</source>
   </extension>
-  <extension library="videolibrary_service.py" point="xbmc.service" start="login|startup">
+  <extension point="xbmc.service" library="videolibrary_service.py" start="login|startup">
   </extension>
-</addon>
\ No newline at end of file
+</addon>
diff --git a/channels.json b/channels.json
index 78f79ee5..f1e8d571 100644
--- a/channels.json
+++ b/channels.json
@@ -1,13 +1,13 @@
 {
-    "altadefinizione01": "https://www.altadefinizione01.cc",
     "altadefinizione01_club": "https://www.altadefinizione01.cc",
-    "altadefinizione01_link": "http://altadefinizione1.com",
+    "altadefinizione01_link": "http://altadefinizione1.link",
+    "altadefinizione01": "https://www.altadefinizione01.cc",
     "altadefinizioneclick": "https://altadefinizione.cloud",
     "altadefinizionehd": "https://altadefinizionetv.best",
-    "animeforce": "https://ww1.animeforce.org",
+    "animeforge": "https://ww1.animeforce.org",
     "animeleggendari": "https://animepertutti.com",
-    "animespace": "http://www.animespace.tv",
     "animestream": "https://www.animeworld.it",
+    "animespace": "https://www.animespace.tv",
     "animesubita": "http://www.animesubita.org",
     "animetubeita": "http://www.animetubeita.com",
     "animevision": "https://www.animevision.it",
@@ -17,29 +17,37 @@
     "casacinemainfo": "https://www.casacinema.info",
     "cb01anime": "https://www.cineblog01.ink",
     "cinemalibero": "https://www.cinemalibero.best",
+    "cinemastreaming": "https://cinemastreaming.icu",
     "documentaristreamingda": "https://documentari-streaming-da.com",
     "dreamsub": "https://www.dreamsub.stream",
     "eurostreaming": "https://eurostreaming.pink",
+    "eurostreaming_video": "https://www.eurostreaming.best",
     "fastsubita": "http://fastsubita.com",
+    "ffilms":"https://ffilms.org",
+    "filmigratis": "https://filmigratis.net",
     "filmgratis": "https://www.filmaltadefinizione.net",
-    "filmigratis": "https://filmigratis.org",
     "filmontv": "https://www.comingsoon.it",
     "filmpertutti": "https://www.filmpertutti.pub",
     "filmsenzalimiti": "https://filmsenzalimiti.best",
     "filmsenzalimiticc": "https://www.filmsenzalimiti.host",
+    "filmsenzalimiti_blue": "https://filmsenzalimiti.best",
+    "filmsenzalimiti_info": "https://www.filmsenzalimiti.host",
     "filmstreaming01": "https://filmstreaming01.com",
     "filmstreamingita": "http://filmstreamingita.live",
+    "guarda_serie": "https://guardaserie.site",
     "guardafilm": "http://www.guardafilm.top",
     "guardarefilm": "https://www.guardarefilm.red",
-    "guardaserie_stream": "https://guardaserie.co",
     "guardaseriecc": "https://guardaserie.site",
     "guardaserieclick": "https://www.guardaserie.media",
+    "guardaserie_stream": "https://guardaserie.co",
+    "guardaserieonline": "http://www.guardaserie.media",
     "guardogratis": "http://guardogratis.net",
     "ilgeniodellostreaming": "https://ilgeniodellostreaming.se",
     "italiafilm": "https://www.italia-film.pw",
     "italiafilmhd": "https://italiafilm.info",
     "italiaserie": "https://italiaserie.org",
     "itastreaming": "https://itastreaming.film",
+    "majintoon": "https://toonitalia.org",
     "mondolunatico": "http://mondolunatico.org",
     "mondolunatico2": "http://mondolunatico.org/stream/",
     "mondoserietv": "https://mondoserietv.com",
@@ -48,9 +56,7 @@
     "serietvonline": "https://serietvonline.tech",
     "serietvsubita": "http://serietvsubita.xyz",
     "serietvu": "https://www.serietvu.club",
-    "streamingaltadefinizione": "https://www.streamingaltadefinizione.me",
-    "streamtime": "https://t.me/s/StreamTime",
+    "streamingaltadefinizione": "https://www.streamingaltadefinizione.best",
     "tantifilm": "https://www.tantifilm.eu",
-    "toonitalia": "https://toonitalia.org",
-    "vedohd": "https://vedohd.icu/"
+    "toonitalia": "https://toonitalia.org"
 }
diff --git a/channels/LIKUOO.py b/channels/LIKUOO.py
index a0038dc6..f42ed721 100644
--- a/channels/LIKUOO.py
+++ b/channels/LIKUOO.py
@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
+import re
+import urlparse
 
-host = 'https://www.likuoo.video'
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
+
+host = 'http://www.likuoo.video'
 
 
 def mainlist(item):
@@ -81,20 +83,13 @@ def lista(item):
 
 
 def play(item):
-    itemlist = []
+    logger.info()
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = 'url:\'([^\']+)\'.*?'
-    patron += 'data:\'([^\']+)\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl,post in matches:
-        post = post.replace("%3D", "=")
-        scrapedurl = host + scrapedurl
-        logger.debug( item.url +" , "+ scrapedurl +" , " +post )
-        datas = httptools.downloadpage(scrapedurl, post=post, headers={'Referer':item.url}).data
-        datas = datas.replace("\\", "")
-        url = scrapertools.find_single_match(datas, '<iframe src="([^"]+)"')
-        itemlist.append( Item(channel=item.channel, action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.fulltitle
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videochannel=item.channel
     return itemlist
 
diff --git a/channels/TXXX.py b/channels/TXXX.py
index 32a360b2..253b7312 100644
--- a/channels/TXXX.py
+++ b/channels/TXXX.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urllib
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.txxx.com'
 
diff --git a/channels/absoluporn.py b/channels/absoluporn.py
index 32abc69c..e5774e59 100644
--- a/channels/absoluporn.py
+++ b/channels/absoluporn.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.absoluporn.es'
 
@@ -89,7 +90,7 @@ def play(item):
     matches = scrapertools.find_multiple_matches(data, patron)
     for servervideo,path,filee  in matches:
         scrapedurl = servervideo + path + "56ea912c4df934c216c352fa8d623af3" + filee
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
+        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
                             thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/alsoporn.py b/channels/alsoporn.py
index 5433405d..306d00d5 100644
--- a/channels/alsoporn.py
+++ b/channels/alsoporn.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
-import base64
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.alsoporn.com'
 
@@ -66,9 +66,8 @@ def lista(item):
         title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        if not "0:00" in scrapedtime:
-            itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                                  fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                              fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
 
     next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)" target="_self"><span class="alsoporn_page">NEXT</span></a>')
     if next_page!="":
@@ -82,18 +81,11 @@ def play(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     scrapedurl = scrapertools.find_single_match(data,'<iframe frameborder=0 scrolling="no"  src=\'([^\']+)\'')
-    data = httptools.downloadpage(scrapedurl).data
+    data = httptools.downloadpage(item.url).data
     scrapedurl1 = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
-    scrapedurl1 = scrapedurl1.replace("//www.playercdn.com/ec/i2.php?url=", "")
-    scrapedurl1 = base64.b64decode(scrapedurl1 + "=")
-    logger.debug(scrapedurl1)
-    data = httptools.downloadpage(scrapedurl1).data
-    if "xvideos" in scrapedurl1:
-        scrapedurl2 = scrapertools.find_single_match(data, 'html5player.setVideoHLS\(\'([^\']+)\'\)')
-    if "xhamster" in scrapedurl1:
-        scrapedurl2 = scrapertools.find_single_match(data, '"[0-9]+p":"([^"]+)"').replace("\\", "")
-
-    logger.debug(scrapedurl2)
-    itemlist.append(item.clone(action="play", title=item.title, url=scrapedurl2))
+    scrapedurl1 = scrapedurl1.replace("//www.playercdn.com/ec/i2.php?", "https://www.trinitytube.xyz/ec/i2.php?")
+    data = httptools.downloadpage(item.url).data
+    scrapedurl2 = scrapertools.find_single_match(data,'<source src="(.*?)"')
+    itemlist.append(item.clone(action="play", title=item.title, fulltitle = item.title, url=scrapedurl2))
     return itemlist
 
diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py
index 3cd9247e..218d7e6d 100644
--- a/channels/altadefinizione01.py
+++ b/channels/altadefinizione01.py
@@ -3,116 +3,59 @@
 # Canale per altadefinizione01
 # ------------------------------------------------------------
 
-
-"""
-        DA FINIRE - CONTROLLARE
-        
-"""
-
-##from specials import autoplay
-from core import support #,servertools
+from core import servertools, httptools, tmdb, scrapertoolsV2, support
 from core.item import Item
-from platformcode import config, logger
+from platformcode import logger, config
+from specials import autoplay
+
+#URL che reindirizza sempre al dominio corrente
+#host = "https://altadefinizione01.to"
 
 __channel__ = "altadefinizione01"
-
 host = config.get_channel_url(__channel__)
 
-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']
+IDIOMAS = {'Italiano': 'IT'}
+list_language = IDIOMAS.values()
+list_servers = ['openload', 'streamango', 'rapidvideo', 'streamcherry', 'megadrive']
 list_quality = ['default']
 
+checklinks = config.get_setting('checklinks', 'altadefinizione01')
+checklinks_number = config.get_setting('checklinks_number', 'altadefinizione01')
+
+headers = [['Referer', host]]
+blacklist_categorie = ['Altadefinizione01', 'Altadefinizione.to']
+
 
-@support.menu
 def mainlist(item):
+    support.log()
+
+    itemlist =[]
+
+    support.menu(itemlist, 'Al Cinema','peliculas',host+'/cinema/')
+    support.menu(itemlist, 'Ultimi Film Inseriti','peliculas',host)
+    support.menu(itemlist, 'Film Sub-ITA','peliculas',host+'/sub-ita/')
+    support.menu(itemlist, 'Film Ordine Alfabetico ','AZlist',host+'/catalog/')
+    support.menu(itemlist, 'Categorie Film','categories',host)
+    support.menu(itemlist, 'Cerca...','search')
     
-    film = [
-        ('Al Cinema', ['/cinema/', 'peliculas', 'pellicola']),
-        ('Generi', ['', 'categorie', 'genres']),
-        ('Lettera', ['/catalog/a/', 'categorie', 'orderalf']),
-        ('Anni', ['', 'categorie', 'years']),
-        ('Sub-ITA', ['/sub-ita/', 'peliculas', 'pellicola'])
-    ]
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
 
-    return locals()
+    return itemlist
 
-@support.scrape
-def peliculas(item):
-    support.log('peliculas',item)
-##    support.dbg()
-    action="findvideos"
-    if item.args == "search":
-        patronBlock = r'</script> <div class="boxgrid caption">(?P<block>.*)<div id="right_bar">'
-    else:
-        patronBlock = r'<div class="cover_kapsul ml-mask">(?P<block>.*)<div class="page_nav">'
-    patron = r'<div class="cover boxcaption"> <h2>.<a href="(?P<url>[^"]+)">.*?<.*?src="(?P<thumb>[^"]+)"'\
-         '.+?[^>]+>[^>]+<div class="trdublaj"> (?P<quality>[A-Z/]+)<[^>]+>(?:.[^>]+>(?P<lang>.*?)<[^>]+>).*?'\
-         '<p class="h4">(?P<title>.*?)</p>[^>]+> [^>]+> [^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> [^>]+> '\
-         '[^>]+>[^>]+>(?P<year>\d{4})[^>]+>[^>]+> [^>]+>[^>]+>(?P<duration>\d+).+?>.*?<p>(?P<plot>[^<]+)<'
 
-    patronNext =  '<span>\d</span> <a href="([^"]+)">'
-    
-##    support.regexDbg(item, patron, headers)
-                     
-    return locals()
+def categories(item):
+    support.log(item)
+    itemlist = support.scrape(item,'<li><a href="([^"]+)">(.*?)</a></li>',['url','title'],headers,'Altadefinizione01',patron_block='<ul class="kategori_list">(.*?)</ul>',action='peliculas')
+    return support.thumb(itemlist)
 
-@support.scrape
-def categorie(item):
-    support.log('categorie',item)
+def AZlist(item):
+    support.log()
+    return support.scrape(item,r'<a title="([^"]+)" href="([^"]+)"',['title','url'],headers,patron_block=r'<div class="movies-letter">(.*?)<\/div>',action='peliculas_list')
 
-    if item.args != 'orderalf': action = "peliculas"
-    else: action = 'orderalf'
-    
-    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>'
-    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>'
-    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>'
-        
-    #support.regexDbg(item, patronBlock, headers)
-    
-    return locals()
-
-@support.scrape
-def orderalf(item):
-    support.log('orderalf',item)
-
-    action= 'findvideos'
-    patron = r'<td class="mlnh-thumb"><a href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"'\
-             '.+?[^>]+>[^>]+ [^>]+[^>]+ [^>]+>(?P<title>[^<]+).*?[^>]+>(?P<year>\d{4})<'\
-             '[^>]+>[^>]+>(?P<quality>[A-Z]+)[^>]+> <td class="mlnh-5">(?P<lang>.*?)</td>'
-    patronNext =  r'<span>[^<]+</span>[^<]+<a href="(.*?)">'
-
-    return locals()
-
-def findvideos(item):
-    support.log('findvideos', item)
-    return support.server(item, headers=headers)
-
-def search(item, text):
-    logger.info("%s mainlist search log: %s %s" % (__channel__, item, text))
-    itemlist = []
-    text = text.replace(" ", "+")
-    item.url = host + "/index.php?do=search&story=%s&subaction=search" % (text)
-    item.args = "search"
-    try:
-        return peliculas(item)
-    # Cattura la eccezione così non interrompe la ricerca globle se il canale si rompe!
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("search except %s: %s" % (__channel__, line))
-        return []
 
 def newest(categoria):
+    # import web_pdb; web_pdb.set_trace()
     support.log(categoria)
     itemlist = []
     item = Item()
@@ -124,7 +67,7 @@ def newest(categoria):
 
             if itemlist[-1].action == "peliculas":
                 itemlist.pop()
-    # Continua la ricerca in caso di errore
+    # Continua la ricerca in caso di errore 
     except:
         import sys
         for line in sys.exc_info():
@@ -132,3 +75,76 @@ def newest(categoria):
         return []
 
     return itemlist
+
+
+def search(item, texto):
+    support.log(texto)
+    item.url = "%s/index.php?do=search&story=%s&subaction=search" % (
+        host, texto)
+    try:
+        return peliculas(item)
+    # Continua la ricerca in caso di errore 
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def peliculas(item):
+    support.log()
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+    patron = r'<div class="cover_kapsul ml-mask".*?<a href="(.*?)">(.*?)<\/a>.*?<img .*?src="(.*?)".*?<div class="trdublaj">(.*?)<\/div>.(<div class="sub_ita">(.*?)<\/div>|())'
+    matches = scrapertoolsV2.find_multiple_matches(data, patron)
+    
+    for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedquality, subDiv, subText, empty in matches:
+        info = scrapertoolsV2.find_multiple_matches(data, r'<span class="ml-label">([0-9]+)+<\/span>.*?<span class="ml-label">(.*?)<\/span>.*?<p class="ml-cat".*?<p>(.*?)<\/p>.*?<a href="(.*?)" class="ml-watch">')
+        infoLabels = {}
+        for infoLabels['year'], duration, scrapedplot, checkUrl in info:
+            if checkUrl == scrapedurl:
+                break
+
+        infoLabels['duration'] = int(duration.replace(' min', '')) * 60  # calcolo la durata in secondi
+        scrapedthumbnail = host + scrapedthumbnail
+        scrapedtitle = scrapertoolsV2.decodeHtmlentities(scrapedtitle)
+        fulltitle = scrapedtitle
+        if subDiv:
+            fulltitle += support.typo(subText + ' _ () color limegreen')
+        fulltitle += support.typo(scrapedquality.strip()+ ' _ [] color kod')
+
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="findvideos",
+                 contentType=item.contenType,
+                 contentTitle=scrapedtitle,
+                 contentQuality=scrapedquality.strip(),
+                 plot=scrapedplot,
+                 title=fulltitle,
+                 fulltitle=scrapedtitle,
+                 show=scrapedtitle,
+                 url=scrapedurl,
+                 infoLabels=infoLabels,
+                 thumbnail=scrapedthumbnail))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    support.nextPage(itemlist,item,data,'<span>[^<]+</span>[^<]+<a href="(.*?)">')
+
+    return itemlist
+
+def peliculas_list(item):
+    support.log()
+    item.fulltitle = ''
+    block = r'<tbody>(.*)<\/tbody>'
+    patron = r'<a href="([^"]+)" title="([^"]+)".*?> <img.*?src="([^"]+)".*?<td class="mlnh-3">([0-9]{4}).*?mlnh-4">([A-Z]+)'
+    return support.scrape(item,patron, ['url', 'title', 'thumb', 'year', 'quality'], patron_block=block)
+
+
+
+def findvideos(item):
+    support.log()
+    
+    itemlist = support.server(item, headers=headers)
+
+    return itemlist
diff --git a/channels/altadefinizione01_club.json b/channels/altadefinizione01_club.json
index b4cadae2..34c36518 100644
--- a/channels/altadefinizione01_club.json
+++ b/channels/altadefinizione01_club.json
@@ -11,6 +11,14 @@
     "movie"
   ],
   "settings": [
+    {
+    "id": "channel_host",
+    "type": "text",
+    "label": "Host del canale",
+    "default": "https://altadefinizione01.estate/",
+    "enabled": true,
+    "visible": true
+    },
     {
       "id": "modo_grafico",
       "type": "bool",
diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py
index 09771127..2895bb93 100644
--- a/channels/altadefinizione01_club.py
+++ b/channels/altadefinizione01_club.py
@@ -3,94 +3,131 @@
 # -*- Riscritto per KOD -*-
 # -*- By Greko -*-
 # -*- last change: 04/05/2019
-# -*- doppione di altadefinizione01
 
-from specials import autoplay
-from core import servertools, support
+
+from core import channeltools, servertools, support
 from core.item import Item
 from platformcode import config, logger
+from specials import autoplay
 
 __channel__ = "altadefinizione01_club"
 host = config.get_channel_url(__channel__)
 
+# ======== Funzionalità =============================
+
+checklinks = config.get_setting('checklinks', __channel__)
+checklinks_number = config.get_setting('checklinks_number', __channel__)
+
 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']
+parameters = channeltools.get_channel_parameters(__channel__)
+fanart_host = parameters['fanart']
+thumbnail_host = parameters['thumbnail']
+
+IDIOMAS = {'Italiano': 'IT'}
+list_language = IDIOMAS.values()
+list_servers = ['verystream','openload','supervideo','rapidvideo','streamango'] # per l'autoplay
 list_quality = ['default']
 
-@support.menu
+
+# =========== home menu ===================
+
 def mainlist(item):
+    """
+    Creo il menu principale del canale
+    :param item:
+    :return: itemlist []
+    """
+    logger.info("%s mainlist log: %s" % (__channel__, item)) 
+    itemlist = []
 
-    film = [
-        ('Al Cinema', ['/cinema/', 'peliculas', 'pellicola']),
-        ('Generi', ['', 'categorie', 'genres']),
-        ('Lettera', ['/catalog/a/', 'categorie', 'orderalf']),
-        ('Anni', ['', 'categorie', 'years']),
-        ('Sub-ITA', ['/sub-ita/', 'peliculas', 'pellicola'])
-    ]
+    # Menu Principale
+    support.menu(itemlist, 'Film Ultimi Arrivi bold', 'peliculas', host, args='pellicola')
+    support.menu(itemlist, 'Genere', 'categorie', host, args='genres')
+    support.menu(itemlist, 'Per anno submenu', 'categorie', host, args=['Film per Anno','years'])
+    support.menu(itemlist, 'Per lettera', 'categorie', host + '/catalog/a/', args=['Film per Lettera','orderalf'])
+    support.menu(itemlist, 'Al Cinema bold', 'peliculas', host + '/cinema/', args='pellicola')
+    support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host + '/sub-ita/', args='pellicola')
+    support.menu(itemlist, 'Cerca film submenu', 'search', host, args = 'search')
 
-    return locals()
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
+
+    support.channel_config(item, itemlist)
+    
+    return itemlist
 
 # ======== def in ordine di menu ===========================
 # =========== def per vedere la lista dei film =============
-@support.scrape
+
 def peliculas(item):
-##    import web_pdb; web_pdb.set_trace()
-    support.log('peliculas',item)
+    logger.info("%s mainlist peliculas log: %s" % (__channel__, item))
+    itemlist = []
 
-    action="findvideos"
+    patron_block = r'<div id="dle-content">(.*?)<div class="page_nav">'
     if item.args == "search":
-        patronBlock = r'</script> <div class="boxgrid caption">(?P<block>.*)<div id="right_bar">'
-    else:
-        patronBlock = r'<div class="cover_kapsul ml-mask">(?P<block>.*)<div class="page_nav">'
-    patron = r'<div class="cover boxcaption"> <h2>.<a href="(?P<url>[^"]+)">.*?<.*?src="(?P<thumb>[^"]+)"'\
-         '.+?[^>]+>[^>]+<div class="trdublaj"> (?P<quality>[A-Z]+)<[^>]+>(?:.[^>]+>(?P<lang>.*?)<[^>]+>).*?'\
-         '<p class="h4">(?P<title>.*?)</p>[^>]+> [^>]+> [^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> [^>]+> '\
-         '[^>]+>[^>]+>(?P<year>\d{4})[^>]+>[^>]+> [^>]+>[^>]+>(?P<duration>\d+).+?>'
+        patron_block = r'</table> </form>(.*?)<div class="search_bg">'
+    patron = r'<h2>.<a href="(.*?)".*?src="(.*?)".*?(?:|<div class="sub_ita">(.*?)</div>)[ ]</div>.*?<p class="h4">(.*?)</p>'
 
-    patronNext =  '<span>\d</span> <a href="([^"]+)">'
+    listGroups = ['url', 'thumb', 'lang', 'title', 'year']
 
-    return locals()
+    patronNext =  '<span>[^<]+</span>[^<]+<a href="(.*?)">'
+    
+    itemlist = support.scrape(item, patron=patron, listGroups=listGroups,
+                          headers= headers, patronNext=patronNext,patron_block=patron_block,
+                          action='findvideos')    
+    
+    return itemlist
 
 # =========== def pagina categorie ======================================
 
-@support.scrape
 def categorie(item):
-    support.log('categorie',item)
-##    import web_pdb; web_pdb.set_trace()
-
-    if item.args != 'orderalf': action = "peliculas"
-    else: action = 'orderalf'
-    blacklist = 'Altadefinizione01'
+    logger.info("%s mainlist categorie log: %s" % (__channel__, item))
+    itemlist = []
 
+    # da qui fare le opportuni modifiche
+    patron = r'<li><a href="(.*?)">(.*?)</a>'
+    action = 'peliculas'
     if item.args == 'genres':
-        patronBlock = r'<ul class="kategori_list">(?P<block>.*)</ul>'
-        patron = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>'
-    elif item.args == 'years':
-        patronBlock = r'<ul class="anno_list">(?P<block>.*)</ul>'
-        patron = '<li><a href="(?P<url>[^"]+)">(?P<title>.*?)</a>'
-    elif item.args == 'orderalf':
-        patronBlock = r'<div class="movies-letter">(.*)<div class="clearfix">'
-        patron = '<a title=.*?href="(?P<url>[^"]+)"><span>(?P<title>.*?)</span>'
+        bloque = r'<ul class="kategori_list">(.*?)</ul>'
+    elif item.args[1] == 'years':
+        bloque = r'<ul class="anno_list">(.*?)</ul>'
+    elif item.args[1] == 'orderalf':
+        bloque = r'<div class="movies-letter">(.*)<div class="clearfix">'
+        patron = r'<a title=.*?href="(.*?)"><span>(.*?)</span>'
+        action = 'orderalf'
+
+    listGroups = ['url', 'title']
+    patronNext = ''
+       
+    itemlist = support.scrape(item, patron=patron, listGroups=listGroups,
+                          headers= headers, patronNext=patronNext, patron_block = bloque,
+                          action=action)
+
+    return itemlist
 
-    return locals()
 # =========== def pagina lista alfabetica ===============================
-@support.scrape
+
 def orderalf(item):
-    support.log('orderalf',item)
+    logger.info("%s mainlist orderalf log: %s" % (__channel__, item))
+    itemlist = []
 
-    action= 'findvideos'
-    patron = r'<td class="mlnh-thumb"><a href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"'\
-             '.+?[^>]+>[^>]+ [^>]+[^>]+ [^>]+>(?P<title>[^<]+).*?[^>]+>(?P<year>\d{4})<'\
-             '[^>]+>[^>]+>(?P<quality>[A-Z]+)[^>]+> <td class="mlnh-5">(?P<lang>.*?)</td>'
-    patronNext =  r'<span>[^<]+</span>[^<]+<a href="(.*?)">'
+    listGroups = ['url', 'title', 'thumb', 'year', 'lang']
+    patron = r'<td class="mlnh-thumb"><a href="(.*?)".title="(.*?)".*?src="(.*?)".*?mlnh-3">(.*?)<.*?"mlnh-5">.<(.*?)<td' #scrapertools.find_single_match(data, '<td class="mlnh-thumb"><a href="(.*?)".title="(.*?)".*?src="(.*?)".*?mlnh-3">(.*?)<.*?"mlnh-5">.<(.*?)<td')
+    patronNext = r'<span>[^<]+</span>[^<]+<a href="(.*?)">'
+    
+    itemlist = support.scrape(item, patron=patron, listGroups=listGroups,
+                          headers= headers, patronNext=patronNext,
+                          action='findvideos')
+
+    return itemlist
 
-    return locals()
 # =========== def pagina del film con i server per verderlo =============
 
 def findvideos(item):
-    support.log('findvideos', item)
+    logger.info("%s mainlist findvideos_film log: %s" % (__channel__, item))
+    itemlist = []
     return support.server(item, headers=headers)
 
 # =========== def per cercare film/serietv =============
@@ -100,7 +137,7 @@ def search(item, text):
     itemlist = []
     text = text.replace(" ", "+")
     item.url = host + "/index.php?do=search&story=%s&subaction=search" % (text)
-    item.args = "search"
+    #item.extra = "search"
     try:
         return peliculas(item)
     # Cattura la eccezione così non interrompe la ricerca globle se il canale si rompe!
@@ -113,17 +150,16 @@ def search(item, text):
 # =========== def per le novità nel menu principale =============
 
 def newest(categoria):
-    support.log(categoria)
+    logger.info("%s mainlist newest log: %s" % (__channel__, categoria))
     itemlist = []
     item = Item()
     try:
-        if categoria == "peliculas":
-            item.url = host
-            item.action = "peliculas"
-            itemlist = peliculas(item)
+        item.url = host
+        item.action = "peliculas"
+        itemlist = peliculas(item)
+        if itemlist[-1].action == "peliculas":
+            itemlist.pop()
 
-            if itemlist[-1].action == "peliculas":
-                itemlist.pop()
     # Continua la ricerca in caso di errore
     except:
         import sys
diff --git a/channels/altadefinizione01_link.json b/channels/altadefinizione01_link.json
index e6b71e57..579853b4 100644
--- a/channels/altadefinizione01_link.json
+++ b/channels/altadefinizione01_link.json
@@ -4,11 +4,24 @@
   "active": true,
   "adult": false,
   "language": ["ita"],
-  "bannermenu": "altadefinizione01link.png",
-  "banner": "altadefinizione01link.png",
-  "fanart": "altadefinizione01link.png",
-  "categories": ["movie","vosi"],
+  "fanart": "https://altadefinizione01.estate/templates/Dark/img/nlogo.png",
+  "thumbnail": "https://altadefinizione01.estate/templates/Dark/img/nlogo.png",
+  "banner": "https://altadefinizione01.estate/templates/Dark/img/nlogo.png",
+  "fix" : "reimpostato url e modificato file per KOD",
+  "change_date": "2019-30-04",
+  "categories": [
+    "movie",
+    "vosi"
+  ],
   "settings": [
+    {
+    "id": "channel_host",
+    "type": "text",
+    "label": "Host del canale",
+    "default": "https://altadefinizione01.estate/",
+    "enabled": true,
+    "visible": true
+    },  
     {
       "id": "modo_grafico",
       "type": "bool",
diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py
index 98c3fcbf..584e175b 100644
--- a/channels/altadefinizione01_link.py
+++ b/channels/altadefinizione01_link.py
@@ -2,78 +2,97 @@
 # -*- Channel Altadefinizione01L Film - Serie -*-
 # -*- By Greko -*-
 
+import channelselector
 from specials import autoplay
-from core import servertools, support#, jsontools
+from core import servertools, support, jsontools
 from core.item import Item
 from platformcode import config, logger
 
 __channel__ = "altadefinizione01_link"
 
 # ======== def per utility INIZIO ============================
-host = config.get_channel_url(__channel__)
-headers = [['Referer', host]]
 
 list_servers = ['supervideo', 'streamcherry','rapidvideo', 'streamango', 'openload']
 list_quality = ['default']
 
-# =========== home menu ===================
-@support.menu
-def mainlist(item):
-##    support.dbg()
+host = config.get_setting("channel_host", __channel__)
 
-    film = [
-        ('Al Cinema', ['/film-del-cinema', 'peliculas', '']),
-        ('Generi', ['', 'genres', 'genres']),
-        ('Anni', ['', 'genres', 'years']),
-        ('Qualità', ['/piu-visti.html', 'genres', 'quality']),
-        ('Mi sento fortunato', ['/piu-visti.html', 'genres', 'lucky']),
-        ('Popolari', ['/piu-visti.html', 'peliculas', '']),
-        ('Sub-ITA', ['/film-sub-ita/', 'peliculas', ''])
-    ]
+headers = [['Referer', host]]
+# =========== home menu ===================
+
+def mainlist(item):
+    """
+    Creo il menu principale del canale
+    :param item:
+    :return: itemlist []
+    """
+    support.log()
+    itemlist = []
+
+    # Menu Principale
+    support.menu(itemlist, 'Novità bold', 'peliculas', host)
+    support.menu(itemlist, 'Film per Genere', 'genres', host, args='genres')
+    support.menu(itemlist, 'Film per Anno submenu', 'genres', host, args='years')
+    support.menu(itemlist, 'Film per Qualità submenu', 'genres', host, args='quality') 
+    support.menu(itemlist, 'Al Cinema bold', 'peliculas', host + '/film-del-cinema')
+    support.menu(itemlist, 'Popolari bold', 'peliculas', host + '/piu-visti.html')
+    support.menu(itemlist, 'Mi sento fortunato bold', 'genres', host, args='lucky')    
+    support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host + '/film-sub-ita/')
+    support.menu(itemlist, 'Cerca film submenu', 'search', host)
+
+    # per autoplay
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
+
+    support.channel_config(item, itemlist)
     
-##    search = ''
-    
-    return locals()
+    return itemlist
 
 # ======== def in ordine di action dal menu ===========================
 
-@support.scrape
 def peliculas(item):
-##    support.dbg()
-    support.log('peliculas',item)
+    support.log
+    itemlist = []
 
-##    patron = r'class="innerImage">.*?href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"'\
-##             '.*?class="ml-item-title">(?P<title>[^<]+)</.*?class="ml-item-label"> '\
-##             '(?P<year>\d{4}) <.*?class="ml-item-label"> (?P<duration>\d+) .*?'\
-##             'class="ml-item-label ml-item-label-.+?"> (?P<quality>.+?) <.*?'\
-##             'class="ml-itelangm-label"> (?P<lang>.+?) </'
+    patron = r'class="innerImage">.*?href="([^"]+)".*?src="([^"]+)"'\
+             '.*?class="ml-item-title">([^<]+)</.*?class="ml-item-label"> (\d{4}) <'\
+             '.*?class="ml-item-label">.*?class="ml-item-label ml-item-label-.+?"> '\
+             '(.+?) </div>.*?class="ml-item-label"> (.+?) </'
+    listGroups = ['url', 'thumb', 'title', 'year', 'quality', 'lang']
 
-    patron = r'class="innerImage">.*?href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+)[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> (?P<year>\d{4})[^>]+>[^>]+> (?P<duration>\d+)[^>]+>[^>]+> (?P<quality>[a-zA-Z\\]+)[^>]+>[^>]+> (?P<lang>.*?) [^>]+>'
     patronNext =  '<span>\d</span> <a href="([^"]+)">'
-##    debug = True
-
-    return locals()   
+    
+    itemlist = support.scrape(item, patron=patron, listGroups=listGroups,
+                          headers= headers, patronNext=patronNext,
+                          action='findvideos')    
+    
+    return itemlist
 
 # =========== def pagina categorie ======================================
-@support.scrape
-def genres(item):
-    support.log('genres',item)
 
+def genres(item):
+    support.log
+    itemlist = []
+    #data = httptools.downloadpage(item.url, headers=headers).data
     action = 'peliculas'
-##    item.contentType = 'movie'
     if item.args == 'genres':
-        patronBlock = r'<ul class="listSubCat" id="Film">(?P<block>.*)</ul>'
+        bloque = r'<ul class="listSubCat" id="Film">(.*?)</ul>'
     elif item.args == 'years':
-        patronBlock = r'<ul class="listSubCat" id="Anno">(?P<block>.*)</ul>'
+        bloque = r'<ul class="listSubCat" id="Anno">(.*?)</ul>'
     elif item.args == 'quality':
-        patronBlock = r'<ul class="listSubCat" id="Qualita">(?P<block>.*)</ul>'
+        bloque = r'<ul class="listSubCat" id="Qualita">(.*?)</ul>'
     elif item.args == 'lucky': # sono i titoli random nella pagina, cambiano 1 volta al dì
-        patronBlock = r'FILM RANDOM.*?class="listSubCat">(?P<block>.*)</ul>'
+        bloque = r'FILM RANDOM.*?class="listSubCat">(.*?)</ul>'
         action = 'findvideos'
-##    item.args = ''
-    patron = r'<li><a href="(?P<url>[^"]+)">(?P<title>[^<]+)<'
-        
-    return locals()    
+     
+    patron = r'<li><a href="([^"]+)">(.*?)<'
+
+    listGroups = ['url','title']
+    itemlist = support.scrape(item, patron=patron, listGroups=listGroups,
+                          headers= headers, patron_block = bloque,
+                          action=action)    
+
+    return itemlist
 
 # =========== def per cercare film/serietv =============
 #host+/index.php?do=search&story=avatar&subaction=search
@@ -84,7 +103,7 @@ def search(item, text):
     item.url = host+"/index.php?do=search&story=%s&subaction=search" % (text)
     try:
         return peliculas(item)
-    # Se captura la excepcion, para no interrumpir al buscador global si un canal falla
+    # Se captura la excepciÛn, para no interrumpir al buscador global si un canal falla
     except:
         import sys
         for line in sys.exc_info():
@@ -115,4 +134,14 @@ def newest(categoria):
     return itemlist
 
 def findvideos(item):
-    return support.server(item, headers=headers)
+    support.log()
+    
+    itemlist = support.server(item, headers=headers)
+
+    # Requerido para FilterTools
+    # itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+    
+    return itemlist
diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py
index 905b8426..e4db4965 100644
--- a/channels/altadefinizioneclick.py
+++ b/channels/altadefinizioneclick.py
@@ -3,60 +3,41 @@
 # Canale per altadefinizioneclick
 # ----------------------------------------------------------
 
-from specials import autoplay
+import re
+
 from core import servertools, support
 from core.item import Item
-from platformcode import config, logger
+from platformcode import logger, config
+from specials import autoplay
 
+#host = config.get_setting("channel_host", 'altadefinizioneclick')
 __channel__ = 'altadefinizioneclick'
-
 host = config.get_channel_url(__channel__)
-headers = [['Referer', host]]
+
+IDIOMAS = {'Italiano': 'IT'}
+list_language = IDIOMAS.values()
 list_servers = ['verystream', 'openload', 'streamango', "vidoza", "thevideo", "okru", 'youtube']
 list_quality = ['1080p']
 
-@support.menu
+checklinks = config.get_setting('checklinks', 'altadefinizioneclick')
+checklinks_number = config.get_setting('checklinks_number', 'altadefinizioneclick')
+
+headers = [['Referer', host]]
+
 def mainlist(item):
-    support.log()
+    support.log()    
+    itemlist = []
 
-    film = '' #'/nuove-uscite/'
-    filmSub = [
-        ('Novità', ['/nuove-uscite/', 'peliculas']),
-        ('Al Cinema', ['/film-del-cinema', 'peliculas']),
-        ('Generi', ['', 'menu', 'Film']),
-        ('Anni', ['', 'menu', 'Anno']),
-        ('Qualità', ['', 'menu', 'Qualita']),
-        ('Sub-ITA', ['/sub-ita/', 'peliculas'])
-    ]
+    support.menu(itemlist, 'Film', 'peliculas', host + "/nuove-uscite/")
+    support.menu(itemlist, 'Per Genere submenu', 'menu', host, args='Film')
+    support.menu(itemlist, 'Per Anno submenu', 'menu', host, args='Anno')
+    support.menu(itemlist, 'Sub-ITA', 'peliculas', host + "/sub-ita/")
+    support.menu(itemlist, 'Cerca...', 'search', host, 'movie')    
+    support.aplay(item, itemlist,list_servers, list_quality)
+    support.channel_config(item, itemlist)
 
-    return locals()
+    return itemlist
 
-@support.scrape
-def menu(item):
-    support.log()
-
-    action='peliculas'
-    patron = r'<li><a href="(?P<url>[^"]+)">(?P<title>[^<]+)</a></li>'
-    patronBlock= r'<ul class="listSubCat" id="'+ str(item.args) + '">(?P<block>.*)</ul>'
-
-    return locals()
-
-@support.scrape
-def peliculas(item):
-    support.log()
-    if item.extra == 'search':
-        patron = r'<a href="(?P<url>[^"]+)">\s*<div class="wrapperImage">(?:<span class="hd">(?P<quality>[^<]+)'\
-                 '<\/span>)?<img[^s]+src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>(?P<title>[^<]+)<[^<]+>'\
-                 '(?:.*?IMDB:\s(\2[^<]+)<\/div>)?'
-    else:
-        patron = r'<img width[^s]+src="(?P<thumb>[^"]+)[^>]+><\/a>.*?<a href="(?P<url>[^"]+)">(?P<title>[^(?:\]|<)]+)'\
-                 '(?:\[(?P<lang>[^\]]+)\])?<\/a>[^>]+>[^>]+>[^>]+>(?:\sIMDB\:\s(?P<rating>[^<]+)<)?'\
-                 '(?:.*?<span class="hd">(?P<quality>[^<]+)<\/span>)?\s*<a'
-
-        # in caso di CERCA si apre la maschera di inserimento dati
-        patronNext = r'<a class="next page-numbers" href="([^"]+)">'
-
-    return locals()
 
 def search(item, texto):
     support.log("search ", texto)
@@ -96,6 +77,36 @@ def newest(categoria):
 
     return itemlist
 
+
+def menu(item):
+    support.log()
+    itemlist = support.scrape(item, '<li><a href="([^"]+)">([^<]+)</a></li>', ['url', 'title'], headers,  patron_block='<ul class="listSubCat" id="'+ str(item.args) + '">(.*?)</ul>', action='peliculas')
+    return support.thumb(itemlist)
+
+def peliculas(item):
+    support.log()
+    if item.extra == 'search':
+        patron = r'<a href="([^"]+)">\s*<div class="wrapperImage">(?:<span class="hd">([^<]+)<\/span>)?<img[^s]+src="([^"]+)"[^>]+>[^>]+>[^>]+>([^<]+)<[^<]+>(?:.*?IMDB:\s([^<]+)<\/div>)?'
+        elements = ['url', 'quality', 'thumb', 'title', 'rating']
+        
+    else:
+        patron = r'<img width[^s]+src="([^"]+)[^>]+><\/a>.*?<a href="([^"]+)">([^(?:\]|<)]+)(?:\[([^\]]+)\])?<\/a>[^>]+>[^>]+>[^>]+>(?:\sIMDB\:\s([^<]+)<)?(?:.*?<span class="hd">([^<]+)<\/span>)?\s*<a'
+        elements =['thumb', 'url', 'title','lang', 'rating', 'quality']
+    itemlist = support.scrape(item, patron, elements, headers, patronNext='<a class="next page-numbers" href="([^"]+)">')
+    return itemlist
+
+
 def findvideos(item):
-    support.log('findvideos', item)
-    return support.hdpass_get_servers(item)
+    support.log()
+
+    itemlist = support.hdpass_get_servers(item)
+
+    if checklinks:
+        itemlist = servertools.check_list_links(itemlist, checklinks_number)
+
+    # itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    autoplay.start(itemlist, item)
+    support.videolibrary(itemlist, item ,'color kod bold')
+
+    return itemlist
diff --git a/channels/analdin.py b/channels/analdin.py
index 65cb6793..278d1433 100644
--- a/channels/analdin.py
+++ b/channels/analdin.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
-
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.analdin.com/es'
 
@@ -108,6 +108,6 @@ def play(item):
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl  in matches:
         url = scrapedurl
-    itemlist.append(item.clone(action="play", title=url, url=url))
+    itemlist.append(item.clone(action="play", title=url, fulltitle = item.title, url=url))
     return itemlist
 
diff --git a/channels/animeforce.json b/channels/animeforce.json
index 386a6e61..e5cbc66e 100644
--- a/channels/animeforce.json
+++ b/channels/animeforce.json
@@ -4,17 +4,17 @@
 	"language": ["ita"],
 	"active": true,
 	"adult": false,
-	"thumbnail": "animeforce.png",
-	"banner": "animeforce.png",
+	"thumbnail": "http://www.animeforce.org/wp-content/uploads/2013/05/logo-animeforce.png",
+	"banner": "http://www.animeforce.org/wp-content/uploads/2013/05/logo-animeforce.png",
 	"categories": ["anime"],
 	"settings": [
         {
             "id": "include_in_global_search",
             "type": "bool",
-            "label": "Includi in Ricerca Globale",
+            "label": "Incluir en busqueda global",
             "default": false,
             "enabled": false,
-            "visible": true
+            "visible": false
         },
         {
             "id": "include_in_newest_anime",
@@ -31,39 +31,6 @@
             "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": "autorenumber", 
-            "type": "bool", 
-            "label": "@70712", 
-            "default": false, 
-            "enabled": true, 
-            "visible": true
-        },
-        {
-            "id": "autorenumber_mode",
-            "type": "bool",
-            "label": "@70688",
-            "default": false,
-            "enabled": true,
-            "visible": "eq(-1,true)"
-        }
+            }
 	  ]
 }
diff --git a/channels/animeforce.py b/channels/animeforce.py
index 3aa5109d..54a14d80 100644
--- a/channels/animeforce.py
+++ b/channels/animeforce.py
@@ -1,132 +1,505 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
-# Canale per AnimeForce
+# Ringraziamo Icarus crew
+# Canale per http://animeinstreaming.net/
 # ------------------------------------------------------------
+import re
+import urllib
+import urlparse
 
+from core import httptools, scrapertools, servertools, tmdb
+from core.item import Item
+from platformcode import config, logger
 from servers.decrypters import adfly
-from core import support
 
-__channel__ = "animeforce"
-host = support.config.get_channel_url(__channel__)
+__channel__ = "animeforge"
+host = config.get_channel_url(__channel__)
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
-list_servers = ['directo', 'openload']
-list_quality = ['default']
-
-checklinks = support.config.get_setting('checklinks', __channel__)
-checklinks_number = support.config.get_setting('checklinks_number', __channel__)
 
 headers = [['Referer', host]]
 
+PERPAGE = 20
 
-@support.menu
+
+# -----------------------------------------------------------------
 def mainlist(item):
-    anime = ['/lista-anime/',
-             ('In Corso',['/lista-anime-in-corso/']),
-             ('Ultimi Episodi',['','peliculas','update']),
-             ('Ultime Serie',['/category/anime/articoli-principali/','peliculas','last'])
-            ]
-    return locals()
+    log("mainlist", "mainlist", item.channel)
+    itemlist = [Item(channel=item.channel,
+                     action="lista_anime",
+                     title="[COLOR azure]Anime [/COLOR]- [COLOR lightsalmon]Lista Completa[/COLOR]",
+                     url=host + "/lista-anime/",
+                     thumbnail=CategoriaThumbnail,
+                     fanart=CategoriaFanart),
+                Item(channel=item.channel,
+                     action="animeaggiornati",
+                     title="[COLOR azure]Anime Aggiornati[/COLOR]",
+                     url=host,
+                     thumbnail=CategoriaThumbnail,
+                     fanart=CategoriaFanart),
+                Item(channel=item.channel,
+                     action="ultimiep",
+                     title="[COLOR azure]Ultimi Episodi[/COLOR]",
+                     url=host,
+                     thumbnail=CategoriaThumbnail,
+                     fanart=CategoriaFanart),
+                Item(channel=item.channel,
+                     action="search",
+                     title="[COLOR yellow]Cerca ...[/COLOR]",
+                     thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")]
 
-    
+    return itemlist
+
+
+# =================================================================
+
+# -----------------------------------------------------------------
 def newest(categoria):
-    support.log(categoria)
+    log("newest", "newest" + categoria)
     itemlist = []
-    item = support.Item()
+    item = Item()
     try:
         if categoria == "anime":
             item.url = host
-            item.args = 'update'
-            itemlist = peliculas(item)            
+            item.action = "ultimiep"
+            itemlist = ultimiep(item)
 
-            if itemlist[-1].action == "peliculas":
+            if itemlist[-1].action == "ultimiep":
                 itemlist.pop()
     # Continua la ricerca in caso di errore 
     except:
         import sys
         for line in sys.exc_info():
-            support.logger.error("{0}".format(line))
+            logger.error("{0}".format(line))
         return []
 
     return itemlist
 
-@support.scrape
+
+# =================================================================
+
+# -----------------------------------------------------------------
 def search(item, texto):
-    search = texto
-    item.contentType = 'tvshow'
-    patron = '<strong><a href="(?P<url>[^"]+)">(?P<title>.*?) [Ss][Uu][Bb]'
-    action = 'episodios'    
-    return locals()
+    log("search", "search", item.channel)
+    item.url = host + "/?s=" + texto
+    try:
+        return search_anime(item)
+    # Continua la ricerca in caso di errore 
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
 
 
-@support.scrape
-def peliculas(item):
-    anime = True
-    if item.args == 'update':
-        patron = r'src="(?P<thumb>[^"]+)" class="attachment-grid-post[^"]+" alt="[^"]*" title="(?P<title>[^"]+").*?<h2><a href="(?P<url>[^"]+)"'
-        def itemHook(item):
-            delete = support.scrapertoolsV2.find_single_match(item.fulltitle, r'( Episodio.*)')
-            number = support.scrapertoolsV2.find_single_match(item.title, r'Episodio (\d+)')
-            item.title = support.typo(number + ' - ','bold') + item.title.replace(delete,'')
-            item.fulltitle = item.show = item.fulltitle.replace(delete,'')    
-            item.url = item.url.replace('-episodio-'+ number,'')
-            item.number = number
-            return item
-        action = 'findvideos'
+# =================================================================
 
-    elif item.args == 'last':
-        patron = r'src="(?P<thumb>[^"]+)" class="attachment-grid-post[^"]+" alt="[^"]*" title="(?P<title>.*?)(?: Sub| sub| SUB|").*?<h2><a href="(?P<url>[^"]+)"'
-        action = 'episodios'
+# -----------------------------------------------------------------
+def search_anime(item):
+    log("search_anime", "search_anime", item.channel)
+    itemlist = []
 
-    else:
-        pagination = ''
-        patron = '<strong><a href="(?P<url>[^"]+)">(?P<title>.*?) [Ss][Uu][Bb]'
-        action = 'episodios'
+    data = httptools.downloadpage(item.url).data
 
-    return locals()
+    patron = r'<a href="([^"]+)"><img.*?src="([^"]+)".*?title="([^"]+)".*?/>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        if "Sub Ita Download & Streaming" in scrapedtitle or "Sub Ita Streaming":
+            if 'episodio' in scrapedtitle.lower():
+                itemlist.append(episode_item(item, scrapedtitle, scrapedurl, scrapedthumbnail))
+            else:
+                scrapedtitle, eptype = clean_title(scrapedtitle, simpleClean=True)
+                cleantitle, eptype = clean_title(scrapedtitle)
+
+                scrapedurl, total_eps = create_url(scrapedurl, cleantitle)
+
+                itemlist.append(
+                    Item(channel=item.channel,
+                        action="episodios",
+                        text_color="azure",
+                        contentType="tvshow",
+                        title=scrapedtitle,
+                        url=scrapedurl,
+                        fulltitle=cleantitle,
+                        show=cleantitle,
+                        thumbnail=scrapedthumbnail))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    # Next Page
+    next_page = scrapertools.find_single_match(data, r'<link rel="next" href="([^"]+)"[^/]+/>')
+    if next_page != "":
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="search_anime",
+                 text_bold=True,
+                 title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
+                 url=next_page,
+                 thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png"))
+
+    return itemlist
 
 
-@support.scrape
-def episodios(item):
-    anime = True
-    patron = r'<td style[^>]+>\s*.*?(?:<span[^>]+)?<strong>(?P<title>[^<]+)<\/strong>.*?<td style[^>]+>\s*<a href="(?P<url>[^"]+)"[^>]+>'
-    def itemHook(item):
-        item.url = item.url.replace(host, '')
-        return item
-    action = 'findvideos'
-    return locals()
+# =================================================================
+
+# -----------------------------------------------------------------
+def animeaggiornati(item):
+    log("animeaggiornati", "animeaggiornati", item.channel)
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<img.*?src="([^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a href="([^"]+)">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedthumbnail, scrapedurl, scrapedtitle in matches:
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        if 'Streaming' in scrapedtitle:
+            cleantitle, eptype = clean_title(scrapedtitle)
+            
+            # Creazione URL
+            scrapedurl, total_eps = create_url(scrapedurl, scrapedtitle)
+
+            itemlist.append(
+                Item(channel=item.channel,
+                     action="episodios",
+                     text_color="azure",
+                     contentType="tvshow",
+                     title=cleantitle,
+                     url=scrapedurl,
+                     fulltitle=cleantitle,
+                     show=cleantitle,
+                     thumbnail=scrapedthumbnail))
+    
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
 
 
-def findvideos(item):
-    support.log(item)
+# =================================================================
+
+# -----------------------------------------------------------------
+def ultimiep(item):
+    log("ultimiep", "ultimiep", item.channel)
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<img.*?src="([^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a href="([^"]+)">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedthumbnail, scrapedurl, scrapedtitle in matches:
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        if 'Streaming' in scrapedtitle:
+            itemlist.append(episode_item(item, scrapedtitle, scrapedurl, scrapedthumbnail))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+
+# =================================================================
+
+# -----------------------------------------------------------------
+def lista_anime(item):
+    log("lista_anime", "lista_anime", item.channel)
 
     itemlist = []
-    
-    if item.number:       
-        item.url = support.match(item, r'<a href="([^"]+)"[^>]*>', patronBlock=r'Episodio %s(.*?)</tr>' % item.number)[0][0]   
-    
-    if 'http' not in item.url:
-        if '//' in item.url[:2]:
-            item.url = 'http:' + item.url
-        elif host not in item.url:        
-            item.url = host + item.url
-    
-    if 'adf.ly' in item.url:
-        item.url = adfly.get_long_url(item.url)
-    elif 'bit.ly' in item.url:
-        item.url = support.httptools.downloadpage(item.url, only_headers=True, follow_redirects=False).headers.get("location")
 
-    matches = support.match(item, r'button"><a href="([^"]+)"')[0]
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    # Carica la pagina 
+    data = httptools.downloadpage(item.url).data
+
+    # Estrae i contenuti 
+    patron = r'<li>\s*<strong>\s*<a\s*href="([^"]+?)">([^<]+?)</a>\s*</strong>\s*</li>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    scrapedplot = ""
+    scrapedthumbnail = ""
+    for i, (scrapedurl, scrapedtitle) in enumerate(matches):
+        if (p - 1) * PERPAGE > i: continue
+        if i >= p * PERPAGE: break
+
+        # Pulizia titolo
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip()
+        cleantitle, eptype = clean_title(scrapedtitle, simpleClean=True)
 
-    for video in matches:
         itemlist.append(
-            support.Item(channel=item.channel,
-                         action="play",
-                         title='diretto',
-                         url=video,
-                         server='directo'))
+            Item(channel=item.channel,
+                 extra=item.extra,
+                 action="episodios",
+                 text_color="azure",
+                 contentType="tvshow",
+                 title=cleantitle,
+                 url=scrapedurl,
+                 thumbnail=scrapedthumbnail,
+                 fulltitle=cleantitle,
+                 show=cleantitle,
+                 plot=scrapedplot,
+                 folder=True))
 
-    support.server(item, itemlist=itemlist)
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
-    return itemlist
\ No newline at end of file
+    if len(matches) >= p * PERPAGE:
+        scrapedurl = item.url + '{}' + str(p + 1)
+        itemlist.append(
+            Item(channel=item.channel,
+                 extra=item.extra,
+                 action="lista_anime",
+                 title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
+                 url=scrapedurl,
+                 thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png",
+                 folder=True))
+
+    return itemlist
+
+
+# =================================================================
+
+# -----------------------------------------------------------------
+def episodios(item):
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+
+    patron = '<td style="[^"]*?">\s*.*?<strong>(.*?)</strong>.*?\s*</td>\s*<td style="[^"]*?">\s*<a href="([^"]+?)"[^>]+>\s*<img.*?src="([^"]+?)".*?/>\s*</a>\s*</td>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    vvvvid_videos = False
+    for scrapedtitle, scrapedurl, scrapedimg in matches:
+        if 'nodownload' in scrapedimg or 'nostreaming' in scrapedimg:
+            continue
+        if 'vvvvid' in scrapedurl.lower():
+            if not vvvvid_videos: vvvvid_videos = True
+            itemlist.append(Item(title='I Video VVVVID Non sono supportati', text_color="red"))
+            continue
+
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        scrapedtitle = re.sub(r'<[^>]*?>', '', scrapedtitle)
+        scrapedtitle = '[COLOR azure][B]' + scrapedtitle + '[/B][/COLOR]'
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="findvideos",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 url=urlparse.urljoin(host, scrapedurl),
+                 fulltitle=scrapedtitle,
+                 show=scrapedtitle,
+                 plot=item.plot,
+                 fanart=item.fanart,
+                 thumbnail=item.thumbnail))
+
+    # Comandi di servizio
+    if config.get_videolibrary_support() and len(itemlist) != 0 and not vvvvid_videos:
+        itemlist.append(
+            Item(channel=item.channel,
+                 title=config.get_localized_string(30161),
+                 text_color="yellow",
+                 text_bold=True,
+                 url=item.url,
+                 action="add_serie_to_library",
+                 extra="episodios",
+                 show=item.show))
+
+    return itemlist
+
+
+# ==================================================================
+
+# -----------------------------------------------------------------
+def findvideos(item):
+    logger.info("kod.animeforce findvideos")
+
+    itemlist = []
+
+    if item.extra:
+        data = httptools.downloadpage(item.url, headers=headers).data
+
+        blocco = scrapertools.find_single_match(data, r'%s(.*?)</tr>' % item.extra)
+        url = scrapertools.find_single_match(blocco, r'<a href="([^"]+)"[^>]*>')
+        if 'vvvvid' in url.lower():
+            itemlist = [Item(title='I Video VVVVID Non sono supportati', text_color="red")]
+            return itemlist
+        if 'http' not in url: url = "".join(['https:', url])
+    else:
+        url = item.url
+
+    if 'adf.ly' in url:
+        url = adfly.get_long_url(url)
+    elif 'bit.ly' in url:
+        url = httptools.downloadpage(url, only_headers=True, follow_redirects=False).headers.get("location")
+
+    if 'animeforce' in url:
+        headers.append(['Referer', item.url])
+        data = httptools.downloadpage(url, headers=headers).data
+        itemlist.extend(servertools.find_video_items(data=data))
+
+        for videoitem in itemlist:
+            videoitem.title = item.title + videoitem.title
+            videoitem.fulltitle = item.fulltitle
+            videoitem.show = item.show
+            videoitem.thumbnail = item.thumbnail
+            videoitem.channel = item.channel
+            videoitem.contentType = item.contentType
+
+        url = url.split('&')[0]
+        data = httptools.downloadpage(url, headers=headers).data
+        patron = """<source\s*src=(?:"|')([^"']+?)(?:"|')\s*type=(?:"|')video/mp4(?:"|')>"""
+        matches = re.compile(patron, re.DOTALL).findall(data)
+        headers.append(['Referer', url])
+        for video in matches:
+            itemlist.append(Item(channel=item.channel, action="play", title=item.title,
+                                 url=video + '|' + urllib.urlencode(dict(headers)), folder=False))
+    else:
+        itemlist.extend(servertools.find_video_items(data=url))
+
+        for videoitem in itemlist:
+            videoitem.title = item.title + videoitem.title
+            videoitem.fulltitle = item.fulltitle
+            videoitem.show = item.show
+            videoitem.thumbnail = item.thumbnail
+            videoitem.channel = item.channel
+            videoitem.contentType = item.contentType
+
+    return itemlist
+
+
+# ==================================================================
+
+# =================================================================
+# Funzioni di servizio
+# -----------------------------------------------------------------
+def scrapedAll(url="", patron=""):
+    data = httptools.downloadpage(url).data
+    MyPatron = patron
+    matches = re.compile(MyPatron, re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+
+    return matches
+
+
+# =================================================================
+
+# -----------------------------------------------------------------
+def create_url(url, title, eptype=""):
+    logger.info()
+
+    if 'download' not in url:
+        url = url.replace('-streaming', '-download-streaming')
+
+    total_eps = ""
+    if not eptype:
+        url = re.sub(r'episodio?-?\d+-?(?:\d+-|)[oav]*', '', url)
+    else: # Solo se è un episodio passa
+        total_eps = scrapertools.find_single_match(title.lower(), r'\((\d+)-(?:episodio|sub-ita)\)') # Questo numero verrà rimosso dall'url
+        if total_eps: url = url.replace('%s-' % total_eps, '')
+        url = re.sub(r'%s-?\d*-' % eptype.lower(), '', url)
+    url = url.replace('-fine', '')
+
+    return url, total_eps
+
+# =================================================================
+
+# -----------------------------------------------------------------
+def clean_title(title, simpleClean=False):
+    logger.info()
+
+    title = title.replace("Streaming", "").replace("&", "")
+    title = title.replace("Download", "")
+    title = title.replace("Sub Ita", "")
+    cleantitle = title.replace("#038;", "").replace("amp;", "").strip()
+
+    if '(Fine)' in title:
+        cleantitle = cleantitle.replace('(Fine)', '').strip() + " (Fine)"
+    eptype = ""
+    if not simpleClean:
+        if "episodio" in title.lower():
+            eptype = scrapertools.find_single_match(title, "((?:Episodio?|OAV))")
+            cleantitle = re.sub(r'%s\s*\d*\s*(?:\(\d+\)|)' % eptype, '', title).strip()
+
+            if 'episodio' not in eptype.lower():
+                cleantitle = re.sub(r'Episodio?\s*\d+\s*(?:\(\d+\)|)\s*[\(OAV\)]*', '', cleantitle).strip()
+
+            if '(Fine)' in title:
+                cleantitle = cleantitle.replace('(Fine)', '')
+
+    return cleantitle, eptype
+
+# =================================================================
+
+# -----------------------------------------------------------------
+def episode_item(item, scrapedtitle, scrapedurl, scrapedthumbnail):
+    scrapedtitle, eptype = clean_title(scrapedtitle, simpleClean=True)
+    cleantitle, eptype = clean_title(scrapedtitle)
+
+    # Creazione URL
+    scrapedurl, total_eps = create_url(scrapedurl, scrapedtitle, eptype)
+
+    epnumber = ""
+    if 'episodio' in eptype.lower():
+        epnumber = scrapertools.find_single_match(scrapedtitle.lower(), r'episodio?\s*(\d+)')
+        eptype += ":? %s%s" % (epnumber, (r" \(%s\):?" % total_eps) if total_eps else "")
+
+    extra = "<tr>\s*<td[^>]+><strong>(?:[^>]+>|)%s(?:[^>]+>[^>]+>|[^<]*|[^>]+>)</strong>" % eptype
+    item = Item(channel=item.channel,
+         action="findvideos",
+         contentType="tvshow",
+         title=scrapedtitle,
+         text_color="azure",
+         url=scrapedurl,
+         fulltitle=cleantitle,
+         extra=extra,
+         show=cleantitle,
+         thumbnail=scrapedthumbnail)
+    return item
+
+# =================================================================
+
+# -----------------------------------------------------------------
+def scrapedSingle(url="", single="", patron=""):
+    data = httptools.downloadpage(url).data
+    paginazione = scrapertools.find_single_match(data, single)
+    matches = re.compile(patron, re.DOTALL).findall(paginazione)
+    scrapertools.printMatches(matches)
+
+    return matches
+
+
+# =================================================================
+
+# -----------------------------------------------------------------
+def Crea_Url(pagina="1", azione="ricerca", categoria="", nome=""):
+    # esempio
+    # chiamate.php?azione=ricerca&cat=&nome=&pag=
+    Stringa = host + "/chiamate.php?azione=" + azione + "&cat=" + categoria + "&nome=" + nome + "&pag=" + pagina
+    log("crea_Url", Stringa)
+    return Stringa
+
+
+# =================================================================
+
+# -----------------------------------------------------------------
+def log(funzione="", stringa="", canale=""):
+    logger.debug("[" + canale + "].[" + funzione + "] " + stringa)
+
+
+# =================================================================
+
+# =================================================================
+# riferimenti di servizio
+# -----------------------------------------------------------------
+AnimeThumbnail = "http://img15.deviantart.net/f81c/i/2011/173/7/6/cursed_candies_anime_poster_by_careko-d3jnzg9.jpg"
+AnimeFanart = "https://i.ytimg.com/vi/IAlbvyBdYdY/maxresdefault.jpg"
+CategoriaThumbnail = "http://static.europosters.cz/image/750/poster/street-fighter-anime-i4817.jpg"
+CategoriaFanart = "https://i.ytimg.com/vi/IAlbvyBdYdY/maxresdefault.jpg"
+CercaThumbnail = "http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search"
+CercaFanart = "https://i.ytimg.com/vi/IAlbvyBdYdY/maxresdefault.jpg"
+AvantiTxt = config.get_localized_string(30992)
+AvantiImg = "http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png"
diff --git a/channels/animeleggendari.json b/channels/animeleggendari.json
index ca862d80..6371a381 100644
--- a/channels/animeleggendari.json
+++ b/channels/animeleggendari.json
@@ -7,5 +7,72 @@
     "thumbnail": "animepertutti.png",
     "bannermenu": "animepertutti.png",
     "categories": ["anime"],
-    "settings": []
+    "settings": [
+        {
+            "id": "include_in_global_search",
+            "type": "bool",
+            "label": "Includi ricerca globale",
+            "default": false,
+            "enabled": false,
+            "visible": false
+        },
+        {
+            "id": "include_in_newest_anime",
+            "type": "bool",
+            "label": "Includi in Novità - Anime",
+            "default": true,
+            "enabled": true,
+            "visible": true
+        },
+        {
+            "id": "include_in_newest_italiano",
+            "type": "bool",
+            "label": "Includi in Novità - Italiano",
+            "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"]
+        },
+        {
+            "id": "autorenumber", 
+            "type": "bool", 
+            "label": "@70712", 
+            "default": false, 
+            "enabled": true, 
+            "visible": true
+        },
+        {
+            "id": "autorenumber_mode",
+            "type": "bool",
+            "label": "@70688",
+            "default": false,
+            "enabled": true,
+            "visible": "eq(-1,true)"
+        }
+    ]
 }
diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py
index 04acc7b8..d5f4fe24 100644
--- a/channels/animeleggendari.py
+++ b/channels/animeleggendari.py
@@ -3,99 +3,184 @@
 # Canale per animeleggendari
 # ------------------------------------------------------------
 
-from core import support
+import re
+
+from core import servertools, httptools, scrapertoolsV2, tmdb, support
+from core.item import Item
+from core.support import log, menu
 from lib.js2py.host import jsfunctions
+from platformcode import logger, config
+from specials import autoplay, autorenumber
 
 __channel__ = "animeleggendari"
-host = support.config.get_channel_url(__channel__)
+host = config.get_channel_url(__channel__)
 
-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']
+# Richiesto per Autoplay
+IDIOMAS = {'Italiano': 'IT'}
+list_language = IDIOMAS.values()
+list_servers = ['verystream', 'openload', 'streamango']
 list_quality = ['default']
 
-                                       
-@support.menu
+checklinks = config.get_setting('checklinks', 'animeleggendari')
+checklinks_number = config.get_setting('checklinks_number', 'animeleggendari')
+
 def mainlist(item):
+    log()
 
-    anime = [
-        ('Leggendari', ['/category/anime-leggendari/', 'peliculas']),
-        ('ITA', ['/category/anime-ita/', 'peliculas']),
-        ('SUB-ITA', ['/category/anime-sub-ita/', 'peliculas']),
-        ('Conclusi', ['/category/serie-anime-concluse/', 'peliculas']),
-        ('in Corso', ['/category/serie-anime-in-corso/', 'last_ep']),
-        ('Genere', ['', 'genres'])
-    ]
-
-    return locals()
+    itemlist = []
+    menu(itemlist, 'Anime Leggendari', 'peliculas', host + '/category/anime-leggendari/')
+    menu(itemlist, 'Anime ITA', 'peliculas', host + '/category/anime-ita/')
+    menu(itemlist, 'Anime SUB-ITA', 'peliculas', host + '/category/anime-sub-ita/')
+    menu(itemlist, 'Anime Conclusi', 'peliculas', host + '/category/serie-anime-concluse/')
+    menu(itemlist, 'Anime in Corso', 'peliculas', host + '/category/anime-in-corso/')
+    menu(itemlist, 'Genere', 'genres', host)
+    menu(itemlist, 'Cerca...', 'search')
+                     
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
+    support.channel_config(item, itemlist)
 
+    return itemlist
 
 def search(item, texto):
-    support.log(texto)
+    log(texto)
     
     item.url = host + "/?s=" + texto
     try:
         return peliculas(item)
-
-    # Continua la ricerca in caso di errore
+        
+    # Continua la ricerca in caso di errore 
     except:
         import sys
         for line in sys.exc_info():
-            support.logger.error("%s" % line)
+            logger.error("%s" % line)
         return []
 
+def last_ep(item):
+    log('ANIME PER TUTTI')
+    return support.scrape(item, '<a href="([^"]+)">([^<]+)<', ['url','title'],patron_block='<ul class="mh-tab-content-posts">(.*?)<\/ul>', action='findvideos')
+
+def newest(categoria):
+    log('ANIME PER TUTTI')
+    log(categoria)
+    itemlist = []
+    item = Item()
+    try:
+        if categoria == "anime":
+            item.url = host
+            item.action = "last_ep"
+            itemlist = last_ep(item)
+
+            if itemlist[-1].action == "last_ep":
+                itemlist.pop()
+    # Continua la ricerca in caso di errore 
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("{0}".format(line))
+        return []
+
+    return itemlist
 
-@support.scrape
 def genres(item):
-    blacklist = ['Contattaci','Privacy Policy', 'DMCA']
-    patronMenu = r'<a href="(?P<url>[^"]+)">(?P<title>[^<]+)<'
-    patronBlock = r'Generi</a>\s*<ul[^>]+>(?P<block>.*?)<\/ul>'
-    action = 'peliculas'
-    return locals()
+    itemlist = support.scrape(item, '<a href="([^"]+)">([^<]+)<', ['url', 'title'], action='peliculas', patron_block=r'Generi.*?<ul.*?>(.*?)<\/ul>', blacklist=['Contattaci','Privacy Policy', 'DMCA'])
+    return support.thumb(itemlist)
 
+def peliculas(item):    
+    log()
+    itemlist = []
 
-@support.scrape
-def peliculas(item):
-    anime = True
     blacklist = ['top 10 anime da vedere']
-    if item.url != host: patronBlock = r'<div id="main-content(?P<block>.*?)<aside'
-    patron = r'<figure class="(?:mh-carousel-thumb|mh-posts-grid-thumb)"> <a class="[^"]+" href="(?P<url>[^"]+)" title="(?P<title>.*?)(?: \((?P<year>\d+)\))? (?:(?P<lang>SUB ITA|ITA))(?: (?P<title2>[Mm][Oo][Vv][Ii][Ee]))?[^"]*"><img[^s]+src="(?P<thumb>[^"]+)"[^>]+'
-    def itemHook(item):
-        if 'movie' in item.title.lower():
-            item.title = support.re.sub(' - [Mm][Oo][Vv][Ii][Ee]|[Mm][Oo][Vv][Ii][Ee]','',item.title)
-            item.title += support.typo('Movie','_ () bold')
-            item.contentType = 'movie'
-            item.action = 'findvideos'
-        return item
-    patronNext = r'<a class="next page-numbers" href="([^"]+)">'
-    action = 'episodios'
-    return locals()
+    matches, data = support.match(item, r'<a class="[^"]+" href="([^"]+)" title="([^"]+)"><img[^s]+src="([^"]+)"[^>]+')
 
+    for url, title, thumb in matches:
+        title = scrapertoolsV2.decodeHtmlentities(title.strip()).replace("streaming", "")        
+        lang = scrapertoolsV2.find_single_match(title, r"((?:SUB ITA|ITA))")
+        videoType = '' 
+        if 'movie' in title.lower():
+            videoType = ' - (MOVIE)' 
+        if 'ova' in title.lower():
+            videoType = ' - (OAV)'
+
+        cleantitle = title.replace(lang, "").replace('(Streaming & Download)', '').replace('( Streaming & Download )', '').replace('OAV', '').replace('OVA', '').replace('MOVIE', '').strip()
+
+        if not videoType :
+            contentType="tvshow"
+            action="episodios"
+        else:
+            contentType="movie"
+            action="findvideos"
+
+        if not title.lower() in blacklist:
+            itemlist.append(
+                Item(channel=item.channel,
+                    action=action,
+                    contentType=contentType,
+                    title=support.typo(cleantitle + videoType, 'bold') + support.typo(lang,'_ [] color kod'),
+                    fulltitle=cleantitle,                    
+                    show=cleantitle,
+                    url=url,
+                    thumbnail=thumb))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    autorenumber.renumber(itemlist)    
+    support.nextPage(itemlist, item, data, r'<a class="next page-numbers" href="([^"]+)">')
+
+    return itemlist
 
-@support.scrape
 def episodios(item):
-    url = item.url
-    anime = True
-    patronBlock = r'(?:<p style="text-align: left;">|<div class="pagination clearfix">\s*)(?P<block>.*?)</span></a></div>'
-    patron = r'(?:<a href="(?P<url>[^"]+)"[^>]+>)?<span class="pagelink">(?P<episode>\d+)</span>'
-    def itemHook(item):
-        if not item.url:
-            item.url = url
-        item.title = support.typo('Episodio ', 'bold') + item.title
-        return item
-    return locals()
+    log()
+    itemlist = []
 
+    data = httptools.downloadpage(item.url).data
+    block = scrapertoolsV2.find_single_match(data, r'(?:<p style="text-align: left;">|<div class="pagination clearfix">\s*)(.*?)</span></a></div>')
+
+    itemlist.append(
+        Item(channel=item.channel,
+             action='findvideos',
+             contentType='episode',
+             title=support.typo('Episodio 1 bold'),
+             fulltitle=item.title,
+             url=item.url,
+             thumbnail=item.thumbnail))
+
+    if block:
+        matches = re.compile(r'<a href="([^"]+)".*?><span class="pagelink">(\d+)</span></a>', re.DOTALL).findall(data)
+        for url, number in matches:
+            itemlist.append(
+                Item(channel=item.channel,
+                     action='findvideos',
+                     contentType='episode',
+                     title=support.typo('Episodio ' + number,'bold'),
+                     fulltitle=item.title,
+                     url=url,
+                     thumbnail=item.thumbnail))
+    
+    autorenumber.renumber(itemlist, item)
+    support.videolibrary
+    return itemlist
 
 def findvideos(item):
-    support.log()
+    log()
     data = ''
     matches = support.match(item, 'str="([^"]+)"')[0]
     if matches:
         for match in matches:
-            data += str(jsfunctions.unescape(support.re.sub('@|g','%', match)))
+            data += str(jsfunctions.unescape(re.sub('@|g','%', match)))
             data += str(match)
+            log('DATA',data)
+            if 'animepertutti' in data:
+                log('ANIMEPERTUTTI!')
+          
     else:
         data = ''
 
-    return support.server(item,data)
+    itemlist = support.server(item,data)
+        
+    if checklinks:
+        itemlist = servertools.check_list_links(itemlist, checklinks_number)
+
+    # itemlist = filtertools.get_links(itemlist, item, list_language)
+    autoplay.start(itemlist, item)
+    
+    return itemlist
diff --git a/channels/animesaturn.json b/channels/animesaturn.json
index c2e68a8a..d07baf12 100644
--- a/channels/animesaturn.json
+++ b/channels/animesaturn.json
@@ -8,14 +8,6 @@
     "banner": "animesaturn.png",
     "categories": ["anime"],
     "settings": [
-        {
-            "id": "modo_grafico",
-            "type": "bool",
-            "label": "Cerca informazioni extra",
-            "default": true,
-            "enabled": true,
-            "visible": true
-        },
         {
             "id": "channel_host",
             "type": "text",
@@ -65,6 +57,15 @@
             "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"]
+        },
         {
             "id": "autorenumber", 
             "type": "bool", 
diff --git a/channels/animesaturn.py b/channels/animesaturn.py
index 3d3e803d..90edb519 100644
--- a/channels/animesaturn.py
+++ b/channels/animesaturn.py
@@ -3,117 +3,377 @@
 # Canale per AnimeSaturn
 # Thanks to 4l3x87
 # ----------------------------------------------------------
+import re
 
-from core import support
+import urlparse
+
+import channelselector
+from core import httptools, tmdb, support, scrapertools, jsontools
+from core.item import Item
+from core.support import log
+from platformcode import logger, config
+from specials import autoplay, autorenumber
 
 __channel__ = "animesaturn"
-host = support.config.get_setting("channel_host", __channel__)
-headers={'X-Requested-With': 'XMLHttpRequest'}
+host = config.get_setting("channel_host", __channel__)
+headers = [['Referer', host]]
 
-IDIOMAS = {'Italiano': 'ITA'}
+IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
 list_servers = ['openload', 'fembed', 'animeworld']
 list_quality = ['default', '480p', '720p', '1080p']
 
-@support.menu
+
 def mainlist(item):
-    
-    anime = ['/animelist?load_all=1',    
-             ('Più Votati',['/toplist','menu', 'top']),
-             ('In Corso',['/animeincorso','peliculas','incorso']),
-             ('Ultimi Episodi',['/fetch_pages.php?request=episodes','peliculas','updated'])]
-
-    return locals()
-
-
-@support.scrape
-def search(item, texto):
-    search = texto
-    item.contentType = 'tvshow'
-    patron = r'href="(?P<url>[^"]+)"[^>]+>[^>]+>(?P<title>[^<|(]+)(?:(?P<lang>\(([^\)]+)\)))?<|\)'
-    action = 'check'    
-    return locals()
-
-
-def newest(categoria):
-    support.log()
+    log()
     itemlist = []
-    item = support.Item()
+    support.menu(itemlist, 'Novità bold', 'ultimiep', "%s/fetch_pages.php?request=episodes" % host, 'tvshow')
+    support.menu(itemlist, 'Anime bold', 'lista_anime', "%s/animelist?load_all=1" % host)
+    support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', '%s/animelist?load_all=1' % host, args=['tvshow', 'alfabetico'])
+    support.menu(itemlist, 'Cerca', 'search', host)
+    support.aplay(item, itemlist, list_servers, list_quality)
+    support.channel_config(item, itemlist)
+
+    return itemlist
+
+
+# ----------------------------------------------------------------------------------------------------------------
+def cleantitle(scrapedtitle):
+    scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle.strip())
+    scrapedtitle = scrapedtitle.replace('[HD]', '').replace('’', '\'').replace('×', 'x').replace('"', "'")
+    year = scrapertools.find_single_match(scrapedtitle, '\((\d{4})\)')
+    if year:
+        scrapedtitle = scrapedtitle.replace('(' + year + ')', '')
+
+    return scrapedtitle.strip()
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def lista_anime(item):
+    log()
+    itemlist = []
+
+    PERPAGE = 15
+
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    if '||' in item.url:
+        series = item.url.split('\n\n')
+        matches = []
+        for i, serie in enumerate(series):
+            matches.append(serie.split('||'))
+    else:
+        # Estrae i contenuti
+        patron = r'<a href="([^"]+)"[^>]*?>[^>]*?>(.+?)<'
+        matches = support.match(item, patron, headers=headers)[0]
+
+    scrapedplot = ""
+    scrapedthumbnail = ""
+    for i, (scrapedurl, scrapedtitle) in enumerate(matches):
+        if (p - 1) * PERPAGE > i: continue
+        if i >= p * PERPAGE: break
+        title = cleantitle(scrapedtitle).replace('(ita)', '(ITA)')
+        movie = False
+        showtitle = title
+        if '(ITA)' in title:
+            title = title.replace('(ITA)', '').strip()
+            showtitle = title
+        else:
+            title += ' ' + support.typo('Sub-ITA', '_ [] color kod')
+
+        infoLabels = {}
+        if 'Akira' in title:
+            movie = True
+            infoLabels['year'] = 1988
+
+        if 'Dragon Ball Super Movie' in title:
+            movie = True
+            infoLabels['year'] = 2019
+
+        itemlist.append(
+            Item(channel=item.channel,
+                 extra=item.extra,
+                 action="episodios" if movie == False else 'findvideos',
+                 title=title,
+                 url=scrapedurl,
+                 thumbnail=scrapedthumbnail,
+                 fulltitle=showtitle,
+                 show=showtitle,
+                 contentTitle=showtitle,
+                 plot=scrapedplot,
+                 contentType='episode' if movie == False else 'movie',
+                 originalUrl=scrapedurl,
+                 infoLabels=infoLabels,
+                 folder=True))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    autorenumber.renumber(itemlist)
+
+    # Paginazione
+    if len(matches) >= p * PERPAGE:
+        support.nextPage(itemlist, item, next_page=(item.url + '{}' + str(p + 1)))
+
+    return itemlist
+
+
+# ================================================================================================================
+
+
+# ----------------------------------------------------------------------------------------------------------------
+def episodios(item):
+    log()
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
+    anime_id = scrapertools.find_single_match(data, r'\?anime_id=(\d+)')
+    # movie or series
+    movie = scrapertools.find_single_match(data, r'\Episodi:</b>\s(\d*)\sMovie')
+
+    data = httptools.downloadpage(
+        host + "/loading_anime?anime_id=" + anime_id,
+        headers={
+            'X-Requested-With': 'XMLHttpRequest'
+        }).data
+
+    patron = r'<td style="[^"]+"><b><strong" style="[^"]+">(.+?)</b></strong></td>\s*'
+    patron += r'<td style="[^"]+"><a href="([^"]+)"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+
+    for scrapedtitle, scrapedurl in matches:
+        scrapedtitle = cleantitle(scrapedtitle)
+        scrapedtitle = re.sub(r'<[^>]*?>', '', scrapedtitle)
+        scrapedtitle = '[B]' + scrapedtitle + '[/B]'
+
+        itemlist.append(
+            Item(
+                channel=item.channel,
+                action="findvideos",
+                contentType="episode",
+                title=scrapedtitle,
+                url=urlparse.urljoin(host, scrapedurl),
+                fulltitle=scrapedtitle,
+                show=scrapedtitle,
+                plot=item.plot,
+                fanart=item.thumbnail,
+                thumbnail=item.thumbnail))
+
+    if ((len(itemlist) == 1 and 'Movie' in itemlist[0].title) or movie) and item.contentType != 'movie':
+        item.url = itemlist[0].url
+        item.contentType = 'movie'
+        return findvideos(item)
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    autorenumber.renumber(itemlist, item)
+    support.videolibrary(itemlist, item, 'bold color kod')
+
+    return itemlist
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def findvideos(item):
+    log()
+    originalItem = item
+
+    if item.contentType == 'movie':
+        episodes = episodios(item)
+        if len(episodes) > 0:
+            item.url = episodes[0].url
+
+    itemlist = []
+    data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
+    data = re.sub(r'\n|\t|\s+', ' ', data)
+    patron = r'<a href="([^"]+)"><div class="downloadestreaming">'
+    url = scrapertools.find_single_match(data, patron)
+    data = httptools.downloadpage(url, headers=headers, ignore_response_code=True).data
+    data = re.sub(r'\n|\t|\s+', ' ', data)
+    itemlist = support.server(item, data=data)
+
+    return itemlist
+
+
+# ================================================================================================================
+
+
+# ----------------------------------------------------------------------------------------------------------------
+
+def ultimiep(item):
+    log()
+    itemlist = []
+
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    post = "page=%s" % p if p > 1 else None
+
+    data = httptools.downloadpage(
+        item.url, post=post, headers={
+            'X-Requested-With': 'XMLHttpRequest'
+        }).data
+
+    patron = r"""<a href='[^']+'><div class="locandina"><img alt="[^"]+" src="([^"]+)" title="[^"]+" class="grandezza"></div></a>\s*"""
+    patron += r"""<a href='([^']+)'><div class="testo">(.+?)</div></a>\s*"""
+    patron += r"""<a href='[^']+'><div class="testo2">(.+?)</div></a>"""
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedthumbnail, scrapedurl, scrapedtitle1, scrapedtitle2 in matches:
+        scrapedtitle1 = cleantitle(scrapedtitle1)
+        scrapedtitle2 = cleantitle(scrapedtitle2)
+        scrapedtitle = scrapedtitle1 + ' - ' + scrapedtitle2 + ''
+
+        title = scrapedtitle
+        showtitle = scrapedtitle
+        if '(ITA)' in title:
+            title = title.replace('(ITA)', '').strip()
+            showtitle = title
+        else:
+            title += ' ' + support.typo('Sub-ITA', '_ [] color kod')
+
+
+        itemlist.append(
+            Item(channel=item.channel,
+                 contentType="episode",
+                 action="findvideos",
+                 title=title,
+                 url=scrapedurl,
+                 fulltitle=scrapedtitle1,
+                 show=showtitle,
+                 thumbnail=scrapedthumbnail))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    # Pagine
+    patronvideos = r'data-page="(\d+)" title="Next">Pagina Successiva'
+    next_page = scrapertools.find_single_match(data, patronvideos)
+    if next_page:
+        support.nextPage(itemlist, item, next_page=(item.url + '{}' + next_page))
+
+    return itemlist
+
+
+# ================================================================================================================
+
+
+# ----------------------------------------------------------------------------------------------------------------
+def newest(categoria):
+    log(categoria)
+    itemlist = []
+    item = Item()
+    item.url = host
+    item.extra = ''
     try:
         if categoria == "anime":
-            item.url = host + '/fetch_pages.php?request=episodes'
-            item.args = "updated"
-            return peliculas(item)
-    # Continua la ricerca in caso di errore 
+            item.url = "%s/fetch_pages?request=episodios" % host
+            item.action = "ultimiep"
+            itemlist = ultimiep(item)
+
+            if itemlist[-1].action == "ultimiep":
+                itemlist.pop()
+
+    # Continua la ricerca in caso di errore
     except:
         import sys
         for line in sys.exc_info():
-            support.logger.error("{0}".format(line))
+            logger.error("{0}".format(line))
         return []
 
     return itemlist
 
-@support.scrape
-def menu(item):
-    patronMenu = r'u>(?P<title>[^<]+)<u>(?P<url>.*?)</div> </div>'
-    action = 'peliculas'
-    return locals()
 
+# ================================================================================================================
 
-@support.scrape
-def peliculas(item):
-    anime = True
-    if item.args == 'updated':
-        post = "page=" + str(item.page if item.page else 1) if item.page > 1 else None
-        page, data = support.match(item, r'data-page="(\d+)" title="Next">', post=post, headers=headers)
-        patron = r'<img alt="[^"]+" src="(?P<thumb>[^"]+)" [^>]+></div></a>\s*<a href="(?P<url>[^"]+)"><div class="testo">(?P<title>[^\(<]+)(?:(?P<lang>\(([^\)]+)\)))?</div></a>\s*<a href="[^"]+"><div class="testo2">[^\d]+(?P<episode>\d+)</div></a>'
-        if page: nextpage = page
-        action = 'findvideos'
-    elif item.args == 'top':
-        data = item.url
-        patron = r'<a href="(?P<url>[^"]+)">[^>]+>(?P<title>[^<\(]+)(?:\((?P<year>[^\)]+)\))?</div></a><div class="numero">(?P<title2>[^<]+)</div>.*?src="(?P<thumb>[^"]+)"' 
-        action = 'check'
-    else:
-        pagination = ''
-        if item.args == 'incorso': patron = r'"slider_title" href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+>(?P<title>[^\(<]+)(?:\((?P<year>\d+)\))?</a>' 
-        else: patron = r'href="(?P<url>[^"]+)"[^>]+>[^>]+>(?P<title>[^<|(]+)(?:(?P<lang>\(([^\)]+)\)))?<|\)'
-        action = 'check'
-    return locals()
-
-
-def check(item):
-    movie, data = support.match(item, r'Episodi:</b> (\d*) Movie')
-    anime_id = support.match(data, r'anime_id=(\d+)')[0][0]    
-    item.url = host + "/loading_anime?anime_id=" + anime_id
-    support.log('MOVIE= ', movie)
-    if movie:
-        item.contentType = 'movie'
-        episodes = episodios(item)
-        if len(episodes) > 0: item.url = episodes[0].url
-        return findvideos(item)
-    else:
-        return episodios(item)
-
-
-@support.scrape
-def episodios(item):
-    if item.contentType != 'movie': anime = True
-    patron = r'<strong" style="[^"]+">(?P<title>[^<]+)</b></strong></td>\s*<td style="[^"]+"><a href="(?P<url>[^"]+)"'
-    return locals()
-
-
-def findvideos(item):
-    support.log(item)
+# ----------------------------------------------------------------------------------------------------------------
+def search_anime(item, texto):
+    log(texto)
     itemlist = []
-    url = support.match(item, r'<a href="([^"]+)"><div class="downloadestreaming">',headers=headers)[0]
-    if url: item.url = url[0]
-    return support.server(item)
+
+    data = httptools.downloadpage(host + "/index.php?search=1&key=%s" % texto).data
+    jsondata = jsontools.load(data)
+
+    for title in jsondata:
+        data = str(httptools.downloadpage("%s/templates/header?check=1" % host, post="typeahead=%s" % title).data)
+
+        if 'Anime non esistente' in data:
+            continue
+        else:
+            title = title.replace('(ita)', '(ITA)')
+            showtitle = title
+            if '(ITA)' in title:
+                title = title.replace('(ITA)', '').strip()
+                showtitle = title
+            else:
+                title += ' ' + support.typo('Sub-ITA', '_ [] color kod')
+
+            url = "%s/anime/%s" % (host, data)
+
+            itemlist.append(
+                Item(
+                    channel=item.channel,
+                    contentType="episode",
+                    action="episodios",
+                    title=title,
+                    url=url,
+                    fulltitle=title,
+                    show=showtitle,
+                    thumbnail=""))
+
+    return itemlist
 
 
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def search(item, texto):
+    log(texto)
+    itemlist = []
+
+    try:
+        return search_anime(item, texto)
+
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
 
 
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
 
 
+def list_az(item):
+    log()
+    itemlist = []
 
+    alphabet = dict()
 
+    # Articoli
+    patron = r'<a href="([^"]+)"[^>]*?>[^>]*?>(.+?)<'
+    matches = support.match(item, patron, headers=headers)[0]
 
+    for i, (scrapedurl, scrapedtitle) in enumerate(matches):
+        letter = scrapedtitle[0].upper()
+        if letter not in alphabet:
+            alphabet[letter] = []
+        alphabet[letter].append(scrapedurl + '||' + scrapedtitle)
+
+    for letter in sorted(alphabet):
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="lista_anime",
+                 url='\n\n'.join(alphabet[letter]),
+                 title=letter,
+                 fulltitle=letter))
+
+    return itemlist
+
+# ================================================================================================================
diff --git a/channels/animesubita.json b/channels/animesubita.json
index 10d977f5..89d78fc6 100644
--- a/channels/animesubita.json
+++ b/channels/animesubita.json
@@ -31,38 +31,6 @@
             "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": "autorenumber", 
-            "type": "bool", 
-            "label": "@70712", 
-            "default": false, 
-            "enabled": true, 
-            "visible": true
-        },
-        {
-            "id": "autorenumber_mode",
-            "type": "bool",
-            "label": "@70688",
-            "default": false,
-            "enabled": true,
-            "visible": "eq(-1,true)"
         }
     ]
 }
diff --git a/channels/animesubita.py b/channels/animesubita.py
index 2bf8b2ce..93fc9f18 100644
--- a/channels/animesubita.py
+++ b/channels/animesubita.py
@@ -1,37 +1,65 @@
 # -*- coding: utf-8 -*-
+# Ringraziamo Icarus crew
 # ------------------------------------------------------------
+# Ringraziamo Icarus crew
 # Canale per AnimeSubIta
 # ------------------------------------------------------------
 
+import re
+import urllib
+import urlparse
 
-from core import support
+from core import httptools, scrapertools, tmdb, support
+from core.item import Item
+from platformcode import logger, config
 
 __channel__ = "animesubita"
-host = support.config.get_channel_url(__channel__)
-headers = {'Upgrade-Insecure-Requests': '1', 'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0'}
+host = config.get_channel_url(__channel__)
+PERPAGE = 20
 
-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()
+    logger.info()
+    itemlist = [Item(channel=item.channel,
+                     action="lista_anime_completa",
+                     title=support.color("Lista Anime", "azure"),
+                     url="%s/lista-anime/" % host,
+                     thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
+                Item(channel=item.channel,
+                     action="ultimiep",
+                     title=support.color("Ultimi Episodi", "azure"),
+                     url="%s/category/ultimi-episodi/" % host,
+                     thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
+                Item(channel=item.channel,
+                     action="lista_anime",
+                     title=support.color("Anime in corso", "azure"),
+                     url="%s/category/anime-in-corso/" % host,
+                     thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
+                Item(channel=item.channel,
+                     action="categorie",
+                     title=support.color("Categorie", "azure"),
+                     url="%s/generi/" % host,
+                     thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
+                Item(channel=item.channel,
+                     action="search",
+                     title=support.color("Cerca anime ...", "yellow"),
+                     extra="anime",
+                     thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")
+                ]
 
+    return itemlist
 
+# ================================================================================================================
+# ----------------------------------------------------------------------------------------------------------------
 def newest(categoria):
-    support.log(categoria)
+    logger.info()
     itemlist = []
-    item = support.Item()
+    item = Item()
     try:
         if categoria == "anime":
             item.url = host
-            item.args = "updated"
-            itemlist = peliculas(item)
+            item.action = "ultimiep"
+            itemlist = ultimiep(item)
 
             if itemlist[-1].action == "ultimiep":
                 itemlist.pop()
@@ -39,92 +67,277 @@ def newest(categoria):
     except:
         import sys
         for line in sys.exc_info():
-            support.logger.error("{0}".format(line))
+            logger.error("{0}".format(line))
         return []
 
     return itemlist
 
-
+# ================================================================================================================
+# ----------------------------------------------------------------------------------------------------------------
 def search(item, texto):
-    support.log(texto)
+    logger.info()
     item.url = host + "/?s=" + texto
-    item.args = 'alt'
     try:
-        return peliculas(item)
+        return lista_anime(item)
     # Continua la ricerca in caso di errore 
     except:
         import sys
         for line in sys.exc_info():
-            support.logger.error("%s" % line)
+            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*(?P<episode>Episodio \d+)[^"]+"[^>]*>\s*<img[^src]+src="(?P<thumb>[^"]+)"'
-        patronNext = r'<link rel="next" href="([^"]+)"\s*/>'
-        action = 'findvideos'
-    elif item.args == 'alt':
-        # debug = True
-        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)
+# ----------------------------------------------------------------------------------------------------------------
+def categorie(item):
+    logger.info()
     itemlist = []
 
-    if item.args == 'updated':
-        ep = support.match(item.fulltitle,r'(Episodio\s*\d+)')[0][0]
-        item.url = support.re.sub(r'episodio-\d+-|oav-\d+-', '',item.url)
-        if 'streaming' not in item.url: item.url = item.url.replace('sub-ita','sub-ita-streaming')
-        item.url = support.match(item, r'<a href="([^"]+)"[^>]+>', ep + '(.*?)</tr>', )[0][0]
+    data = httptools.downloadpage(item.url).data
+    patron = r'<li><a title="[^"]+" href="([^"]+)">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
-    urls = support.match(item.url, r'(episodio\d*.php.*)')[0]
-    for url in urls:
-        url = host + '/' + url
-        headers['Referer'] =  url
-        data = support.match(item, headers=headers, url=url)[1]
-        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(data, r'<source src="([^"]+)"[^>]+>')[0][0] + '|' + support.urllib.urlencode(headers)
+    for scrapedurl, scrapedtitle in matches:
         itemlist.append(
-            support.Item(channel=item.channel,
-                         action="play",
-                         title='diretto',
-                         quality='',
-                         url=url,
-                         server='directo',
-                         fulltitle=item.fulltitle,
-                         show=item.show))
+                Item(channel=item.channel,
+                     action="lista_anime",
+                     title=scrapedtitle.replace('Anime', '').strip(),
+                     text_color="azure",
+                     url=scrapedurl,
+                     thumbnail=item.thumbnail,
+                     folder=True))
 
-    return support.server(item,url,itemlist)
+    return itemlist
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def ultimiep(item):
+    logger.info("ultimiep")
+    itemlist = lista_anime(item, False, False)
+
+    for itm in itemlist:
+        title = scrapertools.decodeHtmlentities(itm.title)
+        # Pulizia titolo
+        title = title.replace("Streaming", "").replace("&", "")
+        title = title.replace("Download", "")
+        title = title.replace("Sub Ita", "").strip()
+        eptype = scrapertools.find_single_match(title, "((?:Episodio?|OAV))")
+        cleantitle = re.sub(r'%s\s*\d*\s*(?:\(\d+\)|)' % eptype, '', title).strip()
+        # Creazione URL
+        url = re.sub(r'%s-?\d*-' % eptype.lower(), '', itm.url)
+        if "-streaming" not in url:
+            url = url.replace("sub-ita", "sub-ita-streaming")
+
+        epnumber = ""
+        if 'episodio' in eptype.lower():
+            epnumber = scrapertools.find_single_match(title.lower(), r'episodio?\s*(\d+)')
+            eptype += ":? " + epnumber
+                
+        extra = "<tr>\s*<td[^>]+><strong>(?:[^>]+>|)%s(?:[^>]+>[^>]+>|[^<]*|[^>]+>)</strong>" % eptype
+        itm.title = support.color(title, 'azure').strip()
+        itm.action = "findvideos"
+        itm.url = url
+        itm.fulltitle = cleantitle
+        itm.extra = extra
+        itm.show = re.sub(r'Episodio\s*', '', title)
+        itm.thumbnail = item.thumbnail
+    
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def lista_anime(item, nextpage=True, show_lang=True):
+    logger.info()
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    blocco = scrapertools.find_single_match(data, r'<div class="post-list group">(.*?)</nav><!--/.pagination-->')
+    # patron = r'<a href="([^"]+)" title="([^"]+)">\s*<img[^s]+src="([^"]+)"[^>]+>' # Patron con thumbnail, Kodi non scarica le immagini dal sito
+    patron = r'<a href="([^"]+)" title="([^"]+)">'
+    matches = re.compile(patron, re.DOTALL).findall(blocco)
+
+    for scrapedurl, scrapedtitle in matches:
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        scrapedtitle = re.sub(r'\s+', ' ', scrapedtitle)
+        # Pulizia titolo
+        scrapedtitle = scrapedtitle.replace("Streaming", "").replace("&", "")
+        scrapedtitle = scrapedtitle.replace("Download", "")
+        lang = scrapertools.find_single_match(scrapedtitle, r"([Ss][Uu][Bb]\s*[Ii][Tt][Aa])")
+        scrapedtitle = scrapedtitle.replace("Sub Ita", "").strip()
+        eptype = scrapertools.find_single_match(scrapedtitle, "((?:Episodio?|OAV))")
+        cleantitle = re.sub(r'%s\s*\d*\s*(?:\(\d+\)|)' % eptype, '', scrapedtitle)
+
+
+        cleantitle = cleantitle.replace(lang, "").strip()
+
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="episodi",
+                 contentType="tvshow" if 'oav' not in scrapedtitle.lower() else "movie",
+                 title=scrapedtitle.replace(lang, "(%s)" % support.color(lang, "red") if show_lang else "").strip(),
+                 fulltitle=cleantitle,
+                 url=scrapedurl,
+                 show=cleantitle,
+                 folder=True))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if nextpage:
+        patronvideos = r'<link rel="next" href="([^"]+)"\s*/>'
+        matches = re.compile(patronvideos, re.DOTALL).findall(data)
+        
+        if len(matches) > 0:
+            scrapedurl = matches[0]
+            itemlist.append(
+                Item(channel=item.channel,
+                    action="lista_anime",
+                    title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
+                    url=scrapedurl,
+                    thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png",
+                    folder=True))
+
+    return itemlist
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def lista_anime_completa(item):
+    logger.info()
+    itemlist = []
+
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    data = httptools.downloadpage(item.url).data
+    blocco = scrapertools.find_single_match(data, r'<ul class="lcp_catlist"[^>]+>(.*?)</ul>')
+    patron = r'<a href="([^"]+)"[^>]+>([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(blocco)
+
+    for i, (scrapedurl, scrapedtitle) in enumerate(matches):
+        if (p - 1) * PERPAGE > i: continue
+        if i >= p * PERPAGE: break
+
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle.strip())
+        cleantitle = scrapedtitle.replace("Sub Ita Streaming", "").replace("Ita Streaming", "")
+
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="episodi",
+                 contentType="tvshow" if 'oav' not in scrapedtitle.lower() else "movie",
+                 title=support.color(scrapedtitle, 'azure'),
+                 fulltitle=cleantitle,
+                 show=cleantitle,
+                 url=scrapedurl,
+                 folder=True))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if len(matches) >= p * PERPAGE:
+        scrapedurl = item.url + '{}' + str(p + 1)
+        itemlist.append(
+            Item(channel=item.channel,
+                 extra=item.extra,
+                 action="lista_anime_completa",
+                 title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
+                 url=scrapedurl,
+                 thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png",
+                 folder=True))
+
+    return itemlist
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def episodi(item):
+    logger.info()
+    itemlist = []
+    
+    data = httptools.downloadpage(item.url).data
+
+    patron = '<td style="[^"]*?">\s*.*?<strong>(.*?)</strong>.*?\s*</td>\s*<td style="[^"]*?">\s*<a href="([^"]+?)"[^>]+>\s*<img.*?src="([^"]+?)".*?/>\s*</a>\s*</td>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedtitle, scrapedurl, scrapedimg in matches:
+        if 'nodownload' in scrapedimg or 'nostreaming' in scrapedimg:
+            continue
+        if 'vvvvid' in scrapedurl.lower():
+            itemlist.append(Item(title='I Video VVVVID Non sono supportati'))
+            continue
+
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        scrapedtitle = re.sub(r'<[^>]*?>', '', scrapedtitle)
+        scrapedtitle = '[COLOR azure][B]' + scrapedtitle + '[/B][/COLOR]'
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="findvideos",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 url=urlparse.urljoin(host, scrapedurl),
+                 fulltitle=item.title,
+                 show=scrapedtitle,
+                 plot=item.plot,
+                 fanart=item.thumbnail,
+                 thumbnail=item.thumbnail))
+
+    # Comandi di servizio
+    if config.get_videolibrary_support() and len(itemlist) != 0:
+        itemlist.append(
+            Item(channel=item.channel,
+                 title="[COLOR lightblue]%s[/COLOR]" % config.get_localized_string(30161),
+                 url=item.url,
+                 action="add_serie_to_library",
+                 extra="episodios",
+                 show=item.show))
+
+    return itemlist
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def findvideos(item):
+    logger.info()
+    itemlist = []
+
+    headers = {'Upgrade-Insecure-Requests': '1',
+                'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0'}
+
+    if item.extra:
+        data = httptools.downloadpage(item.url, headers=headers).data
+        blocco = scrapertools.find_single_match(data, r'%s(.*?)</tr>' % item.extra)
+        item.url = scrapertools.find_single_match(blocco, r'<a href="([^"]+)"[^>]+>')
+
+    patron = r'http:\/\/link[^a]+animesubita[^o]+org\/[^\/]+\/.*?(episodio\d*)[^p]+php(\?.*)'
+    for phpfile, scrapedurl in re.findall(patron, item.url, re.DOTALL):
+        url = "%s/%s.php%s" % (host, phpfile, scrapedurl)
+        headers['Referer'] =  url
+        data = httptools.downloadpage(url, headers=headers).data
+        # ------------------------------------------------
+        cookies = ""
+        matches = re.compile('(.%s.*?)\n' % host.replace("http://", "").replace("www.", ""), re.DOTALL).findall(config.get_cookie_data())
+        for cookie in matches:
+            name = cookie.split('\t')[5]
+            value = cookie.split('\t')[6]
+            cookies += name + "=" + value + ";"
+        headers['Cookie'] = cookies[:-1]
+        # ------------------------------------------------
+        scrapedurl = scrapertools.find_single_match(data, r'<source src="([^"]+)"[^>]+>')
+        url = scrapedurl + '|' + urllib.urlencode(headers)
+        itemlist.append(
+            Item(channel=item.channel,
+                action="play",
+                text_color="azure",
+                title="[%s] %s" % (support.color("Diretto", "orange"), item.title),
+                fulltitle=item.fulltitle,
+                url=url,
+                thumbnail=item.thumbnail,
+                fanart=item.thumbnail,
+                plot=item.plot))
+
+    return itemlist
diff --git a/channels/animeworld.py b/channels/animeworld.py
index d6904580..0890735c 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -23,6 +23,7 @@ list_servers = ['animeworld', 'verystream', 'streamango', 'openload', 'directo']
 list_quality = ['default', '480p', '720p', '1080p']
 
 
+
 def mainlist(item):
     log()
     
@@ -55,19 +56,24 @@ def generi(item):
 def build_menu(item):
     log()
     itemlist = []
-    support.menuItem(itemlist, __channel__, 'Tutti bold', 'peliculas', item.url, 'tvshow' , args=item.args)
-    matches = support.match(item,r'<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown"> (.*?) <span.[^>]+>(.*?)</ul>',r'<form class="filters.*?>(.*?)</form>')[0]
+    support.menu(itemlist, 'Tutti bold submenu', 'video', item.url+item.args[1])
+    matches, data = support.match(item,r'<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown"> (.*?) <span.*?>(.*?)<\/ul>',r'<form class="filters.*?>(.*?)<\/form>')
+    log('ANIME DATA =' ,data)
     for title, html in matches:
         if title not in 'Lingua Ordine':
-            support.menuItem(itemlist, __channel__, title + ' submenu bold', 'build_sub_menu', html, 'tvshow', args=item.args)
+            support.menu(itemlist, title + ' submenu bold', 'build_sub_menu', html, args=item.args)
+            log('ARGS= ', item.args[0])
+            log('ARGS= ', html)
     return itemlist
 
+# Crea SottoMenu Filtro ======================================================
+
 def build_sub_menu(item):
     log()
     itemlist = []
-    matches = support.re.compile(r'<input.*?name="([^"]+)" value="([^"]+)"\s*>[^>]+>([^<]+)<\/label>', re.DOTALL).findall(item.url)
+    matches = re.compile(r'<input.*?name="([^"]+)" value="([^"]+)"\s*>[^>]+>([^<]+)<\/label>', re.DOTALL).findall(item.url)
     for name, value, title in matches:
-        support.menuItem(itemlist, __channel__, support.typo(title, 'bold'), 'peliculas', host + '/filter?&' + name + '=' + value + '&' + item.args + '&sort=2', 'tvshow', args='sub')
+        support.menu(itemlist, support.typo(title, 'bold'), 'video', host + '/filter?' + '&' + name + '=' + value + '&' + item.args[1])     
     return itemlist
 
 # Novità ======================================================
@@ -78,9 +84,12 @@ def newest(categoria):
     item = Item()
     try:
         if categoria == "anime":
-            item.url = host + '/updated'
-            item.args = "updated"
-            return peliculas(item)
+            item.url = host + '/newest'
+            item.action = "video"
+            itemlist = video(item)
+
+            if itemlist[-1].action == "video":
+                itemlist.pop()
     # Continua la ricerca in caso di errore 
     except:
         import sys
@@ -97,7 +106,7 @@ def search(item, texto):
     log(texto)
     item.url = host + '/search?keyword=' + texto
     try:
-        return peliculas(item)
+        return video(item)
     # Continua la ricerca in caso di errore
     except:
         import sys
@@ -105,6 +114,7 @@ def search(item, texto):
             logger.error("%s" % line)
         return []
 
+
 # Lista A-Z ====================================================
 
 def alfabetico(item):
@@ -238,10 +248,12 @@ def video(item):
                      context = autoplay.context,
                      number= number))
     
-    patronNext=r'href="([^"]+)" rel="next"'
-    type_content_dict={'movie':['movie']}
-    type_action_dict={'findvideos':['movie']}    
-    return locals()
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    autorenumber.renumber(itemlist)
+
+    # Next page
+    support.nextPage(itemlist, item, data, r'href="([^"]+)" rel="next"', resub=['&amp;','&'])
+    return itemlist
 
 
 def episodios(item):
@@ -277,18 +289,18 @@ def episodios(item):
 
 
 def findvideos(item):
-    log(item)
-    itemlist = []    
-    matches, data = support.match(item, r'class="tab.*?data-name="([0-9]+)">', headers=headers)
+    log()
+    itemlist = []
+    
+    matches, data = support.match(item, r'class="tab.*?data-name="([0-9]+)">([^<]+)</span', headers=headers)
     videoData = ''
     
-    for serverid in matches:
-        number = scrapertoolsV2.find_single_match(item.title,r'(\d+) -')
-        block = scrapertoolsV2.find_multiple_matches(data,'data-id="' + serverid + '">(.*?)<div class="server')
-        ID = scrapertoolsV2.find_single_match(str(block),r'<a data-id="([^"]+)" data-base="' + (number if number else '1') + '"')
-        log('ID= ',ID)
+    for serverid, servername in matches:
+        block = scrapertoolsV2.find_multiple_matches(data,'data-id="'+serverid+'">(.*?)<div class="server')
+        log('ITEM= ',item)
+        id = scrapertoolsV2.find_single_match(str(block),r'<a data-id="([^"]+)" data-base="'+item.number+'"')
         if id:
-            dataJson = httptools.downloadpage('%s/ajax/episode/info?id=%s&server=%s&ts=%s' % (host, ID, serverid, int(time.time())), headers=[['x-requested-with', 'XMLHttpRequest']]).data
+            dataJson = httptools.downloadpage('%s/ajax/episode/info?id=%s&server=%s&ts=%s' % (host, id, serverid, int(time.time())), headers=[['x-requested-with', 'XMLHttpRequest']]).data
             json = jsontools.load(dataJson)
             videoData +='\n'+json['grabber']
 
@@ -301,7 +313,6 @@ def findvideos(item):
                         quality='',
                         url=json['grabber'],
                         server='directo',
-                        fulltitle=item.fulltitle,
                         show=item.show,
                         contentType=item.contentType,
                         folder=False))
diff --git a/channels/beeg.json b/channels/beeg.json
deleted file mode 100755
index 01d595cb..00000000
--- a/channels/beeg.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "beeg",
-  "name": "Beeg",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "beeg.png",
-  "banner": "beeg.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/beeg.py b/channels/beeg.py
deleted file mode 100755
index 3ce4c8f9..00000000
--- a/channels/beeg.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-
-from core import jsontools as json
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-from core import httptools
-
-
-url_api = ""
-Host = "https://beeg.com"
-
-
-def get_api_url():
-    global url_api
-    data = httptools.downloadpage(Host).data
-    version = re.compile('var beeg_version = ([\d]+)').findall(data)[0]
-    url_api = Host + "/api/v6/" + version
-
-
-get_api_url()
-
-
-def mainlist(item):
-    logger.info()
-    get_api_url()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="videos", title="Útimos videos", url=url_api + "/index/main/0/pc",
-                         viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="canal", title="Canal",
-                        url=url_api + "/channels"))
-    itemlist.append(Item(channel=item.channel, action="listcategorias", title="Categorias",
-                         url=url_api + "/index/main/0/pc", extra="nonpopular"))
-    itemlist.append(
-        Item(channel=item.channel, action="search", title="Buscar"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = url_api + "/index/tag/0/pc?tag=%s" % (texto)
-    
-    try:
-        return videos(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-def videos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    JSONData = json.load(data)
-    for Video in JSONData["videos"]:
-        thumbnail = "http://img.beeg.com/236x177/" + str(Video["id"]) + ".jpg"
-        url= '%s/video/%s?v=2&s=%s&e=%s' % (url_api, Video['svid'], Video['start'], Video['end'])
-        title = Video["title"]
-        itemlist.append(
-            Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot="", show="",
-                 folder=True, contentType="movie"))
-    # Paginador
-    Actual = int(scrapertools.find_single_match(item.url, url_api + '/index/[^/]+/([0-9]+)/pc'))
-    if JSONData["pages"] - 1 > Actual:
-        scrapedurl = item.url.replace("/" + str(Actual) + "/", "/" + str(Actual + 1) + "/")
-        itemlist.append(
-            Item(channel=item.channel, action="videos", title="Página Siguiente", url=scrapedurl, thumbnail="",
-                 viewmode="movie"))
-    return itemlist
-
-
-def listcategorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    JSONData = json.load(data)
-    for Tag in JSONData["tags"]:
-        url = url_api + "/index/tag/0/pc?tag=" + Tag["tag"]
-        url = url.replace("%20", "-")
-        title = '%s (%s)' % (str(Tag["tag"]), str(Tag["videos"]))
-        itemlist.append(
-            Item(channel=item.channel, action="videos", title=title, url=url, viewmode="movie", type="item"))
-    return itemlist
-
-
-def canal(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    JSONData = json.load(data)
-    for Tag in JSONData["channels"]:
-        url = url_api + "/index/channel/0/pc?channel=" + Tag["channel"]
-        url = url.replace("%20", "-")
-        title = '%s (%s)' % (str(Tag["ps_name"]), str(Tag["videos"]))
-        itemlist.append(
-            Item(channel=item.channel, action="videos", title=title, url=url, viewmode="movie", type="item"))
-    return itemlist
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    JSONData = json.load(data)
-    for key in JSONData:
-        videourl = re.compile("([0-9]+p)", re.DOTALL).findall(key)
-        if videourl:
-            videourl = videourl[0]
-            if not JSONData[videourl] == None:
-                url = JSONData[videourl]
-                url = url.replace("{DATA_MARKERS}", "data=pc.ES")
-                if not url.startswith("https:"): url = "https:" + url
-                title = videourl
-                itemlist.append(["%s %s [directo]" % (title, url[-4:]), url])
-    itemlist.sort(key=lambda item: item[0])
-    return itemlist
-
diff --git a/channels/bravoporn.py b/channels/bravoporn.py
index 740dd779..b8c52c35 100644
--- a/channels/bravoporn.py
+++ b/channels/bravoporn.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
 
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.bravoporn.com'
 
diff --git a/channels/camwhoresbay.py b/channels/camwhoresbay.py
index 85ba0b04..330edb20 100644
--- a/channels/camwhoresbay.py
+++ b/channels/camwhoresbay.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.camwhoresbay.com'
 
@@ -65,7 +66,7 @@ def lista(item):
     for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
         title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = "http:" + scrapedthumbnail + "|Referer=%s" % item.url
+        thumbnail = scrapedthumbnail
         plot = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot=plot,
                               contentTitle = scrapedtitle, fanart=thumbnail))
@@ -107,7 +108,7 @@ def play(item):
     if scrapedurl == "" :
         scrapedurl = scrapertools.find_single_match(data, 'video_url: \'([^\']+)\'')
 
-    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, url=scrapedurl,
+    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, fulltitle=item.title, url=scrapedurl,
                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo"))
     return itemlist
 
diff --git a/channels/canalporno.py b/channels/canalporno.py
index 58051909..01a8dcf9 100644
--- a/channels/canalporno.py
+++ b/channels/canalporno.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-import urlparse,re
 
 from core import httptools
 from core import scrapertools
 from platformcode import logger
+from platformcode import config
 
 host = "http://www.canalporno.com"
 
@@ -11,21 +11,20 @@ host = "http://www.canalporno.com"
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append(item.clone(action="lista", title="Útimos videos", url=host + "/ajax/homepage/?page=1"))
-    itemlist.append(item.clone(action="categorias", title="Canal", url=host + "/ajax/list_producers/?page=1"))
-    itemlist.append(item.clone(action="categorias", title="PornStar", url=host + "/ajax/list_pornstars/?page=1"))
-    itemlist.append(item.clone(action="categorias", title="Categorias",
+    itemlist.append(item.clone(action="findvideos", title="Útimos videos", url=host))
+    itemlist.append(item.clone(action="categorias", title="Listado Categorias",
                                url=host + "/categorias"))
-    itemlist.append(item.clone(action="search", title="Buscar"))
+    itemlist.append(item.clone(action="search", title="Buscar", url=host + "/search/?q=%s"))
     return itemlist
 
 
 def search(item, texto):
     logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/ajax/new_search/?q=%s&page=1" % texto
+
     try:
-        return lista(item)
+        item.url = item.url % texto
+        itemlist = findvideos(item)
+        return sorted(itemlist, key=lambda it: it.title)
     except:
         import sys
         for line in sys.exc_info():
@@ -33,60 +32,57 @@ def search(item, texto):
         return []
 
 
-def categorias(item):
+def findvideos(item):
     logger.info()
     itemlist = []
+
     data = httptools.downloadpage(item.url).data
-    if "pornstars" in item.url:
-        patron = '<div class="muestra.*?href="([^"]+)".*?src=\'([^\']+)\'.*?alt="([^"]+)".*?'
-    else:
-        patron = '<div class="muestra.*?href="([^"]+)".*?src="([^"]+)".*?alt="([^"]+)".*?'
-    if "Categorias" in item.title:
-        patron += '<div class="numero">([^<]+)</div>'
-    else:
-        patron += '</span> (\d+) vídeos</div>'
+
+    patron = '<img src="([^"]+)".*?alt="([^"]+)".*?<h2><a href="([^"]+)">.*?' \
+             '<div class="duracion"><span class="ico-duracion sprite"></span> ([^"]+) min</div>'
     matches = scrapertools.find_multiple_matches(data, patron)
-    for url, scrapedthumbnail, scrapedtitle, cantidad in matches:
-        title= "%s [COLOR yellow] %s [/COLOR]" % (scrapedtitle, cantidad) 
-        url= url.replace("/videos-porno/", "/ajax/show_category/").replace("/sitio/", "/ajax/show_producer/").replace("/pornstar/", "/ajax/show_pornstar/")
-        url = host + url + "?page=1"
-        itemlist.append(item.clone(action="lista", title=title, url=url, thumbnail=scrapedthumbnail))
-    if "/?page=" in item.url:
-        next_page=item.url
-        num= int(scrapertools.find_single_match(item.url,".*?/?page=(\d+)"))
-        num += 1
-        next_page = "?page=" + str(num)
-        if next_page!="":
-            next_page = urlparse.urljoin(item.url,next_page)
-            itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
+    for thumbnail, title, url, time in matches:
+        scrapedtitle = time + " - " + title
+        scrapedurl = host + url
+        scrapedthumbnail = thumbnail
+        itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl,
+                                   thumbnail=scrapedthumbnail))
+
+    patron = '<div class="paginacion">.*?<span class="selected">.*?<a href="([^"]+)">([^"]+)</a>'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for url, title in matches:
+        url = host + url
+        title = "Página %s" % title
+        itemlist.append(item.clone(action="findvideos", title=title, url=url))
+
     return itemlist
 
 
-def lista(item):
+def categorias(item):
     logger.info()
     itemlist = []
+
     data = httptools.downloadpage(item.url).data
-    patron = 'data-src="([^"]+)" alt="([^"]+)".*?<h2><a href="([^"]+)">.*?' \
-             '<div class="duracion"><span class="ico-duracion sprite"></span> ([^"]+) min</div>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedthumbnail, scrapedtitle, scrapedurl, duration in matches:
-        title = "[COLOR yellow] %s  [/COLOR] %s" % (duration, scrapedtitle)
-        url = host + scrapedurl
-        itemlist.append(item.clone(action="play", title=title, url=url, thumbnail=scrapedthumbnail))
-    last=scrapertools.find_single_match(item.url,'(.*?)page=\d+')
-    num= int(scrapertools.find_single_match(item.url,".*?/?page=(\d+)"))
-    num += 1
-    next_page = "page=" + str(num)
-    if next_page!="":
-        next_page = last + next_page
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
+    bloque = scrapertools.find_single_match(data, '<ul class="ordenar-por ordenar-por-categoria">'
+                                                  '(.*?)<\/ul>')
+
+    #patron = '<div class="muestra-categorias">.*?<a class="thumb" href="([^"]+)".*?<img class="categorias" src="([^"]+)".*?<div class="nombre">([^"]+)</div>'
+    patron = "<li><a href='([^']+)'\s?title='([^']+)'>.*?<\/a><\/li>"
+    matches = scrapertools.find_multiple_matches(bloque, patron)
+    for url, title in matches:
+        url = host + url
+        #thumbnail = "http:" + thumbnail
+        itemlist.append(item.clone(action="findvideos", title=title, url=url))
+
     return itemlist
 
 
 def play(item):
     logger.info()
     itemlist = []
+
     data = httptools.downloadpage(item.url).data
     url = scrapertools.find_single_match(data, '<source src="([^"]+)"')
     itemlist.append(item.clone(url=url, server="directo"))
+
     return itemlist
diff --git a/channels/cat3plus.json b/channels/cat3plus.json
index ada3335f..63a66ac7 100644
--- a/channels/cat3plus.json
+++ b/channels/cat3plus.json
@@ -9,6 +9,6 @@
   "banner": "https://i.imgur.com/bXUyk6m.png",
   "categories": [
     "movie",
-    "vos"
+    "vo"
   ]
-}
+}
\ No newline at end of file
diff --git a/channels/cat3plus.py b/channels/cat3plus.py
index ea0a7234..f746a00d 100644
--- a/channels/cat3plus.py
+++ b/channels/cat3plus.py
@@ -5,8 +5,7 @@
 
 
 import re
-import urllib
-import urlparse
+
 from channelselector import get_thumb
 from core import httptools
 from core import scrapertools
@@ -84,7 +83,7 @@ def search(item, texto):
     logger.info()
     if texto != "":
         texto = texto.replace(" ", "+")
-    item.url = host + "search?q=" + texto
+    item.url = host + "/search?q=" + texto
     item.extra = "busqueda"
     try:
         return list_all(item)
diff --git a/channels/cineblog01.py b/channels/cineblog01.py
index 0669b3fc..19358108 100644
--- a/channels/cineblog01.py
+++ b/channels/cineblog01.py
@@ -9,8 +9,9 @@ from core import scrapertoolsV2, httptools, servertools, tmdb, support
 from core.item import Item
 from lib import unshortenit
 from platformcode import logger, config
+from specials import autoplay
 
-#impostati dinamicamente da findhost()
+#impostati dinamicamente da getUrl()
 host = ""
 headers = ""
 
@@ -43,18 +44,18 @@ blacklist = ['BENVENUTI', 'Richieste Serie TV', 'CB01.UNO &#x25b6; TROVA L&#8217
 
 def mainlist(item):
     findhost()
-    film = [
-        ('HD', ['', 'menu', 'Film HD Streaming']),
-        ('Generi', ['', 'menu', 'Film per Genere']),
-        ('Anni', ['', 'menu', 'Film per Anno'])
-    ]
-    tvshow = ['/serietv/',
-        ('Per Lettera', ['/serietv/', 'menu', 'Serie-Tv per Lettera']),
-        ('Per Genere', ['/serietv/', 'menu', 'Serie-Tv per Genere']),
-        ('Per anno', ['/serietv/', 'menu', 'Serie-Tv per Anno'])
-    ]
 
-    return locals()
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    # Main options
+    itemlist = []
+    support.menu(itemlist, 'Ultimi 100 Film Aggiornati bold', 'last', host + '/lista-film-ultimi-100-film-aggiornati/')
+
+    support.menu(itemlist, 'Film bold', 'peliculas', host)
+    support.menu(itemlist, 'HD submenu', 'menu', host, args="Film HD Streaming")
+    support.menu(itemlist, 'Per genere submenu', 'menu', host, args="Film per Genere")
+    support.menu(itemlist, 'Per anno submenu', 'menu', host, args="Film per Anno")
+    support.menu(itemlist, 'Cerca film... submenu', 'search', host, args='film')
 
     support.menu(itemlist, 'Serie TV bold', 'peliculas', host + '/serietv/', contentType='tvshow')
     support.menu(itemlist, 'Aggiornamenti serie tv', 'last', host + '/serietv/aggiornamento-quotidiano-serie-tv/', contentType='tvshow')
@@ -65,9 +66,10 @@ def mainlist(item):
 
     autoplay.show_option(item.channel, itemlist)
 
-    return locals()
+    return itemlist
 
-def newest(categoria):
+
+def menu(item):
     findhost()
     itemlist= []
     data = httptools.downloadpage(item.url, headers=headers).data
@@ -92,21 +94,10 @@ def newest(categoria):
 
 def search(item, text):
     support.log(item.url, "search" ,text)
-    debug = True
-    item = Item()
-    item.contentType = 'movie'
-    item.url = host + '/lista-film-ultimi-100-film-aggiunti/'
-    patron = "<a href=(?P<url>[^>]+)>(?P<title>[^<([]+)(?:\[(?P<quality>[A-Z]+)\])?\s\((?P<year>[0-9]{4})\)<\/a>"
-    patronBlock = r'Ultimi 100 film aggiunti:.*?<\/td>'
 
-    return locals()
-
-
-def search(item, text):
-    support.log(item.url, "search", text)
 
     try:
-        item.url = item.url + "/?s=" + text.replace(' ', '+')
+        item.url = item.url + "/?s=" + text.replace(' ','+')
         return peliculas(item)
 
     # Continua la ricerca in caso di errore
@@ -116,6 +107,7 @@ def search(item, text):
             logger.error("%s" % line)
         return []
 
+
 def newest(categoria):
     findhost()
     itemlist = []
@@ -191,22 +183,54 @@ def peliculas(item):
         listGroups = ['thumb', 'url', 'title', 'quality', 'year', 'genre', 'duration', 'plot']
         action = 'findvideos'
     else:
-        patron = r'div class="card-image">.*?<img src="(?P<thumb>[^ ]+)" alt.*?<a href="(?P<url>[^ >]+)">(?P<title>[^<[(]+)<\/a>.*?<strong><span style="[^"]+">(?P<genre>[^<>0-9(]+)\((?P<year>[0-9]{4}).*?</(?:p|div)>(?P<plot>.*?)</div'
+        patron = r'div class="card-image">.*?<img src="([^ ]+)" alt.*?<a href="([^ >]+)">([^<[(]+)<\/a>.*?<strong><span style="[^"]+">([^<>0-9(]+)\(([0-9]{4}).*?</(?:p|div)>(.*?)</div'
+        listGroups = ['thumb', 'url', 'title', 'genre', 'year', 'plot']
         action = 'episodios'
 
-    # patronBlock=[r'<div class="?sequex-page-left"?>(?P<block>.*?)<aside class="?sequex-page-right"?>',
-    #                                           '<div class="?card-image"?>.*?(?=<div class="?card-image"?>|<div class="?rating"?>)']
-    patronNext='<a class="?page-link"? href="?([^>]+)"?><i class="fa fa-angle-right">'
-
-    return locals()
+    return support.scrape(item, patron_block=[r'<div class="?sequex-page-left"?>(.*?)<aside class="?sequex-page-right"?>',
+                                              '<div class="?card-image"?>.*?(?=<div class="?card-image"?>|<div class="?rating"?>)'],
+                          patron=patron, listGroups=listGroups,
+                          patronNext='<a class="?page-link"? href="?([^>]+)"?><i class="fa fa-angle-right">', blacklist=blacklist, action=action)
 
 
-@support.scrape
 def episodios(item):
-    patronBlock = r'(?P<block><div class="sp-head[a-z ]*?" title="Espandi">\s*STAGIONE [0-9]+ - (?P<lang>[^\s]+)(?: - (?P<quality>[^-<]+))?.*?[^<>]*?</div>.*?)<div class="spdiv">\[riduci\]</div>'
-    patron = '(?:<p>)(?P<episode>[0-9]+(?:&#215;|×)[0-9]+)(?P<url>.*?)(?:</p>|<br)'
+    itemlist = []
 
-    return locals()
+    data = httptools.downloadpage(item.url).data
+    matches = scrapertoolsV2.find_multiple_matches(data,
+                                                   r'(<div class="sp-head[a-z ]*?" title="Espandi">[^<>]*?</div>.*?)<div class="spdiv">\[riduci\]</div>')
+
+    for match in matches:
+        support.log(match)
+        blocks = scrapertoolsV2.find_multiple_matches(match, '(?:<p>)(.*?)(?:</p>|<br)')
+        season = scrapertoolsV2.find_single_match(match, r'title="Espandi">.*?STAGIONE\s+\d+([^<>]+)').strip()
+
+        for block in blocks:
+            episode = scrapertoolsV2.find_single_match(block, r'([0-9]+(?:&#215;|×)[0-9]+)').strip()
+            seasons_n = scrapertoolsV2.find_single_match(block, r'<strong>STAGIONE\s+\d+([^<>]+)').strip()
+
+            if seasons_n:
+                season = seasons_n
+
+            if not episode: continue
+
+            season = re.sub(r'&#8211;|–', "-", season)
+            itemlist.append(
+                Item(channel=item.channel,
+                     action="findvideos",
+                     contentType='episode',
+                     title="[B]" + episode + "[/B] " + season,
+                     fulltitle=episode + " " + season,
+                     show=episode + " " + season,
+                     url=block,
+                     extra=item.extra,
+                     thumbnail=item.thumbnail,
+                     infoLabels=item.infoLabels
+                     ))
+
+    support.videolibrary(itemlist, item)
+
+    return itemlist
 
 
 def findvideos(item):
diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py
index f279f63a..58634f13 100644
--- a/channels/cinemalibero.py
+++ b/channels/cinemalibero.py
@@ -28,25 +28,46 @@ host = config.get_channel_url(__channel__)
 
 headers = [['Referer', host]]
 
-@support.menu
 def mainlist(item):
-    film = '/category/film/'
-    filmSub = [
-        ('Generi', ['', 'genres']),
-        ('Sport', ['/category/sport/', 'peliculas']),
-    ]
-    tvshow = '/category/serie-tv/'
-    tvshowSub = [
-        ('Anime ', ['/category/anime-giapponesi/', 'video'])
-    ]
+    logger.info('[cinemalibero.py] mainlist')
+    
+    autoplay.init(item.channel, list_servers, list_quality) # Necessario per Autoplay
+
+    # Menu Principale
+    itemlist = []
+    support.menu(itemlist, 'Film bold', 'video', host+'/category/film/')
+    support.menu(itemlist, 'Generi submenu', 'genres', host)
+    support.menu(itemlist, 'Cerca film submenu', 'search', host)
+    support.menu(itemlist, 'Serie TV bold', 'video', host+'/category/serie-tv/', contentType='episode')
+    support.menu(itemlist, 'Anime submenu', 'video', host+'/category/anime-giapponesi/', contentType='episode')
+    support.menu(itemlist, 'Cerca serie submenu', 'search', host, contentType='episode')
+    support.menu(itemlist, 'Sport bold', 'video', host+'/category/sport/')
+
+    autoplay.show_option(item.channel, itemlist) # Necessario per Autoplay (Menu Configurazione)
+
+    support.channel_config(item, itemlist)
+    
+    return itemlist
+
+
+def search(item, texto):
+    logger.info("[cinemalibero.py] " + item.url + " search " + texto)
+    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 []
 
-    return locals()
 
 def genres(item):
-    return support.scrape2(item, patronBlock=r'<div id="bordobar" class="dropdown-menu(?P<block>.*)</li>', patron=r'<a class="dropdown-item" href="([^"]+)" title="([A-z]+)"', listGroups=['url', 'title'], action='video')
+    return support.scrape(item, patron_block=r'<div id="bordobar" class="dropdown-menu(.*?)</li>', patron=r'<a class="dropdown-item" href="([^"]+)" title="([A-z]+)"', listGroups=['url', 'title'], action='video')
 
 
-def peliculas(item):
+def video(item):
     logger.info('[cinemalibero.py] video')
     itemlist = []
 
diff --git a/channels/cinetemagay.py b/channels/cinetemagay.py
index ad5f5a6d..ad575f68 100644
--- a/channels/cinetemagay.py
+++ b/channels/cinetemagay.py
@@ -3,9 +3,8 @@
 import os
 import re
 
-from core import scrapertools
-from core import servertools
 from core import httptools
+from core import servertools
 from core.item import Item
 from platformcode import config, logger
 
diff --git a/channels/cliphunter.py b/channels/cliphunter.py
index 16f3d093..7ba4ad64 100644
--- a/channels/cliphunter.py
+++ b/channels/cliphunter.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
-
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.cliphunter.com'
 
@@ -84,8 +84,9 @@ def lista(item):
         title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
+        year = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                              fanart=thumbnail, contentTitle = title ))
+                              fanart=thumbnail, contentTitle = title, infoLabels={'year':year} ))
     next_page = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
@@ -102,7 +103,7 @@ def play(item):
     for scrapedurl  in matches:
         scrapedurl = scrapedurl.replace("\/", "/")
         title = scrapedurl
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
                          thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo"))
     return itemlist
 
diff --git a/channels/coomelonitas.py b/channels/coomelonitas.py
index ae943a7d..5d44526a 100644
--- a/channels/coomelonitas.py
+++ b/channels/coomelonitas.py
@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host ='http://www.coomelonitas.com'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
@@ -56,7 +57,7 @@ def lista(item):
         url = scrapertools.find_single_match(match,'<a href="([^"]+)"')
         plot = scrapertools.find_single_match(match,'<p class="summary">(.*?)</p>')
         thumbnail = scrapertools.find_single_match(match,'<img src="([^"]+)"')
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=url,
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, fulltitle=title, url=url,
                               fanart=thumbnail, thumbnail=thumbnail, plot=plot, viewmode="movie") )
     next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="siguiente">')
     if next_page!="":
diff --git a/channels/cumlouder.py b/channels/cumlouder.py
index 4380a53a..1bc5568c 100644
--- a/channels/cumlouder.py
+++ b/channels/cumlouder.py
@@ -2,6 +2,7 @@
 
 import re
 import urllib
+
 import urlparse
 
 from core import httptools
@@ -10,22 +11,23 @@ from core.item import Item
 from platformcode import config, logger
 
 
-host = 'https://www.cumlouder.com'
-
 def mainlist(item):
     logger.info()
     itemlist = []
+
     config.set_setting("url_error", False, "cumlouder")
-    itemlist.append(item.clone(title="Últimos videos", action="videos", url= host + "/porn/"))
-    itemlist.append(item.clone(title="Pornstars", action="pornstars_list", url=host + "/girls/"))
-    itemlist.append(item.clone(title="Listas", action="series", url= host + "/series/"))
-    itemlist.append(item.clone(title="Categorias", action="categorias", url= host + "/categories/"))
-    itemlist.append(item.clone(title="Buscar", action="search", url= host + "/search?q=%s"))
+    itemlist.append(item.clone(title="Últimos videos", action="videos", url="https://www.cumlouder.com/"))
+    itemlist.append(item.clone(title="Categorias", action="categorias", url="https://www.cumlouder.com/categories/"))
+    itemlist.append(item.clone(title="Pornstars", action="pornstars_list", url="https://www.cumlouder.com/girls/"))
+    itemlist.append(item.clone(title="Listas", action="series", url="https://www.cumlouder.com/series/"))
+    itemlist.append(item.clone(title="Buscar", action="search", url="https://www.cumlouder.com/search?q=%s"))
+
     return itemlist
 
 
 def search(item, texto):
     logger.info()
+
     item.url = item.url % texto
     item.action = "videos"
     try:
@@ -39,20 +41,21 @@ def search(item, texto):
 def pornstars_list(item):
     logger.info()
     itemlist = []
-    itemlist.append(item.clone(title="Mas Populares", action="pornstars", url=host + "/girls/1/"))
     for letra in "abcdefghijklmnopqrstuvwxyz":
         itemlist.append(item.clone(title=letra.upper(), url=urlparse.urljoin(item.url, letra), action="pornstars"))
+
     return itemlist
 
 
 def pornstars(item):
     logger.info()
     itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a girl-url=.*?'
-    patron += 'href="([^"]+)" title="([^"]+)">.*?'
-    patron += 'data-lazy="([^"]+)".*?'
-    patron += '<span class="ico-videos sprite"></span>([^<]+)</span>'
+
+    data = get_data(item.url)
+    patron = '<a girl-url="[^"]+" class="[^"]+" href="([^"]+)" title="([^"]+)">[^<]+'
+    patron += '<img class="thumb" src="([^"]+)" [^<]+<h2[^<]+<span[^<]+</span[^<]+</h2[^<]+'
+    patron += '<span[^<]+<span[^<]+<span[^<]+</span>([^<]+)</span>'
+
     matches = re.compile(patron, re.DOTALL).findall(data)
     for url, title, thumbnail, count in matches:
         if "go.php?" in url:
@@ -62,7 +65,8 @@ def pornstars(item):
             url = urlparse.urljoin(item.url, url)
             if not thumbnail.startswith("https"):
                 thumbnail = "https:%s" % thumbnail
-        itemlist.append(item.clone(title="%s (%s)" % (title, count), url=url, action="videos", fanart=thumbnail, thumbnail=thumbnail))
+        itemlist.append(item.clone(title="%s (%s)" % (title, count), url=url, action="videos", thumbnail=thumbnail))
+
     # Paginador
     matches = re.compile('<li[^<]+<a href="([^"]+)" rel="nofollow">Next[^<]+</a[^<]+</li>', re.DOTALL).findall(data)
     if matches:
@@ -70,19 +74,18 @@ def pornstars(item):
             url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0])
         else:
             url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(item.clone(title="Página Siguiente >>", url=url))
+        itemlist.append(item.clone(title="Pagina Siguiente", url=url))
+
     return itemlist
 
 
 def categorias(item):
     logger.info()
     itemlist = []
-    data = httptools.downloadpage(item.url).data
+
+    data = get_data(item.url)
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    patron = '<a tag-url=.*?'
-    patron += 'href="([^"]+)" title="([^"]+)".*?'
-    patron += 'data-lazy="([^"]+)".*?'
-    patron += '<span class="cantidad">([^<]+)</span>'
+    patron = '<a tag-url=.*?href="([^"]+)" title="([^"]+)".*?<img class="thumb" src="([^"]+)".*?<span class="cantidad">([^<]+)</span>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for url, title, thumbnail, count in matches:
         if "go.php?" in url:
@@ -93,7 +96,8 @@ def categorias(item):
             if not thumbnail.startswith("https"):
                 thumbnail = "https:%s" % thumbnail
         itemlist.append(
-            item.clone(title="%s (%s videos)" % (title, count), url=url, action="videos", fanart=thumbnail, thumbnail=thumbnail))
+            item.clone(title="%s (%s videos)" % (title, count), url=url, action="videos", thumbnail=thumbnail))
+
     # Paginador
     matches = re.compile('<li[^<]+<a href="([^"]+)" rel="nofollow">Next[^<]+</a[^<]+</li>', re.DOTALL).findall(data)
     if matches:
@@ -101,20 +105,22 @@ def categorias(item):
             url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0])
         else:
             url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(item.clone(title="Página Siguiente >>", url=url))
-    return itemlist
+        itemlist.append(item.clone(title="Pagina Siguiente", url=url))
 
+    return itemlist
 
 def series(item):
     logger.info()
     itemlist = []
-    data = httptools.downloadpage(item.url).data
+
+    data = get_data(item.url)
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     patron = '<a onclick=.*?href="([^"]+)".*?\<img src="([^"]+)".*?h2 itemprop="name">([^<]+).*?p>([^<]+)</p>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for url, thumbnail, title, count in matches:
         itemlist.append(
-            item.clone(title="%s (%s) " % (title, count), url=urlparse.urljoin(item.url, url), action="videos", fanart=thumbnail, thumbnail=thumbnail))
+            item.clone(title="%s (%s) " % (title, count), url=urlparse.urljoin(item.url, url), action="videos", thumbnail=thumbnail))
+
     # Paginador
     matches = re.compile('<li[^<]+<a href="([^"]+)" rel="nofollow">Next[^<]+</a[^<]+</li>', re.DOTALL).findall(data)
     if matches:
@@ -122,33 +128,29 @@ def series(item):
             url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0])
         else:
             url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(item.clone(title="Página Siguiente >>", url=url))
-    return itemlist
+        itemlist.append(item.clone(title="Pagina Siguiente", url=url))
 
+    return itemlist
 
 def videos(item):
     logger.info()
     itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a class="muestra-escena" href="([^"]+)" title="([^"]+)".*?'
-    patron += 'data-lazy="([^"]+)".*?'
-    patron += '<span class="ico-minutos sprite"></span>([^<]+)</span>(.*?)</a>'
+
+    data = get_data(item.url)
+    patron = '<a class="muestra-escena" href="([^"]+)" title="([^"]+)"[^<]+<img class="thumb" src="([^"]+)".*?<span class="minutos"> <span class="ico-minutos sprite"></span> ([^<]+)</span>'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, thumbnail, duration,calidad in matches:
-        if "hd sprite" in calidad:
-            title="[COLOR yellow] %s [/COLOR][COLOR red] HD [/COLOR] %s" % (duration,  title)
-        else:
-            title="[COLOR yellow] %s [/COLOR] %s" % (duration, title)
+    for url, title, thumbnail, duration in matches:
         if "go.php?" in url:
             url = urllib.unquote(url.split("/go.php?u=")[1].split("&")[0])
             thumbnail = urllib.unquote(thumbnail.split("/go.php?u=")[1].split("&")[0])
         else:
-            url = urlparse.urljoin(host, url)
+            url = urlparse.urljoin("https://www.cumlouder.com", url)
             if not thumbnail.startswith("https"):
                 thumbnail = "https:%s" % thumbnail
-        itemlist.append(item.clone(title=title, url=url,
+        itemlist.append(item.clone(title="%s (%s)" % (title, duration), url=urlparse.urljoin(item.url, url),
                                    action="play", thumbnail=thumbnail, contentThumbnail=thumbnail,
-                                   fanart=thumbnail, contentType="movie", contentTitle=title))
+                                   contentType="movie", contentTitle=title))
+
     # Paginador
     nextpage = scrapertools.find_single_match(data, '<ul class="paginador"(.*?)</ul>')
     matches = re.compile('<a href="([^"]+)" rel="nofollow">Next »</a>', re.DOTALL).findall(nextpage)
@@ -159,22 +161,51 @@ def videos(item):
             url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0])
         else:
             url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(item.clone(title="Página Siguiente >>", url=url))
+
+        itemlist.append(item.clone(title="Pagina Siguiente", url=url))
+
     return itemlist
 
 
 def play(item):
     logger.info()
     itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<source src="([^"]+)" type=\'video/([^\']+)\' label=\'[^\']+\' res=\'([^\']+)\''
+
+    data = get_data(item.url)
+    patron = '<source src="([^"]+)" type=\'video/([^\']+)\' label=\'[^\']+\' res=\'([^\']+)\' />'
     url, type, res = re.compile(patron, re.DOTALL).findall(data)[0]
     if "go.php?" in url:
         url = urllib.unquote(url.split("/go.php?u=")[1].split("&")[0])
     elif not url.startswith("http"):
-        url = "https:" + url.replace("&amp;", "&")
+        url = "http:" + url.replace("&amp;", "&")
     itemlist.append(
-        Item(channel='cumlouder', action="play", title='Video' + res, contentTitle=type.upper() + ' ' + res, url=url,
+        Item(channel='cumlouder', action="play", title='Video' + res, fulltitle=type.upper() + ' ' + res, url=url,
              server="directo", folder=False))
+
     return itemlist
 
+
+def get_data(url_orig):
+    try:
+        if config.get_setting("url_error", "cumlouder"):
+            raise Exception
+        response = httptools.downloadpage(url_orig)
+        if not response.data or "urlopen error [Errno 1]" in str(response.code):
+            raise Exception
+    except:
+        config.set_setting("url_error", True, "cumlouder")
+        import random
+        server_random = ['nl', 'de', 'us']
+        server = server_random[random.randint(0, 2)]
+        url = "https://%s.hideproxy.me/includes/process.php?action=update" % server
+        post = "u=%s&proxy_formdata_server=%s&allowCookies=1&encodeURL=0&encodePage=0&stripObjects=0&stripJS=0&go=" \
+               % (urllib.quote(url_orig), server)
+        while True:
+            response = httptools.downloadpage(url, post, follow_redirects=False)
+            if response.headers.get("location"):
+                url = response.headers["location"]
+                post = ""
+            else:
+                break
+
+    return response.data
diff --git a/channels/czechvideo.json b/channels/czechvideo.json
index 84b1c775..b770da2e 100644
--- a/channels/czechvideo.json
+++ b/channels/czechvideo.json
@@ -1,7 +1,7 @@
 {
   "id": "czechvideo",
   "name": "Czechvideo",
-  "active": false,
+  "active": true,
   "adult": true,
   "language": ["*"],
   "thumbnail": "http://czechvideo.org/templates/Default/images/black75.png",
diff --git a/channels/czechvideo.py b/channels/czechvideo.py
index 23b444aa..a750ede4 100644
--- a/channels/czechvideo.py
+++ b/channels/czechvideo.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
 
-import urlparse,urllib2,urllib,re
-import os, sys
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import config, logger
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://czechvideo.org'
 
@@ -80,7 +82,7 @@ def play(item):
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
-        videoitem.contentTitle = item.contentTitle
+        videoitem.fulltitle = item.fulltitle
         videoitem.thumbnail = item.thumbnail
         videoitem.channel = item.channel
     return itemlist
diff --git a/channels/datoporn.py b/channels/datoporn.py
index 243e4a8c..507efb1d 100644
--- a/channels/datoporn.py
+++ b/channels/datoporn.py
@@ -4,7 +4,8 @@ import re
 
 from core import httptools
 from core import scrapertools
-from platformcode import config, logger
+from platformcode import logger
+from platformcode import config
 
 
 def mainlist(item):
@@ -25,39 +26,49 @@ def search(item, texto):
 def lista(item):
     logger.info()
     itemlist = []
+
+    # Descarga la pagina 
     data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)", "", httptools.downloadpage(item.url).data)
-    patron = '<div class="videobox">\s*<a href="([^"]+)".*?'
-    patron += 'url\(\'([^\']+)\'.*?'
-    patron += '<span>(.*?)<\/span>.*?'
-    patron += 'class="title">(.*?)<\/a>'
+
+    # Extrae las entradas
+    patron = '<div class="videobox">\s*<a href="([^"]+)".*?url\(\'([^\']+)\'.*?<span>(.*?)<\/span><\/div><\/a>.*?class="title">(.*?)<\/a><span class="views">.*?<\/a><\/span><\/div> '
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl, scrapedthumbnail, duration, scrapedtitle in matches:
         if "/embed-" not in scrapedurl:
+            #scrapedurl = scrapedurl.replace("dato.porn/", "dato.porn/embed-") + ".html"
             scrapedurl = scrapedurl.replace("datoporn.co/", "datoporn.co/embed-") + ".html"
-        if not config.get_setting('unify'):
-            scrapedtitle = '[COLOR yellow] %s [/COLOR] %s' % (duration , scrapedtitle)
-        else:
-            scrapedtitle += ' gb'
-            scrapedtitle = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-            scrapedtitle = scrapedtitle.replace(":", "'")
-        # logger.debug(scrapedurl + ' / ' + scrapedthumbnail + ' / ' + duration + ' / ' + scrapedtitle)
-        itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, server="datoporn", 
-                                   fanart=scrapedthumbnail.replace("_t.jpg", ".jpg"), plot = ""))
+        if duration:
+            scrapedtitle = "%s - %s" % (duration, scrapedtitle)
+        scrapedtitle += ' gb'
+        scrapedtitle = scrapedtitle.replace(":", "'")
+
+        #logger.debug(scrapedurl + ' / ' + scrapedthumbnail + ' / ' + duration + ' / ' + scrapedtitle)
+        itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
+                                   server="datoporn", fanart=scrapedthumbnail.replace("_t.jpg", ".jpg")))
+
+    # Extrae la marca de siguiente página
+    #next_page = scrapertools.find_single_match(data, '<a href=["|\']([^["|\']+)["|\']>Next')
     next_page = scrapertools.find_single_match(data, '<a class=["|\']page-link["|\'] href=["|\']([^["|\']+)["|\']>Next')
     if next_page and itemlist:
         itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
+
     return itemlist
 
 
 def categorias(item):
     logger.info()
     itemlist = []
+
+    # Descarga la pagina    
     data = httptools.downloadpage(item.url).data
+
+    # Extrae las entradas (carpetas)
     patron = '<div class="vid_block">\s*<a href="([^"]+)".*?url\((.*?)\).*?<span>(.*?)</span>.*?<b>(.*?)</b>'
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl, scrapedthumbnail, numero, scrapedtitle in matches:
         if numero:
             scrapedtitle = "%s  (%s)" % (scrapedtitle, numero)
-        itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail))
-    return itemlist
 
+        itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail))
+
+    return itemlist
diff --git a/channels/eporner.py b/channels/eporner.py
index b82358c0..00b0e4b2 100644
--- a/channels/eporner.py
+++ b/channels/eporner.py
@@ -1,37 +1,38 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
 from core import httptools
-from core import scrapertools
+from core import jsontools
 from platformcode import logger
+from platformcode import config
 
-host = 'http://www.eporner.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append(item.clone(title="Últimos videos", action="videos", url=host + "/0/"))
-    itemlist.append(item.clone(title="Más visto", action="videos", url=host + "/most-viewed/"))
-    itemlist.append(item.clone(title="Mejor valorado", action="videos", url=host + "/top-rated/"))
-    itemlist.append(item.clone(title="Categorias", action="categorias", url=host + "/categories/"))
-    itemlist.append(item.clone(title="Pornstars", action="pornstars", url=host + "/pornstars/"))
-    itemlist.append(item.clone(title="      Alfabetico", action="pornstars_list", url=host + "/pornstars/"))
-    itemlist.append(item.clone(title="Buscar", action="search"))
+
+    itemlist.append(item.clone(title="Últimos videos", action="videos", url="http://www.eporner.com/0/"))
+    itemlist.append(item.clone(title="Categorias", action="categorias", url="http://www.eporner.com/categories/"))
+    itemlist.append(item.clone(title="Pornstars", action="pornstars_list", url="http://www.eporner.com/pornstars/"))
+    itemlist.append(item.clone(title="Buscar", action="search", url="http://www.eporner.com/search/%s/"))
+
     return itemlist
 
 
 def search(item, texto):
     logger.info()
-    texto = texto.replace(" ", "-")
-    item.url = host + "/search/%s/" % texto
+
+    item.url = item.url % texto
+    item.action = "videos"
+
     try:
         return videos(item)
     except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
+        import traceback
+        logger.error(traceback.format_exc())
         return []
 
 
@@ -40,67 +41,71 @@ def pornstars_list(item):
     itemlist = []
     for letra in "ABCDEFGHIJKLMNOPQRSTUVWXYZ":
         itemlist.append(item.clone(title=letra, url=urlparse.urljoin(item.url, letra), action="pornstars"))
+
     return itemlist
 
 
 def pornstars(item):
     logger.info()
     itemlist = []
+
     data = httptools.downloadpage(item.url).data
-    patron = '<div class="mbprofile">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
+
+    patron = '<div class="mbtit" itemprop="name"><a href="([^"]+)" title="([^"]+)">[^<]+</a></div> '
+    patron += '<a href="[^"]+" title="[^"]+"> <img src="([^"]+)" alt="[^"]+" style="width:190px;height:152px;" /> </a> '
     patron += '<div class="mbtim"><span>Videos: </span>([^<]+)</div>'
+
     matches = re.compile(patron, re.DOTALL).findall(data)
     for url, title, thumbnail, count in matches:
         itemlist.append(
             item.clone(title="%s (%s videos)" % (title, count), url=urlparse.urljoin(item.url, url), action="videos",
                        thumbnail=thumbnail))
-    # Paginador           
-    next_page = scrapertools.find_single_match(data,"<a href='([^']+)' class='nmnext' title='Next page'>")
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="pornstars", title="Página Siguiente >>", text_color="blue", url=next_page) )
+
+    # Paginador
+    patron = "<span style='color:#FFCC00;'>[^<]+</span></a> <a href='([^']+)' title='[^']+'><span>[^<]+</span></a>"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    if matches:
+        itemlist.append(item.clone(title="Pagina siguiente", url=urlparse.urljoin(item.url, matches[0])))
+
     return itemlist
 
 
 def categorias(item):
     logger.info()
     itemlist = []
+
     data = httptools.downloadpage(item.url).data
-    patron = '<span class="addrem-cat">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron +='<div class="cllnumber">([^<]+)</div>'
+
+    patron = '<div class="categoriesbox" id="[^"]+"> <div class="ctbinner"> <a href="([^"]+)" title="[^"]+"> <img src="([^"]+)" alt="[^"]+"> <h2>([^"]+)</h2> </a> </div> </div>'
+
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, cantidad in matches:
-        url = urlparse.urljoin(item.url, url)
-        title = title + " " + cantidad
-        thumbnail = ""
-        if not thumbnail:
-            thumbnail = scrapertools.find_single_match(data,'<img src="([^"]+)" alt="%s"> % title')
-        itemlist.append(item.clone(title=title, url=url, action="videos", thumbnail=thumbnail))
+    for url, thumbnail, title in matches:
+        itemlist.append(
+            item.clone(title=title, url=urlparse.urljoin(item.url, url), action="videos", thumbnail=thumbnail))
+
     return sorted(itemlist, key=lambda i: i.title)
 
 
 def videos(item):
     logger.info()
     itemlist = []
+
     data = httptools.downloadpage(item.url).data
-    patron = '<div class="mvhdico"><span>([^<]+)</span>.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)" id="[^"]+">.*?'
-    patron += 'src="([^"]+)"[^>]+>.*?'
-    patron += '<div class="mbtim">([^<]+)</div>'
+
+    patron = '<a href="([^"]+)" title="([^"]+)" id="[^"]+">.*?<img id="[^"]+" src="([^"]+)"[^>]+>.*?<div class="mbtim">([^<]+)</div>'
+
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for quality, url, title, thumbnail, duration in matches:
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + "[COLOR red]" + quality + "[/COLOR] " +title
-        itemlist.append(item.clone(title=title, url=urlparse.urljoin(item.url, url),
+    for url, title, thumbnail, duration in matches:
+        itemlist.append(item.clone(title="%s (%s)" % (title, duration), url=urlparse.urljoin(item.url, url),
                                    action="play", thumbnail=thumbnail, contentThumbnail=thumbnail,
                                    contentType="movie", contentTitle=title))
+
     # Paginador
-    next_page = scrapertools.find_single_match(data,"<a href='([^']+)' class='nmnext' title='Next page'>")
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="videos", title="Página Siguiente >>", text_color="blue", url=next_page) )
+    patron = "<span style='color:#FFCC00;'>[^<]+</span></a> <a href='([^']+)' title='[^']+'><span>[^<]+</span></a>"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    if matches:
+        itemlist.append(item.clone(title="Página siguiente", url=urlparse.urljoin(item.url, matches[0])))
+
     return itemlist
 
 
@@ -130,7 +135,8 @@ def play(item):
         int(hash[16:24], 16)) + int_to_base36(int(hash[24:32], 16))
 
     url = "https://www.eporner.com/xhr/video/%s?hash=%s" % (vid, hash)
-    jsondata = httptools.downloadpage(url).json
+    data = httptools.downloadpage(url).data
+    jsondata = jsontools.load(data)
 
     for source in jsondata["sources"]["mp4"]:
         url = jsondata["sources"]["mp4"][source]["src"]
diff --git a/channels/eroticage.py b/channels/eroticage.py
index fab51da2..568b39a0 100644
--- a/channels/eroticage.py
+++ b/channels/eroticage.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import config, logger
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.eroticage.net'
 
diff --git a/channels/erotik.json b/channels/erotik.json
index 8724bd2f..bedade55 100644
--- a/channels/erotik.json
+++ b/channels/erotik.json
@@ -10,5 +10,13 @@
     "adult"
   ],
   "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
   ]
-}
+}
\ No newline at end of file
diff --git a/channels/erotik.py b/channels/erotik.py
index 55f089fb..f39befd7 100644
--- a/channels/erotik.py
+++ b/channels/erotik.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
 from core import httptools
@@ -8,6 +9,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "https://www.youfreeporntube.net"
 
@@ -15,12 +17,11 @@ def mainlist(item):
     logger.info()
     itemlist = []
     itemlist.append(Item(channel=item.channel, action="lista", title="Útimos videos",
-                         url= host + "/newvideos.html?&page=1"))
-    itemlist.append(Item(channel=item.channel, action="lista", title="Populares",
-                         url=host + "/topvideos.html?page=1"))
+                         url= host + "/new-clips.html?&page=1"))
     itemlist.append(
         Item(channel=item.channel, action="categorias", title="Categorias", url=host + "/browse.html"))
-
+    itemlist.append(Item(channel=item.channel, action="lista", title="Populares",
+                         url=host + "/topvideo.html?page=1"))
     itemlist.append(Item(channel=item.channel, action="search", title="Buscar",
                          url=host + "/search.php?keywords="))
     return itemlist
@@ -48,7 +49,7 @@ def categorias(item):
     patron = '<div class="pm-li-category"><a href="([^"]+)">.*?.<h3>(.*?)</h3></a>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for url, actriz in matches:
-        itemlist.append(Item(channel=item.channel, action="lista", title=actriz, url=url))
+        itemlist.append(Item(channel=item.channel, action="listacategoria", title=actriz, url=url))
     return itemlist
 
 
@@ -57,9 +58,7 @@ def lista(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}", "", data)
-    patron = '<li><div class=".*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?alt="([^"]+)"'
+    patron = '<li><div class=".*?<a href="([^"]+)".*?>.*?.img src="([^"]+)".*?alt="([^"]+)".*?>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     itemlist = []
     for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
@@ -67,14 +66,36 @@ def lista(item):
         thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
         title = scrapedtitle.strip()
         itemlist.append(Item(channel=item.channel, action="play", thumbnail=thumbnail, fanart=thumbnail, title=title,
-                             url=url,
+                             fulltitle=title, url=url,
                              viewmode="movie", folder=True))
     paginacion = scrapertools.find_single_match(data,
-                                                '<li class="active">.*?</li>.*?<a href="([^"]+)">')
+                                                '<li class="active"><a href="#" onclick="return false;">\d+</a></li><li class=""><a href="([^"]+)">')
     if paginacion:
-        paginacion = urlparse.urljoin(item.url,paginacion)
         itemlist.append(Item(channel=item.channel, action="lista", title=">> Página Siguiente",
-                             url= paginacion))
+                             url=host + "/" + paginacion))
+    return itemlist
+
+
+def listacategoria(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}", "", data)
+    patron = '<li><div class=".*?<a href="([^"]+)".*?>.*?.img src="([^"]+)".*?alt="([^"]+)".*?>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    itemlist = []
+    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
+        url = urlparse.urljoin(item.url, scrapedurl)
+        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
+        title = scrapedtitle.strip()
+        itemlist.append(
+            Item(channel=item.channel, action="play", thumbnail=thumbnail, title=title, fulltitle=title, url=url,
+                 viewmode="movie", folder=True))
+    paginacion = scrapertools.find_single_match(data,
+                                                '<li class="active"><a href="#" onclick="return false;">\d+</a></li><li class=""><a href="([^"]+)">')
+    if paginacion:
+        itemlist.append(
+            Item(channel=item.channel, action="listacategoria", title=">> Página Siguiente", url=paginacion))
     return itemlist
 
 
@@ -82,9 +103,14 @@ def play(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, '<div id="video-wrapper">.*?<iframe.*?src="([^"]+)"')
-    itemlist.append(item.clone(action="play", title=url, url=url ))
+    item.url = scrapertools.find_single_match(data, '(?i)Playerholder.*?src="([^"]+)"')
+    if "tubst.net" in item.url:
+        url = scrapertools.find_single_match(data, 'itemprop="embedURL" content="([^"]+)')
+        data = httptools.downloadpage(url).data
+        url = scrapertools.find_single_match(data, '<iframe.*?src="([^"]+)"')
+        data = httptools.downloadpage(url).data
+        url = scrapertools.find_single_match(data, '<source src="([^"]+)"')
+        item.url = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers.get("location", "")
+    itemlist.append(item.clone())
     itemlist = servertools.get_servers_itemlist(itemlist)
     return itemlist
-
-
diff --git a/channels/eurostreaming.json b/channels/eurostreaming.json
index 67742a84..3fb5ddf3 100644
--- a/channels/eurostreaming.json
+++ b/channels/eurostreaming.json
@@ -4,10 +4,18 @@
     "active": true,
 	"adult": false,
 	"language": ["ita"],
-    "thumbnail": "eurostreaming.png",
-    "banner": "eurostreaming.png",
+    "thumbnail": "https://eurostreaming.cafe/wp-content/uploads/2017/08/logocafe.png",
+    "bannermenu": "https://eurostreaming.cafe/wp-content/uploads/2017/08/logocafe.png",
 	"categories": ["tvshow","anime","vosi"],
-  "settings": [   
+  "settings": [
+    {
+    "id": "channel_host",
+    "type": "text",
+    "label": "Host del canale",
+    "default": "https://eurostreaming.cafe",
+    "enabled": true,
+    "visible": true
+    },   
       {
       "id": "include_in_global_search",
       "type": "bool",
diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py
index fdcdb4a6..817cbf45 100644
--- a/channels/eurostreaming.py
+++ b/channels/eurostreaming.py
@@ -4,91 +4,146 @@
 # by Greko
 # ------------------------------------------------------------
 """
+    Riscritto per poter usufruire del modulo support.
     Problemi noti:
-    Alcune sezioni di anime-cartoni non vanno, alcune hanno solo la lista degli episodi, ma non hanno link,
+    Le regex non prendono tutto...
+    server versystream : 'http://vcrypt.net/very/' # VeryS non decodifica il link :http://vcrypt.net/fastshield/
+    alcuni server tra cui nowvideo.club non sono implementati nella cartella servers
+    Alcune sezioni di anime-cartoni non vanno, alcune hanno solo la lista degli episodi, ma non hanno link
     altre cambiano la struttura
+    La sezione novità non fa apparire il titolo degli episodi
+
+    In episodios è stata aggiunta la possibilità di configurare la videoteca
+
 """
-import re
-from core import scrapertoolsV2, httptools, support
+
+import channelselector
+from specials import autoplay, filtertools
+from core import scrapertoolsV2, httptools, servertools, tmdb, support
 from core.item import Item
 from platformcode import logger, config
 
 __channel__ = "eurostreaming"
 host = config.get_channel_url(__channel__)
-headers = [['Referer', host]]
+headers = ['Referer', host]
 
 list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload']
 list_quality = ['default']
 
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'eurostreaming')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'eurostreaming')
+
 IDIOMAS = {'Italiano': 'ITA', 'Sub-ITA':'vosi'}
 list_language = IDIOMAS.values()
 
-@support.menu
 def mainlist(item):
-    support.log()
-    tvshow = [
-        ('Archivio ', ['/category/serie-tv-archive/', 'peliculas', '', 'tvshow']),
-        ('Aggiornamenti ', ['/aggiornamento-episodi/', 'peliculas', True, 'tvshow'])
-        ]
-    anime = ['/category/anime-cartoni-animati/']
-    return locals()
+    #import web_pdb; web_pdb.set_trace()
+    support.log()    
+    itemlist = []
+    
+    support.menu(itemlist, 'Serie TV', 'serietv', host, contentType = 'tvshow') # mettere sempre episode per serietv, anime!!
+    support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "/category/serie-tv-archive/", contentType = 'tvshow')
+    support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + '/aggiornamento-episodi/', args='True', contentType = 'tvshow')
+    support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + '/category/anime-cartoni-animati/', contentType = 'tvshow')
+    support.menu(itemlist, 'Cerca...', 'search', host, contentType = 'tvshow')
 
+##    itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality)
+    # richiesto per autoplay
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
 
-@support.scrape
-def peliculas(item):
+    support.channel_config(item, itemlist)
+    
+    return itemlist
+
+def serietv(item):
+    #import web_pdb; web_pdb.set_trace()
+    # lista serie tv
     support.log()
-    action = 'episodios'
-    if item.args == True:
-        patron = r'<span class="serieTitle" style="font-size:20px">(?P<title>.*?).[^–]<a href="(?P<url>[^"]+)"'\
-                 '\s+target="_blank">(?P<episode>\d+x\d+) (?P<title2>.*?)</a>'
-        # permette di vedere episodio e titolo + titolo2 in novità
-        def itemHook(item):
-            item.show = item.episode + item.title
-            return item
+    itemlist = []
+    if item.args:
+        # il titolo degli episodi viene inglobato in episode ma non sono visibili in newest!!!
+        patron = r'<span class="serieTitle" style="font-size:20px">(.*?).[^–]<a href="([^"]+)"\s+target="_blank">(.*?)<\/a>'
+        listGroups = ['title', 'url', 'title2']
+        patronNext = ''
     else:
-        patron = r'<div class="post-thumb">.*?\s<img src="(?P<thumb>[^"]+)".*?>'\
-                 '<a href="(?P<url>[^"]+)".*?>(?P<title>.*?(?:\((?P<year>\d{4})\)|(\4\d{4}))?)<\/a><\/h2>'
-
+        patron = r'<div class="post-thumb">.*?\s<img src="([^"]+)".*?><a href="([^"]+)".*?>(.*?(?:\((\d{4})\)|(\d{4}))?)<\/a><\/h2>'
+        listGroups = ['thumb', 'url', 'title', 'year', 'year']
         patronNext='a class="next page-numbers" href="?([^>"]+)">Avanti &raquo;</a>'
-    return locals()
 
-@support.scrape
+    itemlist = support.scrape(item, patron_block='', patron=patron, listGroups=listGroups,
+                          patronNext=patronNext, action='episodios')
+    return itemlist
+
+
 def episodios(item):
-    support.log("episodios: %s" % item)
-    action = 'findvideos'
-    item.contentType = 'episode'
+##    import web_pdb; web_pdb.set_trace()
+    support.log("episodios")
+    itemlist = []
+
     # Carica la pagina
-    data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"')
+    data = httptools.downloadpage(item.url).data
     #======== 
     if 'clicca qui per aprire' in data.lower():
         item.url = scrapertoolsV2.find_single_match(data, '"go_to":"([^"]+)"')
         item.url = item.url.replace("\\","")
         # Carica la pagina
-        data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"')
+        data = httptools.downloadpage(item.url).data
     elif 'clicca qui</span>' in data.lower():
         item.url = scrapertoolsV2.find_single_match(data, '<h2 style="text-align: center;"><a href="([^"]+)">')
         # Carica la pagina        
-        data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"')
+        data = httptools.downloadpage(item.url).data
     #=========
-    data = re.sub('\n|\t', ' ', data)
-    patronBlock = r'(?P<block>STAGIONE\s\d+ (?:\()?(?P<lang>ITA|SUB ITA)(?:\))?<\/div>.*?)</div></div>'
-    patron = r'(?:\s|\Wn)?(?:|<strong>)?(?P<episode>\d+&#\d+;\d+)(?:|</strong>) (?P<title>.*?)(?:|–)?<a\s(?P<url>.*?)<\/a><br\s\/>'
+    patron = r'(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(ITA|SUB ITA)(?:\))?<\/div>'\
+             '<div class="su-spoiler-content su-clearfix" style="display:none">|'\
+             '(?:\s|\Wn)?(?:<strong>)?(\d+&#.*?)(?:|–)?<a\s(.*?)<\/a><br\s\/>)'
+##    '(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(ITA|SUB ITA)(?:\))?'\
+##             '<\/div><div class="su-spoiler-content su-clearfix" style="display:none">|'\
+##             '(?:\s|\Wn)?(?:<strong>)?(\d[&#].*?)(?:–|\W)?<a\s(.*?)<\/a><br\s\/>)'
+##    '(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(ITA|SUB ITA)(?:\))?<\/div>'\
+##             '<div class="su-spoiler-content su-clearfix" style="display:none">|'\
+##             '\s(?:<strong>)?(\d[&#].*?)–<a\s(.*?)<\/a><br\s\/>)'
+    listGroups = ['lang', 'title', 'url'] 
+    itemlist = support.scrape(item, data=data, patron=patron,
+                              listGroups=listGroups, action='findvideos')
 
-    return locals()
+    # Permette la configurazione della videoteca senza andare nel menu apposito
+    # così si possono Attivare/Disattivare le impostazioni direttamente dalla
+    # pagina delle puntate
+    itemlist.append(
+        Item(channel='setting',
+             action="channel_config",
+             title=support.typo("Configurazione Videoteca color lime"),
+             plot = 'Filtra per lingua utilizzando la configurazione della videoteca.\
+                     Escludi i video in sub attivando "Escludi streams... " e aggiungendo sub in Parole',
+             config='videolibrary', #item.channel,
+             folder=False,
+             thumbnail=channelselector.get_thumb('setting_0.png')
+             ))
+
+    itemlist = filtertools.get_links(itemlist, item, list_language)      
+    return itemlist
 
 # ===========  def findvideos  =============
 
 def findvideos(item):
-    support.log('findvideos', item)
-    return support.server(item, item.url)
+    support.log()
+    itemlist =[]
+
+    # Requerido para FilterTools
+##    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    itemlist = support.server(item, item.url)
+##    support.videolibrary(itemlist, item)
+    
+    return itemlist
 
 # ===========  def ricerca  =============
 def search(item, texto):
     support.log()
     item.url = "%s/?s=%s" % (host, texto)
-    item.contentType = 'tvshow'
     try:
-        return peliculas(item)
+        return serietv(item)
     # Continua la ricerca in caso di errore
     except:
         import sys
@@ -101,14 +156,14 @@ def newest(categoria):
     support.log()  
     itemlist = []
     item = Item()
-    item.contentType = 'tvshow'
-    item.args = True
+    item.contentType= 'episode'
+    item.args= 'True'
     try:        
         item.url = "%s/aggiornamento-episodi/" % host
-        item.action = "peliculas"
-        itemlist = peliculas(item)
+        item.action = "serietv"
+        itemlist = serietv(item)
 
-        if itemlist[-1].action == "peliculas":
+        if itemlist[-1].action == "serietv":
             itemlist.pop()
 
     # Continua la ricerca in caso di errore 
@@ -119,3 +174,6 @@ def newest(categoria):
         return []
 
     return itemlist
+
+def paginator(item):
+    pass
diff --git a/channels/fapality.json b/channels/fapality.json
index 564fc8d4..c0d28164 100644
--- a/channels/fapality.json
+++ b/channels/fapality.json
@@ -4,7 +4,7 @@
   "active": true,
   "adult": true,
   "language": ["*"],
-  "thumbnail": "https://i.imgur.com/Orguh85.png",
+  "thumbnail": "",
   "banner": "",
   "categories": [
     "adult"
diff --git a/channels/fapality.py b/channels/fapality.py
index d0527c27..20c77965 100644
--- a/channels/fapality.py
+++ b/channels/fapality.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://fapality.com'
 
@@ -92,6 +93,6 @@ def play(item):
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl  in matches:
         url =  scrapedurl
-    itemlist.append(item.clone(action="play", title=url, contentTitle = item.title, url=url))
+    itemlist.append(item.clone(action="play", title=url, fulltitle = item.title, url=url))
     return itemlist
 
diff --git a/channels/fastsubita.py b/channels/fastsubita.py
index 1e10a0e5..bc7e1c5e 100644
--- a/channels/fastsubita.py
+++ b/channels/fastsubita.py
@@ -38,8 +38,8 @@ def mainlist(item):
 
     support.menu(itemlist, 'Novità bold', 'pelicuals_tv', host, 'tvshow')
     support.menu(itemlist, 'Serie TV bold', 'lista_serie', host, 'tvshow')
-    ('Archivio A-Z ', [, 'list_az', ]), 'tvshow', args=['serie'])
-
+    support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', host, 'tvshow', args=['serie'])
+    support.menu(itemlist, 'Cerca', 'search', host, 'tvshow')
     support.aplay(item, itemlist, list_servers, list_quality)
     support.channel_config(item, itemlist)
 
@@ -208,13 +208,13 @@ def findvideos(item):
     itemlist = []
 
     # data = httptools.downloadpage(item.url, headers=headers).data
-    patronBlock = '<div class="entry-content">(?P<block>.*)<footer class="entry-footer">'
-    # bloque = scrapertools.find_single_match(data, patronBlock)
+    patron_block = '<div class="entry-content">(.*?)<footer class="entry-footer">'
+    # bloque = scrapertools.find_single_match(data, patron_block)
 
     patron = r'<a href="([^"]+)">'
     # matches = re.compile(patron, re.DOTALL).findall(bloque)
 
-    matches, data = support.match(item, patron, patronBlock, headers)
+    matches, data = support.match(item, patron, patron_block, headers)
 
     for scrapedurl in matches:
         if 'is.gd' in scrapedurl:
diff --git a/channels/fetishshrine.py b/channels/fetishshrine.py
index a0a3971d..52168aae 100644
--- a/channels/fetishshrine.py
+++ b/channels/fetishshrine.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.fetishshrine.com'
 
diff --git a/channels/filmigratis.py b/channels/filmigratis.py
index c89e50c2..39b4bfff 100644
--- a/channels/filmigratis.py
+++ b/channels/filmigratis.py
@@ -31,8 +31,8 @@ def mainlist(item):
     support.menu(itemlist, 'Film alta definizione bold', 'peliculas', host, contentType='movie', args='film')
     support.menu(itemlist, 'Categorie Film bold', 'categorias_film', host , contentType='movie', args='film')
     support.menu(itemlist, 'Categorie Serie bold', 'categorias_serie', host, contentType='tvshow', args='serie')
-
-
+    support.menu(itemlist, '[COLOR blue]Cerca Film...[/COLOR] bold', 'search', host, contentType='movie', args='film')
+    support.menu(itemlist, '[COLOR blue]Cerca Serie...[/COLOR] bold', 'search', host, contentType='tvshow', args='serie')
 
     autoplay.init(item.channel, list_servers, list_quality)
     autoplay.show_option(item.channel, itemlist)
diff --git a/channels/filmoviXXX.py b/channels/filmoviXXX.py
index 5993b540..5669cfbe 100644
--- a/channels/filmoviXXX.py
+++ b/channels/filmoviXXX.py
@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import config, logger
-from core import httptools
+from platformcode import logger
+from platformcode import config
+
 
 # BLOQUEO ESET INTERNET SECURITY
 def mainlist(item):
@@ -40,6 +43,7 @@ def play(item):
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
         videoitem.thumbnail = item.thumbnail
         videoitem.channel = item.channel
     return itemlist
diff --git a/channels/filmpertutti.json b/channels/filmpertutti.json
index 4be0ed84..011f40c4 100644
--- a/channels/filmpertutti.json
+++ b/channels/filmpertutti.json
@@ -4,8 +4,8 @@
   "active": true,
   "adult": false,
   "language": ["ita"],
-  "thumbnail": "",
-  "banner": "",
+  "thumbnail": "https://www.filmpertutti.club/wp-content/themes/blunge/assets/logo.png",
+  "banner": "https://www.filmpertutti.club/wp-content/themes/blunge/assets/logo.png",
   "categories": ["tvshow","movie"],
   "settings": [
         {
diff --git a/channels/foxtube.py b/channels/foxtube.py
index ae2fae11..e8ab9c34 100644
--- a/channels/foxtube.py
+++ b/channels/foxtube.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://es.foxtube.com'
 
@@ -14,9 +15,7 @@ def mainlist(item):
     logger.info()
     itemlist = []
     itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="PornStar" , action="catalogo", url=host + '/actrices/'))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -34,31 +33,6 @@ def search(item, texto):
         return []
 
 
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a class="tco5" href="([^"]+)">.*?'
-    patron += 'data-origen="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-                              # <a class="bgco2 tco3" rel="next" href="/actrices/2/">&gt</a>
-    next_page = scrapertools.find_single_match(data,'<a class="bgco2 tco3" rel="next" href="([^"]+)">&gt</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista" , title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-                              
-                              
-    return itemlist
-
-
 def categorias(item):
     logger.info()
     itemlist = []
@@ -80,8 +54,6 @@ def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    if "/actrices/" in item.url:
-        data=scrapertools.find_single_match(data,'<section class="container">(.*?)>Actrices similares</h3>')
     patron = '<a class="thumb tco1" href="([^"]+)">.*?'
     patron += 'src="([^"]+)".*?'
     patron += 'alt="([^"]+)".*?'
@@ -99,7 +71,7 @@ def lista(item):
         plot = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
                               fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<a class="bgco2 tco3" rel="next" href="([^"]+)">&gt</a>')
+	next_page = scrapertools.find_single_match(data,'<a class="bgco2 tco3" rel="next" href="([^"]+)">&gt</a>')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
         itemlist.append(item.clone(action="lista" , title="Página Siguiente >>", text_color="blue", url=next_page) )
@@ -110,14 +82,13 @@ def play(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data,'<iframe title="video" src="([^"]+)"')
-    url = url.replace("https://flashservice.xvideos.com/embedframe/", "https://www.xvideos.com/video") + "/"
+    url = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
     data = httptools.downloadpage(url).data
     patron  = 'html5player.setVideoHLS\\(\'([^\']+)\''
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
         scrapedurl = scrapedurl.replace("\/", "/")
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
+        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
                             thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/freeporn.py b/channels/freeporn.py
index c2ef1df2..69e1f65d 100644
--- a/channels/freeporn.py
+++ b/channels/freeporn.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://frprn.com'
 
@@ -96,6 +97,6 @@ def play(item):
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
         title = scrapedurl
-    itemlist.append(item.clone(action="play", title=title, contentTitle = scrapedurl, url=scrapedurl))
+    itemlist.append(item.clone(action="play", title=title, fulltitle = scrapedurl, url=scrapedurl))
     return itemlist
 
diff --git a/channels/freepornstreams.py b/channels/freepornstreams.py
index f5eae9c7..adc9881f 100644
--- a/channels/freepornstreams.py
+++ b/channels/freepornstreams.py
@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import config, logger
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
-host = 'http://freepornstreams.org'    #es http://xxxstreams.org 
+host = 'http://freepornstreams.org'
 
 
 def mainlist(item):
@@ -16,8 +18,8 @@ def mainlist(item):
     itemlist = []
     itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/free-full-porn-movies/"))
     itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/free-stream-porn/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host))
+    itemlist.append( Item(channel=item.channel, title="Categoria" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -35,24 +37,35 @@ def search(item, texto):
         return []
 
 
+def catalogo(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = scrapertools.find_single_match(data,'>Top Sites</a>(.*?)</aside>')
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<li id="menu-item-\d+".*?<a href="([^"]+)">([^"]+)</a></li>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
+    return itemlist
+
 def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
+    data = scrapertools.find_single_match(data,'Top Tags(.*?)</ul>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    if item.title == "Categorias" :
-        data = scrapertools.find_single_match(data,'>Top Tags(.*?)</ul>')
-    else:
-        data = scrapertools.find_single_match(data,'>Top Sites</a>(.*?)</aside>')
     patron  = '<a href="([^"]+)">(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle in matches:
-        if not "Featured" in scrapedtitle:
-            scrapedplot = ""
-            scrapedthumbnail = ""
-            scrapedurl = scrapedurl.replace ("http://freepornstreams.org/freepornst/stout.php?s=100,75,65:*&#038;u=" , "")
-            itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                                   thumbnail=scrapedthumbnail, plot=scrapedplot) )
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        scrapedurl = scrapedurl.replace ("http://freepornstreams.org/freepornst/stout.php?s=100,75,65:*&#038;u=" , "")
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
@@ -66,15 +79,12 @@ def lista(item):
     patron += '<img src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        if '/HD' in scrapedtitle : title= "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        elif 'SD' in scrapedtitle : title= "[COLOR red]" + "SD" + "[/COLOR] " + scrapedtitle
-        elif 'FullHD' in scrapedtitle : title= "[COLOR red]" + "FullHD" + "[/COLOR] " + scrapedtitle
-        elif '1080' in scrapedtitle : title= "[COLOR red]" + "1080p" + "[/COLOR] " + scrapedtitle
-        else: title = scrapedtitle
+        calidad = scrapertools.find_single_match(scrapedtitle, '(\(.*?\))')
+        title = "[COLOR yellow]" + calidad + "[/COLOR] "  + scrapedtitle.replace( "%s" % calidad, "")
         thumbnail = scrapedthumbnail.replace("jpg#", "jpg")
         plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle=title) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
+                              fanart=thumbnail, plot=plot, fulltitle=title) )
     next_page = scrapertools.find_single_match(data, '<div class="nav-previous"><a href="([^"]+)"')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
@@ -82,14 +92,14 @@ def lista(item):
     return itemlist
 
 
-def findvideos(item):
-    itemlist = []
+def play(item):
+    logger.info()
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = '<a href="([^"]+)" rel="nofollow"[^<]+>(?:Streaming|Download)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        if not "ubiqfile" in url:
-            itemlist.append(item.clone(action='play',title="%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.fulltitle
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videochannel=item.channel
     return itemlist
+
diff --git a/channels/gotporn.json b/channels/gotporn.json
deleted file mode 100755
index 96df587b..00000000
--- a/channels/gotporn.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "gotporn",
-  "name": "gotporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://cdn2-static-cf.gotporn.com/desktop/img/gotporn-logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/gotporn.py b/channels/gotporn.py
deleted file mode 100755
index fc42255d..00000000
--- a/channels/gotporn.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.gotporn.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/top-rated?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-viewed?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest?page=1"))
-
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/results?search_query=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-
-
-    patron = '<a href="([^"]+)">'
-    patron += '<span class="text">([^<]+)</span>'
-    patron += '<span class="num">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = "%s %s" % (scrapedtitle,cantidad)
-        scrapedurl = scrapedurl + "?page=1"
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    logger.debug(data)
-    patron = '<header class="clearfix" itemscope>.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = scrapedurl + "?page=1"
-        thumbnail = "https:" + scrapedthumbnail
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" class="btn btn-secondary"><span class="text">Next')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="catalogo", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li class="video-item poptrigger".*?'
-    patron += 'href="([^"]+)" data-title="([^"]+)".*?'
-    patron += '<span class="duration">(.*?)</span>.*?'
-    patron += 'src=\'([^\']+)\'.*?'
-    patron += '<h3 class="video-thumb-title(.*?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedtime,scrapedthumbnail,quality in matches:
-        scrapedtime = scrapedtime.strip()
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        if quality:
-            title = "[COLOR yellow]%s[/COLOR] [COLOR red]HD[/COLOR] %s" % (scrapedtime,scrapedtitle)
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot,))
-    next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" class="btn btn-secondary')
-    if "categories" in item.url:
-        next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" class="btn btn-secondary paginate-show-more')
-    if "search_query" in item.url:
-        next_page = scrapertools.find_single_match(data, '<link rel=\'next\' href="([^"]+)">')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<source src="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        url += "|Referer=%s" % host
-        itemlist.append(item.clone(action="play", title = item.title, url=url ))
-    return itemlist
-
diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py
index 5d6d3c05..e6ad4ef9 100644
--- a/channels/guardaserieclick.py
+++ b/channels/guardaserieclick.py
@@ -4,18 +4,15 @@
 # Thanks to Icarus crew & Alfa addon & 4l3x87
 # ------------------------------------------------------------
 
-"""
-    Problemi noti:
-    - nella pagina categorie appaiono i risultati di tmdb in alcune voci
-"""
+import re
 
-from core import scrapertoolsV2, httptools, support
+from core import httptools, scrapertools, support
+from core import tmdb
 from core.item import Item
-from platformcode import logger, config
 from core.support import log
+from platformcode import logger, config
 
 __channel__ = 'guardaserieclick'
-
 host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
@@ -33,154 +30,34 @@ def mainlist(item):
 
     itemlist = []
 
-    support.menu(itemlist, 'Serie', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args=['news'])
-    support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args= ['update'])
-    support.menu(itemlist, 'Categorie', 'categorie', host, 'tvshow', args=['cat'])
-    support.menu(itemlist, 'Serie inedite Sub-ITA submenu', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args=['inedite'])
-    support.menu(itemlist, 'Da non perdere bold submenu', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args=['tv', 'da non perdere'])
-    support.menu(itemlist, 'Classiche bold submenu', 'serietv', "%s/lista-serie-tv" % host, 'tvshow', args=['tv', 'classiche'])
-    support.menu(itemlist, 'Disegni che si muovono sullo schermo per magia bold', 'tvserie', "%s/category/animazione/" % host, 'tvshow', args= ['anime'])
-
-
-    # autoplay
+    support.menu(itemlist, 'Novità bold', 'serietvaggiornate', "%s/lista-serie-tv" % host, 'tvshow')
+    support.menu(itemlist, 'Nuove serie', 'nuoveserie', "%s/lista-serie-tv" % host, 'tvshow')
+    support.menu(itemlist, 'Serie inedite Sub-ITA', 'nuoveserie', "%s/lista-serie-tv" % host, 'tvshow', args=['inedite'])
+    support.menu(itemlist, 'Da non perdere bold', 'nuoveserie', "%s/lista-serie-tv" % host, 'tvshow', args=['tv', 'da non perdere'])
+    support.menu(itemlist, 'Classiche bold', 'nuoveserie', "%s/lista-serie-tv" % host, 'tvshow', args=['tv', 'classiche'])
+    support.menu(itemlist, 'Anime', 'lista_serie', "%s/category/animazione/" % host, 'tvshow')
+    support.menu(itemlist, 'Categorie', 'categorie', host, 'tvshow', args=['serie'])
+    support.menu(itemlist, 'Cerca', 'search', host, 'tvshow', args=['serie'])
     support.aplay(item, itemlist, list_servers, list_quality)
-    # configurazione del canale
     support.channel_config(item, itemlist)
 
     return itemlist
 
-@support.scrape
-def serietv(item):
-##    import web_pdb; web_pdb.set_trace()
-    log('serietv ->\n')
-##<<<<<<< HEAD
-##
-##    action = 'episodios'
-##    listGroups = ['url', 'thumb', 'title']
-##    patron = r'<a href="([^"]+)".*?> <img\s.*?src="([^"]+)" \/>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<\/p>'
-##    if 'news' in item.args:
-##        patronBlock = r'<div class="container container-title-serie-new container-scheda" meta-slug="new">(.*?)</div></div><div'
-##    elif 'inedite' in item.args:
-##        patronBlock = r'<div class="container container-title-serie-ined container-scheda" meta-slug="ined">(.*?)</div></div><div'
-##    elif 'da non perdere' in item.args:
-##        patronBlock = r'<div class="container container-title-serie-danonperd container-scheda" meta-slug="danonperd">(.*?)</div></div><div'
-##    elif 'classiche' in item.args:
-##        patronBlock = r'<div class="container container-title-serie-classiche container-scheda" meta-slug="classiche">(.*?)</div></div><div'
-##    elif 'update' in item.args:
-##        listGroups = ['url', 'thumb', 'episode', 'lang', 'title']
-##        patron = r'rel="nofollow" href="([^"]+)"[^>]+> <img.*?src="([^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(\d+.\d+) \((.+?)\).<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>'
-##        patronBlock = r'meta-slug="lastep">(.*?)</div></div><div'
-##        # permette di vedere episodio + titolo + titolo2 in novità
-##        def itemHook(item):
-##            item.show = item.episode + item.title
-##            return item
-##    return locals()
-##
-##@support.scrape
-##def tvserie(item):
-##
-##    action = 'episodios'
-##    listGroups = ['url', 'thumb', 'title']
-##    patron = r'<a\shref="([^"]+)".*?>\s<img\s.*?src="([^"]+)" />[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)</p></div>'
-##    patronBlock = r'<div\sclass="col-xs-\d+ col-sm-\d+-\d+">(.*?)<div\sclass="container-fluid whitebg" style="">'
-##    patronNext = r'<link\s.*?rel="next"\shref="([^"]+)"'
-##
-##    return locals()
-##
-##@support.scrape
-##def episodios(item):
-##    log('episodios ->\n')
-##    item.contentType = 'episode'
-##
-##    action = 'findvideos'
-##    listGroups = ['episode', 'lang', 'title2', 'plot', 'title', 'url']
-##    patron = r'class="number-episodes-on-img"> (\d+.\d+)(?:|[ ]\((.*?)\))<[^>]+>'\
-##             '[^>]+>[^>]+>[^>]+>[^>]+>(.*?)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>'\
-##             '(.*?)<[^>]+></div></div>.<span\s.+?meta-serie="(.*?)" meta-stag=(.*?)</span>'
-##
-##    return locals()
-##
-##=======
-
-    action = 'episodios'
-    listGroups = ['url', 'thumb', 'title']
-    patron = r'<a href="([^"]+)".*?> <img\s.*?src="([^"]+)" \/>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<\/p>'
-    if 'news' in item.args:
-        patron_block = r'<div class="container container-title-serie-new container-scheda" meta-slug="new">(.*?)</div></div><div'
-    elif 'inedite' in item.args:
-        patron_block = r'<div class="container container-title-serie-ined container-scheda" meta-slug="ined">(.*?)</div></div><div'
-    elif 'da non perdere' in item.args:
-        patron_block = r'<div class="container container-title-serie-danonperd container-scheda" meta-slug="danonperd">(.*?)</div></div><div'
-    elif 'classiche' in item.args:
-        patron_block = r'<div class="container container-title-serie-classiche container-scheda" meta-slug="classiche">(.*?)</div></div><div'
-    elif 'update' in item.args:
-        listGroups = ['url', 'thumb', 'episode', 'lang', 'title']
-        patron = r'rel="nofollow" href="([^"]+)"[^>]+> <img.*?src="([^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(\d+.\d+) \((.+?)\).<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>'
-        patron_block = r'meta-slug="lastep">(.*?)</div></div><div'
-        # permette di vedere episodio + titolo + titolo2 in novità
-        def itemHook(item):
-            item.show = item.episode + item.title
-            return item
-    return locals()
-
-@support.scrape
-def tvserie(item):
-
-    action = 'episodios'
-    listGroups = ['url', 'thumb', 'title']
-    patron = r'<a\shref="([^"]+)".*?>\s<img\s.*?src="([^"]+)" />[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)</p></div>'
-    patron_block = r'<div\sclass="col-xs-\d+ col-sm-\d+-\d+">(.*?)<div\sclass="container-fluid whitebg" style="">'
-    patronNext = r'<link\s.*?rel="next"\shref="([^"]+)"'
-
-    return locals()
-
-@support.scrape
-def episodios(item):
-    log('episodios ->\n')
-    item.contentType = 'episode'
-
-    action = 'findvideos'
-    listGroups = ['episode', 'lang', 'title2', 'plot', 'title', 'url']
-    patron = r'class="number-episodes-on-img"> (\d+.\d+)(?:|[ ]\((.*?)\))<[^>]+>'\
-             '[^>]+>[^>]+>[^>]+>[^>]+>(.*?)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>'\
-             '(.*?)<[^>]+></div></div>.<span\s.+?meta-serie="(.*?)" meta-stag=(.*?)</span>'
-
-    return locals()
-
-##>>>>>>> a72130e0324ae485ae5f39d3d8f1df46c365fa5b
-def findvideos(item):
-    log()
-    return support.server(item, item.url)
-
-@support.scrape
-def categorie(item):
-    log
-
-    action = 'tvserie'
-    listGroups = ['url', 'title']
-    patron = r'<li>\s<a\shref="([^"]+)"[^>]+>([^<]+)</a></li>'
-
-    patron_block = r'<ul\sclass="dropdown-menu category">(.*?)</ul>'
-
-
-    return locals()
 
 # ================================================================================================================
-##
-### ----------------------------------------------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------------------------------------------
 def newest(categoria):
     log()
     itemlist = []
     item = Item()
-    item.contentType= 'episode'
-    item.args = 'update'
     try:
         if categoria == "series":
             item.url = "%s/lista-serie-tv" % host
-            item.action = "serietv"
-            itemlist = serietv(item)
+            item.action = "serietvaggiornate"
+            itemlist = serietvaggiornate(item)
 
-            if itemlist[-1].action == "serietv":
+            if itemlist[-1].action == "serietvaggiornate":
                 itemlist.pop()
 
     # Continua la ricerca in caso di errore 
@@ -192,18 +69,207 @@ def newest(categoria):
 
     return itemlist
 
-### ================================================================================================================
-### ----------------------------------------------------------------------------------------------------------------
 
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
 def search(item, texto):
     log(texto)
     item.url = host + "/?s=" + texto
-    item.args = 'cerca'
     try:
-        return tvserie(item)
+        return lista_serie(item)
     # Continua la ricerca in caso di errore 
     except:
         import sys
         for line in sys.exc_info():
             logger.error("%s" % line)
         return []
+
+
+# ================================================================================================================
+# ----------------------------------------------------------------------------------------------------------------
+def cleantitle(scrapedtitle):
+    scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle.strip()).replace('"', "'")
+    return scrapedtitle.strip()
+
+
+# ================================================================================================================
+# ----------------------------------------------------------------------------------------------------------------
+
+def nuoveserie(item):
+    log()
+    itemlist = []
+
+    patron_block = ''
+    if 'inedite' in item.args:
+        patron_block = r'<div class="container container-title-serie-ined container-scheda" meta-slug="ined">(.*?)</div></div><div'
+    elif 'da non perdere' in item.args:
+        patron_block = r'<div class="container container-title-serie-danonperd container-scheda" meta-slug="danonperd">(.*?)</div></div><div'
+    elif 'classiche' in item.args:
+        patron_block = r'<div class="container container-title-serie-classiche container-scheda" meta-slug="classiche">(.*?)</div></div><div'
+    else:
+        patron_block = r'<div class="container container-title-serie-new container-scheda" meta-slug="new">(.*?)</div></div><div'
+
+    patron = r'<a href="([^"]+)".*?><img\s.*?src="([^"]+)" \/>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<\/p>'
+
+    matches = support.match(item, patron, patron_block, headers)[0]
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
+        scrapedtitle = cleantitle(scrapedtitle)
+
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="episodios",
+                 contentType="tvshow",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 thumbnail=scrapedthumbnail,
+                 folder=True))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def serietvaggiornate(item):
+    log()
+    itemlist = []
+
+    patron_block = r'<div class="container\s*container-title-serie-lastep\s*container-scheda" meta-slug="lastep">(.*?)<\/div><\/div><div'
+    patron = r'<a rel="nofollow"\s*href="([^"]+)"[^>]+><img.*?src="([^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>'
+
+    matches = support.match(item, patron, patron_block, headers)[0]
+
+    for scrapedurl, scrapedthumbnail, scrapedep, scrapedtitle in matches:
+        episode = re.compile(r'^(\d+)x(\d+)', re.DOTALL).findall(scrapedep)  # Prendo stagione ed episodioso
+        scrapedtitle = cleantitle(scrapedtitle)
+
+        contentlanguage = ""
+        if 'sub-ita' in scrapedep.strip().lower():
+            contentlanguage = 'Sub-ITA'
+
+        extra = r'<span\s.*?meta-stag="%s" meta-ep="%s" meta-embed="([^"]+)"\s.*?embed2="([^"]+)?"\s.*?embed3="([^"]+)?"[^>]*>' % (
+            episode[0][0], episode[0][1].lstrip("0"))
+
+        infoLabels = {}
+        infoLabels['episode'] = episode[0][1].zfill(2)
+        infoLabels['season'] = episode[0][0]
+
+        title = str(
+            "%s - %sx%s %s" % (scrapedtitle, infoLabels['season'], infoLabels['episode'], contentlanguage)).strip()
+
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="findepvideos",
+                 contentType="tvshow",
+                 title=title,
+                 show=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 extra=extra,
+                 thumbnail=scrapedthumbnail,
+                 contentLanguage=contentlanguage,
+                 infoLabels=infoLabels,
+                 folder=True))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def categorie(item):
+    log()
+    return support.scrape(item, r'<li>\s<a\shref="([^"]+)"[^>]+>([^<]+)</a></li>', ['url', 'title'], patron_block=r'<ul\sclass="dropdown-menu category">(.*?)</ul>', headers=headers, action="lista_serie")
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def lista_serie(item):
+    log()
+    itemlist = []
+
+    patron_block = r'<div\sclass="col-xs-\d+ col-sm-\d+-\d+">(.*?)<div\sclass="container-fluid whitebg" style="">'
+    patron = r'<a\shref="([^"]+)".*?>\s<img\s.*?src="([^"]+)" />[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)</p></div>'
+
+    return support.scrape(item, patron, ['url', 'thumb', 'title'], patron_block=patron_block, patronNext=r"<link\s.*?rel='next'\shref='([^']*)'", action='episodios')
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def episodios(item):
+    log()
+    itemlist = []
+
+    patron = r'<div\sclass="[^"]+">\s([^<]+)<\/div>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><p[^>]+>([^<]+)<[^>]+>[^>]+>[^>]+>'
+    patron += r'[^"]+".*?serie="([^"]+)".*?stag="([0-9]*)".*?ep="([0-9]*)"\s'
+    patron += r'.*?embed="([^"]+)"\s.*?embed2="([^"]+)?"\s.*?embed3="([^"]+)?"?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s?'
+    patron += r'(?:<img\sclass="[^"]+" meta-src="([^"]+)"[^>]+>|<img\sclass="[^"]+" src="" data-original="([^"]+)"[^>]+>)?'
+
+    matches = support.match(item, patron, headers=headers)[0]
+
+    for scrapedtitle, scrapedepisodetitle, scrapedplot, scrapedserie, scrapedseason, scrapedepisode, scrapedurl, scrapedurl2, scrapedurl3, scrapedthumbnail, scrapedthumbnail2 in matches:
+        scrapedtitle = cleantitle(scrapedtitle)
+        scrapedepisode = scrapedepisode.zfill(2)
+        scrapedepisodetitle = cleantitle(scrapedepisodetitle)
+        title = str("%sx%s %s" % (scrapedseason, scrapedepisode, scrapedepisodetitle)).strip()
+        if 'SUB-ITA' in scrapedtitle:
+            title += " "+support.typo("Sub-ITA", '_ [] color kod')
+
+        infoLabels = {}
+        infoLabels['season'] = scrapedseason
+        infoLabels['episode'] = scrapedepisode
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="findvideos",
+                 title=support.typo(title, 'bold'),
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl + "\r\n" + scrapedurl2 + "\r\n" + scrapedurl3,
+                 contentType="episode",
+                 plot=scrapedplot,
+                 contentSerieName=scrapedserie,
+                 contentLanguage='Sub-ITA' if 'Sub-ITA' in title else '',
+                 infoLabels=infoLabels,
+                 thumbnail=scrapedthumbnail2 if scrapedthumbnail2 != '' else scrapedthumbnail,
+                 folder=True))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    support.videolibrary(itemlist, item)
+
+    return itemlist
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def findepvideos(item):
+    log()
+    data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
+    matches = scrapertools.find_multiple_matches(data, item.extra)
+    data = "\r\n".join(matches[0])
+    item.contentType = 'movie'
+    return support.server(item, data=data)
+
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def findvideos(item):
+    log()
+    if item.contentType == 'tvshow':
+        data = httptools.downloadpage(item.url, headers=headers).data
+        matches = scrapertools.find_multiple_matches(data, item.extra)
+        data = "\r\n".join(matches[0])
+    else:
+        log(item.url)
+        data = item.url
+    return support.server(item, data)
diff --git a/channels/guardogratis.json b/channels/guardogratis.json
index 427cb6ee..4ebedf28 100644
--- a/channels/guardogratis.json
+++ b/channels/guardogratis.json
@@ -4,8 +4,8 @@
     "active": true,
     "adult": false,
     "language": ["ita"],
-    "thumbnail": "",
-    "bannermenu": "",
+    "thumbnail": "https:\/\/guardogratis.com\/wp-content\/uploads\/2018\/01\/Logo-4.png",
+    "bannermenu": "https:\/\/guardogratis.com\/wp-content\/uploads\/2018\/01\/Logo-4.png",
     "categories": ["movie","tvshow"],
     "settings": [
         {
diff --git a/channels/hclips.py b/channels/hclips.py
index 9ae7ce89..eda1f2dc 100644
--- a/channels/hclips.py
+++ b/channels/hclips.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urllib
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.hclips.com'
 
diff --git a/channels/hdzog.py b/channels/hdzog.py
index 09ef0158..9418454b 100644
--- a/channels/hdzog.py
+++ b/channels/hdzog.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urllib
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.hdzog.com'
 
diff --git a/channels/hellporno.py b/channels/hellporno.py
index 0dab3be3..cfff8d1c 100644
--- a/channels/hellporno.py
+++ b/channels/hellporno.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://hellporno.com'
 
@@ -60,7 +61,7 @@ def lista(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = '<div class="video-thumb"><a href="([^"]+)" class="title".*?>([^"]+)</a>.*?'
     patron += '<span class="time">([^<]+)</span>.*?'
-    patron += '<video muted poster="([^"]+)"'
+    patron += '<video poster="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,duracion,scrapedthumbnail  in matches:
         url = scrapedurl
@@ -84,6 +85,6 @@ def play(item):
     scrapedurl = scrapertools.find_single_match(data,'<source data-fluid-hd src="([^"]+)/?br=\d+"')
     if scrapedurl=="":
         scrapedurl = scrapertools.find_single_match(data,'<source src="([^"]+)/?br=\d+"')
-    itemlist.append(item.clone(action="play", title=scrapedurl, url=scrapedurl))
+    itemlist.append(item.clone(action="play", title=scrapedurl, fulltitle = item.title, url=scrapedurl))
     return itemlist
 
diff --git a/channels/hentaiid.json b/channels/hentaiid.json
index 0519590a..c490a751 100644
--- a/channels/hentaiid.json
+++ b/channels/hentaiid.json
@@ -4,9 +4,9 @@
   "active": true,
   "adult": true,
   "language": ["*"],
-  "thumbnail": "http://www.hentai-id.tv/wp-content/themes/moviescript/assets/img/logo.png",
-  "banner": "http://www.hentai-id.tv/wp-content/themes/moviescript/assets/img/background.jpg",
+  "thumbnail": "https://dl.dropboxusercontent.com/u/30248079/hentai_id.png",
+  "banner": "https://dl.dropboxusercontent.com/u/30248079/hentai_id2.png",
   "categories": [
     "adult"
   ]
-}
+}
\ No newline at end of file
diff --git a/channels/hentaiid.py b/channels/hentaiid.py
index 495fae4d..da7240b8 100644
--- a/channels/hentaiid.py
+++ b/channels/hentaiid.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
 from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 CHANNEL_HOST = "http://hentai-id.tv/"
 
@@ -68,11 +70,11 @@ def series(item):
         action = "episodios"
 
     for url, thumbnail, title in matches:
-        contentTitle = title
+        fulltitle = title
         show = title
         # logger.debug("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
         itemlist.append(Item(channel=item.channel, action=action, title=title, url=url, thumbnail=thumbnail,
-                             show=show, fanart=thumbnail, folder=True))
+                             show=show, fulltitle=fulltitle, fanart=thumbnail, folder=True))
 
     if pagination:
         page = scrapertools.find_single_match(pagination, '>(?:Page|Página)\s*(\d+)\s*(?:of|de)\s*\d+<')
@@ -104,7 +106,7 @@ def episodios(item):
 
         # logger.debug("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
         itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url,
-                             thumbnail=thumbnail, plot=plot,
+                             thumbnail=thumbnail, plot=plot, show=item.show, fulltitle="%s %s" % (item.show, title),
                              fanart=thumbnail))
 
     return itemlist
@@ -114,33 +116,20 @@ def findvideos(item):
     logger.info()
 
     data = httptools.downloadpage(item.url).data
-    video_urls = []
-    down_urls = []
+
     patron = '<(?:iframe)?(?:IFRAME)?\s*(?:src)?(?:SRC)?="([^"]+)"'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for url in matches:
-        if 'goo.gl' in url or 'tinyurl' in url:
+        if 'goo.gl' in url:
             video = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers["location"]
-            video_urls.append(video)
-        else:
-            video_urls.append(url)
-    paste = scrapertools.find_single_match(data, 'https://gpaste.us/([a-zA-Z0-9]+)')
-    if paste:
-        try:
-            new_data = httptools.downloadpage('https://gpaste.us/'+paste).data
+            matches.remove(url)
+            matches.append(video)
 
-            bloq = scrapertools.find_single_match(new_data, 'id="input_text">(.*?)</div>')
-            matches = bloq.split('<br>')
-            for url in matches:
-                down_urls.append(url)
-        except:
-            pass
-    video_urls.extend(down_urls)
     from core import servertools
-    itemlist = servertools.find_video_items(data=",".join(video_urls))
+    itemlist = servertools.find_video_items(data=",".join(matches))
     for videoitem in itemlist:
-        videoitem.contentTitle = item.contentTitle
+        videoitem.fulltitle = item.fulltitle
         videoitem.channel = item.channel
         videoitem.thumbnail = item.thumbnail
 
diff --git a/channels/hotmovs.py b/channels/hotmovs.py
index 37ec2078..55a7f1ec 100644
--- a/channels/hotmovs.py
+++ b/channels/hotmovs.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urllib
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://hotmovs.com'
 
diff --git a/channels/italiaserie.py b/channels/italiaserie.py
index ef648130..e31efa2f 100644
--- a/channels/italiaserie.py
+++ b/channels/italiaserie.py
@@ -28,7 +28,7 @@ def mainlist(item):
     support.menu(itemlist, 'Ultime Uscite', 'peliculas', host + "/category/serie-tv/", "episode")
     support.menu(itemlist, 'Ultimi Episodi', 'peliculas', host + "/ultimi-episodi/", "episode", 'latest')
     support.menu(itemlist, 'Categorie', 'menu', host, "episode", args="Serie-Tv per Genere")
-
+    support.menu(itemlist, 'Cerca...', 'search', host, 'episode', args='serie')
 
     autoplay.init(item.channel, list_servers, [])
     autoplay.show_option(item.channel, itemlist)
diff --git a/channels/javtasty.py b/channels/javtasty.py
index 46c41026..96ffdcb6 100644
--- a/channels/javtasty.py
+++ b/channels/javtasty.py
@@ -109,7 +109,8 @@ def menu_info(item):
     itemlist = []
     video_urls, data = play(item.clone(extra="play_menu"))
     itemlist.append(item.clone(action="play", title="Ver -- %s" % item.title, video_urls=video_urls))
-    matches = scrapertools.find_multiple_matches(data, '<a href="([^"]+)" class="item" rel="screenshots"')
+    bloque = scrapertools.find_single_match(data, '<div class="carousel-inner"(.*?)<div class="container">')
+    matches = scrapertools.find_multiple_matches(bloque, 'src="([^"]+)"')
     for i, img in enumerate(matches):
         if i == 0:
             continue
diff --git a/channels/javus.json b/channels/javus.json
index 17595685..efd2ac02 100644
--- a/channels/javus.json
+++ b/channels/javus.json
@@ -10,5 +10,13 @@
     "adult"
   ],
   "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": false,
+      "visible": false
+    }
   ]
 }
\ No newline at end of file
diff --git a/channels/javus.py b/channels/javus.py
index 83979eb7..df1b7e82 100644
--- a/channels/javus.py
+++ b/channels/javus.py
@@ -6,6 +6,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://javus.net/'
 
diff --git a/channels/javwhores.py b/channels/javwhores.py
index 6746f9d9..c974c92b 100644
--- a/channels/javwhores.py
+++ b/channels/javwhores.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
-
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.javwhores.com/'
 
@@ -74,13 +74,9 @@ def lista(item):
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
                               plot=plot, contentTitle = title))
     next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-    if "#videos" in next_page:
-        next_page = scrapertools.find_single_match(data, 'data-parameters="sort_by:post_date;from:(\d+)">Next')
-        next = scrapertools.find_single_match(item.url, '(.*?/)\d+')
-        next_page = next + "%s/" % next_page
     if next_page:
         next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title= next_page, text_color="blue", url=next_page ) )
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>" , text_color="blue", url=next_page ) )
     return itemlist
 
 
@@ -96,7 +92,7 @@ def play(item):
     if scrapedurl == "" :
         scrapedurl = scrapertools.find_single_match(data, 'video_url: \'([^\']+)\'')
 
-    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, url=scrapedurl,
+    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, fulltitle=item.title, url=scrapedurl,
                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/jizzbunker.py b/channels/jizzbunker.py
index d6a22407..c453be1d 100644
--- a/channels/jizzbunker.py
+++ b/channels/jizzbunker.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://jizzbunker.com/es'
 
@@ -86,7 +87,7 @@ def play(item):
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
         scrapedurl = scrapedurl.replace("https", "http")
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
+        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
                             thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/justporn.py b/channels/justporn.py
index 50aa533f..912ab1bb 100644
--- a/channels/justporn.py
+++ b/channels/justporn.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://xxx.justporno.tv'
 
@@ -92,6 +93,10 @@ def lista(item):
                     next_page = "%s?mode=async&function=get_block&block_id=list_videos_common_videos_list" \
                                 "&sort_by=post_date&from=%s" % (item.url, next_page)
                 itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
+
+    # if next_page!="":
+        # next_page = urlparse.urljoin(item.url,next_page)
+        # itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
@@ -104,6 +109,6 @@ def play(item):
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl in matches:
         scrapedplot = ""
-        itemlist.append(item.clone(channel=item.channel, action="play", title=item.title , url=scrapedurl , plot="" , folder=True) )
+        itemlist.append(item.clone(channel=item.channel, action="play", title=scrapedurl , url=scrapedurl , plot="" , folder=True) )
     return itemlist
 
diff --git a/channels/kingsizetits.json b/channels/kingsizetits.json
deleted file mode 100755
index 69493b3e..00000000
--- a/channels/kingsizetits.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "kingsizetits",
-  "name": "Kingsizetits",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://cdn.images.kingsizetits.com/resources/kingsizetits.com/rwd_5/default/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/kingsizetits.py b/channels/kingsizetits.py
deleted file mode 100755
index c8cdc8a3..00000000
--- a/channels/kingsizetits.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://kingsizetits.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/most-recent/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-viewed-week/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas largos" , action="lista", url=host + "/longest/"))
-    
-
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/videos/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a href="([^"]+)" class="video-box.*?'
-    patron += 'src=\'([^\']+)\' alt=\'([^\']+)\'.*?'
-    patron += 'data-video-count="(\d+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<script>stat.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<span class="video-length">([^<]+)</span>.*?'
-    patron += '<span class="pic-name">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtime,scrapedtitle in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<a class="btn default-btn page-next page-nav" href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    logger.debug(data)
-    url = scrapertools.find_single_match(data,'label:"\d+", file\:"([^"]+)"')
-    itemlist.append(item.clone(action="play", server="directo", url=url ))
-    return itemlist
-
-
diff --git a/channels/mangovideo.json b/channels/mangovideo.json
deleted file mode 100755
index af5b8c23..00000000
--- a/channels/mangovideo.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "mangovideo",
-  "name": "mangovideo",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://mangovideo.pw/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/mangovideo.py b/channels/mangovideo.py
deleted file mode 100755
index 509d2f93..00000000
--- a/channels/mangovideo.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-
-server = {'1': 'https://www.mangovideo.pw/contents/videos', '7' : 'https://server9.mangovideo.pw/contents/videos/',
-          '8' : 'https://s10.mangovideo.pw/contents/videos/', '9' : 'https://server2.mangovideo.pw/contents/videos/',
-          '10' : 'https://server217.mangovideo.pw/contents/videos/', '11' : 'https://234.mangovideo.pw/contents/videos/'
-         }
-
-host = 'http://mangovideo.pw'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Sitios" , action="categorias", url=host + "/sites/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a class="item" href="([^"]+)" title="([^"]+)".*?'
-    patron += '<div class="videos">(\d+) videos</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-                              
-    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="categorias", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-                              
-                              
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div class="item\s+">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)".*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<div class="duration">([^<]+)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    scrapedtitle = ""
-    patron = 'video_url: \'function/0/https://mangovideo.pw/get_file/(\d+)/\w+/(.*?)/\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedtitle,url in matches:
-        scrapedtitle = server.get(scrapedtitle, scrapedtitle)
-        url = scrapedtitle + url
-    if not scrapedtitle:
-        url = scrapertools.find_single_match(data, '<div class="embed-wrap".*?<iframe src="([^"]+)\?ref=')
-    itemlist.append(item.clone(action="play", title="%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) 
-    
-    return itemlist
-
diff --git a/channels/mondolunatico2.py b/channels/mondolunatico2.py
index e9dbf88f..075ca1d1 100644
--- a/channels/mondolunatico2.py
+++ b/channels/mondolunatico2.py
@@ -30,11 +30,11 @@ def mainlist(item):
     support.menu(itemlist, 'Sub ITA bold', 'carousel_subita', host, contentType='movie', args='movies')
     support.menu(itemlist, 'Ultime Richieste Inserite bold', 'carousel_request', host, contentType='movie', args='movies')
     support.menu(itemlist, 'Film Nelle Sale bold', 'carousel_cinema', host, contentType='movie', args='movies')
-    ('Film Ultimi Inseriti ', [, 'carousel_last', 'movies'])
-    ('Film Top ImDb ', ['/top-imdb/', 'top_imdb', 'movies'])
-    support.menu(itemlist, 'Serie TV', 'carousel_episodes', host, contentTyp='episode', args='tvshows')
-    ('Serie TV Top ImDb ', ['/top-imdb/', 'top_serie', 'tvshows'])
-
+    support.menu(itemlist, 'Film Ultimi Inseriti submenu', 'carousel_last', host, contentType='movie', args='movies')
+    support.menu(itemlist, 'Film Top ImDb submenu', 'top_imdb', host + '/top-imdb/', contentType='movie', args='movies')
+    support.menu(itemlist, 'Serie TV', 'carousel_episodes', host, contentType='episode', args='tvshows')
+    support.menu(itemlist, 'Serie TV Top ImDb submenu', 'top_serie', host + '/top-imdb/', contentType='episode', args='tvshows')
+    support.menu(itemlist, '[COLOR blue]Cerca...[/COLOR] bold', 'search', host)
     autoplay.init(item.channel, list_servers, list_quality)
     autoplay.show_option(item.channel, itemlist)
 
diff --git a/channels/mporno.py b/channels/mporno.py
index e568594d..1071c972 100644
--- a/channels/mporno.py
+++ b/channels/mporno.py
@@ -1,22 +1,23 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://mporno.tv'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host + "/most-recent/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistas" , action="lista", url=host + "/most-viewed/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest/"))
+    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host + "/most-recent/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="peliculas", url=host + "/top-rated/"))
+    itemlist.append( Item(channel=item.channel, title="Mas vistas" , action="peliculas", url=host + "/most-viewed/"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/longest/"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/channels/"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
@@ -27,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/videos/%s/page1.html" % texto
     try:
-        return lista(item)
+        return peliculas(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -45,12 +46,12 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedtitle = scrapedtitle + "  " + cantidad
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail , plot=scrapedplot) )
     return itemlist
 
 
-def lista(item):
+def peliculas(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -60,21 +61,15 @@ def lista(item):
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         contentTitle = scrapedtitle
         title = scrapedtitle
+        scrapedurl = scrapedurl.replace("/thumbs/", "/videos/") + ".mp4"
         thumbnail = scrapedthumbnail
         plot = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, server= "directo", contentTitle=contentTitle))
+                              fanart=thumbnail, plot=plot, contentTitle=contentTitle))
     next_page_url = scrapertools.find_single_match(data,'<a href=\'([^\']+)\' class="next">Next &gt;&gt;</a>')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
+        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
         
     return itemlist
 
-
-def play(item):
-    logger.info()
-    itemlist = []
-    url = item.url.replace("/thumbs/", "/videos/") + ".mp4"
-    itemlist.append( Item(channel=item.channel, action="play", title= item.title, server= "directo", url=url))
-    return itemlist
\ No newline at end of file
diff --git a/channels/muchoporno.py b/channels/muchoporno.py
index 73130718..9af38852 100644
--- a/channels/muchoporno.py
+++ b/channels/muchoporno.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.pornburst.xxx'
 
@@ -42,21 +43,20 @@ def categorias(item):
     if "/sites/" in item.url:
         patron = '<div class="muestra-escena muestra-canales">.*?'
         patron += 'href="([^"]+)">.*?'
-        patron += 'data-src="([^"]+)".*?'
+        patron += 'src="([^"]+)".*?'
         patron += '<a title="([^"]+)".*?'
         patron += '</span> (\d+) videos</span>'
     if "/pornstars/" in item.url:
         patron = '<a class="muestra-escena muestra-pornostar" href="([^"]+)">.*?'
-        patron += 'data-src="([^"]+)".*?'
+        patron += 'src="([^"]+)".*?'
         patron += 'alt="([^"]+)".*?'
         patron += '</span> (\d+) videos</span>'
     else:
         patron  = '<a class="muestra-escena muestra-categoria" href="([^"]+)" title="[^"]+">.*?'
-        patron += 'data-src="([^"]+)".*?'
+        patron += 'src="([^"]+)".*?'
         patron += '</span> ([^"]+) </h2>(.*?)>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        logger.debug(scrapedurl + ' / ' + scrapedthumbnail + ' / ' + cantidad + ' / ' + scrapedtitle)
         scrapedplot = ""
         cantidad =  " (" + cantidad + ")"
         if "</a" in cantidad:
@@ -107,6 +107,6 @@ def play(item):
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
         title = scrapedurl
-    itemlist.append(item.clone(action="play", title=title, url=scrapedurl))
+    itemlist.append(item.clone(action="play", title=title, fulltitle = item.title, url=scrapedurl))
     return itemlist
 
diff --git a/channels/nuvid.py b/channels/nuvid.py
index d87be509..4f6a64c6 100644
--- a/channels/nuvid.py
+++ b/channels/nuvid.py
@@ -2,11 +2,13 @@
 
 import base64
 import hashlib
+
 import urlparse
 
 from core import httptools
 from core import scrapertools
 from platformcode import logger
+from platformcode import config
 
 host = "https://www.nuvid.com"
 
@@ -51,7 +53,7 @@ def lista(item):
     data = httptools.downloadpage(item.url, headers=header, cookies=False).data
 
     # Extrae las entradas
-    patron = '<div class="box-tumb related_vid.*?href="([^"]+)" title="([^"]+)".*?src="([^"]+)"(.*?)<i class="time">([^<]+)<'
+    patron = '<div class="box-tumb related_vid">.*?href="([^"]+)" title="([^"]+)".*?src="([^"]+)"(.*?)<i class="time">([^<]+)<'
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl, scrapedtitle, scrapedthumbnail, quality, duration in matches:
         scrapedurl = urlparse.urljoin(host, scrapedurl)
@@ -83,7 +85,7 @@ def categorias(item):
     for cat, b in bloques:
         cat = cat.replace("Straight", "Hetero")
         itemlist.append(item.clone(action="", title=cat, text_color="gold"))
-        matches = scrapertools.find_multiple_matches(b, '<li>.*?href="([^"]+)" >(.*?)</span>')
+        matches = scrapertools.find_multiple_matches(b, '<li.*?href="([^"]+)">(.*?)</span>')
         for scrapedurl, scrapedtitle in matches:
             scrapedtitle = "   " + scrapedtitle.replace("<span>", "")
             scrapedurl = urlparse.urljoin(host, scrapedurl)
diff --git a/channels/pandamovie.py b/channels/pandamovie.py
index e7961206..7680ad63 100644
--- a/channels/pandamovie.py
+++ b/channels/pandamovie.py
@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
-import urlparse
 import re
-import base64
 
-from platformcode import config, logger
-from core import scrapertools
-from core import servertools
-from core.item import Item
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'https://pandamovies.pw'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
@@ -61,7 +62,7 @@ def lista(item):
     data = httptools.downloadpage(item.url).data
     patron = '<div data-movie-id="\d+".*?'
     patron += '<a href="([^"]+)".*?oldtitle="([^"]+)".*?'
-    patron += '<img data-original="([^"]+)".*?'
+    patron += '<img src="([^"]+)".*?'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
         url = urlparse.urljoin(item.url, scrapedurl)
@@ -70,6 +71,7 @@ def lista(item):
         plot = ""
         itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
                              fanart=thumbnail, plot=plot, contentTitle=title))
+        # <li class='active'><a class=''>1</a></li><li><a rel='nofollow' class='page larger' href='https://pandamovies.pw/movies/page/2'>
     next_page = scrapertools.find_single_match(data, '<li class=\'active\'>.*?href=\'([^\']+)\'>')
     if next_page == "":
         next_page = scrapertools.find_single_match(data, '<a.*?href="([^"]+)" >Next &raquo;</a>')
@@ -77,34 +79,3 @@ def lista(item):
         next_page = urlparse.urljoin(item.url, next_page)
         itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
     return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = '- on ([^"]+)" href="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedtitle,url in matches:
-        if 'aHR0' in url:
-            n = 3
-            while n > 0:
-                url= url.replace("https://vshares.tk/goto/", "").replace("https://waaws.tk/goto/", "").replace("https://openloads.tk/goto/", "")
-                logger.debug (url)
-                url = base64.b64decode(url)
-                n -= 1
-        if "mangovideo" in url:  #Aparece como directo
-            data = httptools.downloadpage(url).data
-            patron = 'video_url: \'function/0/https://mangovideo.pw/get_file/(\d+)/\w+/(.*?)/\?embed=true\''
-            matches = scrapertools.find_multiple_matches(data, patron)
-            for scrapedtitle,url in matches:
-                if scrapedtitle =="1":  scrapedtitle= "https://www.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="7":  scrapedtitle= "https://server9.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="8":  scrapedtitle= "https://s10.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="10": scrapedtitle= "https://server217.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="11": scrapedtitle= "https://234.mangovideo.pw/contents/videos/"
-                url = scrapedtitle + url
-        itemlist.append( Item(channel=item.channel, action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/pelisxporno.json b/channels/pelisxporno.json
index e01fb74e..d727ed88 100644
--- a/channels/pelisxporno.json
+++ b/channels/pelisxporno.json
@@ -10,5 +10,13 @@
     "adult"
   ],
   "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    }
   ]
 }
\ No newline at end of file
diff --git a/channels/pelisxporno.py b/channels/pelisxporno.py
index f8920727..fcebb93d 100644
--- a/channels/pelisxporno.py
+++ b/channels/pelisxporno.py
@@ -1,85 +1,63 @@
 # -*- coding: utf-8 -*-
-import urlparse
-import re
 
-from platformcode import config, logger
 from core import httptools
 from core import scrapertools
-from core import servertools
+from platformcode import logger
+from platformcode import config
 
 
-host = 'http://www.pelisxporno.com'
-
 def mainlist(item):
     logger.info()
+
     itemlist = []
-    itemlist.append(item.clone(action="lista", title="Novedades", url= host + "/?order=date"))
-    itemlist.append(item.clone(action="categorias", title="Categorías", url=host + "/categorias/"))
-    itemlist.append(item.clone(action="search", title="Buscar"))
+    itemlist.append(item.clone(action="lista", title="Novedades", url="http://www.pelisxporno.com/?order=date"))
+    itemlist.append(item.clone(action="categorias", title="Categorías", url="http://www.pelisxporno.com/categorias/"))
+    itemlist.append(item.clone(action="search", title="Buscar", url="http://www.pelisxporno.com/?s=%s"))
+
     return itemlist
 
-def search(item, texto):
-    logger.info("")
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-        
+
 def search(item, texto):
     logger.info()
     item.url = item.url % texto
     return lista(item)
 
 
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<li class="cat-item cat-item-.*?"><a href="(.*?)".*?>(.*?)<'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle in matches:
-        itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl))
-    return itemlist
-
-
 def lista(item):
     logger.info()
     itemlist = []
+
+    # Descarga la pagina  
     data = httptools.downloadpage(item.url).data
+    # Extrae las entradas (carpetas)
     patron = '<div class="video.".*?<a href="(.*?)" title="(.*?)">.*?<img src="(.*?)".*?\/>.*?duration.*?>(.*?)<'
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl, scrapedtitle, scrapedthumbnail, duration in matches:
         if duration:
-            scrapedtitle = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
+            scrapedtitle += "  (%s)" % duration
+
         itemlist.append(item.clone(action="findvideos", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
                                    fanart=scrapedthumbnail))
+
+    # Extrae la marca de siguiente página
     next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)"')
     if next_page:
         itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
+
     return itemlist
 
 
-def findvideos(item):
+def categorias(item):
+    logger.info()
     itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '<div class="video_code">(.*?)<h3')
-    patron = '(?:src|SRC)="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl in matches:
-        if not 'mixdrop' in scrapedurl:  #el base64 es netu.tv
-            url = "https://hqq.tv/player/embed_player.php?vid=RODE5Z2Hx3hO&autoplay=none"
-        else:
-            url = "https:" + scrapedurl
-            headers = {'Referer': item.url}
-            data = httptools.downloadpage(url, headers=headers).data
-            url = scrapertools.find_single_match(data, 'vsrc = "([^"]+)"')
-            url= "https:" + url
-        itemlist.append(item.clone(action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
 
+    # Descarga la pagina  
+    data = httptools.downloadpage(item.url).data
+
+    # Extrae las entradas (carpetas)
+    patron = '<li class="cat-item cat-item-.*?"><a href="(.*?)".*?>(.*?)<'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for scrapedurl, scrapedtitle in matches:
+        itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl))
+
+    return itemlist
diff --git a/channels/perfectgirls.py b/channels/perfectgirls.py
index 43503f3c..b77d35e0 100644
--- a/channels/perfectgirls.py
+++ b/channels/perfectgirls.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.perfectgirls.net'
 
diff --git a/channels/playpornx.json b/channels/playpornx.json
index d7582a98..632234b5 100644
--- a/channels/playpornx.json
+++ b/channels/playpornx.json
@@ -10,5 +10,13 @@
     "adult"
   ],
   "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": false,
+      "visible": false
+    }
   ]
 }
\ No newline at end of file
diff --git a/channels/playpornx.py b/channels/playpornx.py
index c39822b1..8a03ef39 100644
--- a/channels/playpornx.py
+++ b/channels/playpornx.py
@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
 from core import httptools
-from core import servertools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
-import base64
+from platformcode import config
 
 host = "https://watchfreexxx.net/"
 
+
 def mainlist(item):
     itemlist = []
 
@@ -21,17 +22,47 @@ def mainlist(item):
     itemlist.append(Item(channel=item.channel, title="Escenas", action="lista",
                          url = urlparse.urljoin(host, "category/xxx-scenes/")))
 
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=',
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + '/?s=',
                          thumbnail='https://s30.postimg.cc/pei7txpa9/buscar.png',
                          fanart='https://s30.postimg.cc/pei7txpa9/buscar.png'))
 
     return itemlist
 
 
+def lista(item):
+    logger.info()
+
+    itemlist = []
+    if item.url == '': item.url = host
+
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+
+    patron = '<article id=.*?<a href="([^"]+)".*?<img data-src="([^"]+)" alt="([^"]+)"'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for data_1, data_2, data_3 in matches:
+        url = data_1
+        thumbnail = data_2
+        title = data_3
+        itemlist.append(Item(channel=item.channel, action='findvideos', title=title, url=url, thumbnail=thumbnail))
+
+    #Paginacion
+    if itemlist != []:
+        actual_page_url = item.url
+        next_page = scrapertools.find_single_match(data, '<a href="([^"]+)">Next</a>')
+        if next_page != '':
+            itemlist.append(Item(channel=item.channel, action="lista", title='Siguiente >>>', url=next_page,
+                                 thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png', extra=item.extra))
+    
+    return itemlist
+
+
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
     item.url = item.url + texto
+
     try:
         if texto != '':
             item.extra = 'Buscar'
@@ -43,58 +74,3 @@ def search(item, texto):
         for line in sys.exc_info():
             logger.error("%s" % line)
         return []
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    if item.url == '': item.url = host
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    patron = '<article id=.*?<a href="([^"]+)".*?<img data-src="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for data_1, data_2, data_3 in matches:
-        url = data_1
-        thumbnail = data_2
-        title = data_3
-        itemlist.append(Item(channel=item.channel, action='findvideos', title=title, url=url, thumbnail=thumbnail))
-    #Paginacion
-    if itemlist != []:
-        actual_page_url = item.url
-        next_page = scrapertools.find_single_match(data, '<a href="([^"]+)">Next</a>')
-        if next_page != '':
-            itemlist.append(Item(channel=item.channel, action="lista", title='Siguiente >>>', url=next_page,
-                                 thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png', extra=item.extra))
-    return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = '- on ([^"]+)" href="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedtitle,url in matches:
-        if "tk/goto/" in url:
-            n = 3
-            while n > 0:
-                url= url.replace("https://vshares.tk/goto/", "").replace("https://waaws.tk/goto/", "").replace("https://openloads.tk/goto/", "")
-                logger.debug (url)
-                url = base64.b64decode(url)
-                n -= 1
-        if "mangovideo" in url:  #Aparece como directo
-            data = httptools.downloadpage(url).data
-            patron = 'video_url: \'function/0/https://mangovideo.pw/get_file/(\d+)/\w+/(.*?)/\?embed=true\''
-            matches = scrapertools.find_multiple_matches(data, patron)
-            for scrapedtitle,url in matches:
-                if scrapedtitle =="1":  scrapedtitle= "https://www.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="7":  scrapedtitle= "https://server9.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="8":  scrapedtitle= "https://s10.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="10": scrapedtitle= "https://server217.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="11": scrapedtitle= "https://234.mangovideo.pw/contents/videos/"
-                url = scrapedtitle + url
-        itemlist.append(item.clone(action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
-
diff --git a/channels/porn300.py b/channels/porn300.py
index c84840a0..b222d71a 100644
--- a/channels/porn300.py
+++ b/channels/porn300.py
@@ -1,31 +1,35 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.porn300.com'
 
+#BLOQUEO ANTIVIRUS STREAMCLOUD
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/en_US/ajax/page/list_videos/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/channels/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="categorias", url=host + "/pornstars/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/?page=1"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/es/videos/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/es/mas-vistos/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/es/mas-votados/"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/es/canales/?page=1"))
+    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="categorias", url=host + "/es/pornostars/?page=1"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/es/categorias/"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
-# view-source:https://www.porn300.com/en_US/ajax/page/show_search?q=big+tit&page=1
-# https://www.porn300.com/en_US/ajax/page/show_search?page=2 
+
+
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
-    item.url = host + "/en_US/ajax/page/show_search?q=%s&?page=1" % texto
+    item.url = host + "/es/buscar/?q=%s" % texto
     try:
         return lista(item)
     except:
@@ -40,18 +44,20 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a itemprop="url" href="/([^"]+)".*?'
-    patron += 'data-src="([^"]+)" alt=.*?'
-    patron += 'itemprop="name">([^<]+)</h3>.*?'
-    patron += '</svg>([^<]+)<'
+    patron  = '<a itemprop="url" href="([^"]+)".*?'
+    patron += 'title="([^"]+)">.*?'
+    if "/pornostars/" in item.url:
+        patron += '<img itemprop="image" src=([^"]+) alt=.*?'
+        patron += '</svg>([^<]+)<'
+    else:
+        patron += '<img itemprop="image" src="([^"]+)" alt=.*?'
+        patron += '</svg>([^<]+)<'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
+    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         cantidad = re.compile("\s+", re.DOTALL).sub(" ", cantidad)
         scrapedtitle = scrapedtitle + " (" + cantidad +")"
-        scrapedurl = scrapedurl.replace("channel/", "producer/")
-        scrapedurl = "/en_US/ajax/page/show_" + scrapedurl + "?page=1"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/?sort=latest"
         itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                               fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
     next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)" />')
@@ -69,29 +75,22 @@ def lista(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a itemprop="url" href="([^"]+)".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += 'itemprop="name">([^<]+)<.*?'
+    patron = '<a itemprop="url" href="([^"]+)" data-video-id="\d+" title="([^"]+)">.*?'
+    patron += '<img itemprop="thumbnailUrl" src="([^"]+)".*?'
     patron += '</svg>([^<]+)<'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime  in matches:
+    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad  in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
-        scrapedtime = scrapedtime.strip()
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
+        cantidad = re.compile("\s+", re.DOTALL).sub(" ", cantidad)
+        title = "[COLOR yellow]" + cantidad + "[/COLOR] " + scrapedtitle
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
         itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
                               fanart=thumbnail, plot=plot, contentTitle = contentTitle) )
-    prev_page = scrapertools.find_single_match(item.url,"(.*?)page=\d+")
-    num= int(scrapertools.find_single_match(item.url,".*?page=(\d+)"))
-    num += 1
-    num_page = "?page=" + str(num)
-    if num_page!="":
-        next_page = urlparse.urljoin(item.url,num_page)
-        if "show_search" in next_page:
-            next_page = prev_page + num_page
-            next_page = next_page.replace("&?", "&")
+    next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)" />')
+    if next_page!="":
+        next_page = urlparse.urljoin(item.url,next_page)
         itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
@@ -102,6 +101,6 @@ def play(item):
     patron  = '<source src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for url  in matches:
-        itemlist.append(item.clone(action="play", title=url, url=url))
+        itemlist.append(item.clone(action="play", title=url, fulltitle = item.title, url=url))
     return itemlist
 
diff --git a/channels/pornboss.py b/channels/pornboss.py
index ebe0f22b..c2ff0e62 100644
--- a/channels/pornboss.py
+++ b/channels/pornboss.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import jsontools as json
+import re
+
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import config, logger
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://pornboss.org'
 
@@ -15,11 +15,13 @@ def mainlist(item):
     logger.info()
     itemlist = []
     itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/category/movies/"))
+    itemlist.append( Item(channel=item.channel, title="     categorias" , action="categorias", url=host + "/category/movies/"))
+    
     itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/clips/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    itemlist.append( Item(channel=item.channel, title="     categorias" , action="categorias", url=host + "/category/clips/"))
     return itemlist
 
+
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
@@ -38,9 +40,13 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data,'<div class="uk-panel uk-panel-box widget_nav_menu">(.*?)</ul>')
-    patron  = '<li><a href=(.*?) class>([^<]+)</a>'
+    if "/category/movies/" in item.url:
+        data = scrapertools.find_single_match(data,'>Movies</a>(.*?)</ul>')
+    else:
+        data = scrapertools.find_single_match(data,'>Clips</a>(.*?)</ul>')
+    patron  = '<a href=([^"]+)>([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -53,39 +59,29 @@ def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<article id=item-\d+.*?'
-    patron += '<img class=.*?src=(.*?) alt="([^"]+)".*?'
-    patron += 'Duration:</strong>(.*?) / <strong>.*?'
-    patron += '>SHOW<.*?href=([^"]+) target=' 
+    patron = '<article id=post-\d+.*?'
+    patron += '<img class="center cover" src=([^"]+) alt="([^"]+)".*?'
+    patron += '<blockquote><p> <a href=(.*?) target=_blank'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedtitle,duration,scrapedurl in matches:
+    scrapertools.printMatches(matches)
+    for scrapedthumbnail,scrapedtitle,scrapedurl in matches:
         scrapedplot = ""
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
                               fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li><a href=([^<]+)><i class=uk-icon-angle-double-right>')
-    next_page = next_page.replace('"', '')
+    next_page = scrapertools.find_single_match(data,'<a class=nextpostslink rel=next href=(.*?)>')
     if next_page!="":
         itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
+
 def play(item):
     logger.info()
-    itemlist = []
-    if "streamcloud" in item.url:
-         itemlist.append(item.clone(action="play", url=item.url ))
-    else:
-        data = httptools.downloadpage(item.url).data
-        url=scrapertools.find_single_match(data,'<span class="bottext">Streamcloud.eu</span>.*?href="([^"]+)"')
-        url= "https://tolink.to" + url
-        data = httptools.downloadpage(url).data
-        patron = '<input type="hidden" name="id" value="([^"]+)">.*?'
-        patron += '<input type="hidden" name="fname" value="([^"]+)">'
-        matches = re.compile(patron,re.DOTALL).findall(data)
-        for id, url in matches:
-            url= "http://streamcloud.eu/" + id
-            itemlist.append(item.clone(action="play", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist)
+    data = httptools.downloadpage(item.url).data
+    itemlist = servertools.find_video_items(data=item.url)
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
     return itemlist
 
-
diff --git a/channels/porndish.json b/channels/porndish.json
deleted file mode 100755
index c6089759..00000000
--- a/channels/porndish.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "porndish",
-  "name": "porndish",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.porndish.com/wp-content/uploads/2015/09/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porndish.py b/channels/porndish.py
deleted file mode 100755
index 0a5508aa..00000000
--- a/channels/porndish.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.porndish.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li id="menu-item-\d+".*?'
-    patron += '<a href="([^"]+)">([^<]+)<'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    data = scrapertools.find_single_match(data, 'archive-body">(.*?)<div class="g1-row g1-row-layout-page g1-prefooter">')
-    patron = '<article class=.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += 'title="([^"]+)".*?'
-    patron += '<a href="([^"]+)" rel="bookmark">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedtitle,scrapedurl in matches:
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<a class="g1-delta g1-delta-1st next" href="([^"]+)">Next</a>')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-
-
diff --git a/channels/porneq.py b/channels/porneq.py
index 044346eb..5b4bee8a 100644
--- a/channels/porneq.py
+++ b/channels/porneq.py
@@ -1,16 +1,12 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
-import urlparse
-import urllib2
-import urllib
 import re
-import os
-import sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://porneq.com'
 
@@ -21,7 +17,7 @@ def mainlist(item):
     itemlist.append(Item(channel=item.channel, title="Ultimos", action="lista", url=host + "/videos/browse/"))
     itemlist.append(Item(channel=item.channel, title="Mas Vistos", action="lista", url=host + "/videos/most-viewed/"))
     itemlist.append(Item(channel=item.channel, title="Mas Votado", action="lista", url=host + "/videos/most-liked/"))
-    itemlist.append(Item(channel=item.channel, title="Big Tits", action="lista", url=host + "/show/big+tit"))
+    itemlist.append(Item(channel=item.channel, title="Big Tits", action="lista", url=host + "/show/big+tits&sort=w"))
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -50,7 +46,6 @@ def lista(item):
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedtitle, scrapedurl, scrapedthumbnail, scrapedtime in matches:
         scrapedplot = ""
-        scrapedthumbnail = scrapedthumbnail.replace("https:", "http:")
         scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + scrapedtitle
         itemlist.append(Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot))
@@ -65,8 +60,7 @@ def play(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     scrapedurl = scrapertools.find_single_match(data, '<source src="([^"]+)"')
-    scrapedurl = scrapedurl.replace("X20", "-")
     itemlist.append(
-        Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
+        Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
              thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
diff --git a/channels/pornhive.py b/channels/pornhive.py
index f34ce0f6..5df6411b 100644
--- a/channels/pornhive.py
+++ b/channels/pornhive.py
@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
 import base64
+import re
 
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import config, logger
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.pornhive.tv/en'
 
-# Algunos link caidos
 
 def mainlist(item):
     logger.info()
diff --git a/channels/pornhub.json b/channels/pornhub.json
index 4a719116..e1f50b6f 100644
--- a/channels/pornhub.json
+++ b/channels/pornhub.json
@@ -11,5 +11,13 @@
     "adult"
   ],
   "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
   ]
-}
+}
\ No newline at end of file
diff --git a/channels/pornhub.py b/channels/pornhub.py
index c485be51..5c1fe01e 100644
--- a/channels/pornhub.py
+++ b/channels/pornhub.py
@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
+
 from core import httptools
-from core import servertools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append(Item(channel=item.channel, action="lista", title="Novedades", fanart=item.fanart,
+    itemlist.append(Item(channel=item.channel, action="peliculas", title="Novedades", fanart=item.fanart,
                          url="http://es.pornhub.com/video?o=cm"))
     itemlist.append(Item(channel=item.channel, action="categorias", title="Categorias", fanart=item.fanart,
                          url="http://es.pornhub.com/categories"))
@@ -26,7 +28,8 @@ def search(item, texto):
 
     item.url = item.url % texto
     try:
-        return lista(item)
+        return peliculas(item)
+    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
     except:
         import sys
         for line in sys.exc_info():
@@ -50,13 +53,13 @@ def categorias(item):
         else:
             url = urlparse.urljoin(item.url, scrapedurl + "?o=cm")
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
+        itemlist.append(Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url,
                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail))
     itemlist.sort(key=lambda x: x.title)
     return itemlist
 
 
-def lista(item):
+def peliculas(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -67,11 +70,10 @@ def lista(item):
     patron += '<var class="duration">([^<]+)</var>(.*?)</div>'
     matches = re.compile(patron, re.DOTALL).findall(videodata)
     for url, scrapedtitle, thumbnail, duration, scrapedhd in matches:
+        title =  "(" + duration + ") " + scrapedtitle.replace("&amp;amp;", "&amp;")
         scrapedhd = scrapertools.find_single_match(scrapedhd, '<span class="hd-thumbnail">(.*?)</span>')
-        if scrapedhd  == 'HD':
-            title = "[COLOR yellow]" +duration+ "[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
-        else:
-            title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
+        if scrapedhd == 'HD':
+            title += ' [HD]'
         url = urlparse.urljoin(item.url, url)
         itemlist.append(
             Item(channel=item.channel, action="play", title=title, url=url, fanart=thumbnail, thumbnail=thumbnail))
@@ -82,12 +84,19 @@ def lista(item):
         if matches:
             url = urlparse.urljoin(item.url, matches[0].replace('&amp;', '&'))
             itemlist.append(
-                Item(channel=item.channel, action="lista", title=">> Página siguiente", fanart=item.fanart,
+                Item(channel=item.channel, action="peliculas", title=">> Página siguiente", fanart=item.fanart,
                      url=url))
     return itemlist
 
 def play(item):
-    logger.info(item)
-    itemlist = servertools.find_video_items(item.clone(url = item.url))
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron  = '"defaultQuality":true,"format":"mp4","quality":"\d+","videoUrl":"(.*?)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl  in matches:
+        url = scrapedurl.replace("\/", "/")
+    itemlist.append(item.clone(action="play", title=url, fulltitle = item.title, url=url))
     return itemlist
+
     
diff --git a/channels/pornohdmega.json b/channels/pornohdmega.json
deleted file mode 100755
index c8cc0622..00000000
--- a/channels/pornohdmega.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "pornohdmega",
-  "name": "pornohdmega",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.pornohdmega.com/wp-content/uploads/2018/11/dftyu.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/pornohdmega.py b/channels/pornohdmega.py
deleted file mode 100755
index 862a37f1..00000000
--- a/channels/pornohdmega.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.pornohdmega.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/?order=recent"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/?order=top-rated"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/?order=most-viewed"))
-
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li><a href=\'([^\']+)\' title=\'([^\']+) Tag\'>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        if not "tag" in scrapedurl:
-            scrapedurl = ""
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<h2><a href="([^"]+)">([^<]+)</a></h2>.*?'
-    patron += '<strong>(\d+) Videos</strong>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = "%s (%s)" % (scrapedtitle,cantidad)
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<figure class="video-preview"><a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += 'title="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot,))
-    next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<iframe src="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        itemlist.append(item.clone(action="play", title= "%s", url=url))
-        itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/pornrewind.py b/channels/pornrewind.py
index 55d415e8..6dfde368 100644
--- a/channels/pornrewind.py
+++ b/channels/pornrewind.py
@@ -1,17 +1,16 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.pornrewind.com'
 
-# hacer funcionar conector Kt player
-
 def mainlist(item):
     logger.info()
     itemlist = []
diff --git a/channels/porntrex.py b/channels/porntrex.py
index 70dbca6f..22d99f01 100644
--- a/channels/porntrex.py
+++ b/channels/porntrex.py
@@ -2,12 +2,14 @@
 
 import re
 import urllib
+
 import urlparse
 
 from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import config, logger
+from platformcode import config
 
 host = "https://www.porntrex.com"
 perpage = 20
@@ -25,7 +27,6 @@ def mainlist(item):
     itemlist.append(item.clone(action="categorias", title="Modelos",
                                url=host + "/models/?mode=async&function=get_block&block_id=list_models_models" \
                                           "_list&sort_by=total_videos"))
-    itemlist.append(item.clone(action="categorias", title="Canal", url=host + "/channels/"))
     itemlist.append(item.clone(action="playlists", title="Listas", url=host + "/playlists/"))
     itemlist.append(item.clone(action="tags", title="Tags", url=host + "/tags/"))
     itemlist.append(item.clone(title="Buscar...", action="search"))
@@ -58,14 +59,15 @@ def search(item, texto):
 def lista(item):
     logger.info()
     itemlist = []
+
     # Descarga la pagina 
     data = get_data(item.url)
+
     action = "play"
     if config.get_setting("menu_info", "porntrex"):
         action = "menu_info"
-    # Quita las entradas, que no son private <div class="video-preview-screen video-item thumb-item private "
-    patron  = '<div class="video-preview-screen video-item thumb-item  ".*?'
-    patron += '<a href="([^"]+)".*?'
+    # Quita las entradas, que no son private
+    patron  = '<div class="video-preview-screen video-item thumb-item  ".*?<a href="([^"]+)".*?'
     patron += 'data-src="([^"]+)".*?'
     patron += 'alt="([^"]+)".*?'
     patron += '<span class="quality">(.*?)<.*?'
@@ -118,25 +120,21 @@ def lista(item):
 def categorias(item):
     logger.info()
     itemlist = []
+
+    # Descarga la pagina    
     data = get_data(item.url)
 
     # Extrae las entradas
-    if "/channels/" in item.url:
-        patron = '<div class="video-item   ">.*?<a href="([^"]+)" title="([^"]+)".*?src="([^"]+)".*?<li>([^<]+)<'
-    else:
-        patron = '<a class="item" href="([^"]+)" title="([^"]+)".*?src="([^"]+)".*?<div class="videos">([^<]+)<'
+    patron = '<a class="item" href="([^"]+)" title="([^"]+)".*?src="([^"]+)".*?<div class="videos">([^<]+)<'
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl, scrapedtitle, scrapedthumbnail, videos in matches:
         if "go.php?" in scrapedurl:
             scrapedurl = urllib.unquote(scrapedurl.split("/go.php?u=")[1].split("&")[0])
             scrapedthumbnail = urllib.unquote(scrapedthumbnail.split("/go.php?u=")[1].split("&")[0])
-            scrapedthumbnail += "|Referer=https://www.porntrex.com/"
         else:
             scrapedurl = urlparse.urljoin(host, scrapedurl)
             if not scrapedthumbnail.startswith("https"):
                 scrapedthumbnail = "https:%s" % scrapedthumbnail
-                scrapedthumbnail += "|Referer=https://www.porntrex.com/"
-                scrapedthumbnail = scrapedthumbnail.replace(" " , "%20")
         if videos:
             scrapedtitle = "%s  (%s)" % (scrapedtitle, videos)
         itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
@@ -160,10 +158,7 @@ def playlists(item):
     # Descarga la pagina    
     data = get_data(item.url)
     # Extrae las entradas
-    patron = '<div class="item.*?'
-    patron += 'href="([^"]+)" title="([^"]+)".*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<div class="totalplaylist">([^<]+)<'
+    patron = '<div class="item.*?href="([^"]+)" title="([^"]+)".*?data-original="([^"]+)".*?<div class="totalplaylist">([^<]+)<'
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl, scrapedtitle, scrapedthumbnail, videos in matches:
         if "go.php?" in scrapedurl:
@@ -173,8 +168,6 @@ def playlists(item):
             scrapedurl = urlparse.urljoin(host, scrapedurl)
             if not scrapedthumbnail.startswith("https"):
                 scrapedthumbnail = "https:%s" % scrapedthumbnail
-                scrapedthumbnail += "|Referer=https://www.porntrex.com/"
-                scrapedthumbnail = scrapedthumbnail.replace(" " , "%20")
         if videos:
             scrapedtitle = "%s  [COLOR red](%s)[/COLOR]" % (scrapedtitle, videos)
         itemlist.append(item.clone(action="videos", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
@@ -202,12 +195,7 @@ def videos(item):
     if config.get_setting("menu_info", "porntrex"):
         action = "menu_info"
     # Extrae las entradas
-    # Quita las entradas, que no son private  <div class="video-item private ">
-    patron = '<div class="video-item  ".*?'
-    patron += 'href="([^"]+)".*?'
-    patron += 'title="([^"]+)".*?'
-    patron += 'src="([^"]+)"(.*?)<div class="durations">.*?'
-    patron += '</i>([^<]+)</div>'
+    patron = '<div class="video-item.*?href="([^"]+)".*?title="([^"]+)".*?src="([^"]+)"(.*?)<div class="durations">.*?</i>([^<]+)</div>'
     matches = scrapertools.find_multiple_matches(data, patron)
     count = 0
     for scrapedurl, scrapedtitle, scrapedthumbnail, quality, duration in matches:
@@ -221,51 +209,60 @@ def videos(item):
             scrapedurl = urlparse.urljoin(host, scrapedurl)
             if not scrapedthumbnail.startswith("https"):
                 scrapedthumbnail = "https:%s" % scrapedthumbnail
-                scrapedthumbnail += "|Referer=https://www.porntrex.com/"
-                scrapedthumbnail = scrapedthumbnail.replace(" " , "%20")
-        if 'k4"' in quality:
-            quality = "4K"
-            scrapedtitle = "%s - [COLOR yellow]%s[/COLOR] %s" % (duration, quality, scrapedtitle)
-        else:
-            quality = scrapertools.find_single_match(quality, '<span class="quality">(.*?)<.*?')
-            scrapedtitle = "%s - [COLOR red]%s[/COLOR] %s" % (duration, quality, scrapedtitle)
+        if duration:
+            scrapedtitle = "%s - %s" % (duration, scrapedtitle)
+        if '>HD<' in quality:
+            scrapedtitle += "  [COLOR red][HD][/COLOR]"
         if len(itemlist) >= perpage:
             break;
-        itemlist.append(item.clone(action=action, title=scrapedtitle, url=scrapedurl, contentThumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail, thumbnail=scrapedthumbnail))
+        itemlist.append(item.clone(action=action, title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, contentThumbnail=scrapedthumbnail,
+                                   fanart=scrapedthumbnail))
     #Extrae la marca de siguiente página
     if item.channel and len(itemlist) >= perpage:
         itemlist.append( item.clone(title = "Página siguiente >>>", indexp = count + 1) )
+
     return itemlist
 
 def play(item):
     logger.info()
     itemlist = []
+
     data = get_data(item.url)
-    patron = '(?:video_url|video_alt_url[0-9]*):\s*\'([^\']+)\'.*?'
-    patron += '(?:video_url_text|video_alt_url[0-9]*_text):\s*\'([^\']+)\''
+    patron = '(?:video_url|video_alt_url[0-9]*)\s*:\s*\'([^\']+)\'.*?(?:video_url_text|video_alt_url[0-9]*_text)\s*:\s*\'([^\']+)\''
     matches = scrapertools.find_multiple_matches(data, patron)
-    scrapertools.printMatches(matches)
+    if not matches:
+        patron = '<iframe.*?height="(\d+)".*?video_url\s*:\s*\'([^\']+)\''
+        matches = scrapertools.find_multiple_matches(data, patron)
     for url, quality in matches:
-        quality = quality.replace(" HD" , "").replace(" 4k", "")
+        if "https" in quality:
+            calidad = url
+            url = quality
+            quality = calidad + "p"
+
         itemlist.append(['.mp4 %s [directo]' % quality, url])
+
     if item.extra == "play_menu":
         return itemlist, data
+
     return itemlist
 
 
 def menu_info(item):
     logger.info()
     itemlist = []
+
     video_urls, data = play(item.clone(extra="play_menu"))
     itemlist.append(item.clone(action="play", title="Ver -- %s" % item.title, video_urls=video_urls))
-    matches = scrapertools.find_multiple_matches(data, '<img class="thumb lazy-load" src="([^"]+)"')
+
+    matches = scrapertools.find_multiple_matches(data, '<img class="thumb lazy-load".*?data-original="([^"]+)"')
     for i, img in enumerate(matches):
         if i == 0:
             continue
-        img = "https:" + img + "|Referer=https://www.porntrex.com/"
+        img = urlparse.urljoin(host, img)
+        img += "|Referer=https://www.porntrex.com/"
         title = "Imagen %s" % (str(i))
         itemlist.append(item.clone(action="", title=title, thumbnail=img, fanart=img))
+
     return itemlist
 
 
@@ -324,4 +321,5 @@ def get_data(url_orig):
                 post = ""
             else:
                 break
+
     return response.data
diff --git a/channels/porntv.json b/channels/porntv.json
deleted file mode 100755
index d65c8cb8..00000000
--- a/channels/porntv.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "porntv",
-  "name": "porntv",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.porntv.com/images/dart/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porntv.py b/channels/porntv.py
deleted file mode 100755
index c2a9a31e..00000000
--- a/channels/porntv.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.porntv.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/videos/straight/all-recent.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/videos/straight/all-view.html"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/videos/straight/all-rate.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="lista", url=host + "/videos/straight/all-popular.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas largos" , action="lista", url=host + "/videos/straight/all-length.html"))
-    
-
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "")
-    item.url = host + "/videos/straight/%s-recent.html" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    data = scrapertools.find_single_match(data, '<h1>Popular Categories</h1>(.*?)<h1>Community</h1>')
-    patron = '<h2><a href="([^"]+)">([^<]+)</a>.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<span class="contentquantity">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle + " " + cantidad
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div class="item" style="width: 320px">.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '>(.*?)<div class="trailer".*?'
-    patron += 'title="([^"]+)".*?'
-    patron += 'clock"></use></svg>([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,quality,scrapedtitle,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        if "flag-hd" in quality:
-            title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = scrapedtitle))
-                              
-    next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" class="next"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data, 'sources: \[(.*?)\]')
-    patron = 'file: "([^"]+)",.*?label: "([^"]+)",'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for url,quality in matches:
-        itemlist.append(["%s %s [directo]" % (quality, url), url])
-    return itemlist
-
-
diff --git a/channels/qwertty.json b/channels/qwertty.json
index 0d618542..c9b9bf25 100644
--- a/channels/qwertty.json
+++ b/channels/qwertty.json
@@ -4,7 +4,7 @@
   "active": true,
   "adult": true,
   "language": ["*"],
-  "thumbnail": "https://qwertty.net/wp-content/uploads/2019/07/favicon.ico",
+  "thumbnail": "http://qwertty.net/wp-content/uploads/2018/05/favicon.ico",
   "banner": "",
   "categories": [
     "adult"
diff --git a/channels/qwertty.py b/channels/qwertty.py
index 7daedcbe..73f2d01c 100644
--- a/channels/qwertty.py
+++ b/channels/qwertty.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urllib
+import urlparse
+
 from core import httptools
-from channels import pornhub, xvideos,youporn
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://qwertty.net'
 
@@ -55,6 +56,7 @@ def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
+    data = scrapertools.find_single_match(data,'<div class="videos-list">(.*?)<div class="videos-list">')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = '<article id="post-\d+".*?'
     patron += '<a href="([^"]+)" title="([^"]+)">.*?'
@@ -71,7 +73,7 @@ def lista(item):
                               fanart=thumbnail, thumbnail=thumbnail, plot=scrapedplot) )
     next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)">Next</a>')
     if next_page=="":
-        next_page = scrapertools.find_single_match(data,'<li><a class="current">.*?<li><a href="([^"]+)" class="inactive">')
+        next_page = scrapertools.find_single_match(data,'<li><a class="current">.*?<li><a href=\'([^\']+)\' class="inactive">')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
         itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
@@ -82,35 +84,65 @@ def play(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    url1 = scrapertools.find_single_match(data,'<meta itemprop="embedURL" content="([^"]+)"')
-    if "spankwire" in url1: 
+    url = scrapertools.find_single_match(data,'<meta itemprop="embedURL" content="([^"]+)"')
+    url = url.replace("pornhub.com/embed/", "pornhub.com/view_video.php?viewkey=")
+    data = httptools.downloadpage(url).data
+    if "spankwire" in url : 
         data = httptools.downloadpage(item.url).data
-        data = scrapertools.get_match(data,'Copy Embed Code(.*?)For Desktop')
+        data = scrapertools.find_single_match(data,'Copy Embed Code(.*?)For Desktop')
         patron  = '<div class="shareDownload_container__item__dropdown">.*?<a href="([^"]+)"'
         matches = scrapertools.find_multiple_matches(data, patron)
         for scrapedurl  in matches:
             url = scrapedurl
             if url=="#":
-                url = scrapertools.find_single_match(data,'playerData.cdnPath480         = \'([^\']+)\'')
-            itemlist.append(item.clone(action="play", title=url, contentTitle = url, url=url))
-    elif "xvideos1" in url1: 
-        item1 = item.clone(url=url1)
-        itemlist = xvideos.play(item1)
-        return itemlist
-    elif "pornhub" in url1 :
-        url = url1
-    elif "txx" in url1:# Falta conector
-        url = ""
-    elif "youporn" in url1: 
-        item1 = item.clone(url=url1)
-        itemlist = youporn.play(item1)
-        return itemlist
-    else:
-        data = httptools.downloadpage(url1).data
-        url  = scrapertools.find_single_match(data,'"quality":"\d+","videoUrl":"([^"]+)"')
-    url = url.replace("\/", "/")
+                scrapedurl = scrapertools.find_single_match(data,'playerData.cdnPath480         = \'([^\']+)\'')
+            itemlist.append(item.clone(action="play", title=scrapedurl, fulltitle = scrapedurl, url=scrapedurl))
 
-    itemlist.append(item.clone(action="play", title= "%s  " + url1, contentTitle = item.title, url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) 
+    if "xvideos" in url : 
+        scrapedurl  = scrapertools.find_single_match(data,'setVideoHLS\(\'([^\']+)\'')
+    if "pornhub" in url : 
+        scrapedurl  = scrapertools.find_single_match(data,'"defaultQuality":true,"format":"mp4","quality":"\d+","videoUrl":"(.*?)"')
+    if "txx" in url :
+        video_url = scrapertools.find_single_match(data, 'var video_url="([^"]*)"')
+        video_url += scrapertools.find_single_match(data, 'video_url\+="([^"]*)"')
+        partes = video_url.split('||')
+        video_url = decode_url(partes[0])
+        video_url = re.sub('/get_file/\d+/[0-9a-z]{32}/', partes[1], video_url)
+        video_url += '&' if '?' in video_url else '?'
+        video_url += 'lip=' + partes[2] + '&lt=' + partes[3]
+        scrapedurl = video_url
+    else:
+        scrapedurl  = scrapertools.find_single_match(data,'"quality":"\d+","videoUrl":"(.*?)"')
+    scrapedurl = scrapedurl.replace("\/", "/")
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
+                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
+
+def decode_url(txt):
+    _0x52f6x15 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.,~'
+    reto = ''; n = 0
+    # En las dos siguientes líneas, ABCEM ocupan 2 bytes cada letra! El replace lo deja en 1 byte. !!!!: АВСЕМ (10 bytes) ABCEM (5 bytes)
+    txt = re.sub('[^АВСЕМA-Za-z0-9\.\,\~]', '', txt)
+    txt = txt.replace('А', 'A').replace('В', 'B').replace('С', 'C').replace('Е', 'E').replace('М', 'M')
+
+    while n < len(txt):
+        a = _0x52f6x15.index(txt[n])
+        n += 1
+        b = _0x52f6x15.index(txt[n])
+        n += 1
+        c = _0x52f6x15.index(txt[n])
+        n += 1
+        d = _0x52f6x15.index(txt[n])
+        n += 1
+
+        a = a << 2 | b >> 4
+        b = (b & 15) << 4 | c >> 2
+        e = (c & 3) << 6 | d
+        reto += chr(a)
+        if c != 64: reto += chr(b)
+        if d != 64: reto += chr(e)
+
+    return urllib.unquote(reto)
+
+
diff --git a/channels/redtube.py b/channels/redtube.py
index 91c511a0..faeaad1a 100644
--- a/channels/redtube.py
+++ b/channels/redtube.py
@@ -2,11 +2,14 @@
 #------------------------------------------------------------
 
 import re
+
 import urlparse
+
 from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://es.redtube.com'
 
@@ -114,6 +117,6 @@ def play(item):
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl  in matches:
         url =  scrapedurl.replace("\/", "/")
-    itemlist.append(item.clone(action="play", title=url, url=url))
+    itemlist.append(item.clone(action="play", title=url, fulltitle = item.title, url=url))
     return itemlist
 
diff --git a/channels/seriehd.json b/channels/seriehd.json
index b6be2f7b..ecd59d5c 100644
--- a/channels/seriehd.json
+++ b/channels/seriehd.json
@@ -7,5 +7,56 @@
     "thumbnail": "seriehd.png",
     "banner": "seriehd.png",
     "categories": ["tvshow"],
-    "settings": []
+    "settings": [
+        {
+            "id": "include_in_global_search",
+            "type": "bool",
+            "label": "Includi ricerca globale",
+            "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": "include_in_newest_italiano",
+            "type": "bool",
+            "label": "Includi in Novità - Italiano",
+            "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/seriehd.py b/channels/seriehd.py
index c377854c..288f5b7a 100644
--- a/channels/seriehd.py
+++ b/channels/seriehd.py
@@ -1,49 +1,53 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
-# Canale per SerieHD
+# Canale per seriehd
 # ------------------------------------------------------------
+import urlparse
+import re
 
-
-from core import scrapertoolsV2, httptools, support
+from channelselector import thumb
+from lib import cloudscraper
+from core import scrapertoolsV2, servertools, httptools, support
 from core.item import Item
+from core.support import menu, log
+from platformcode import logger, config
+from specials import autoplay
 
 
-__channel__ = 'seriehd'
-# host = support.config.get_channel_url(__channel__)
-
-# impostati dinamicamente da findhost()
-host = ''
-headers = ''
-
-def findhost():
-    data= httptools.downloadpage('https://seriehd.nuovo.link/').data
-    global host, headers
-    host = scrapertoolsV2.find_single_match(data, r'<div class="elementor-button-wrapper"> <a href="([^"]+)"')
-    headers = [['Referer', host]]
-    return host
+__channel__ = "seriehd"
+host = config.get_channel_url(__channel__)
 
+IDIOMAS = {'Italiano': 'IT'}
+list_language = IDIOMAS.values()
 list_servers = ['verystream', 'openload', 'streamango', 'thevideome']
 list_quality = ['1080p', '720p', '480p', '360']
 
-checklinks = support.config.get_setting('checklinks', __channel__)
-checklinks_number = support.config.get_setting('checklinks_number', __channel__)
+checklinks = config.get_setting('checklinks', 'seriehd')
+checklinks_number = config.get_setting('checklinks_number', 'seriehd')
 
 headers = [['Referer', host]]
 
-@support.menu
+
 def mainlist(item):
-    findhost()
-    tvshow = [('Genere', ['', 'genre']),
-              ('Americane', ['serie-tv-streaming/serie-tv-americane', 'peliculas']),
-              ('Italiane', ['serie-tv-streaming/serie-tv-italiane', 'peliculas']),]
-    return locals()
+    log()
+    itemlist = []
+
+    menu(itemlist, 'Serie TV', 'peliculas', host + '/serie-tv-streaming', 'tvshow')
+    menu(itemlist, 'Per Genere submenu', 'genre', host, 'tvshow', 'TV')
+    menu(itemlist, 'Per Nazione submenu', 'nation', host + '/serie-tv-streaming/', 'tvshow', 'TV')
+    menu(itemlist, 'Cerca...', 'search', contentType='tvshow', args='TV')
+
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
 
 
 def search(item, texto):
-    support.log(texto)
-    
-    # item.contentType = 'tvshow'
-    item.url = findhost() + "/?s=" + texto
+    log(texto)
+
+    item.url = host + "/?s=" + texto
+
     try:
         return peliculas(item)
 
@@ -51,36 +55,46 @@ def search(item, texto):
     except:
         import sys
         for line in sys.exc_info():
-            support.logger.error("%s" % line)
+            logger.error("%s" % line)
         return []
 
 
 def newest(categoria):
-    support.log(categoria)
+    log(categoria)
     itemlist = []
-    item = support.Item()    
+    item = Item()
     try:
+
+        ## cambiar los valores "peliculas, infantiles, series, anime, documentales por los que correspondan aqui en
+        # el py y en l json ###
         if categoria == "series":
-            item.url = findhost()
+            item.url = host
             itemlist = peliculas(item)
 
+            if 'Successivo>>' in itemlist[-1].title:
+                itemlist.pop()
+
     # Continua la ricerca in caso di errore
     except:
         import sys
         for line in sys.exc_info():
-            support.logger.error("{0}".format(line))
+            logger.error("{0}".format(line))
         return []
 
     return itemlist
 
 
-@support.scrape
 def genre(item):
-    patronMenu = '<a href="(?P<url>[^"]+)">(?P<title>[^<]+)</a>'
-    blacklist = ['Serie TV','Serie TV Americane','Serie TV Italiane','altadefinizione']
-    patronBlock = '<ul class="sub-menu">(?P<block>.*)</ul>'
-    action = 'peliculas'
-    return locals()
+    itemlist = support.scrape(item, '<a href="([^"]+)">([^<]+)</a>', ['url', 'title'], headers,['Serie TV','Serie TV Americane','Serie TV Italiane','altadefinizione'], action='peliculas')
+    return thumb(itemlist)
+
+
+def nation(item):
+    log()
+    itemlist = []
+    menu(itemlist, 'Serie TV Americane', 'peliculas', host + '/serie-tv-streaming/serie-tv-americane/')
+    menu(itemlist, 'Serie TV Italiane', 'peliculas', host + '/serie-tv-streaming/serie-tv-italiane/')
+    return itemlist
 
 
 def peliculas(item):
@@ -88,27 +102,48 @@ def peliculas(item):
     return support.scrape(item,r'<h2>(.*?)</h2>\s*<img src="([^"]+)" alt="[^"]*" />\s*<A HREF="([^"]+)">.*?<span class="year">([0-9]{4}).*?<span class="calidad">([A-Z]+)',['title', 'thumb', 'url', 'year', 'quality'], headers, patronNext=r'<link rel="next" href="([^"]+)"', action='episodios')
 
 
-@support.scrape
 def episodios(item):
-    data =''
-    url = support.match(item, patronBlock=r'<iframe width=".+?" height=".+?" src="([^"]+)" allowfullscreen frameborder="0">')[1]
-    seasons = support.match(item, r'<a href="([^"]+)">(\d+)<', r'<h3>STAGIONE</h3><ul>(.*?)</ul>', headers, url)[0]    
+    log()
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    patron = r'<iframe width=".+?" height=".+?" src="([^"]+)" allowfullscreen frameborder="0">'
+    url = scrapertoolsV2.find_single_match(data, patron).replace("?seriehd", "")
+    seasons = support.match(item, r'<a href="([^"]+)">(\d+)<', r'<h3>STAGIONE</h3><ul>(.*?)</ul>', headers, url)[0]
     for season_url, season in seasons:
-        season_url = support.urlparse.urljoin(url, season_url)
+        season_url = urlparse.urljoin(url, season_url)
         episodes = support.match(item, r'<a href="([^"]+)">(\d+)<', '<h3>EPISODIO</h3><ul>(.*?)</ul>', headers, season_url)[0]
         for episode_url, episode in episodes:
-            episode_url = support.urlparse.urljoin(url, episode_url)
+            episode_url = urlparse.urljoin(url, episode_url)
             title = season + "x" + episode.zfill(2)
-            data += title + '|' + episode_url + '\n'
-    support.log('DaTa= ',data)
-    patron = r'(?P<title>[^\|]+)\|(?P<url>[^\n]+)\n'
-    action = 'findvideos'
-    return locals()
+
+            itemlist.append(
+                Item(channel=item.channel,
+                     action="findvideos",
+                     contentType="episode",
+                     title=support.typo(title + ' - ' +item.show,'bold'),
+                     url=episode_url,
+                     fulltitle=title + ' - ' + item.show,
+                     show=item.show,
+                     thumbnail=item.thumbnail))
+
+    support.videolibrary(itemlist, item, 'color kod bold')
+
+    return itemlist
 
 
 def findvideos(item):
-    support.log()
-    return support.hdpass_get_servers(item) 
+    log()
+
+    itemlist = []
+    itemlist = support.hdpass_get_servers(item)
+
+    if checklinks:
+        itemlist = servertools.check_list_links(itemlist, checklinks_number)
+
+    autoplay.start(itemlist, item)
+
+    return itemlist
 
 
 
diff --git a/channels/serietvsubita.json b/channels/serietvsubita.json
index dcd8baec..fe08633c 100644
--- a/channels/serietvsubita.json
+++ b/channels/serietvsubita.json
@@ -8,6 +8,14 @@
     "banner": "serietvsubita.png",
     "categories": ["tvshow"],
     "settings": [
+        {
+            "id": "channel_host",
+            "type": "text",
+            "label": "Host del canale",
+            "default": "http://serietvsubita.xyz",
+            "enabled": true,
+            "visible": true
+        },
         {
             "id": "include_in_global_search",
             "type": "bool",
diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py
index b4695992..302c15df 100644
--- a/channels/serietvsubita.py
+++ b/channels/serietvsubita.py
@@ -21,20 +21,18 @@ list_language = IDIOMAS.values()
 list_servers = ['gounlimited', 'verystream', 'streamango', 'openload']
 list_quality = ['default']
 
-@support.menu
+
 def mainlist(item):
     log()
     itemlist = []
-    tvshowSub = [
-        ('Novità bold',[ '', 'peliculas_tv', '', 'tvshow']),
-        ('Serie TV bold',[ '', 'lista_serie', '', 'tvshow']),
-        ('Per Lettera', ['', 'list_az', 'serie', 'tvshow'])
-    ]
-##    support.aplay(item, itemlist, list_servers, list_quality)
-##    support.channel_config(item, itemlist)
-
-    return locals()
+    support.menu(itemlist, 'Novità bold', 'peliculas_tv', host, 'tvshow')
+    support.menu(itemlist, 'Serie TV bold', 'lista_serie', host, 'tvshow')
+    support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', host, 'tvshow', args=['serie'])
+    support.menu(itemlist, 'Cerca', 'search', host, 'tvshow')
+    support.aplay(item, itemlist, list_servers, list_quality)
+    support.channel_config(item, itemlist)
 
+    return itemlist
 
 
 # ----------------------------------------------------------------------------------------------------------------
@@ -161,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 = blocco.replace('<strong>Episodio ', '<strong>Episodio ').replace(' </strong>', ' </strong>')
+            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')
             episodes = []
@@ -353,4 +351,3 @@ def list_az(item):
     return itemlist
 
 # ================================================================================================================
- 
diff --git a/channels/serietvu.py b/channels/serietvu.py
index 4ccf528e..0a9bbc2d 100644
--- a/channels/serietvu.py
+++ b/channels/serietvu.py
@@ -26,7 +26,7 @@ def mainlist(item):
     support.menu(itemlist, 'Novità bold', 'latestep', "%s/ultimi-episodi" % host, 'tvshow')
     support.menu(itemlist, 'Serie TV bold', 'lista_serie', "%s/category/serie-tv" % host, 'tvshow')
     support.menu(itemlist, 'Categorie', 'categorie', host, 'tvshow')
-
+    support.menu(itemlist, 'Cerca', 'search', host, 'tvshow')
     support.aplay(item, itemlist, list_servers, list_quality)
     support.channel_config(item, itemlist)
     return itemlist
diff --git a/channels/serviporno.json b/channels/serviporno.json
index 5b72fb31..e0307f90 100644
--- a/channels/serviporno.json
+++ b/channels/serviporno.json
@@ -10,5 +10,13 @@
     "adult"
   ],
   "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
   ]
-}
+}
\ No newline at end of file
diff --git a/channels/serviporno.py b/channels/serviporno.py
index 67096e09..773d51cc 100644
--- a/channels/serviporno.py
+++ b/channels/serviporno.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
 from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "https://www.serviporno.com"
 
@@ -45,9 +47,7 @@ def search(item, texto):
 def get_last_page(url):
     logger.info()
     data = httptools.downloadpage(url).data
-    last_page= scrapertools.find_single_match(data,'data-ajax-last-page="(\d+)"')
-    if last_page:
-        last_page= int(last_page)
+    last_page= int(scrapertools.find_single_match(data,'data-ajax-last-page="(\d+)"'))
     return last_page
 
 
@@ -59,7 +59,7 @@ def videos(item):
     patron += '<div class="box-escena">.*?'
     patron += '<a\s*href="([^"]+)".*?'
     patron += 'data-stats-video-name="([^"]+)".*?'
-    patron += 'data-src="([^"]+)".*?'
+    patron += '<img\s*src="([^"]+)".*?'
     patron += '<div class="duracion">([^"]+) min</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for url, title, thumbnail,duration in matches:
@@ -114,17 +114,15 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     patron = '<div class="wrap-box-escena.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<h4.*?<a href="([^"]+)">([^<]+)<'
+    patron += 'href="([^"]+)"><img src="([^"]+)".*?'
+    patron += '<h4.*?<a href="[^"]+">([^<]+)</a></h4>'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for thumbnail, url, title in matches:
+    for url, thumbnail, title in matches:
         last = urlparse.urljoin(item.url, url)
         url= last.replace("/videos-porno", "/ajax/show_category").replace("/sitio","/ajax/show_producer") + "?page=1"
         itemlist.append(Item(channel=item.channel, action='videos', title=title, url=url, last=last, thumbnail=thumbnail, plot=""))
     # Paginador   "Página Siguiente >>"
-    current_page = scrapertools.find_single_match(item.url, "/?page=(\d+)")
-    if current_page:
-        current_page = int(current_page)
+    current_page = int(scrapertools.find_single_match(item.url, "/?page=(\d+)"))
     if not item.last_page:
         last_page = get_last_page(item.last)
     else:
diff --git a/channels/sexgalaxy.py b/channels/sexgalaxy.py
index 506bd45a..0228b622 100644
--- a/channels/sexgalaxy.py
+++ b/channels/sexgalaxy.py
@@ -1,15 +1,19 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
+
 from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://sexgalaxy.net'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
@@ -38,7 +42,7 @@ def canales(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(host).data
-    data = scrapertools.find_single_match(data, '>TopSites</a>(.*?)</ul>')
+    data = scrapertools.find_single_match(data, 'Top Networks</a>(.*?)</ul>')
     patron = '<li id=.*?<a href="(.*?)">(.*?)</a></li>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedurl, scrapedtitle in matches:
@@ -55,8 +59,8 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '>Popular Categories<(.*?)</p>')
-    patron = '<a href="(.*?)">(.*?)</a>'
+    data = scrapertools.find_single_match(data, 'More Categories</a>(.*?)</ul>')
+    patron = '<li id=.*?<a href="(.*?)">(.*?)</a></li>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedurl, scrapedtitle in matches:
         scrapedplot = ""
@@ -79,11 +83,21 @@ def lista(item):
         calidad = scrapertools.find_single_match(scrapedtitle, '\(.*?/(\w+)\)')
         if calidad:
             scrapedtitle = "[COLOR red]" + calidad + "[/COLOR] " + scrapedtitle
-        itemlist.append(Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                             fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot))
+        itemlist.append(Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
+                             fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, fulltitle=scrapedtitle, plot=scrapedplot))
     next_page = scrapertools.find_single_match(data, '<a class="next page-numbers" href="([^"]+)"')
     if next_page != "":
         itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
     return itemlist
 
 
+def play(item):
+    logger.info()
+    data = httptools.downloadpage(item.url).data
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
+    return itemlist
diff --git a/channels/sexkino.py b/channels/sexkino.py
index c530c2b2..0aca2759 100644
--- a/channels/sexkino.py
+++ b/channels/sexkino.py
@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
+
 from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://sexkino.to'
 
@@ -131,6 +134,7 @@ def play(item):
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
         videoitem.thumbnail = item.thumbnail
         videoitem.channel = item.channel
     return itemlist
diff --git a/channels/sexofilm.py b/channels/sexofilm.py
index d71a7d3e..8a1eb01f 100644
--- a/channels/sexofilm.py
+++ b/channels/sexofilm.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import config, logger
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://sexofilm.com'
 
@@ -42,7 +44,7 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     if item.title == "Canal" :
-        data = scrapertools.find_single_match(data,'>Best Porn Studios</a>(.*?)</ul>')
+        data = scrapertools.find_single_match(data,'>Adult Porn Parodies</a></li>(.*?)</ul>')
     else:
         data = scrapertools.find_single_match(data,'<div class="nav-wrap">(.*?)<ul class="sub-menu">')
         itemlist.append( Item(channel=item.channel, action="lista", title="Big tit", url="https://sexofilm.com/?s=big+tits"))
@@ -70,17 +72,14 @@ def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<article id="post-\d+".*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += '<h2 class="post-title.*?title="([^"]+)"'
+    patron  = '<div class="post-thumbnail.*?<a href="([^"]+)".*?src="([^"]+)".*?title="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         plot = ""
         title = scrapedtitle.replace(" Porn DVD", "").replace("Permalink to ", "").replace(" Porn Movie", "")
         itemlist.append(item.clone(action="play", title=title, url=scrapedurl, thumbnail=scrapedthumbnail,
                                    fanart=scrapedthumbnail, plot=plot) )
-    next_page = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
+    next_page = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">&raquo;</a>')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
         itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
@@ -89,14 +88,12 @@ def lista(item):
 
 def play(item):
     logger.info()
-    itemlist = []
     data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data,'<div class="entry-inner">.*?<source src="([^"]+)"')
-    if not url:
-        url = scrapertools.find_single_match(data,'<div class="entry-inner">.*?<source src=\'([^\']+)\'')
-    itemlist = servertools.find_video_items(item.clone(url = item.url))
-    if url:
-        itemlist.append(item.clone(action="play", title=url, url=url))
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
     return itemlist
 
-
diff --git a/channels/shameless.json b/channels/shameless.json
deleted file mode 100755
index f8016a10..00000000
--- a/channels/shameless.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "shameless",
-  "name": "Shameless",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.shameless.com/favicon/apple-touch-icon.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/shameless.py b/channels/shameless.py
deleted file mode 100755
index 2d7ca4ab..00000000
--- a/channels/shameless.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.shameless.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/videos/1/"))
-    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="lista", url=host + "/videos/popular/week/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/videos/rated/week/"))
-
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a href="(https://www.shameless.com/categories/[^"]+)".*?'
-    patron += '<span itemprop="name">(.*?)</span> <sup>(.*?)</sup>.*?'
-    patron += 'src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad,scrapedthumbnail in matches:
-        scrapedplot = ""
-        title = scrapedtitle + " " + cantidad
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div class="icnt.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'data-src="([^"]+)" alt="([^"]+)".*?'
-    patron += '<div class="bg"></div>([^<]+)</time>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail + "|Referer=https://www.shameless.com/"
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, 'class="active">.*?<a href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '(?:video_url|video_alt_url[0-9]*):\s*\'([^\']+)\'.*?'
-    patron += '(?:video_url_text|video_alt_url[0-9]*_text):\s*\'([^\']+)\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url, quality in matches:
-        headers = {'Referer': item.url}
-        url = httptools.downloadpage(url, headers=headers , follow_redirects=False, only_headers=True).headers.get("location", "")
-        itemlist.append(["%s %s [directo]" % (quality, url), url])
-    return itemlist
-
-
diff --git a/channels/siska.py b/channels/siska.py
index 2ef0d1a2..b38151da 100644
--- a/channels/siska.py
+++ b/channels/siska.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.siska.tv/'
 
@@ -15,11 +16,11 @@ def mainlist(item):
     logger.info()
     itemlist = []
 
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "newVideo.php?language=en"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "MostViewed.php?views=month&language=en"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "Channel.php?language=en"))
+    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/newVideo.php?language=en"))
+    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/MostViewed.php?views=month&language=en"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/Channel.php?language=en"))
 
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "index.php?category=1&language=en"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/index.php?category=1&language=en"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -27,7 +28,7 @@ def mainlist(item):
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
-    item.url = host + "search.php?q=%s&language=en&search=Search" % texto
+    item.url = host + "/search.php?q=%s&language=en&search=Search" % texto
     try:
         return lista(item)
     except:
diff --git a/channels/sleazemovies.json b/channels/sleazemovies.json
index 1be75fce..8b387d45 100644
--- a/channels/sleazemovies.json
+++ b/channels/sleazemovies.json
@@ -9,6 +9,6 @@
   "fanart": "https://i.imgur.com/NRdQvFW.jpg",
   "categories": [
     "movie",
-    "vos"
+    "vo"
   ]
-}
+}
\ No newline at end of file
diff --git a/channels/sleazemovies.py b/channels/sleazemovies.py
index 10b81e6f..a3574ee5 100644
--- a/channels/sleazemovies.py
+++ b/channels/sleazemovies.py
@@ -4,6 +4,7 @@
 # -*- By Sculkurt -*-
 
 import re
+
 from channelselector import get_thumb
 from core import httptools
 from core import scrapertools
@@ -70,7 +71,7 @@ def search(item, texto):
     logger.info()
     if texto != "":
         texto = texto.replace(" ", "+")
-    item.url = host + "?s=" + texto
+    item.url = host + "/?s=" + texto
     item.extra = "busqueda"
     try:
         return list_all(item)
diff --git a/channels/spankbang.py b/channels/spankbang.py
index 538eabe8..30834ae0 100644
--- a/channels/spankbang.py
+++ b/channels/spankbang.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://es.spankbang.com'
 
diff --git a/channels/spankwire.json b/channels/spankwire.json
index bb80d7a9..505547fb 100644
--- a/channels/spankwire.json
+++ b/channels/spankwire.json
@@ -1,7 +1,7 @@
 {
   "id": "spankwire",
   "name": "spankwire",
-  "active": true,
+  "active": false,
   "adult": true,
   "language": ["*"],
   "thumbnail": "https://cdn1-static-spankwire.spankcdn.net/apple-touch-icon-precomposed.png",
diff --git a/channels/spankwire.py b/channels/spankwire.py
index bd0856c8..67a60e86 100644
--- a/channels/spankwire.py
+++ b/channels/spankwire.py
@@ -1,27 +1,24 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
+import re
+import urlparse
 
-from core import jsontools as json
-from platformcode import config, logger
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.spankwire.com'
 
-url_api = host + "/api/video/list.json?segment=Straight&limit=33&sortby="
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=url_api + "recent&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=url_api + "views&period=Month&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=url_api + "rating&period=Month&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=url_api + "duration&period=Month&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Pornstar" , action="catalogo", url=host + "/api/pornstars?limit=48&sort=popular&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/api/categories/list.json?segmentId=0&limit=100&sort=abc&page=1"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/recentvideos/straight"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/home1/Straight/Month/Views"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/home1/Straight/Month/Rating"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/home1/Straight/Month/Duration"))
+    #itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/Straight"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -29,7 +26,7 @@ def mainlist(item):
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
-    item.url = host + "/api/video/search.json?segment=Straight&limit=33&query=%s&page=1" % texto
+    item.url = host + "/search/?q=%s" % texto
     try:
         return lista(item)
     except:
@@ -44,46 +41,18 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    JSONData = json.load(data)
-    for Video in  JSONData["items"]:
-        title = Video["name"]
-        id = Video["id"]
-        cantidad = Video["videosNumber"]
-        thumbnail = Video["image"]
-        title =  "%s (%s)" % (title,cantidad)
-        thumbnail = thumbnail.replace("\/", "/").replace(".webp", ".jpg")
-        url = url_api + "recent&category=%s&page=1" % id
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=url,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot) )
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pages"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    JSONData = json.load(data)
-    for Video in  JSONData["items"]:
-        title = Video["name"]
-        id = Video["id"]
-        cantidad = Video["videos"]
-        thumbnail = Video["thumb"]
-        title =  "%s (%s)" % (title,cantidad)
-        thumbnail = thumbnail.replace("\/", "/").replace(".webp", ".jpg")
-        url = host + "/api/video/list.json?pornstarId=%s&limit=25&sortby=recent&page=1" % id
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=url,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot) )
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pages"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
+    patron  = '<div class="category-thumb"><a href="([^"]+)".*?'
+    patron += '<img src="([^"]+)" alt="([^"]+)" />.*?'
+    patron += '<span>([^"]+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
+        scrapedplot = ""
+        scrapedthumbnail = "http:" + scrapedthumbnail
+        scrapedtitle = scrapedtitle + " (" + cantidad +")"
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/Submitted/59"
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
@@ -92,34 +61,27 @@ def lista(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    JSONData = json.load(data)
-    for Video in  JSONData["items"]:
-        segundos = Video["duration"]
-        horas=int(segundos/3600)
-        segundos-=horas*3600
-        minutos=int(segundos/60)
-        segundos-=minutos*60
-        if segundos < 10:
-            segundos = "0%s" %segundos
-        if minutos < 10:
-            minutos = "0%s" %minutos
-        if horas == 00:
-            duration = "%s:%s" % (minutos,segundos)
-        else:
-            duration = "%s:%s:%s" % (horas,minutos,segundos)
-        title = Video["title"]
-        thumbnail = Video["flipBookPath"]
-        url = host + Video["url"]
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + title
-        thumbnail = thumbnail.replace("\/", "/").replace("{index}", "2")
-        url = url.replace("\/", "/")
+    patron  = '<div class="video_thumb_wrapper">.*?'
+    patron += '<a href="([^"]+)".*?data-original="([^"]+)".*?'
+    patron += 'title="([^"]+)".*?'
+    patron += '<div class="video_thumb_wrapper__thumb_info video_thumb_wrapper__duration">(.*?)</div>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
+        url = urlparse.urljoin(item.url,scrapedurl)
+        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        contentTitle = title
+        thumbnail = scrapedthumbnail
         plot = ""
         itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot))
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pages"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
+                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
+    next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)" />')
+    #Para el buscador
+    if next_page=="":
+        next_page = scrapertools.find_single_match(data,'<div class="paginator_wrapper__buttons"><a class="" href="([^"]+)"')
+        next_page = urlparse.urljoin(item.url,next_page)
+    if next_page!="":
+        next_page = urlparse.urljoin(item.url,next_page)
+        itemlist.append( Item(channel=item.channel , action="lista" , title="Página Siguiente >>" , text_color="blue", url=next_page) )
     return itemlist
 
 
@@ -127,7 +89,14 @@ def play(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data,'<div class="shareDownload_container__item__dropdown">.*?<a href="([^"]+)"')
-    itemlist.append(item.clone(action="play", server = "directo", url=scrapedurl))
+    data = scrapertools.find_single_match(data,'Copy Embed Code(.*?)For Desktop')
+    patron  = '<div class="shareDownload_container__item__dropdown">.*?<a href="([^"]+)"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for scrapedurl  in matches:
+        url = scrapedurl
+        if url=="#":
+            scrapedurl = scrapertools.find_single_match(data,'playerData.cdnPath480         = \'([^\']+)\'')
+        itemlist.append(item.clone(action="play", title=scrapedurl, fulltitle = scrapedurl, url=scrapedurl))
+
     return itemlist
 
diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py
index ba9582aa..0406e670 100644
--- a/channels/streamingaltadefinizione.py
+++ b/channels/streamingaltadefinizione.py
@@ -14,16 +14,22 @@ host = config.get_channel_url(__channel__)
 list_servers = ['verystream', 'openload', 'wstream']
 list_quality = ['1080p', 'HD', 'DVDRIP', 'SD', 'CAM']
 
-@support.menu
 def mainlist(item):
-    film = ["/film/"]
-    anime = ["/genere/anime/",
-        ('Film Anime', ["/genere/anime/", 'peliculas']),
-        ('Film Anime per genere', ["/genere/anime/", 'generos'])
-    ]
-    tvshow = ["/serietv/"]
+    support.log()
+    itemlist = []
 
-    return locals()
+    support.menu(itemlist, 'Film', 'peliculas', host + "/film/")
+    support.menu(itemlist, 'Film Anime', 'peliculas', host + "/genere/anime/")
+    support.menu(itemlist, 'Film per genere', 'generos', host)
+    support.menu(itemlist, 'Serie TV', 'peliculas', host + "/serietv/", contentType='tvshow')
+    support.menu(itemlist, 'Anime', 'peliculas', host + "/genere/anime/", contentType='tvshow')
+    support.menu(itemlist, 'Cerca film', 'search', host)
+    support.menu(itemlist, 'Cerca serie tv', 'search', host, contentType='tvshow')
+
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
 
 
 def search(item, text):
@@ -33,16 +39,14 @@ def search(item, text):
     return support.dooplay_search(item)
 
 
-@support.scrape
 def generos(item):
-    patron = '<a href="(?P<url>[^"#]+)">(?P<title>[a-zA-Z]+)'
-    patronBlock='<a href="#">Genere</a><ul class="sub-menu">(?P<block>.*?)</ul>'
-    action='peliculas'
-
-    return locals()
+    patron = '<a href="([^"#]+)">([a-zA-Z]+)'
+    return support.scrape(item, patron, ['url', 'title'], patron_block='<a href="#">Genere</a><ul class="sub-menu">.*?</ul>', action='peliculas')
 
 
 def peliculas(item):
+    support.log("[streamingaltadefinizione.py] video")
+
     return support.dooplay_films(item)
 
 
diff --git a/channels/streamingporn.py b/channels/streamingporn.py
index 383bedae..1c08ca6d 100644
--- a/channels/streamingporn.py
+++ b/channels/streamingporn.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://streamingporn.xyz'
 
@@ -88,7 +90,7 @@ def lista(item):
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, 
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, 
                               fanart=scrapedthumbnail, plot=plot, contentTitle = contentTitle) )
     next_page_url = scrapertools.find_single_match(data,'<div class="loadMoreInfinite"><a href="(.*?)" >Load More')
     if next_page_url!="":
@@ -97,3 +99,15 @@ def lista(item):
                         text_color="blue", url=next_page_url) )
     return itemlist
 
+
+def play(item):
+    logger.info()
+    data = httptools.downloadpage(item.url).data
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
+    return itemlist
+
diff --git a/channels/streamporno.py b/channels/streamporno.py
index 0634b825..853b5d9c 100644
--- a/channels/streamporno.py
+++ b/channels/streamporno.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://streamporno.eu'
 
@@ -41,7 +42,7 @@ def categorias(item):
     patron  = '<li id="menu-item-.*?<a href="([^"]+)">([^"]+)</a>'
     if item.title == "Categorias":
         itemlist.append( Item(channel=item.channel, title="Big Tits" , action="lista", url=host + "/?s=big+tits"))
-        patron  = '<li class="cat-item.*?<a href="([^"]+)">([^"]+)</a>'
+        patron  = '<li class="cat-item.*?<a href="([^"]+)" >([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
diff --git a/channels/streamtime.json b/channels/streamtime.json
deleted file mode 100644
index bc3f7a12..00000000
--- a/channels/streamtime.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-	"id": "streamtime",
-	"name": "StreamTime",
-	"language": ["ita"],
-	"active": true,
-	"adult": false,
-	"thumbnail": "",
-	"banner": "streamtime.png",
-	"categories": ["tvshow", "movie"],
-	"settings": [
-		{
-		  "id": "include_in_global_search",
-		  "type": "bool",
-		  "label": "Includi in Ricerca Globale",
-		  "default": true,
-		  "enabled": true,
-		  "visible": true
-		},
-		{
-      "id": "include_in_newest_peliculas",
-      "type": "bool",
-      "label": "Includi in Novità - Film",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "include_in_newest_italiano",
-      "type": "bool",
-      "label": "Includi in Novità - Italiano",
-      "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 di link da verificare",
-      "default": 1,
-      "enabled": true,
-      "visible": "eq(-1,true)",
-      "lvalues": [ "5", "10", "15", "20" ]
-    }
-	  ]
-}
diff --git a/channels/streamtime.py b/channels/streamtime.py
deleted file mode 100644
index c1191f53..00000000
--- a/channels/streamtime.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import support, httptools, scrapertoolsV2
-from core.item import Item
-from platformcode import config, logger
-
-__channel__ = "streamtime"
-host = config.get_channel_url(__channel__)
-headers = [['Referer', 'org.telegram.messenger']]
-list_servers = ['directo']
-list_quality = ['default']
-
-downPrefix = 'https://stsh.ml/Down-'
-
-@support.menu
-def mainlist(item):
-    film = ['?q=%23Film']
-    tvshow = ['?q=%23SerieTv']
-    return locals()
-
-
-@support.scrape
-def peliculas(item):
-    patron = """tgme_widget_message_photo_wrap blured.*?image:url\("(?P<thumbnail>[^"]+).*?(?:🎥|🎬)(?P<title>.*?)(?:🎥|🎬).*?(?:Audio(?:</b>)?: (?P<lang>.*?<br>))?.*?Anno(?:</b>)?: (?P<year>[0-9]{4}).*?(?:<b>Stream</b>|Risoluzione|<b>Tipo</b>): (?P<quality>[^<]+).*?tgme_widget_message_inline_button url_button" href="(?P<url>[^"]+)"""
-    def itemlistHook(itemlist):
-        retItemlist = []
-        # filtro per tipo
-        for i in itemlist:
-            if item.contentType == 'movie':
-                if '/Film/' in i.url or 'Stream-' in i.url:
-                    retItemlist.append(i)
-            else:
-                if '/SerieTv/' in i.url:
-                    retItemlist.append(i)
-        # rimuovo duplicati
-        if item.contentType != 'movie':
-            nonDupl = []
-            # support.dbg()
-            for i in retItemlist:
-                for nd in nonDupl:
-                    if i.title == nd.title:
-                        break
-                else:
-                    daAgg = i
-                    spl1 = i.url.split('-')
-                    stagione1 = spl1[-2]
-                    nEp1 = int(spl1[-1])
-
-                    for i2 in retItemlist[1:]:
-                        if i.title == i2.title:
-                            spl2 = i2.url.split('-')
-                            stagione2 = spl2[-2]
-                            nEp2 = int(spl2[-1])
-                            if stagione1 == stagione2 and nEp2 > nEp1:
-                                daAgg = i2
-                    nonDupl.append(daAgg)
-            retItemlist = nonDupl
-        return retItemlist[::-1]
-    # debug = True
-    patronNext = 'tgme_widget_message_photo_wrap blured" href="([^"]+)'
-    def fullItemlistHook(itemlist):
-        msgId = int(itemlist[-1].url.split('/')[-1])
-        itemlist[-1].url = host + '?before=' + str(msgId) + '&after=' + str(msgId-20)
-        return itemlist
-
-    if item.contentType == 'tvshow':
-        action = 'episodios'
-    return locals()
-
-
-def search(item, texto):
-    item.url = host + "/?q=" + texto
-    try:
-        return peliculas(item)
-    # Continua la ricerca in caso di errore
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-    return []
-
-
-def episodios(item):
-    domain, id, season, episode = scrapertoolsV2.find_single_match(item.url, r'(https?://[a-z0-9.-]+).*?/([^-/]+)-S([0-9]+)-([0-9]+)$')
-    itemlist = []
-    for n in range(1, int(episode)):
-        url = domain + '/play_s.php?s=' + id + '-S' + season + '&e=' + str(n)
-        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=item.contentType,
-                 folder=False,
-                 args={'id': id, 'season': season, 'episode': episode}))
-
-    support.videolibrary(itemlist, item)
-    return itemlist
-
-
-def findvideos(item):
-    domain = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+')
-    if item.contentType == 'movie':
-        id = item.url.split('/')[-1]
-        url = domain + '/play_f.php?f=' + id
-    else:
-        url = item.url
-        id = item.args['id']
-        season = item.args['season']
-        episode = item.args['episode']
-    res = support.match(item, 'src="([^"]+)">.*?</video>', url=url, headers=[['Referer', domain]])
-    itemlist = []
-    support.dbg()
-
-    if res[0]:
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="play",
-                 title='stpgs.ml' + support.typo(item.quality, '-- [] color kod'),
-                 url=res[0][0],
-                 server='directo',
-                 fulltitle=item.fulltitle,
-                 thumbnail=item.thumbnail,
-                 show=item.show,
-                 quality=item.quality,
-                 contentType=item.contentType,
-                 folder=False))
-        download = itemlist[0].clone()
-        if item.contentType == 'movie':
-            download.url = downPrefix + id
-        else:
-            download.url = downPrefix + id + 'S' + season + '-' + episode
-        itemlist.append(download)
-    else:
-        # google drive...
-        pass
-    support.videolibrary(itemlist, item)
-    return support.controls(itemlist, item, True, True)
diff --git a/channels/submityouflicks.json b/channels/submityouflicks.json
index 42bdf281..52fb7bae 100644
--- a/channels/submityouflicks.json
+++ b/channels/submityouflicks.json
@@ -10,5 +10,13 @@
     "adult"
   ],
   "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
   ]
-}
+}
\ No newline at end of file
diff --git a/channels/submityouflicks.py b/channels/submityouflicks.py
index 4d726fb8..d4fc0723 100644
--- a/channels/submityouflicks.py
+++ b/channels/submityouflicks.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
 from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.submityourflicks.com'
 
@@ -61,7 +63,7 @@ def play(item):
     data = httptools.downloadpage(item.url).data
     media_url = "https:" + scrapertools.find_single_match(data, 'source src="([^"]+)"')
     itemlist = []
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=media_url,
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=media_url,
                          thumbnail=item.thumbnail, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/sunporno.py b/channels/sunporno.py
index e9a0259f..2909bd65 100644
--- a/channels/sunporno.py
+++ b/channels/sunporno.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.sunporno.com'
 
@@ -18,7 +19,7 @@ def mainlist(item):
     itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-rated/date-last-week/"))
     itemlist.append( Item(channel=item.channel, title="Mas largas" , action="lista", url=host + "/long-movies/date-last-month/"))
     itemlist.append( Item(channel=item.channel, title="PornStars" , action="catalogo", url=host + "/pornstars/most-viewed/1/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/channels/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/channels"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -41,7 +42,7 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="thumb-container with-title moviec.*?'
+    patron = '<div class="thumb-container with-title moviec">.*?'
     patron += '<a href="([^"]+)".*?'
     patron += 'src="([^"]+)".*?'
     patron += '<a title="([^"]+)".*?'
@@ -112,7 +113,6 @@ def play(item):
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
         scrapedurl = scrapedurl.replace("https:", "http:")
-        scrapedurl += "|Referer=%s" % host
         itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
                             thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
diff --git a/channels/sxyprn.json b/channels/sxyprn.json
deleted file mode 100755
index 55157b53..00000000
--- a/channels/sxyprn.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "sxyprn",
-  "name": "sxyprn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.sxyprn.com/favicon.ico",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/sxyprn.py b/channels/sxyprn.py
deleted file mode 100755
index 8f68519b..00000000
--- a/channels/sxyprn.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,re
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.sxyprn.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/blog/all/0.html?fl=all&sm=latest"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/popular/top-viewed.html"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/popular/top-rated.html"))
-    itemlist.append( Item(channel=item.channel, title="Sitios" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "-")
-    item.url = host + "/%s.html" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    if "Sitios" in item.title:
-        patron = "<a href='([^']+)' target='_blank'><div class='top_sub_el top_sub_el_sc'>.*?"
-        patron += "<span class='top_sub_el_key_sc'>([^<]+)</span>"
-        patron += "<span class='top_sub_el_count'>(\d+)</span>"
-    else:
-        patron = "<a class='tdn' href='([^']+)'.*?"
-        patron += "<span class='htag_el_tag'>([^<]+)</span>"
-        patron += "<span class='htag_el_count'>(\d+) videos</span>"
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = "<img class=.*?"
-    patron += " src='([^']+)'.*?"
-    patron += "<span class='duration_small'.*?'>([^<]+)<.*?"
-    patron += "<span class='shd_small'.*?>([^<]+)<.*?"
-    patron += "post_time' href='([^']+)' title='([^']+)'"
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedtime,quality,scrapedurl,scrapedtitle in matches:
-        title = "[COLOR yellow]%s[/COLOR] [COLOR red]%s[/COLOR] %s" % (scrapedtime,quality,scrapedtitle)
-        thumbnail = "https:" + scrapedthumbnail
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
-                              # 
-    next_page = scrapertools.find_single_match(data, "<div class='ctrl_el ctrl_sel'>.*?<a href='([^']+)'")
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    url = scrapertools.find_single_match(data, 'data-vnfo=.*?":"([^"]+)"')
-    url = url.replace("\/", "/").replace("/cdn/", "/cdn7/")
-    url = urlparse.urljoin(item.url,url)
-    itemlist.append( Item(channel=item.channel, action="play", title = "%s " + url, url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/thumbzilla.json b/channels/thumbzilla.json
index fcce22f8..bf9e0378 100644
--- a/channels/thumbzilla.json
+++ b/channels/thumbzilla.json
@@ -14,7 +14,7 @@
     {
       "id": "modo_grafico",
       "type": "bool",
-      "label": "Buscar información extra",
+      "label": "Cerca informazioni extra",
       "default": true,
       "enabled": true,
       "visible": true
diff --git a/channels/thumbzilla.py b/channels/thumbzilla.py
index d0273b3c..e68fa3b5 100644
--- a/channels/thumbzilla.py
+++ b/channels/thumbzilla.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
+from channelselector import get_thumb
 from core import channeltools
 from core import httptools
 from core import scrapertools
-from core import servertools
 from core.item import Item
 from platformcode import config, logger
-from channelselector import get_thumb
 
 __channel__ = "thumbzilla"
 
diff --git a/channels/titsbox.json b/channels/titsbox.json
deleted file mode 100755
index 1262153a..00000000
--- a/channels/titsbox.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "titsbox",
-  "name": "titsbox",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://titsbox.com/android-chrome-192x192.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/titsbox.py b/channels/titsbox.py
deleted file mode 100755
index d34d1f47..00000000
--- a/channels/titsbox.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-
-from core import jsontools as json
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://titsbox.com'    #titbox vivud zmovs
-
-url_api = host + "/?ajax=1&type="
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=url_api + "most-recent&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=url_api + "top-rated&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=url_api + "long&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '<ul class="sidebar-nav">(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a class="category-item" href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        url = host + scrapedurl + "?ajax=1&type=most-recent&page=1"
-        scrapedplot = ""
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    JSONData = json.load(data)
-    for Video in JSONData["data"]:
-        duration = Video["duration"]
-        title = Video["videoTitle"]
-        title = "[COLOR yellow]%s[/COLOR] %s" % (duration,title)
-        src= Video["src"]
-        domain=""
-        thumbnail = src.get('domain', domain) + src.get('pathMedium', domain)+"1.jpg"
-        url= Video["urls_CDN"]
-        url= url.get('480', domain)
-        url = url.replace("/\n/", "/")
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot,))
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pagesLeft"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
-    return itemlist
-
-
-def findvideos(item):
-    return
-
diff --git a/channels/tnaflix.py b/channels/tnaflix.py
index 0df37291..7734b23e 100644
--- a/channels/tnaflix.py
+++ b/channels/tnaflix.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
-from core import tmdb
-from core import jsontools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.tnaflix.com'
 
@@ -87,52 +86,31 @@ def peliculas(item):
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = '<a class=\'thumb no_ajax\' href=\'(.*?)\'.*?'
-    patron += 'data-original=\'(.*?)\' alt="([^"]+)"><div class=\'videoDuration\'>([^<]+)</div>(.*?)<div class=\'watchedInfo'
+    patron += 'data-original=\'(.*?)\' alt="([^"]+)"><div class=\'videoDuration\'>([^<]+)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion,quality in matches:
+    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        if quality:
-            quality= scrapertools.find_single_match(quality, '>(\d+p)<')
-            title = "[COLOR yellow]" + duracion + "[/COLOR] " + "[COLOR red]" + quality +  "[/COLOR] " + scrapedtitle
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        itemlist.append(Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                             fanart=thumbnail, plot=plot, contentTitle = contentTitle))
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
     next_page_url = scrapertools.find_single_match(data,'<a class="llNav" href="([^"]+)">')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
     return itemlist
 
 
-def ref(url):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(url).data
-    VID = scrapertools.find_single_match(data,'id="VID" type="hidden" value="([^"]+)"')
-    vkey = scrapertools.find_single_match(data,'id="vkey" type="hidden" value="([^"]+)"')
-    thumb = scrapertools.find_single_match(data,'id="thumb" type="hidden" value="([^"]+)"')
-    nkey= scrapertools.find_single_match(data,'id="nkey" type="hidden" value="([^"]+)"')
-    url = "https://cdn-fck.tnaflix.com/tnaflix/%s.fid?key=%s&VID=%s&nomp4=1&catID=0&rollover=1&startThumb=%s" % (vkey, nkey, VID, thumb)
-    url += "&embed=0&utm_source=0&multiview=0&premium=1&country=0user=0&vip=1&cd=0&ref=0&alpha"
-    return url
-
-
 def play(item):
     logger.info()
     itemlist = []
-    url= ref(item.url)
-    headers = {'Referer': item.url}
-    data = httptools.downloadpage(url, headers=headers).data
-    patron = '<res>(.*?)</res>.*?'
-    patron += '<videoLink><([^<]+)></videoLink>'
+    data = httptools.downloadpage(item.url).data
+    patron  = '<meta itemprop="contentUrl" content="([^"]+)" />'
     matches = scrapertools.find_multiple_matches(data, patron)
-    for title, url in matches:
-        url= url.replace("![CDATA[", "http:").replace("]]", "")
-        itemlist.append(["%s %s [directo]" % (title, url), url])
-    itemlist.reverse()
+    for url  in matches:
+        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=url,
+                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
-
diff --git a/channels/toonitalia.json b/channels/toonitalia.json
index a8cd2928..1ba2b01d 100644
--- a/channels/toonitalia.json
+++ b/channels/toonitalia.json
@@ -17,6 +17,22 @@
 		  "visible": true
 		},
 		{
+      "id": "include_in_newest_peliculas",
+      "type": "bool",
+      "label": "Includi in Novità - Film",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_italiano",
+      "type": "bool",
+      "label": "Includi in Novità - Italiano",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+		{
       "id": "checklinks",
       "type": "bool",
       "label": "Verifica se i link esistono",
diff --git a/channels/toonitalia.py b/channels/toonitalia.py
index fc0689f5..89804615 100644
--- a/channels/toonitalia.py
+++ b/channels/toonitalia.py
@@ -1,59 +1,251 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
+# Ringraziamo Icarus crew
 # Canale per ToonItalia
 # ------------------------------------------------------------
 
-from core import support
+import re
+
+from core import scrapertools, httptools, tmdb, support, servertools
+from core.item import Item
+from platformcode import logger
+from specials import autoplay
+from platformcode import config
 
 __channel__ = "toonitalia"
-host = support.config.get_channel_url(__channel__)
+host = config.get_channel_url(__channel__)
 
 headers = [['Referer', host]]
 
 list_servers = ['wstream', 'openload', 'streamango']
 list_quality = ['HD', 'default']
 
-
-@support.menu
 def mainlist(item):
 
-    top = [('Novità',['', 'peliculas', 'new', 'tvshow']),
-           ('Aggiornamenti', ['', 'peliculas', 'last', 'tvshow']),
-           ('Popolari', ['', 'peliculas', 'most_view', 'tvshow'])]   
-    tvshow = '/lista-serie-tv/'
-    anime =['/lista-anime-2/',
-               ('Sub-Ita',['/lista-anime-sub-ita/']),
-               ('Film Animati',['/lista-film-animazione/','peliculas', '', 'movie'])]    
-    search = ''
+    # Main options
+    itemlist = []
+    support.menu(itemlist, 'Ultimi episodi inseriti bold', 'insert', host, contentType='episode')
+    support.menu(itemlist, 'Ultime novità bold', 'updates', host, contentType='episode')
+    support.menu(itemlist, 'Episodi più visti bold', 'most_view', host, contentType='episode')
+    support.menu(itemlist, 'Anime', 'list', host + '/lista-anime-2/', contentType='episode')
+    support.menu(itemlist, 'Sub-Ita submenu', 'list', host + '/lista-anime-sub-ita/', contentType='episode')
+    support.menu(itemlist, 'Serie TV bold', 'list', host + '/lista-serie-tv/', contentType='episode')
+    support.menu(itemlist, 'Film Animazione bold', 'list', host + '/lista-film-animazione/', contentType="episode", args="film")
+    support.menu(itemlist, '[COLOR blue]Cerca anime e serie...[/COLOR] bold', 'search', host, contentType='episode')
 
-    return locals()
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
 
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def insert(item):
+    logger.info("[toonitalia.py] insert")
+    itemlist = []
+    minpage = 14
+
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<h2 class="entry-title"><a href="([^"]+)" rel="bookmark">([^<]+)</a></h2>.*?'
+    patron += r'<p class[^>]+><a href="[^"]+"><img width[^>]+src="([^"]+)" class[^>]+>.*?'
+    patron += r'<p>(.*?)<\/p>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for i, (scrapedurl, scrapedtitle, scrapedthumbnail, scrapedplot) in enumerate(matches):
+        if (p - 1) * minpage > i: continue
+        if i >= p * minpage: break
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+
+        itemlist.append(
+            Item(channel=__channel__,
+                 action="episodios",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 thumbnail=scrapedthumbnail,
+                 plot=scrapedplot,
+                 folder=True))
+
+    if len(matches) >= p * minpage:
+        scrapedurl = item.url + '{}' + str(p + 1)
+        itemlist.append(
+            Item(channel=__channel__,
+                 args=item.args,
+                 action="insert",
+                 title="[COLOR blue][B]Successivo >[/B][/COLOR]",
+                 url=scrapedurl,
+                 thumbnail="thumb_next.png",
+                 folder=True))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def updates(item):
+    logger.info("[toonitalia.py] updates")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    blocco = r'Aggiornamenti</h2>(.*?)</ul>'
+    matches = re.compile(blocco, re.DOTALL).findall(data)
+    for scrapedurl in matches:
+        blocco = scrapedurl
+
+    patron = r'<a href="(.*?)">(.*?)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(blocco)
+
+    for scrapedurl, scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        itemlist.append(
+            Item(channel=__channel__,
+                 action="episodios",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 plot=scrapedplot))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def most_view(item):
+    logger.info("[toonitalia.py] most_view")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    blocco = r'I piu visti</h2>(.*?)</ul>'
+    matches = re.compile(blocco, re.DOTALL).findall(data)
+    for scrapedurl in matches:
+        blocco = scrapedurl
+
+    patron = r'<a href="([^"]+)" title="[^"]+" class="wpp-post-title" target="_self">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(blocco)
+
+    for scrapedurl, scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        itemlist.append(
+            Item(channel=__channel__,
+                 action="episodios",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 plot=scrapedplot))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def list(item):
+    logger.info("[toonitalia.py] list")
+    itemlist = []
+    minpage = 14
+
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<li ><a href="([^"]+)" title="[^>]+">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for i, (scrapedurl, scrapedtitle) in enumerate(matches):
+        if (p - 1) * minpage > i: continue
+        if i >= p * minpage: break
+        if 'Film Animazione disponibili' not in scrapedtitle:
+            scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+            scrapedplot = ""
+            itemlist.append(
+                Item(channel=__channel__,
+                     action = 'episodios' if not 'film' in item.args else 'findvideos',
+                     contentType=item.contentType,
+                     title=scrapedtitle,
+                     fulltitle=scrapedtitle,
+                     url=scrapedurl,
+                     show=scrapedtitle,
+                     args=item.args,
+                     plot=scrapedplot))
+
+    if len(matches) >= p * minpage:
+        scrapedurl = item.url + '{}' + str(p + 1)
+        itemlist.append(
+            Item(channel=__channel__,
+                 args=item.args,
+                 contentType=item.contentType,
+                 action="list",
+                 title="[COLOR blue][B]Successivo >[/B][/COLOR]",
+                 url=scrapedurl))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
 
-@support.scrape
 def peliculas(item):
-    pagination = ''
-    anime = True
-    blacklist = ['-Film Animazione disponibili in attesa di recensione ']
-    
-    if item.args == 'search':
-        patron = r'<h2 class="entry-title"><a href="(?P<url>[^"]+)" rel="bookmark">(?P<title>[^<]+)</a>'
-    elif item.args == 'last':
-        patronBlock = 'Aggiornamenti</h2>(?P<block>.*)</ul>'
-        patron = '<a href="(?P<url>[^"]+)">(?P<title>[^<]+)</a>'
-    elif item.args == 'most_view':
-        patronBlock = 'I piu visti</h2>(?P<block>.*)</ul>'
-        patron = '<a href="(?P<url>[^"]+)" title="(?P<title>[^"]+)"'
-    elif item.args == 'new':
-        patronBlock = '<main[^>]+>(?P<block>.*)</main>'
-        patron = '<a href="(?P<url>[^"]+)" rel="bookmark">(?P<title>[^<]+)</a>[^>]+>[^>]+>[^>]+><img.*?src="(?P<thumb>[^"]+)".*?<p>(?P<plot>[^<]+)</p>'
-        patronNext = '<a class="next page-numbers" href="([^"]+)">'
-    else:
-        patronBlock = '"lcp_catlist"[^>]+>(?P<block>.*)</ul>'
-        patron = r'<li ><a href="(?P<url>[^"]+)" title="[^>]+">(?P<title>[^<|\(]+)?(?:\([^\d]*(?P<year>\d+)\))?[^<]*</a>'
-        
-    action = 'findvideos' if item.contentType == 'movie' else 'episodios'
+    logger.info("[toonitalia] peliculas")
+    itemlist = []
+    minpage = 14
 
-    return locals()
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<h2 class="entry-title"><a href="([^"]+)" rel="bookmark">([^<]+)</a></h2>.*?<p>([^<]+)</p>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    print data
+
+    for i, (scrapedurl, scrapedtitle, scrapedplot) in enumerate(matches):
+        if (p - 1) * minpage > i: continue
+        if i >= p * minpage: break
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        itemlist.append(
+            Item(channel=__channel__,
+                 action="episodios",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 plot=scrapedplot))
+
+    if len(matches) >= p * minpage:
+        scrapedurl = item.url + '{}' + str(p + 1)
+        itemlist.append(
+            Item(channel=__channel__,
+                 extra=item.extra,
+                 action="peliculas",
+                 title="[COLOR blue][B]Successivo >[/B][/COLOR]",
+                 url=scrapedurl))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
 
 def episodios(item):
     logger.info("[toonitalia.py] episodios")
@@ -93,14 +285,79 @@ def episodios(item):
                              show=item.show,
                              plot=item.plot))
     else:
-        patron = '<br /> <a href="(?P<url>[^"]+)" target="_blank" rel="noopener[^>]+>(?P<title>[^<]+)</a>'
+        for scrapedurl, scrapedtitle in matches:
+            if 'Wikipedia' not in scrapedurl:
+                scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).replace("×", "x")
+                scrapedtitle = scrapedtitle.replace("_", " ")
+                scrapedtitle = scrapedtitle.replace(".mp4", "")
+                # puntata = scrapertools.find_single_match(scrapedtitle, '[0-9]+x[0-9]+')
+                puntata = scrapedtitle
+                for i in itemlist:
+                    if i.args == puntata: #è già stata aggiunta
+                        i.url +=  " " + scrapedurl
+                        break
 
-    def itemHook(item):
-        item.title = item.title.replace('_',' ').replace('–','-')
-        item.title = support.re.sub(item.fulltitle + ' - ','',item.title)
-        return item
+                else:
+                    itemlist.append(
+                        Item(channel=__channel__,
+                            action="findvideos",
+                            contentType=item.contentType,
+                            title="[COLOR azure]" + scrapedtitle + "[/COLOR]",
+                            thumbnail=item.thumbnail,
+                            fulltitle=scrapedtitle,
+                            url=scrapedurl,
+                            args = puntata,
+                            show=item.show,
+                            plot=item.plot))
 
-    return locals()
+    support.videolibrary(itemlist, item, 'color kod')
+
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def search(item, texto):
+    logger.info("[toonitalia.py] " + item.url + " search " + texto)
+    item.url = host + "/?s=" + texto
+    try:
+        return peliculas(item)
+
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
 
 def findvideos(item):
-    return support.server(item, item.url if item.contentType != 'movie' else support.httptools.downloadpage(item.url, headers=headers).data )
+    logger.info("[toonitalia.py] findvideos")
+
+    if item.args == 'film':
+        data = httptools.downloadpage(item.url, headers=headers).data
+        itemlist = servertools.find_video_items(data=data)
+
+        for videoitem in itemlist:
+            videoitem.channel = __channel__
+            server = re.sub(r'[-\[\]\s]+', '', videoitem.title)
+            videoitem.title = "".join(['[COLOR blue] ' + "[[B]" + server + "[/B]][/COLOR] " + item.title])
+            videoitem.thumbnail = item.thumbnail
+            videoitem.plot = item.plot
+            videoitem.fulltitle = item.fulltitle
+            videoitem.show = item.show
+
+    else:
+        itemlist = servertools.find_video_items(data=item.url)
+
+        for videoitem in itemlist:
+            videoitem.channel = __channel__
+            server = re.sub(r'[-\[\]\s]+', '', videoitem.title)
+            videoitem.title = "".join(['[COLOR blue] ' + "[[B]" + server + "[/B]] " + item.title + '[/COLOR]'])
+            videoitem.thumbnail = item.thumbnail
+            videoitem.plot = item.plot
+            videoitem.fulltitle = item.fulltitle
+            videoitem.show = item.show
+
+    autoplay.start(itemlist, item)
+
+    return itemlist
diff --git a/channels/tryboobs.py b/channels/tryboobs.py
index 333751d3..fa2108f2 100644
--- a/channels/tryboobs.py
+++ b/channels/tryboobs.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.tryboobs.com'
 
@@ -89,8 +90,7 @@ def play(item):
     patron  = '<video src="([^"]+)"'
     matches = scrapertools.find_multiple_matches(data, patron)
     for url  in matches:
-        url += "|Referer=%s" % host
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=url,
+        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=url,
                          thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/tubedupe.py b/channels/tubedupe.py
index 0897c8bb..44d90216 100644
--- a/channels/tubedupe.py
+++ b/channels/tubedupe.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://tubedupe.com'
 
@@ -19,7 +20,7 @@ def mainlist(item):
     itemlist.append( Item(channel=item.channel, title="Modelos" , action="categorias", url=host + "/models/?sort_by=model_viewed"))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/channels/?sort_by=cs_viewed"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/?sort_by=avg_videos_popularity"))
-    # itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
 
@@ -99,7 +100,7 @@ def play(item):
     if scrapedurl == "" :
         scrapedurl = scrapertools.find_single_match(data, 'video_url: \'([^\']+)\'')
 
-    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, url=scrapedurl,
+    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, fulltitle=item.title, url=scrapedurl,
                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/tubehentai.json b/channels/tubehentai.json
index 57321cbf..73b93b72 100644
--- a/channels/tubehentai.json
+++ b/channels/tubehentai.json
@@ -10,5 +10,13 @@
         "adult"
     ],
     "settings": [
+        {
+            "id": "include_in_global_search",
+            "type": "bool",
+            "label": "Incluir en busqueda global",
+            "default": false,
+            "enabled": true,
+            "visible": true
+        }
     ]
 }
\ No newline at end of file
diff --git a/channels/tubehentai.py b/channels/tubehentai.py
index 6352c943..e2affd96 100644
--- a/channels/tubehentai.py
+++ b/channels/tubehentai.py
@@ -1,32 +1,33 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
-from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
-host = 'http://tubehentai.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Novedades", action="lista", url=host + "/most-recent/"))
-    itemlist.append(Item(channel=item.channel, title="Mas visto", action="lista", url=host + "/most-viewed/"))
-    itemlist.append(Item(channel=item.channel, title="Mejor valorado", action="lista", url=host + "/top-rated/"))
+    itemlist.append(Item(channel=item.channel, title="Novedades", action="novedades", url="http://tubehentai.com/"))
+    itemlist.append(
+        Item(channel=item.channel, title="Buscar", action="search", url="http://tubehentai.com/search/%s/page1.html"))
 
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
 
 def search(item, texto):
     logger.info()
+
     texto = texto.replace(" ", "%20")
-    item.url = host + "/search/%s/" % texto
+
+    item.url = item.url % texto
     try:
-        return lista(item)
+        return novedades(item)
     # Se captura la excepciÛn, para no interrumpir al buscador global si un canal falla
     except:
         import sys
@@ -35,31 +36,58 @@ def search(item, texto):
         return []
 
 
-def lista(item):
+def novedades(item):
     logger.info()
-    itemlist = []
+
+    # Descarga la página
     data = httptools.downloadpage(item.url).data
-    patron = '<a href="((?:http|https)://tubehentai.com/video/[^"]+)" title="([^"]+)".*?'
-    patron += '<span class="icon -time">.*?<span class="item__stat-label">([^<]+)</span>.*?'
-    patron += '<img src="([^"]+)"'
+    # <a href="http://tubehentai.com/videos/slave_market_¨c_ep1-595.html"><img class="img" width="145" src="http://tubehentai.com/media/thumbs/5/9/5/./f/595/595.flv-3.jpg" alt="Slave_Market_&Acirc;&uml;C_Ep1" id="4f4fbf26f36
+    patron = '<a href="(http://tubehentai.com/videos/[^"]+)"><img.*?src="(http://tubehentai.com/media/thumbs/[^"]+)" alt="([^"]+)"'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,duration,scrapedthumbnail in matches:
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-        itemlist.append(Item(channel=item.channel, action="play", title=title, url=scrapedurl, 
-                        fanart=scrapedthumbnail, thumbnail=scrapedthumbnail))
-    next_page = scrapertools.find_single_match(data,'<a rel=\'next\' title=\'Next\' href=\'([^\']+)\'')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
+
+    itemlist = []
+    for match in matches:
+        # Titulo
+        scrapedtitle = match[2]
+        scrapedurl = match[0]
+        scrapedthumbnail = match[1].replace(" ", "%20")
+        scrapedplot = scrapertools.htmlclean(match[2].strip())
+        logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
+
+        # Añade al listado de XBMC
+        itemlist.append(
+            Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
+                 plot=scrapedplot, folder=False))
+
+    # ------------------------------------------------------
+    # Extrae el paginador
+    # ------------------------------------------------------
+    # <a href="page2.html" class="next">Next »</a>
+    patronvideos = '<a href=\'(page[^\.]+\.html)\'[^>]*?>Next[^<]*?<\/a>'
+    matches = re.compile(patronvideos, re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+
+    if len(matches) > 0:
+        scrapedurl = urlparse.urljoin(item.url, "/" + matches[0])
+        logger.info(scrapedurl)
+        itemlist.append(Item(channel=item.channel, action="novedades", title=">> Página siguiente", url=scrapedurl))
+
     return itemlist
 
 
 def play(item):
     logger.info()
     itemlist = []
+
+    # s1.addParam("flashvars","overlay=http://tubehentai.com/media/thumbs/5/2/3/9/c/5239cf74632cbTHLaBlueGirlep3%20%20Segment2000855.000001355.000.mp4
+    # http://tubehentai.com/media/thumbs/5/2/3/9/c/5239cf74632cbTHLaBlueGirlep3%20%20Segment2000855.000001355.000.mp4
+    # http://tubehentai.com/media/videos/5/2/3/9/c/5239cf74632cbTHLaBlueGirlep3%20%20Segment2000855.000001355.000.mp4?start=0
     data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, '<source src="([^"]+\.mp4)"')
+    url = scrapertools.find_single_match(data, 's1.addParam\("flashvars","bufferlength=1&autostart=true&overlay=(.*?\.mp4)')
+    url = url.replace("/thumbs", "/videos")
+    # url = url+"?start=0"
+    logger.info("url=" + url)
     server = "Directo"
     itemlist.append(Item(channel=item.channel, title="", url=url, server=server, folder=False))
-    return itemlist
 
+    return itemlist
diff --git a/channels/vedohd.py b/channels/vedohd.py
index fb7803d8..bb536728 100644
--- a/channels/vedohd.py
+++ b/channels/vedohd.py
@@ -5,12 +5,26 @@
 
 from core import scrapertoolsV2, httptools, support
 from core.item import Item
-from platformcode import logger, config
+from platformcode import logger
 from specials import autoplay
+from platformcode import config
 
-__channel__ = "vedohd"
-host = config.get_channel_url(__channel__)
 headers = ""
+host = ""
+
+
+def findhost():
+    permUrl = httptools.downloadpage('https://www.cb01.uno/', follow_redirects=False).headers
+    cb01Url = 'https://www.'+permUrl['location'].replace('https://www.google.it/search?q=site:', '')
+    data = httptools.downloadpage(cb01Url).data
+    global host, headers
+
+    host = scrapertoolsV2.find_single_match(data, r'class="?mega-menu-link"? href="?(https://vedohd[^/"]+)"?')+'/'
+
+    if 'https' not in host:  # in caso cb01 cambi, si spera di riuscire ad accedere da questo URL
+        host = "https://vedohd.pw/"
+    headers = [['Referer', host]]
+
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
@@ -20,16 +34,25 @@ list_quality = ['HD', 'SD']
 #esclusione degli articoli 'di servizio'
 blacklist = ['CB01.UNO &#x25b6; TROVA L&#8217;INDIRIZZO UFFICIALE ', 'AVVISO IMPORTANTE – CB01.UNO', 'GUIDA VEDOHD']
 
-@support.menu
-def mainlist(item):
 
-    film = [
-        ('I più votati', ["ratings/?get=movies", 'peliculas']),
-        ('I più popolari', ["trending/?get=movies", 'peliculas']),
-        ('Generi', ['ratings/?get=movies', 'menu', 'genres']),
-        ('Anno', ["", 'menu', 'releases']),
-    ]
-    return locals()
+def mainlist(item):
+    logger.info("[vedohd.py] mainlist")
+    findhost()
+
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    # Main options
+    itemlist = []
+    support.menu(itemlist, 'Film', "peliculas", host+"film-hd")
+    support.menu(itemlist, 'I più votati', "peliculas", host+"ratings/?get=movies")
+    support.menu(itemlist, 'I più popolari', "peliculas", host+"trending/?get=movies")
+    support.menu(itemlist, 'Generi', "generos", host)
+    support.menu(itemlist, 'Anno', "year", host)
+    support.menu(itemlist, 'Cerca', "search", host)
+
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
 
 
 def search(item, text):
@@ -40,10 +63,13 @@ def search(item, text):
 
 
 def peliculas(item):
+    logger.info("[vedohd.py] video")
+
     return support.dooplay_films(item, blacklist)
 
 
 def findvideos(item):
+    findhost()
     itemlist = []
     for link in support.dooplay_get_links(item, host):
         if link['title'] != 'Trailer':
@@ -71,13 +97,16 @@ def findvideos(item):
     return itemlist
 
 
-@support.scrape
-def menu(item):
-    patron = '<a href="(?P<url>[^"#]+)"(?: title="[^"]+")?>(?P<title>[a-zA-Z0-9]+)'
-    patronBlock = '<nav class="' + item.args + '">(?P<block>.*?)</nav>'
-    action = 'peliculas'
+def generos(item):
+    findhost()
+    patron = '<a href="([^"#]+)">([a-zA-Z]+)'
+    return support.scrape(item, patron, ['url', 'title'], patron_block='<a href="#">Genere</a><ul class="sub-menu">.*?</ul>', action='peliculas')
 
-    return locals()
+
+def year(item):
+    findhost()
+    patron = r'<a href="([^"#]+)">(\d+)'
+    return support.scrape(item, patron, ['url', 'title'], patron_block='<a href="#">Anno</a><ul class="sub-menu">.*?</ul>', action='peliculas')
 
 
 def play(item):
diff --git a/channels/videosXYZ.py b/channels/videosXYZ.py
index 6f645dcf..ba26f46b 100644
--- a/channels/videosXYZ.py
+++ b/channels/videosXYZ.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core import servertools
 from core.item import Item
-from platformcode import config, logger
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://free-porn-videos.xyz'
 
@@ -62,6 +64,7 @@ def play(item):
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
         videoitem.thumbnail = item.thumbnail
         videoitem.channel = item.channel
     return itemlist
diff --git a/channels/vidz7.py b/channels/vidz7.py
index de2cb712..5f3cbdbc 100644
--- a/channels/vidz7.py
+++ b/channels/vidz7.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
 
 from core import httptools
@@ -8,6 +9,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.vidz7.com'
 
@@ -17,7 +19,7 @@ def mainlist(item):
     itemlist = []
     itemlist.append(Item(channel=item.channel, action="lista", title="Útimos videos", url=host))
     itemlist.append(
-        Item(channel=item.channel, action="categorias", title="Canal", url=host + "/category/"))
+        Item(channel=item.channel, action="categorias", title="Categorias", url=host + "/category/"))
     itemlist.append(Item(channel=item.channel, action="search", title="Buscar", url="http://www.vidz7.com"))
     return itemlist
 
@@ -42,11 +44,10 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}", "", data)
-    patron = '<li><a href="([^"]+)">([^<]+)</a><span>(\d+) </'
+    patron = '<li><a href="([^"]+)">(.*?)</a>'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, cantidad in matches:
-        title = title + " (" + cantidad + ")"
-        itemlist.append(Item(channel=item.channel, action="lista", title=title, url=url))
+    for url, actriz in matches:
+        itemlist.append(Item(channel=item.channel, action="lista", title=actriz, url=url))
 
     return itemlist
 
@@ -69,7 +70,7 @@ def lista(item):
         title = "[COLOR yellow]" + duration + "[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
         # Añade al listado
         itemlist.append(Item(channel=item.channel, action="play", title=title, thumbnail=thumbnail, fanart=thumbnail,
-                             contentTitle=title, url=url,
+                             fulltitle=title, url=url,
                              viewmode="movie", folder=True))
     paginacion = scrapertools.find_single_match(data,'<a class="active".*?.>\d+</a><a class="inactive" href ="([^"]+)">')
     if paginacion:
diff --git a/channels/vintagetube.py b/channels/vintagetube.py
index fafe7f37..c3831dcd 100644
--- a/channels/vintagetube.py
+++ b/channels/vintagetube.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.vintagetube.club'
 
@@ -92,7 +93,7 @@ def play(item):
         data = httptools.downloadpage("https:" + scrapedurl).data
     scrapedurl = scrapertools.find_single_match(data,'<source src="([^"]+)"')
     itemlist = []
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.title, url=scrapedurl,
                          thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
     
diff --git a/channels/vintagexxxsex.py b/channels/vintagexxxsex.py
index b7afa813..d905d842 100644
--- a/channels/vintagexxxsex.py
+++ b/channels/vintagexxxsex.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://www.vintagexxxsex.com'
 
@@ -89,7 +90,7 @@ def play(item):
         scrapedurl = "http:" + scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
         data = httptools.downloadpage(scrapedurl).data
         scrapedurl = scrapertools.find_single_match(data,'file: "([^"]+)"')
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
                     thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/vivud.json b/channels/vivud.json
deleted file mode 100755
index 7b70e238..00000000
--- a/channels/vivud.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "vivud",
-  "name": "vivud",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://vivud.com/favicon-96x96.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/vivud.py b/channels/vivud.py
deleted file mode 100755
index 02d6b015..00000000
--- a/channels/vivud.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-
-from core import jsontools as json
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://vivud.com'    #titbox vivud zmovs
-
-url_api = host + "/?ajax=1&type="
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=url_api + "most-recent&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=url_api + "top-rated&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=url_api + "long&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '<ul class="sidebar-nav">(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a class="category-item" href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        url = host + scrapedurl + "?ajax=1&type=most-recent&page=1"
-        scrapedplot = ""
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    JSONData = json.load(data)
-    for Video in JSONData["data"]:
-        duration = Video["duration"]
-        title = Video["videoTitle"]
-        title = "[COLOR yellow]%s[/COLOR] %s" % (duration,title)
-        src= Video["src"]
-        domain=""
-        thumbnail = src.get('domain', domain) + src.get('pathMedium', domain)+"1.jpg"
-        url= Video["urls_CDN"]
-        url= url.get('480', domain)
-        url = url.replace("/\n/", "/")
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot,))
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pagesLeft"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
-    return itemlist
-
-
-def findvideos(item):
-    return
-
diff --git a/channels/vporn.json b/channels/vporn.json
index d33ff5f9..a6579d50 100644
--- a/channels/vporn.json
+++ b/channels/vporn.json
@@ -4,7 +4,7 @@
   "active": true,
   "adult": true,
   "language": ["*"],
-  "thumbnail": "https://th-eu1.vporn.com/images/logo-dark-theme.png",
+  "thumbnail": "https://th-us2.vporn.com/images/logo%20Dark%20theme.png",
   "banner": "",
   "categories": [
     "adult"
diff --git a/channels/vporn.py b/channels/vporn.py
index 65727102..25344cb9 100644
--- a/channels/vporn.py
+++ b/channels/vporn.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import jsontools as json
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.vporn.com'
 
@@ -22,7 +22,7 @@ def mainlist(item):
     itemlist.append( Item(channel=item.channel, title="Mas Votada" , action="lista", url=host + "/votes/month/"))
     itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest/month/"))
     itemlist.append( Item(channel=item.channel, title="PornStar" , action="catalogo", url=host + "/pornstars/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -46,7 +46,7 @@ def catalogo(item):
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = '<div class=\'star\'>.*?'
-    patron += '<a href="([^"]+)".*?'
+    patron += '<a href="([^"]+)">.*?'
     patron += '<img src="([^"]+)" alt="([^"]+)".*?'
     patron += '<span> (\d+) Videos'
     matches = re.compile(patron,re.DOTALL).findall(data)
@@ -68,16 +68,13 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '"name":"([^"]+)".*?'
-    patron  += '"image":"([^"]+)".*?'
-    patron  += '"url":"([^"]+)"'
+    data = scrapertools.find_single_match(data,'<div class="cats-all categories-list">(.*?)</div>')
+    patron  = '<a href="([^"]+)".*?>([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedtitle,scrapedthumbnail,scrapedurl in matches:
+    for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
-        scrapedthumbnail = "https://th-us2.vporn.com" + scrapedthumbnail
-        scrapedthumbnail= scrapedthumbnail.replace("\/", "/")
+        scrapedthumbnail = ""
         scrapedurl = host + scrapedurl
-        scrapedurl = scrapedurl.replace("\/", "/")
         itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
@@ -116,6 +113,6 @@ def play(item):
     patron  = '<source src="([^"]+)" type="video/mp4" label="([^"]+)"'
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl,scrapedtitle  in matches:
-        itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl))
+        itemlist.append(item.clone(action="play", title=scrapedtitle, fulltitle = item.title, url=scrapedurl))
     return itemlist
 
diff --git a/channels/watchpornfree.json b/channels/watchpornfree.json
index f5f9b0a9..c6ad57a7 100644
--- a/channels/watchpornfree.json
+++ b/channels/watchpornfree.json
@@ -4,7 +4,7 @@
   "active": true,
   "adult": true,
   "language": ["*"],
-  "thumbnail": "https://watchpornfree.info/wp-content/uploads/2019/01/favicon.ico",
+  "thumbnail": "https://watchpornfree.ws/wp-content/uploads/2018/03/Untitled-2.png",
   "banner": "",
   "categories": [
     "adult"
diff --git a/channels/watchpornfree.py b/channels/watchpornfree.py
index 73d14f7f..d2709d5f 100644
--- a/channels/watchpornfree.py
+++ b/channels/watchpornfree.py
@@ -1,23 +1,24 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 # https://playpornfree.org/    https://mangoporn.net/   https://watchfreexxx.net/   https://losporn.org/  https://xxxstreams.me/  https://speedporn.net/
 
-host = 'https://watchpornfree.info'
+host = 'https://watchpornfree.ws'
 
 def mainlist(item):
     logger.info("")
     itemlist = []
     itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/clips-scenes"))
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Parodia" , action="lista", url=host + "/category/parodies"))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/movies"))
+    itemlist.append( Item(channel=item.channel, title="Parodia" , action="lista", url=host + "/category/parodies-hd"))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Año" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
@@ -42,18 +43,17 @@ def categorias(item):
     logger.info("")
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     if item.title == "Canal":
-        data = scrapertools.find_single_match(data,'Scenes</a></li>(.*?)</ul>')
+        data = scrapertools.find_single_match(data,'>Studios</a>(.*?)</ul>')
     if item.title == "Año":
-        data = scrapertools.find_single_match(data,'Year</a>(.*?)</ul>')
+        data = scrapertools.find_single_match(data,'>Years</a>(.*?)</ul>')
     if item.title == "Categorias":
-        data = scrapertools.find_single_match(data,'>Categories</div>(.*?)</ul>')
-    patron  = '<a href="([^"]+)".*?>([^"]+)</a></li>'
+        data = scrapertools.find_single_match(data,'>XXX Genres</div>(.*?)</ul>')
+    patron  = '<a href="([^"]+)".*?>([^"]+)</a>(.*?)</li>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle  in matches:
+    for scrapedurl,scrapedtitle,cantidad  in matches:
         scrapedplot = ""
-        scrapedtitle = scrapedtitle
+        scrapedtitle = scrapedtitle + cantidad
         scrapedthumbnail = ""
         itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
diff --git a/channels/woodrocket.py b/channels/woodrocket.py
index f24640e4..494c269a 100644
--- a/channels/woodrocket.py
+++ b/channels/woodrocket.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://woodrocket.com'
 
@@ -61,8 +62,12 @@ def play(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    url  = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
-    itemlist.append(item.clone(action="play", title= "%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    scrapedurl  = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
+    scrapedurl = scrapedurl.replace("pornhub.com/embed/", "pornhub.com/view_video.php?viewkey=")
+    data = httptools.downloadpage(scrapedurl).data
+    scrapedurl = scrapertools.find_single_match(data,'"defaultQuality":true,"format":"mp4","quality":"\d+","videoUrl":"([^"]+)"')
+    scrapedurl = scrapedurl.replace("\/", "/")
+    itemlist.append(item.clone(action="play", title=scrapedurl, fulltitle = item.title, url=scrapedurl))
     return itemlist
 
+
diff --git a/channels/xhamster.py b/channels/xhamster.py
index c9020a97..564fb28f 100644
--- a/channels/xhamster.py
+++ b/channels/xhamster.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 
 import re
-import sys
+
 import urlparse
 
-from platformcode import logger
 from core import scrapertools, httptools
 from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 HOST = "http://es.xhamster.com/"
 
@@ -62,9 +63,9 @@ def videos(item):
 
     for scrapedurl, scrapedthumbnail, scrapedtitle, duration in matches:
         # logger.debug("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        contentTitle = scrapedtitle.strip() + " [" + duration + "]"
+        fullTitle = scrapedtitle.strip() + " [" + duration + "]"
         itemlist.append(
-            Item(channel=item.channel, action="play", title=contentTitle, url=scrapedurl, thumbnail=scrapedthumbnail,
+            Item(channel=item.channel, action="play", title=fullTitle, url=scrapedurl, thumbnail=scrapedthumbnail,
                  folder=True))
 
     # Paginador
@@ -92,8 +93,8 @@ def categorias(item):
     patron = '(?s)<li>.*?<a href="([^"]+)".*?>([^<]+).*?</a></li>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedurl, scrapedtitle in matches:
-        contentTitle = scrapedtitle.strip()
-        itemlist.append(Item(channel=item.channel, action="videos", title=contentTitle, url=scrapedurl))
+        fullTitle = scrapedtitle.strip()
+        itemlist.append(Item(channel=item.channel, action="videos", title=fullTitle, url=scrapedurl))
 
     return itemlist
 
diff --git a/channels/xms.json b/channels/xms.json
index 64e505cd..4c3088f3 100644
--- a/channels/xms.json
+++ b/channels/xms.json
@@ -14,7 +14,7 @@
     {
       "id": "modo_grafico",
       "type": "bool",
-      "label": "Buscar información extra",
+      "label": "Cerca informazioni extra",
       "default": true,
       "enabled": true,
       "visible": true
diff --git a/channels/xms.py b/channels/xms.py
index 7fa51198..969aae7e 100644
--- a/channels/xms.py
+++ b/channels/xms.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 import urlparse
-import base64
 
 from core import channeltools
 from core import httptools
@@ -13,7 +13,7 @@ from platformcode import config, logger
 
 __channel__ = "xms"
 
-host = 'https://xtheatre.org/'
+host = 'https://xtheatre.org'
 host1 = 'https://www.cam4.com/'
 try:
     __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
@@ -45,20 +45,20 @@ def mainlist(item):
     logger.info()
     itemlist = []
 
-    itemlist.append(Item(channel=__channel__, title="Últimas", url=host + '?filtre=date&cat=0',
+    itemlist.append(Item(channel=__channel__, title="Últimas", url=host + '/?filtre=date&cat=0',
                          action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
                          thumbnail=thumbnail % '1'))
 
-    itemlist.append(Item(channel=__channel__, title="Más Vistas", url=host + '?display=extract&filtre=views',
+    itemlist.append(Item(channel=__channel__, title="Más Vistas", url=host + '/?display=extract&filtre=views',
                          action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
                          thumbnail=thumbnail % '2'))
 
-    itemlist.append(Item(channel=__channel__, title="Mejor Valoradas", url=host + '?display=extract&filtre=rate',
+    itemlist.append(Item(channel=__channel__, title="Mejor Valoradas", url=host + '/?display=extract&filtre=rate',
                          action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
                          thumbnail=thumbnail % '3'))
 
     itemlist.append(Item(channel=__channel__, title="Categorías", action="categorias",
-                         url=host + 'categories/', viewmode="movie_with_plot", viewcontent='movies',
+                         url=host + '/categories/', viewmode="movie_with_plot", viewcontent='movies',
                          thumbnail=thumbnail % '4'))
 
     itemlist.append(Item(channel=__channel__, title="WebCam", action="webcamenu",
@@ -99,7 +99,7 @@ def peliculas(item):
     for scrapedthumbnail, scrapedurl, scrapedtitle, plot in matches:
         plot = scrapertools.decodeHtmlentities(plot)
 
-        itemlist.append(item.clone(channel=__channel__, action="play", title=scrapedtitle.capitalize(),
+        itemlist.append(item.clone(channel=__channel__, action="findvideos", title=scrapedtitle.capitalize(),
                                    url=scrapedurl, thumbnail=scrapedthumbnail, infoLabels={"plot": plot},
                                    fanart=scrapedthumbnail,viewmode="movie_with_plot",
                                    folder=True, contentTitle=scrapedtitle))
@@ -150,10 +150,10 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = 'data-lazy-src="([^"]+)".*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<span>([^<]+)</span></a>.*?'
-    patron += '<span class="nb_cat border-radius-5">([^<]+)</span>'
+    patron = 'data-lazy-src="([^"]+)".*?'                            # img
+    patron += '</noscript><a href="([^"]+)".*?'                      # url
+    patron += '<span>([^<]+)</span></a>.*?'                          # title
+    patron += '<span class="nb_cat border-radius-5">([^<]+)</span>'  # num_vids
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedthumbnail, scrapedurl, scrapedtitle, vids in matches:
@@ -196,7 +196,7 @@ def sub_search(item):
 
     for scrapedthumbnail, scrapedtitle, scrapedurl, plot in matches:
         itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl, plot=plot, fanart=scrapedthumbnail,
-                                   action="play", thumbnail=scrapedthumbnail))
+                                   action="findvideos", thumbnail=scrapedthumbnail))
 
     paginacion = scrapertools.find_single_match(
         data, "<a href='([^']+)' class=\"inactive\">\d+</a>")
@@ -208,39 +208,17 @@ def sub_search(item):
     return itemlist
 
 
-def play(item):
+def findvideos(item):
     itemlist = []
-    if "playlist.m3u8" in item.url:
-        url = item.url
-    else:
-        data = httptools.downloadpage(item.url).data
-        data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-        patron = 'src="([^"]+)" allowfullscreen="true">'
-        matches = scrapertools.find_multiple_matches(data, patron)
-        for url in matches:
-            if "strdef" in url: 
-                url = decode_url(url)
-                if "strdef" in url:
-                    url = httptools.downloadpage(url).url
-    itemlist.append(item.clone(action="play", title= "%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
+    patron = '<iframe src="[^"]+".*?<iframe src="([^"]+)" scrolling="no" frameborder="0"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+
+    for url in matches:
+        server = servertools.get_server_from_url(url)
+        title = "Ver en: [COLOR yellow](%s)[/COLOR]" % server.title()
+
+        itemlist.append(item.clone(action='play', title=title, server=server, url=url))
+
     return itemlist
-
-
-def decode_url(txt):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(txt).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    rep = True
-    while rep == True:
-        b64_data = scrapertools.find_single_match(data, '\(dhYas638H\("([^"]+)"\)')
-        if b64_data:
-            b64_url = base64.b64decode(b64_data + "=")
-            b64_url = base64.b64decode(b64_url + "==")
-            data = b64_url
-        else:
-            rep = False
-    url = scrapertools.find_single_match(b64_url, '<iframe src="([^"]+)"')
-    logger.debug (url)
-    return url
\ No newline at end of file
diff --git a/channels/xozilla.py b/channels/xozilla.py
index 4b0b3d46..566c8b43 100644
--- a/channels/xozilla.py
+++ b/channels/xozilla.py
@@ -1,17 +1,14 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
-import urlparse
-import urllib2
-import urllib
 import re
-import os
-import sys
 
-from platformcode import config, logger
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.xozilla.com'
 
@@ -59,8 +56,6 @@ def categorias(item):
             scrapedtitle += " (" + cantidad + ")"
         itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot))
-    if "Categorias" in item.title:
-        itemlist.sort(key=lambda x: x.title)
     next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
     if next_page != "#videos":
         next_page = urlparse.urljoin(item.url, next_page)
@@ -109,6 +104,6 @@ def play(item):
     media_url = scrapertools.find_single_match(data, 'video_alt_url: \'([^\']+)/\'')
     if media_url == "":
         media_url = scrapertools.find_single_match(data, 'video_url: \'([^\']+)/\'')
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=media_url,
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=media_url,
                          thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
diff --git a/channels/xtapes.json b/channels/xtapes.json
index 017437cb..9a1cc2fa 100644
--- a/channels/xtapes.json
+++ b/channels/xtapes.json
@@ -1,7 +1,7 @@
 {
   "id": "xtapes",
   "name": "xtapes",
-  "active": false,
+  "active": true,
   "adult": true,
   "language": ["*"],
   "thumbnail": "http://hd.xtapes.to/wp-content/uploads/xtapes.png",
diff --git a/channels/xtapes.py b/channels/xtapes.py
index 4bb3548b..13c4f297 100644
--- a/channels/xtapes.py
+++ b/channels/xtapes.py
@@ -1,21 +1,21 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://hd.xtapes.to'
 
-# Links NetuTV
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/hd-porn-movies/"))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/full-porn-movies/?display=tube&filtre=date"))
     itemlist.append( Item(channel=item.channel, title="Productora" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/?filtre=date&cat=0"))
     itemlist.append( Item(channel=item.channel, title="Mas Vistos" , action="lista", url=host + "/?display=tube&filtre=views"))
@@ -48,7 +48,7 @@ def categorias(item):
     if item.title=="Canal":
         data = scrapertools.find_single_match(data,'<div class="footer-banner">(.*?)<div id="footer-copyright">')
     if item.title=="Productora" :
-       data = scrapertools.find_single_match(data,'>Full Movies</a>(.*?)</ul>')
+       data = scrapertools.find_single_match(data,'<li id="menu-item-16"(.*?)</ul>')
     if item.title=="Categorias" :
        data = scrapertools.find_single_match(data,'<a>Categories</a>(.*?)</ul>')
     patron  = '<a href="([^"]+)">([^"]+)</a>'
@@ -79,8 +79,8 @@ def lista(item):
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
+                              fanart=thumbnail, plot=plot, fulltitle = title,  contentTitle = contentTitle))
     next_page = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next video')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
@@ -90,3 +90,19 @@ def lista(item):
     return itemlist
 
 
+def play(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    variable = scrapertools.find_single_match(data,'<script type=\'text/javascript\'> str=\'([^\']+)\'')
+    resuelta = re.sub("@[A-F0-9][A-F0-9]", lambda m: m.group()[1:].decode('hex'), variable)
+    url = scrapertools.find_single_match(resuelta,'<iframe src="([^"]+)"')
+    data = httptools.downloadpage(item.url).data
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
+    return itemlist
+
diff --git a/channels/xvideos.json b/channels/xvideos.json
deleted file mode 100755
index ddcc89d5..00000000
--- a/channels/xvideos.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "xvideos",
-  "name": "xvideos",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "xvideos.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/xvideos.py b/channels/xvideos.py
deleted file mode 100755
index 6c66b18c..00000000
--- a/channels/xvideos.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.xvideos.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Lo mejor" , action="lista", url=host + "/best/"))
-    itemlist.append( Item(channel=item.channel, title="Pornstar" , action="catalogo", url=host + "/pornstars-index"))
-    itemlist.append( Item(channel=item.channel, title="WebCAM" , action="catalogo", url=host + "/webcam-models-index"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels-index/top"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/tags"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?k=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li><a href="([^"]+)"><b>([^<]+)</b><span class="navbadge default">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<img src="([^"]+)".*?'
-    patron += '<p class="profile-name">.*?<a href="([^"]+)">([^<]+)</a>.*?'
-    patron += '<span class="with-sub">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(host,scrapedurl) + "/videos/new/0"
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data, '<li><a href="([^"]+)" class="no-page next-page">Siguiente')
-    if next_page=="":
-        next_page = scrapertools.find_single_match(data, '<li><a class="active".*?<a href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="catalogo", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div id="video_\d+".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += '</a>(.*?)<div class=.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)".*?'
-    patron += '<span class="duration">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,quality,scrapedurl,scrapedtitle,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = scrapedthumbnail.replace("THUMBNUM" , "10")
-        quality = scrapertools.find_single_match(quality, 'mark">([^<]+)</span>')
-        if quality:
-            title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + "[COLOR red]" + quality + "[/COLOR] " + scrapedtitle
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<li><a href="([^"]+)" class="no-page next-page">Siguiente')
-    if "profile" in item.url:
-        next_page = scrapertools.find_single_match(data, '<li><a class="active" href="">(\d+)</a></li><li><a href="#')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page).replace("&amp;", "&")
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    url = scrapertools.find_single_match(data, 'html5player.setVideoHLS\(\'([^\']+)\'\)')
-    itemlist.append(item.clone(action="play", title=url, url=url ))
-    return itemlist
-
diff --git a/channels/xxxdan.py b/channels/xxxdan.py
index c4d21fd0..f2359eb4 100644
--- a/channels/xxxdan.py
+++ b/channels/xxxdan.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+import re
+import urlparse
 
-from platformcode import config, logger
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'http://xxxdan.com'
 
@@ -93,7 +93,7 @@ def play(item):
     data = httptools.downloadpage(item.url).data
     media_url = scrapertools.find_single_match(data, 'src:\'([^\']+)\'')
     media_url = media_url.replace("https","http")
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=media_url,
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=media_url,
                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/channels/xxxfreeinhd.json b/channels/xxxfreeinhd.json
index ff580284..16376ceb 100644
--- a/channels/xxxfreeinhd.json
+++ b/channels/xxxfreeinhd.json
@@ -4,7 +4,7 @@
   "active": true,
   "adult": true,
   "language": ["*"],
-  "thumbnail": "https://watchxxxfreeinhd.com/wp-content/uploads/logo2015-1.png",
+  "thumbnail": "https://watchxxxfreeinhd.com/wp-content/uploads/logo2015%20(1).jpg",
   "banner": "",
   "categories": [
     "adult"
diff --git a/channels/xxxfreeinhd.py b/channels/xxxfreeinhd.py
index ff12d4e1..b29172a4 100644
--- a/channels/xxxfreeinhd.py
+++ b/channels/xxxfreeinhd.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-import base64
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'https://watchxxxfreeinhd.com'
 
@@ -28,7 +29,7 @@ def mainlist(item):
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
-    item.url = host + "search.php?q=%s&language=en&search=Search" % texto
+    item.url = host + "/search.php?q=%s&language=en&search=Search" % texto
     try:
         return lista(item)
     except:
@@ -69,13 +70,10 @@ def lista(item):
         thumbnail = scrapedthumbnail + "|https://watchxxxfreeinhd.com/" 
         plot = ""
         itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, plot=plot, fanart=scrapedthumbnail ))
+                              thumbnail=thumbnail, plot=plot, fanart=scrapedthumbnail, contentTitle = scrapedtitle))
     next_page = scrapertools.find_single_match(data, '<link rel="next" href="([^"]+)"')
     if next_page:
         next_page =  urlparse.urljoin(item.url,next_page)
-        if "?filtre=date&cat=0" in item.url: next_page += "?filtre=date&cat=0"
-        elif "?display=tube&filtre=views" in item.url: next_page += "?display=tube&filtre=views"
-        elif "?display=tube&filtre=rate" in item.url: next_page += "?display=tube&filtre=rate"
         itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
                               url=next_page) )
     return itemlist
@@ -86,37 +84,12 @@ def findvideos(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data,'<div class="video-embed">(.*?)<div class="views-infos">')
-    patron = 'data-lazy-src="([^"]+)"'
+    data = scrapertools.find_single_match(data,'<div class="video-embed">(.*?)</div>')
+    patron = '<noscript>.*?<iframe src="([^"]+)"'
     matches = scrapertools.find_multiple_matches(data, patron)
-    for title in matches:
-        if "strdef" in title: 
-            url = decode_url(title)
-            if "strdef" in url:
-                url = httptools.downloadpage(url).url
-        if "hqq" in title:
-            url = title
-        itemlist.append( Item(channel=item.channel, action="play", title = "%s", url=url ))
+    for url in matches:
+        itemlist.append(item.clone(action="play", title = "%s", url=url ))
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     return itemlist
 
 
-def decode_url(txt):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(txt).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    rep = True
-    while rep == True:
-        b64_data = scrapertools.find_single_match(data, '\(dhYas638H\("([^"]+)"\)')
-        if b64_data:
-            b64_url = base64.b64decode(b64_data + "=")
-            b64_url = base64.b64decode(b64_url + "==")
-            data = b64_url
-        else:
-            rep = False
-    url = scrapertools.find_single_match(b64_url, '<iframe src="([^"]+)"')
-    logger.debug (url)
-    return url
-
-
diff --git a/channels/xxxparodyhd.py b/channels/xxxparodyhd.py
index df554687..e3e04dd1 100644
--- a/channels/xxxparodyhd.py
+++ b/channels/xxxparodyhd.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core import tmdb
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'https://xxxparodyhd.net'
 
@@ -17,8 +19,8 @@ def mainlist(item):
     itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/movies/"))
     itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/genre/new-release/"))
     itemlist.append( Item(channel=item.channel, title="Parodias" , action="lista", url=host + "/genre/parodies/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/categories"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -67,6 +69,7 @@ def lista(item):
         scrapedplot = ""
         itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot, infoLabels={'year':scrapedyear}) )
+    tmdb.set_infoLabels(itemlist, True)
     next_page = scrapertools.find_single_match(data,'<li class=\'active\'>.*?href=\'([^\']+)\'>')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
diff --git a/channels/xxxstreams.json b/channels/xxxstreams.json
index a92df9d3..522372fd 100644
--- a/channels/xxxstreams.json
+++ b/channels/xxxstreams.json
@@ -4,7 +4,7 @@
   "active": true,
   "adult": true,
   "language": ["*"],
-  "thumbnail": "xxxstreams.png",
+  "thumbnail": "",
   "banner": "",
   "categories": [
     "adult"
diff --git a/channels/xxxstreams.py b/channels/xxxstreams.py
index cff4d613..2cb55ef4 100644
--- a/channels/xxxstreams.py
+++ b/channels/xxxstreams.py
@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
+import re
+import urlparse
 
-host = 'http://xxxstreams.org' #es hhttp://freepornstreams.org
+from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
+
+host = 'http://xxxstreams.org'
 
 def mainlist(item):
     logger.info()
     itemlist = []
     itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url= host + "/category/full-porn-movie-stream/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/new-porn-streaming/"))
+    itemlist.append( Item(channel=item.channel, title="Clips" , action="lista", url=host))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
@@ -38,10 +39,7 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    if item.title == "Categorias" :
-        data1 = scrapertools.find_single_match(data,'>Top Tags</a>(.*?)</ul>')
-        data1 += scrapertools.find_single_match(data,'>Ethnic</a>(.*?)</ul>')
-        data1 += scrapertools.find_single_match(data,'>Kinky</a>(.*?)</ul>')
+    data1 = scrapertools.find_single_match(data,'<h5>Popular Categories<br />(.*?)</aside>')
     if item.title == "Canal" :
         data1 = scrapertools.find_single_match(data,'>Top sites</a>(.*?)</ul>')
         data1 += scrapertools.find_single_match(data,'Downloads</h2>(.*?)</ul>')
@@ -67,7 +65,6 @@ def lista(item):
     for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         if '/HD' in scrapedtitle : title= "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        elif 'SD' in scrapedtitle : title= "[COLOR red]" + "SD" + "[/COLOR] " + scrapedtitle
         elif 'FullHD' in scrapedtitle : title= "[COLOR red]" + "FullHD" + "[/COLOR] " + scrapedtitle
         elif '1080' in scrapedtitle : title= "[COLOR red]" + "1080p" + "[/COLOR] " + scrapedtitle
         else: title = scrapedtitle
@@ -80,14 +77,3 @@ def lista(item):
     return itemlist
 
 
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = '<a href="([^"]+)" rel="nofollow"[^<]+>(?:Streaming|Download)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        if not "ubiqfile" in url:
-            itemlist.append(item.clone(action='play',title="%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
diff --git a/channels/yespornplease.py b/channels/yespornplease.py
index ae7c2b40..8e5abc28 100644
--- a/channels/yespornplease.py
+++ b/channels/yespornplease.py
@@ -2,12 +2,12 @@
 
 import re
 
-from core import httptools
-from core.item import Item
-from platformcode import logger
 from urlparse import urljoin
-from core import servertools
 
+from core import httptools
+from core import servertools
+from platformcode import logger
+from platformcode import config
 
 HOST="http://yespornplease.com"
 
@@ -70,7 +70,7 @@ def links(item):
         if quality:
             formattedQuality += " [%s]" % (quality)
         titleFormatted = "%(title)s%(quality)s [%(duration)s]" % ({"title": title, "quality": formattedQuality, "duration": duration})
-        result.append(item.clone(action = "play", title = titleFormatted, url = urljoin(item.url, "/v/%s" % (vID)), thumbnail = urljoin(item.url, img), vID = vID))
+        result.append(item.clone(action = "play", title = titleFormatted, url = urljoin(item.url, "/view/%s" % (vID)), thumbnail = urljoin(item.url, img), vID = vID))
     # Has pagination
     paginationOccurences = data.count('class="prevnext"')
     if paginationOccurences:
@@ -85,6 +85,6 @@ def links(item):
 
 def play(item):
     logger.info(item)
-    embededURL = urljoin(item.url, "/v/%s" % (item.vID))
+    embededURL = urljoin(item.url, "/view/%s" % (item.vID))
     itemlist = servertools.find_video_items(item.clone(url = embededURL))
     return itemlist
diff --git a/channels/youjizz.py b/channels/youjizz.py
index 4112acbe..54b310b0 100644
--- a/channels/youjizz.py
+++ b/channels/youjizz.py
@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
-import urlparse
-import urllib2
-import urllib
 import re
-import os
-import sys
-from platformcode import config, logger
+
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.youjizz.com'
 
@@ -44,7 +42,7 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '>Trending Categories<(.*?)</ul>')
+    data = scrapertools.find_single_match(data, '<h4>Trending(.*?)</ul>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = '<li><a href="([^"]+)">([^"]+)</a>'
     matches = re.compile(patron, re.DOTALL).findall(data)
@@ -106,6 +104,6 @@ def play(item):
         patron = '"1080".*?"filename"\:"(.*?)"'
     media_url = scrapertools.find_single_match(data, patron)
     media_url = "https:" + media_url.replace("\\", "")
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=media_url,
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=media_url,
                          thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
diff --git a/channels/youporn.py b/channels/youporn.py
index fd41cfb7..97e6b395 100644
--- a/channels/youporn.py
+++ b/channels/youporn.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
+import re
+import urlparse
+
+from core import httptools
 from core import scrapertools
 from core.item import Item
-from core import servertools
-from core import httptools
+from platformcode import logger
+from platformcode import config
 
 host = 'https://www.youporn.com'
 
@@ -123,7 +124,7 @@ def play(item):
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
         scrapedurl =  scrapedurl.replace("\/", "/")
-    itemlist.append(item.clone(action="play", title=scrapedurl, url=scrapedurl))
+    itemlist.append(item.clone(action="play", title=scrapedurl, fulltitle = item.title, url=scrapedurl))
     return itemlist
 
 
diff --git a/channels/yuuk.py b/channels/yuuk.py
index f6e08673..a4adb269 100644
--- a/channels/yuuk.py
+++ b/channels/yuuk.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
+import re
+import urlparse
+
 from core import httptools
+from core import scrapertools
+from core.item import Item
+from platformcode import logger
+from platformcode import config
 
 host = 'http://yuuk.net'
 
@@ -74,20 +75,3 @@ def lista(item):
 
     return itemlist
 
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data,'Streaming Server<(.*?)Screenshot<')
-    patron = '(?:src|SRC)="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        if "http://stream.yuuk.net/embed.php" in url:
-            data = httptools.downloadpage(url).data
-            url = scrapertools.find_single_match(data,'"file": "([^"]+)e=download"')
-        itemlist.append( Item(channel=item.channel, action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/zmovs.json b/channels/zmovs.json
deleted file mode 100755
index 928b5a0f..00000000
--- a/channels/zmovs.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "zmovs",
-  "name": "zmovs",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://zmovs.com/favicon-96x96.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channelselector.py b/channelselector.py
index 5cd94b8f..36dd50b8 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -16,10 +16,6 @@ def getmainlist(view="thumb_"):
     logger.info()
     itemlist = list()
 
-    if config.dev_mode():
-        itemlist.append(Item(title="Redirect", channel="checkhost", action="check_channels",
-                            thumbnail='',
-                            category=config.get_localized_string(30119), viewmode="thumbnails"))
     # Añade los canales que forman el menú principal
     if addon.getSetting('enable_news_menu') == "true":
         itemlist.append(Item(title=config.get_localized_string(30130), channel="news", action="mainlist",
@@ -327,10 +323,10 @@ def auto_filter(auto_lang=False):
     return lang
 
 
-def thumb(itemlist=[], genre=False):
+def thumb(itemlist=[]):
     if itemlist:
         import re
-        
+
         icon_dict = {'channels_movie':['film'],
                      'channels_tvshow':['serie','tv','episodi','episodio'],
                      'channels_documentary':['documentari','documentario'],
@@ -339,13 +335,13 @@ def thumb(itemlist=[], genre=False):
                      'now_playing':['cinema', 'in sala'],
                      'channels_anime':['anime'],
                      'genres':['genere', 'generi', 'categorie', 'categoria'],
-                     'channels_animation': ['animazione', 'cartoni', 'cartoon'],
+                     'channels_animation': ['animazione', 'cartoni'],
+                     'channels_adventure': ['avventura'],
                      'channels_action':['azione', 'arti marziali'],
-                     'channels_adventure': ['avventura'],                     
                      'channels_biographical':['biografico'],
                      'channels_comedy':['comico','commedia', 'demenziale'],
                      'channels_adult':['erotico', 'hentai'],
-                     'channels_drama':['drammatico', 'drama'],
+                     'channels_drama':['drammatico'],
                      'channels_syfy':['fantascienza'],
                      'channels_fantasy':['fantasy'],
                      'channels_crime':['gangster','poliziesco'],
@@ -359,8 +355,7 @@ def thumb(itemlist=[], genre=False):
                      'channels_noir':['noir'],
                      'popular' : ['popolari','popolare', 'più visti'],
                      'channels_thriller':['thriller'],
-                     'top_rated' : ['fortunato', 'votati'],
-                     'on_the_air' : ['corso', 'onda'],
+                     'top_rated' : ['fortunato'],
                      'channels_western':['western'],
                      'channels_vos':['sub','sub-ita'],
                      'channels_romance':['romantico','sentimentale'],
@@ -372,44 +367,39 @@ def thumb(itemlist=[], genre=False):
         suffix_dict = {'_hd':['hd','altadefinizione','alta definizione'],
                        '_4k':['4K'],
                        '_az':['lettera','lista','alfabetico','a-z'],
-                       '_year':['anno', 'anni'],
+                       '_year':['anno'],
                        '_genre':['genere', 'generi', 'categorie', 'categoria']}
 
         search = ['cerca']
 
         search_suffix ={'_movie':['film'],
                         '_tvshow':['serie','tv']}
-
         for item in itemlist:
-            
-            if genre == False:
 
-                for thumb, titles in icon_dict.items():
-                    if any( word in item.title.lower() for word in search):
-                        thumb = 'search'
-                        for suffix, titles in search_suffix.items():
-                            if any( word in item.title.lower() for word in titles ): 
+            # Check if item has args propriety
+            if item.args: item.title = item.title + ' || ' + str(item.args)
+
+            for thumb, titles in icon_dict.items():
+                if any( word in item.title.lower() for word in search):
+                    thumb = 'search'
+                    for suffix, titles in search_suffix.items():
+                        if any( word in item.title.lower() for word in titles ): 
+                            thumb = thumb + suffix
+                    item.thumbnail = get_thumb(thumb + '.png')
+                elif any( word in item.title.lower() for word in titles ):
+                    if thumb == 'channels_movie' or thumb == 'channels_tvshow':
+                        for suffix, titles in suffix_dict.items():
+                            if any( word in item.title.lower() for word in titles ):
                                 thumb = thumb + suffix
-                        item.thumbnail = get_thumb(thumb + '.png')
-                    elif any( word in item.title.lower() for word in titles ):
-                        if thumb == 'channels_movie' or thumb == 'channels_tvshow':
-                            for suffix, titles in suffix_dict.items():
-                                if any( word in item.title.lower() for word in titles ):
-                                    thumb = thumb + suffix
-                            item.thumbnail = get_thumb(thumb + '.png')
-                        else: item.thumbnail = get_thumb(thumb + '.png')
-                    else:
-                        thumb = item.thumbnails
+                    item.thumbnail = get_thumb(thumb + '.png')
+                else:
+                    thumb = item.thumbnails
 
-            else:
-                for thumb, titles in icon_dict.items():
-                    if any(word in item.title.lower() for word in titles ):
-                        item.thumbnail = get_thumb(thumb + '.png')
-                    else:
-                        thumb = item.thumbnails
+                if item.thumbnail != '':
+                    break
 
-            
-            item.title = re.sub(r'\s*\{[^\}]+\}','',item.title)
+            # Remove args from title
+            if item.args: item.title = item.title.replace(' || ' + str(item.args), '')
         return itemlist
     else:
         return get_thumb('next.png')
diff --git a/core/channeltools.py b/core/channeltools.py
index 5d350b16..17c42b8f 100644
--- a/core/channeltools.py
+++ b/core/channeltools.py
@@ -79,7 +79,7 @@ def get_channel_parameters(channel_name):
                     #             break
                     #     if found:
                     #         break
-                    channel_parameters['settings'] = get_default_settings(channel_name)                    
+
                     for s in channel_parameters['settings']:
                         if 'id' in s:
                             if s['id'] == "include_in_global_search":
@@ -155,8 +155,7 @@ def get_channel_controls_settings(channel_name):
     # logger.info("channel_name=" + channel_name)
     dict_settings = {}
     # import web_pdb; web_pdb.set_trace()
-    # list_controls = get_channel_json(channel_name).get('settings', list())
-    list_controls = get_default_settings(channel_name)
+    list_controls = get_channel_json(channel_name).get('settings', list())
 
     for c in list_controls:
         if 'id' not in c or 'type' not in c or 'default' not in c:
@@ -168,67 +167,6 @@ def get_channel_controls_settings(channel_name):
 
     return list_controls, dict_settings
 
-def get_default_settings(channel_name):
-    import filetools, inspect
-    from core import support, scrapertoolsV2
-    channel = __import__('channels.%s' % channel_name, fromlist=["channels.%s" % channel_name])
-    if hasattr(channel, 'list_language'):
-        list_language = channel.list_language
-        list_language.insert(0, config.get_localized_string(70522))
-    else:
-        list_language = []
-    if 'episodios' in dir(channel):
-        episodios = getattr(__import__('channels.%s' % channel_name, fromlist=['episodios']), 'episodios')
-        anime = scrapertoolsV2.find_single_match(inspect.getsource(support.extract_wrapped(episodios)), r'(anime\s*=\s*True)')
-
-    channel_controls = get_channel_json(channel_name).get('settings', list())
-    default_path = filetools.join(config.get_runtime_path(), 'default_channel_settings' + '.json')
-    default_controls = jsontools.load(filetools.read(default_path)).get('settings', list())
-    default_controls_anime = jsontools.load(filetools.read(default_path)).get('anime', list())
-    categories = get_channel_json(channel_name).get('categories', list())
-    for control in default_controls:
-        if control['id'] not in str(channel_controls):
-            if 'include_in_newest' in control['id']:
-                label = control['id'].split('_')
-                label = label[-1]
-                if label == 'peliculas':
-                    if 'movie' not in categories:
-                        pass
-                    else:
-                        control['label'] = config.get_localized_string(70727) + ' - ' + config.get_localized_string(30122)
-                        channel_controls.append(control)
-                        logger.info(control)
-                elif label == 'series':
-                    if 'tvshow' not in categories:
-                        pass
-                    else:
-                        control['label'] = config.get_localized_string(70727) + ' - ' + config.get_localized_string(30123)
-                        channel_controls.append(control)
-                elif label == 'anime':
-                    if 'anime' not in categories:
-                        pass
-                    else:
-                        control['label'] = config.get_localized_string(70727) + ' - ' + config.get_localized_string(30124)   
-                        channel_controls.append(control) 
-                else:
-                    control['label'] = config.get_localized_string(70727) + ' - ' + label.capitalize()
-                    channel_controls.append(control)
-
-            elif control['id'] == 'filter_languages':
-                if len(list_language) > 1:
-                    control['lvalues'] = list_language
-                    channel_controls.append(control)
-                else:
-                    pass         
-            else:
-                channel_controls.append(control)
-    if anime:
-        for control in default_controls_anime:
-            if control['id'] not in str(channel_controls):
-                channel_controls.append(control)
-            else: pass
-    return channel_controls
-
 
 def get_channel_setting(name, channel, default=None):
     """
diff --git a/core/scrapertoolsV2.py b/core/scrapertoolsV2.py
index a8e5b163..9fa26d28 100644
--- a/core/scrapertoolsV2.py
+++ b/core/scrapertoolsV2.py
@@ -32,11 +32,6 @@ def find_multiple_matches(text, pattern):
     return re.findall(pattern, text, re.DOTALL)
 
 
-def find_multiple_matches_groups(text, pattern):
-    r = re.compile(pattern)
-    return [m.groupdict() for m in r.finditer(text)]
-
-
 # Convierte los codigos html "&ntilde;" y lo reemplaza por "ñ" caracter unicode utf-8
 def decodeHtmlentities(data):
     entity_re = re.compile("&(#?)(\d{1,5}|\w{1,8})(;?)")
diff --git a/core/support.py b/core/support.py
index 1a3258b1..f815f7fe 100644
--- a/core/support.py
+++ b/core/support.py
@@ -16,6 +16,7 @@ from lib import unshortenit
 from platformcode import logger, config
 from specials import autoplay
 
+
 def hdpass_get_servers(item):
     # Carica la pagina
     data = httptools.downloadpage(item.url).data.replace('\n', '')
@@ -52,7 +53,7 @@ def hdpass_get_servers(item):
                 for media_label, media_url in scrapertoolsV2.find_multiple_matches(data, patron_media):
                     itemlist.append(Item(channel=item.channel,
                                          action="play",
-                                         title=item.title + typo(server, '-- [] color kod') + typo(res_video, '-- [] color kod'),
+                                         title=item.title+" ["+color(server, 'orange')+"]"+" - "+color(res_video, 'limegreen'),
                                          fulltitle=item.fulltitle,
                                          quality=res_video,
                                          show=item.show,
@@ -92,338 +93,176 @@ def color(text, color):
     return "[COLOR " + color + "]" + text + "[/COLOR]"
 
 
-def search(channel, item, texto):
-    log(item.url + " search " + texto)
-    if 'findhost' in dir(channel):
-        channel.findhost()
-    item.url = channel.host + "/?s=" + texto
-    try:
-        return channel.peliculas(item)
-    # Continua la ricerca in caso di errore
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-    return []
-
-
-def dbg():
-    import web_pdb;
-    if not web_pdb.WebPdb.active_instance:
-        import webbrowser
-        webbrowser.open('http://127.0.0.1:5555')
-    web_pdb.set_trace()
-
-
-
-def regexDbg(item, patron, headers, data=''):
-    import json, urllib2, webbrowser
-    url = 'https://regex101.com'
-
-    if not data:
-        html = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data.replace("'", '"')
-        html = re.sub('\n|\t', ' ', html)
-    else:
-        html = data
-    headers = {'content-type': 'application/json'}
-    data = {
-        'regex': patron,
-        'flags': 'gm',
-        'testString': html,
-        'delimiter': '"""',
-        'flavor': 'python'
-    }
-    r = urllib2.Request(url + '/api/regex', json.dumps(data), headers=headers)
-    r = urllib2.urlopen(r).read()
-    permaLink = json.loads(r)['permalinkFragment']
-    webbrowser.open(url + "/r/" + permaLink)
-
-
-def scrape2(item, patron = '', listGroups = [], headers="", blacklist="", data="", patronBlock="",
-           patronNext="", action="findvideos", addVideolibrary = True, typeContentDict={}, typeActionDict={}):
-    m = re.search(r'(?<!\\|\[)\((?!\?)', patron)
-    n = 0
-    while m:
-        patron = patron[:m.end()] + '?P<' + listGroups[n] + '>' + patron[m.end():]
-        m = re.search(r'(?<!\\|\[)\((?!\?)', patron)
-        n += 1
-    regexDbg(item, patron, headers)
-
-
-def scrapeLang(scraped, lang, longtitle):
-    ##    Aggiunto/modificato per gestire i siti che hanno i video
-    ##    in ita e subita delle serie tv nella stessa pagina
-    if scraped['lang']:
-        if 'sub' in scraped['lang'].lower():
-            lang = 'Sub-ITA'
-        else:
-            lang = 'ITA'
-    if lang != '':
-        longtitle += typo(lang, '_ [] color kod')
-
-    return lang, longtitle
-
-def cleantitle(title):
-    cleantitle = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(title).replace('"', "'").replace('×', 'x').replace('–', '-')).strip()
-    return cleantitle
-
-def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, typeContentDict, typeActionDict, blacklist, search, pag, function):
-    itemlist = []
-    log("scrapeBlock qui", block, patron)
-    matches = scrapertoolsV2.find_multiple_matches_groups(block, patron)
-    log('MATCHES =', matches)
-
-    if debug:
-        regexDbg(item, patron, headers, block)
-
-    known_keys = ['url', 'title', 'title2', 'episode', 'thumb', 'quality', 'year', 'plot', 'duration', 'genere', 'rating', 'type', 'lang']
-    lang = ''  # aggiunto per gestire i siti con pagine di serietv dove si hanno i video in ita e in subita
-
-    for i, match in enumerate(matches):
-        if pagination and (pag - 1) * pagination > i: continue  # pagination
-        if pagination and i >= pag * pagination: break          # pagination
-        listGroups = match.keys()
-        match = match.values()
-
-        if len(listGroups) > len(match):  # to fix a bug
-            match = list(match)
-            match.extend([''] * (len(listGroups) - len(match)))
-
-        scraped = {}
-        for kk in known_keys:
-            val = match[listGroups.index(kk)] if kk in listGroups else ''
-            if val and (kk == "url" or kk == 'thumb') and 'http' not in val:
-                val = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + val
-            scraped[kk] = val
-        
-        
-        episode = re.sub(r'\s-\s|-|x|&#8211|&#215;', 'x', scraped['episode']) if scraped['episode'] else ''
-        title = cleantitle(scraped['title']) if scraped['title'] else ''
-        title2 = cleantitle(scraped['title2']) if scraped['title2'] else ''
-        quality = scraped['quality'] if scraped['quality'] else ''
-        Type = scraped['type'] if scraped['type'] else ''
-        plot = cleantitle(scraped["plot"]) if scraped["plot"] else ''
-       
-        # make formatted Title [longtitle]
-        s = ' - '
-        title = episode +  (s if episode and title else '') + title
-        longtitle = title + (s if title and title2 else '') + title2
-        longtitle = typo(longtitle, 'bold')
-        longtitle += (typo(Type,'_ () bold') if Type else '') +  (typo(quality, '_ [] color kod') if quality else '')
-        lang, longtitle = scrapeLang(scraped, lang, longtitle)
-
-        # if title is set, probably this is a list of episodes or video sources
-        if item.infoLabels["title"]:
-            infolabels = item.infoLabels
-        else:
-            infolabels = {}
-            if scraped['year']:
-                infolabels['year'] = scraped['year']
-            if scraped["plot"]:
-                infolabels['plot'] = plot
-            if scraped['duration']:
-                matches = scrapertoolsV2.find_multiple_matches(scraped['duration'],
-                                                               r'([0-9])\s*?(?:[hH]|:|\.|,|\\|\/|\||\s)\s*?([0-9]+)')
-                for h, m in matches:
-                    scraped['duration'] = int(h) * 60 + int(m)
-                if not matches:
-                    scraped['duration'] = scrapertoolsV2.find_single_match(scraped['duration'], r'(\d+)')
-                infolabels['duration'] = int(scraped['duration']) * 60
-            if scraped['genere']:
-                genres = scrapertoolsV2.find_multiple_matches(scraped['genere'], '[A-Za-z]+')
-                infolabels['genere'] = ", ".join(genres)
-            if scraped["rating"]:
-                infolabels['rating'] = scrapertoolsV2.decodeHtmlentities(scraped["rating"])
-
-        AC = CT = ''
-        if typeContentDict:
-            for name, variants in typeContentDict.items():
-                if str(scraped['type']).lower() in variants:
-                    CT = name
-                else: CT = item.contentType
-        if typeActionDict:
-            for name, variants in typeActionDict.items():
-                if str(scraped['type']).lower() in variants:
-                    AC = name
-                else: AC = action
-        
-        if (scraped["title"] not in blacklist) and (search.lower() in longtitle.lower()):
-            it = Item(
-                channel=item.channel,
-                action=AC if AC else action,
-                contentType='episode' if function == 'episodios' else CT if CT else item.contentType,
-                title=longtitle,
-                fulltitle=item.fulltitle if function == 'episodios' else title,
-                show=item.show if function == 'episodios' else title,
-                quality=quality,
-                url=scraped["url"],
-                infoLabels=infolabels,
-                thumbnail=item.thumbnail if function == 'episodios' else scraped["thumb"] ,
-                args=item.args,
-                contentSerieName= title if item.contentType != 'movie' and function != 'episodios' else item.fulltitle if function == 'episodios' else '',
-                contentTitle= title if item.contentType == 'movie' else '',
-                contentLanguage=lang,
-                ep=episode if episode else ''
-            )
-            
-            for lg in list(set(listGroups).difference(known_keys)):
-                it.__setattr__(lg, match[listGroups.index(lg)])
-
-            if 'itemHook' in args:
-                it = args['itemHook'](it)
-            itemlist.append(it)
-
-    return itemlist, matches
-
-
-def scrape(func):
-    # args is a dict containing the foolowing keys:
+def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="", patron_block="",
+           patronNext="", action="findvideos", addVideolibrary = True, type_content_dict={}, type_action_dict={}):
     # patron: the patron to use for scraping page, all capturing group must match with listGroups
     # listGroups: a list containing the scraping info obtained by your patron, in order
     # accepted values are: url, title, thumb, quality, year, plot, duration, genre, rating, episode, lang
 
-    # headers: values to pass to request header
+    # header: values to pass to request header
     # blacklist: titles that you want to exclude(service articles for example)
     # data: if you want to pass data manually, maybe because you need some custom replacement
-    # patronBlock: patron to get parts of the page (to scrape with patron attribute),
+    # patron_block: patron to get parts of the page (to scrape with patron attribute),
     #               if you need a "block inside another block" you can create a list, please note that all matches
     #               will be packed as string
     # patronNext: patron for scraping next page link
     # action: if you want results perform an action different from "findvideos", useful when scraping film by genres
-    # addVideolibrary: if "add to videolibrary" should appear
+    # url_host: string to prepend to scrapedurl, useful when url don't contain host
     # example usage:
     #   import support
     #   itemlist = []
     #   patron = 'blablabla'
     #   headers = [['Referer', host]]
     #   blacklist = 'Request a TV serie!'
-    #   return support.scrape(item, itemlist, patron, ['thumb', 'quality', 'url', 'title', 'year', 'plot', 'episode', 'lang'],
+    #   return support.scrape(item, itemlist, patron, ['thumb', 'quality', 'url', 'title', 'title2', 'year', 'plot', 'episode', 'lang'],
     #                           headers=headers, blacklist=blacklist)
+    # listGroups
+    #    thumb = immagine, quality = qualità, url = link singolo o gruppo, title = titolo film o serie, title2 = titolo aggiuntivo
+    #    year = anno del film o della serie, plot = descrizione film o serie, episode = numero stagione - numero episodio in caso di serie,
+    #    lang = lingua del video
     # 'type' is a check for typologies of content e.g. Film or TV Series
     # 'episode' is a key to grab episode numbers if it is separated from the title
-    # IMPORTANT 'type' is a special key, to work need typeContentDict={} and typeActionDict={}
+    # IMPORTANT 'type' is a special key, to work need type_content_dict={} and type_action_dict={}
 
-    def wrapper(*args):
-        function = func.__name__
-        itemlist = []
+    itemlist = []
 
-        args = func(*args)
+    if not data:
+        data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data.replace("'", '"')
+        data = re.sub('\n|\t', ' ', data)
+        # replace all ' with " and eliminate newline, so we don't need to worry about
+        log('DATA =', data)
 
-        item = args['item']
+        block = data
 
-        action = args['action'] if 'action' in args else 'findvideos'
-        anime = args['anime'] if 'anime' in args else ''
-        addVideolibrary = args['addVideolibrary'] if 'addVideolibrary' in args else True
-        search = args['search'] if 'search' in args else ''
-        blacklist = args['blacklist'] if 'blacklist' in args else []
-        data = args['data'] if 'data' in args else ''
-        patron = args['patron'] if 'patron' in args else args['patronMenu'] if 'patronMenu' in args else ''
-        if 'headers' in args:
-            headers = args['headers']
-        elif 'headers' in func.__globals__:
-            headers = func.__globals__['headers']
-        else:
-            headers = ''
-        patronNext = args['patronNext'] if 'patronNext' in args else ''
-        patronBlock = args['patronBlock'] if 'patronBlock' in args else ''
-        typeActionDict = args['type_action_dict'] if 'type_action_dict' in args else {}
-        typeContentDict = args['type_content_dict'] if 'type_content_dict' in args else {}
-        debug = args['debug'] if 'debug' in args else False
-        if 'pagination' in args: pagination = args['pagination'] if args['pagination'] else 20
-        else: pagination = ''
-        list_language = func.__globals__['list_language'] if 'list_language' in func.__globals__ else {}
+        if patron_block:
+            if type(patron_block) == str:
+                patron_block = [patron_block]
 
-        pag = item.page if item.page else 1  # pagination
-        matches = []
+            for n, regex in enumerate(patron_block):
+                blocks = scrapertoolsV2.find_multiple_matches(block, regex)
+                block = ""
+                for b in blocks:
+                    block += "\n" + str(b)
+                log('BLOCK ', n, '=', block)
+    else:
+        block = data
+    if patron and listGroups:
+        matches = scrapertoolsV2.find_multiple_matches(block, patron)
+        log('MATCHES =', matches)
 
-        log('PATRON= ', patron)
-        if not data:
-            data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data.replace("'", '"')
-            data = re.sub('\n|\t', ' ', data)
-            data = re.sub('>\s+<', '> <', data)
-            # replace all ' with " and eliminate newline, so we don't need to worry about
-            log('DATA =', data)
-
-        if patronBlock:
-            blocks = scrapertoolsV2.find_multiple_matches_groups(data, patronBlock) 
-            block = ""
-            for bl in blocks:
-                blockItemlist, blockMatches = scrapeBlock(item, args, bl['block'], patron, headers, action, pagination, debug,
-                                            typeContentDict, typeActionDict, blacklist, search, pag, function)
-                for it in blockItemlist:
-                    if 'lang' in bl:
-                        it.contentLanguage, it.title = scrapeLang(bl, it.contentLanguage, it.title)
-                    if 'quality' in bl and bl['quality']:
-                        it.quality = bl['quality']
-                        it.title = it.title + typo(bl['quality'], '_ [] color kod')
-                log('BLOCK ', '=', block)
-                itemlist.extend(blockItemlist)
-                matches.extend(blockMatches)
-        elif patron:
-            itemlist, matches = scrapeBlock(item, args, data, patron, headers, action, pagination, debug, typeContentDict,
-                                   typeActionDict, blacklist, search, pag, function)
+        known_keys = ['url', 'title', 'title2', 'episode', 'thumb', 'quality', 'year', 'plot', 'duration', 'genere', 'rating', 'type', 'lang'] #by greko aggiunto episode
+        lang = '' # aggiunto per gestire i siti con pagine di serietv dove si hanno i video in ita e in subita
         
+        for match in matches:
+            if len(listGroups) > len(match):  # to fix a bug
+                match = list(match)
+                match.extend([''] * (len(listGroups) - len(match)))
+
+            scraped = {}
+            for kk in known_keys:
+                val = match[listGroups.index(kk)] if kk in listGroups else ''
+                if val and (kk == "url" or kk == 'thumb') and 'http' not in val:
+                    val = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + val
+                scraped[kk] = val
+
+            title = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["title"])).replace('’', '\'').replace('"', "'").strip() # fix by greko da " a '
+            plot = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["plot"]))
+
+            longtitle = typo(title, 'bold')
+            if scraped['quality']: longtitle = longtitle + typo(scraped['quality'], '_ [] color kod')
+            if scraped['episode']:
+                scraped['episode'] = re.sub(r'\s-\s|-|x|&#8211', 'x' , scraped['episode'])
+                longtitle = typo(scraped['episode'] + ' - ', 'bold') + longtitle
+            if scraped['title2']:
+                title2 = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["title2"])).replace('"', "'").strip()
+                longtitle = longtitle + typo(title2, 'bold _ -- _')
+
+            ##    Aggiunto/modificato per gestire i siti che hanno i video
+            ##    in ita e subita delle serie tv nella stessa pagina
+            if scraped['lang'] == '': #altrimenti nei canali dei film mi aggiunge sub-ita a tutti i film successivi
+                lang = '' # o in alternativa lang = 'ITA'
+            if scraped['lang']:              
+                if 'sub' in scraped['lang'].lower():
+                    lang = 'Sub-ITA'
+                else:
+                    lang = 'ITA'                      
+            if lang != '':
+                longtitle += typo(lang, '_ [] color kod')
+
+            if item.infoLabels["title"] or item.fulltitle:  # if title is set, probably this is a list of episodes or video sources
+                infolabels = item.infoLabels
+            else:
+                infolabels = {}
+                if scraped["year"]:
+                    infolabels['year'] = scraped["year"]
+                if scraped["plot"]:
+                    infolabels['plot'] = plot
+                if scraped["duration"]:
+                    matches = scrapertoolsV2.find_multiple_matches(scraped["duration"],r'([0-9])\s*?(?:[hH]|:|\.|,|\\|\/|\||\s)\s*?([0-9]+)')
+                    for h, m in matches:
+                        scraped["duration"] = int(h) * 60 + int(m)
+                    if not matches:
+                        scraped["duration"] = scrapertoolsV2.find_single_match(scraped["duration"], r'(\d+)')
+                    infolabels['duration'] = int(scraped["duration"]) * 60
+                if scraped["genere"]:
+                    genres = scrapertoolsV2.find_multiple_matches(scraped["genere"], '[A-Za-z]+')
+                    infolabels['genere'] = ", ".join(genres)
+                if scraped["rating"]:
+                    infolabels['rating'] = scrapertoolsV2.decodeHtmlentities(scraped["rating"])
+
+            if type_content_dict:
+                for name, variants in type_content_dict.items():
+                    if scraped['type'] in variants:
+                        item.contentType = name
+            if type_action_dict:
+                for name, variants in type_action_dict.items():
+                    if scraped['type'] in variants:
+                        action = name
+
+            if inspect.stack()[1][3] == 'episodios':  item.contentType = 'episode'
+
+            if scraped["title"] not in blacklist:
+                it = Item(
+                    channel=item.channel,
+                    action=action,
+                    contentType=item.contentType,
+                    title=longtitle,
+                    fulltitle=title,
+                    show=title,
+                    language = lang if lang != '' else '',
+                    quality=scraped["quality"],
+                    url=scraped["url"],
+                    infoLabels=infolabels,
+                    thumbnail=scraped["thumb"],
+                    args=item.args
+                )
+
+                for lg in list(set(listGroups).difference(known_keys)):
+                    it.__setattr__(lg, match[listGroups.index(lg)])
+
+                itemlist.append(it)
         checkHost(item, itemlist)
-
-        
-
-        if 'itemlistHook' in args:
-            itemlist = args['itemlistHook'](itemlist)
+        if (item.contentType == "tvshow" and (action != "findvideos" and action != "play")) \
+                or (item.contentType == "episode" and action != "play") \
+                or (item.contentType == "movie" and action != "play"):
+            tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+        else:
+            for it in itemlist:
+                it.infoLabels = item.infoLabels
 
         if patronNext:
             nextPage(itemlist, item, data, patronNext, 2)
 
-        # next page for pagination
-        if pagination and len(matches) >= pag * pagination:
-            itemlist.append(
-                Item(channel=item.channel,
-                     action = item.action,
-                     contentType=item.contentType,
-                     title=typo(config.get_localized_string(30992), 'color kod bold'),
-                     url=item.url,
-                     args=item.args,
-                     page=pag + 1,
-                     thumbnail=thumb()))
-
-        if action != 'play' and function != 'episodios' and 'patronMenu' not in args:
-            tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-        if anime:
-            from specials import autorenumber
-            if function == 'episodios' or item.action == 'episodios': autorenumber.renumber(itemlist, item, 'bold')
-            else: autorenumber.renumber(itemlist)
-
         if addVideolibrary and (item.infoLabels["title"] or item.fulltitle):
-            # item.fulltitle = item.infoLabels["title"]
-            videolibrary(itemlist, item, function=function)
-        if config.get_setting('downloadenabled') and (function == 'episodios' or function == 'finvideos'):
-            download(itemlist, item, function=function)
+            item.fulltitle = item.infoLabels["title"]
+            videolibrary(itemlist, item)
 
-        if 'patronMenu' in args:
-            itemlist = thumb(itemlist, genre=True)
-
-        if 'fullItemlistHook' in args:
-            itemlist = args['fullItemlistHook'](itemlist)
-        
-        filterLang = False
-        for item in itemlist:
-            if item.contentLanguage:
-                filterLang = True
-                break
-            
-        if list_language and filterLang:
-            log('Lista Lingue = ', list_language)
-            from specials import filtertools
-            return filtertools.get_links(itemlist, item, list_language)
-        else:
-            return itemlist
-
-    return wrapper
+    return itemlist
 
 
 def checkHost(item, itemlist):
     # nel caso non ci siano risultati puo essere che l'utente abbia cambiato manualmente l'host, pertanto lo riporta
-    # al valore di default (fixa anche il problema  del cambio di host da parte nostra)
+    # al valore di default (fixa anche il problema del cambio di host da parte nostra)
     if len(itemlist) == 0:
         # trovo il valore di default
         defHost = None
@@ -464,51 +303,61 @@ def dooplay_get_links(item, host):
     return ret
 
 
-@scrape
 def dooplay_get_episodes(item):
+    itemlist = []
     item.contentType = "episode"
-    patron = '<li class="mark-[0-9]+">.*?<img.*?(?:data-lazy-)?src="(?P<thumb>[^"]+).*?(?P<episode>[0-9]+ - [0-9]+).*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+).*?(?P<year>[0-9]{4})'
-    # debug = True
-    return locals()
+    data = httptools.downloadpage(item.url).data.replace("'", '"')
+    patron = '<li class="mark-[0-9]">.*?<img.*?data-lazy-src="([^"]+).*?([0-9] - [0-9]).*?<a href="([^"]+)">([^<>]+).*?([0-9]{4})'
+
+    for scrapedthumb, scrapedep, scrapedurl, scrapedtitle, scrapedyear in scrapertoolsV2.find_multiple_matches(data, patron):
+        scrapedep = scrapedep.replace(' - ', 'x')
+        infoLabels = {}
+        infoLabels['year'] = scrapedyear
+
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="findvideos",
+                 contentType="episode",
+                 title=scrapedep + " " + scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 show=item.fulltitle,
+                 url=scrapedurl,
+                 thumbnail=scrapedthumb,
+                 infoLabels=infoLabels
+                 )
+        )
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    videolibrary(itemlist, item)
+    return itemlist
 
 
-@scrape
 def dooplay_films(item, blacklist=""):
-    if item.args == 'searchPage':
-        return dooplay_search_vars(item, blacklist)
+    if item.contentType == 'movie':
+        action = 'findvideos'
+        patron = '<article id="post-[0-9]+" class="item movies">.*?<img src="(?!data)([^"]+)".*?<span class="quality">([^<>]+).*?<a href="([^"]+)">([^<>]+)</a></h3>.*?(?:<span>([0-9]{4})</span>|</article>).*?(?:<span>([0-9]+) min</span>|</article>).*?(?:<div class="texto">([^<>]+)|</article>).*?(?:genres">(.*?)</div>|</article>)'
     else:
-        if item.contentType == 'movie':
-            action = 'findvideos'
-            patron = '<article id="post-[0-9]+" class="item movies">.*?<img src="(?!data)(?P<thumb>[^"]+)".*?<span class="quality">(?P<quality>[^<>]+).*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a></h3>.*?(?:<span>[^<>]*(?P<year>[0-9]{4})</span>|</article>).*?(?:<span>(?P<duration>[0-9]+) min</span>|</article>).*?(?:<div class="texto">(?P<plot>[^<>]+)|</article>).*?(?:genres">(?P<genre>.*?)</div>|</article>)'
-        else:
-            action = 'episodios'
-            patron = '<article id="post-[0-9]+" class="item tvshows">.*?<img src="(?!data)(?P<thumb>[^"]+)".*?(?:<span class="quality">(?P<quality>[^<>]+))?.*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a></h3>.*?(?:<span>(?P<year>[0-9]{4})</span>|</article>).*?(?:<div class="texto">(?P<plot>[^<>]+)|</article>).*?(?:genres">(?P<genre>.*?)</div>|</article>)'
-        patronNext = '<div class="pagination">.*?class="current".*?<a href="([^"]+)".*?<div class="resppages">'
-        addVideolibrary = False
+        action = 'episodios'
+        patron = '<article id="post-[0-9]+" class="item tvshows">.*?<img src="(?!data)([^"]+)".*?(?:<span class="quality">([^<>]+))?.*?<a href="([^"]+)">([^<>]+)</a></h3>.*?(?:<span>([0-9]{4})</span>|</article>).*?(?:<span>([0-9]+) min</span>|</article>).*?(?:<div class="texto">([^<>]+)|</article>).*?(?:genres">(.*?)</div>|</article>)'
+    # patronNext = '<a class="arrow_pag" href="([^"]+)"><i id="nextpagination"'
+    patronNext = '<div class="pagination">.*?class="current".*?<a href="([^"]+)".*?<div class="resppages">'
+    itemlist = scrape(item, patron, ['thumb', 'quality', 'url', 'title', 'year', 'duration', 'plot', 'genre'], blacklist=blacklist, patronNext=patronNext, action=action, addVideolibrary=False)
+    if itemlist and 'Successivo' in itemlist[-1].title:
+        itemlist[-1].action = 'peliculas'
 
-        return locals()
+    return itemlist
 
-
-@scrape
+    
 def dooplay_search(item, blacklist=""):
-    return dooplay_search_vars(item, blacklist)
-
-def dooplay_search_vars(item, blacklist):
     if item.contentType == 'movie':
         type = 'movies'
         action = 'findvideos'
     else:
         type = 'tvshows'
         action = 'episodios'
-    patron = '<div class="result-item">.*?<img src="(?P<thumb>[^"]+)".*?<span class="' + type + '">(?P<quality>[^<>]+).*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a>.*?<span class="year">(?P<year>[0-9]{4}).*?<div class="contenido"><p>(?P<plot>[^<>]+)'
+    patron = '<div class="result-item">.*?<img src="([^"]+)".*?<span class="' + type + '">([^<>]+).*?<a href="([^"]+)">([^<>]+)</a>.*?<span class="year">([0-9]{4}).*?<div class="contenido"><p>([^<>]+)'
     patronNext = '<a class="arrow_pag" href="([^"]+)"><i id="nextpagination"'
-    def fullItemlistHook(itemlist):
-        # se è una next page
-        if itemlist[-1].title == typo(config.get_localized_string(30992), 'color kod bold'):
-            itemlist[-1].action = 'peliculas'
-            itemlist[-1].args = 'searchPage'
-        return itemlist
-    return locals()
+    return scrape(item, patron, ['thumb', 'quality', 'url', 'title', 'year', 'plot'], blacklist=blacklist, patronNext=patronNext, action=action)
+
 
 def swzz_get_url(item):
     headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:59.0) Gecko/20100101 Firefox/59.0'}
@@ -549,9 +398,13 @@ def swzz_get_url(item):
     return data
 
 
-def menuItem(itemlist, filename, title='', action='', url='', contentType='movie', args=[]):
+def menu(itemlist, title='', action='', url='', contentType='movie', args=[]):
     # Function to simplify menu creation
 
+    frame = inspect.stack()[1]
+    filename = frame[0].f_code.co_filename
+    filename = os.path.basename(filename).replace('.py','')
+
     # Call typo function
     title = typo(title)
 
@@ -567,98 +420,14 @@ def menuItem(itemlist, filename, title='', action='', url='', contentType='movie
         args = args,
         contentType = contentType
     ))
-   
+
     # Apply auto Thumbnails at the menus
     from channelselector import thumb
     thumb(itemlist)
+
     return itemlist
 
 
-def menu(func):
-    def wrapper(*args):
-        log()
-        args = func(*args)
-
-        item = args['item']
-        host = func.__globals__['host']
-        list_servers = func.__globals__['list_servers']
-        list_quality = func.__globals__['list_quality']
-        filename = func.__module__.split('.')[1]
-
-        # listUrls = ['film', 'filmSub', 'tvshow', 'tvshowSub', 'anime', 'animeSub', 'search', 'top', 'topSub']
-        listUrls = ['top', 'film', 'tvshow', 'anime', 'search']
-        listUrls_extra = []
-        dictUrl = {}
-
-
-        # Main options
-        itemlist = []
-
-        for name in listUrls:
-            dictUrl[name] = args[name] if name in args else None
-            log(dictUrl[name])
-            if name == 'film': title = 'Film'
-            if name == 'tvshow': title = 'Serie TV'
-            if name == 'anime': title = 'Anime'
-
-            if name == 'search' and dictUrl[name] is not None:
-                menuItem(itemlist, filename, 'Cerca… bold', 'search', host + dictUrl['search'])
-
-            # Make TOP MENU
-            elif name == 'top' and dictUrl[name] is not None:
-                for sub, var in dictUrl['top']:
-                    menuItem(itemlist, filename,
-                             title = sub + ' italic bold',
-                             url = host + var[0] if len(var) > 0 else '',
-                             action = var[1] if len(var) > 1 else 'peliculas',
-                             args=var[2] if len(var) > 2 else '',
-                             contentType= var[3] if len(var) > 3 else 'movie',)
-
-            # Make MAIN MENU
-            elif dictUrl[name] is not None:
-                if len(dictUrl[name]) == 0: url = ''
-                else: url = dictUrl[name][0] if type(dictUrl[name][0]) is not tuple and len(dictUrl[name][0]) > 0 else ''
-                menuItem(itemlist, filename,
-                         title + ' bullet bold', 'peliculas',
-                         host + url,
-                         contentType='movie' if name == 'film' else 'tvshow')
-                if len(dictUrl[name]) > 0:
-                    if type(dictUrl[name][0]) is not tuple and type(dictUrl[name]) is not str: dictUrl[name].pop(0)
-                if dictUrl[name] is not None and type(dictUrl[name]) is not str:
-                    for sub, var in dictUrl[name]:
-                        menuItem(itemlist, filename,
-                             title = sub + ' submenu' + typo(title,'_ {}'),
-                             url = host + var[0] if len(var) > 0 else '',
-                             action = var[1] if len(var) > 1 else 'peliculas',
-                             args=var[2] if len(var) > 2 else '',
-                             contentType= var[3] if len(var) > 3 else 'movie' if name == 'film' else 'tvshow',)
-                # add search menu for category
-                if 'search' not in args: menuItem(itemlist, filename, 'Cerca ' + title + '… submenu bold', 'search', host + url, contentType='movie' if name == 'film' else 'tvshow')
-                
-        # Make EXTRA MENU (on bottom)
-        for name, var in args.items():
-            if name not in listUrls and name != 'item':
-               listUrls_extra.append(name)
-        for name in listUrls_extra:
-            dictUrl[name] = args[name] if name in args else None
-            for sub, var in dictUrl[name]:
-                menuItem(itemlist, filename,
-                             title = sub + ' ',
-                             url = host + var[0] if len(var) > 0 else '',
-                             action = var[1] if len(var) > 1 else 'peliculas',
-                             args=var[2] if len(var) > 2 else '',
-                             contentType= var[3] if len(var) > 3 else 'movie',)
-
-
-        autoplay.init(item.channel, list_servers, list_quality)
-        autoplay.show_option(item.channel, itemlist)
-        channel_config(item, itemlist) 
-        
-        return itemlist
-
-    return wrapper
-
-
 def typo(string, typography=''):
 
     kod_color = '0xFF65B3DA' #'0xFF0081C2'
@@ -694,7 +463,7 @@ def typo(string, typography=''):
         if '{}' in string:
             string = '{' + re.sub(r'\s\{\}','',string) + '}'
         if 'submenu' in string:
-            string = u"\u2022\u2022 ".encode('utf-8') + re.sub(r'\ssubmenu','',string)
+            string = ' > ' + re.sub(r'\ssubmenu','',string)
         if 'color' in string:
             color = scrapertoolsV2.find_single_match(string,'color ([a-z]+)')
             if color == 'kod' or '': color = kod_color
@@ -707,25 +476,20 @@ def typo(string, typography=''):
             string = ' ' + re.sub(r'\s_','',string)
         if '--' in string:
             string = ' - ' + re.sub(r'\s--','',string)
-        if 'bullet' in string:
-            string = '[B]' + u"\u2022".encode('utf-8') + '[/B] ' + re.sub(r'\sbullet','',string)
 
     return string
 
 
-def match(item, patron='', patronBlock='', headers='', url='', post=''):
+def match(item, patron='', patron_block='', headers='', url=''):
     matches = []
-    if type(item) == str:
-        data = item
-    else:
-        url = url if url else item.url
-        data = httptools.downloadpage(url, headers=headers, ignore_response_code=True, post=post).data.replace("'", '"')
+    url = url if url else item.url
+    data = httptools.downloadpage(url, headers=headers, ignore_response_code=True).data.replace("'", '"')
     data = re.sub(r'\n|\t', ' ', data)
-    data = re.sub(r'>\s\s*<', '><', data)    
+    data = re.sub(r'>\s\s*<', '><', data)
     log('DATA= ', data)
 
-    if patronBlock:
-        block = scrapertoolsV2.find_single_match(data, patronBlock)
+    if patron_block:
+        block = scrapertoolsV2.find_single_match(data, patron_block)
         log('BLOCK= ',block)
     else:
         block = data
@@ -734,64 +498,13 @@ def match(item, patron='', patronBlock='', headers='', url='', post=''):
         matches = scrapertoolsV2.find_multiple_matches(block, patron)
         log('MATCHES= ',matches)
 
-    return matches, block
+    return matches, data
 
 
-def download(itemlist, item, typography='', function_level=1, function=''):
-    if not typography: typography = 'color kod bold'
-
-    if item.contentType == 'movie':       
-        fromaction = 'findvideos'
-        title = typo(config.get_localized_string(60354), typography)
-    elif item.contentType == 'episode':       
-        fromaction = 'findvideos'
-        title = typo(config.get_localized_string(60356), typography) + ' - ' + item.title
-    else:        
-        fromaction = 'episodios'
-        title = typo(config.get_localized_string(60355), typography)
-
-    function = function if function else inspect.stack()[function_level][3]
-    
-    contentSerieName=item.contentSerieName if item.contentSerieName else ''
-    contentTitle=item.contentTitle if item.contentTitle else ''
-    if item.contentChannel != 'videolibrary':
-        itemlist.append(
-            Item(channel='downloads',
-                fromchannel=item.channel,
-                title=title,
-                fulltitle=item.fulltitle,
-                show=item.fulltitle,
-                contentType=item.contentType,
-                contentSerieName=contentSerieName,
-                url=item.url,
-                action='save_download',
-                fromaction=fromaction,
-                contentTitle=contentTitle
-            ))
-        if fromaction == 'episodios':
-            itemlist.append(
-                Item(channel='downloads',
-                    fromchannel=item.channel,
-                    title=typo(config.get_localized_string(60357),typography),
-                    fulltitle=item.fulltitle,
-                    show=item.fulltitle,
-                    contentType=item.contentType,
-                    contentSerieName=contentSerieName,
-                    url=item.url,
-                    action='save_download',
-                    fromaction=fromaction,
-                    contentTitle=contentTitle,
-                    download='season'
-                ))
-
-    return itemlist
-
-
-def videolibrary(itemlist, item, typography='', function_level=1, function=''):
+def videolibrary(itemlist, item, typography='', function_level=1):
     # Simply add this function to add video library support
     # Function_level is useful if the function is called by another function.
     # If the call is direct, leave it blank
-    log()
 
     if item.contentType == 'movie':
         action = 'add_pelicula_to_library'
@@ -802,29 +515,22 @@ def videolibrary(itemlist, item, typography='', function_level=1, function=''):
         extra = 'episodios'
         contentType = 'tvshow'
 
-    function = function if function else inspect.stack()[function_level][3]
-
     if not typography: typography = 'color kod bold'
 
-    title = typo(config.get_localized_string(30161), typography)
-    contentSerieName=item.contentSerieName if item.contentSerieName else ''
-    contentTitle=item.contentTitle if item.contentTitle else ''
-
-    if (function == 'findvideos' and contentType == 'movie') \
-        or (function == 'episodios' and contentType != 'movie'):
+    title = typo(config.get_localized_string(30161) + ' ' + typography)
+    log('STACK= ',inspect.stack()[function_level][3])
+    if (inspect.stack()[function_level][3] == 'findvideos' and contentType == 'movie') \
+        or (inspect.stack()[function_level][3] == 'episodios' and contentType != 'movie'):
         if config.get_videolibrary_support() and len(itemlist) > 0:
             itemlist.append(
                 Item(channel=item.channel,
-                        title=title,
-                        fulltitle=item.fulltitle,
-                        show=item.fulltitle,
-                        contentType=contentType,
-                        contentSerieName=contentSerieName,
-                        url=item.url,
-                        action=action,
-                        extra=extra,
-                        contentTitle=contentTitle
-                        ))
+                     title=title,
+                     contentType=contentType,
+                     contentSerieName=item.fulltitle if contentType == 'tvshow' else '',
+                     url=item.url,
+                     action=action,
+                     extra=extra,
+                     contentTitle=item.fulltitle))
 
     return itemlist
 
@@ -838,11 +544,10 @@ def nextPage(itemlist, item, data='', patron='', function_level=1, next_page='',
         if resub: next_page = re.sub(resub[0], resub[1], next_page)
         if 'http' not in next_page:
             next_page = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + next_page
-        next_page = re.sub('&amp;', '&',next_page)
         log('NEXT= ', next_page)
         itemlist.append(
             Item(channel=item.channel,
-                 action = item.action,
+                 action=inspect.stack()[function_level][3],
                  contentType=item.contentType,
                  title=typo(config.get_localized_string(30992), 'color kod bold'),
                  url=next_page,
@@ -852,7 +557,7 @@ def nextPage(itemlist, item, data='', patron='', function_level=1, next_page='',
     return itemlist
 
 def pagination(itemlist, item, page, perpage, function_level=1):
-    if len(itemlist) >= page * perpage:
+    if len(itemlist) >= perpage: # page * perpage
         itemlist.append(
             Item(channel=item.channel,
                  action=inspect.stack()[function_level][3],
@@ -874,8 +579,8 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
     itemlist += itemList
     
     for videoitem in itemlist:
-        item.title = item.contentTitle if config.get_localized_string(30161) in item.title else item.title
-        videoitem.title = "".join([item.title, ' ', typo(videoitem.title, 'color kod []'), typo(videoitem.quality, 'color kod []') if videoitem.quality else ""])
+        item.title = typo(item.contentTitle,'bold') if item.contentType == 'movie' else item.title
+        videoitem.title = "".join([item.title, typo(videoitem.title, '_ color kod []'), typo(videoitem.quality, '_ color kod []') if videoitem.quality else ""])
         videoitem.fulltitle = item.fulltitle
         videoitem.show = item.show
         videoitem.thumbnail = item.thumbnail
@@ -915,7 +620,6 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True):
         autoplay.start(itemlist, item)
 
     if item.contentChannel != 'videolibrary': videolibrary(itemlist, item, function_level=3)
-    if get_setting('downloadenabled'): download(itemlist, item, function_level=3)
     return itemlist
 
 
@@ -948,8 +652,3 @@ def channel_config(item, itemlist):
              thumbnail=get_thumb('setting_0.png'))
     )
 
-
-def extract_wrapped(decorated):
-    from types import FunctionType
-    closure = (c.cell_contents for c in decorated.__closure__)
-    return next((c for c in closure if isinstance(c, FunctionType)), None)
\ No newline at end of file
diff --git a/core/videolibrarytools.py b/core/videolibrarytools.py
index c70b62a6..381e1bd5 100644
--- a/core/videolibrarytools.py
+++ b/core/videolibrarytools.py
@@ -203,7 +203,6 @@ def save_movie(item):
             item_nfo.library_urls[item.channel] = item.url
 
             if filetools.write(nfo_path, head_nfo + item_nfo.tojson()):
-                #logger.info("FOLDER_MOVIES : %s" % FOLDER_MOVIES)
                 # actualizamos la videoteca de Kodi con la pelicula
                 if config.is_xbmc():
                     from platformcode import xbmc_videolibrary
@@ -340,7 +339,7 @@ def save_tvshow(item, episodelist):
     '''msg = "Insertados: %d | Sobreescritos: %d | Fallidos: %d | Tiempo: %2.2f segundos" % \
           (insertados, sobreescritos, fallidos, time.time() - start_time)
     logger.debug(msg)'''
-    
+
     return insertados, sobreescritos, fallidos, path
 
 
@@ -398,8 +397,7 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
     channel_alt = generictools.verify_channel(serie.channel)            #Preparamos para añadir las urls de emergencia
     emergency_urls_stat = config.get_setting("emergency_urls", channel_alt)         #El canal quiere urls de emergencia?
     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])
+    channel = __import__('channels.%s' % channel_alt, fromlist=["channels.%s" % channel_alt])
     if serie.torrent_caching_fail:                              #Si el proceso de conversión ha fallado, no se cachean
         emergency_urls_stat = 0
         del serie.torrent_caching_fail
@@ -678,8 +676,7 @@ 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])
             except ImportError:
                 exec "import channels." + item.channel + " as channel"
 
@@ -743,8 +740,7 @@ def emergency_urls(item, channel=None, path=None):
     try:
         if channel == None:                             #Si el llamador no ha aportado la estructura de channel, se crea
             channel = generictools.verify_channel(item.channel)             #Se verifica si es un clon, que devuelva "newpct1"
-            #channel = __import__('channels.%s' % channel, fromlist=["channels.%s" % channel])
-            channel = __import__('specials.%s' % channel_alt, fromlist=["specials.%s" % channel_alt])
+            channel = __import__('channels.%s' % channel, fromlist=["channels.%s" % channel])
         if hasattr(channel, 'findvideos'):                                  #Si el canal tiene "findvideos"...
             item.videolibray_emergency_urls = True                          #... se marca como "lookup"
             channel_save = item.channel                 #... guarda el canal original por si hay fail-over en Newpct1
diff --git a/default.py b/default.py
index f4508aab..26a058fd 100644
--- a/default.py
+++ b/default.py
@@ -10,7 +10,6 @@ import sys
 import xbmc
 from platformcode import config, logger
 
-
 logger.info("init...")
 if os.path.isfile(os.path.join(config.get_data_path(), 'alfavorites-default.json')) == True and os.path.isfile(os.path.join(config.get_data_path(), 'kodfavorites-default.json')) == False:
     os.rename(os.path.join(config.get_data_path(), 'alfavorites-default.json'), os.path.join(config.get_data_path(), 'kodfavorites-default.json'))
@@ -20,7 +19,6 @@ if os.path.isfile(os.path.join(config.get_data_path(), 'alfa_db.sqlite')) == Tru
 librerias = xbmc.translatePath(os.path.join(config.get_runtime_path(), 'lib'))
 sys.path.append(librerias)
 
-
 from platformcode import launcher
 
 if sys.argv[2] == "":
diff --git a/default_channel_settings.json b/default_channel_settings.json
deleted file mode 100644
index 914d5730..00000000
--- a/default_channel_settings.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-	"settings": [
-		{
-		  "id": "include_in_global_search",
-		  "type": "bool",
-		  "label": "@70728",
-		  "default": true,
-		  "enabled": true,
-		  "visible": true
-		},
-		{
-      "id": "include_in_newest_peliculas",
-      "type": "bool",
-      "label": "@70727",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },    
-		{
-				"id": "include_in_newest_series",
-				"type": "bool",
-				"label": "@70727",
-				"default": true,
-				"enabled": true,
-				"visible": true
-		},    
-		{
-				"id": "include_in_newest_anime",
-				"type": "bool",
-				"label": "@70727",
-				"default": true,
-				"enabled": true,
-				"visible": true
-		},
-    {
-      "id": "include_in_newest_italiano",
-      "type": "bool",
-      "label": "@70727",
-      "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 di link da verificare",
-      "default": 2,
-      "enabled": true,
-      "visible": "eq(-1,true)",
-      "lvalues": [ "3", "5", "10", "15", "20" ]
-    },
-    {
-      "id": "filter_languages",
-      "type": "list",
-      "label": "@30019",
-      "default": 0,
-      "enabled": true,
-      "visible": true,
-      "lvalues": ["Non Filtrare"]
-    }
-  ],
-  
-  "anime": [
-    {
-      "id": "autorenumber", 
-      "type": "bool", 
-      "label": "@70712", 
-      "default": false, 
-      "enabled": true, 
-      "visible": true
-    },
-    {
-      "id": "autorenumber_mode",
-      "type": "bool",
-      "label": "@70688",
-      "default": false,
-      "enabled": true,
-      "visible": "eq(-1,true)"
-    }
-  ]
-}
diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index 099769b8..a5d47125 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -37,10 +37,8 @@ def start():
     from specials.checkhost import test_conn
     import threading
     threading.Thread(target=test_conn, args=(True, True, True, [], [], True)).start()
-    # check_adsl = test_conn(is_exit = True, check_dns = True, view_msg = True,
-    #           lst_urls = [], lst_site_check_dns = [], in_addon = True)
 
-    
+
 def run(item=None):
     logger.info()
     if not item:
@@ -60,7 +58,7 @@ def run(item=None):
                         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(30124): 'castellano',
                         config.get_localized_string(59976): 'latino',
                         config.get_localized_string(70171): 'torrent',
                     }
@@ -131,9 +129,7 @@ def run(item=None):
             from core import tmdb
             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)
+
         # Action in certain channel specified in "action" and "channel" parameters
         else:
             # Entry point for a channel is the "mainlist" action, so here we check parental control
@@ -264,11 +260,7 @@ def run(item=None):
                         from specials import search
                         search.save_search(tecleado)
 
-                    if 'search' in dir(channel):
-                        itemlist = channel.search(item, tecleado)
-                    else:
-                        from core import support
-                        itemlist = support.search(channel, item, tecleado)
+                    itemlist = channel.search(item, tecleado)
                 else:
                     return
 
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index 65e312c1..cb927cbe 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -596,7 +596,7 @@ def set_context_commands(item, parent_item):
                                          (sys.argv[0], item.clone(action="add_pelicula_to_library",
                                                                   from_action=item.action).tourl())))
 
-        if item.channel != "downloads" and item.channel != "videolibrary" and downloadenabled != "false":
+        if item.channel != "downloads" and downloadenabled != "false":
             # Descargar pelicula
             if item.contentType == "movie":
                 context_commands.append((config.get_localized_string(60354), "XBMC.RunPlugin(%s?%s)" %
@@ -612,11 +612,6 @@ def set_context_commands(item, parent_item):
                                             (sys.argv[0], item.clone(channel="downloads", action="save_download",
                                                                     from_channel=item.channel,
                                                                     from_action=item.action).tourl())))
-                context_commands.append((config.get_localized_string(60357), "XBMC.RunPlugin(%s?%s)" %
-                                            (sys.argv[0], item.clone(channel="downloads", action="save_download",
-                                                                    from_channel=item.channel,
-                                                                    from_action=item.action,
-                                                                    download='season').tourl())))
 
             # Descargar episodio
             elif item.contentType == 'episode' and item.action in ["findvideos"]:
@@ -627,12 +622,11 @@ def set_context_commands(item, parent_item):
                                                                     from_action=item.action).tourl())))
 
             # Descargar temporada
-            # elif item.contentType == "season":
-            #     context_commands.append((config.get_localized_string(60357), "XBMC.RunPlugin(%s?%s)" %
-            #                                 (sys.argv[0], item.clone(channel="downloads", action="save_download",
-            #                                                         from_channel=item.channel,
-            #                                                         from_action=item.action,
-            #                                                         download='season').tourl())))
+            elif item.contentType == "season":
+                context_commands.append((config.get_localized_string(60357), "XBMC.RunPlugin(%s?%s)" %
+                                            (sys.argv[0], item.clone(channel="downloads", action="save_download",
+                                                                    from_channel=item.channel,
+                                                                    from_action=item.action).tourl())))
 
         # Abrir configuración
         if parent_item.channel not in ["setting", "news", "search"]:
@@ -658,10 +652,6 @@ def set_context_commands(item, parent_item):
                                                                                      action="open_menu",
                                                                                      parent=parent_item.tourl()).tourl(
                                 ))))
-    if config.dev_mode():
-        context_commands.insert(1, ("item info",
-                                    "XBMC.Container.Update (%s?%s)" % (sys.argv[0], Item(action="itemInfo",
-                                                                                parent=item.tojson()).tourl())))
     return context_commands
 
 
diff --git a/platformcode/updater.py b/platformcode/updater.py
index 0ec2e129..9eeabafa 100755
--- a/platformcode/updater.py
+++ b/platformcode/updater.py
@@ -19,7 +19,7 @@ addon = xbmcaddon.Addon('plugin.video.kod')
 _hdr_pat = re.compile("^@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@.*")
 
 branch = 'stable'
-user = 'mac12m99'
+user = 'kodiondemand'
 repo = 'addon'
 addonDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + '/'
 maxPage = 5  # le api restituiscono 30 commit per volta, quindi se si è rimasti troppo indietro c'è bisogno di andare avanti con le pagine
@@ -74,6 +74,9 @@ def check_addon_init():
         for c in reversed(commits[:pos]):
             commit = httptools.downloadpage(c['url']).data
             commitJson = json.loads(commit)
+            # evitiamo di applicare i merge commit
+            if 'Merge' in commitJson['commit']['message']:
+                continue
             logger.info('aggiornando a ' + commitJson['sha'])
             alreadyApplied = True
 
@@ -128,7 +131,7 @@ def check_addon_init():
                                     filetools.mkdir(addonDir + d)
                             filetools.move(addonDir + file['previous_filename'], addonDir + file['filename'])
                             alreadyApplied = False
-            if not alreadyApplied and 'Merge' not in commitJson['commit']['message']: # non mando notifica se già applicata (es. scaricato zip da github) o se è un merge
+            if not alreadyApplied:  # non mando notifica se già applicata (es. scaricato zip da github)
                 changelog += commitJson['commit']['message'] + " | "
                 nCommitApplied += 1
         if addon.getSetting("addon_update_message"):
diff --git a/resources/media/channels/banner/altadefinizione01link.png b/resources/media/channels/banner/altadefinizione01link.png
deleted file mode 100644
index 35a64397..00000000
Binary files a/resources/media/channels/banner/altadefinizione01link.png and /dev/null differ
diff --git a/resources/media/channels/banner/animeforce.png b/resources/media/channels/banner/animeforce.png
deleted file mode 100644
index 0a6c312f..00000000
Binary files a/resources/media/channels/banner/animeforce.png and /dev/null differ
diff --git a/resources/media/channels/banner/animesubita.png b/resources/media/channels/banner/animesubita.png
deleted file mode 100644
index b62bf2bf..00000000
Binary files a/resources/media/channels/banner/animesubita.png and /dev/null differ
diff --git a/resources/media/channels/banner/eurostreaming.png b/resources/media/channels/banner/eurostreaming.png
deleted file mode 100644
index 0a3bb144..00000000
Binary files a/resources/media/channels/banner/eurostreaming.png and /dev/null differ
diff --git a/resources/media/channels/thumb/animeforce.png b/resources/media/channels/thumb/animeforce.png
deleted file mode 100644
index 5016d5bc..00000000
Binary files a/resources/media/channels/thumb/animeforce.png and /dev/null differ
diff --git a/resources/media/channels/thumb/animesubita.png b/resources/media/channels/thumb/animesubita.png
deleted file mode 100644
index 63115262..00000000
Binary files a/resources/media/channels/thumb/animesubita.png and /dev/null differ
diff --git a/resources/media/channels/thumb/eurostreaming.png b/resources/media/channels/thumb/eurostreaming.png
deleted file mode 100644
index 2ca40328..00000000
Binary files a/resources/media/channels/thumb/eurostreaming.png and /dev/null differ
diff --git a/resources/settings.xml b/resources/settings.xml
index 84bbad87..678b9ea6 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -62,7 +62,7 @@
         <setting id="news_start" type="bool" label="70123" default="false" visible="eq(-2,True)"
                  enable="eq(-1,False)+eq(-2,True"/>
          <setting id="category" type="labelenum" label="70124"
-                 lvalues="70137|30123|30124|60513"
+                 lvalues="70137|30123|30124|70018|60513|70013|70014|59976|70171"
                  default="70137" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/>
    </category>
     <category label="70126">
diff --git a/servers/debriders/realdebrid.py b/servers/debriders/realdebrid.py
index 97b516e1..63e50662 100644
--- a/servers/debriders/realdebrid.py
+++ b/servers/debriders/realdebrid.py
@@ -127,7 +127,7 @@ def authentication():
         # Se solicita el token de acceso y el de actualización para cuando el primero caduque
         post = urllib.urlencode({"client_id": debrid_id, "client_secret": secret, "code": device_code,
                                  "grant_type": "http://oauth.net/grant_type/device/1.0"})
-        data = htttools.downloadpage("https://api.real-debrid.com/oauth/v2/token", post=post,
+        data = httptools.downloadpage("https://api.real-debrid.com/oauth/v2/token", post=post,
                                          headers=headers.items()).data
         data = jsontools.load(data)
 
diff --git a/servers/netutv.py b/servers/netutv.py
index 3204df2f..116f5ce0 100644
--- a/servers/netutv.py
+++ b/servers/netutv.py
@@ -35,17 +35,15 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     page_url = page_url.replace('https://waaw.tv/', 'http://hqq.watch/')
 
     data = httptools.downloadpage(page_url).data
-    logger.debug(data)
+    # ~ logger.debug(data)
 
-    # js_wise = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>\s*;?(eval.*?)</script>")
-    js_wise = scrapertools.find_single_match(data, "<script>\s*;(eval.*?)\s*</script>")
-    logger.info('JS_WISE= '+ js_wise)
+    js_wise = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>\s*;?(eval.*?)</script>")
     data = jswise(js_wise).replace("\\", "")
-    logger.debug(data)
+    # ~ logger.debug(data)
 
     alea = str(random.random())[2:]
     data_ip = httptools.downloadpage('http://hqq.watch/player/ip.php?type=json&rand=%s' % alea).data
-    logger.debug(data_ip)
+    # ~ logger.debug(data_ip)
     json_data_ip = jsontools.load(data_ip)
 
     url = scrapertools.find_single_match(data, 'self\.location\.replace\("([^)]+)\)')
@@ -53,15 +51,14 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     url = url.replace('"+data.ip+"', json_data_ip['ip'])
     url = url.replace('"+need_captcha+"', '0') #json_data_ip['need_captcha'])
     url = url.replace('"+token', '')
-    # logger.info('URL= '+url)
-    # logger.debug(url)
+    # ~ logger.debug(url)
 
     headers = { "User-Agent": 'Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/533.4 (KHTML, like Gecko) Chrome/5.0.375.127 Large Screen Safari/533.4 GoogleTV/162671' }
     data = httptools.downloadpage('http://hqq.watch'+url, headers=headers).data
-    # logger.debug(data)
+    # ~ logger.debug(data)
     
     codigo_js = scrapertools.find_multiple_matches(data, '<script>document.write\(unescape\("([^"]+)')
-    # logger.debug(codigo_js)
+    # ~ logger.debug(codigo_js)
     
     js_aux = urllib.unquote(codigo_js[0])
     at = scrapertools.find_single_match(js_aux, 'var at = "([^"]+)')
diff --git a/specials/autoplay.py b/specials/autoplay.py
index 8defa70b..451f18e3 100644
--- a/specials/autoplay.py
+++ b/specials/autoplay.py
@@ -16,8 +16,6 @@ PLAYED = False
 
 autoplay_node = {}
 
-colorKOD = '0xFF65B3DA'
-
 
 def context():
     '''
@@ -38,7 +36,7 @@ def context():
 context = context()
 
 
-def show_option(channel, itemlist, text_color=colorKOD, thumbnail=None, fanart=None):
+def show_option(channel, itemlist, text_color='yellow', thumbnail=None, fanart=None):
     '''
     Agrega la opcion Configurar AutoPlay en la lista recibida
 
@@ -56,8 +54,8 @@ def show_option(channel, itemlist, text_color=colorKOD, thumbnail=None, fanart=N
 
     if thumbnail == None:
         thumbnail = get_thumb('autoplay.png')
-    # if fanart == None:
-    #     fanart = get_thumb('autoplay.png')
+    if fanart == None:
+        fanart = get_thumb('autoplay.png')
 
     plot_autoplay = config.get_localized_string(60399)
     itemlist.append(
@@ -65,12 +63,10 @@ def show_option(channel, itemlist, text_color=colorKOD, thumbnail=None, fanart=N
              title=config.get_localized_string(60071),
              action="autoplay_config",
              text_color=text_color,
-             text_bold=True,
              thumbnail=thumbnail,
-            #  fanart=fanart,
+             fanart=fanart,
              plot=plot_autoplay,
-             from_channel=channel,
-             folder=False
+             from_channel=channel
              ))
     return itemlist
 
@@ -645,7 +641,7 @@ def get_languages(channel):
     :return: list
     '''
     logger.info()
-    list_language = ['Non filtrare']
+    list_language = ['No filtrar']
     list_controls, dict_settings = channeltools.get_channel_controls_settings(channel)
     for control in list_controls:
         try:
diff --git a/specials/autorenumber.py b/specials/autorenumber.py
index 36f233c9..1bdc5339 100644
--- a/specials/autorenumber.py
+++ b/specials/autorenumber.py
@@ -192,8 +192,6 @@ def config_item(item, itemlist=[], typography='', active=False):
 
 def renumber(itemlist, item='', typography=''):
     log()
-    if 'fromchannel' in item:
-        item.channel = item.fromchannel if item.fromchannel else item.channel
     # Seleziona la funzione Adatta, Menu Contestuale o Rinumerazione
     if item:
         settings_node = jsontools.get_node_from_file(item.channel, 'settings')
@@ -261,7 +259,7 @@ def renumeration (itemlist, item, typography, dict_series, ID, SEASON, EPISODE,
             return error(itemlist)
         if len(EpisodeDict) >= len(itemlist):
             for item in itemlist:
-                number = scrapertoolsV2.find_single_match(item.title, r'\d+').lstrip("0")
+                number = scrapertoolsV2.find_single_match(item.title, r'\d+')
                 item.title = typo(EpisodeDict[str(number)] + ' - ', typography) + item.title
         else:
             make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE) 
@@ -270,7 +268,6 @@ def renumeration (itemlist, item, typography, dict_series, ID, SEASON, EPISODE,
         make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE)
 
 def make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE):
-    from core import support
     log()
     page = 1
     EpList = []
@@ -327,7 +324,6 @@ def make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE
         for item in itemlist:
             # Otiene Numerazione Episodi
             episode = int(scrapertoolsV2.find_single_match(item.title, r'\d+'))
-            log('EPISODE= ',episode)
             number = episode + FirstOfSeason - addiction
             count = number + addiction
             # find = episode + FirstOfSeason
diff --git a/specials/downloads.py b/specials/downloads.py
index d39d1ab7..0673d1d6 100644
--- a/specials/downloads.py
+++ b/specials/downloads.py
@@ -8,13 +8,11 @@ import re
 import time
 import unicodedata
 
-
 from core import filetools, jsontools, scraper, scrapertools, servertools, videolibrarytools, support
 from core.downloader import Downloader
 from core.item import Item
 from platformcode import config, logger
 from platformcode import platformtools
-from core.support import log
 
 STATUS_COLORS = {0: "orange", 1: "orange", 2: "green", 3: "red"}
 STATUS_CODES = type("StatusCode", (), {"stoped": 0, "canceled": 1, "completed": 2, "error": 3})
@@ -22,9 +20,6 @@ DOWNLOAD_LIST_PATH = config.get_setting("downloadlistpath")
 DOWNLOAD_PATH = config.get_setting("downloadpath")
 STATS_FILE = os.path.join(config.get_data_path(), "servers.json")
 
-FOLDER_MOVIES = config.get_setting("folder_movies")
-FOLDER_TVSHOWS = config.get_setting("folder_tvshows")
-
 TITLE_FILE = "[COLOR %s][%i%%][/COLOR] %s"
 TITLE_TVSHOW = "[COLOR %s][%i%%][/COLOR] %s [%s]"
 
@@ -267,20 +262,10 @@ def menu(item):
 
 
 def move_to_libray(item):
-    if item.contentType == 'movie':
-        FOLDER = FOLDER_MOVIES
-        path_title = "%s [%s]" % (item.contentTitle.strip(), item.infoLabels['IMDBNumber'])
-        move_path = filetools.join(config.get_videolibrary_path(), FOLDER, path_title)
-        
-    else:
-        FOLDER = FOLDER_TVSHOWS
-        path_title = "%s [%s]" % (item.contentSerieName, item.infoLabels['IMDBNumber'])
-        move_path = filetools.join(config.get_videolibrary_path(), FOLDER)
-
     download_path = filetools.join(config.get_setting("downloadpath"), item.downloadFilename)
-    library_path = filetools.join(move_path, *filetools.split(item.downloadFilename))
+    library_path = filetools.join(config.get_videolibrary_path(), *filetools.split(item.downloadFilename))
     final_path = download_path
-    
+
     if config.get_setting("library_add", "downloads") == True and config.get_setting("library_move", "downloads") == True:
         if not filetools.isdir(filetools.dirname(library_path)):
             filetools.mkdir(filetools.dirname(library_path))
@@ -294,35 +279,8 @@ def move_to_libray(item):
 
             if len(filetools.listdir(filetools.dirname(download_path))) == 0:
                 filetools.rmdir(filetools.dirname(download_path))
-        
-        
-        logger.info('ITEM = ' + str(item))
-        name = item.contentTitle if item.contentType == 'movie' else str(item.infoLabels['season']) + 'x' + str(item.infoLabels['episode']).zfill(2)
-        list_item = os.listdir(filetools.join(config.get_videolibrary_path(), FOLDER, path_title))
-                
-        clean = False
-        for File in list_item:
-            filename = File.lower()
-            name = name.lower()
-            if filename.startswith(name) and (filename.endswith('.strm') or filename.endswith('.json') or filename.endswith('.nfo')):
-                clean = True
-                logger.info('Delete File: ' + str(os.path.join(config.get_videolibrary_path(), FOLDER, path_title, File)))
-                os.remove(os.path.join(config.get_videolibrary_path(), FOLDER, path_title, File))
-        from platformcode import xbmc_videolibrary
-        
-        xbmc_videolibrary.update(FOLDER)
-        if clean == True:
-            import xbmc
-            while xbmc.getCondVisibility('Library.IsScanningVideo()'):
-                xbmc.sleep(500)
-            xbmc_videolibrary.clean()
-        
-        
-                    
-            
-        
 
-    if config.get_setting("library_add", "downloads") == True and config.get_setting("library_move", "downloads") == False:
+    if config.get_setting("library_add", "downloads") == True:
         if filetools.isfile(final_path):
             if item.contentType == "movie" and item.infoLabels["tmdb_id"]:
                 library_item = Item(title=config.get_localized_string(70228) % item.downloadFilename, channel="downloads",
@@ -335,7 +293,7 @@ def move_to_libray(item):
                 tvshow = Item(channel="downloads", contentType="tvshow",
                               infoLabels={"tmdb_id": item.infoLabels["tmdb_id"]})
                 videolibrarytools.save_tvshow(tvshow, [library_item])
-            
+
 
 def update_json(path, params):
     item = Item().fromjson(filetools.read(path))
@@ -681,8 +639,6 @@ def select_server(item):
             "downloadServer": {"url": play_items[seleccion - 1].url, "server": play_items[seleccion - 1].server}})
     elif seleccion == 0:
         update_json(item.path, {"downloadServer": {}})
-    if seleccion == 0:
-        update_json(item.path, {"downloadServer": {}})
 
     platformtools.itemlist_refresh()
 
@@ -712,11 +668,6 @@ def start_download(item):
 def get_episodes(item):
     logger.info("contentAction: %s | contentChannel: %s | contentType: %s" % (
         item.contentAction, item.contentChannel, item.contentType))
-    if 'dlseason' in item:
-        season = True
-        season_number = item.dlseason
-    else: 
-        season = False
         
             # El item que pretendemos descargar YA es un episodio
     if item.contentType == "episode":
@@ -763,43 +714,14 @@ def get_episodes(item):
 
             # Episodio, Temporada y Titulo
             if not episode.contentTitle:
-                episode.contentTitle = re.sub(r"\[[^\]]+\]|\([^\)]+\)|\d*x\d*\s*-", "", episode.title).strip()
+                episode.contentTitle = re.sub("\[[^\]]+\]|\([^\)]+\)|\d*x\d*\s*-", "", episode.title).strip()
 
             episode.downloadFilename = filetools.validate_path(os.path.join(item.downloadFilename, "%dx%0.2d - %s" % (
                 episode.contentSeason, episode.contentEpisodeNumber, episode.contentTitle.strip())))
-            if season:
-                log('SEASON= ',season)
-                log(int(scrapertools.find_single_match(episode.title, r'(\d+)x')))
-                log(season_number,' ',type(season_number))
-                if scrapertools.find_single_match(episode.title, r'(\d+)x') == season_number:
-                    itemlist.append(episode)
-            else:
-                itemlist.append(episode)
+            itemlist.append(episode)
         # Cualquier otro resultado no nos vale, lo ignoramos
         else:
             logger.info("Omitting invalid item: %s" % episode.tostring())
-    
-    # if Multiple Languages or Qualities
-    list_lang = []
-    list_quality = []
-    for item in itemlist:
-        if not item.language: item.language = item.contentLanguage
-        if item.language not in list_lang: list_lang.append(item.language)
-        if item.infoLabels['quality'] not in list_quality: list_quality.append(item.infoLabels['quality'])
-    if len(list_lang) > 1:        
-        selection = platformtools.dialog_select(config.get_localized_string(70725),list_lang)
-        it = []
-        for item in itemlist:
-            if not item.language: item.language = item.contentLanguage
-            if item.language == list_lang[selection]:
-                it.append(item)            
-        itemlist = it
-    if len(list_quality) > 1:
-        selection = platformtools.dialog_select(config.get_localized_string(70726),list_quality)
-        it = []
-        for item in itemlist:
-            if item.infoLabels['quality'] == list_quality[selection]: it.append(item)
-        itemlist = it
 
     return itemlist
 
@@ -837,17 +759,11 @@ def save_download(item):
         del item.from_action
         del item.from_channel
 
-    item.contentChannel = item.fromchannel if item.fromchannel else item.channel
-    item.contentAction = item.fromaction if item.fromaction else item.action
+    item.contentChannel = item.channel
+    item.contentAction = item.action
 
     if item.contentType in ["tvshow", "episode", "season"]:
-        if 'download' in item:
-            heading = config.get_localized_string(70594) # <- Enter the season number
-            item.dlseason = platformtools.dialog_numeric(0, heading, '')
-            if item.dlseason:
-                save_download_tvshow(item)
-        else:
-            save_download_tvshow(item)
+        save_download_tvshow(item)
 
     elif item.contentType == "movie":
         save_download_movie(item)
@@ -888,7 +804,7 @@ def save_download_movie(item):
 
     progreso.update(0, config.get_localized_string(60062))
 
-    item.downloadFilename = filetools.validate_path("%s [%s] [%s]" % (item.contentTitle.strip(), item.contentChannel, item.infoLabels['IMDBNumber']))
+    item.downloadFilename = filetools.validate_path("%s [%s]" % (item.contentTitle.strip(), item.contentChannel))
 
     write_json(item)
 
@@ -909,11 +825,9 @@ def save_download_tvshow(item):
 
     item.show = item.fulltitle
     scraper.find_and_set_infoLabels(item)
-    item.contentSerieName = item.fulltitle
-    
-    item.downloadFilename = filetools.validate_path("%s [%s]" % (item.contentSerieName, item.infoLabels['IMDBNumber']))
-    if config.get_setting("lowerize_title", "videolibrary") == 0:
-        item.downloadFilename = item.downloadFilename.lower()
+
+    item.downloadFilename = filetools.validate_path("%s [%s]" % (item.contentSerieName, item.contentChannel))
+
     progreso.update(0, config.get_localized_string(70186), config.get_localized_string(70187) % item.contentChannel)
 
     episodes = get_episodes(item)
@@ -928,7 +842,7 @@ def save_download_tvshow(item):
 
     if not platformtools.dialog_yesno(config.get_localized_string(30101), config.get_localized_string(70189)):
         platformtools.dialog_ok(config.get_localized_string(30101),
-                                str(len(episodes)) + config.get_localized_string(30110) + item.contentSerieName,
+                                str(len(episodes)) + " capitulos de: " + item.contentSerieName,
                                 config.get_localized_string(30109))
     else:
         for i in episodes:
diff --git a/specials/favorites.py b/specials/favorites.py
index f12e7944..38a997bd 100644
--- a/specials/favorites.py
+++ b/specials/favorites.py
@@ -49,7 +49,7 @@ def mainlist(item):
                                   "action": "delFavourite",
                                   "channel": "favorites",
                                   "from_title": item.title},
-                                 {"title": config.get_localized_string(70278), # Rename
+                                 {"title": "Renombrar",
                                   "action": "renameFavourite",
                                   "channel": "favorites",
                                   "from_title": item.title}
diff --git a/specials/filtertools.py b/specials/filtertools.py
index 931e9b06..df4f4c8d 100644
--- a/specials/filtertools.py
+++ b/specials/filtertools.py
@@ -163,8 +163,6 @@ def load(item):
 
 
 def check_conditions(_filter, list_item, item, list_language, list_quality, quality_count=0, language_count=0):
-    if not item.language: item.language = item.contentLanguage 
-    
     is_language_valid = True
     if _filter.language:
         # logger.debug("title es %s" % item.title)
diff --git a/specials/news.py b/specials/news.py
index 30271664..734ddef1 100644
--- a/specials/news.py
+++ b/specials/news.py
@@ -28,8 +28,8 @@ perfil = [['0xFF0B7B92', '0xFF89FDFB', '0xFFACD5D4'],
           ['0xFFA5DEE5', '0xFFE0F9B5', '0xFFFEFDCA'],
           ['0xFFF23557', '0xFF22B2DA', '0xFFF0D43A']]
 
-color1, color2, color3 = ["white", "white", "white"]
-# color1, color2, color3 = perfil[__perfil__]
+#color1, color2, color3 = ["white", "white", "white"]
+color1, color2, color3 = perfil[__perfil__]
 
 list_newest = []
 list_newest_tourl = []
diff --git a/specials/search.py b/specials/search.py
index 985e6f0d..6369f390 100644
--- a/specials/search.py
+++ b/specials/search.py
@@ -15,7 +15,6 @@ from core import tmdb
 from core.item import Item
 from platformcode import config, logger
 from platformcode import platformtools
-from core.support import typo
 
 addon = xbmcaddon.Addon('metadata.themoviedb.org')
 def_lang = addon.getSetting('language')
@@ -720,7 +719,7 @@ def discover_list(item):
         #if not 'similar' in item.list_type:
         #    itemlist.append(item.clone(title='Pagina Siguente', page=next_page))
         #else:
-        itemlist.append(Item(channel=item.channel, action='discover_list', title=typo(config.get_localized_string(30992), 'color kod bold'),
+        itemlist.append(Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70065),
                              search_type=item.search_type, list_type=item.list_type, type=item.type, page=next_page))
 
     return itemlist
diff --git a/specials/videolibrary.py b/specials/videolibrary.py
index 48b78cca..1eac3030 100644
--- a/specials/videolibrary.py
+++ b/specials/videolibrary.py
@@ -68,7 +68,7 @@ def list_movies(item, silent=False):
                     canal = generictools.verify_channel(canal_org)
                     try:
                         channel_verify = __import__('channels.%s' % canal, fromlist=["channels.%s" % canal])
-                        logger.debug('Channel %s seems correct' % channel_verify)
+                        logger.debug('El canal %s parece correcto' % channel_verify)
                     except:
                         dead_item = Item(multicanal=multicanal,
                                          contentType='movie',
@@ -78,9 +78,9 @@ def list_movies(item, silent=False):
                                          library_urls=new_item.library_urls,
                                          infoLabels={'title': new_item.contentTitle})
                         if canal not in dead_list and canal not in zombie_list:
-                            confirm = platformtools.dialog_yesno(config.get_localized_string(30131),
-                                                                 config.get_localized_string(30132) % canal.upper(),
-                                                                 config.get_localized_string(30133))
+                            confirm = platformtools.dialog_yesno('Videoteca',
+                                                                 'Parece que el canal [COLOR red]%s[/COLOR] ya no existe.' % canal.upper(),
+                                                                 'Deseas eliminar los enlaces de este canal?')
 
                         elif canal in zombie_list:
                             confirm = False
@@ -198,9 +198,9 @@ def list_tvshows(item):
                                          library_urls=item_tvshow.library_urls,
                                          infoLabels={'title': item_tvshow.contentTitle})
                         if canal not in dead_list and canal not in zombie_list:
-                            confirm = platformtools.dialog_yesno(config.get_localized_string(30131),
-                                                                 config.get_localized_string(30132) % canal.upper(),
-                                                                 config.get_localized_string(30133))
+                            confirm = platformtools.dialog_yesno('Videoteca',
+                                                                 'Parece que el canal [COLOR red]%s[/COLOR] ya no existe.' % canal.upper(),
+                                                                 'Deseas eliminar los enlaces de este canal?')
 
                         elif canal in zombie_list:
                             confirm = False
@@ -238,7 +238,7 @@ def list_tvshows(item):
                         contador = 1
                 
                 except:
-                    logger.error('Not find: ' + str(tvshow_path))
+                    logger.error('No encuentra: ' + str(tvshow_path))
                     logger.error(traceback.format_exc())
                     continue
 
@@ -435,7 +435,7 @@ def findvideos(item):
     autoplay.set_status(False)
 
     if not item.contentTitle or not item.strm_path:
-        logger.debug("Unable to search for videos due to lack of parameters")
+        logger.debug("No se pueden buscar videos por falta de parametros")
         return []
 
     content_title = filter(lambda c: c not in ":*?<>|\/", item.contentTitle.strip().lower())
@@ -533,7 +533,7 @@ def findvideos(item):
                 from core import servertools
                 list_servers = servertools.find_video_items(item_json)
         except Exception, ex:
-            logger.error("The findvideos function for the channel %s failed" % nom_canal)
+            logger.error("Ha fallado la funcion findvideos para el canal %s" % nom_canal)
             template = "An exception of type %s occured. Arguments:\n%r"
             message = template % (type(ex).__name__, ex.args)
             logger.error(message)
@@ -623,7 +623,7 @@ def update_videolibrary(item):
                 break
 
         if ficheros and not strm:
-            logger.debug("Deleting deleted movie folder: %s" % raiz)
+            logger.debug("Borrando carpeta de pelicula eliminada: %s" % raiz)
             filetools.rmdirtree(raiz)
 
 
@@ -668,7 +668,7 @@ def verify_playcount_series(item, path):
         nfo_path = filetools.join(path, "tvshow.nfo")
         head_nfo, it = videolibrarytools.read_nfo(nfo_path)                         #Obtenemos el .nfo de la Serie
         if not hasattr(it, 'library_playcounts') or not it.library_playcounts:      #Si el .nfo no tiene library_playcounts se lo creamos
-            logger.error('** It does not have PlayCount')
+            logger.error('** No tiene PlayCount')
             it.library_playcounts = {}
         
         # Obtenemos los archivos de los episodios
@@ -879,7 +879,7 @@ def delete(item):
             from platformcode import xbmc_videolibrary
             xbmc_videolibrary.clean()
 
-        logger.info("All links removed")
+        logger.info("Eliminados todos los enlaces")
         platformtools.itemlist_refresh()
 
     # logger.info(item.contentTitle)