diff --git a/cuevana3.json b/cuevana3.json
new file mode 100644
index 00000000..97c0d751
--- /dev/null
+++ b/cuevana3.json
@@ -0,0 +1,69 @@
+{
+  "id": "cuevana3",
+  "name": "Cuevana 3",
+  "active": true,
+  "adult": false,
+  "language": ["lat", "cast"],
+  "thumbnail": "https://www.cuevana3.co/wp-content/themes/cuevana3/public/img/cnt/cuevana3.png",
+  "banner": "",
+  "version": 1,
+  "categories": [
+    "movie"
+  ],
+  "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": false,
+      "visible": false
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "LAT",
+        "CAST",
+        "VOSE"
+      ]
+    },
+    {
+      "id": "include_in_newest_peliculas",
+      "type": "bool",
+      "label": "Incluir en Novedades - Peliculas",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_infantiles",
+      "type": "bool",
+      "label": "Incluir en Novedades - Infantiles",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_terror",
+      "type": "bool",
+      "label": "Incluir en Novedades - Terror",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_documentales",
+      "type": "bool",
+      "label": "Incluir en Novedades - Documentales",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
+  ]
+}
diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml
index e8bda9ea..9f4ebb95 100755
--- a/plugin.video.alfa/addon.xml
+++ b/plugin.video.alfa/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.alfa" name="Alfa" version="2.7.21" provider-name="Alfa Addon">
+<addon id="plugin.video.alfa" name="Alfa" version="2.7.31" provider-name="Alfa Addon">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.libtorrent" optional="true"/>
@@ -18,13 +18,15 @@
       <screenshot>resources/media/themes/ss/4.jpg</screenshot>
     </assets>
       <news>[B]Estos son los cambios para esta versión:[/B]
-      [COLOR green][B]Arreglos[/B][/COLOR] 
-      ¤ Grantorrent                     ¤ Zonatorrent                ¤ pack +18
-      ¤ erotik                                 ¤ pelis24                        ¤ cineasiaenlinea
-      ¤ pelisgratis                        ¤ repelis                         ¤ descargacineclasico
-      ¤ Goovie                              ¤ PelisFox                       ¤ PelisPlus
-      ¤ TvSeriesDk                       ¤ UqLoad                       ¤ Vi2
-      ¤ gnula.biz
+      [COLOR green][B]Arreglos[/B][/COLOR]
+      ¤ maxipelis24                  ¤ cuevana3             ¤ pelisplusco
+      ¤ mejortorrent                 ¤ newpct1     
+ 
+      [COLOR green][B]Novedades[/B][/COLOR]
+      ¤ Mundopelis                  ¤ thevideobee             ¤ tusfiles
+      ¤ vup
+
+      ¤ Agradecimientos a @mac12m99 y @chivmalev por colaborar con ésta versión
       
     </news>
     <description lang="es">Navega con Kodi por páginas web para ver sus videos de manera fácil.</description>
diff --git a/plugin.video.alfa/channels/LIKUOO.py b/plugin.video.alfa/channels/LIKUOO.py
index 20925e3c..2ca05d84 100644
--- a/plugin.video.alfa/channels/LIKUOO.py
+++ b/plugin.video.alfa/channels/LIKUOO.py
@@ -7,8 +7,6 @@ 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
 
 host = 'http://www.likuoo.video'
 
@@ -16,7 +14,8 @@ host = 'http://www.likuoo.video'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host))
+    itemlist.append( Item(channel=item.channel, title="Pornstar" , action="categorias", url=host + "/pornstars/"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/all-channels/"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
@@ -27,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -46,16 +45,24 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = "https:" + scrapedthumbnail
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'...<a href="([^"]+)" class="next">&#187;</a>')
+    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) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="item">.*?<a href="([^"]+)" title="(.*?)">.*?src="(.*?)".*?<div class="runtime">(.*?)</div>'
+    patron = '<div class="item">.*?'
+    patron += '<a href="([^"]+)" title="(.*?)">.*?'
+    patron += 'src="(.*?)".*?'
+    patron += '<div class="runtime">(.*?)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
@@ -64,12 +71,12 @@ def peliculas(item):
         contentTitle = title
         thumbnail = "https:" + scrapedthumbnail
         plot = ""
-        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 href="([^"]+)" class="next">&#187;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                              plot=plot, contentTitle = contentTitle))
+    next_page = scrapertools.find_single_match(data,'...<a href="([^"]+)" class="next">&#187;</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
 
 
diff --git a/plugin.video.alfa/channels/TXXX.py b/plugin.video.alfa/channels/TXXX.py
index 3ade3fb3..5755703b 100644
--- a/plugin.video.alfa/channels/TXXX.py
+++ b/plugin.video.alfa/channels/TXXX.py
@@ -2,14 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://www.txxx.com'
 
@@ -17,10 +14,10 @@ host = 'http://www.txxx.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimas" , action="peliculas", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="peliculas", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="peliculas", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels-list/"))
+    itemlist.append( Item(channel=item.channel, title="Ultimas" , action="lista", url=host + "/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="lista", url=host + "/top-rated/"))
+    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="lista", url=host + "/most-popular/"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels-list/most-popular/"))
     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
@@ -31,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -44,19 +41,22 @@ def catalogo(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="channel-thumb">.*?<a href="([^"]+)" title="([^"]+)".*?<img src="([^"]+)".*?<span>(.*?)</span>'
+    patron = '<div class="channel-thumb">.*?'
+    patron += '<a href="([^"]+)" title="([^"]+)".*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<span>(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,num in matches:
         scrapedplot = ""
         scrapedurl = host + scrapedurl
         title = scrapedtitle + "[COLOR yellow]  " + num + "[/COLOR]"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=scrapedurl , 
-                        thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next" href="([^"]+)" title="Next Page"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel, action="lista", title=title , url=scrapedurl , 
+                        thumbnail=scrapedthumbnail , plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next" href="([^"]+)" title="Next Page"')
+    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_url , folder=True) )
+                        text_color="blue", url=next_page) )
     return itemlist
 
 
@@ -73,33 +73,36 @@ def categorias(item):
         scrapedthumbnail = ""
         scrapedplot = ""
         title = scrapedtitle + "[COLOR yellow]  " + num + "[/COLOR]"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=url , 
-                        thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=title , url=url , 
+                        thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = 'data-video-id="\d+">.*?<a href="([^"]+)".*?'
     patron += '<img src="([^"]+)" alt="([^"]+)".*?'
-    patron += '<span class="thumb__duration">(.*?)</span>'
+    patron += '</div>(.*?)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,time in matches:
+    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
         contentTitle = scrapedtitle
-        title = "[COLOR yellow]" + time + "  [/COLOR]" + scrapedtitle
+        scrapedhd = scrapertools.find_single_match(scrapedtime, '<span class="thumb__hd">(.*?)</span>')
+        duration = scrapertools.find_single_match(scrapedtime, '<span class="thumb__duration">(.*?)</span>')
+        if scrapedhd != '':
+            title = "[COLOR yellow]" +duration+ "[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
+        else:
+            title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
         itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, 
-                        plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next" href="([^"]+)" title="Next Page"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+                        plot=plot, contentTitle=title) )
+    next_page = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next.*?" href="([^"]+)" title="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
 
 
diff --git a/plugin.video.alfa/channels/absoluporn.py b/plugin.video.alfa/channels/absoluporn.py
index aea514f6..2832859d 100644
--- a/plugin.video.alfa/channels/absoluporn.py
+++ b/plugin.video.alfa/channels/absoluporn.py
@@ -7,9 +7,6 @@ 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
-
 
 host = 'http://www.absoluporn.es'
 
@@ -18,10 +15,10 @@ def mainlist(item):
     logger.info()
     itemlist = []
 
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/wall-date-1.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas valorados" , action="peliculas", url=host + "/wall-note-1.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="peliculas", url=host + "/wall-main-1.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas largos" , action="peliculas", url=host + "/wall-time-1.html"))
+    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/wall-date-1.html"))
+    itemlist.append( Item(channel=item.channel, title="Mas valorados" , action="lista", url=host + "/wall-note-1.html"))
+    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/wall-main-1.html"))
+    itemlist.append( Item(channel=item.channel, title="Mas largos" , action="lista", url=host + "/wall-time-1.html"))
 
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
@@ -33,7 +30,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search-%s-1.html" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -52,12 +49,12 @@ def categorias(item):
         scrapedthumbnail = ""
         scrapedurl = scrapedurl.replace(".html", "_date.html")
         scrapedurl = host +"/" + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail , plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -72,14 +69,13 @@ def peliculas(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,
-                              contentTitle = title, infoLabels={'year':year} ))
+                              contentTitle = scrapedtitle))
     next_page = scrapertools.find_single_match(data, '<span class="text16">\d+</span> <a href="..([^"]+)"')
     if next_page:
         next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>", text_color="blue", 
-                              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/plugin.video.alfa/channels/abtoon.json b/plugin.video.alfa/channels/abtoon.json
new file mode 100644
index 00000000..cef38d45
--- /dev/null
+++ b/plugin.video.alfa/channels/abtoon.json
@@ -0,0 +1,12 @@
+{
+  "id": "abtoon",
+  "name": "abtoon",
+  "active": true,
+  "adult": false,
+  "language": ["lat"],
+  "thumbnail": "http://i.imgur.com/EpNUqsD.png",
+  "banner": "http://i.imgur.com/c1YTgNT.png",
+  "categories": [
+    "tvshow"
+  ]
+}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/abtoon.py b/plugin.video.alfa/channels/abtoon.py
new file mode 100644
index 00000000..5d7653e5
--- /dev/null
+++ b/plugin.video.alfa/channels/abtoon.py
@@ -0,0 +1,225 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from channels import renumbertools
+from channelselector import get_thumb
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core import tmdb
+from core.item import Item
+from platformcode import config, logger
+from channels import filtertools
+from channels import autoplay
+from lib import gktools
+
+IDIOMAS = {'latino': 'Latino'}
+list_language = IDIOMAS.values()
+list_servers = ['openload'
+                ]
+list_quality = ['default']
+
+
+host = "https://abtoon.net"
+
+
+def mainlist(item):
+    logger.info()
+    thumb_series = get_thumb("channels_tvshow.png")
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist = list()
+
+    itemlist.append(
+        Item(channel=item.channel, action="lista", title="Series", contentSerieName="Series", url=host, thumbnail=thumb_series, page=0))
+    #itemlist.append(
+    #    Item(channel=item.channel, action="lista", title="Live Action", contentSerieName="Live Action", url=host+"/liveaction", thumbnail=thumb_series, page=0))
+    #itemlist.append(
+    #    Item(channel=item.channel, action="peliculas", title="Películas", contentSerieName="Películas", url=host+"/peliculas", thumbnail=thumb_series, page=0))
+    itemlist = renumbertools.show_option(item.channel, itemlist)
+    autoplay.show_option(item.channel, itemlist)
+    return itemlist
+
+
+def lista(item):
+    logger.info()
+
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron = '<a href="([^"]+)" '
+    if item.contentSerieName == "Series":
+        patron += 'class="link">.+?<img src="([^"]+)".*?'
+    else:
+        patron += 'class="link-la">.+?<img src="([^"]+)".*?'
+    patron += 'title="([^"]+)">'
+    if item.url==host or item.url==host+"/liveaction":
+        a=1
+    else:
+        num=(item.url).split('-')
+        a=int(num[1])
+    matches = scrapertools.find_multiple_matches(data, patron)
+
+    # Paginacion
+    num_items_x_pagina = 30
+    min = item.page * num_items_x_pagina
+    min=min-item.page
+    max = min + num_items_x_pagina - 1
+    b=0
+    for link, img, name in matches[min:max]:
+        b=b+1
+        if " y " in name:
+            title=name.replace(" y "," & ")
+        else:
+            title = name
+        url = host + link
+        scrapedthumbnail = host + img
+        context = renumbertools.context(item)
+        context2 = autoplay.context
+        context.extend(context2)
+        
+        itemlist.append(item.clone(title=title, url=url, action="episodios", thumbnail=scrapedthumbnail, show=title,contentSerieName=title,
+                                   context=context))
+    if b<29:
+        a=a+1
+        url=host+"/p/pag-"+str(a)
+        if b>10:
+            itemlist.append(
+                Item(channel=item.channel, contentSerieName=item.contentSerieName, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=url, action="lista", page=0))
+    else:    
+        itemlist.append(
+             Item(channel=item.channel, contentSerieName=item.contentSerieName, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=item.url, action="lista", page=item.page + 1))
+
+    tmdb.set_infoLabels(itemlist)
+    return itemlist
+
+def peliculas(item):
+    logger.info()
+
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron = '<div class="pel play" dt="(.+?)" .+?><img src="(.+?)" .+? title="(.*?)"><span class=".+?">(.+?)<\/span><a href="(.+?)" class.+?>'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    # Paginacion
+    num_items_x_pagina = 30
+    min = item.page * num_items_x_pagina
+    min=min-item.page
+    max = min + num_items_x_pagina - 1
+    b=0
+    for scrapedplot,scrapedthumbnail, scrapedtitle, scrapedyear, scrapedurl in matches[min:max]:
+        b=b+1
+        url = host + scrapedurl
+        thumbnail = host +scrapedthumbnail
+        context = renumbertools.context(item)
+        context2 = autoplay.context
+        context.extend(context2)
+        itemlist.append(item.clone(title=scrapedtitle+"-"+scrapedyear, url=url, action="findvideos", thumbnail=thumbnail, plot=scrapedplot,
+                show=scrapedtitle,contentSerieName=scrapedtitle,context=context))
+    if b<29:
+        pass
+    else:    
+        itemlist.append(
+             Item(channel=item.channel, contentSerieName=item.contentSerieName, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=item.url, action="peliculas", page=item.page + 1))
+
+    tmdb.set_infoLabels(itemlist)
+    return itemlist
+
+def episodios(item):
+    logger.info()
+
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    # obtener el numero total de episodios
+    total_episode = 0
+
+    patron_caps = '<li><a href="(.*?)">(.*?) - (.*?)<\/a><\/li>'
+    matches = scrapertools.find_multiple_matches(data, patron_caps)
+    patron_info = '<img src="([^"]+)" .+?>.+?<h1>([^"]+)<\/h1><p .+?>(.+?)<\/p>'
+    scrapedthumbnail, show, scrapedplot = scrapertools.find_single_match(data, patron_info)
+    scrapedthumbnail = host + scrapedthumbnail
+
+    for link, cap, name in matches:
+
+        title = ""
+        pat = "$%&"
+        # varios episodios en un enlace
+        if len(name.split(pat)) > 1:
+            i = 0
+            for pos in name.split(pat):
+                i = i + 1
+                total_episode += 1
+                season, episode = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, 1, total_episode)
+                if len(name.split(pat)) == i:
+                    title += "%sx%s " % (season, str(episode).zfill(2))
+                else:
+                    title += "%sx%s_" % (season, str(episode).zfill(2))
+        else:
+            total_episode += 1
+            season, episode = renumbertools.numbered_for_tratk(item.channel,item.contentSerieName, 1, total_episode)
+
+            title += "%sx%s " % (season, str(episode).zfill(2))
+
+        url = host + "/" + link
+        if "DISPONIBLE" in name:
+            title += "No Disponible aún"
+        else:
+            title += name
+            itemlist.append(
+                Item(channel=item.channel, action="findvideos", title=title, url=url, show=show, plot=scrapedplot,
+                     thumbnail=scrapedthumbnail))
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(Item(channel=item.channel, title="[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]", url=item.url,
+                             action="add_serie_to_library", extra="episodios", show=show))
+
+    return itemlist
+
+def findvideos(item):
+    import base64
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    _sl = scrapertools.find_single_match(data, 'var abi = ([^;]+);')
+    sl = eval(_sl)
+    buttons = scrapertools.find_multiple_matches(data,'class="bsel" sl="(.+?)"')#[0,1,2,3,4]
+    for ids in buttons:
+        id = int(ids)
+        url_end = golink(id,sl)
+        new_url = "https://abtoon.net/" + "embed/" + sl[0] + "/" + sl[1] + "/" + str(id) + "/" + sl[2] + url_end
+        data_new = httptools.downloadpage(new_url).data
+        data_new = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data_new)
+        logger.info("asdasdasdcc"+data_new)
+        valor1, valor2 = scrapertools.find_single_match(data_new, 'var x0x = \["[^"]*", "([^"]+)", "[^"]*", "[^"]*", "([^"]+)"\];') 
+        try:
+            url = base64.b64decode(gktools.transforma_gsv(valor2, base64.b64decode(valor1)))
+            if 'download' in url:
+                url = url.replace('download', 'preview')
+            title = '%s'
+            itemlist.append(Item(channel=item.channel, title=title, url=url, action='play', language='latino',
+                         infoLabels=item.infoLabels))
+        except Exception as e:
+            logger.info(e)
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+
+    return itemlist
+
+def golink(ida,sl):
+    a=ida
+    b=[3,10,5,22,31]
+    c=1
+    d=""
+    e=sl[2]
+    for i in range(len(b)):
+      d=d+substr(e,b[i]+a,c)
+    return d
+
+def substr(st,a,b):
+    return st[a:a+b]
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py
index d297d964..3cd981d8 100755
--- a/plugin.video.alfa/channels/allcalidad.py
+++ b/plugin.video.alfa/channels/allcalidad.py
@@ -19,7 +19,7 @@ list_servers = ['rapidvideo', 'streamango', 'fastplay', 'flashx', 'openload', 'v
 
 __channel__='allcalidad'
 
-host = "http://allcalidad.net/"
+host = "https://allcalidad.net/"
 
 try:
     __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
@@ -198,17 +198,16 @@ def findvideos(item):
 
     autoplay.start(itemlist, item)
 
-    if itemlist:
+    if itemlist and item.contentChannel != "videolibrary":
         itemlist.append(Item(channel = item.channel))
         itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="",
                                    text_color="magenta"))
         # Opción "Añadir esta película a la biblioteca de KODI"
-        if item.extra != "library":
-            if config.get_videolibrary_support():
-                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
-                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
-                                     contentTitle = item.contentTitle
-                                     ))
+        if config.get_videolibrary_support():
+            itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
+                                 action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
+                                 contentTitle = item.contentTitle
+                                 ))
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/alsoporn.py b/plugin.video.alfa/channels/alsoporn.py
index f1e7e5fb..5bd8e5a4 100644
--- a/plugin.video.alfa/channels/alsoporn.py
+++ b/plugin.video.alfa/channels/alsoporn.py
@@ -7,15 +7,14 @@ 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
 
 host = 'http://www.alsoporn.com'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Top" , action="peliculas", url=host + "/g/All/top/1"))
+    itemlist.append( Item(channel=item.channel, title="Top" , action="lista", url=host + "/g/All/top/1"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
@@ -26,7 +25,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/=%s/" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -46,8 +45,8 @@ def catalogo(item):
     for scrapedurl,cantidad,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl, 
-                               thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl, 
+                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
@@ -62,12 +61,12 @@ def categorias(item):
     for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         scrapedplot = ""
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl, 
-                              thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl, 
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
@@ -82,14 +81,12 @@ def peliculas(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, contentTitle = title, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)" target="_self"><span class="alsoporn_page">NEXT</span></a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+                              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!="":
+        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
 
 
diff --git a/plugin.video.alfa/channels/analdin.py b/plugin.video.alfa/channels/analdin.py
index 29bf3c73..051cc8f3 100644
--- a/plugin.video.alfa/channels/analdin.py
+++ b/plugin.video.alfa/channels/analdin.py
@@ -7,17 +7,17 @@ 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
+
 
 host = 'https://www.analdin.com/es'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/más-reciente/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/más-visto/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/mejor-valorado/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/más-reciente/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/más-visto/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/mejor-valorado/"))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categorías/"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
@@ -29,7 +29,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -48,13 +48,12 @@ def catalogo(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
-                               thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    next_page_url = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel, action="catalogo", title="Página Siguiente >>", text_color="blue",
-                               url=next_page_url) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
+    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)
+        itemlist.append(item.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
@@ -71,12 +70,12 @@ def categorias(item):
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                                thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -91,14 +90,13 @@ def peliculas(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,
-                              contentTitle = title, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>", text_color="blue",
-                              url=next_page_url) )
+                              contentTitle = title))
+    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
 
 
diff --git a/plugin.video.alfa/channels/animeboom.py b/plugin.video.alfa/channels/animeboom.py
index 6efc3116..9d3875e7 100644
--- a/plugin.video.alfa/channels/animeboom.py
+++ b/plugin.video.alfa/channels/animeboom.py
@@ -15,7 +15,7 @@ from core.item import Item
 from platformcode import logger, config
 from channels import autoplay
 from channels import filtertools
-
+from channels import renumbertools
 
 host = "https://animeboom.net/"
 
@@ -84,6 +84,7 @@ def mainlist(item):
                                ))
 
     autoplay.show_option(item.channel, itemlist)
+    itemlist = renumbertools.show_option(item.channel, itemlist)
 
     return itemlist
 
@@ -113,12 +114,16 @@ def list_all(item):
         else:
             lang = 'VOSE'
         title = re.sub('Audio Latino', '', scrapedtitle)
+        context = renumbertools.context(item)
+        context2 = autoplay.context
+        context.extend(context2)
         itemlist.append(Item(channel=item.channel, action='episodios',
                                    title=title,
                                    url=url,
                                    thumbnail=thumbnail,
                                    contentSerieName=title,
                                    language = lang,
+                                   context = context,
                                    infoLabels={'year':year}
                                    ))
 
@@ -153,11 +158,17 @@ def search_results(item):
 
         url = scrapedurl
         title = re.sub('online|Audio|Latino', '', scrapedtitle)
-
+        title = title.lstrip()
+        title = title.rstrip()
+        context = renumbertools.context(item)
+        context2 = autoplay.context
+        context.extend(context2)
         itemlist.append(Item(channel=item.channel,
                              action="episodios",
                              title=title,
+                             contentSerieName=title,
                              url=url,
+                             context = context,
                              thumbnail=scrapedthumbnail))
 
     tmdb.set_infoLabels(itemlist, seekTmdb=True)
@@ -217,9 +228,10 @@ def episodios(item):
             lang='Latino'
         else:
             lang = 'VOSE'
-        title = "1x" + episode + " - Episodio %s" % episode
+        season, episode = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, 1, int(episode))
+        title = "%sx%s - %s" % (season, str(episode).zfill(2),item.contentSerieName)
         url = scrapedurl
-        infoLabels['season'] = '1'
+        infoLabels['season'] = season
         infoLabels['episode'] = episode
 
         itemlist.append(Item(channel=item.channel, title=title, contentSerieName=item.contentSerieName, url=url,
diff --git a/plugin.video.alfa/channels/animeflv.json b/plugin.video.alfa/channels/animeflv.json
index e6851bab..0415a82f 100755
--- a/plugin.video.alfa/channels/animeflv.json
+++ b/plugin.video.alfa/channels/animeflv.json
@@ -25,6 +25,19 @@
       "default": true,
       "enabled": true,
       "visible": true
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "VOSE",
+        "LAT"
+      ]
     }
   ]
 }
diff --git a/plugin.video.alfa/channels/animeflv.py b/plugin.video.alfa/channels/animeflv.py
index de6d7901..fed22711 100644
--- a/plugin.video.alfa/channels/animeflv.py
+++ b/plugin.video.alfa/channels/animeflv.py
@@ -10,12 +10,24 @@ from core import servertools
 from core import scrapertools
 from core.item import Item
 from platformcode import config, logger
+from channels import autoplay
+from channels import filtertools
+
+
+IDIOMAS = {'LAT': 'LAT','SUB': 'VOSE'}
+list_language = IDIOMAS.values()
+list_servers = ['directo', 'rapidvideo', 'streamango', 'yourupload', 'mailru', 'netutv', 'okru']
+list_quality = ['default']
+
 
 HOST = "https://animeflv.net/"
 
 
 def mainlist(item):
     logger.info()
+
+    autoplay.init(item.channel, list_servers, list_quality)
+
     itemlist = list()
     itemlist.append(Item(channel=item.channel, action="novedades_episodios", title="Últimos episodios", url=HOST))
     itemlist.append(Item(channel=item.channel, action="novedades_anime", title="Últimos animes", url=HOST))
@@ -31,6 +43,9 @@ def mainlist(item):
     itemlist.append(Item(channel=item.channel, action="search_section", title="    Estado", url=HOST + "browse",
                          extra="status"))
     itemlist = renumbertools.show_option(item.channel, itemlist)
+
+    autoplay.show_option(item.channel, itemlist)
+
     return itemlist
 
 
@@ -50,6 +65,10 @@ def search(item, texto):
                 _id = e["id"]
             url = "%sanime/%s/%s" % (HOST, _id, e["slug"])
             title = e["title"]
+            #if "&#039;" in title:
+            #    title = title.replace("&#039;","")
+            #if "&deg;" in title:
+            #    title = title.replace("&deg;","")
             thumbnail = "%suploads/animes/covers/%s.jpg" % (HOST, e["id"])
             new_item = item.clone(action="episodios", title=title, url=url, thumbnail=thumbnail)
             if e["type"] != "movie":
@@ -173,47 +192,57 @@ def episodios(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", data)
-    info = eval(scrapertools.find_single_match(data, 'anime_info = (.*?);'))
-    episodes = eval(scrapertools.find_single_match(data, 'var episodes = (.*?);'))
+    info = scrapertools.find_single_match(data, "anime_info = \[(.*?)\];")
+    info = eval(info)
+    episodes = eval(scrapertools.find_single_match(data, "var episodes = (.*?);"))
     for episode in episodes:
         url = '%s/ver/%s/%s-%s' % (HOST, episode[1], info[2], episode[0])
-        title = '1x%s Episodio %s' % (episode[0], episode[0])
-        itemlist.append(item.clone(title=title, url=url, action='findvideos', show=info[1]))
+        season = 1
+        season, episodeRenumber = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, season, int(episode[0]))
+        #title = '1x%s Episodio %s' % (episode[0], episode[0])
+        title = '%sx%s Episodio %s' % (season, str(episodeRenumber).zfill(2), episodeRenumber)
+        itemlist.append(item.clone(title=title, url=url, action='findvideos', contentSerieName=item.contentSerieName))
     itemlist = itemlist[::-1]
     if config.get_videolibrary_support() and len(itemlist) > 0:
         itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url,
-                             action="add_serie_to_library", extra="episodios"))
+                             action="add_serie_to_library", extra="episodios", show=item.contentSerieName))
     return itemlist
 
 
 def findvideos(item):
     logger.info()
+    from core import jsontools
     itemlist = []
     data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", httptools.downloadpage(item.url).data)
-    list_videos = scrapertools.find_multiple_matches(data, 'video\[\d\]\s=\s\'<iframe.+?src="([^"]+)"')
-    download_list = scrapertools.find_multiple_matches(data, 'video\[\d+\] = \'<iframe .*?src="(.*?)"')
-    for url in download_list:
-        data = httptools.downloadpage(url).data
-        if 'izanagi' in url:
-            new_url = url.replace('embed', 'check')
-            new_data = httptools.downloadpage(new_url).data
-            url = scrapertools.find_single_match(new_data, '"file":"(.*?)"')
-        else:
-            url = scrapertools.find_single_match(data, 'var redir = "(.*?)"')
-        if url != '':
-            url = url.replace("\\","")
-            itemlist.append(item.clone(title='%s', url=url, action='play'))
+    videos = scrapertools.find_single_match(data, 'var videos = (.*?);')
+    videos_json = jsontools.load(videos)
+    for video_lang in videos_json.items():
+        language = video_lang[0]
+        matches = scrapertools.find_multiple_matches(str(video_lang[1]), 'src="([^"]+)"')
+        for source in matches:
+            new_data = httptools.downloadpage(source).data
+            if 'redirector' in source:
+
+                url = scrapertools.find_single_match(new_data, 'window.location.href = "([^"]+)"')
+            elif 'embed' in source:
+                source = source.replace('embed', 'check')
+                new_data = httptools.downloadpage(source).data
+                json_data = jsontools.load(new_data)
+                try:
+                    url = json_data['file']
+                except:
+                    continue
+
+            itemlist.append(Item(channel=item.channel, url=url, title='%s', action='play', language=language))
+
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server)
+
+    # Requerido para FilterTools
+
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+
     return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    if item.video_urls:
-        for it in item.video_urls:
-            title = ".%s %sp [directo]" % (it[1].replace("video/", ""), it[0])
-            itemlist.append([title, it[2]])
-        return itemlist
-    else:
-        return [item]
diff --git a/plugin.video.alfa/channels/animeflv_me.json b/plugin.video.alfa/channels/animeflv_me.json
deleted file mode 100755
index 96f16b74..00000000
--- a/plugin.video.alfa/channels/animeflv_me.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "id": "animeflv_me",
-  "name": "Animeflv.ME",
-  "active": false,
-  "adult": false,
-  "language": ["cast", "lat"],
-  "thumbnail": "http://i.imgur.com/x9AdvBx.png",
-  "banner": "http://i.imgur.com/dTZwCPq.png",
-  "categories": [
-    "anime"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": false,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
diff --git a/plugin.video.alfa/channels/animemovil.json b/plugin.video.alfa/channels/animeflv_ru.json
similarity index 55%
rename from plugin.video.alfa/channels/animemovil.json
rename to plugin.video.alfa/channels/animeflv_ru.json
index f3a4f840..a6ada31d 100644
--- a/plugin.video.alfa/channels/animemovil.json
+++ b/plugin.video.alfa/channels/animeflv_ru.json
@@ -1,43 +1,45 @@
-{
-  "id": "animemovil",
-  "name": "Animemovil",
-  "active": true,
-  "adult": false,
-  "language": ["cast", "lat"],
-  "thumbnail": "https://s1.postimg.cc/92ji7stii7/animemovil1.png",
-  "banner": "",
-  "categories": [
-    "anime"
-  ],
-  "settings": [
-    {
-      "id": "modo_grafico",
-      "type": "bool",
-      "label": "Buscar información extra",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "perfil",
-      "type": "list",
-      "label": "Perfil de color",
-      "default": 0,
-      "enabled": true,
-      "visible": true,
-      "lvalues": [
-        "Perfil 3",
-        "Perfil 2",
-        "Perfil 1"
-      ]
-    }
-  ]
-}
+{
+  "id": "animeflv_ru",
+  "name": "AnimeFLV.RU",
+  "active": true,
+  "adult": false,
+  "language": ["cast", "lat"],
+  "thumbnail": "http://i.imgur.com/5nRR9qq.png",
+  "banner": "animeflv_ru.png",
+  "compatible": {
+    "python": "2.7.9"
+  },
+  "categories": [
+    "anime"
+  ],
+  "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_anime",
+      "type": "bool",
+      "label": "Incluir en Novedades - Episodios de anime",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "VOSE"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/animeflv_ru.py b/plugin.video.alfa/channels/animeflv_ru.py
index d85b12c0..f4050f68 100755
--- a/plugin.video.alfa/channels/animeflv_ru.py
+++ b/plugin.video.alfa/channels/animeflv_ru.py
@@ -5,10 +5,18 @@ import urlparse
 
 from channels import renumbertools
 from core import httptools
+from core import servertools
 from core import jsontools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from channels import autoplay
+
+IDIOMAS = {'VOSE': 'VOSE'}
+list_language = IDIOMAS.values()
+list_servers = ['directo']
+list_quality = ['default']
+
 
 HOST = "https://animeflv.ru/"
 
@@ -16,25 +24,25 @@ HOST = "https://animeflv.ru/"
 def mainlist(item):
     logger.info()
 
-    itemlist = list()
+    autoplay.init(item.channel, list_servers, list_quality)
 
+    itemlist = list()
     itemlist.append(Item(channel=item.channel, action="novedades_episodios", title="Últimos episodios", url=HOST))
     itemlist.append(Item(channel=item.channel, action="novedades_anime", title="Últimos animes", url=HOST))
     itemlist.append(Item(channel=item.channel, action="listado", title="Animes", url=HOST + "animes/nombre/lista"))
-
     itemlist.append(Item(channel=item.channel, title="Buscar por:"))
     itemlist.append(Item(channel=item.channel, action="search", title="    Título"))
     itemlist.append(Item(channel=item.channel, action="search_section", title="    Género", url=HOST + "animes",
                          extra="genre"))
-
     itemlist = renumbertools.show_option(item.channel, itemlist)
 
+    autoplay.show_option(item.channel, itemlist)
+
     return itemlist
 
 
 def clean_title(title):
     year_pattern = r'\([\d -]+?\)'
-
     return re.sub(year_pattern, '', title).strip()
 
 
@@ -45,32 +53,26 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     post = "value=%s" % texto
     data = httptools.downloadpage(item.url, post=post).data
-
     try:
         dict_data = jsontools.load(data)
-
         for e in dict_data:
             title = clean_title(scrapertools.htmlclean(e["name"]))
             url = e["url"]
             plot = e["description"]
-            thumbnail = HOST + e["thumb"]
+            thumbnail = e["thumb"]
             new_item = item.clone(action="episodios", title=title, url=url, plot=plot, thumbnail=thumbnail)
-
             if "Pelicula" in e["genre"]:
                 new_item.contentType = "movie"
                 new_item.contentTitle = title
             else:
                 new_item.show = title
                 new_item.context = renumbertools.context(item)
-
             itemlist.append(new_item)
-
     except:
         import sys
         for line in sys.exc_info():
             logger.error("%s" % line)
         return []
-
     return itemlist
 
 
@@ -79,41 +81,32 @@ def search_section(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", data)
-
     patron = 'id="%s_filter"[^>]+><div class="inner">(.*?)</div></div>' % item.extra
     data = scrapertools.find_single_match(data, patron)
     matches = re.compile('<a href="([^"]+)"[^>]+>(.*?)</a>', re.DOTALL).findall(data)
-
     for url, title in matches:
         url = "%s/nombre/lista" % url
         itemlist.append(Item(channel=item.channel, action="listado", title=title, url=url,
                              context=renumbertools.context(item)))
-
     return itemlist
 
 
 def newest(categoria):
     itemlist = []
-
     if categoria == 'anime':
         itemlist = novedades_episodios(Item(url=HOST))
-
     return itemlist
 
 
 def novedades_episodios(item):
     logger.info()
-
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", data)
     data = scrapertools.find_single_match(data, '<ul class="ListEpisodios[^>]+>(.*?)</ul>')
-
     matches = re.compile('href="([^"]+)"[^>]+>.+?<img src="([^"]+)".+?"Capi">(.*?)</span>'
                          '<strong class="Title">(.*?)</strong>', re.DOTALL).findall(data)
     itemlist = []
-
     for url, thumbnail, str_episode, show in matches:
-
         try:
             episode = int(str_episode.replace("Ep. ", ""))
         except ValueError:
@@ -121,42 +114,31 @@ def novedades_episodios(item):
             episode = 1
         else:
             season, episode = renumbertools.numbered_for_tratk(item.channel, item.show, 1, episode)
-
         title = "%s: %sx%s" % (show, season, str(episode).zfill(2))
         url = urlparse.urljoin(HOST, url)
         thumbnail = urlparse.urljoin(HOST, thumbnail)
-
         new_item = Item(channel=item.channel, action="findvideos", title=title, url=url, show=show, thumbnail=thumbnail,
                         fulltitle=title)
-
         itemlist.append(new_item)
-
     return itemlist
 
 
 def novedades_anime(item):
     logger.info()
-
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", data)
     data = scrapertools.find_single_match(data, '<ul class="ListAnimes[^>]+>(.*?)</ul>')
-
     matches = re.compile('<img src="([^"]+)".+?<a href="([^"]+)">(.*?)</a>', re.DOTALL).findall(data)
     itemlist = []
-
     for thumbnail, url, title in matches:
         url = urlparse.urljoin(HOST, url)
         thumbnail = urlparse.urljoin(HOST, thumbnail)
         title = clean_title(title)
-
         new_item = Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail,
                         fulltitle=title)
-
         new_item.show = title
         new_item.context = renumbertools.context(item)
-
         itemlist.append(new_item)
-
     return itemlist
 
 
@@ -166,19 +148,16 @@ def listado(item):
     data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", data)
     url_pagination = scrapertools.find_single_match(data, '<li class="current">.*?</li>[\s]<li><a href="([^"]+)">')
     data = scrapertools.find_single_match(data, '</div><div class="full">(.*?)<div class="pagination')
-
     matches = re.compile('<img.+?src="([^"]+)".+?<a href="([^"]+)">(.*?)</a>.+?'
                          '<div class="full item_info genres_info">(.*?)</div>.+?class="full">(.*?)</p>',
                          re.DOTALL).findall(data)
     itemlist = []
     for thumbnail, url, title, genres, plot in matches:
-
         title = clean_title(title)
         url = urlparse.urljoin(HOST, url)
         thumbnail = urlparse.urljoin(HOST, thumbnail)
         new_item = Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail,
                         fulltitle=title, plot=plot)
-
         if "Pelicula Anime" in genres:
             new_item.contentType = "movie"
             new_item.contentTitle = title
@@ -189,7 +168,6 @@ def listado(item):
     if url_pagination:
         url = urlparse.urljoin(HOST, url_pagination)
         title = ">> Pagina Siguiente"
-
         itemlist.append(Item(channel=item.channel, action="listado", title=title, url=url))
     return itemlist
 
@@ -203,7 +181,6 @@ def episodios(item):
         item.plot = scrapertools.find_single_match(data, 'Description[^>]+><p>(.*?)</p>')
     data = scrapertools.find_single_match(data, '<div class="Sect Episodes full">(.*?)</div>')
     matches = re.compile('<a href="([^"]+)"[^>]+>(.+?)</a', re.DOTALL).findall(data)
-
     for url, title in matches:
         title = title.strip()
         url = urlparse.urljoin(item.url, url)
@@ -224,27 +201,27 @@ def episodios(item):
 def findvideos(item):
     logger.info()
     itemlist = []
-    _id = scrapertools.find_single_match(item.url, 'https://animeflv.ru/ver/([^/]+)/')
-    post = "embed_id=%s" % _id
-    data = httptools.downloadpage("https://animeflv.ru/get_video_info", post=post).data
-    dict_data = jsontools.load(data)
-    headers = dict()
-    headers["Referer"] = item.url
-    data = httptools.downloadpage("https:" + dict_data["value"], headers=headers).data
-    dict_data = jsontools.load(data)
-    if not dict_data:
-        return itemlist
-    list_videos = dict_data["playlist"][0]
-    if isinstance(list_videos, list):
-        for video in list_videos:
-            itemlist.append(Item(channel=item.channel, action="play", url=video["file"],
-                                 show=re.escape(item.show),
-                                 title=item.title, plot=item.plot, fulltitle=item.title,
-                                 thumbnail=item.thumbnail))
-    else:
-        for video in list_videos.values():
-            video += "|User-Agent=Mozilla/5.0"
-            itemlist.append(Item(channel=item.channel, action="play", url=video, show=re.escape(item.show),
-                                 title=item.title, plot=item.plot, fulltitle=item.title,
-                                 thumbnail=item.thumbnail))
+    _id = scrapertools.find_single_match(item.url, HOST + 'ver/([^/]+)/')
+    data = httptools.downloadpage(item.url).data
+    bloque = scrapertools.find_single_match(data, 'atrl(.*?)choose_quality')
+    matches = scrapertools.find_multiple_matches(bloque, '<option value="([^"]+)')
+    headers = {"Referer" : item.url}
+    for url in matches:
+        post = "embed_id=%s" % _id
+        xserver = scrapertools.find_single_match(url, 's=(\w+)')
+        data = httptools.downloadpage(HOST + "get_video_info_v2?s=%s" %xserver, post=post).data
+        dict_data = jsontools.load(data)
+        data = httptools.downloadpage(dict_data["value"], headers=headers).data
+        matches = scrapertools.find_multiple_matches(data, '"file":"([^"]+)"')
+        for url in matches:
+            url = url.replace("\\","")
+            itemlist.append(item.clone(action="play", url=url, title='%s',
+                             fulltitle=item.title, language='VOSE'
+                             ))
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % x.server.capitalize())
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+
     return itemlist
diff --git a/plugin.video.alfa/channels/animeid.py b/plugin.video.alfa/channels/animeid.py
index 5a9400ca..b58be2ee 100755
--- a/plugin.video.alfa/channels/animeid.py
+++ b/plugin.video.alfa/channels/animeid.py
@@ -9,11 +9,19 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import config, logger
+from channels import renumbertools, autoplay
 
 CHANNEL_HOST = "https://www.animeid.tv/"
 
+IDIOMAS = {'Latino': 'LAT', 'VOSE': 'VOSE'}
+list_language = IDIOMAS.values()
+list_quality = []
+list_servers = ['animeid']
+
+
 def mainlist(item):
     logger.info()
+    autoplay.init(item.channel, list_servers, list_quality)
     itemlist = list()
     itemlist.append(
         Item(channel=item.channel, action="novedades_series", title="Últimas series", url=CHANNEL_HOST))
@@ -25,6 +33,9 @@ def mainlist(item):
         Item(channel=item.channel, action="letras", title="Listado alfabetico", url=CHANNEL_HOST))
     itemlist.append(Item(channel=item.channel, action="search", title="Buscar..."))
 
+    itemlist = renumbertools.show_option(item.channel, itemlist)
+    autoplay.show_option(item.channel, itemlist)
+
     return itemlist
 
 
@@ -59,7 +70,7 @@ def search(item, texto):
             ["User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:19.0) Gecko/20100101 Firefox/19.0"])
         headers.append(["Referer", CHANNEL_HOST])
         headers.append(["X-Requested-With", "XMLHttpRequest"])
-        data = scrapertools.cache_page(item.url, headers=headers)
+        data = httptools.downloadpage(item.url, headers=headers).data
         data = data.replace("\\", "")
         patron = '{"id":"([^"]+)","text":"([^"]+)","date":"[^"]*","image":"([^"]+)","link":"([^"]+)"}'
         matches = re.compile(patron, re.DOTALL).findall(data)
@@ -69,9 +80,12 @@ def search(item, texto):
             url = urlparse.urljoin(item.url, scrapedurl)
             thumbnail = scrapedthumbnail
             plot = ""
+            context = renumbertools.context(item)
+            context2 = autoplay.context
+            context.extend(context2)
             itemlist.append(
                 Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                     show=title, viewmode="movie_with_plot"))
+                     context=context, show=title, viewmode="movie_with_plot"))
 
         return itemlist
 
@@ -93,8 +107,11 @@ def novedades_series(item):
     for url, tipo, title in matches:
         scrapedtitle = title + " (" + tipo + ")"
         scrapedurl = urlparse.urljoin(item.url, url)
+        context = renumbertools.context(item)
+        context2 = autoplay.context
+        context.extend(context2)
         itemlist.append(Item(channel=item.channel, action="episodios", title=scrapedtitle, url=scrapedurl,
-                             show=title, viewmode="movie_with_plot"))
+                             context=context, show=title, viewmode="movie_with_plot"))
     return itemlist
 
 
@@ -102,7 +119,7 @@ def novedades_episodios(item):
     logger.info()
     data = httptools.downloadpage(item.url).data
     data = scrapertools.find_single_match(data, '<section class="lastcap">(.*?)</section>')
-    patronvideos  = '(?s)<a href="([^"]+)">[^<]+<header>([^<]+).*?src="([^"]+)"[\s\S]+?<p>(.+?)</p>'
+    patronvideos = '(?s)<a href="([^"]+)">[^<]+<header>([^<]+).*?src="([^"]+)"[\s\S]+?<p>(.+?)</p>'
     matches = re.compile(patronvideos, re.DOTALL).findall(data)
     itemlist = []
     for url, title, thumbnail, plot in matches:
@@ -165,13 +182,16 @@ def series(item):
         scrapedurl = urlparse.urljoin(item.url, url)
         scrapedthumbnail = thumbnail
         scrapedplot = plot
+        context = renumbertools.context(item)
+        context2 = autoplay.context
+        context.extend(context2)
         itemlist.append(Item(channel=item.channel, action="episodios", title=scrapedtitle, url=scrapedurl,
-                             thumbnail=scrapedthumbnail, plot=scrapedplot, show=scrapedtitle,
+                             thumbnail=scrapedthumbnail, plot=scrapedplot, show=scrapedtitle, context=context,
                              viewmode="movie_with_plot"))
     itemlist = sorted(itemlist, key=lambda it: it.title)
     try:
         page_url = scrapertools.find_single_match(data, '<li><a href="([^"]+)">&gt;</a></li>')
-        itemlist.append(Item(channel=item.channel, action="series", title=">> Página siguiente",
+        itemlist.append(Item(channel=item.channel, action="series", title="[COLOR cyan]>> Página siguiente[/COLOR]",
                              url=urlparse.urljoin(item.url, page_url), viewmode="movie_with_plot", thumbnail="",
                              plot=""))
     except:
@@ -185,33 +205,39 @@ def episodios(item, final=True):
     data = httptools.downloadpage(item.url).data
     data_id = scrapertools.find_single_match(data, 'data-id="([^"]+)')
     CHANNEL_HEADERS = [
-    ["Host", "m.animeid.tv"],
-    ["X-Requested-With", "XMLHttpRequest"]
+        ["Host", "m.animeid.tv"],
+        ["X-Requested-With", "XMLHttpRequest"]
     ]
     page = 0
     while True:
         page += 1
-        u = "https://m.animeid.tv/ajax/caps?id=%s&ord=DESC&pag=%s" %(data_id, page)
+        u = "https://m.animeid.tv/ajax/caps?id=%s&ord=DESC&pag=%s" % (data_id, page)
         data = httptools.downloadpage(u, headers=CHANNEL_HEADERS).data
         # Cuando ya no hay datos devuelve: "list":[]
         if '"list":[]' in data:
             break
         dict_data = jsontools.load(data)
-        list = dict_data['list']
+        list = dict_data['list'][::-1]
         for dict in list:
-             itemlist.append(Item(action = "findvideos",
-                                  channel = item.channel,
-                                  title = "1x" + dict["numero"] + " - " + dict["date"],
-                                  url = CHANNEL_HOST + dict['href'],
-                                  thumbnail = item.thumbnail,
-                                  show = item.show,
-                                  viewmode = "movie_with_plot"
-                                  ))
+            season, episode = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, 1,
+                                                               int(dict["numero"]))
+            title = "%sx%s - %s" % (season, str(episode).zfill(2), dict["date"])
+            itemlist.append(Item(action="findvideos",
+                                 channel=item.channel,
+                                 title=title,
+                                 url=CHANNEL_HOST + dict['href'],
+                                 thumbnail=item.thumbnail,
+                                 show=item.show,
+                                 viewmode="movie_with_plot"
+                                 ))
     if config.get_videolibrary_support():
-        itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url,
-                             action="add_serie_to_library", extra="episodios", show=item.show))
-        itemlist.append(Item(channel=item.channel, title="Descargar todos los episodios de la serie", url=item.url,
-                             action="download_all_episodes", extra="episodios", show=item.show))
+        itemlist.append(
+            Item(channel=item.channel, title="[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]", url=item.url,
+                 action="add_serie_to_library", extra="episodios", show=item.show))
+        itemlist.append(
+            Item(channel=item.channel, title="[COLOR white]Descargar todos los episodios de la serie[/COLOR]",
+                 url=item.url,
+                 action="download_all_episodes", extra="episodios", show=item.show))
     return itemlist
 
 
@@ -249,4 +275,8 @@ def findvideos(item):
         itemlist.append(Item(channel=item.channel, action="findvideos", title="Siguiente: " + title_siguiente,
                              url=CHANNEL_HOST + url_siguiente, thumbnail=item.thumbnail, plot=item.plot, show=item.show,
                              fanart=item.thumbnail, folder=True))
+
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+
     return itemlist
diff --git a/plugin.video.alfa/channels/animemovil.py b/plugin.video.alfa/channels/animemovil.py
deleted file mode 100644
index 0cd3153a..00000000
--- a/plugin.video.alfa/channels/animemovil.py
+++ /dev/null
@@ -1,338 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from channels import renumbertools
-from core import httptools
-from core import servertools
-from core import jsontools
-from core import scrapertools
-from core.item import Item
-from platformcode import platformtools, config, logger
-
-
-
-__modo_grafico__ = config.get_setting('modo_grafico', 'animemovil')
-__perfil__ = ''
-
-# Fijar perfil de color            
-perfil = [['0xFFFFE6CC', '0xFFFFCE9C', '0xFF994D00', '0xFFFE2E2E', '0xFFFFD700'],
-          ['0xFFA5F6AF', '0xFF5FDA6D', '0xFF11811E', '0xFFFE2E2E', '0xFFFFD700'],
-          ['0xFF58D3F7', '0xFF2E9AFE', '0xFF2E64FE', '0xFFFE2E2E', '0xFFFFD700']]
-if __perfil__ < 3:
-    color1, color2, color3, color4, color5 = perfil[__perfil__]
-else:
-    color1 = color2 = color3 = color4 = color5 = ""
-
-host = "http://animemovil.com"
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(Item(channel=item.channel, action="recientes", title="Episodios Recientes", thumbnail=item.thumbnail,
-                         url=host, text_color=color1, contentType="tvshow", extra="recientes"))
-
-    itemlist.append(Item(channel=item.channel, action="listado", title="Anime", thumbnail=item.thumbnail,
-             url=host+'/api/buscador?q=&letra=ALL&genero=ALL&estado=2&offset=0&limit=20', text_color=color1, contentType="tvshow", extra="recientes"))
-
-    itemlist.append(Item(channel=item.channel, action="list_by_json", title="En emisión", thumbnail=item.thumbnail,
-                         text_color=color2, contentType="tvshow"))
-    itemlist.append(Item(channel=item.channel, action="indices", title="Índices", thumbnail=item.thumbnail,
-                         text_color=color2))
-
-
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar...",
-                         thumbnail=item.thumbnail, text_color=color3))
-
-    itemlist.append(item.clone(title="Configurar canal", action="openconfig", text_color=color5, folder=False))
-    if renumbertools.context:
-        itemlist = renumbertools.show_option(item.channel, itemlist)
-
-
-    return itemlist
-
-
-def openconfig(item):
-    ret = platformtools.show_channel_settings()
-    platformtools.itemlist_refresh()
-    return ret
-
-
-def search(item, texto):
-    item.url = "%s/api/buscador?q=%s&letra=ALL&genero=ALL&estado=2&offset=0&limit=30" % (host, texto.replace(" ", "+"))
-    return list_by_json(item)
-
-
-def recientes(item):
-    logger.info()
-    item.contentType = "tvshow"
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r'\n|\s{2,}','', data)
-
-    bloque = scrapertools.find_single_match(data, '<ul class="hover">(.*?)</ul>')
-    patron = '<li><a href="([^"]+)" title="([^"]+)".*?src="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(bloque, patron)
-    for url, title, thumb in matches:
-        url = host + url
-
-        try:
-            contentTitle = re.split(r"(?i) \d+ (?:Sub Español|Audio Español|Español Latino)", title)[0]
-        except:
-            contentTitle = ""
-        contentTitle = re.sub(r"(?i) Ova| Especiales| \(Pelicula[s]*\)| \(Película[s]*\)| Sub| Español| Peliculas| Audio| Latino", "", contentTitle)
-
-        tipo = "tvshow"
-        show = contentTitle
-        action = "episodios"
-        context = renumbertools.context(item)
-        if item.extra == "recientes":
-            action = "findvideos"
-            context = ""
-        if not item.extra and (url.endswith("-pelicula/") or url.endswith("-pelicula")):
-            tipo = "movie"
-            show = ""
-            action = "peliculas"
-        if not thumb.startswith("http"):
-            thumb = "http:%s" % thumb
-        infoLabels = {'filtro': {"original_language": "ja"}.items()}
-        itemlist.append(item.clone(action=action, title=title, url=url, thumbnail=thumb, text_color=color3,
-                                   contentTitle=contentTitle, contentSerieName=show, infoLabels=infoLabels,
-                                   thumb_=thumb, contentType=tipo, context=context))
-
-    try:
-        from core import tmdb
-        tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__)
-        if item.extra and itemlist:
-            for it in itemlist:
-                it.thumbnail = it.thumb_
-    except:
-        pass
-
-    return itemlist
-
-
-def listado(item):
-    logger.info()
-    itemlist = []
-    data = jsontools.load(httptools.downloadpage(item.url).data)
-    status = data.get('status')
-    data= data.get('result')
-    for it in data.get("items", []):
-        scrapedtitle = it["title"]
-        url = "%s/%s/" % (host, it["slug"])
-        thumb = 'http://media.animemovil.com/animes/%s/wallpaper_small.jpg' % it['id']
-        title = re.sub(r"(?i) Ova| Especiales| \(Pelicula[s]*\)| \(Película[s]*\)| Sub| Español| Peliculas| Audio| Latino", "", scrapedtitle)
-
-        tipo = "tvshow"
-        show = title
-        action = "episodios"
-        if url.endswith("-pelicula/") or url.endswith("-pelicula"):
-            tipo = "movie"
-            show = ""
-            action = "peliculas"
-        infoLabels = {'filtro': {"original_language": "ja"}.items()}
-        itemlist.append(item.clone(action=action, title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3,
-                                   contentTitle=title, contentSerieName=show, infoLabels=infoLabels,
-                                   context=renumbertools.context(item), contentType=tipo))
-    try:
-        from core import tmdb
-        tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__)
-    except:
-        pass
-
-    if status and itemlist:
-        offset = scrapertools.find_single_match(item.url, 'offset=(\d+)')
-        if offset:
-            offset = int(offset) + 2
-        else:
-            offset = 0
-        url = re.sub(r'offset=\d+', 'offset=%s' % offset, item.url)
-        itemlist.append(Item(channel=item.channel, action="listado", url=url, title=">> Página Siguiente",
-                             thumbnail=item.thumbnail, text_color=color2))
-
-    return itemlist
-
-
-def indices(item):
-    logger.info()
-    itemlist = []
-    
-    if "Índices" in item.title:
-        itemlist.append(item.clone(title="Por Género", url="%s/anime" % host))
-        itemlist.append(item.clone(title="Por Letra", url="%s/anime" % host))
-        itemlist.append(item.clone(action="list_by_json", title="Lista completa de Animes",
-                        url="%s/api/buscador?q=&letra=ALL&genero=ALL&estado=2&offset=0&limit=20" % host))
-    else:
-        data = httptools.downloadpage(item.url).data
-        data = re.sub('\n|\s{2,}', '', data)
-        if 'Letra' in item.title:
-            bloque = scrapertools.find_single_match(data, '<select name="letra"(.*?)</select>')
-            patron = '<option value="(\w)"'
-        elif 'Género' in item.title:
-            bloque = scrapertools.find_single_match(data, '<select name="genero"(.*?)</select>')
-            patron = '<option value="(\d+.*?)/'
-
-        matches = scrapertools.find_multiple_matches(bloque, patron)
-
-        for title in matches:
-            if "Letra" in item.title:
-                url = '%s/api/buscador?q=&letra=%s&genero=ALL&estado=2&offset=0&limit=20' % (host, title)
-            else:
-                value = scrapertools.find_single_match(title, '(\d+)"')
-                title = scrapertools.find_single_match(title, '\d+">(.*?)<')
-                url = '%s/api/buscador?q=&letra=ALL&genero=%s&estado=2&offset=0&limit=20' % (host, value)
-
-            itemlist.append(item.clone(action="list_by_json", url=url, title=title))
-        
-    return itemlist
-
-
-def episodios(item):
-    logger.info()
-
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub('\n|\s{2,}', '', data)
-    show = scrapertools.find_single_match(data, '<div class="x-title">(.*?)</div>')
-    show = re.sub(r"(?i) Ova| Especiales| \(Pelicula[s]*\)| \(Película[s]*\)| Sub| Español| Peliculas| Audio| Latino", "", show)
-    
-    if not item.infoLabels["plot"]:
-        item.infoLabels["plot"] = scrapertools.find_single_match(data, '<div class="x-sinopsis">\s*(.*?)</div>')
-
-    bloque = scrapertools.find_single_match(data, '<ul class="list"(.*?)</ul>')
-    matches = scrapertools.find_multiple_matches(bloque, '<li><a href="([^"]+)" title="([^"]+)"')
-    for url, title in matches:
-        url = host + url
-        epi = scrapertools.find_single_match(title, '.+?(\d+) (?:Sub|Audio|Español)')
-        #epi = scrapertools.find_single_match(title, '(?i)%s.*? (\d+) (?:Sub|Audio|Español)' % item.contentSerieName)
-        new_item = item.clone(action="findvideos", url=url, title=title, extra="")
-        if epi:
-            if "Especial" in title:
-                epi=0
-            season, episode = renumbertools.numbered_for_tratk(
-                item.channel, item.contentSerieName, 1, int(epi))
-            new_item.infoLabels["episode"] = episode
-            new_item.infoLabels["season"] = season
-            new_item.title = "%sx%s %s" % (season, episode, title)
-        itemlist.append(new_item)
-
-    if item.infoLabels.get("tmdb_id") or item.extra == "recientes" or item.extra == "completo":
-        try:
-            from core import tmdb
-            tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__)
-        except:
-            pass
-
-    if config.get_videolibrary_support() and itemlist:
-        itemlist.append(Item(channel=item.channel, title="Añadir serie a la videoteca", url=item.url,
-                             action="add_serie_to_library", extra="episodios", contentTitle=item.contentTitle,
-                             contentSerieName=item.contentSerieName, text_color=color4, fanart=item.fanart,
-                             thumbnail=item.thumbnail))
-
-    return itemlist
-
-
-def list_by_json(item):
-    logger.info()
-    itemlist = []
-    repeat = 1
-    status = False
-    if item.url =='':
-        item.url = host+"/api/buscador?limit=30&estado=1&dia=%s"
-        repeat = 6
-    for element in range(0,repeat):
-        if repeat != 1:
-            data = jsontools.load(httptools.downloadpage(item.url % element).data)
-        else:
-            data = jsontools.load(httptools.downloadpage(item.url).data)
-
-        status = data.get('status')
-        json_data = data.get('result')
-        elem_data = json_data['items']
-
-        for item_data in elem_data:
-            url = '%s/%s/' % (host, item_data['slug'])
-            title = item_data['title']
-            title = re.sub(r"(?i) Ova| Especiales| \(Pelicula[s]*\)| \(Película[s]*\)| Sub Español| Peliculas", "",
-                           title)
-            thumb = 'http://media.animemovil.com/animes/%s/wallpaper_small.jpg' % item_data['id']
-            infoLabels = {'filtro': {"original_language": "ja"}.items()}
-            itemlist.append(
-                item.clone(action="episodios", title=title, url=url, thumbnail=thumb, text_color=color3,
-                           contentTitle=title, contentSerieName=title, extra="recientes",
-                           context=renumbertools.context(item), infoLabels=infoLabels))
-    if status and itemlist:
-        offset = scrapertools.find_single_match(item.url, 'offset=(\d+)')
-        if offset:
-            offset = int(offset) + 2
-        else:
-            offset = 0
-        url = re.sub(r'offset=\d+', 'offset=%s' % offset, item.url)
-        itemlist.append(Item(channel=item.channel, action="listado", url=url, title=">> Página Siguiente",
-                             thumbnail=item.thumbnail, text_color=color2))
-    return itemlist
-
-    
-def findvideos(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r'\n|\s{2,}', '', data)
-    strm_id = scrapertools.find_single_match(data, '"id": (.*?),')
-    streams = scrapertools.find_single_match(data, '"stream": (.*?)};')
-    dict_strm = jsontools.load(streams)
-    base_url = 'http:%s%s/' % (dict_strm['accessPoint'], strm_id)
-    for server in dict_strm['servers']:
-        expire = dict_strm['expire']
-        signature = dict_strm['signature']
-        last_modify = dict_strm['last_modify']
-        callback = 'playerWeb'
-
-        strm_url = base_url +'%s?expire=%s&callback=%s&signature=%s&last_modify=%s' % (server, expire, callback,
-                                                                                       signature, last_modify)
-        try:
-            strm_data = httptools.downloadpage(strm_url).data
-            strm_data = scrapertools.unescape(strm_data)
-            title = '%s'
-            language = ''
-            if server not in ['fire', 'meph']:
-                urls = scrapertools.find_multiple_matches(strm_data, '"(?:file|src)"*?:.*?"(.*?)"')
-                for url in urls:
-                    if url != '':
-                        url = url.replace ('\\/','/')
-                        itemlist.append(Item(channel=item.channel, title=title, url=url, action='play'))
-            elif server in ['fire', 'mpeh']:
-                url = scrapertools.find_single_match(strm_data, 'xmlhttp.open(\"GET\", \"(.*?)\"')
-                if url != '':
-                    url = url.replace('\\/', '/')
-                    itemlist.append(Item(channel=item.channel, title=url, url=url, action='play'))
-            else:
-                continue
-        except:
-            pass
-
-
-    servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server)
-    return itemlist
-
-def newest(categoria):
-    logger.info()
-    item = Item()
-    try:
-        item.url = host
-        item.extra = "novedades"
-        itemlist = recientes(item)
-    # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-    return itemlist
diff --git a/plugin.video.alfa/channels/animeshd.py b/plugin.video.alfa/channels/animeshd.py
index ea2504a0..18d53b81 100644
--- a/plugin.video.alfa/channels/animeshd.py
+++ b/plugin.video.alfa/channels/animeshd.py
@@ -10,7 +10,7 @@ from channelselector import get_thumb
 from core import tmdb
 from core.item import Item
 from platformcode import logger, config
-from channels import autoplay
+from channels import autoplay, renumbertools
 from channels import filtertools
 
 tgenero = {"Comedia": "https://s7.postimg.cc/ne9g9zgwb/comedia.png",
@@ -33,8 +33,8 @@ tgenero = {"Comedia": "https://s7.postimg.cc/ne9g9zgwb/comedia.png",
 
 host = "http://www.animeshd.tv"
 
-__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'poseidonhd')
-__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'poseidonhd')
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animeshd')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'animeshd')
 
 
 IDIOMAS = {'Castellano':'CAST','Latino': 'LAT', 'Subtitulado': 'VOSE'}
@@ -83,7 +83,7 @@ def mainlist(item):
                                ))
 
     itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality)
-
+    itemlist = renumbertools.show_option(item.channel, itemlist)
     autoplay.show_option(item.channel, itemlist)
 
 
@@ -113,7 +113,9 @@ def lista(item):
     patron = 'class="anime"><a href="([^"]+)">'
     patron +='<div class="cover" style="background-image: url\((.*?)\)">.*?<h2>([^<]+)<\/h2>'
     matches = re.compile(patron, re.DOTALL).findall(data)
-
+    context = renumbertools.context(item)
+    context2 = autoplay.context
+    context.extend(context2)
     for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
         url = scrapedurl
         thumbnail = host + scrapedthumbnail
@@ -191,10 +193,11 @@ def episodios(item):
     infoLabels = item.infoLabels
     for scrapedurl, scrapedlang, scrapedtitle, episode in matches:
         language = scrapedlang
-        title = scrapedtitle + " " + "1x" + episode
+        season, episode = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, 1, int(episode))
+        title = scrapedtitle + " " + str(season) +"x" + str(episode)
         url = scrapedurl
-        infoLabels['season'] ='1'
-        infoLabels['episode'] = episode
+        infoLabels['season'] = str(season)
+        infoLabels['episode'] = str(episode)
 
         itemlist.append(Item(channel=item.channel, title=title, contentSerieName=item.contentSerieName, url=url,
                              action='findvideos', language=IDIOMAS[language], infoLabels=infoLabels))
@@ -211,22 +214,32 @@ def episodios(item):
 
 def findvideos(item):
     logger.info()
-
+    from channels.pelisplus import add_vip
     itemlist = []
 
     data = get_source(item.url)
-    patron = "<option value=(.*?) data-content=.*?width='16'> (.*?) <span class='text-muted'>"
+    patron = "<option value=\"([^\"]+)\" data-content=.*?width='16'> (.*?) <span class='text-muted'>"
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, language in matches:
-        if 'jpg' in scrapedurl:
-            vip_data = httptools.downloadpage(scrapedurl, follow_redirects=False)
-            scrapedurl = vip_data.headers['location']
-        title = '%s [%s]'
-        itemlist.append(item.clone(title=title, url=scrapedurl.strip(), action='play',
-                        language=IDIOMAS[language]))
+        vip = False
+        if not config.get_setting('unify'):
+            title = ' [%s]' % IDIOMAS[language]
+        else:
+            title = ''
+        if 'pelisplus.net' in scrapedurl:
+            itemlist += add_vip(item, scrapedurl, IDIOMAS[language])
+            vip = True
+        elif 'server' in scrapedurl:
+            new_data = get_source(scrapedurl)
+            scrapedurl = scrapertools.find_single_match(new_data, '<iframe src="([^"]+)"')
 
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % (x.server.capitalize(), x.language))
+
+        if not vip:
+            itemlist.append(item.clone(title='%s'+title, url=scrapedurl.strip(), action='play',
+                            language=IDIOMAS[language]))
+
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % x.server.capitalize())
 
     if __comprueba_enlaces__:
         itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
diff --git a/plugin.video.alfa/channels/animeyt.json b/plugin.video.alfa/channels/animeyt.json
deleted file mode 100644
index 54ead4c4..00000000
--- a/plugin.video.alfa/channels/animeyt.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "id": "animeyt",
-  "name": "AnimeYT",
-  "active": true,
-  "adult": false,
-  "language": "cast, lat",
-  "thumbnail": "http://i.imgur.com/dHpupFk.png",
-  "categories": [
-    "anime",
-    "vos"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": false,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "modo_grafico",
-      "type": "bool",
-      "label": "información extra",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
diff --git a/plugin.video.alfa/channels/animeyt.py b/plugin.video.alfa/channels/animeyt.py
deleted file mode 100644
index 40e78e1a..00000000
--- a/plugin.video.alfa/channels/animeyt.py
+++ /dev/null
@@ -1,510 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from channels import renumbertools
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from core import tmdb
-from platformcode import config,logger
-
-import gktools, random, time, urllib
-
-__modo_grafico__ = config.get_setting('modo_grafico', 'animeyt')
-
-HOST = "http://animeyt.tv/"
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = list()
-
-    itemlist.append(Item(channel=item.channel, title="Novedades", action="novedades", url=HOST))
-
-    itemlist.append(Item(channel=item.channel, title="Recientes", action="recientes", url=HOST))
-    
-    itemlist.append(Item(channel=item.channel, title="Alfabético", action="alfabetico", url=HOST))
-
-    itemlist.append(Item(channel=item.channel, title="Búsqueda", action="search", url=urlparse.urljoin(HOST, "busqueda?terminos=")))
-
-    itemlist = renumbertools.show_option(item.channel, itemlist)
-
-    return itemlist
-
-
-def novedades(item):
-    logger.info()
-    itemlist = list()
-    if not item.pagina:
-        item.pagina = 0
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-
-    patron_novedades = '<div class="capitulos-portada">[\s\S]+?<h2>Comentarios</h2>'
-
-    data_novedades = scrapertools.find_single_match(data, patron_novedades)
-
-    patron = 'href="([^"]+)"[\s\S]+?src="([^"]+)"[^<]+alt="([^"]+) (\d+)([^"]+)'
-
-    matches = scrapertools.find_multiple_matches(data_novedades, patron)
-    
-    for url, img, scrapedtitle, eps, info in matches[item.pagina:item.pagina + 20]:
-        title = scrapedtitle + " " + "1x" + eps + info
-        title = title.replace("Sub Español", "").replace("sub español", "")
-        infoLabels = {'filtro': {"original_language": "ja"}.items()}
-        itemlist.append(Item(channel=item.channel, title=title, url=url, thumb=img, action="findvideos", contentTitle=scrapedtitle, contentSerieName=scrapedtitle, infoLabels=infoLabels, contentType="tvshow"))
-    try:
-        from core import tmdb
-        tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__)
-        for it in itemlist:
-                it.thumbnail = it.thumb
-    except:
-        pass
-    
-    if len(matches) > item.pagina + 20:
-        pagina = item.pagina + 20
-        itemlist.append(item.clone(channel=item.channel, action="novedades", url=item.url, title=">> Página Siguiente", pagina=pagina))
-
-    return itemlist
-
-
-def alfabetico(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-
-    
-    for letra in '0ABCDEFGHIJKLMNOPQRSTUVWXYZ':
-        titulo = letra
-        if letra == "0":
-            letra = "num"
-        itemlist.append(Item(channel=item.channel, action="recientes", title=titulo,
-                             url=urlparse.urljoin(HOST, "animes?tipo=0&genero=0&anio=0&letra={letra}".format(letra=letra))))
-
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-
-    texto = texto.replace(" ","+")
-    item.url = item.url+texto
-    if texto!='':
-       return recientes(item)
-
-
-def recientes(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-
-    patron_recientes = '<article class="anime">[\s\S]+?</main>'
-
-    data_recientes = scrapertools.find_single_match(data, patron_recientes)
-
-    patron = '<a href="([^"]+)"[^<]+<img src="([^"]+)".+?js-synopsis-reduce">(.*?)<.*?<h3 class="anime__title">(.*?)<small>(.*?)</small>'
-
-    matches = scrapertools.find_multiple_matches(data_recientes, patron)
-
-    for url, thumbnail, plot, title, cat in matches:
-        itemlist.append(item.clone(title=title, url=url, action="episodios", show=title, thumbnail=thumbnail, plot=plot, cat=cat, context=renumbertools.context(item)))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb = True)
-
-    paginacion = scrapertools.find_single_match(data, '<a class="pager__link icon-derecha last" href="([^"]+)"')
-    paginacion = scrapertools.decodeHtmlentities(paginacion)
-
-    if paginacion:
-        itemlist.append(Item(channel=item.channel, action="recientes", title=">> Página Siguiente", url=paginacion))
-
-    return itemlist
-
-
-def episodios(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-  
-    patron = '<span class="icon-triangulo-derecha"></span>.*?<a href="([^"]+)">([^"]+) (\d+)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-
-    for url, scrapedtitle, episode in matches:
-        
-        season = 1
-        episode = int(episode)
-        season, episode = renumbertools.numbered_for_tratk(item.channel, scrapedtitle, season, episode)
-        title = "%sx%s %s" % (season, str(episode).zfill(2), scrapedtitle)
-        itemlist.append(item.clone(title=title, url=url, action='findvideos'))
-        
-    if config.get_videolibrary_support:
-        itemlist.append(Item(channel=item.channel, title="Añadir serie a la biblioteca", url=item.url, action="add_serie_to_library", extra="episodios", show=item.show))
-        
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    duplicados = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-
-    from collections import OrderedDict # cambiado dict por OrderedDict para mantener el mismo orden que en la web
-
-    matches = scrapertools.find_multiple_matches(data, '<li><a id="mirror(\d*)" class="link-veranime[^"]*" href="[^"]*">([^<]*)')
-    d_links = OrderedDict(matches)
-
-    matches = scrapertools.find_multiple_matches(data, 'if \(mirror == (\d*)\).*?iframe src="([^"]*)"')
-    d_frames = OrderedDict(matches)
-
-    for k in d_links:
-        if k in d_frames and d_frames[k] != '':
-            tit = scrapertools.find_single_match(d_frames[k], '/([^\./]*)\.php\?')
-            if tit == '':
-                tit = 'mega' if 'mega.nz/' in d_frames[k] else 'dailymotion' if 'dailymotion.com/' in d_frames[k] else'noname'
-            if tit == 'id' and 'yourupload.com/' in d_frames[k]: tit = 'yourupload'
-            title = 'Opción %s (%s)' % (d_links[k], tit)
-            
-            itemlist.append(item.clone(channel=item.channel, folder=False, title=title, action="play", url=d_frames[k], referer=item.url))
-
-
-    if item.extra != "library":
-        if config.get_videolibrary_support() and item.extra:
-            itemlist.append(item.clone(channel=item.channel, title="[COLOR yellow]Añadir pelicula a la videoteca[/COLOR]", url=item.url, action="add_pelicula_to_library", extra="library", contentTitle=item.show, contentType="movie"))
-
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    
-    if item.url.startswith('https://www.dailymotion.com/'):
-        itemlist.append(item.clone(url=item.url, server='dailymotion'))
-
-    elif item.url.startswith('https://mega.nz/'):
-        itemlist.append(item.clone(url=item.url.replace('embed',''), server='mega'))
-
-    elif item.url.startswith('https://s2.animeyt.tv/rakuten.php?'):
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="google-site-verification" content="([^"]*)"')
-        if not gsv: return itemlist
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '3497510'
-
-        token = gktools.generar_token('"'+gsv+'"', suto+'yt'+suto+sufijo)
-
-        link, subtitle = gktools.get_play_link_id(data, item.url)
-        
-        url = 'https://s2.animeyt.tv/rakuten/plugins/gkpluginsphp.php'
-        post = "link=%s&token=%s" % (link, token)
-
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer, subtitle)
-
-
-    elif item.url.startswith('https://s3.animeyt.tv/amz.php?'):
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        v_token = scrapertools.find_single_match(data, "var v_token='([^']*)'")
-        if not gsv or not v_token: return itemlist
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '9457610'
-
-        token = gktools.generar_token('"'+gsv+'"', suto+'yt'+suto+sufijo)
-
-        url = 'https://s3.animeyt.tv/amz_animeyts.php'
-        post = "v_token=%s&token=%s&handler=%s" % (v_token, token, 'Animeyt')
-        
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    elif item.url.startswith('https://s2.animeyt.tv/lola.php?'):
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        s_cd, s_file = scrapertools.find_single_match(data, "var cd='([^']*)';\s*var file='([^']*)'")
-        if not gsv or not s_cd or not s_file: return itemlist
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '8134976'
-
-        token = gktools.generar_token('"'+gsv+'"', suto+'yt'+suto+sufijo)
-
-        url = 'https://s2.animeyt.tv/minha_animeyt.php'
-        post = "cd=%s&file=%s&token=%s&handler=%s" % (s_cd, s_file, token, 'Animeyt')
-        
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    elif item.url.startswith('https://s4.animeyt.tv/chumi.php?'): #https://s4.animeyt.tv/chumi.php?cd=3481&file=4
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        s_cd, s_file = scrapertools.find_single_match(item.url, '\?cd=([^&]*)&file=([^&]*)')
-        if not gsv or not s_cd or not s_file: return itemlist
-        
-        ip = gktools.toHex(gsv) + str(1000000 + random.randint(0,9000000)) + str(100000 + random.randint(0,900000))
-        
-        gsv_bis = gktools.transforma_gsv(gsv, '159753')
-        p1 = '1705f5652bb6546ab3643ff698e' + gsv[-5:]
-        p2 = '8388ca3fd07' + gsv[-5:] + gsv_bis
-        
-        texto = gktools.toHex(gktools.encode_rijndael(gsv, p1, p2))
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '147268278' + gsv[-5:]
-        prefijo = gsv[:-5] + gsv_bis
-
-        token = gktools.generar_token('"'+texto+'"', prefijo+suto+'yt'+suto+sufijo)
-        archive = gktools.toHex(token)
-
-        url = 'https://s4.animeyt.tv/minha/minha_animeyt.php'
-        post = "cd=%s&id=%s&archive=%s&ip=%s&Japan=%s" % (s_cd, s_file, archive, ip, 'Asia')
-        
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    elif item.url.startswith('https://s3.animeyt.tv/mega.php?'): #https://s3.animeyt.tv/mega.php?v=WmpHMEVLVTNZZktyaVAwai9sYzhWV1ZRTWh0WTZlNGZ3VzFVTXhMTkx2NGlOMjRYUHhZQlMvaUFsQlJFbHBVTA==
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        s_v = scrapertools.find_single_match(item.url, '\?v=([^&]*)')
-        if not gsv or not s_v: return itemlist
-        
-        ip = gktools.toHex(gsv) + str(1000000 + random.randint(0,9000000)) + str(100000 + random.randint(0,900000))
-        
-        gsv_bis = gktools.transforma_gsv(gsv, '159753')
-        p1 = '1705f5652bb6546ab3643ff698e' + gsv[-5:]
-        p2 = '8388ca3fd07' + gsv[-5:] + gsv_bis
-        
-        texto = gktools.toHex(gktools.encode_rijndael(gsv, p1, p2))
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '147268278' + gsv[-5:]
-        prefijo = gsv[:-5] + gsv_bis
-
-        token = gktools.generar_token('"'+texto+'"', prefijo+suto+'yt'+suto+sufijo)
-        archive = gktools.toHex(token)
-
-        url = 'https://s3.animeyt.tv/mega_animeyts.php'
-        post = "v=%s&archive=%s&referer=%s&ip=%s&Japan=%s" % (s_v, archive, item.url, ip, 'Asia')
-
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    elif item.url.startswith('https://s2.animeyt.tv/naruto/naruto.php?'): #https://s2.animeyt.tv/naruto/naruto.php?id=3477&file=11.mp4
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        s_id, s_file = scrapertools.find_single_match(item.url, '\?id=([^&]*)&file=([^&]*)')
-        if not gsv or not s_id or not s_file: return itemlist
-        
-        ip = gktools.toHex(gsv) + str(1000000 + random.randint(0,9000000)) + str(100000 + random.randint(0,900000))
-        
-        gsv_bis = gktools.transforma_gsv(gsv, '159753')
-        p1 = '1705f5652bb6546ab3643ff698e' + gsv[-5:]
-        p2 = '8388ca3fd07' + gsv[-5:] + gsv_bis
-        
-        texto = gktools.toHex(gktools.encode_rijndael(gsv, p1, p2))
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '147268278' + gsv[-5:]
-        prefijo = gsv[:-5] + gsv_bis
-
-        token = gktools.generar_token('"'+texto+'"', prefijo+suto+'yt'+suto+sufijo)
-        archive = gktools.toHex(token)
-
-        url = 'https://s2.animeyt.tv/naruto/narutos_animeyt.php'
-        post = "id=%s&file=%s&archive=%s&referer=%s&ip=%s&Japan=%s" % (s_id, s_file, archive, urllib.quote(item.url), ip, 'Asia')
-
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    elif item.url.startswith('https://s4.animeyt.tv/facebook.php?'): #https://s4.animeyt.tv/facebook.php?cd=3481&id=4
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        s_cd, s_id = scrapertools.find_single_match(item.url, '\?cd=([^&]*)&id=([^&]*)')
-        if not gsv or not s_cd or not s_id: return itemlist
-        
-        ip = gktools.toHex(gsv) + str(1000000 + random.randint(0,9000000)) + str(100000 + random.randint(0,900000))
-        
-        gsv_bis = gktools.transforma_gsv(gsv, '159753')
-        p1 = '1705f5652bb6546ab3643ff698e' + gsv[-5:]
-        p2 = '8388ca3fd07' + gsv[-5:] + gsv_bis
-        
-        texto = gktools.toHex(gktools.encode_rijndael(gsv, p1, p2))
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '147268278' + gsv[-5:]
-        prefijo = gsv[:-5] + gsv_bis
-
-        token = gktools.generar_token('"'+texto+'"', prefijo+suto+'yt'+suto+sufijo)
-        archive = gktools.toHex(token)
-
-        url = 'https://s4.animeyt.tv/facebook/facebook_animeyts.php'
-        post = "cd=%s&id=%s&archive=%s&referer=%s&ip=%s&Japan=%s" % (s_cd, s_id, archive, urllib.quote(item.url), ip, 'Asia')
-
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    elif item.url.startswith('https://s.animeyt.tv/v4/media.php?'): #https://s.animeyt.tv/v4/media.php?id=SmdMQ2Y0NUhFK2hOZlYzbVJCbnE3QT09
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        s_id = scrapertools.find_single_match(item.url, '\?id=([^&]*)')
-        if not gsv or not s_id: return itemlist
-        
-        ip = gktools.toHex(gsv) + str(1000000 + random.randint(0,9000000)) + str(100000 + random.randint(0,900000))
-        
-        gsv_bis = gktools.transforma_gsv(gsv, '159753')
-        p1 = '1705f5652bb6546ab3643ff698e' + gsv[-5:]
-        p2 = '8388ca3fd07' + gsv[-5:] + gsv_bis
-        
-        texto = gktools.toHex(gktools.encode_rijndael(gsv, p1, p2))
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '8049762' + gsv[-5:]
-        prefijo = gsv[:-5] + gsv_bis
-
-        token = gktools.generar_token('"'+texto+'"', prefijo+suto+'yt'+suto+sufijo)
-        archive = gktools.toHex(token)
-
-        url = 'https://s.animeyt.tv/v4/gsuite_animeyts.php'
-        post = "id=%s&archive=%s&ip=%s&Japan=%s" % (s_id, archive, ip, 'Asia')
-        
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    elif item.url.startswith('https://s10.animeyt.tv/yourupload.com/id.php?'): #https://s10.animeyt.tv/yourupload.com/id.php?id=62796D77774A4E4363326642
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        s_id = scrapertools.find_single_match(item.url, '\?id=([^&]*)')
-        if not gsv or not s_id: return itemlist
-        
-        ip = gktools.toHex(gsv) + str(1000000 + random.randint(0,9000000)) + str(100000 + random.randint(0,900000))
-        
-        gsv_bis = gktools.transforma_gsv(gsv, '159753')
-        p1 = '1705f5652bb6546ab3643ff698e' + gsv[-5:]
-        p2 = '8388ca3fd07' + gsv[-5:] + gsv_bis
-        
-        texto = gktools.toHex(gktools.encode_rijndael(gsv, p1, p2))
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '8049762' + gsv[-5:]
-        prefijo = gsv[:-5] + gsv_bis
-
-        token = gktools.generar_token('"'+texto+'"', prefijo+suto+'yt'+suto+sufijo)
-        archive = gktools.toHex(token)
-
-        url = 'https://s10.animeyt.tv/yourupload.com/chinese_streaming.php'
-        post = "id=%s&archive=%s&ip=%s&Japan=%s" % (s_id, archive, ip, 'Asia')
-        
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    elif item.url.startswith('https://s4.animeyt.tv/onedrive.php?'): #https://s4.animeyt.tv/onedrive.php?cd=3439&id=12
-        # 1- Descargar
-        data, ck = gktools.get_data_and_cookie(item)
-
-        # 2- Calcular datos
-        gsv = scrapertools.find_single_match(data, '<meta name="Animeyt-Token" content="([^"]*)"')
-        s_cd, s_id = scrapertools.find_single_match(item.url, '\?cd=([^&]*)&id=([^&]*)')
-        if not gsv or not s_cd or not s_id: return itemlist
-        
-        ip = gktools.toHex(gsv) + str(1000000 + random.randint(0,9000000)) + str(100000 + random.randint(0,900000))
-        
-        gsv_bis = gktools.transforma_gsv(gsv, '159753')
-        p1 = '1705f5652bb6546ab3643ff698e' + gsv[-5:]
-        p2 = '8388ca3fd07' + gsv[-5:] + gsv_bis
-        
-        texto = gktools.toHex(gktools.encode_rijndael(gsv, p1, p2))
-
-        suto = gktools.md5_dominio(item.url)
-        sufijo = '147268278' + gsv[-5:]
-        prefijo = gsv[:-5] + gsv_bis
-
-        token = gktools.generar_token('"'+texto+'"', prefijo+suto+'yt'+suto+sufijo)
-        archive = gktools.toHex(token)
-
-        url = 'https://s4.animeyt.tv/onedrive/onedrive_animeyts.php'
-        post = "cd=%s&id=%s&archive=%s&ip=%s&Japan=%s" % (s_cd, s_id, archive, ip, 'Asia')
-        
-        # 3- Descargar json
-        data = gktools.get_data_json(url, post, ck, item.url)
-
-        # 4- Extraer enlaces
-        itemlist = gktools.extraer_enlaces_json(data, item.referer)
-
-
-    return itemlist
diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py
index ac4e623c..733a4eda 100644
--- a/plugin.video.alfa/channels/anitoonstv.py
+++ b/plugin.video.alfa/channels/anitoonstv.py
@@ -116,7 +116,7 @@ def lista(item):
             itemlist.append(item.clone(title=scrapedtitle, contentSerieName=show,url=scrapedurl, plot=scrapedplot,
         	   thumbnail=scrapedthumbnail, action="episodios", context=context))
     tmdb.set_infoLabels(itemlist, seekTmdb=True)
-    itemlist.append(Item(channel=item.channel, url=item.url, range=next_page, title='Pagina Siguente >>>', contentTitle=item.title, action='lista'))
+    itemlist.append(Item(channel=item.channel, url=item.url, range=next_page, title='Pagina Siguente >>>', contentTitle=item.contentTitle, action='lista'))
 
     return itemlist
 
diff --git a/plugin.video.alfa/channels/asialiveaction.py b/plugin.video.alfa/channels/asialiveaction.py
index 75c37dec..ad2d930b 100644
--- a/plugin.video.alfa/channels/asialiveaction.py
+++ b/plugin.video.alfa/channels/asialiveaction.py
@@ -25,14 +25,14 @@ def mainlist(item):
     autoplay.init(item.channel, list_servers, list_quality)
     itemlist = list()
     itemlist.append(Item(channel=item.channel, action="lista", title="Peliculas",
-                             url=urlparse.urljoin(host, "p/peliculas.html"), type='pl', first=0))
-    itemlist.append(Item(channel=item.channel, action="lista", title="Series",
-                         url=urlparse.urljoin(host, "p/series.html"), type='sr', first=0))
+                             url=urlparse.urljoin(host, "/category/pelicula"), type='pl', pag=1))
+    #itemlist.append(Item(channel=item.channel, action="lista", title="Series",
+    #                     url=urlparse.urljoin(host, "/category/serie"), type='sr', pag=1))
     itemlist.append(Item(channel=item.channel, action="category", title="Géneros", url=host, cat='genre'))
     itemlist.append(Item(channel=item.channel, action="category", title="Calidad", url=host, cat='quality'))
     itemlist.append(Item(channel=item.channel, action="category", title="Orden Alfabético", url=host, cat='abc'))
     itemlist.append(Item(channel=item.channel, action="category", title="Año de Estreno", url=host, cat='year'))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+"/search?q="))
+    #itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+"/search?q="))
     autoplay.show_option(item.channel, itemlist)
     return itemlist
 
@@ -43,18 +43,18 @@ def category(item):
     data = httptools.downloadpage(host).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     if item.cat == 'abc':
-        data = scrapertools.find_single_match(data, '<span>Orden Alfabético</span>.*?</ul>')
+        data = scrapertools.find_single_match(data, '<div class="Body Container">(.+?)<main>')
     elif item.cat == 'genre':
-        data = scrapertools.find_single_match(data, '<span>Géneros</span>.*?</ul>')
+        data = scrapertools.find_single_match(data, '<a>Géneros<\/a><ul class="sub.menu">(.+?)<a>Año<\/a>')
     elif item.cat == 'year':
-        data = scrapertools.find_single_match(data, '<span>Año</span>.*?</ul>')
+        data = scrapertools.find_single_match(data, '<a>Año<\/a><ul class="sub.menu">(.+?)<a>Idioma<\/a>')
     elif item.cat == 'quality':
-        data = scrapertools.find_single_match(data, '<span>Calidad</span>.*?</ul>')
-    patron = "<li.*?>([^<]+)<a href='([^']+)'>"
+        data = scrapertools.find_single_match(data, '<a>Calidad<\/a><ul class="sub-menu">(.+?)<a>Géneros<\/a>')
+    patron = '<li.*?><a href="(.*?)">(.*?)<\/a><\/li>'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedtitle, scrapedurl  in matches:
+    for scrapedurl,scrapedtitle  in matches:
         if scrapedtitle != 'Próximas Películas':
-            itemlist.append(item.clone(action='lista', title=scrapedtitle, url=host+scrapedurl, type='cat', first=0))
+            itemlist.append(item.clone(action='lista', title=scrapedtitle, url=host+scrapedurl, type='cat', pag=0))
     return itemlist
 
 
@@ -63,6 +63,7 @@ def search_results(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    logger.info(data)
     patron = '<span class=.post-labels.>([^<]+)</span>.*?class="poster-bg" src="([^"]+)"/>.*?<h4>.*?'
     patron +=">(\d{4})</a>.*?<h6>([^<]+)<a href='([^']+)"
     matches = scrapertools.find_multiple_matches(data, patron)
@@ -90,28 +91,6 @@ def search(item, texto):
     if texto != '':
         return search_results(item)
 
-
-def episodios(item):
-    logger.info()
-    itemlist = list()
-    data = httptools.downloadpage(item.url).data
-    data = data.replace('"ep0','"epp"')
-    patron  = '(?is)<div id="ep(\d+)".*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '(href.*?)fa fa-download'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedepi, scrapedthumbnail, scrapedurls in matches:
-        title="1x%s - %s" % (scrapedepi, item.contentSerieName)
-        urls = scrapertools.find_multiple_matches(scrapedurls, 'href="([^"]+)')
-        itemlist.append(item.clone(action='findvideos', title=title, url=item.url, thumbnail=scrapedthumbnail, type=item.type,
-                                   urls = urls, infoLabels=item.infoLabels))
-    if config.get_videolibrary_support() and len(itemlist) > 0:
-        itemlist.append(Item(channel=item.channel, title="[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]",
-                             url=item.url, action="add_serie_to_library", extra="episodios",
-                             contentSerieName=item.contentSerieName))
-    return itemlist
-
-
 def lista(item):
     logger.info()
     next = True
@@ -119,64 +98,37 @@ def lista(item):
 
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-
-    css_data = scrapertools.find_single_match(data, "<style id='page-skin-1' type='text/css'>(.*?)</style>")
-
-    data = scrapertools.find_single_match(data, "itemprop='headline'>.*?</h2>.*?</ul>")
-
-    patron = '<span class="([^"]+)">.*?<figure class="poster-bg">(.*?)<img src="([^"]+)" />'
-    patron += '(.*?)</figure><h6>([^<]+)</h6><a href="([^"]+)"></a>'
+        
+    patron = '<article .*?">'
+    patron += '<a href="([^"]+)"><.*?><figure.*?>' #scrapedurl
+    patron += '<img.*?src="([^"]+)".*?>.*?' #scrapedthumbnail
+    patron += '<h3 class=".*?">([^"]+)<\/h3>' #scrapedtitle
+    patron += '<span.*?>([^"]+)<\/span>.+?' #scrapedyear
+    patron += '<a.+?>([^"]+)<\/a>' #scrapedtype
     matches = scrapertools.find_multiple_matches(data, patron)
 
-    first = int(item.first)
-    last = first + 19
-    if last > len(matches):
-        last = len(matches)
-        next = False
+    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, scrapedtype in matches:
+        title="%s - %s" % (scrapedtitle,scrapedyear)
 
-    for scrapedtype, scrapedyear, scrapedthumbnail, scrapedquality, scrapedtitle, scrapedurl in matches[first:last]:
-        year = scrapertools.find_single_match(scrapedyear, '<span>(\d{4})</span>')
+        new_item = Item(channel=item.channel, title=title, url=scrapedurl, thumbnail=scrapedthumbnail,
+                       type=scrapedtype, infoLabels={'year':scrapedyear})
 
-        if not year:
-            class_year = scrapertools.find_single_match(scrapedyear, 'class="([^\"]+)"')
-            year = scrapertools.find_single_match(css_data, "\." + class_year + ":after {content:'(\d{4})';}")
-            if not year:
-                year = scrapertools.find_single_match(data, "headline'>(\d{4})</h2>")
-
-        qual = ""
-        if scrapedquality:
-            patron_qualities='<i class="([^"]+)"></i>'
-            qualities = scrapertools.find_multiple_matches(scrapedquality, patron_qualities)
-
-            for quality in qualities:
-                patron_desc = "\." + quality + ":after {content:'([^\']+)';}"
-                quality_desc = scrapertools.find_single_match(css_data, patron_desc)
-
-                qual = qual+ "[" + quality_desc + "] "
-
-        title="%s [%s] %s" % (scrapedtitle,year,qual)
-
-        new_item = Item(channel=item.channel, title=title, url=host+scrapedurl, thumbnail=scrapedthumbnail,
-                       type=scrapedtype, infoLabels={'year':year})
-
-        if scrapedtype.strip() == 'sr':
+        if scrapedtype == 'sr':
             new_item.contentSerieName = scrapedtitle
             new_item.action = 'episodios'
         else:
             new_item.contentTitle = scrapedtitle
             new_item.action = 'findvideos'
-
-        if scrapedtype == item.type or item.type == 'cat':
-            itemlist.append(new_item)
+            
+        itemlist.append(new_item)
 
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
     #pagination
-    url_next_page = item.url
-    first = last
-    if next:
-        itemlist.append(item.clone(title="Siguiente >>", url=url_next_page, action='lista', first=first))
-
+    pag = item.pag + 1
+    url_next_page = item.url+"/page/"+str(pag)+"/"
+    if len(itemlist)>19:
+        itemlist.append(item.clone(title="Siguiente >>", url=url_next_page, action='lista', pag=pag))
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/autoplay.py b/plugin.video.alfa/channels/autoplay.py
index 31f2275a..79c764b7 100644
--- a/plugin.video.alfa/channels/autoplay.py
+++ b/plugin.video.alfa/channels/autoplay.py
@@ -9,6 +9,7 @@ from platformcode import config, logger
 from platformcode import platformtools
 from platformcode import launcher
 from time import sleep
+from platformcode.config import get_setting
 
 __channel__ = "autoplay"
 
@@ -117,7 +118,7 @@ def start(itemlist, item):
     # Obtiene los ajustes des autoplay para este canal
     settings_node = channel_node.get('settings', {})
 
-    if settings_node['active']:
+    if get_setting('autoplay') or settings_node['active']:
         url_list_valid = []
         autoplay_list = []
         autoplay_b = []
@@ -142,7 +143,7 @@ def start(itemlist, item):
         #       2: Solo servidores
         #       3: Solo calidades
         #       4: No ordenar
-        if settings_node['custom_servers'] and settings_node['custom_quality']:
+        if (settings_node['custom_servers'] and settings_node['custom_quality']) or get_setting('autoplay'):
             priority = settings_node['priority']  # 0: Servidores y calidades o 1: Calidades y servidores
         elif settings_node['custom_servers']:
             priority = 2  # Solo servidores
@@ -391,14 +392,15 @@ def init(channel, list_servers, list_quality, reset=False):
             # Se comprueba que no haya calidades ni servidores duplicados
             if 'default' not in list_quality:
                 list_quality.append('default')
-            list_servers = list(set(list_servers))
-            list_quality = list(set(list_quality))
+            # list_servers = list(set(list_servers))
+            # list_quality = list(set(list_quality))
 
             # Creamos el nodo del canal y lo añadimos
             channel_node = {"servers": list_servers,
                             "quality": list_quality,
                             "settings": {
                                 "active": False,
+                                "plan_b": True,
                                 "custom_servers": False,
                                 "custom_quality": False,
                                 "priority": 0}}
@@ -455,7 +457,7 @@ def check_value(channel, itemlist):
 
     for item in itemlist:
         if item.server.lower() not in server_list and item.server !='':
-            server_list.append(item.server)
+            server_list.append(item.server.lower())
             change = True
         if item.quality not in quality_list and item.quality !='':
             quality_list.append(item.quality)
@@ -672,7 +674,7 @@ def is_active(channel):
     # Obtiene los ajustes des autoplay para este canal
     settings_node = channel_node.get('settings', {})
 
-    return settings_node.get('active', False)
+    return settings_node.get('active', False) or get_setting('autoplay')
 
 
 def reset(item, dict):
diff --git a/plugin.video.alfa/channels/beeg.py b/plugin.video.alfa/channels/beeg.py
index f3b68b14..36e3f020 100755
--- a/plugin.video.alfa/channels/beeg.py
+++ b/plugin.video.alfa/channels/beeg.py
@@ -3,7 +3,7 @@
 import re
 import urllib
 
-from core import jsontools as json
+from core import jsontools as json, httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
@@ -12,6 +12,7 @@ url_api = ""
 beeg_salt = ""
 Host = "https://beeg.com"
 
+
 def get_api_url():
     global url_api
     global beeg_salt
@@ -53,7 +54,7 @@ def mainlist(item):
     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="listcategorias", title="Listado categorias Populares",
+    # itemlist.append(Item(channel=item.channel, action="listcategorias", title="Listado categorias Populares",
     #                     url=url_api + "/index/main/0/pc", extra="popular"))
     itemlist.append(Item(channel=item.channel, action="listcategorias", title="Listado categorias completo",
                          url=url_api + "/index/main/0/pc", extra="nonpopular"))
@@ -65,7 +66,7 @@ def mainlist(item):
 def videos(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     JSONData = json.load(data)
 
     for Video in JSONData["videos"]:
@@ -90,14 +91,14 @@ def videos(item):
 def listcategorias(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     JSONData = json.load(data)
 
-    #for Tag in JSONData["tags"][item.extra]:
+    # for Tag in JSONData["tags"][item.extra]:
     for Tag in JSONData["tags"]:
         url = url_api + "/index/tag/0/pc?tag=" + Tag["tag"]
         title = '%s - %s' % (str(Tag["tag"]), str(Tag["videos"]))
-        #title = title[:1].upper() + title[1:]
+        # title = title[:1].upper() + title[1:]
         itemlist.append(
             Item(channel=item.channel, action="videos", title=title, url=url, folder=True, viewmode="movie"))
 
@@ -109,7 +110,7 @@ def search(item, texto):
 
     texto = texto.replace(" ", "+")
     item.url = item.url % (texto)
-    
+
     try:
         return videos(item)
     # Se captura la excepción, para no interrumpir al buscador global si un canal falla
@@ -136,7 +137,8 @@ def play(item):
                 viedokey = re.compile("key=(.*?)%2Cend=", re.DOTALL).findall(url)[0]
 
                 url = url.replace(viedokey, decode(viedokey))
-                if not url.startswith("https:"): url = "https:" + url
+                if not url.startswith("https:"):
+                    url = "https:" + url
                 title = videourl
                 itemlist.append(["%s %s [directo]" % (title, url[-4:]), url])
 
diff --git a/plugin.video.alfa/channels/bravoporn.py b/plugin.video.alfa/channels/bravoporn.py
index 9c69e7e8..9b0f8032 100644
--- a/plugin.video.alfa/channels/bravoporn.py
+++ b/plugin.video.alfa/channels/bravoporn.py
@@ -8,8 +8,6 @@ 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
 
 host = 'http://www.bravoporn.com'
 
@@ -17,8 +15,8 @@ host = 'http://www.bravoporn.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host +"/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host +"/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/most-popular/"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/c/"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
@@ -29,7 +27,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/s/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -51,12 +49,12 @@ def categorias(item):
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedthumbnail = "http:" + scrapedthumbnail
         scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/latest/"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                                thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -70,14 +68,12 @@ def peliculas(item):
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
         thumbnail = "https:" + scrapedthumbnail
         plot = ""
-        year = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                               plot=plot, contentTitle = title, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next" title="Next">Next</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>", text_color="blue",
-                               url=next_page_url) )
+                               plot=plot, contentTitle = scrapedtitle))
+    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next" title="Next">Next</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
 
 
diff --git a/plugin.video.alfa/channels/camwhoresbay.py b/plugin.video.alfa/channels/camwhoresbay.py
index b4197f0d..39009f08 100644
--- a/plugin.video.alfa/channels/camwhoresbay.py
+++ b/plugin.video.alfa/channels/camwhoresbay.py
@@ -7,20 +7,16 @@ 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
-
 
 host = 'https://www.camwhoresbay.com'
 
-# EN CATALOGO Y BUSQUEDA LA PAGINACION FUNCIONA CON UN AJAX 
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="peliculas", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="peliculas", url=host + "/most-popular/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/top-rated/"))
+    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-popular/"))
     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
@@ -28,10 +24,11 @@ def mainlist(item):
 
 def search(item, texto):
     logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s/" % texto
+    item.url = "%s/search/%s/" % (host, texto.replace("+", "-"))
+    item.extra = texto
     try:
-        return peliculas(item)
+        return lista(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():
@@ -51,12 +48,12 @@ def categorias(item):
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad  in matches:
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -70,14 +67,31 @@ def peliculas(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,
-                              contentTitle = title, infoLabels={'year':year} ))
-    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="peliculas", title="Página Siguiente >>", text_color="blue",
-                              url=next_page ) )
+                              contentTitle = scrapedtitle, fanart=scrapedthumbnail))
+    if item.extra:
+       next_page = scrapertools.find_single_match(data, '<li class="next">.*?from_videos\+from_albums:(\d+)')
+       if next_page:
+           if "from_videos=" in item.url:
+               next_page = re.sub(r'&from_videos=(\d+)', '&from_videos=%s' % next_page, item.url)
+           else:
+               next_page = "%s?mode=async&function=get_block&block_id=list_videos_videos_list_search_result" \
+                           "&q=%s&category_ids=&sort_by=post_date&from_videos=%s" % (item.url, item.extra, next_page)
+           itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
+    else:
+        next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
+        if next_page and not next_page.startswith("#"):
+            next_page = urlparse.urljoin(item.url,next_page)
+            itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
+        else:
+            next_page = scrapertools.find_single_match(data, '<li class="next">.*?from:(\d+)')
+            if next_page:
+                if "from" in item.url:
+                    next_page = re.sub(r'&from=(\d+)', '&from=%s' % next_page, item.url)
+                else:
+                    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))
     return itemlist
 
 
@@ -94,7 +108,7 @@ def play(item):
         scrapedurl = scrapertools.find_single_match(data, 'video_url: \'([^\']+)\'')
 
     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))
+                        thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo"))
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/canalpelis.py b/plugin.video.alfa/channels/canalpelis.py
index 03ef43b6..d827b70f 100644
--- a/plugin.video.alfa/channels/canalpelis.py
+++ b/plugin.video.alfa/channels/canalpelis.py
@@ -40,7 +40,6 @@ else:
 headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
            ['Referer', host]]
 
-
 parameters = channeltools.get_channel_parameters(__channel__)
 fanart_host = parameters['fanart']
 thumbnail_host = parameters['thumbnail']
@@ -105,7 +104,6 @@ def sub_search(item):
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedthumbnail, scrapedtitle, tipo, year in matches:
-
         itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl, contentTitle=scrapedtitle,
                                    action="findvideos", infoLabels={"year": year},
                                    thumbnail=scrapedthumbnail, text_color=color3, page=0))
@@ -167,7 +165,6 @@ def peliculas(item):
 
     for scrapedthumbnail, scrapedtitle, rating, quality, scrapedurl, year in matches[item.page:item.page + 30]:
         if 'Próximamente' not in quality and '-XXX.jpg' not in scrapedthumbnail:
-
             scrapedtitle = scrapedtitle.replace('Ver ', '').strip()
             contentTitle = scrapedtitle.partition(':')[0].partition(',')[0]
             title = "%s [COLOR green][%s][/COLOR] [COLOR yellow][%s][/COLOR]" % (
@@ -212,7 +209,7 @@ def generos(item):
     logger.info()
     itemlist = []
 
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
 
     patron = '<li class="cat-item cat-item-[^"]+"><a href="([^"]+)" title="[^"]+">([^<]+)</a> <i>([^<]+)</i></li>'
@@ -231,14 +228,13 @@ def year_release(item):
     logger.info()
     itemlist = []
 
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     # logger.info(data)
     patron = '<li><a href="([^"]+)">([^<]+)</a></li>'  # url, title
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle in matches:
-
         itemlist.append(item.clone(channel=item.channel, action="peliculas", title=scrapedtitle, page=0,
                                    url=scrapedurl, text_color=color3, viewmode="movie_with_plot", extra='next'))
 
@@ -289,9 +285,9 @@ def temporadas(item):
 
     data = httptools.downloadpage(item.url).data
     datas = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<span class="title">([^<]+)<i>.*?'  # numeros de temporadas
-    patron += '<img src="([^"]+)"></a></div>'  # capitulos
-
+    patron = "<span class='title'>([^<]+)<i>.*?"  # numeros de temporadas
+    patron += "<img src='([^']+)'>"  # capitulos
+    # logger.info(datas)
     matches = scrapertools.find_multiple_matches(datas, patron)
     if len(matches) > 1:
         for scrapedseason, scrapedthumbnail in matches:
@@ -331,14 +327,13 @@ def episodios(item):
 
     data = httptools.downloadpage(item.url).data
     datas = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    # logger.info(datas)
-    patron = '<div class="imagen"><a href="([^"]+)">.*?'  # url cap, img
-    patron += '<div class="numerando">(.*?)</div>.*?'  # numerando cap
-    patron += '<a href="[^"]+">([^<]+)</a>'  # title de episodios
+    patron = "<div class='imagen'>.*?"
+    patron += "<div class='numerando'>(.*?)</div>.*?"
+    patron += "<a href='([^']+)'>([^<]+)</a>"
 
     matches = scrapertools.find_multiple_matches(datas, patron)
 
-    for scrapedurl, scrapedtitle, scrapedname in matches:
+    for scrapedtitle, scrapedurl, scrapedname in matches:
         scrapedtitle = scrapedtitle.replace('--', '0')
         patron = '(\d+) - (\d+)'
         match = re.compile(patron, re.DOTALL).findall(scrapedtitle)
@@ -366,7 +361,7 @@ def episodios(item):
             if i.infoLabels['title']:
                 # Si el capitulo tiene nombre propio añadirselo al titulo del item
                 i.title = "%sx%s %s" % (i.infoLabels['season'], i.infoLabels[
-                                        'episode'], i.infoLabels['title'])
+                    'episode'], i.infoLabels['title'])
             if i.infoLabels.has_key('poster_path'):
                 # Si el capitulo tiene imagen propia remplazar al poster
                 i.thumbnail = i.infoLabels['poster_path']
diff --git a/plugin.video.alfa/channels/ciberpeliculashd.py b/plugin.video.alfa/channels/ciberpeliculashd.py
index 6921dd39..0152beb9 100644
--- a/plugin.video.alfa/channels/ciberpeliculashd.py
+++ b/plugin.video.alfa/channels/ciberpeliculashd.py
@@ -248,8 +248,8 @@ def findvideos(item):
         itemlist.append(Item(channel = item.channel))
         itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="",
                                    text_color="magenta"))
-        # Opción "Añadir esta película a la biblioteca de KODI"
-        if item.extra != "library":
+        # Opción "Añadir esta película a la videoteca de KODI"
+        if item.contentChannel != "videolibrary":
             if config.get_videolibrary_support():
                 itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
                                      action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
diff --git a/plugin.video.alfa/channels/cine24h.py b/plugin.video.alfa/channels/cine24h.py
index 566bbb7f..5c328ea5 100644
--- a/plugin.video.alfa/channels/cine24h.py
+++ b/plugin.video.alfa/channels/cine24h.py
@@ -41,7 +41,6 @@ else:
 headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
            ['Referer', host]]
 
-
 parameters = channeltools.get_channel_parameters(__channel__)
 fanart_host = parameters['fanart']
 thumbnail_host = parameters['thumbnail']
@@ -121,10 +120,10 @@ def peliculas(item):
     data = re.sub(r"\n|\r|\t|\(.*?\)|\s{2}|&nbsp;", "", data)
     data = scrapertools.decodeHtmlentities(data)
     patron = '<article id="[^"]+" class="TPost[^<]+<a href="([^"]+)">.*?'  # url
-    patron += '<img src="([^"]+)".*?'                                      # img
-    patron += '</figure>(.*?)'                                             # tipo
-    patron += '<h3 class="Title">([^<]+)</h3>.*?'                          # title
-    patron += '<span class="Year">([^<]+)</span>.*?'                       # year
+    patron += '<img src="([^"]+)".*?'  # img
+    patron += '</figure>(.*?)'  # tipo
+    patron += '<h3 class="Title">([^<]+)</h3>.*?'  # title
+    patron += '<span class="Year">([^<]+)</span>.*?'  # year
 
     matches = scrapertools.find_multiple_matches(data, patron)
 
@@ -173,7 +172,6 @@ def genresYears(item):
     matches = scrapertools.find_multiple_matches(data, patron)
 
     for scrapedurl, scrapedtitle in matches:
-
         itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl, action="peliculas"))
 
     return itemlist
@@ -183,13 +181,12 @@ def year_release(item):
     logger.info()
     itemlist = []
 
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     patron = '<li><a href="([^"]+)">([^<]+)</a></li>'  # url, title
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle in matches:
-
         itemlist.append(item.clone(channel=item.channel, action="peliculas", title=scrapedtitle, page=0,
                                    url=scrapedurl, text_color=color3, viewmode="movie_with_plot", extra='next'))
 
@@ -203,13 +200,12 @@ def series(item):
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\(.*?\)|&nbsp;|<br>", "", data)
     patron = '<article class="TPost C TPostd">\s*<a href="([^"]+)">.*?'  # url
-    patron += '<img src="([^"]+)".*?'                                   # img
-    patron += '<h3 class="Title">([^<]+)</h3>'                          # title
+    patron += '<img src="([^"]+)".*?'  # img
+    patron += '<h3 class="Title">([^<]+)</h3>'  # title
 
     matches = scrapertools.find_multiple_matches(data, patron)
 
     for scrapedurl, scrapedthumbnail, scrapedtitle in matches[item.page:item.page + 30]:
-
         itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl, action="temporadas",
                                    contentSerieName=scrapedtitle, show=scrapedtitle,
                                    thumbnail='https:' + scrapedthumbnail, contentType='tvshow'))
@@ -274,7 +270,7 @@ def episodios(item):
 
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<td class="MvTbImg B"><a href="([^"]+)".*?'                                     # url
+    patron = '<td class="MvTbImg B"><a href="([^"]+)".*?'  # url
     patron += '<td class="MvTbTtl"><a href="https://cine24h.net/episode/(.*?)/">([^<]+)</a>'  # title de episodios
 
     matches = scrapertools.find_multiple_matches(data, patron)
@@ -307,7 +303,7 @@ def episodios(item):
             if i.infoLabels['title']:
                 # Si el capitulo tiene nombre propio añadirselo al titulo del item
                 i.title = "%sx%s %s" % (i.infoLabels['season'], i.infoLabels[
-                                        'episode'], i.infoLabels['title'])
+                    'episode'], i.infoLabels['title'])
             if i.infoLabels.has_key('poster_path'):
                 # Si el capitulo tiene imagen propia remplazar al poster
                 i.thumbnail = i.infoLabels['poster_path']
@@ -340,7 +336,8 @@ def findvideos(item):
         lang, quality = match[0]
         quality = quality.strip()
         headers = {'Referer': item.url}
-        url_1 = scrapertools.find_single_match(data, 'id="Opt%s"><iframe width="560" height="315" src="([^"]+)"' % option)
+        url_1 = scrapertools.find_single_match(data,
+                                               'id="Opt%s"><iframe width="560" height="315" src="([^"]+)"' % option)
         new_data = httptools.downloadpage(url_1, headers=headers).data
         new_data = re.sub(r"\n|\r|\t|amp;|\(.*?\)|\s{2}|&nbsp;", "", new_data)
         new_data = scrapertools.decodeHtmlentities(new_data)
diff --git a/plugin.video.alfa/channels/cinecalidad.py b/plugin.video.alfa/channels/cinecalidad.py
index ec18bc95..2c11d1ad 100644
--- a/plugin.video.alfa/channels/cinecalidad.py
+++ b/plugin.video.alfa/channels/cinecalidad.py
@@ -130,7 +130,7 @@ def anyos(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<a href="([^"]+)">([^<]+)</a><br'
+    patron = '<a href=([^>]+)>([^<]+)</a><br'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle in matches:
@@ -171,8 +171,8 @@ def generos(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<li id="menu-item-.*?" class="menu-item menu-item-type-taxonomy menu-item-object-category ' \
-             'menu-item-.*?"><a href="([^"]+)">([^<]+)<\/a></li>'
+    patron = '<li id=menu-item-.*? class="menu-item menu-item-type-taxonomy menu-item-object-category menu-item-.*?'
+    patron +='"><a href=([^>]+)>([^<]+)<\/a></li>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedurl, scrapedtitle in matches:
         url = urlparse.urljoin(item.url, scrapedurl)
@@ -206,8 +206,8 @@ def peliculas(item):
 
 
     data = httptools.downloadpage(item.url).data
-    patron = '<div class="home_post_cont.*? post_box">.*?<a href="(.*?)".*?'
-    patron += 'src="(.*?)".*?title="(.*?) \((.*?)\).*?".*?p&gt;(.*?)&lt'
+    patron = '<div class="home_post_cont.*? post_box">.*?<a href=([^>]+)>.*?src=([^ ]+).*?'
+    patron += 'title="(.*?) \((.*?)\).*?".*?p&gt;(.*?)&lt'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, scrapedplot in matches:
@@ -232,7 +232,7 @@ def peliculas(item):
                  ))
 
     try:
-        patron = "<link rel='next' href='([^']+)' />"
+        patron = "<link rel=next href=([^>]+)>"
         next_page = re.compile(patron, re.DOTALL).findall(data)
         itemlist.append(Item(channel=item.channel,
                              action="peliculas",
@@ -298,7 +298,7 @@ def findvideos(item):
         lang = 'latino'
 
     data = httptools.downloadpage(item.url).data
-    patron = 'target="_blank".*? service=".*?" data="(.*?)"><li>(.*?)<\/li>'
+    patron = 'target=_blank.*? service=.*? data="(.*?)"><li>(.*?)<\/li>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     server_url = {'YourUpload': 'https://www.yourupload.com/embed/',
@@ -315,7 +315,6 @@ def findvideos(item):
         if server_id not in ['Mega', 'MediaFire', 'Trailer', '']:
             video_id = dec(video_cod, dec_value)
 
-        logger.debug('server_id %s' % server_id)
         if server_id in server_url:
             server = server_id.lower()
             thumbnail = item.thumbnail
diff --git a/plugin.video.alfa/channels/cinedetodo.py b/plugin.video.alfa/channels/cinedetodo.py
index 6ada755c..07af0a04 100644
--- a/plugin.video.alfa/channels/cinedetodo.py
+++ b/plugin.video.alfa/channels/cinedetodo.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# -*- Channel CinemaHD -*-
+# -*- Channel CineDeTodo -*-
 # -*- Created for Alfa-addon -*-
 # -*- By the Alfa Develop Group -*-
 
@@ -16,39 +16,61 @@ from channels import autoplay
 from channels import filtertools
 
 
-host = 'http://www.cinedetodo.com/'
+
+host = 'https://www.cinedetodo.net/'
 
 IDIOMAS = {'Latino': 'LAT'}
 list_language = IDIOMAS.values()
 list_quality = []
-list_servers = ['fastplay', 'rapidvideo', 'streamplay', 'flashx', 'streamito', 'streamango', 'vidoza']
+list_servers = ['gounlimited', 'rapidvideo', 'vshare', 'clipwatching', 'jawclowd', 'streamango']
 
 
 def mainlist(item):
     logger.info()
-
     autoplay.init(item.channel, list_servers, list_quality)
 
     itemlist = list()
-    itemlist.append(item.clone(title="Ultimas", action="list_all", url=host, thumbnail=get_thumb('last', auto=True)))
-    itemlist.append(item.clone(title="Generos", action="section", section='genre',
-                               thumbnail=get_thumb('genres', auto=True)))
-    # itemlist.append(item.clone(title="Por Calidad", action="section", section='quality',
-    #                            thumbnail=get_thumb('quality', auto=True)))
-    itemlist.append(item.clone(title="Alfabetico", action="section", section='alpha',
-                               thumbnail=get_thumb('alphabet', auto=True)))
-    itemlist.append(item.clone(title="Buscar", action="search", url=host+'?s=',
-                               thumbnail=get_thumb('search', auto=True)))
+
+    itemlist.append(Item(channel=item.channel, title="Películas", action="sub_menu", url=host,
+                         thumbnail=get_thumb('last', auto=True), type='MovieList'))
+
+    itemlist.append(Item(channel=item.channel, title="Series", action="sub_menu", url=host,
+                         thumbnail=get_thumb('last', auto=True), type='Series'))
+
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + '?s=',
+                         thumbnail=get_thumb('search', auto=True)))
 
     autoplay.show_option(item.channel, itemlist)
 
     return itemlist
 
 
-def get_source(url):
+def sub_menu(item):
     logger.info()
-    data = httptools.downloadpage(url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+
+    itemlist = []
+
+    itemlist.append(Item(channel=item.channel, title="Ultimas", action="list_all", url=host,
+                         thumbnail=get_thumb('last', auto=True), type=item.type))
+
+    itemlist.append(Item(channel=item.channel, title="Generos", action="section", section='genre',
+                         thumbnail=get_thumb('genres', auto=True), type=item.type ))
+
+    if item.type != 'Series':
+        itemlist.append(Item(channel=item.channel, title="Alfabetico", action="section", section='alpha',
+                             thumbnail=get_thumb('alphabet', auto=True), type=item.type))
+
+
+
+    return itemlist
+
+def get_source(url, referer=None):
+    logger.info()
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
     return data
 
 
@@ -57,60 +79,86 @@ def list_all(item):
     itemlist = []
 
     data = get_source(item.url)
-    if item.section == 'alpha':
-        patron = '<span class=Num>\d+.*?<a href=(.*?) class.*?<img src=(.*?) alt=.*?<strong>(.*?)</strong>.*?'
-        patron += '<td>(\d{4})</td>'
+    full_data = data
+    if item.section != '':
+        data = scrapertools.find_single_match(data, 'class="MovieList NoLmtxt(.*?)</ul>')
     else:
-        patron = '<article id=post-.*?<a href=(.*?)>.*?<img src=(.*?) alt=.*?'
-        patron += '<h3 class=Title>(.*?)<\/h3>.*?<span class=Year>(.*?)<\/span>'
-    data = get_source(item.url)
-    matches = re.compile(patron, re.DOTALL).findall(data)
+        data = scrapertools.find_single_match(data, '<!--<%s>.*?class="MovieList NoLmtxt(.*?)</ul>' % item.type)
+
+    if item.section == 'alpha':
+        patron = '<span class="Num">\d+.*?<a href="([^"]+)" class.*?<img src="([^"]+)" alt=.*?'
+        patron += '<strong>([^"]+)</strong>.*?<td>(\d{4})</td>'
+        matches = re.compile(patron, re.DOTALL).findall(full_data)
+    else:
+        patron = '<article.*?<a href="(.*?)">.*?<img src="(.*?)" alt=.*?'
+        patron += '<h3 class="Title">(.*?)<\/h3>.*?date_range">(\d+)<'
+        matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedthumbnail, scrapedtitle, year in matches:
 
         url = scrapedurl
+        if year == '':
+            year = '-'
         if "|" in scrapedtitle:
             scrapedtitle= scrapedtitle.split("|")
-            contentTitle = scrapedtitle[0].strip()
+            cleantitle = scrapedtitle[0].strip()
         else:
-            contentTitle = scrapedtitle
+            cleantitle = scrapedtitle
 
-        contentTitle = re.sub('\(.*?\)','', contentTitle)
+        cleantitle = re.sub('\(.*?\)', '', cleantitle)
 
-        title = '%s [%s]'%(contentTitle, year)
+        if not config.get_setting('unify'):
+            title = '%s [%s]'%(cleantitle, year)
+        else:
+            title = cleantitle
         thumbnail = 'http:'+scrapedthumbnail
-        itemlist.append(item.clone(action='findvideos',
-                                   title=title,
-                                   url=url,
-                                   thumbnail=thumbnail,
-                                   contentTitle=contentTitle,
-                                   infoLabels={'year':year}
-                                   ))
+
+        new_item = Item(channel=item.channel,
+                        title=title,
+                        url=url,
+                        thumbnail=thumbnail,
+                        infoLabels = {'year': year}
+                        )
+
+        if 'series' not in url:
+            new_item.contentTitle = cleantitle
+            new_item.action='findvideos'
+
+        else:
+            new_item.contentSerieName = cleantitle
+            new_item.action = 'seasons'
+
+        itemlist.append(new_item)
+
     tmdb.set_infoLabels_itemlist(itemlist, True)
 
     #  Paginación
 
-    url_next_page = scrapertools.find_single_match(data,'<a class=next.*?href=(.*?)>')
+    url_next_page = scrapertools.find_single_match(full_data,'<a class="next.*?href="([^"]+)">')
     if url_next_page:
-        itemlist.append(item.clone(title="Siguiente >>", url=url_next_page, action='list_all'))
+        itemlist.append(Item(channel=item.channel, title="Siguiente >>", url=url_next_page, action='list_all',
+                             type=item.type))
     return itemlist
 
 def section(item):
     logger.info()
     itemlist = []
 
-    data = get_source(host)
+    if item.type == 'Series':
+        url = host + '?tr_post_type=2'
+    else:
+        url = host + '?tr_post_type=1'
 
+    data = get_source(url)
     action = 'list_all'
-    if item.section == 'quality':
-        patron = 'menu-item-object-category.*?menu-item-\d+><a href=(.*?)>(.*?)<\/a>'
-    elif item.section == 'genre':
-        patron = '<a href=(http:.*?) class=Button STPb>(.*?)</a>'
-    elif item.section == 'year':
-        patron = 'custom menu-item-15\d+><a href=(.*?\?s.*?)>(\d{4})<\/a><\/li>'
+
+
+    if item.section == 'genre':
+        patron = '<a href="([^ ]+)" class="Button STPb">(.*?)</a>'
     elif item.section == 'alpha':
-        patron = '<li><a href=(.*?letters.*?)>(.*?)</a>'
+        patron = '<li><a href="(.*?letter.*?)">(.*?)</a>'
         action = 'list_all'
+
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for data_one, data_two in matches:
@@ -118,38 +166,104 @@ def section(item):
         url = data_one
         title = data_two
         if title != 'Ver más':
-            new_item = Item(channel=item.channel, title= title, url=url, action=action, section=item.section)
+            if item.type == 'Series':
+                url =url + '?tr_post_type=2'
+            else:
+                url = url + '?tr_post_type=1'
+                if 'serie'in title.lower():
+                    continue
+            new_item = Item(channel=item.channel, title= title, url=url, action=action, section=item.section,
+                            type=item.type)
             itemlist.append(new_item)
 
     return itemlist
 
 
+def seasons(item):
+    logger.info()
+
+    itemlist=[]
+
+    data=get_source(item.url)
+    patron='Temporada <span>(\d+)'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    infoLabels = item.infoLabels
+    for season in matches:
+        season = season.lower().replace('temporada','')
+        infoLabels['season']=season
+        title = 'Temporada %s' % season
+        itemlist.append(Item(channel=item.channel, title=title, url=item.url, action='episodesxseasons',
+                             infoLabels=infoLabels))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+                Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                     action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName))
+
+    return itemlist
+
+def episodios(item):
+    logger.info()
+    itemlist = []
+    templist = seasons(item)
+    for tempitem in templist:
+        itemlist += episodesxseasons(tempitem)
+
+    return itemlist
+
+def episodesxseasons(item):
+    logger.info()
+
+    itemlist = []
+
+    full_data=get_source(item.url)
+    data = scrapertools.find_single_match(full_data, 'Temporada <span>\d+.*?</ul>')
+    patron='<span class="Num">(\d+)<.*?<a href="([^"]+)".*?"MvTbTtl".*?">([^<]+)<'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    infoLabels = item.infoLabels
+
+    for scrapedepisode, scrapedurl, scrapedtitle in matches:
+
+        infoLabels['episode'] = scrapedepisode
+        url = scrapedurl
+        title = '%sx%s - %s' % (infoLabels['season'], infoLabels['episode'], scrapedtitle)
+
+        itemlist.append(Item(channel=item.channel, title= title, url=url, action='findvideos', infoLabels=infoLabels))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+
+
 def findvideos(item):
     logger.info()
 
     itemlist = []
     data = get_source(item.url)
     data = scrapertools.decodeHtmlentities(data)
-
-    patron = 'id=(Opt\d+)>.*?src=(.*?) frameborder.*?</iframe>'
+    patron = 'id="(Opt\d+)">.*?src="([^"]+)" frameborder.*?</iframe>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for option, scrapedurl in matches:
         scrapedurl = scrapedurl.replace('"','').replace('&#038;','&')
         data_video = get_source(scrapedurl)
-        url = scrapertools.find_single_match(data_video, '<div class=Video>.*?src=(.*?) frameborder')
-        opt_data = scrapertools.find_single_match(data,'%s><span>.*?</span>.*?<span>(.*?)</span>'%option).split('-')
+        url = scrapertools.find_single_match(data_video, '<div class="Video">.*?src="([^"]+)" frameborder')
+        opt_data = scrapertools.find_single_match(data,'"%s"><span>.*?</span>.*?<span>(.*?)</span>'%option).split('-')
         language = opt_data[0].strip()
-        language = language.replace('(','').replace(')','')
+        language = re.sub('\(|\)', '', language)
         quality = opt_data[1].strip()
         if url != '' and 'youtube' not in url:
-            itemlist.append(item.clone(title='%s', url=url, language=IDIOMAS[language], quality=quality, action='play'))
+            itemlist.append(Item(channel=item.channel, title='%s', url=url, language=IDIOMAS[language], quality=quality,
+                                 action='play', infoLabels=item.infoLabels))
         elif 'youtube' in url:
-            trailer = item.clone(title='Trailer', url=url, action='play', server='youtube')
+            trailer = Item(channel=item.channel, title='Trailer', url=url, action='play', server='youtube')
 
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % '%s [%s] [%s]'%(i.server.capitalize(),
                                                                                               i.language, i.quality))
-    tmdb.set_infoLabels_itemlist(itemlist, True)
     try:
         itemlist.append(trailer)
     except:
@@ -175,7 +289,7 @@ def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
     item.url = item.url + texto
-
+    item.section = 'search'
     if texto != '':
         return list_all(item)
     else:
@@ -190,11 +304,11 @@ def newest(categoria):
         if categoria in ['peliculas','latino']:
             item.url = host
         elif categoria == 'infantiles':
-            item.url = host+'/animacion'
+            item.url = host+'animacion/?tr_post_type=1'
         elif categoria == 'terror':
-            item.url = host+'/terror'
-        elif categoria == 'documentales':
-            item.url = host+'/documental'
+            item.url = host+'terror/?tr_post_type=1'
+        item.type = 'MovieList'
+        item.section = 'search'
         itemlist = list_all(item)
         if itemlist[-1].title == 'Siguiente >>':
             itemlist.pop()
diff --git a/plugin.video.alfa/channels/cinehindi.json b/plugin.video.alfa/channels/cinehindi.json
index a7812b3f..b841a135 100755
--- a/plugin.video.alfa/channels/cinehindi.json
+++ b/plugin.video.alfa/channels/cinehindi.json
@@ -3,7 +3,7 @@
   "name": "CineHindi",
   "active": true,
   "adult": false,
-  "language": ["cast", "lat"],
+  "language": ["vos"],
   "thumbnail": "cinehindi.png",
   "banner": "http://i.imgur.com/cau9TVe.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/cinehindi.py b/plugin.video.alfa/channels/cinehindi.py
index 0431dec8..e08ba2f3 100755
--- a/plugin.video.alfa/channels/cinehindi.py
+++ b/plugin.video.alfa/channels/cinehindi.py
@@ -27,8 +27,8 @@ def mainlist(item):
     itemlist = list()
     itemlist.append(Item(channel=item.channel, action="genero", title="Generos", url=host, thumbnail = get_thumb("genres", auto = True)))
     itemlist.append(Item(channel=item.channel, action="lista", title="Novedades", url=host, thumbnail = get_thumb("newest", auto = True)))
-    itemlist.append(Item(channel=item.channel, action="proximas", title="Próximas Películas",
-                         url=urlparse.urljoin(host, "proximamente")))
+    #itemlist.append(Item(channel=item.channel, action="proximas", title="Próximas Películas",
+    #                     url=urlparse.urljoin(host, "proximamente")))
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=urlparse.urljoin(host, "?s="), thumbnail = get_thumb("search", auto = True)))
     autoplay.show_option(item.channel, itemlist)
     return itemlist
@@ -38,8 +38,8 @@ def genero(item):
     logger.info()
     itemlist = list()
     data = httptools.downloadpage(host).data
-    patron  = 'level-0.*?value="([^"]+)"'
-    patron += '>([^<]+)'
+    patron  = '<option class=.*? value=([^<]+)>'
+    patron += '([^<]+)<\/option>'
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl, scrapedtitle in matches:
         if 'Próximas Películas' in scrapedtitle:
@@ -94,28 +94,29 @@ def lista(item):
     else:
         url = httptools.downloadpage("%s?cat=%s" %(host, item.cat), follow_redirects=False, only_headers=True).headers.get("location", "")
         data = httptools.downloadpage(url).data
-    bloque = scrapertools.find_single_match(data, """class="item_1 items.*?id="paginador">""")
-    patron = 'class="item">.*?'  # Todos los items de peliculas (en esta web) empiezan con esto
-    patron += '<a href="([^"]+).*?'  # scrapedurl
-    patron += '<img src="([^"]+).*?'  # scrapedthumbnail
-    patron += 'alt="([^"]+).*?'  # scrapedtitle
-    patron += '<div class="fixyear">(.*?)</span></div><'  # scrapedfixyear
+    bloque = data#scrapertools.find_single_match(data, """class="item_1 items.*?id="paginador">""")
+    patron = '<div id=mt.+?>'  # Todos los items de peliculas (en esta web) empiezan con esto
+    patron += '<a href=([^"]+)\/><div class=image>'  # scrapedurl
+    patron += '<img src=([^"]+) alt=.*?'  # scrapedthumbnail
+    patron += '<span class=tt>([^"]+)<\/span>' # scrapedtitle
+    patron += '<span class=ttx>([^"]+)<div class=degradado>.*?'  # scrapedplot
+    patron += '<span class=year>([^"]+)<\/span><\/div><\/div>'  # scrapedfixyear
     matches = scrapertools.find_multiple_matches(bloque, patron)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedfixyear in matches:
-        patron = '<span class="year">([^<]+)'  # scrapedyear
-        scrapedyear = scrapertools.find_single_match(scrapedfixyear, patron)
+    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedplot, scrapedyear in matches:
+        #patron = '<span class="year">([^<]+)'  # scrapedyear
+        #scrapedyear = scrapertools.find_single_match(scrapedfixyear, patron)
         scrapedtitle = scrapedtitle.replace(scrapertools.find_single_match(scrapedtitle,'\(\d{4}\)'),'').strip()
         title = scrapedtitle
         if scrapedyear:
             title += ' (%s)' % (scrapedyear)
             item.infoLabels['year'] = int(scrapedyear)
         patron = '<span class="calidad2">([^<]+).*?'  # scrapedquality
-        scrapedquality = scrapertools.find_single_match(scrapedfixyear, patron)
-        if scrapedquality:
-            title += ' [%s]' % (scrapedquality)
+        #scrapedquality = scrapertools.find_single_match(scrapedfixyear, patron)
+        #if scrapedquality:
+        #    title += ' [%s]' % (scrapedquality)
         itemlist.append(
             item.clone(title=title, url=scrapedurl, action="findvideos", extra=scrapedtitle,
-                       contentTitle=scrapedtitle, thumbnail=scrapedthumbnail, contentType="movie", context=["buscar_trailer"]))
+                       contentTitle=scrapedtitle, thumbnail=scrapedthumbnail, plot=scrapedplot, contentType="movie", context=["buscar_trailer"]))
     tmdb.set_infoLabels(itemlist)
     # Paginacion
     patron = 'rel="next" href="([^"]+)'
diff --git a/plugin.video.alfa/channels/cinemahd.py b/plugin.video.alfa/channels/cinemahd.py
index 9bc60787..775ba87e 100644
--- a/plugin.video.alfa/channels/cinemahd.py
+++ b/plugin.video.alfa/channels/cinemahd.py
@@ -16,41 +16,61 @@ from channels import autoplay
 from channels import filtertools
 
 
-host = 'http://www.cinemahd.co/'
+
+host = 'https://www.cinemahd.co/'
 
 IDIOMAS = {'Latino': 'LAT'}
 list_language = IDIOMAS.values()
 list_quality = []
-list_servers = ['fastplay', 'rapidvideo', 'streamplay', 'flashx', 'streamito', 'streamango', 'vidoza']
+list_servers = ['gounlimited', 'rapidvideo', 'vshare', 'clipwatching', 'jawclowd', 'streamango']
 
 
 def mainlist(item):
     logger.info()
-
     autoplay.init(item.channel, list_servers, list_quality)
 
     itemlist = list()
-    itemlist.append(Item(channel=item.channel, title="Ultimas", action="list_all", url=host, thumbnail=get_thumb('last', auto=True)))
-    itemlist.append(Item(channel=item.channel, title="Generos", action="section", section='genre',
-                               thumbnail=get_thumb('genres', auto=True)))
-    itemlist.append(Item(channel=item.channel, title="Por Calidad", action="section", section='quality',
-                               thumbnail=get_thumb('quality', auto=True)))
-    itemlist.append(Item(channel=item.channel, title="Por Año", action="section", section='year',
-                               thumbnail=get_thumb('year', auto=True)))
-    itemlist.append(Item(channel=item.channel, title="Alfabetico", action="section", section='alpha',
-                               thumbnail=get_thumb('alphabet', auto=True)))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=',
-                               thumbnail=get_thumb('search', auto=True)))
+
+    itemlist.append(Item(channel=item.channel, title="Películas", action="sub_menu", url=host,
+                         thumbnail=get_thumb('last', auto=True), type='MovieList'))
+
+    itemlist.append(Item(channel=item.channel, title="Series", action="sub_menu", url=host,
+                         thumbnail=get_thumb('last', auto=True), type='Series'))
+
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + '?s=',
+                         thumbnail=get_thumb('search', auto=True)))
 
     autoplay.show_option(item.channel, itemlist)
 
     return itemlist
 
 
-def get_source(url):
+def sub_menu(item):
     logger.info()
-    data = httptools.downloadpage(url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+
+    itemlist = []
+
+    itemlist.append(Item(channel=item.channel, title="Ultimas", action="list_all", url=host,
+                         thumbnail=get_thumb('last', auto=True), type=item.type))
+
+    itemlist.append(Item(channel=item.channel, title="Generos", action="section", section='genre',
+                         thumbnail=get_thumb('genres', auto=True), type=item.type ))
+
+    if item.type != 'Series':
+        itemlist.append(Item(channel=item.channel, title="Alfabetico", action="section", section='alpha',
+                             thumbnail=get_thumb('alphabet', auto=True), type=item.type))
+
+
+
+    return itemlist
+
+def get_source(url, referer=None):
+    logger.info()
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
     return data
 
 
@@ -60,14 +80,18 @@ def list_all(item):
 
     data = get_source(item.url)
     full_data = data
-    data = scrapertools.find_single_match(data, '<ul class=MovieList NoLmtxt.*?</ul>')
+    if item.section != '':
+        data = scrapertools.find_single_match(data, 'class="MovieList NoLmtxt(.*?)</ul>')
+    else:
+        data = scrapertools.find_single_match(data, '<!--<%s>.*?class="MovieList NoLmtxt(.*?)</ul>' % item.type)
+
     if item.section == 'alpha':
-        patron = '<span class=Num>\d+.*?<a href=(.*?) class.*?<img src=(.*?) alt=.*?<strong>(.*?)</strong>.*?'
-        patron += '<td>(\d{4})</td>'
+        patron = '<span class="Num">\d+.*?<a href="([^"]+)" class.*?<img src="([^"]+)" alt=.*?'
+        patron += '<strong>([^"]+)</strong>.*?<td>(\d{4})</td>'
         matches = re.compile(patron, re.DOTALL).findall(full_data)
     else:
-        patron = '<article id=post-.*?<a href=(.*?)>.*?<img src=(.*?) alt=.*?'
-        patron += '<h3 class=Title>(.*?)<\/h3>(?:</a>|<span class=Year>(.*?)<\/span>)'
+        patron = '<article.*?<a href="(.*?)">.*?<img src="(.*?)" alt=.*?'
+        patron += '<h3 class="Title">(.*?)<\/h3>.*?date_range">(\d+)<'
         matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedthumbnail, scrapedtitle, year in matches:
@@ -77,45 +101,64 @@ def list_all(item):
             year = '-'
         if "|" in scrapedtitle:
             scrapedtitle= scrapedtitle.split("|")
-            contentTitle = scrapedtitle[0].strip()
+            cleantitle = scrapedtitle[0].strip()
         else:
-            contentTitle = scrapedtitle
+            cleantitle = scrapedtitle
 
-        contentTitle = re.sub('\(.*?\)','', contentTitle)
+        cleantitle = re.sub('\(.*?\)', '', cleantitle)
 
-        title = '%s [%s]'%(contentTitle, year)
+        if not config.get_setting('unify'):
+            title = '%s [%s]'%(cleantitle, year)
+        else:
+            title = cleantitle
         thumbnail = 'http:'+scrapedthumbnail
-        itemlist.append(Item(channel=item.channel, action='findvideos',
-                                   title=title,
-                                   url=url,
-                                   thumbnail=thumbnail,
-                                   contentTitle=contentTitle,
-                                   infoLabels={'year':year}
-                                   ))
+
+        new_item = Item(channel=item.channel,
+                        title=title,
+                        url=url,
+                        thumbnail=thumbnail,
+                        infoLabels = {'year': year}
+                        )
+
+        if 'series' not in url:
+            new_item.contentTitle = cleantitle
+            new_item.action='findvideos'
+
+        else:
+            new_item.contentSerieName = cleantitle
+            new_item.action = 'seasons'
+
+        itemlist.append(new_item)
+
     tmdb.set_infoLabels_itemlist(itemlist, True)
 
     #  Paginación
 
-    url_next_page = scrapertools.find_single_match(full_data,'<a class=next.*?href=(.*?)>')
+    url_next_page = scrapertools.find_single_match(full_data,'<a class="next.*?href="([^"]+)">')
     if url_next_page:
-        itemlist.append(Item(channel=item.channel, title="Siguiente >>", url=url_next_page, action='list_all'))
+        itemlist.append(Item(channel=item.channel, title="Siguiente >>", url=url_next_page, action='list_all',
+                             type=item.type))
     return itemlist
 
 def section(item):
     logger.info()
     itemlist = []
 
-    data = get_source(host)
+    if item.type == 'Series':
+        url = host + '?tr_post_type=2'
+    else:
+        url = host + '?tr_post_type=1'
+
+    data = get_source(url)
     action = 'list_all'
-    if item.section == 'quality':
-        patron = 'menu-item-object-category.*?menu-item-\d+ menu-category-list><a href=(.*?)>(.*?)<\/a>'
-    elif item.section == 'genre':
-        patron = '<a href=([^ ]+) class=Button STPb>(.*?)</a>'
-    elif item.section == 'year':
-        patron = '<li><a href=([^>]+)>(\d{4})<\/a><\/li>'
+
+
+    if item.section == 'genre':
+        patron = '<a href="([^ ]+)" class="Button STPb">(.*?)</a>'
     elif item.section == 'alpha':
-        patron = '<li><a href=(.*?letters.*?)>(.*?)</a>'
+        patron = '<li><a href="(.*?letter.*?)">(.*?)</a>'
         action = 'list_all'
+
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for data_one, data_two in matches:
@@ -123,32 +166,99 @@ def section(item):
         url = data_one
         title = data_two
         if title != 'Ver más':
-            new_item = Item(channel=item.channel, title= title, url=url, action=action, section=item.section)
+            if item.type == 'Series':
+                url =url + '?tr_post_type=2'
+            else:
+                url = url + '?tr_post_type=1'
+                if 'serie'in title.lower():
+                    continue
+            new_item = Item(channel=item.channel, title= title, url=url, action=action, section=item.section,
+                            type=item.type)
             itemlist.append(new_item)
 
     return itemlist
 
 
+def seasons(item):
+    logger.info()
+
+    itemlist=[]
+
+    data=get_source(item.url)
+    patron='Temporada <span>(\d+)'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    infoLabels = item.infoLabels
+    for season in matches:
+        season = season.lower().replace('temporada','')
+        infoLabels['season']=season
+        title = 'Temporada %s' % season
+        itemlist.append(Item(channel=item.channel, title=title, url=item.url, action='episodesxseasons',
+                             infoLabels=infoLabels))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+                Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                     action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName))
+
+    return itemlist
+
+def episodios(item):
+    logger.info()
+    itemlist = []
+    templist = seasons(item)
+    for tempitem in templist:
+        itemlist += episodesxseasons(tempitem)
+
+    return itemlist
+
+def episodesxseasons(item):
+    logger.info()
+
+    itemlist = []
+
+    full_data=get_source(item.url)
+    data = scrapertools.find_single_match(full_data, 'Temporada <span>\d+.*?</ul>')
+    patron='<span class="Num">(\d+)<.*?<a href="([^"]+)".*?"MvTbTtl".*?">([^<]+)<'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    infoLabels = item.infoLabels
+
+    for scrapedepisode, scrapedurl, scrapedtitle in matches:
+
+        infoLabels['episode'] = scrapedepisode
+        url = scrapedurl
+        title = '%sx%s - %s' % (infoLabels['season'], infoLabels['episode'], scrapedtitle)
+
+        itemlist.append(Item(channel=item.channel, title= title, url=url, action='findvideos', infoLabels=infoLabels))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+
+
 def findvideos(item):
     logger.info()
 
     itemlist = []
     data = get_source(item.url)
     data = scrapertools.decodeHtmlentities(data)
-
-    patron = 'id=(Opt\d+)>.*?src=(.*?) frameborder.*?</iframe>'
+    patron = 'id="(Opt\d+)">.*?src="([^"]+)" frameborder.*?</iframe>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for option, scrapedurl in matches:
         scrapedurl = scrapedurl.replace('"','').replace('&#038;','&')
         data_video = get_source(scrapedurl)
-        url = scrapertools.find_single_match(data_video, '<div class=Video>.*?src=(.*?) frameborder')
-        opt_data = scrapertools.find_single_match(data,'%s><span>.*?</span>.*?<span>(.*?)</span>'%option).split('-')
+        url = scrapertools.find_single_match(data_video, '<div class="Video">.*?src="([^"]+)" frameborder')
+        opt_data = scrapertools.find_single_match(data,'"%s"><span>.*?</span>.*?<span>(.*?)</span>'%option).split('-')
         language = opt_data[0].strip()
+        language = re.sub('\(|\)', '', language)
         quality = opt_data[1].strip()
         if url != '' and 'youtube' not in url:
             itemlist.append(Item(channel=item.channel, title='%s', url=url, language=IDIOMAS[language], quality=quality,
-                                 action='play'))
+                                 action='play', infoLabels=item.infoLabels))
         elif 'youtube' in url:
             trailer = Item(channel=item.channel, title='Trailer', url=url, action='play', server='youtube')
 
@@ -179,7 +289,7 @@ def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
     item.url = item.url + texto
-
+    item.section = 'search'
     if texto != '':
         return list_all(item)
     else:
@@ -194,9 +304,11 @@ def newest(categoria):
         if categoria in ['peliculas','latino']:
             item.url = host
         elif categoria == 'infantiles':
-            item.url = host+'/animacion'
+            item.url = host+'animacion/?tr_post_type=1'
         elif categoria == 'terror':
-            item.url = host+'/terror'
+            item.url = host+'terror/?tr_post_type=1'
+        item.type = 'MovieList'
+        item.section = 'search'
         itemlist = list_all(item)
         if itemlist[-1].title == 'Siguiente >>':
             itemlist.pop()
diff --git a/plugin.video.alfa/channels/cineonline.json b/plugin.video.alfa/channels/cineonline.json
new file mode 100644
index 00000000..beac2e9b
--- /dev/null
+++ b/plugin.video.alfa/channels/cineonline.json
@@ -0,0 +1,63 @@
+{
+  "id": "cineonline",
+  "name": "cineonline",
+  "active": true,
+  "adult": false,
+  "language": ["cast", "lat"],
+  "thumbnail": "https://www.cine-online.eu/wp-content/uploads/2015/04/CINE-logo-bueno.png",
+  "banner": "",
+  "categories": [
+    "movie"
+  ],
+  "settings": [
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "LAT",
+        "ESP",
+        "VOSE"
+      ]
+    },
+     {
+      "id": "modo_grafico",
+      "type": "bool",
+      "label": "Buscar información extra",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    } 
+  ]
+}
+
+
diff --git a/plugin.video.alfa/channels/cineonline.py b/plugin.video.alfa/channels/cineonline.py
new file mode 100644
index 00000000..82197c84
--- /dev/null
+++ b/plugin.video.alfa/channels/cineonline.py
@@ -0,0 +1,210 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import re, urllib, urlparse
+
+from channels import autoplay
+from platformcode import config, logger, platformtools
+from core.item import Item
+from core import httptools, scrapertools, jsontools, tmdb
+from core import servertools
+from channels import filtertools
+
+host = 'https://www.cine-online.eu'
+
+IDIOMAS = {'Español': 'ESP', 'Cast': 'ESP', 'Latino': 'LAT', 'Lat': 'LAT', 'Subtitulado': 'VOSE', 'Sub': 'VOSE'}
+list_language = IDIOMAS.values()
+list_servers = ['Streamango', 'Vidoza', 'Openload', 'Streamcherry', 'Netutv']
+list_quality = []
+__channel__='cineonline'
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__)
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__)
+try:
+    __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
+except:
+    __modo_grafico__ = True
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    autoplay.init(item.channel, list_servers, list_quality)
+    itemlist.append(item.clone(title ="Películas", action ="mainlist_pelis"))
+    itemlist.append(item.clone(title="Series" , action="lista", url= host + "/serie/"))
+    itemlist.append(item.clone(title="Buscar", action="search"))
+    
+    itemlist.append(item.clone(title="Configurar canal...", text_color="gold", action="configuracion", folder=False))
+    autoplay.show_option(item.channel, itemlist)
+    return itemlist
+
+def mainlist_pelis(item):
+    logger.info()
+    itemlist = []
+
+    itemlist.append(item.clone(title="Novedades" , action="lista", url= host))
+    itemlist.append(item.clone(title="Castellano" , action="lista", url= host + "/tag/castellano/"))
+    itemlist.append(item.clone(title="Latino" , action="lista", url= host + "/tag/latino/"))
+    itemlist.append(item.clone(title="Subtituladas" , action="lista", url= host + "/tag/subtitulado/"))
+    itemlist.append(item.clone(title="Categorias" , action="categorias", url= host))
+    itemlist.append(item.clone(title="Año" , action="categorias", url= host))
+
+    itemlist.append(item.clone( title = 'Buscar', action = 'search', search_type = 'movie' ))
+
+    return itemlist
+
+def configuracion(item):
+    ret = platformtools.show_channel_settings()
+    platformtools.itemlist_refresh()
+    return ret
+
+
+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
+    if "Año" in item.title:
+        data = scrapertools.get_match(data,'<h3>Año de estreno(.*?)</ul>')
+        patron  = '<li><a href="([^"]+)">(\d+)</(\w)>'
+    else:
+        patron  = '<li class="cat-item cat-item-\d+"><a href="([^"]+)">([^"]+)</a> <span>(\d+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle, cantidad in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        title = scrapedtitle + " %s" % cantidad
+        itemlist.append(item.clone(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
+    patron  = '<div id="mt-\d+".*?<a href="([^"]+)".*?'
+    patron += '<img src="([^"]+)" alt="([^"]+)".*?'
+    patron += '<span class="year">(\d+)</span>.*?'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear in matches:
+        scrapedtitle = scrapedtitle.replace("Ver", "").replace("online", "")
+        title = '%s (%s)' % (scrapedtitle, scrapedyear)
+        url = scrapedurl
+        new_item = Item(channel=item.channel,
+                        title=title,
+                        url=scrapedurl,
+                        thumbnail=scrapedthumbnail,
+                        infoLabels={'year':scrapedyear})
+
+        if '/serie/' in url:
+            new_item.action = 'temporadas'
+            new_item.contentSerieName = scrapedtitle
+        else:
+            new_item.action = 'findvideos'
+            new_item.contentTitle = scrapedtitle
+        itemlist.append(new_item)
+    tmdb.set_infoLabels(itemlist, True)
+    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)">Siguiente</a>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append(item.clone(channel=item.channel , action="lista" , title="Next page >>" , 
+                                   text_color="blue", url=next_page_url) )
+    return itemlist
+
+
+def temporadas(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron = '<span class="se-t">(\d+)</span>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for numtempo in matches:
+        itemlist.append(item.clone( action='episodesxseason', title='Temporada %s' % numtempo, url = item.url,
+                                    contentType='season', contentSeason=numtempo ))
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+            Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                 action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName))
+    # return sorted(itemlist, key=lambda it: it.title)
+    return itemlist
+
+
+def episodios(item):
+    logger.info()
+    itemlist = []
+    templist = temporadas(item)
+    for tempitem in templist:
+        itemlist += episodesxseason(tempitem)
+    return itemlist
+
+
+def episodesxseason(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron = '<div class="numerando">%s x (\d+)</div>.*?' % item.contentSeason
+    patron += '<a href="([^"]+)">([^"]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for episode, url, title in matches:
+        titulo = '%sx%s %s' % (item.contentSeason, episode, title)
+        itemlist.append(item.clone( action='findvideos', url=url, title=titulo,
+                                    contentType='episode', contentEpisodeNumber=episode ))
+    tmdb.set_infoLabels(itemlist)
+    return itemlist
+
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron = 'id="plays-(\d+)">\s*([^<]+)</div'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for xnumber, xname in matches:
+        if "/episodios/" in item.url:
+            lang = scrapertools.find_single_match(data, '#player2%s">([^<]+)</a>' % xnumber)
+        else:
+            lang = scrapertools.find_single_match(data, '#div%s">([^<]+)<' % xnumber)
+        if "lat" in lang.lower(): lang= "Lat"
+        if 'cast' in lang.lower(): lang= "Cast"
+        if 'sub' in lang.lower(): lang= "Sub"
+        if lang in IDIOMAS:
+            lang = IDIOMAS[lang]
+        post= {"nombre":xname}
+        url= httptools.downloadpage("https://www.cine-online.eu/ecrypt", post=urllib.urlencode(post)).data
+        url = scrapertools.find_single_match(url,'<(?:IFRAME SRC|iframe src)="([^"]+)"')
+
+        if not config.get_setting('unify'):
+            title = ' (%s)' % (lang)
+        else:
+            title = ''
+        if url != '':  
+            itemlist.append(item.clone(action="play", title='%s'+title, url=url, language=lang ))
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+
+    # Requerido para Filtrar enlaces
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+    if not "/episodios/" in item.url:
+        if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra !='findvideos':
+            itemlist.append(Item(channel=item.channel, action="add_pelicula_to_library", 
+                                 title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+                                 extra="findvideos", contentTitle=item.contentTitle)) 
+    return itemlist
+
+
diff --git a/plugin.video.alfa/channels/cinetemagay.py b/plugin.video.alfa/channels/cinetemagay.py
index 9a981445..6fb44ac3 100755
--- a/plugin.video.alfa/channels/cinetemagay.py
+++ b/plugin.video.alfa/channels/cinetemagay.py
@@ -5,6 +5,7 @@ import re
 
 from core import scrapertools
 from core import servertools
+from core import httptools
 from core.item import Item
 from platformcode import config, logger
 
@@ -43,7 +44,7 @@ def lista(item):
     itemlist = []
 
     # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
 
     # Extrae las entradas (carpetas)
     patronvideos = '&lt;img .*?src=&quot;(.*?)&quot;'
@@ -92,7 +93,7 @@ def detail(item):
     itemlist = []
 
     # Descarga la pagina
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
 
     data = data.replace("%3A", ":")
     data = data.replace("%2F", "/")
diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py
index 303616d2..32d90536 100644
--- a/plugin.video.alfa/channels/cinetux.py
+++ b/plugin.video.alfa/channels/cinetux.py
@@ -244,8 +244,8 @@ def findvideos(item):
         url = scrapertools.find_single_match(new_data, "src='([^']+)'")
         url = get_url(url.replace('\\/', '/'))
         if url:
-            itemlist.append(Item(channel=item.channel, title ='%s'+title, url=url, action='play', quality=item.quality,
-                                 language=IDIOMAS[language], infoLabels=item.infoLabels))
+            itemlist.append(item.clone(title ='%s'+title, url=url, action='play',
+                                 language=IDIOMAS[language], text_color = ""))
     patron = "<a class='optn' href='([^']+)'.*?<img src='.*?>([^<]+)<.*?<img src='.*?>([^<]+)<"
     matches = scrapertools.find_multiple_matches(data, patron)
     for hidden_url, quality, language in matches:
@@ -258,10 +258,23 @@ def findvideos(item):
         url = get_url(url.replace('\\/', '/'))
         if url:
             itemlist.append(Item(channel=item.channel, title='%s'+title, url=url, action='play', quality=quality,
-                                 language=IDIOMAS[language], infoLabels=item.infoLabels))
+                                 language=IDIOMAS[language], infoLabels=item.infoLabels, text_color = ""))
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     itemlist.sort(key=lambda it: (it.language, it.server, it.quality))
     tmdb.set_infoLabels(itemlist, __modo_grafico__)
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+    if itemlist:
+        if item.contentChannel != "videolibrary":
+            if config.get_videolibrary_support():
+                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
+                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
+                                     contentTitle = item.contentTitle
+                                     ))
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/cliphunter.py b/plugin.video.alfa/channels/cliphunter.py
index 1d244a3c..78760c97 100644
--- a/plugin.video.alfa/channels/cliphunter.py
+++ b/plugin.video.alfa/channels/cliphunter.py
@@ -7,8 +7,7 @@ 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
+
 
 host = 'https://www.cliphunter.com'
 
@@ -16,8 +15,8 @@ host = 'https://www.cliphunter.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/categories/All"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/popular/ratings/yesterday"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/categories/All"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/popular/ratings/yesterday"))
     itemlist.append( Item(channel=item.channel, title="Pornstars" , 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="Buscar", action="search"))
@@ -29,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -47,13 +46,13 @@ def catalogo(item):
     for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         scrapedplot = ""
         scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/movies"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
-                               thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail , plot=scrapedplot) )
+    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)
         itemlist.append( Item(channel=item.channel, action="catalogo", title="Página Siguiente >>", text_color="blue",
-                               url=next_page_url) )
+                               url=next_page) )
     return itemlist
 
 
@@ -68,12 +67,12 @@ def categorias(item):
         scrapedplot = ""
         scrapedtitle = scrapedtitle
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                                thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -88,11 +87,10 @@ def peliculas(item):
         year = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot=plot,
                                contentTitle = title, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="peliculas", title="Página Siguiente >>", text_color="blue",
-                               url=next_page_url) )
+    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)
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/coomelonitas.py b/plugin.video.alfa/channels/coomelonitas.py
index 92d3220e..b205e452 100644
--- a/plugin.video.alfa/channels/coomelonitas.py
+++ b/plugin.video.alfa/channels/coomelonitas.py
@@ -2,7 +2,6 @@
 #------------------------------------------------------------
 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
@@ -16,7 +15,7 @@ host ='http://www.coomelonitas.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", 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
@@ -27,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host+ "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -43,12 +42,12 @@ def categorias(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -61,9 +60,8 @@ def peliculas(item):
         thumbnail = scrapertools.find_single_match(match,'<img src="([^"]+)"')
         itemlist.append( Item(channel=item.channel, action="findvideos", title=title, fulltitle=title, url=url,
                                thumbnail=thumbnail, plot=plot, viewmode="movie") )
-    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)" class="siguiente">')
-    if next_page_url!="":
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>", text_color="blue",
-                               url=next_page_url) )
+    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="siguiente">')
+    if next_page!="":
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
diff --git a/plugin.video.alfa/channels/cuevana3.py b/plugin.video.alfa/channels/cuevana3.py
index 9c4d64b3..4882c812 100644
--- a/plugin.video.alfa/channels/cuevana3.py
+++ b/plugin.video.alfa/channels/cuevana3.py
@@ -31,23 +31,29 @@ def mainlist(item):
 
     itemlist = list()
 
-    itemlist.append(Item(channel=item.channel, title="Ultimas", action="list_all", url=host,
-                         thumbnail=get_thumb('last', auto=True)))
+    itemlist.append(Item(channel=item.channel, title="Todas", action="list_all", url=host+'peliculas',
+                         thumbnail=get_thumb('all', auto=True)))
+    itemlist.append(Item(channel=item.channel, title="Estrenos", action="list_all", url=host+'estrenos',
+                         thumbnail=get_thumb('premieres', auto=True)))
+    itemlist.append(Item(channel=item.channel, title="Mas vistas", action="list_all", url=host+'peliculas-mas-vistas',
+                         thumbnail=get_thumb('more watched', auto=True)))
+    itemlist.append(Item(channel=item.channel, title="Mas votadas", action="list_all", url=host+'peliculas-mas-valoradas',
+                         thumbnail=get_thumb('more voted', auto=True)))
 
     itemlist.append(Item(channel=item.channel, title="Generos", action="section", section='genre',
                          thumbnail=get_thumb('genres', auto=True)))
 
-    itemlist.append(Item(channel=item.channel, title="Castellano", action="list_all", url= host+'espanol',
-                         thumbnail=get_thumb('audio', auto=True)))
-
-    itemlist.append(Item(channel=item.channel, title="Latino", action="list_all", url=host + 'latino',
-                         thumbnail=get_thumb('audio', auto=True)))
-
-    itemlist.append(Item(channel=item.channel, title="VOSE", action="list_all", url=host + 'subtitulado',
-                         thumbnail=get_thumb('audio', auto=True)))
-
-    itemlist.append(Item(channel=item.channel, title="Alfabetico", action="section", section='alpha',
-                         thumbnail=get_thumb('alphabet', auto=True)))
+    # itemlist.append(Item(channel=item.channel, title="Castellano", action="list_all", url= host+'espanol',
+    #                      thumbnail=get_thumb('audio', auto=True)))
+    #
+    # itemlist.append(Item(channel=item.channel, title="Latino", action="list_all", url=host + 'latino',
+    #                      thumbnail=get_thumb('audio', auto=True)))
+    #
+    # itemlist.append(Item(channel=item.channel, title="VOSE", action="list_all", url=host + 'subtitulado',
+    #                      thumbnail=get_thumb('audio', auto=True)))
+    #
+    # itemlist.append(Item(channel=item.channel, title="Alfabetico", action="section", section='alpha',
+    #                      thumbnail=get_thumb('alphabet', auto=True)))
 
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=',
                          thumbnail=get_thumb('search', auto=True)))
@@ -69,17 +75,16 @@ def list_all(item):
     itemlist = []
 
     try:
-        data = get_source(item.url)
-        if item.section == 'alpha':
-          patron = '<span class="Num">\d+.*?<a href="([^"]+)" class.*?'
-          patron += 'src="([^"]+)" class.*?<strong>([^<]+)</strong>.*?<td>(\d{4})</td>'
-        else:
-            patron = '<article id="post-\d+".*?<a href="([^"]+)">.*?'
-            patron += 'src="([^"]+)".*?<h2 class="Title">([^<]+)<\/h2>.*?<span class="Year">([^<]+)<\/span>'
+        # if item.section == 'alpha':
+        #   patron = '<span class="Num">\d+.*?<a href="([^"]+)" class.*?'
+        #   patron += 'src="([^"]+)" class.*?<strong>([^<]+)</strong>.*?<td>(\d{4})</td>'
+        # else:
+        patron = '<article class="TPost C post-\d+.*?<a href="([^"]+)">.*?'
+        patron +='"Year">(\d{4})<.*?src="([^"]+)".*?"Title">([^"]+)</h2>'
         data = get_source(item.url)
         matches = re.compile(patron, re.DOTALL).findall(data)
 
-        for scrapedurl, scrapedthumbnail, scrapedtitle, year in matches:
+        for scrapedurl, year, scrapedthumbnail, scrapedtitle in matches:
 
             url = scrapedurl
             if "|" in scrapedtitle:
@@ -103,7 +108,7 @@ def list_all(item):
 
         #  Paginación
 
-        url_next_page = scrapertools.find_single_match(data,'<a class="next.*?" rel="next" href="([^"]+)"')
+        url_next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next page-numbers">')
         if url_next_page:
             itemlist.append(Item(channel=item.channel, title="Siguiente >>", url=url_next_page, action='list_all',
                                  section=item.section))
diff --git a/plugin.video.alfa/channels/czechvideo.py b/plugin.video.alfa/channels/czechvideo.py
index 84e0852b..d7c5c030 100644
--- a/plugin.video.alfa/channels/czechvideo.py
+++ b/plugin.video.alfa/channels/czechvideo.py
@@ -3,21 +3,18 @@
 
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://czechvideo.org'
 
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", 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
@@ -28,7 +25,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/tags/%s/" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -40,45 +37,47 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'<ul class="cat_menu" id="cat_menu_c0">(.*?)</ul>')
+    data = scrapertools.get_match(data,'<div class="category">(.*?)</ul>')
     patron  = '<li><a href="(.*?)".*?>(.*?)</a></li>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        scrapedtitle = str(scrapedtitle)
-        scrapedurl = host + scrapedurl
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
         thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<div class="short-story">.*?<a href="([^"]+)" title="([^"]+)"><img src="([^"]+)".*?div class="short-time">(.*?)</div>'
+    patron = '<div class="short-story">.*?'
+    patron += '<a href="([^"]+)" title="([^"]+)"><img src="([^"]+)".*?'
+    patron += 'div class="short-time">(.*?)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
         title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
         scrapedthumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<del><a href="([^"]+)">Next</a></del>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<del><a href="([^"]+)">Next</a></del>')
+    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
 
 
 def play(item):
     logger.info()
     data = scrapertools.cachePage(item.url)
-    url = scrapertools.find_single_match(data,'<iframe src=.*?<iframe src="([^"]+)"')
-    url = "http:" + url
-    itemlist = servertools.find_video_items(data=url)
+
+    itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
         videoitem.fulltitle = item.fulltitle
diff --git a/plugin.video.alfa/channels/danimados.py b/plugin.video.alfa/channels/danimados.py
index bc06b99d..9a91887b 100644
--- a/plugin.video.alfa/channels/danimados.py
+++ b/plugin.video.alfa/channels/danimados.py
@@ -167,7 +167,8 @@ def findvideos(item):
     headers = {"X-Requested-With":"XMLHttpRequest"}
     for scrapedserver, scrapeduser in matches:
         data1 = httptools.downloadpage("https://space.danimados.space/gilberto.php?id=%s&sv=mp4" %scrapeduser).data
-        url = base64.b64decode(scrapertools.find_single_match(data1, 'hashUser = "([^"]+)'))
+        data1 = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data1)
+        url = base64.b64decode(scrapertools.find_single_match(data1, '<iframe data-source="([^"]+)"'))
         url1 = devuelve_enlace(url)
         if "drive.google" in url1:
             url1 = url1.replace("view","preview")
diff --git a/plugin.video.alfa/channels/discoverymx.py b/plugin.video.alfa/channels/discoverymx.py
index c0684131..a3d315b0 100755
--- a/plugin.video.alfa/channels/discoverymx.py
+++ b/plugin.video.alfa/channels/discoverymx.py
@@ -5,6 +5,7 @@ import urlparse
 
 from core import scrapertools
 from core import servertools
+from core import httptools
 from core.item import Item
 from platformcode import logger
 
@@ -30,7 +31,7 @@ def DocuSeries(item):
     itemlist = []
 
     # Descarga la página
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
 
     # Extrae las entradas (carpetas)
     patronvideos = '<li><b><a href="([^"]+)" target="_blank">([^<]+)</a></b></li>'
@@ -54,7 +55,7 @@ def DocuTag(item):
     itemlist = []
 
     # Descarga la página
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     patronvideos = "<a dir='ltr' href='([^']+)'>([^<]+)</a>[^<]+<span class='label-count' dir='ltr'>(.+?)</span>"
     matches = re.compile(patronvideos, re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
@@ -76,7 +77,7 @@ def DocuARCHIVO(item):
     itemlist = []
 
     # Descarga la página
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     patronvideos = "<a class='post-count-link' href='([^']+)'>([^<]+)</a>[^<]+"
     patronvideos += "<span class='post-count' dir='ltr'>(.+?)</span>"
     matches = re.compile(patronvideos, re.DOTALL).findall(data)
@@ -102,7 +103,7 @@ def listvideos(item):
     scrapedplot = ""
 
     # Descarga la página
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     patronvideos = "<h3 class='post-title entry-title'[^<]+"
     patronvideos += "<a href='([^']+)'>([^<]+)</a>.*?"
     patronvideos += "<div class='post-body entry-content'(.*?)<div class='post-footer'>"
@@ -156,7 +157,7 @@ def findvideos(item):
     itemlist = []
 
     # Descarga la página
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     data = scrapertools.get_match(data, "<div class='post-body entry-content'(.*?)<div class='post-footer'>")
 
     # Busca los enlaces a los videos
diff --git a/plugin.video.alfa/channels/divxtotal.py b/plugin.video.alfa/channels/divxtotal.py
index 2e80f2f3..44b25f20 100644
--- a/plugin.video.alfa/channels/divxtotal.py
+++ b/plugin.video.alfa/channels/divxtotal.py
@@ -525,7 +525,7 @@ def findvideos(item):
 
     #Bajamos los datos de la página
     data = ''
-    patron = '<a onclick="eventDownloadTorrent\(.*?\)".?class="linktorrent" href="([^"]+)">'
+    patron = '<a onclick="eventDownloadTorrent\(.*?\)".?class="linktorrent" href="([^"]+)"'
     if item.contentType == 'movie':                                                 #Es una peli
         try:
             data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)", "", httptools.downloadpage(item.url, timeout=timeout).data)
@@ -588,7 +588,7 @@ def findvideos(item):
         #Buscamos si ya tiene tamaño, si no, los buscamos en el archivo .torrent
         size = scrapertools.find_single_match(item_local.quality, '\s\[(\d+,?\d*?\s\w\s?[b|B])\]')
         if not size and not item.armagedon:
-            size = generictools.get_torrent_size(item_local.url)                    #Buscamos el tamaño en el .torrent
+            size = generictools.get_torrent_size(scrapedurl)                        #Buscamos el tamaño en el .torrent
         if size:
             item_local.title = re.sub(r'\s\[\d+,?\d*?\s\w[b|B]\]', '', item_local.title)    #Quitamos size de título, si lo traía
             item_local.title = '%s [%s]' % (item_local.title, size)                         #Agregamos size al final del título
diff --git a/plugin.video.alfa/channels/doomtv.py b/plugin.video.alfa/channels/doomtv.py
index d8c4907d..6a233c27 100644
--- a/plugin.video.alfa/channels/doomtv.py
+++ b/plugin.video.alfa/channels/doomtv.py
@@ -15,12 +15,10 @@ from core.item import Item
 from platformcode import config, logger
 from channelselector import get_thumb
 
-IDIOMAS = {'latino': 'Latino'}
+IDIOMAS = {'Latino': 'Latino'}
 list_language = IDIOMAS.values()
-
-CALIDADES = {'1080p': '1080p', '720p': '720p', '480p': '480p', '360p': '360p'}
-list_quality = CALIDADES.values()
-list_servers = ['directo', 'openload']
+list_quality = []
+list_servers = ['dostream', 'openload']
 
 host = 'http://doomtv.net/'
 
@@ -28,6 +26,8 @@ host = 'http://doomtv.net/'
 def mainlist(item):
     logger.info()
 
+    autoplay.init(item.channel, list_servers, list_quality)
+
     itemlist = []
 
     itemlist.append(
@@ -65,19 +65,29 @@ def mainlist(item):
                    fanart='https://s30.postimg.cc/pei7txpa9/buscar.png'
                    ))
 
+    autoplay.show_option(item.channel, itemlist)
+
     return itemlist
 
 
+def get_source(url, referer=None):
+    logger.info()
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
 def lista(item):
     logger.info()
 
     itemlist = []
     next = False
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
 
-    patron = 'movie-id=.*?href=(.*?) data-url.*?quality>(.*?)'
-    patron += '<img data-original=(.*?) class.*?<h2>(.*?)<\/h2>.*?<p>(.*?)<\/p>'
+    data = get_source(item.url)
+    patron = 'movie-id=.*?href="([^"]+)" data-url.*?quality">([^<]+)<.*?img data-original="([^"]+)" class.*?'
+    patron += '<h2>([^<]+)<\/h2>.*?<p>([^<]+)<\/p>'
 
     matches = re.compile(patron, re.DOTALL).findall(data)
 
@@ -89,9 +99,9 @@ def lista(item):
 
     for scrapedurl, quality, scrapedthumbnail, scrapedtitle, plot in matches[first:last]:
 
-        url = scrapedurl
-        thumbnail = scrapedthumbnail
-        filtro_thumb = scrapedthumbnail.replace("https://image.tmdb.org/t/p/w185", "")
+        url = host+scrapedurl
+        thumbnail = 'https:'+scrapedthumbnail.strip()
+        filtro_thumb = thumbnail.replace("https://image.tmdb.org/t/p/w185", "")
         filtro_list = {"poster_path": filtro_thumb.strip()}
         filtro_list = filtro_list.items()
         title = scrapedtitle
@@ -114,7 +124,7 @@ def lista(item):
         url_next_page = item.url
         first = last
     else:
-        url_next_page = scrapertools.find_single_match(data, "<a href=([^ ]+) class=page-link aria-label=Next>")
+        url_next_page = scrapertools.find_single_match(data, "<li class='active'>.*?class='page larger' href='([^']+)'")
         first = 0
 
     if url_next_page:
@@ -128,14 +138,14 @@ def seccion(item):
 
     itemlist = []
     duplicado = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    patron = 'menu-item-object-category menu-item-\d+><a href=(.*?)>(.*?)<\/a><\/li>'
+    data = get_source(item.url)
+
+    patron = 'menu-item-object-category menu-item-\d+"><a href="([^"]+)">([^<]+)<\/a><\/li>'
 
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle in matches:
-        url = scrapedurl
+        url = host+scrapedurl
         title = scrapedtitle
         thumbnail = ''
         if url not in duplicado:
@@ -163,7 +173,6 @@ def newest(categoria):
     logger.info()
     itemlist = []
     item = Item()
-    # categoria='peliculas'
     try:
         if categoria in ['peliculas', 'latino']:
             item.url = host +'peliculas/page/1'
@@ -186,23 +195,38 @@ def newest(categoria):
 def findvideos(item):
     logger.info()
     itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
 
-    patron = 'id=(tab\d+)><div class=movieplay><(?:iframe|script) src=(.*?)(?:scrolling|frameborder|><\/script>)'
+    data = get_source(item.url)
+    patron = 'id="(tab\d+)"><div class="movieplay">.*?src="([^"]+)"'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for option, urls in matches:
-
+        language = 'Latino'
+        if 'http' not in urls:
+            urls = 'https:'+urls
+        if not config.get_setting('unify'):
+            title = ' [%s]' % language
+        else:
+            title = '%s'
         new_item = Item(
                         channel=item.channel,
                         url=urls,
-                        title=item.title,
+                        title= '%s'+ title,
                         contentTitle=item.title,
                         action='play',
+                        language = IDIOMAS[language],
+                        infoLabels = item.infoLabels
                         )
         itemlist.append(new_item)
-    itemlist = servertools.get_servers_itemlist(itemlist)
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+
+    # Requerido para FilterTools
+
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
 
     if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
         itemlist.append(
@@ -214,4 +238,5 @@ def findvideos(item):
                  contentTitle=item.contentTitle,
                  ))
 
+
     return itemlist
diff --git a/plugin.video.alfa/channels/doramasmp4.py b/plugin.video.alfa/channels/doramasmp4.py
index e1a26fc1..c1b41936 100644
--- a/plugin.video.alfa/channels/doramasmp4.py
+++ b/plugin.video.alfa/channels/doramasmp4.py
@@ -16,7 +16,7 @@ from core.item import Item
 from platformcode import config, logger
 from channelselector import get_thumb
 
-host = 'https://www2.doramasmp4.com/'
+host = 'https://www4.doramasmp4.com/'
 
 IDIOMAS = {'sub': 'VOSE', 'VO': 'VO'}
 list_language = IDIOMAS.values()
@@ -166,6 +166,8 @@ def findvideos(item):
     itemlist = []
 
     data = get_source(item.url)
+    new_dom=scrapertools.find_single_match(data,"var web = { domain: '(.*?)'")
+    
     patron = 'link="([^"]+)"'
 
     matches = re.compile(patron, re.DOTALL).findall(data)
@@ -191,7 +193,7 @@ def findvideos(item):
             video_data = httptools.downloadpage(video_url, headers=headers).data
             url = scrapertools.find_single_match(video_data, "'file':'([^']+)'")
         else:
-            video_url = 'https://www2.doramasmp4.com/api/redirect.php?token=%s' % token
+            video_url = new_dom+'api/redirect.php?token=%s' % token
             video_data = httptools.downloadpage(video_url, headers=headers, follow_redirects=False).headers
             url = scrapertools.find_single_match(video_data['location'], '\d+@@@(.*?)@@@')
 
diff --git a/plugin.video.alfa/channels/dospelis.json b/plugin.video.alfa/channels/dospelis.json
index 13130b10..b311ee3b 100644
--- a/plugin.video.alfa/channels/dospelis.json
+++ b/plugin.video.alfa/channels/dospelis.json
@@ -4,7 +4,7 @@
   "active": true,
   "adult": false,
   "language": ["lat", "cast"],
-  "thumbnail": "https://www.dospelis.com/wp-content/uploads/2018/07/dospelislogo.png",
+  "thumbnail": "https://www.dospelis.net/wp-content/uploads/2019/02/logodospelisamor.png",
   "banner": "",
   "categories": [
     "movie",
diff --git a/plugin.video.alfa/channels/dospelis.py b/plugin.video.alfa/channels/dospelis.py
index 4b02891a..ae332456 100644
--- a/plugin.video.alfa/channels/dospelis.py
+++ b/plugin.video.alfa/channels/dospelis.py
@@ -90,11 +90,11 @@ def section(item):
     logger.info()
     itemlist=[]
     duplicados=[]
-    data = get_source(host+'/'+item.type)
+    data = get_source(host+item.type)
     if 'Genero' in item.title:
-        patron = '<li class="cat-item cat-item-\d+"><a href="([^"]+)" >(.*?)/i>'
+        patron = '<liclass="cat-item cat-item-\d+"><ahref=([^ ]+) .*?>(.*?)/i>'
     elif 'Año' in item.title:
-        patron = '<li><a href="(.*?release.*?)">([^<]+)</a>'
+        patron = '<li><ahref=(.*?release.*?)>([^<]+)</a>'
 
     matches = re.compile(patron, re.DOTALL).findall(data)
 
@@ -102,7 +102,7 @@ def section(item):
         title = scrapedtitle
         plot=''
         if 'Genero' in item.title:
-            quantity =  scrapertools.find_single_match(scrapedtitle,'</a> <i>(.*?)<')
+            quantity =  scrapertools.find_single_match(scrapedtitle,'<i>(.*?)<')
             title = scrapertools.find_single_match(scrapedtitle,'(.*?)</')
             title = title
             plot = '%s elementos' % quantity.replace('.','')
@@ -123,9 +123,8 @@ def list_all(item):
     data = get_source(item.url)
     if item.type ==  'movies':
 
-        patron = '<article id="post-\d+" class="item movies"><div class="poster">.?<img src="([^"]+)" alt="([^"]+)">.*?'
-        patron +='"quality">([^<]+)</span><\/div>.?<a href="([^"]+)">.*?'
-        patron +='<\/h3>.?<span>([^"]+)<\/span><\/div>.*?"flags"(.*?)metadata'
+        patron = '<articleid=post-\d+ class="item movies"><divclass=poster>.?<imgsrc=([^ ]+) alt="([^"]+)">.*?'
+        patron += 'quality>([^<]+)<.*?<ahref=([^>]+)>.*?<\/h3><span>([^<]+)<.*?flags(.*?)metadata'
 
         matches = re.compile(patron, re.DOTALL).findall(data)
 
@@ -148,8 +147,8 @@ def list_all(item):
                             infoLabels={'year':year}))
 
     elif item.type ==  'tvshows':
-        patron = '<article id="post-\d+" class="item tvshows">.?<div class="poster">.?<img src="([^"]+)"'
-        patron += ' alt="([^"]+)">.*?<a href="([^"]+)">.*?<\/h3>.?<span>(.*?)<\/span><\/div>'
+        patron = '<articleid=post-\d+ class="item tvshows">.?<divclass=poster>.?<imgsrc=([^ ]+)'
+        patron += ' alt="([^"]+)">.*?<ahref=([^>]+)>.*?<\/h3>.?<span>(.*?)<\/span><\/div>'
         matches = re.compile(patron, re.DOTALL).findall(data)
 
         for scrapedthumbnail, scrapedtitle, scrapedurl, year in matches:
@@ -168,7 +167,7 @@ def list_all(item):
     tmdb.set_infoLabels(itemlist, seekTmdb=True)
     #  Paginación
 
-    url_next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)" />')
+    url_next_page = scrapertools.find_single_match(data,'<linkrel=next href=([^>]+)>')
     if url_next_page:
         itemlist.append(item.clone(title="Siguiente >>", url=url_next_page, action='list_all'))
 
@@ -180,7 +179,7 @@ def seasons(item):
     itemlist=[]
 
     data=get_source(item.url)
-    patron='Temporada.?\d+'
+    patron='title>Temporada.?(\d+)'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     infoLabels = item.infoLabels
@@ -214,7 +213,7 @@ def episodesxseasons(item):
     itemlist = []
 
     data=get_source(item.url)
-    patron='class="numerando">%s - (\d+)</div>.?<div class="episodiotitle">.?<a href="([^"]+)">([^<]+)<' % item.infoLabels['season']
+    patron='class=numerando>%s - (\d+)</div>.?<divclass=episodiotitle>.?<ahref=([^>]+)>([^<]+)<' % item.infoLabels['season']
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     infoLabels = item.infoLabels
@@ -236,12 +235,15 @@ def findvideos(item):
     logger.info()
     itemlist = []
     data = get_source(item.url)
-    patron = 'id="option-(\d+)".*?rptss" src="([^"]+)" frameborder'
+    patron = 'id=option-(\d+).*?src=([^ ]+) frameborder'
     matches = re.compile(patron, re.DOTALL).findall(data)
     lang=''
     for option, scrapedurl in matches:
         lang = scrapertools.find_single_match(data, 'href=#option-%s>.*?/flags/(.*?).png' % option)
         quality = ''
+        if 'goo.gl' in scrapedurl:
+            new_data = httptools.downloadpage(scrapedurl, follow_redirects=False).headers
+            scrapedurl = new_data['location']
         if lang not in IDIOMAS:
             lang = 'en'
         title = '%s %s'
@@ -291,8 +293,7 @@ def search_results(item):
     itemlist=[]
 
     data=get_source(item.url)
-    patron = '<article>.*?<a href="([^"]+)"><img src="([^"]+)" alt="([^"]+)" \/>.*?meta.*?'
-    patron += '"year">([^<]+)<(.*?)<p>([^<]+)<\/p>'
+    patron = '<article>.*?<ahref=([^>]+)><imgsrc=([^ ]+) alt="([^"]+)">.*?year>([^<]+)<(.*?)<p>([^<]+)<\/p>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedthumb, scrapedtitle, year, lang_data, scrapedplot in matches:
diff --git a/plugin.video.alfa/channels/downloads.json b/plugin.video.alfa/channels/downloads.json
index 6ee0d432..6e7a13d8 100755
--- a/plugin.video.alfa/channels/downloads.json
+++ b/plugin.video.alfa/channels/downloads.json
@@ -18,7 +18,7 @@
       "id": "library_add",
       "type": "bool",
       "label": "@70230",
-      "default": true,
+      "default": false,
       "enabled": true,
       "visible": true
     },
@@ -26,7 +26,7 @@
       "id": "library_move",
       "type": "bool",
       "label": "@70231",
-      "default": true,
+      "default": false,
       "enabled": "eq(-1,true)",
       "visible": true
     },
@@ -34,7 +34,7 @@
       "id": "browser",
       "type": "bool",
       "label": "@70232",
-      "default": false,
+      "default": true,
       "enabled": true,
       "visible": true
     },
diff --git a/plugin.video.alfa/channels/downloads.py b/plugin.video.alfa/channels/downloads.py
index 8c0a2441..7c44cca1 100755
--- a/plugin.video.alfa/channels/downloads.py
+++ b/plugin.video.alfa/channels/downloads.py
@@ -6,8 +6,11 @@
 import os
 import re
 import time
+import unicodedata
+
 
 from core import filetools
+from core import jsontools
 from core import scraper
 from core import scrapertools
 from core import servertools
@@ -53,7 +56,7 @@ def mainlist(item):
                     title = TITLE_TVSHOW % (
                         STATUS_COLORS[i.downloadStatus], i.downloadProgress, i.contentSerieName, i.contentChannel)
 
-                    itemlist.append(Item(title=title, channel="descargas", action="mainlist", contentType="tvshow",
+                    itemlist.append(Item(title=title, channel="downloads", action="mainlist", contentType="tvshow",
                                          contentSerieName=i.contentSerieName, contentChannel=i.contentChannel,
                                          downloadStatus=i.downloadStatus, downloadProgress=[i.downloadProgress],
                                          fanart=i.fanart, thumbnail=i.thumbnail))
@@ -308,7 +311,6 @@ def update_json(path, params):
 
 
 def save_server_statistics(server, speed, success):
-    from core import jsontools
     if os.path.isfile(STATS_FILE):
         servers = jsontools.load(open(STATS_FILE, "rb").read())
     else:
@@ -330,7 +332,6 @@ def save_server_statistics(server, speed, success):
 
 
 def get_server_position(server):
-    from core import jsontools
     if os.path.isfile(STATS_FILE):
         servers = jsontools.load(open(STATS_FILE, "rb").read())
     else:
@@ -360,7 +361,6 @@ def get_match_list(data, match_list, order_list=None, only_ascii=False, ignoreca
      coincidira con "Idioma Español" pero no con "Español" ya que la coincidencia mas larga tiene prioridad.
      
     """
-    import unicodedata
     match_dict = dict()
     matches = []
 
diff --git a/plugin.video.alfa/channels/dramasjc.py b/plugin.video.alfa/channels/dramasjc.py
index e7be6375..d9c82dd6 100644
--- a/plugin.video.alfa/channels/dramasjc.py
+++ b/plugin.video.alfa/channels/dramasjc.py
@@ -208,7 +208,8 @@ def findvideos(item):
     data = scrapertools.unescape(data)
     data = scrapertools.decodeHtmlentities(data)
 
-    patron = 'id="(Opt\d+)">.*?src="([^"]+)" frameborder.*?</iframe>'
+    # patron = 'id="(Opt\d+)">.*?src="([^"]+)" frameborder.*?</iframe>'
+    patron = 'id="(Opt\d+)">.*?src="(?!about:blank)([^"]+)" frameborder.*?</iframe>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for option, scrapedurl in matches:
diff --git a/plugin.video.alfa/channels/elreyx.py b/plugin.video.alfa/channels/elreyx.py
index 9a759807..3f5f7d78 100644
--- a/plugin.video.alfa/channels/elreyx.py
+++ b/plugin.video.alfa/channels/elreyx.py
@@ -7,8 +7,6 @@ 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
 
 host = 'http://www.elreyx.com'
 
@@ -17,11 +15,11 @@ def mainlist(item):
     logger.info()
     itemlist = []
     
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/peliculasporno.html"))
-    itemlist.append( Item(channel=item.channel, title="Escenas" , action="escenas", url=host + "/index.html"))
-    itemlist.append( Item(channel=item.channel, title="Productora" , action="productora", url=host + "/index.html"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/peliculasporno.html"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/peliculasporno.html") )
+    itemlist.append( Item(channel=item.channel, title="Escenas" , action="lista", url=host + "/index.html"))
+    itemlist.append( Item(channel=item.channel, title="Productora" , action="categorias", url=host + "/index.html") )
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/peliculasporno.html") )
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search") )
     return itemlist
 
 
@@ -30,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search-%s" % texto + ".html"
     try:
-        return escenas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -38,43 +36,33 @@ def search(item, texto):
         return []
 
 
-def productora(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^<]+)" title="View Category ([^<]+)">(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        scrapedplot = ""
-        thumbnail="https:" + scrapedthumbnail
-        url="https:" + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="escenas", title=scrapedtitle, url=url, thumbnail=thumbnail,
-                              plot=scrapedplot) )
-    return itemlist
-
-
 def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<td><a href="([^<]+)" title="Movies ([^<]+)">.*?</a>'
+    if item.title == "Categorias" :
+        patron  = '<td><a href="([^<]+)" title="Movies ([^<]+)">.*?</a>'
+    else:
+        patron  = '<a href="([^<]+)" title="View Category ([^<]+)">.*?</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         url="https:" + scrapedurl
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def escenas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = '<div class="notice_image">.*?<a title="([^"]+)" href="([^"]+)">.*?<img src="(.*?)"'
+    if not "/peliculasporno" in item.url:
+        patron  = '<div class="notice_image">.*?<a title="([^"]+)" href="([^"]+)">.*?<img src="(.*?)">'
+    else:
+        patron  = '<div class="captura"><a title="([^"]+)" href="([^"]+)".*?><img src="(.*?)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedtitle,scrapedurl,scrapedthumbnail in matches:
         scrapedplot = ""
@@ -87,28 +75,7 @@ def escenas(item):
         next_page = scrapertools.find_single_match(data,'<li><a href=\'([^\']+)\' title=\'Pagina \d+\'>&raquo;</a>')
     if next_page!= "":
         next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="escenas", title="Página Siguiente >>", text_color="blue",
-                              url=next_page) )
-    return itemlist
-
-
-def peliculas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<div class="captura"><a title="([^"]+)" href="([^"]+)".*?><img src="(.*?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedtitle,scrapedurl,scrapedthumbnail in matches:
-        scrapedplot = ""
-        url="https:" + scrapedurl
-        thumbnail="https:" + scrapedthumbnail
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=url, thumbnail=thumbnail,
-                              plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li><a href=\'([^\']+)\' title=\'Pagina \d+\'>&raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel , action="peliculas", title="Página Siguiente >>", text_color="blue",
-                              url=next_page) )
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/eroticage.py b/plugin.video.alfa/channels/eroticage.py
index 042d54ea..32b9d77c 100644
--- a/plugin.video.alfa/channels/eroticage.py
+++ b/plugin.video.alfa/channels/eroticage.py
@@ -2,13 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://www.eroticage.net'
 
@@ -16,7 +14,7 @@ host = 'http://www.eroticage.net'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", 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
@@ -27,7 +25,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -45,12 +43,12 @@ def categorias(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                                thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -61,24 +59,21 @@ def peliculas(item):
         title = scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                               plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
+                               plot=plot, fanart=scrapedthumbnail, contentTitle=contentTitle ))
     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="peliculas", title="Página Siguiente >>", text_color="blue",
-                               url=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 = scrapertools.cachePage(item.url)
+    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
         videochannel=item.channel
     return itemlist
diff --git a/plugin.video.alfa/channels/eroticasonlinetv.py b/plugin.video.alfa/channels/eroticasonlinetv.py
index 5ea30c5f..3dc0dd1f 100644
--- a/plugin.video.alfa/channels/eroticasonlinetv.py
+++ b/plugin.video.alfa/channels/eroticasonlinetv.py
@@ -7,15 +7,14 @@ 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
 
 host = 'http://www.peliculaseroticasonline.tv'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", 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
@@ -26,7 +25,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -43,12 +42,12 @@ def categorias(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -63,8 +62,7 @@ def peliculas(item):
     next_page = scrapertools.find_single_match(data, '<div class="naviright"><a href="([^"]+)">Siguiente &raquo;</a>')
     if next_page:
         next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>", text_color="blue",
-                              url=next_page ))
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page ))
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/estrenosdoramas.json b/plugin.video.alfa/channels/estrenosdoramas.json
new file mode 100644
index 00000000..82519f8f
--- /dev/null
+++ b/plugin.video.alfa/channels/estrenosdoramas.json
@@ -0,0 +1,38 @@
+{
+    "id": "estrenosdoramas",
+    "name": "Estrenos Doramas",
+    "active": true,
+    "adult": false,
+    "language": ["VOSE","LAT"],
+    "thumbnail": "https://www.estrenosdoramas.net/wp-content/uploads/2016/08/estrenos-doramasss-net3.png",
+    "banner": "",
+    "categories": [
+      "tvshow",
+      "vos"
+    ],
+    "settings": [
+      {
+        "id": "include_in_global_search",
+        "type": "bool",
+        "label": "Incluir en busqueda global",
+        "default": false,
+        "enabled": false,
+        "visible": false
+      },
+      {
+        "id": "filter_languages",
+        "type": "list",
+        "label": "Mostrar enlaces en idioma...",
+        "default": 0,
+        "enabled": true,
+        "visible": true,
+        "lvalues": [
+          "No filtrar",
+          "VOSE",
+          "VO",
+          "LAT"
+        ]
+      }
+    ]
+  }
+  
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/estrenosdoramas.py b/plugin.video.alfa/channels/estrenosdoramas.py
new file mode 100644
index 00000000..90331adc
--- /dev/null
+++ b/plugin.video.alfa/channels/estrenosdoramas.py
@@ -0,0 +1,296 @@
+# -*- coding: utf-8 -*-
+# -*- Channel Estreno Doramas -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the BDamian (Based on channels from Alfa Develop Group) -*-
+
+import re
+
+from channels import autoplay
+from channels import filtertools
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core import jsontools
+from core import tmdb
+from core.item import Item
+from platformcode import config, logger
+from channelselector import get_thumb
+import ast
+
+host = 'https://www.estrenosdoramas.net/'
+
+IDIOMAS = {'Latino': 'LAT', 'Vo':'VO', 'Vose': 'VOSE'}
+IDIOMA = "no filtrar"
+list_language = IDIOMAS.values()
+list_quality = []
+list_servers = ['openload', 'streamango', 'netutv', 'okru', 'mp4upload']
+
+def get_source(url, referer=None):
+    logger.info()
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+def mainlist(item):
+    logger.info()
+
+    autoplay.init(item.channel, list_servers, list_quality)
+    itemlist = []
+
+    itemlist.append(Item(channel= item.channel, title="Doramas", action="list_all",
+                         url=host + 'category/doramas-online',
+                         thumbnail=get_thumb('doramas', auto=True), type='dorama'))
+
+    itemlist.append(Item(channel=item.channel, title="Películas", action="list_all",
+                         url=host + 'category/peliculas',
+                         thumbnail=get_thumb('movies', auto=True), type='movie'))
+    
+    itemlist.append(Item(channel=item.channel, title="Últimos capítulos", action="list_all",
+                         url=host + 'category/ultimos-capitulos-online',
+                         thumbnail=get_thumb('doramas', auto=True), type='movie'))
+
+    itemlist.append(Item(channel=item.channel, title="Por Genero", action="menu_generos",
+                         url=host,
+                         thumbnail=get_thumb('doramas', auto=True), type='dorama'))
+
+    itemlist.append(Item(channel=item.channel, title="Doblado Latino", action="list_all",
+                         url=host + 'category/latino',
+                         thumbnail=get_thumb('doramas', auto=True), type='dorama'))
+
+    itemlist.append(Item(channel=item.channel, title = 'Buscar', action="search", url= host+'search/',
+                         thumbnail=get_thumb('search', auto=True)))
+
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+
+def menu_generos(item):
+    logger.info()
+
+    data = get_source(item.url)
+    data = scrapertools.find_single_match(data, '<div id="genuno">(.*?)</div>')
+    
+    itemlist = []
+
+    patron = '<li><a.*?href="(.*?)">(.*?)</a>.*?</li>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    media_type = item.type
+    for scrapedurl, scrapedtitle in matches:
+        new_item = Item(channel=item.channel, title=scrapedtitle, url=scrapedurl, 
+                        thumbnail=item.thumbnail, type=item.type, action="list_all")
+        itemlist.append(new_item)
+
+    return itemlist
+
+
+def list_all(item):
+    logger.info()
+    itemlist = []
+
+    data = get_source(item.url)
+    data = scrapertools.find_single_match(data, '<h3 class="widgetitulo">Resultados</h3>.*?<div id="sidebar-wrapper">')
+    
+    patron = '<div.*?<a href="(.*?)"><img src="(.*?)" alt="(.*?)".*?</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
+        new_item = Item(channel=item.channel, title=scrapedtitle, url=scrapedurl,
+                        thumbnail=scrapedthumbnail)
+        if scrapedtitle.startswith("Pelicula") or item.type == "movie":
+            new_item.action = 'findvideos'
+            new_item.contentTitle = scrapedtitle
+        else:
+            new_item.contentSerieName=scrapedtitle
+            new_item.action = 'episodios'
+        itemlist.append(new_item)
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    # Paginacion
+    patron = '<a class="nextpostslink" rel="next" href="(.*?)">'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    if matches:
+        itemlist.append(Item(channel=item.channel, action="list_all", title='Siguiente >>>',
+                             url=matches[0], type=item.type))
+    return itemlist
+
+
+def episodios(item):
+    logger.info()
+    itemlist = []
+    data = get_source(item.url)
+    
+    plot_regex = '(<span class="clms"><b>Nombre.*?)<\/div>'
+    plot_match = re.compile(plot_regex, re.DOTALL).findall(data)
+    if plot_match:
+        plot = scrapertools.htmlclean(plot_match[0].replace('<br />', '\n'))
+    
+    data = scrapertools.find_single_match(data, '<ul class="lcp_catlist".*?</ul>')
+    patron = '<li.*?<a href="(.*?)" title="(.*?)">.*?(\d*?)<\/a>'
+    
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    infoLabels = item.infoLabels
+
+    for scrapedurl, scrapedtitle, scrapedep in matches:
+        if item.url == scrapedurl:
+            continue
+        url = scrapedurl        
+        contentEpisodeNumber = scrapedep
+        if contentEpisodeNumber == "":
+            title = '1xEE - ' + scrapedtitle
+        else:
+            title = '1x' + ("0" + contentEpisodeNumber)[-2:] + " - " + scrapedtitle
+            # title = ("0" + contentEpisodeNumber)[-2:]
+
+        infoLabels['season'] = 1
+        infoLabels['episode'] = contentEpisodeNumber
+        infoLabels = item.infoLabels
+
+        itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, plot=plot,
+                             contentEpisodeNumber=contentEpisodeNumber, type='episode', infoLabels=infoLabels))
+
+    itemlist.sort(key=lambda x: x.title)
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+            item.clone(title="Añadir esta serie a la videoteca", action="add_serie_to_library", extra="episodios", text_color='yellow'))
+    return itemlist
+
+def findvideos(item):
+    logger.info()
+
+    itemlist = []
+    data = get_source(item.url)
+    data = scrapertools.find_single_match(data, '<div id="marco-post">.*?<div id="sidebar">')
+    data = scrapertools.unescape(data)
+    data = scrapertools.decodeHtmlentities(data)
+    
+    options_regex = '<a href="#tab.*?">.*?<b>(.*?)</b>'
+    option_matches = re.compile(options_regex, re.DOTALL).findall(data)
+
+    video_regex = '<iframe.*?src="(.*?)".*?</iframe>'
+    video_matches = re.compile(video_regex, re.DOTALL).findall(data)
+
+    # for option, scrapedurl in matches:
+    for option, scrapedurl in map(None, option_matches, video_matches):
+        if scrapedurl is None:
+            continue
+        
+        scrapedurl = scrapedurl.replace('"','').replace('&#038;','&')
+        logger.info(scrapedurl)
+        try:
+            data_video = get_source(scrapedurl)
+        except Exception as e:
+            logger.info('Error en url: ' + scrapedurl)
+            continue
+        
+        # logger.info(data_video)
+
+        # Este sitio pone multiples páginas intermedias, cada una con sus reglas.
+        source_headers = dict()
+        source_headers["Content-Type"] = "application/x-www-form-urlencoded; charset=UTF-8"
+        source_headers["X-Requested-With"] = "XMLHttpRequest"
+        if scrapedurl.find("https://repro") != 0:
+            logger.info("Caso 0: url externa")
+            url = scrapedurl
+            itemlist.append(Item(channel=item.channel, title=option, url=url, action='play', language=IDIOMA))
+        elif scrapedurl.find("pi76823.php") > 0:
+            logger.info("Caso 1")
+            source_data = get_source(scrapedurl)
+            source_regex = 'post\( "(.*?)", { acc: "(.*?)", id: \'(.*?)\', tk: \'(.*?)\' }'
+            source_matches = re.compile(source_regex, re.DOTALL).findall(source_data)
+            for source_page, source_acc, source_id, source_tk in source_matches:
+                source_url = scrapedurl[0:scrapedurl.find("pi76823.php")] + source_page
+                source_result = httptools.downloadpage(source_url, 'acc=' + source_acc + '&id=' + 
+                                                       source_id + '&tk=' + source_tk, source_headers)
+                if source_result.code == 200:
+                    source_json = jsontools.load(source_result.data)
+                    itemlist.append(Item(channel=item.channel, title=option, url=source_json['urlremoto'], action='play', language=IDIOMA))
+        elif scrapedurl.find("pi7.php") > 0:
+            logger.info("Caso 2")
+            source_data = get_source(scrapedurl)
+            source_regex = 'post\( "(.*?)", { acc: "(.*?)", id: \'(.*?)\', tk: \'(.*?)\' }'
+            source_matches = re.compile(source_regex, re.DOTALL).findall(source_data)
+            for source_page, source_acc, source_id, source_tk in source_matches:
+                source_url = scrapedurl[0:scrapedurl.find("pi7.php")] + source_page
+                source_result = httptools.downloadpage(source_url, 'acc=' + source_acc + '&id=' + 
+                                                       source_id + '&tk=' + source_tk, source_headers)
+                if source_result.code == 200:
+                    source_json = jsontools.load(source_result.data)
+                    itemlist.append(Item(channel=item.channel, title=option, url=source_json['urlremoto'], action='play', language=IDIOMA))
+        elif scrapedurl.find("reproducir120.php") > 0:
+            logger.info("Caso 3")
+            source_data = get_source(scrapedurl)
+
+            videoidn = scrapertools.find_single_match(source_data, 'var videoidn = \'(.*?)\';')
+            tokensn = scrapertools.find_single_match(source_data, 'var tokensn = \'(.*?)\';')
+            
+            source_regex = 'post\( "(.*?)", { acc: "(.*?)"'
+            source_matches = re.compile(source_regex, re.DOTALL).findall(source_data)
+            for source_page, source_acc in source_matches:
+                source_url = scrapedurl[0:scrapedurl.find("reproducir120.php")] + source_page
+                source_result = httptools.downloadpage(source_url, 'acc=' + source_acc + '&id=' + 
+                                                       videoidn + '&tk=' + tokensn, source_headers)
+                if source_result.code == 200:
+                    source_json = jsontools.load(source_result.data)
+                    urlremoto_regex = "file:'(.*?)'"
+                    urlremoto_matches = re.compile(urlremoto_regex, re.DOTALL).findall(source_json['urlremoto'])
+                    if len(urlremoto_matches) == 1:
+                        itemlist.append(Item(channel=item.channel, title=option, url=urlremoto_matches[0], action='play', language=IDIOMA))
+        elif scrapedurl.find("reproducir14.php") > 0:
+            logger.info("Caso 4")
+            source_data = get_source(scrapedurl)
+            
+            source_regex = '<div id="player-contenido" vid="(.*?)" name="(.*?)"'
+            source_matches = re.compile(source_regex, re.DOTALL).findall(source_data)
+            videoidn = source_matches[0][0]
+            tokensn = source_matches[0][1]
+            
+            source_regex = 'post\( "(.*?)", { acc: "(.*?)"'
+            source_matches = re.compile(source_regex, re.DOTALL).findall(source_data)
+            for source_page, source_acc in source_matches:
+                source_url = scrapedurl[0:scrapedurl.find("reproducir14.php")] + source_page
+                source_result = httptools.downloadpage(source_url, 'acc=' + source_acc + '&id=' + 
+                                                       videoidn + '&tk=' + tokensn, source_headers)
+                if source_result.code == 200:
+                    source_json = jsontools.load(source_result.data)
+                    itemlist.append(Item(channel=item.channel, title=option, url=source_json['urlremoto'], action='play', language=IDIOMA))
+        else:
+            logger.info("Caso nuevo")      
+
+    itemlist = servertools.get_servers_itemlist(itemlist)
+
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+        itemlist.append(
+            Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+                 action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle))
+
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    import urllib
+    itemlist = []
+    texto = texto.replace(" ", "+")
+    item.url = item.url + texto
+    item.type = 'search'
+    if texto != '':
+        try:
+            return list_all(item)
+        except:
+            itemlist.append(item.clone(url='', title='No hay elementos...', action=''))
+            return itemlist
diff --git a/plugin.video.alfa/channels/fanpelis.py b/plugin.video.alfa/channels/fanpelis.py
index ede3f2d6..5c5e9987 100644
--- a/plugin.video.alfa/channels/fanpelis.py
+++ b/plugin.video.alfa/channels/fanpelis.py
@@ -16,7 +16,7 @@ from core.item import Item
 from platformcode import config, logger
 from core import tmdb
 
-host = "http://fanpelis.com/"
+host = "https://fanpelis.com/"
 
 def mainlist(item):
     logger.info()
diff --git a/plugin.video.alfa/channels/fapality.py b/plugin.video.alfa/channels/fapality.py
index f6bd2bd8..97ba9d01 100644
--- a/plugin.video.alfa/channels/fapality.py
+++ b/plugin.video.alfa/channels/fapality.py
@@ -7,8 +7,6 @@ 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
 
 host = 'https://fapality.com'
 
@@ -16,9 +14,9 @@ host = 'https://fapality.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/newest/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/newest/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/popular/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top/"))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/channels/"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
@@ -30,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -51,12 +49,12 @@ def categorias(item):
         scrapedplot = ""
         scrapedtitle = scrapedtitle.replace("movies", "") + " (" + cantidad + ")"
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                                thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -75,8 +73,7 @@ def peliculas(item):
     next_page_url = scrapertools.find_single_match(data,'<li itemprop="url" class="current">.*?<a href="([^"]+)"')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="peliculas", title="Página Siguiente >>", text_color="blue",
-                               url=next_page_url) )
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/fetishshrine.py b/plugin.video.alfa/channels/fetishshrine.py
index 48e45937..d57820a9 100644
--- a/plugin.video.alfa/channels/fetishshrine.py
+++ b/plugin.video.alfa/channels/fetishshrine.py
@@ -7,8 +7,6 @@ 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
 
 host = 'https://www.fetishshrine.com'
 
@@ -16,9 +14,9 @@ host = 'https://www.fetishshrine.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor Valorado" , action="peliculas", url=host + "/top-rated/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/most-popular/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor Valorado" , action="lista", url=host + "/top-rated/"))
     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
@@ -29,7 +27,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -42,45 +40,50 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)" title="([^"]+) porn tube" class="thumb">.*?<img src="([^"]+)".*?<span class="total">([^"]+)</span>'
+    patron = '<a href="([^"]+)" title="([^"]+)">.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<span class="vids">(\d+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail , plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a itemprop="url" href="([^"]+)">.*?<img src="([^"]+)".*?alt="([^"]+)">.*?<span class="duration">(.*?)</span>'
+    patron = '<a href="([^"]+)" itemprop="url">.*?'
+    patron += '<img src="([^"]+)" alt="([^"]+)">.*?'
+    patron += '<span itemprop="duration" class="length">(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
         url = scrapedurl
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = title
+        contentTitle = scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        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,'<li class="next"><a.*?href="([^"]+)" title="Next">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                               plot=plot, fanart=scrapedthumbnail, contentTitle = contentTitle ))
+    next_page = scrapertools.find_single_match(data,'<li><a data=\'\d+\' href="([^"]+)" title="Next">')
+    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
 
 
 def play(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     patron  = 'video_url: \'([^\']+)\''
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
+        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/plugin.video.alfa/channels/filmoviXXX.py b/plugin.video.alfa/channels/filmoviXXX.py
index 44b952c4..650f9335 100644
--- a/plugin.video.alfa/channels/filmoviXXX.py
+++ b/plugin.video.alfa/channels/filmoviXXX.py
@@ -2,14 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
-from core import jsontools
 
 
 def mainlist(item):
@@ -19,27 +16,28 @@ def mainlist(item):
         item.url = "http://www.filmovix.net/videoscategory/porno/"
     data = httptools.downloadpage(item.url).data
     data = scrapertools.get_match(data,'<h1 class="cat_head">XXX</h1>(.*?)<h3> Novo dodato </h3>')
-    patron  = '<li class="clearfix">.*?src="([^"]+)".*?<p class="title"><a href="([^"]+)" rel="bookmark" title="([^"]+)">'
+    patron  = '<li class="clearfix">.*?'
+    patron += 'src="([^"]+)".*?'
+    patron += '<p class="title"><a href="([^"]+)" rel="bookmark" title="([^"]+)">'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
         contentTitle = scrapedtitle
         title = scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
+                               thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle=contentTitle))
     next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="mainlist" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append(item.clone(action="mainlist", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
     return itemlist
     
     
 def play(item):
     logger.info()
-    data = scrapertools.cachePage(item.url)
+    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
diff --git a/plugin.video.alfa/channels/filmpornoita.py b/plugin.video.alfa/channels/filmpornoita.py
index 9b730573..cc0d3cde 100644
--- a/plugin.video.alfa/channels/filmpornoita.py
+++ b/plugin.video.alfa/channels/filmpornoita.py
@@ -2,14 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
-from core import jsontools
 
 host = 'http://www.streamxxxx.com'
 
@@ -17,7 +14,7 @@ host = 'http://www.streamxxxx.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url= host))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url= host))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url= host))
     return itemlist
 
@@ -32,11 +29,12 @@ def categorias(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -48,10 +46,11 @@ def peliculas(item):
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail  in matches:
         plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=plot , viewmode="movie", folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)">Next')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail , plot=plot , viewmode="movie") )
+    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)">Next')
+    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
 
diff --git a/plugin.video.alfa/channels/foxtube.py b/plugin.video.alfa/channels/foxtube.py
index ad457b70..a1ce679e 100644
--- a/plugin.video.alfa/channels/foxtube.py
+++ b/plugin.video.alfa/channels/foxtube.py
@@ -7,15 +7,13 @@ 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
 
 host = 'http://es.foxtube.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", 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
@@ -26,7 +24,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/buscador/%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -45,29 +43,37 @@ def categorias(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
-    patron  = '<a class="thumb tco1" href="([^"]+)">.*?src="([^"]+)".*?alt="([^"]+)".*?<i class="m tc2">(.*?)</i>'
+    patron = '<a class="thumb tco1" href="([^"]+)">.*?'
+    patron += 'src="([^"]+)".*?'
+    patron += 'alt="([^"]+)".*?'
+    patron += '<span class="t">(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
-        url = host + scrapedurl
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = title
+        url = urlparse.urljoin(item.url,scrapedurl)
+        contentTitle = scrapedtitle
+        time = scrapertools.find_single_match(duracion, '<i class="m tc2">([^"]+)</i>')
+        if not 'HD' in duracion :
+            title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
+        else:
+            title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR]  " + scrapedtitle
         thumbnail = scrapedthumbnail + "|Referer=%s" %host
         plot = ""
-        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="bgco2 tco3" rel="next" href="([^"]+)">&gt</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                               plot=plot, contentTitle = contentTitle))
+	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
 
 
@@ -76,7 +82,7 @@ def play(item):
     itemlist = []
     url = scrapertools.find_single_match(scrapertools.cachePage(item.url),'<iframe src="([^"]+)"')
     data = httptools.downloadpage(url).data
-    patron  = 'html5player.setVideoUrlHigh\\(\'([^\']+)\''
+    patron  = 'html5player.setVideoHLS\\(\'([^\']+)\''
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
         scrapedurl = scrapedurl.replace("\/", "/")
diff --git a/plugin.video.alfa/channels/freeporn.py b/plugin.video.alfa/channels/freeporn.py
index 0f60bbba..36ec9804 100644
--- a/plugin.video.alfa/channels/freeporn.py
+++ b/plugin.video.alfa/channels/freeporn.py
@@ -7,16 +7,15 @@ 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
 
 host = 'https://frprn.com'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top-raped/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-raped/"))
     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
@@ -27,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/%s/" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -40,22 +39,30 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li class="thumb thumb-category">.*?<a href="([^"]+)">.*?<img class="lazy" data-original="([^"]+)">.*?<div class="name">([^"]+)</div>.*?<div class="count">(\d+)</div>'
+    patron  = '<li class="thumb thumb-category">.*?'
+    patron += '<a href="([^"]+)">.*?'
+    patron += '<img class="lazy" data-original="([^"]+)">.*?'
+    patron += '<div class="name">([^"]+)</div>.*?'
+    patron += '<div class="count">(\d+)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + "  (" + cantidad + ")"
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="thumb">.*?<a href="([^"]+)".*?<img class="lazy" data-original="([^"]+)" alt="([^"]+)".*?<span class="duration">([^"]+)</span>'
+    patron  = '<div class="thumb">.*?'
+    patron += '<a href="([^"]+)".*?'
+    patron += '<img class="lazy" data-original="([^"]+)" alt="([^"]+)".*?'
+    patron += '<span class="duration">([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
@@ -64,11 +71,12 @@ def peliculas(item):
         thumbnail = scrapedthumbnail
         plot = ""
         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,'<li class="pagination-next"><a href="([^"]+)">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                               plot=plot, contentTitle = contentTitle))
+    next_page = scrapertools.find_single_match(data,'<li class="pagination-next"><a 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
 
 
diff --git a/plugin.video.alfa/channels/freepornstreams.py b/plugin.video.alfa/channels/freepornstreams.py
index b1196b16..c98aae73 100644
--- a/plugin.video.alfa/channels/freepornstreams.py
+++ b/plugin.video.alfa/channels/freepornstreams.py
@@ -2,14 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
-from core import jsontools
 
 host = 'http://freepornstreams.org'
 
@@ -17,8 +14,8 @@ host = 'http://freepornstreams.org'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/free-full-porn-movies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/free-stream-porn/"))
+    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="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"))
@@ -30,7 +27,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -49,7 +46,7 @@ def catalogo(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
@@ -65,12 +62,12 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedurl = scrapedurl.replace ("http://freepornstreams.org/freepornst/stout.php?s=100,75,65:*&#038;u=" , "")
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
                                thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -85,11 +82,10 @@ def peliculas(item):
         plot = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
                                plot=plot, fulltitle=title) )
-    next_page_url = scrapertools.find_single_match(data, '<div class="nav-previous"><a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="peliculas", title="Página Siguiente >>", text_color="blue",
-                               url=next_page_url) )
+    next_page = scrapertools.find_single_match(data, '<div class="nav-previous"><a 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
 
 
diff --git a/plugin.video.alfa/channels/gmobi.json b/plugin.video.alfa/channels/gmobi.json
index 8db02207..fc321f42 100644
--- a/plugin.video.alfa/channels/gmobi.json
+++ b/plugin.video.alfa/channels/gmobi.json
@@ -4,35 +4,59 @@
   "active": true,
   "adult": false,
   "language": ["cast", "lat"],
-  "thumbnail": "http://www.gnula.mobi/wp-content/uploads/2018/05/Captura-1.png?%3E",
+  "thumbnail": "https://gnula.mobi/wp-content/uploads/2018/12/gnula-logo.png",
   "banner": "",
   "categories": [
     "movie"
   ],
   "settings": [
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "LAT",
+        "ESP",
+        "VOSE"
+      ]
+    },
+     {
+      "id": "modo_grafico",
+      "type": "bool",
+      "label": "Buscar información extra",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
     {
       "id": "include_in_global_search",
       "type": "bool",
       "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
       "default": false,
-      "enabled": false,
-      "visible": false
-    },
-    {
-      "id": "include_in_newest_castellano",
-      "type": "bool",
-      "label": "Incluir en Novedades - Castellano",
-      "default": true,
       "enabled": true,
       "visible": true
     },
     {
-      "id": "include_in_newest_latino",
-      "type": "bool",
-      "label": "Incluir en Novedades - Latino",
-      "default": true,
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
       "enabled": true,
-      "visible": true
-    }
-  ]
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    } 
+ ]
 }
+
diff --git a/plugin.video.alfa/channels/gmobi.py b/plugin.video.alfa/channels/gmobi.py
index f1d6b58d..1afc1e1b 100644
--- a/plugin.video.alfa/channels/gmobi.py
+++ b/plugin.video.alfa/channels/gmobi.py
@@ -3,36 +3,60 @@
 # Alfa 
 # ------------------------------------------------------------
 
-import re
+import re, urllib, urlparse
+import base64
 
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import tmdb
+from channels import autoplay
+from platformcode import config, logger, platformtools
 from core.item import Item
-from platformcode import logger
+from core import httptools, scrapertools, jsontools, tmdb
+from core import servertools
+from channels import filtertools
+
+host = 'http://www.gnula.mobi'
+
+IDIOMAS = {'Latino': 'LAT', 'Castellano': 'ESP', 'Subtitulado': 'VOSE'}
+list_language = IDIOMAS.values()
+list_servers = ['rapidvideo', 'streamgo', 'openload']
+
+list_quality = ['HD',  'BR-S', 'TS']
+
+__channel__='gmobi'
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__)
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__)
+
+
+try:
+    __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
+except:
+    __modo_grafico__ = True
+
 
-host = 'http://www.gnula.mobi/'
 def mainlist(item):
     logger.info()
     itemlist = list()
-    itemlist.append(item.clone(title="Novedades", action="peliculas", url=host))
-    itemlist.append(item.clone(title="Castellano", action="peliculas",
-                               url="http://www.gnula.mobi/tag/espanol/"))
-    itemlist.append(item.clone(title="Latino", action="peliculas", url="http://gnula.mobi/tag/latino/"))
-    itemlist.append(item.clone(title="VOSE", action="peliculas", url="http://gnula.mobi/tag/subtitulada/"))
-
+    autoplay.init(item.channel, list_servers, list_quality)
+    itemlist.append(item.clone(title="Novedades", action="lista", url=host + "/categorias/estrenos"))
+    itemlist.append(item.clone(title="Categorias" , action="categorias", url= host))
     itemlist.append(item.clone(title="Buscar", action="search"))
+    itemlist.append(item.clone(title="Configurar canal...", text_color="gold", action="configuracion", folder=False))
+    autoplay.show_option(item.channel, itemlist)
     return itemlist
 
 
+def configuracion(item):
+    ret = platformtools.show_channel_settings()
+    platformtools.itemlist_refresh()
+    return ret
+
+
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
-    item.url = "http://gnula.mobi/?s=%s" % texto
+    item.url = host + "/?s=%s" % texto
 
     try:
-        return sub_search(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -40,55 +64,49 @@ def search(item, texto):
         return []
 
 
-def sub_search(item):
+def categorias(item):
     logger.info()
-
     itemlist = []
-
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-
-    patron = '<div class="row">.*?<a href="([^"]+)" title="([^"]+)">.*?<img src="(.*?)" title'
-    matches = scrapertools.find_multiple_matches(data, patron)
-
-    for url, name, img in matches:
-        itemlist.append(item.clone(title=name, url=url, action="findvideos", thumbnail=img))
-
-    paginacion = scrapertools.find_single_match(data, '<a href="([^"]+)" ><i class="glyphicon '
-                                                      'glyphicon-chevron-right" aria-hidden="true"></i>')
-
-    if paginacion:
-        itemlist.append(Item(channel=item.channel, action="sub_search", title="Next page >>", url=paginacion))
-
+    data = scrapertools.get_match(data,'<a>CATEGORÍAS</a>(.*?)</ul>')
+    patron  = '<a href="([^"]+)">([^"]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append(item.clone(channel=item.channel, action="lista", title=scrapedtitle , url=scrapedurl ,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="col-mt-5 postsh">.*?href="(.*?)" title="(.*?)".*?<.*?src="(.*?)"'
+    patron = '<article id="post-\d+".*?'
+    patron += '<a href="([^"]+)".*?'
+    patron += '<div class="Image">(.*?)</div>.*?'
+    patron += '"Title">([^"]+)</h2>.*?'
+    patron += '"Year">(\d+)</span>.*?'
+    patron += '<span class="Qlty">\w+ \(([^"]+)\)</span>'
     matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
-        filter_thumb = scrapedthumbnail.replace("http://image.tmdb.org/t/p/w300", "")
-        filter_list = {"poster_path": filter_thumb}
-        filter_list = filter_list.items()
-        itemlist.append(Item(channel=item.channel,
-                             action="findvideos",
-                             title=scrapedtitle,
-                             fulltitle = scrapedtitle,
-                             url=scrapedurl,
-                             thumbnail=scrapedthumbnail,
-                             infoLabels={'filtro': filter_list}))
-
+    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, calidad in matches:
+        thumbnail = scrapertools.find_single_match(scrapedthumbnail, 'src="([^"]+)"')
+        scrapedtitle = scrapedtitle.replace("(%s)"  % scrapedyear, "")
+        if not config.get_setting('unify'):
+            title =  title = '%s [COLOR red] %s [/COLOR] (%s)' % (scrapedtitle, calidad , scrapedyear)
+        else:
+            title = ''
+        if not '>TV<' in scrapedthumbnail:
+            itemlist.append(item.clone(action="findvideos", title=title, url=scrapedurl, thumbnail=thumbnail,
+                                   contentTitle = scrapedtitle, quality=calidad, infoLabels={'year':scrapedyear}) )
     tmdb.set_infoLabels(itemlist, True)
-    next_page_url = scrapertools.find_single_match(data, '<link rel="next" href="(.*?)"')
+    next_page_url = scrapertools.find_single_match(data, '<a class="next page-numbers" href="([^"]+)"')
     if next_page_url != "":
         next_page_url = next_page_url
-        itemlist.append(item.clone(action="peliculas", title="Siguiente >>", text_color="yellow",
+        itemlist.append(item.clone(action="lista", title="Siguiente >>", text_color="yellow",
                                    url=next_page_url))
-
     return itemlist
 
 
@@ -96,50 +114,46 @@ def findvideos(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = 'data-src="([^"]+)".*?'
-    patron += 'data-toggle="tab">([^<]+)'
+    patron = '"server":"[^"]+",'
+    patron += '"lang":"([^"]+)",'
+    patron += '"quality":"\w+ \(([^"]+)\)",'
+    patron += '"link":"https:.*?=([^"]+)"'
     matches = scrapertools.find_multiple_matches(data, patron)
-    for url, language in matches:
-        url = url.replace("&amp;", "&")
-        response = httptools.downloadpage(url, follow_redirects=False, add_referer=True)
-        if response.data:
-            url = scrapertools.find_single_match(response.data, 'src="([^"]+)"')
+    for lang, quality, url in matches:
+        if lang in IDIOMAS:
+            lang = IDIOMAS[lang]
+        url = base64.b64decode(url + "==")
+        if not config.get_setting('unify'):
+            title =  '[COLOR red] %s [/COLOR] (%s)' % (quality , lang)
         else:
-            url = response.headers.get("location", "")
-        url = url.replace("&quot","")
-        titulo = "Ver en %s (" + language + ")"
-        itemlist.append(item.clone(
-                                   action = "play",
-                                   title = titulo,
-                                   url = url,
-                                   language = language))
-    tmdb.set_infoLabels(itemlist, True)
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+            title = ''
+        itemlist.append(item.clone(action = "play", title = '%s'+ title, url = url, language=lang, quality=quality,
+                                   fulltitle = item.title))
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) 
+    # Requerido para Filtrar enlaces
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra !='findvideos' :
+        itemlist.append(Item(channel=item.channel, action="add_pelicula_to_library", 
+                             title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+                             extra="findvideos", contentTitle=item.contentTitle))
     return itemlist
 
 
 def play(item):
-    item.thumbnail = item.contentThumbnail
-    return [item]
-
-def newest(categoria):
     logger.info()
-    itemlist = []
-    item = Item()
-    try:
-        if categoria == 'peliculas':
-            item.url = host
-        elif categoria == 'castellano':
-            item.url = host +'tag/espanol/'
-        elif categoria == 'latino':
-            item.url = host +'tag/latino/'
-        itemlist = peliculas(item)
-        if "Pagina" in itemlist[-1].title:
-            itemlist.pop()
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
+    data = scrapertools.cachePage(item.url)
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.fulltitle
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
     return itemlist
+
+
diff --git a/plugin.video.alfa/channels/goodpelis.py b/plugin.video.alfa/channels/goodpelis.py
deleted file mode 100644
index c7aa3349..00000000
--- a/plugin.video.alfa/channels/goodpelis.py
+++ /dev/null
@@ -1,354 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- Channel GoodPelis -*-
-# -*- Created for Alfa-addon -*-
-# -*- By the Alfa Develop Group -*-
-
-import re
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import tmdb
-from core.item import Item
-from platformcode import config, logger
-from channelselector import get_thumb
-
-host = 'https://goodpelis.net/'
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(item.clone(title="Peliculas",
-                               action="menu_peliculas",
-                               thumbnail=get_thumb('movies', auto=True),
-                               ))
-
-    # itemlist.append(item.clone(title="Series",
-    #                            action="menu_series",
-    #                            thumbnail=get_thumb('tvshows', auto=True),
-    #                            ))
-
-    itemlist.append(item.clone(title="Buscar", action="search",
-                               thumbnail=get_thumb('search', auto=True),
-                               url=host + '?s='
-                               ))
-
-    return itemlist
-
-
-def menu_peliculas(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(item.clone(title="Todas",
-                               action="list_all",
-                               thumbnail=get_thumb('all', auto=True),
-                               url=host + 'page/1/?s'
-                               ))
-
-    itemlist.append(item.clone(title="Generos",
-                               action="seccion",
-                               url=host + 'page/1/?s',
-                               thumbnail=get_thumb('genres', auto=True),
-                               seccion='generos-pelicula'
-                               ))
-
-    itemlist.append(item.clone(title="Por Año",
-                               action="seccion",
-                               url=host + 'page/1/?s',
-                               thumbnail=get_thumb('year', auto=True),
-                               seccion='fecha-estreno'
-                               ))
-
-    itemlist.append(item.clone(title="Calidad",
-                               action="seccion",
-                               url=host + 'page/1/?s',
-                               thumbnail=get_thumb('quality', auto=True),
-                               seccion='calidad'
-                               ))
-
-    return itemlist
-
-
-def menu_series(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(item.clone(title="Todas",
-                               action="list_all", thumbnail=get_thumb('all', auto=True),
-                               url=host + 'series/page/1/',
-                               ))
-
-    itemlist.append(item.clone(title="Generos",
-                               action="seccion",
-                               url=host + 'series/page/1/',
-                               thumbnail=get_thumb('genres', auto=True),
-                               seccion='generos-serie'
-                               ))
-
-    itemlist.append(item.clone(title="Por Año",
-                               action="seccion",
-                               url=host + 'series/page/1/',
-                               thumbnail=get_thumb('year', auto=True),
-                               seccion='series-lanzamiento'
-                               ))
-
-    return itemlist
-
-
-def list_all(item):
-    logger.info()
-
-    itemlist = []
-    data = get_source(item.url)
-    patron = 'class=item.*?<a href=(.*?)><div class=image.*?<img src=(.*?) alt=(.*?) (?:\(\d{4}|width).*?'
-    patron += 'fixyear><h2>.*?<\/h2>.*?<span class=year>(.*?)<\/span><\/div>(.*?)<\/div>'
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, scrapedquality in matches:
-        url = scrapedurl
-        action = 'findvideos'
-        thumbnail = scrapedthumbnail
-        plot = ''
-        contentSerieName = ''
-        contentTitle = scrapedtitle
-        title = contentTitle
-        quality = 'Full HD'
-        if scrapedquality != '':
-            quality = scrapertools.find_single_match(scrapedquality, 'calidad2>(.*?)<')
-            title = contentTitle + ' (%s)' % quality
-
-        year = scrapedyear
-
-        if 'series' in item.url or 'series' in url:
-            action = 'seasons'
-            contentSerieName = contentTitle
-            quality = ''
-        new_item = Item(channel=item.channel,
-                             action=action,
-                             title=title,
-                             url=url,
-                             thumbnail=thumbnail,
-                             plot=plot,
-                             quality=quality,
-                             infoLabels={'year': year}
-                             )
-        if 'series' not in item.url:
-            new_item.contentTitle = contentTitle
-        else:
-            new_item.contentSerieName = contentSerieName
-        if 'temporada' not in url:
-            itemlist.append(new_item)
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    # Paginacion
-
-    if itemlist != []:
-        next_page = scrapertools.find_single_match(data,
-                                                   '<div class=pag_b><a href=(.*?)>Siguiente</a>')
-        if next_page != '':
-            itemlist.append(Item(channel=item.channel,
-                                 action="list_all",
-                                 title='Siguiente >>>',
-                                 url=next_page,
-                                 ))
-    return itemlist
-
-
-def seccion(item):
-    logger.info()
-    itemlist = []
-    data = get_source(item.url)
-    if item.seccion == 'generos-pelicula':
-        patron = '<li class=cat-item cat-item-.*?><a href=(.*?)>(.*?<\/a> <span>.*?)<\/span><\/li>'
-    elif item.seccion == 'generos-serie':
-        patron = '<li class=cat-item cat-item-.*?><a href=(.*?\/series-genero\/.*?)>(.*?<\/a> <span>.*?)<\/span><\/li>'
-    elif item.seccion in ['fecha-estreno', 'series-lanzamiento']:
-        patron = '<li><a href=%sfecha-estreno(.*?)>(.*?)<\/a>' % host
-    elif item.seccion == 'calidad':
-        patron = '<li><a href=%scalidad(.*?)>(.*?)<\/a>' % host
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle in matches:
-        thumbnail = ''
-        if 'generos' in item.seccion:
-            cantidad = scrapertools.find_single_match(scrapedtitle, '<span>(\d+)')
-            title = scrapertools.find_single_match(scrapedtitle, '(.*?)<')
-            url = scrapedurl
-            title = scrapertools.decodeHtmlentities(title)
-            title = title + ' (%s)' % cantidad
-        elif item.seccion in ['series-lanzamiento', 'fecha-estreno', 'calidad']:
-            title = scrapedtitle
-            url = '%s%s%s' % (host, item.seccion, scrapedurl)
-
-        itemlist.append(item.clone(action='list_all',
-                                   title=title,
-                                   url=url,
-                                   thumbnail=thumbnail
-                                   ))
-    return itemlist
-
-
-def seasons(item):
-    logger.info()
-
-    itemlist = []
-
-    data = get_source(item.url)
-    patron = '<span class=title>.*?- Temporada (.*?)<\/span>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for temporada in matches:
-        title = 'Temporada %s' % temporada
-        contentSeasonNumber = temporada
-        item.infoLabels['season'] = contentSeasonNumber
-        itemlist.append(item.clone(action='episodiosxtemp',
-                                   title=title,
-                                   contentSeasonNumber=contentSeasonNumber
-                                   ))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-    if config.get_videolibrary_support() and len(itemlist) > 0:
-        itemlist.append(Item(channel=item.channel,
-                             title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]',
-                             url=item.url,
-                             action="add_serie_to_library",
-                             extra="episodios",
-                             contentSerieName=item.contentSerieName,
-                             contentSeasonNumber=contentSeasonNumber
-                             ))
-
-    return itemlist
-
-
-def episodios(item):
-    logger.info()
-
-    itemlist = []
-    data = get_source(item.url)
-
-    patron = '<li><div class=numerando>(\d+).*?x.*?(\d+)<\/div>.*?<a href=(.*?)> (.*?)<\/a>.*?<\/i>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedtemp, scrapedep, scrapedurl, scrapedtitle in matches:
-        temporada = scrapedtemp
-        title = temporada + 'x%s %s' % (scrapedep, scrapedtitle)
-        url = scrapedurl
-        contentEpisodeNumber = scrapedep
-        item.infoLabels['episode'] = contentEpisodeNumber
-        itemlist.append(item.clone(action='findvideos',
-                                   title=title,
-                                   url=url,
-                                   contentEpisodeNumber=contentEpisodeNumber,
-                                   ))
-    return itemlist
-
-
-def episodiosxtemp(item):
-    logger.info()
-
-    itemlist = []
-    data = get_source(item.url)
-    temporada = item.contentSeasonNumber
-    patron = '<li><div class=numerando>%s.*?x.*?(\d+)<\/div>.*?<a href=(.*?)> (.*?)<\/a>.*?<\/i>' % temporada
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedep, scrapedurl, scrapedtitle in matches:
-        title = temporada + 'x%s %s' % (scrapedep, scrapedtitle)
-        url = scrapedurl
-        contentEpisodeNumber = scrapedep
-        item.infoLabels['episode'] = contentEpisodeNumber
-        itemlist.append(item.clone(action='findvideos',
-                                   title=title,
-                                   url=url,
-                                   contentEpisodeNumber=contentEpisodeNumber,
-                                   ))
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    url_list = []
-    itemlist = []
-    duplicados = []
-    data = get_source(item.url)
-    src = data
-    patron = '<(?:iframe|IFRAME).*?(?:src|SRC)=(.*?) (?:scrolling|frameborder|FRAMEBORDER)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for url in matches:
-            lang = 'LAT'
-            quality = item.quality
-            title = '[%s] [%s]'
-            if url != '':
-                itemlist.append(item.clone(title=title, url=url, action='play', language=lang))
-
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % (i.server, i.language))
-
-    if item.infoLabels['mediatype'] == 'movie':
-        if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
-            itemlist.append(Item(channel=item.channel,
-                                 title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
-                                 url=item.url,
-                                 action="add_pelicula_to_library",
-                                 extra="findvideos",
-                                 contentTitle=item.contentTitle
-                                 ))
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = item.url + texto
-    try:
-        if texto != '':
-            return list_all(item)
-        else:
-            return []
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def newest(categoria):
-    logger.info()
-    itemlist = []
-    item = Item()
-    try:
-        if categoria in ['peliculas', 'latino']:
-            item.url = host + 'page/1/?s'
-
-        elif categoria == 'infantiles':
-            item.url = host + 'category/animacion/'
-
-        elif categoria == 'terror':
-            item.url = host + 'category/terror/'
-
-        itemlist = list_all(item)
-        if itemlist[-1].title == 'Siguiente >>>':
-            itemlist.pop()
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
-    return itemlist
-
-
-def get_source(url):
-    logger.info()
-    data = httptools.downloadpage(url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    return data
diff --git a/plugin.video.alfa/channels/goovie.py b/plugin.video.alfa/channels/goovie.py
index 84c89358..55cb88ef 100644
--- a/plugin.video.alfa/channels/goovie.py
+++ b/plugin.video.alfa/channels/goovie.py
@@ -44,6 +44,8 @@ def mainlist(item):
                          thumbnail= get_thumb('movies', auto=True)))
     itemlist.append(Item(channel=item.channel, title='Series', action='sub_menu', type='series',
                          thumbnail= get_thumb('tvshows', auto=True)))
+    itemlist.append(Item(channel=item.channel, title='Colecciones', action='list_collections',
+                        url= host+'listas=populares', thumbnail=get_thumb('colections', auto=True)))
     itemlist.append(
         item.clone(title="Buscar", action="search", url=host + 'search?go=', thumbnail=get_thumb("search", auto=True),
                    extra='movie'))
@@ -66,10 +68,13 @@ def sub_menu(item):
 
     return itemlist
 
-def get_source(url):
+def get_source(url, referer=None):
     logger.info()
-    data = httptools.downloadpage(url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
     return data
 
 
@@ -93,7 +98,7 @@ def section(item):
         data = scrapertools.find_single_match(data, 'Generos.*?</ul>')
     elif 'Año' in item.title:
         data = scrapertools.find_single_match(data, 'Años.*?</ul>')
-    patron = "<li onclick=filter\(this, '([^']+)', \d+\);>"
+    patron = '<li onclick="filter\(this, \'([^\']+)\', \d+\);">'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedtitle in matches:
@@ -112,8 +117,8 @@ def list_all(item):
     itemlist = []
 
     data = get_source(item.url)
-    patron = '<article class=Item><a href=([^>]+)><div class=Poster>'
-    patron += '<img src=(.+?)(?:>|alt).*?<h2>([^>]+)</h2>.*?</article>'
+    patron = '<article class="Item"><a href="([^>]+)"><div class="Poster"><img src="([^"]+)".*?'
+    patron += '<h2>([^>]+)</h2>.*?</article>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
@@ -128,10 +133,9 @@ def list_all(item):
                         title=title,
                         url=url,
                         thumbnail=thumbnail,
-                        plot=thumbnail,
                         infoLabels={'filtro':filter_list})
 
-        if item.type == 'peliculas':
+        if item.type == 'peliculas' or 'peliculas' in url:
             new_item.action = 'findvideos'
             new_item.contentTitle = scrapedtitle
         else:
@@ -143,19 +147,38 @@ def list_all(item):
     tmdb.set_infoLabels(itemlist, seekTmdb=True)
     #  Paginación
 
-    url_next_page = scrapertools.find_single_match(data,"<link rel=next href=(.*?) />")
+    url_next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)"')
     if url_next_page:
         itemlist.append(item.clone(title="Siguiente >>", url=url_next_page, action='list_all'))
 
     return itemlist
 
+def list_collections(item):
+    logger.info()
+
+    itemlist = []
+
+    data = get_source(item.url)
+    patron = '<li><a href="([^"]+)">.*?"first-lIMG"><img src="([^"]+)">.*?<h2>([^<]+)</h2>.*?Fichas:?\s(\d+)'
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for url, thumb, title, cant in matches:
+        plot = 'Contiene %s elementos' % cant
+        itemlist.append(Item(channel=item.channel, action='list_all', title=title, url=url, thumbnail=thumb, plot=plot))
+
+    url_next_page = scrapertools.find_single_match(data, 'class="PageActiva">\d+</a><a href="([^"]+)"')
+    if url_next_page:
+        itemlist.append(item.clone(title="Siguiente >>", url=url_next_page, action='list_collections'))
+    return itemlist
+
 def seasons(item):
     logger.info()
 
     itemlist=[]
 
     data=get_source(item.url)
-    patron='<div class=season temporada-(\d+)>'
+    patron='<div class="season temporada-(\d+)">'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     infoLabels = item.infoLabels
@@ -189,7 +212,7 @@ def episodesxseasons(item):
     itemlist = []
 
     data=get_source(item.url)
-    patron= "<li><a href=([^>]+)><b>%s - (\d+)</b><h2 class=eTitle>([^>]+)</h2>" % item.infoLabels['season']
+    patron= '<li><a href="([^"]+)"><b>%s - (\d+)</b><h2 class="eTitle">([^>]+)</h2>' % item.infoLabels['season']
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     infoLabels = item.infoLabels
@@ -207,31 +230,52 @@ def episodesxseasons(item):
     return itemlist
 
 def findvideos(item):
-    from lib.generictools import privatedecrypt
+
     logger.info()
 
     itemlist = []
 
     data = get_source(item.url)
-
-    patron = "onclick=clickLink\(this, '([^']+)', '([^']+)', '([^']+)'\);>"
+    data = data.replace('"', "'")
+    patron = "onclick='clickLink\(this, '([^']+)', '([^']+)', '([^']+)'\);'>.*?<b>([a-zA-Z]+)"
     matches = re.compile(patron, re.DOTALL).findall(data)
     headers = {'referer': item.url}
-    for url, quality, language in matches:
+    for url, quality, language, server in matches:
 
-        url = privatedecrypt(url, headers)
         if url != '':
             language = IDIOMAS[language]
             if quality.lower() == 'premium':
                 quality = '720p'
             quality = CALIDADES[quality]
             title = ' [%s] [%s]' % (language, quality)
+            if 'visor/vdz' in url:
+                server = 'powvideo'
             itemlist.append(Item(channel=item.channel, title='%s' + title, url=url, action='play', language=language,
-                                 quality=quality, infoLabels=item.infoLabels))
+                                 quality=quality, server=server, headers=headers, infoLabels=item.infoLabels))
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     return sorted(itemlist, key=lambda i: i.language)
 
 
+def play(item):
+    from lib.generictools import privatedecrypt
+    logger.info()
+    itemlist = []
+    url = ''
+    item.server = ''
+    data = httptools.downloadpage(item.url, headers=item.headers, follow_redirects=False)
+    if 'visor/vdz' in item.url:
+        url = scrapertools.find_single_match(data.data, 'IFRAME SRC="([^"]+)"')
+    elif 'visor/if' in item.url:
+        url = data.headers['location']
+
+    itemlist.append(Item(channel=item.channel, url=url, action='play', server=item.server,
+                         infoLabels=item.infoLabels))
+
+    itemlist = servertools.get_servers_itemlist(itemlist)
+    return itemlist
+
+
+
 
 def search(item, texto):
     logger.info()
diff --git a/plugin.video.alfa/channels/grantorrent.json b/plugin.video.alfa/channels/grantorrent.json
index 923acf94..88e3b68c 100644
--- a/plugin.video.alfa/channels/grantorrent.json
+++ b/plugin.video.alfa/channels/grantorrent.json
@@ -113,6 +113,14 @@
         "14",
         "15"
       ]
+    },
+    {
+      "id": "include_in_newest_4k",
+      "type": "bool",
+      "label": "Incluir en Novedades - 4K",
+      "default": true,
+      "enabled": true,
+      "visible": true
     }
   ]
 }
diff --git a/plugin.video.alfa/channels/grantorrent.py b/plugin.video.alfa/channels/grantorrent.py
index e2bb54ba..ff07dc1a 100644
--- a/plugin.video.alfa/channels/grantorrent.py
+++ b/plugin.video.alfa/channels/grantorrent.py
@@ -1086,3 +1086,29 @@ def search(item, texto):
         for line in sys.exc_info():
             logger.error("ERROR: %s: SEARCH" % line)
         return []
+
+        
+def newest(categoria):
+    logger.info()
+    itemlist = []
+    item = Item()
+    
+    try:
+        if categoria == '4k':
+            item.url = host + "categoria/4k/"
+            item.extra = "peliculas"
+            item.channel = channel
+            item.category_new= 'newest'
+
+            itemlist = listado(item)
+            if ">> Página siguiente" in itemlist[-1].title:
+                itemlist.pop()
+
+    # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("{0}".format(line))
+        return []
+
+    return itemlist
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/hclips.py b/plugin.video.alfa/channels/hclips.py
index b071e9c2..94ce8649 100644
--- a/plugin.video.alfa/channels/hclips.py
+++ b/plugin.video.alfa/channels/hclips.py
@@ -7,11 +7,10 @@ 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
 
 host = 'http://www.hclips.com'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
@@ -41,12 +40,16 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)" class="thumb">.*?src="([^"]+)".*?<strong class="title">([^"]+)</strong>.*?<b>(.*?)</b>'
+    patron  = '<a href="([^"]+)" class="thumb">.*?'
+    patron += 'src="([^"]+)".*?'
+    patron += '<strong class="title">([^"]+)</strong>.*?'
+    patron += '<b>(.*?)</b>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,vidnum in matches:
         scrapedplot = ""
         title = scrapedtitle + " \(" + vidnum + "\)"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
@@ -54,19 +57,21 @@ def peliculas(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
-    patron  = '<a href="([^"]+)" class="thumb">.*?<img src="([^"]+)" alt="([^"]+)".*?<span class="dur">(.*?)</span>'
+    patron  = '<a href="([^"]+)" class="thumb">.*?'
+    patron += '<img src="([^"]+)" alt="([^"]+)".*?'
+    patron += '<span class="dur">(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,time  in matches:
         title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
+                              thumbnail=thumbnail, plot=plot, contentTitle = contentTitle))
     next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)" title="Next Page">Next</a>')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/hdfilmologia.py b/plugin.video.alfa/channels/hdfilmologia.py
index 7beaef27..b553bb55 100644
--- a/plugin.video.alfa/channels/hdfilmologia.py
+++ b/plugin.video.alfa/channels/hdfilmologia.py
@@ -179,7 +179,7 @@ def genres(item):
     logger.info()
     itemlist = []
 
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
 
     patron = '<li class="myli"><a href="/([^"]+)">([^<]+)</a>'
diff --git a/plugin.video.alfa/channels/hdfull.py b/plugin.video.alfa/channels/hdfull.py
index 8140ecf7..7b369752 100644
--- a/plugin.video.alfa/channels/hdfull.py
+++ b/plugin.video.alfa/channels/hdfull.py
@@ -533,17 +533,17 @@ def findvideos(item):
     key = scrapertools.find_single_match(data_js, 'JSON.parse\(atob.*?substrings\((.*?)\)')
 
     data_js = httptools.downloadpage("%s/js/providers.js" % host).data
-    try:
-        from lib import alfaresolver
-        provs = alfaresolver.hdfull_providers(data_js)
-        if provs == '': return []
-    except:
-        return []
+    decoded = jhexdecode(data_js)
+    providers_pattern = 'p\[(\d+)\]= {"t":"([^"]+)","d":".*?","e":.function.*?,"l":.function.*?return "([^"]+)".*?};'
+    providers = scrapertools.find_multiple_matches (decoded, providers_pattern)
+    provs = {}
+    for provider, e, l in providers:
+        provs[provider]=[e,l]
 
     data = agrupa_datos(httptools.downloadpage(item.url).data)
     data_obf = scrapertools.find_single_match(data, "var ad\s*=\s*'([^']+)'")
-    data_decrypt = jsontools.load(obfs(base64.b64decode(data_obf), 126 - int(key)))
 
+    data_decrypt = jsontools.load(obfs(base64.b64decode(data_obf), 126 - int(key)))
     infolabels = {}
     year = scrapertools.find_single_match(data, '<span>A&ntilde;o:\s*</span>.*?(\d{4})')
     infolabels["year"] = year
@@ -552,7 +552,7 @@ def findvideos(item):
         if match['provider'] in provs:
             try:
                 embed = provs[match['provider']][0]
-                url = eval(provs[match['provider']][1].replace('_code_', "match['code']"))
+                url = provs[match['provider']][1]+match['code']
                 matches.append([match['lang'], match['quality'], url, embed])
             except:
                 pass
@@ -691,7 +691,6 @@ def get_status(status, type, id):
 ## --------------------------------------------------------------------------------
 ## --------------------------------------------------------------------------------
 
-
 def jhexdecode(t):
     r = re.sub(r'_\d+x\w+x(\d+)', 'var_' + r'\1', t)
     r = re.sub(r'_\d+x\w+', 'var_0', r)
diff --git a/plugin.video.alfa/channels/hdzog.py b/plugin.video.alfa/channels/hdzog.py
index 9e3e7532..1aeeeca4 100644
--- a/plugin.video.alfa/channels/hdzog.py
+++ b/plugin.video.alfa/channels/hdzog.py
@@ -7,17 +7,15 @@ 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
 
 host = 'http://www.hdzog.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/new/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/popular/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/longest/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/new/"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/popular/"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , 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
@@ -27,7 +25,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -41,33 +39,40 @@ def categorias(item):
     data = httptools.downloadpage(item.url).data
     data = scrapertools.get_match(data,'<ul class="cf">(.*?)</ul>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li>.*?<a href="([^"]+)".*?<img class="thumb" src="([^"]+)" alt="([^"]+)".*?<span class="videos-count">(\d+)</span>'
+    patron = '<li>.*?<a href="([^"]+)".*?'
+    patron += '<img class="thumb" src="([^"]+)" alt="([^"]+)".*?'
+    patron += '<span class="videos-count">(\d+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,vidnum in matches:
         scrapedplot = ""
+        
+        url= scrapedurl + "?sortby=post_date"
         title = scrapedtitle + " \(" + vidnum + "\)"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = scrapertools.get_match(data,'<ul class="cf">(.*?)<h2>Advertisement</h2>')
-    patron  = '<li>.*?<a href="([^"]+)".*?src="([^"]+)" alt="([^"]+)" />.*?<span class="time">(.*?)</span>'
+    patron  = '<li>.*?<a href="([^"]+)".*?'
+    patron += 'src="([^"]+)" alt="([^"]+)".*?'
+    patron += '<span class="time">(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,time  in matches:
         contentTitle = scrapedtitle
         title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)" title="Next Page" data-page-num="\d+">Next page &raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
+                               thumbnail=thumbnail, plot=plot, contentTitle = contentTitle))
+    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" title="Next Page" data-page-num="\d+">Next page &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) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/hellporno.py b/plugin.video.alfa/channels/hellporno.py
index abc63bf4..a36789b4 100644
--- a/plugin.video.alfa/channels/hellporno.py
+++ b/plugin.video.alfa/channels/hellporno.py
@@ -7,15 +7,13 @@ 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
 
 host = 'http://hellporno.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/?page=1"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/?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
@@ -26,7 +24,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -39,25 +37,30 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)">.*?<img src="([^"]+)" alt="([^"]+) - Porn videos">.*?<span>(\d+) videos</span>'
+    patron  = '<a href="([^"]+)">.*?'
+    patron += '<img src="([^"]+)" alt="([^"]+) - Porn videos">.*?'
+    patron += '<span>(\d+) videos</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next">Next page &raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="categorias" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail , plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next">Next page &raquo;</a>')
+    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) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="video-thumb"><a href="([^"]+)" class="title".*?>([^"]+)</a>.*?<span class="time">([^<]+)</span>.*?<video poster="([^"]+)"'
+    patron = '<div class="video-thumb"><a href="([^"]+)" class="title".*?>([^"]+)</a>.*?'
+    patron += '<span class="time">([^<]+)</span>.*?'
+    patron += '<video poster="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,duracion,scrapedthumbnail  in matches:
         url = scrapedurl
@@ -65,12 +68,12 @@ def peliculas(item):
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        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 href="([^"]+)" class="next">Next page &raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                               plot=plot, contentTitle = contentTitle))
+    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next">Next page &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) )
     return itemlist
 
 
@@ -78,10 +81,6 @@ def play(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
-    
-    #<source src="https://hellporno.com/get_file/6/b44b40165f7e95e4aeff4d9c33100447/202000/202198/202198_360p.mp4/?br=390" title="360p" type="video/mp4" />
-    #<source data-fluid-hd src="https://hellporno.com/get_file/6/4ec6bbf8288123603094c76d9cd8ede4/202000/202198/202198.mp4/?br=1440" title="720p" type="video/mp4" />
-
     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+"')
diff --git a/plugin.video.alfa/channels/hotmovs.py b/plugin.video.alfa/channels/hotmovs.py
index 691de51a..ed8b3d35 100644
--- a/plugin.video.alfa/channels/hotmovs.py
+++ b/plugin.video.alfa/channels/hotmovs.py
@@ -7,17 +7,15 @@ 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
 
 host = 'https://hotmovs.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/most-popular/?sort_by=video_viewed_week"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top-rated/?sort_by=rating_week"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/most-popular/?sort_by=video_viewed_week"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-rated/?sort_by=rating_week"))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels/?sort_by=cs_viewed"))
     itemlist.append( Item(channel=item.channel, title="Pornstars" , action="categorias", url=host + "/models/"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/?sort_by=title"))
@@ -30,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -43,18 +41,22 @@ def catalogo(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a class="thumbnail" href="([^"]+)">.*?<img src="([^"]+)".*?<span class="thumbnail__info__right">\s+([^"]+)\s+</span>.*?<h5>([^"]+)</h5>'
+    patron  = '<a class="thumbnail" href="([^"]+)">.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<span class="thumbnail__info__right">\s+([^"]+)\s+</span>.*?'
+    patron += '<h5>([^"]+)</h5>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
         scrapedplot = ""
         cantidad = cantidad.replace("         ", "")
         scrapedtitle = scrapedtitle + " (" + cantidad +")"
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, 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.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
@@ -63,22 +65,25 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a class="thumbnail" href="([^"]+)" title="([^"]+)">.*?<img src="([^"]+)".*?<i class="mdi mdi-video"></i>([^"]+)</div>'
+    patron  = '<a class="thumbnail" href="([^"]+)" title="([^"]+)">.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<i class="mdi mdi-video"></i>([^"]+)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         cantidad = cantidad.replace("        ", "")
         scrapedtitle = scrapedtitle + " (" + cantidad +")"
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="categorias" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, 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.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
@@ -90,12 +95,12 @@ def peliculas(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, contentTitle = title, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        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 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
 
 
diff --git a/plugin.video.alfa/channels/inkapelis.py b/plugin.video.alfa/channels/inkapelis.py
index 668c9a7e..1172655f 100644
--- a/plugin.video.alfa/channels/inkapelis.py
+++ b/plugin.video.alfa/channels/inkapelis.py
@@ -28,6 +28,8 @@ list_language = IDIOMAS.values()
 list_quality = ['Cam', 'TSHQ', 'Dvdrip', 'Blurayrip', 'HD Rip 320p', 'hd rip 320p', 'HD Real 720p', 'Full HD 1080p']
 list_servers = ['openload', 'gamovideo', 'streamplay', 'streamango', 'vidoza']
 
+host = 'https://www.inkapelis.to/'
+
 
 def mainlist(item):
     logger.info()
@@ -35,28 +37,28 @@ def mainlist(item):
     autoplay.init(item.channel, list_servers, list_quality)
     itemlist = []
 
-    itemlist.append(Item(channel=item.channel, title="Novedades", action="entradas", url="http://www.inkapelis.com/",
+    itemlist.append(Item(channel=item.channel, title="Novedades", action="entradas", url=host,
                                extra="Novedades", text_color=color1, thumbnail=get_thumb('newest', auto=True)))
     #itemlist.append(Item(channel=item.channel, title="Estrenos", action="entradas", url="http://www.inkapelis.com/genero/estrenos/",
     #                           text_color=color1, thumbnail=get_thumb('premieres', auto=True)))
     itemlist.append(Item(channel=item.channel, title="Castellano", action="entradas",
-                               url="https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Castellano&s=",
+                               url=host+"?anio=&genero=&calidad=&idioma=Castellano&s=",
                                extra="Buscar", text_color=color1, thumbnail=get_thumb('espanolas', auto=True)))
 
     itemlist.append(Item(channel=item.channel, title="Latino", action="entradas",
-                               url="https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Latino&s=",
+                               url=host+"?anio=&genero=&calidad=&idioma=Latino&s=",
                                extra="Buscar", text_color=color1, thumbnail=get_thumb('latino', auto=True)))
 
     itemlist.append(Item(channel=item.channel, title="VOSE", action="entradas",
-                               url="https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Subtitulada&s=",
+                               url=host+"?anio=&genero=&calidad=&idioma=Subtitulada&s=",
                                extra="Buscar", text_color=color1, thumbnail=get_thumb('newest', auto=True)))
 
-    itemlist.append(Item(channel=item.channel, title="Géneros", action="generos", url="http://www.inkapelis.com/", text_color=color1,
+    itemlist.append(Item(channel=item.channel, title="Géneros", action="generos", url=host, text_color=color1,
                                thumbnail=get_thumb('genres', auto=True),))
-    itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url="http://www.inkapelis.com/?s=", text_color=color1))
+    itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url=host+"?s=", text_color=color1))
     itemlist.append(Item(channel=item.channel, action="", title=""))
     itemlist.append(
-        Item(channel=item.channel, action="filtro", title="Filtrar películas", url="http://www.inkapelis.com/?s=", text_color=color1))
+        Item(channel=item.channel, action="filtro", title="Filtrar películas", url=host+"?s=", text_color=color1))
     # Filtros personalizados para peliculas
     for i in range(1, 4):
         filtros = config.get_setting("pers_peliculas" + str(i), item.channel)
@@ -65,7 +67,7 @@ def mainlist(item):
             new_item = item.clone()
             new_item.values = filtros
             itemlist.append(
-                new_item.clone(action="filtro", title=title, url="http://www.inkapelis.com/?s=", text_color=color2))
+                new_item.clone(action="filtro", title=title, url=host+"?s=", text_color=color2))
     itemlist.append(Item(channel=item.channel, action="configuracion", title="Configurar canal...", text_color="gold", folder=False))
 
     autoplay.show_option(item.channel, itemlist)
@@ -86,21 +88,21 @@ def newest(categoria):
     item = Item()
     try:
         if categoria == "peliculas":
-            item.url = "http://www.inkapelis.com/"
+            item.url = host
             item.action = "entradas"
             item.extra = "Novedades"
 
         if categoria == "terror":
-            item.url = "https://www.inkapelis.com/genero/terror/"
+            item.url = host+"genero/terror/"
             item.action = "entradas"
 
         if categoria == "castellano":
-            item.url = "https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Castellano&s="
+            item.url = host+"?anio=&genero=&calidad=&idioma=Castellano&s="
             item.extra = "Buscar"
             item.action = "entradas"
 
         if categoria == "latino":
-            item.url = "https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Latino&s="
+            item.url = host+"?anio=&genero=&calidad=&idioma=Latino&s="
             item.extra = "Buscar"
             item.action = "entradas"
         itemlist = entradas(item)
@@ -122,7 +124,7 @@ def search(item, texto):
     logger.info()
     itemlist = []
     item.extra = "Buscar"
-    item.url = "http://www.inkapelis.com/?s=%s" % texto
+    item.url = host+"?s=%s" % texto
 
     try:
         return entradas(item)
@@ -254,7 +256,7 @@ def filtrado(item, values):
 
     item.valores = "Filtro: " + ", ".join(sorted(strings))
     item.strings = ""
-    item.url = "http://www.inkapelis.com/?anio=%s&genero=%s&calidad=%s&idioma=%s&s=%s" % \
+    item.url = host+"?anio=%s&genero=%s&calidad=%s&idioma=%s&s=%s" % \
                (year, genero, calidad, idioma, texto)
     item.extra = "Buscar"
 
@@ -292,7 +294,8 @@ def entradas(item):
     else:
         # Extrae las entradas
         if item.extra == "Novedades":
-            data2 = data.split("<h3>Últimas Películas Agregadas</h3>", 1)[1]
+            data2 = data.split("<h2>Últimas Películas Agregadas y Actualizadas</h2>", 1)[1]
+
             entradas = scrapertools.find_multiple_matches(data2, '<div class="col-mt-5 postsh">(.*?)</div></div></div>')
         else:
             entradas = scrapertools.find_multiple_matches(data, '<div class="col-mt-5 postsh">(.*?)</div></div></div>')
diff --git a/plugin.video.alfa/channels/inkaseries.py b/plugin.video.alfa/channels/inkaseries.py
index 1fbab100..3c9613ab 100644
--- a/plugin.video.alfa/channels/inkaseries.py
+++ b/plugin.video.alfa/channels/inkaseries.py
@@ -38,9 +38,6 @@ def mainlist(item):
                          thumbnail=get_thumb('all', auto=True)))
     itemlist.append(Item(channel= item.channel, title="Generos", action="genres", url=host + 'ultimas-series-agregadas/',
                          thumbnail=get_thumb('genres', auto=True)))
-    itemlist.append(Item(channel= item.channel, title="Recomendadas", action="list_all",
-                         url=host + 'ultimas-series-agregadas/', type='recomended',
-                         thumbnail=get_thumb('recomended', auto=True)))
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=',
                          thumbnail=get_thumb('search', auto=True)))
 
@@ -54,18 +51,9 @@ def list_all(item):
 
     itemlist = []
     data = get_source(item.url)
-    if item.type != 'search':
-        if item.type == 'recomended':
-            class_type = 'list_mt'
-        else:
-            class_type = 'info'
-
-        patron = '<a class=poster href=(.*?) title=(.*?)> <img src=(.*?) alt.*?class=%s' % class_type
-    else:
-        patron = 'item> <a class=poster href=(.*?) title=(.*?)> <img src=(.*?) alt.*?class=info'
-
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
+    data1 = scrapertools.find_single_match(data, '<div class=col-md-80 lado2(.*?)</div></div></div>')
+    patron = '<a class=poster href=(.*?) title=(.*?)> <img.*?src=(.*?) alt'
+    matches = re.compile(patron, re.DOTALL).findall(data1)
 
     for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
         url = scrapedurl
@@ -82,7 +70,7 @@ def list_all(item):
 
     if itemlist != []:
         actual_page_url = item.url
-        next_page = scrapertools.find_single_match(data, '<li><a href=([^ ]+) ><span aria-hidden=true>&raquo;</span>')
+        next_page = scrapertools.find_single_match(data, '<li><a href=([^ ]+)><span aria-hidden=true>&raquo;</span>')
         if next_page != '':
             itemlist.append(Item(channel=item.channel, action="list_all", title='Siguiente >>>', url=next_page,
                                  thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png'))
@@ -160,13 +148,13 @@ def genres(item):
     itemlist = []
     norep = []
     data = get_source(item.url)
-    patron = '<a href=([^>]+)><span.*?<i>(.*?)</i>'
+    patron = '<a href=([^>]+)><span.*?<i>(.*?)</i>.*?>(.*?)</b>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for scrapedurl, scrapedtitle in matches:
+    for scrapedurl, scrapedtitle, cantidad in matches:
 
         url = scrapedurl
-        title = scrapedtitle.capitalize()
+        title = "%s - %s" % (scrapedtitle.capitalize(), cantidad)
         itemactual = Item(channel=item.channel, action='list_all', title=title, url=url)
 
         if title not in norep:
diff --git a/plugin.video.alfa/channels/javlin.py b/plugin.video.alfa/channels/javlin.py
index 562c102e..95b1bf18 100644
--- a/plugin.video.alfa/channels/javlin.py
+++ b/plugin.video.alfa/channels/javlin.py
@@ -2,14 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
-
 
 host = 'http://javl.in'
 
@@ -17,7 +14,7 @@ host = 'http://javl.in'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="lista" , action="lista", 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
@@ -28,7 +25,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host+ "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -48,11 +45,12 @@ def categorias(item):
         scrapedtitle = str(scrapedtitle) + " ("+ str(number) + ")"
         scrapedurl = "http://javl.in/?cat=" + scrapedurl
         thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -60,23 +58,12 @@ def peliculas(item):
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<span class=\'currenttext\'>.*?href=\'([^\']+)\' class=\'inactive\'>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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 play(item):
-    logger.info()
-    data = scrapertools.cachePage(item.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
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
+                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<span class=\'currenttext\'>.*?href=\'([^\']+)\' class=\'inactive\'')
+    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/plugin.video.alfa/channels/javwhores.py b/plugin.video.alfa/channels/javwhores.py
index 594fbe35..902e1916 100644
--- a/plugin.video.alfa/channels/javwhores.py
+++ b/plugin.video.alfa/channels/javwhores.py
@@ -7,8 +7,6 @@ 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
 
 
 host = 'https://www.javwhores.com/'
@@ -17,10 +15,9 @@ host = 'https://www.javwhores.com/'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="peliculas", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="peliculas", url=host + "/most-popular/"))
-
+    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/top-rated/"))
+    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-popular/"))
     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
@@ -31,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/%s/" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -51,30 +48,35 @@ def categorias(item):
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad  in matches:
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     patron = '<div class="video-item   ">.*?'
     patron += '<a href="([^"]+)" title="([^"]+)"  class="thumb">.*?'
     patron += 'data-original="([^"]+)".*?'
-    patron += '<i class="fa fa-clock-o"></i>(.*?)</div>'
+    patron += '<span class="ico-fav-1(.*?)<p class="inf">'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
+    for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
+        time = scrapertools.find_single_match(duracion, '<i class="fa fa-clock-o"></i>([^"]+)</div>')
+        if not 'HD' in duracion :
+            title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
+        else:
+            title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR]  " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = title, infoLabels={'year':year} ))
+        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 next_page:
         next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>" , text_color="blue", url=next_page ) )
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>" , text_color="blue", url=next_page ) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/jizzbunker.py b/plugin.video.alfa/channels/jizzbunker.py
index 53e8c142..a7c6e0e2 100644
--- a/plugin.video.alfa/channels/jizzbunker.py
+++ b/plugin.video.alfa/channels/jizzbunker.py
@@ -7,8 +7,6 @@ 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
 
 host = 'http://jizzbunker.com/es'
 
@@ -42,14 +40,17 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li><figure>.*?<a href="([^"]+)".*?<img class="lazy" data-original="([^"]+)" alt="([^"]+)".*?<span class="score">(\d+)</span>'
+    patron  = '<li><figure>.*?<a href="([^"]+)".*?'
+    patron += '<img class="lazy" data-original="([^"]+)" alt="([^"]+)".*?'
+    patron += '<span class="score">(\d+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedurl = scrapedurl.replace("channel", "channel30")
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
     return itemlist
 
 
@@ -58,7 +59,9 @@ def peliculas(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li><figure>.*?<a href="([^"]+)/([^"]+).html".*?<img class="lazy" data-original="([^"]+)".*?<time datetime=".*?">([^"]+)</time>'
+    patron  = '<li><figure>.*?<a href="([^"]+)/([^"]+).html".*?'
+    patron += '<img class="lazy" data-original="([^"]+)".*?'
+    patron += '<time datetime=".*?">([^"]+)</time>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
         url = scrapedurl + "/" + scrapedtitle + ".html"
@@ -66,12 +69,12 @@ def peliculas(item):
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
+                              plot=plot, contentTitle = contentTitle))
     next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)" rel="next">&rarr;</a>')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/justporn.py b/plugin.video.alfa/channels/justporn.py
index 4a1dbccd..42f77dc1 100644
--- a/plugin.video.alfa/channels/justporn.py
+++ b/plugin.video.alfa/channels/justporn.py
@@ -2,14 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
-from core import jsontools
 
 host = 'http://xxx.justporno.tv'
 
@@ -17,9 +14,9 @@ host = 'http://xxx.justporno.tv'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host + "/latest-updates/1/"))
-    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-popular/"))
+    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host + "/latest-updates/1/"))
+    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-popular/"))
     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
@@ -27,10 +24,11 @@ def mainlist(item):
 
 def search(item, texto):
     logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s" % texto
+    item.url = "%s/search/%s/" % (host, texto.replace("+", "-"))
+    item.extra = texto
     try:
-        return peliculas(item)
+        return lista(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():
@@ -42,33 +40,62 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?<div class="videos">(\d+) video.*?</div>'
+    patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?'
+    patron += '<div class="videos">(\d+) video.*?</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,numero in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedtitle = scrapedtitle + " (" + numero + ")"
         thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
 
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<a href="http://xxx.justporno.tv/videos/(\d+)/.*?" title="([^"]+)" >.*?data-original="([^"]+)".*?<div class="duration">(.*?)</div>'
+    patron = '<a href="http://xxx.justporno.tv/videos/(\d+)/.*?" title="([^"]+)" >.*?'
+    patron += 'data-original="([^"]+)".*?'
+    patron += '<div class="duration">(.*?)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
         scrapedplot = ""
         scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + scrapedtitle
         scrapedurl = "http://xxx.justporno.tv/embed/" + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
+                              
+    if item.extra:
+        next_page = scrapertools.find_single_match(data, '<li class="next">.*?from_videos\+from_albums:(.*?)>')
+        if next_page:
+            if "from_videos=" in item.url:
+                next_page = re.sub(r'&from_videos=(\d+)', '&from_videos=%s' % next_page, item.url)
+            else:
+                next_page = "%s?mode=async&function=get_block&block_id=list_videos_videos_list_search_result"\
+                            "&q=%s&category_ids=&sort_by=post_date&from_videos=%s" % (item.url, item.extra, next_page)
+            itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
+    else:
+        next_page = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
+        if next_page and not next_page.startswith("#"):
+            next_page = urlparse.urljoin(host, next_page)
+            itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
+        else:
+            next_page = scrapertools.find_single_match(data, '<li class="next">.*?from:(\d+)')
+            if next_page:
+                if "from" in item.url:
+                    next_page = re.sub(r'&from=(\d+)', '&from=%s' % next_page, item.url)
+                else:
+                    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
 
 
diff --git a/plugin.video.alfa/channels/mundoflv.json b/plugin.video.alfa/channels/legalmentegratis.json
old mode 100755
new mode 100644
similarity index 60%
rename from plugin.video.alfa/channels/mundoflv.json
rename to plugin.video.alfa/channels/legalmentegratis.json
index a21239bf..91fa2762
--- a/plugin.video.alfa/channels/mundoflv.json
+++ b/plugin.video.alfa/channels/legalmentegratis.json
@@ -1,13 +1,15 @@
 {
-  "id": "mundoflv",
-  "name": "MundoFlv",
-  "active": false,
+  "id": "legalmentegratis",
+  "name": "Legalmente Gratis (clasicos)",
+  "active": true,
   "adult": false,
-  "language": ["lat"],
-  "thumbnail": "https://s32.postimg.cc/h1ewz9hhx/mundoflv.png",
-  "banner": "mundoflv.png",
+  "language": ["cast"],
+  "thumbnail": "https://i.postimg.cc/NFGv0pN3/legalgratis.png",
+  "banner": "",
+  "version": 1,
   "categories": [
-    "tvshow"
+    "movie",
+    "vos"
   ],
   "settings": [
     {
@@ -27,12 +29,9 @@
       "visible": true,
       "lvalues": [
         "No filtrar",
-        "Latino",
-        "Español",
-        "VOS",
-        "VOSE",
-        "VO"
+        "CAST",
+        "VOSE"
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/plugin.video.alfa/channels/legalmentegratis.py b/plugin.video.alfa/channels/legalmentegratis.py
new file mode 100644
index 00000000..dfc1f863
--- /dev/null
+++ b/plugin.video.alfa/channels/legalmentegratis.py
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+# -*- Channel Legalmente Gratis -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the Alfa Develop Group -*-
+
+import re
+import urllib
+from channelselector import get_thumb
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core import tmdb
+from core.item import Item
+from platformcode import config, logger
+from channels import autoplay
+from channels import filtertools
+
+host = 'http://legalmentegratis.com/'
+
+IDIOMAS = {'español':'CAST', 'VOSE': 'VOSE'}
+list_language = IDIOMAS.values()
+list_quality = []
+list_servers = ['youtube']
+
+
+def mainlist(item):
+    logger.info()
+
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist = list()
+
+    itemlist.append(Item(channel=item.channel, title="Todas", action="list_all", url=host,
+                         thumbnail=get_thumb('all', auto=True)))
+
+    itemlist.append(Item(channel=item.channel, title="Generos", action="section", section='genre',
+                         thumbnail=get_thumb('genres', auto=True)))
+
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+
+def get_source(url, referer=None):
+    logger.info()
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+
+def list_all(item):
+    logger.info()
+    itemlist = []
+
+    data = get_source(item.url)
+    patron = '<article id="post-\d+".*?href="([^"]+)".*?src="([^"]+)".*?<p>(.*?) (\(?\d{4}\)?)([^<]+)</p>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle, year, scrapedplot in matches:
+
+        url = scrapedurl
+        contentTitle = scrapedtitle
+
+        year = re.sub(r'\(|\)','', year)
+
+        title = '%s [%s]' % (contentTitle, year)
+        thumbnail = 'http:' + scrapedthumbnail
+        itemlist.append(Item(channel=item.channel, action='findvideos',
+                             title=title,
+                             url=url,
+                             thumbnail=thumbnail,
+                             contentTitle=contentTitle,
+                             infoLabels={'year': year}
+                             ))
+    tmdb.set_infoLabels_itemlist(itemlist, True)
+
+
+    itemlist = sorted(itemlist, key=lambda it: it.contentTitle)
+    #  Paginación
+
+    url_next_page = scrapertools.find_single_match(data, '<a class="next page-numbers" href="([^"]+)">')
+    if url_next_page:
+        itemlist.append(Item(channel=item.channel, title="Siguiente >>", url=url_next_page, action='list_all',
+                             section=item.section))
+    return itemlist
+
+
+def section(item):
+    logger.info()
+    itemlist = []
+
+    data = get_source(host)
+    action = 'list_all'
+
+    if item.section == 'genre':
+        data = scrapertools.find_single_match(data, '>Género(.*?)</ul>')
+
+    patron = 'href="([^"]+)".*?>([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for url, title in matches:
+        new_item = Item(channel=item.channel, title=title, url=url, action=action, section=item.section)
+        itemlist.append(new_item)
+
+    return itemlist
+
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    data = get_source(item.url)
+    lang_data = scrapertools.find_single_match(data, '<p><strong(.*?)</strong></p>')
+    if 'español' in lang_data:
+        language = 'español'
+    else:
+        language = 'VOSE'
+    url = scrapertools.find_single_match (data, '<iframe.*?src="([^"]+)"')
+    if 'gloria.tv' in url:
+        new_data = get_source(url)
+        url = 'https://gloria.tv'+ scrapertools.find_single_match(new_data, '<source type=".*?" src="([^"]+)">')
+
+
+    itemlist.append(Item(channel=item.channel, title='%s', action='play', url=url,
+                         language=IDIOMAS[language], infoLabels=item.infoLabels))
+
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % '%s' % i.server.capitalize())
+
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+        itemlist.append(Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
+                             url=item.url, action="add_pelicula_to_library", extra="findvideos",
+                             contentTitle=item.contentTitle))
+    return itemlist
diff --git a/plugin.video.alfa/channels/mastorrents.json b/plugin.video.alfa/channels/mastorrents.json
deleted file mode 100644
index 6ebae2fc..00000000
--- a/plugin.video.alfa/channels/mastorrents.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "id": "mastorrents",
-  "name": "MasTorrents",
-  "active": true,
-  "adult": false,
-  "language": ["cast","lat"],
-  "thumbnail": "https://s33.postimg.cc/3y8720l9b/mastorrents.png",
-  "banner": "",
-  "version": 1,
-  "categories": [
-    "movie",
-    "tvshow",
-    "torrent"
-  ],
-  "settings": [
-    {
-      "id": "include_in_newest_peliculas",
-      "type": "bool",
-      "label": "Incluir en Novedades - Peliculas",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "include_in_newest_torrent",
-      "type": "bool",
-      "label": "Incluir en Novedades - Torrent",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/mastorrents.py b/plugin.video.alfa/channels/mastorrents.py
deleted file mode 100644
index df53aece..00000000
--- a/plugin.video.alfa/channels/mastorrents.py
+++ /dev/null
@@ -1,323 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- Channel MasTorrents -*-
-# -*- Created for Alfa-addon -*-
-# -*- By the Alfa Develop Group -*-
-
-import re
-from channelselector import get_thumb
-from platformcode import logger
-from platformcode import config
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-from core import tmdb
-
-host = 'http://www.mastorrents.com/'
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-    
-    itemlist.append(item.clone(title="Peliculas",
-                               action="movie_list",
-                               thumbnail=get_thumb("channels_movie.png")
-                               ))
-
-    itemlist.append(item.clone(title="Series",
-                               action="series_list",
-                               thumbnail=get_thumb("channels_tvshow.png")
-                               ))
-    return itemlist
-
-
-def movie_list(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(item.clone(title="Todas",
-                               action="lista",
-                               url=host+'peliculas',
-                               extra='movie',
-                               thumbnail=get_thumb('all', auto=True)
-                               ))
-
-    itemlist.append(item.clone(title="Generos",
-                               action="genres",
-                               url=host,
-                               extra='movie',
-                               thumbnail=get_thumb('genres', auto=True)
-                               ))
-
-    itemlist.append(item.clone(title="Buscar",
-                               action="search",
-                               url=host + '?pTit=', thumbnail=get_thumb('search', auto=True),
-                               extra='movie'
-                               ))
-    return itemlist
-
-
-def series_list(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(item.clone(title="Todas",
-                               action="lista",
-                               url=host + 'series',
-                               extra='serie',
-                               thumbnail=get_thumb('all', auto=True)
-                               ))
-
-    itemlist.append(item.clone(title="Generos",
-                               action="genres",
-                               url=host + 'series/',
-                               extra='serie',
-                               thumbnail=get_thumb('genres', auto=True)
-                               ))
-
-    itemlist.append(item.clone(title="Buscar",
-                               action="search",
-                               url=host + 'series/?pTit=',
-                               extra='serie',
-                               thumbnail=get_thumb('search', auto=True)
-                               ))
-    return itemlist
-
-
-def get_source(url):
-    logger.info()
-    data = httptools.downloadpage(url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    return data
-
-def lista (item):
-    logger.info ()
-    itemlist = []
-    infoLabels = dict()
-    data = get_source(item.url)
-    patron = "<div class=moviesbox>.*?</div><a href=(.*?)><div class=moviesbox_img style=background-image:url\('("
-    patron += ".*?)'\)>.*?tooltipbox>(.*?)(?: <i>| <br /><i>)(.*?)<"
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedthumbnail, scrapedtitle, extra_data in matches:
-        extra_data = extra_data.replace('(','').replace(')','')
-        url = scrapedurl
-        thumbnail = scrapedthumbnail
-        contentTitle = scrapedtitle.decode('latin1').encode('utf8')
-        title = contentTitle
-
-        tvshow = False
-        if 'x' in extra_data:
-            tvshow = True
-            filtro_thumb = scrapedthumbnail.replace("https://image.tmdb.org/t/p/w200_and_h300_bestv2", "")
-            filtro_list = {"poster_path": filtro_thumb}
-            filtro_list = filtro_list.items()
-            infoLabels['filtro']= filtro_list
-        else:
-            infoLabels['year']=extra_data
-        new_item=(Item(channel=item.channel,
-                       action='findvideos',
-                       title=title, 
-                       url=url,
-                       thumbnail=thumbnail,
-                       infoLabels=infoLabels,
-                       extra=item.extra
-                       ))
-        if tvshow:
-            new_item.contentSerieName = contentTitle
-            new_item.action = 'seasons'
-        else:
-            new_item.contentTitle = contentTitle
-            new_item.action = 'findvideos'
-        itemlist.append(new_item)
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb =True)
- #Paginacion
-
-    if itemlist !=[]:
-        actual_page_url = item.url
-        next_page = scrapertools.find_single_match(data,'<span class=pagination_next><a href=(.*?)>')
-        import inspect
-        if next_page !='':
-           itemlist.append(item.clone(action = "lista",
-                                      title = 'Siguiente >>>',
-                                      url = next_page
-                                      ))
-    return itemlist
-
-
-def genres(item):
-    logger.info()
-
-    itemlist = []
-
-    data = get_source(item.url)
-    data = scrapertools.find_single_match(data,'G&eacute;neros</option>(.+)</select></div>')
-
-    patron = '<option value=(.*?)>(.*?)</option>'
-
-    matches = re.compile(patron,re.DOTALL).findall(data)
-
-    for value, title in matches:
-        url = item.url + value
-        title = title.decode('latin1').encode('utf8')
-        itemlist.append(Item(channel=item.channel, title=title, url=url, action='lista'))
-    return itemlist
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = item.url + texto
-
-    if texto != '':
-        return lista(item)
-    else:
-        return []
-
-
-def seasons(item):
-    logger.info()
-    itemlist=[]
-    infoLabels = item.infoLabels
-    data=get_source(item.url)
-    patron ='href=javascript:showSeasson\(.*?\); id=.*?>Temporada (.*?)<\/a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for season in matches:
-        title='Temporada %s' % season
-        infoLabels['season'] = season
-        itemlist.append(Item(channel=item.channel,
-                             title= title,
-                             url=item.url,
-                             action='episodesxseasons',
-                             contentSeasonNumber=season,
-                             contentSerieName=item.contentSerieName,
-                             infoLabels=infoLabels
-                             ))
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    itemlist = itemlist[::-1]
-    if config.get_videolibrary_support() and len(itemlist) > 0:
-        itemlist.append(
-                Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
-                     action="add_serie_to_library", extra="all_episodes", contentSerieName=item.contentSerieName))
-
-    return itemlist
-
-def all_episodes(item):
-    logger.info()
-    itemlist = []
-    templist = seasons(item)
-    for tempitem in templist:
-        itemlist += episodesxseasons(tempitem)
-
-    return itemlist
-
-def episodesxseasons(item):
-    logger.info()
-
-    itemlist=[]
-
-    data=get_source(item.url)
-    patron = "<div class=corner-episode>%sx(.\d+)<\/div><a href=(.*?)>.*?" % item.contentSeasonNumber
-    patron += "image:url\('(.*?)'.*?href.*?>(%s)<" % item.contentSerieName
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    infoLabels=item.infoLabels
-    for episode, scrapedurl, scrapedthumbnail, scrapedtitle in matches:
-        contentEpisodeNumber=episode
-        season = item.contentSeasonNumber
-        url=scrapedurl
-        thumbnail=scrapedthumbnail
-        infoLabels['episode']=episode
-        title = '%sx%s - %s' % (season, episode, item.contentSerieName)
-        itemlist.append(Item(channel=item.channel,
-                             action='findvideos',
-                             title=title,
-                             url=url,
-                             thumbnail=thumbnail,
-                             contentSerieName=item.contentSerieName,
-                             contentEpisodeNumber=contentEpisodeNumber,
-                             infoLabels=infoLabels
-                             ))
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-    return itemlist[::-1]
-
-
-def findvideos(item):
-    logger.info()
-    itemlist=[]
-    data = get_source(item.url)
-    patron = "showDownload\(([^\)]+)\);.*?alt=.*?torrent (.*?) "
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for extra_info, quality in matches:
-        extra_info= extra_info.replace(",'",'|')
-        extra_info= extra_info.split('|')
-        title = '%s [%s]' % ('Torrent', quality.strip())
-        if item.extra == 'movie':
-            url = extra_info[2].strip("'")
-        else:
-            url = extra_info[3].strip("'")
-        server = 'torrent'
-
-        if not '.torrent' in url:
-            if 'tvsinpagar' in url:
-                url = url.replace('http://','http://www.')
-            try:
-                from_web = httptools.downloadpage(url, follow_redirects=False)
-                url = from_web.headers['location']
-            except:
-                pass
-
-        if '.torrent' in url:
-            itemlist.append(Item(channel=item.channel,
-                                 title=title,
-                                 contentTitle= item.title,
-                                 url=url,
-                                 action='play',
-                                 quality=quality,
-                                 server=server,
-                                 thumbnail = item.infoLabels['thumbnail'],
-                                 infoLabels=item.infoLabels
-                                 ))
-
-    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
-        itemlist.append(Item(channel=item.channel,
-                             title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
-                             url=item.url,
-                             action="add_pelicula_to_library",
-                             extra="findvideos",
-                             contentTitle=item.contentTitle
-                             ))
-
-    return itemlist
-
-
-def newest(category):
-    logger.info()
-    item = Item()
-    try:
-        if category in  ['peliculas', 'torrent']:
-            item.url = host + 'estrenos-de-cine'
-            item.extra='movie'
-            itemlist = lista(item)
-        if itemlist[-1].title == 'Siguiente >>>':
-            itemlist.pop()
-        if category == 'torrent':
-
-            item.url = host+'series'
-            item.extra = 'serie'
-            itemlist.extend(lista(item))
-
-        if itemlist[-1].title == 'Siguiente >>>':
-            itemlist.pop()
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-    return itemlist
diff --git a/plugin.video.alfa/channels/maxipelis24.json b/plugin.video.alfa/channels/maxipelis24.json
index 5c93a817..02df67fb 100644
--- a/plugin.video.alfa/channels/maxipelis24.json
+++ b/plugin.video.alfa/channels/maxipelis24.json
@@ -1,12 +1,27 @@
 {
-"id": "maxipelis24",
+  "id": "maxipelis24",
   "name": "Maxipelis24",
   "active": true,
   "adult": false,
-  "language": ["lat"],
+  "language": ["cast", "lat", "vose"],
   "thumbnail": "maxipelis24.png",
-  "banner": "",
   "categories": [
     "movie"
+  ],
+  "settings": [
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "Latino",
+        "CAST",
+        "VOSE"
+      ]
+    }
   ]
 }
diff --git a/plugin.video.alfa/channels/maxipelis24.py b/plugin.video.alfa/channels/maxipelis24.py
index bfa6773d..9be8e64e 100644
--- a/plugin.video.alfa/channels/maxipelis24.py
+++ b/plugin.video.alfa/channels/maxipelis24.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import re
-import urlparse
-import urllib
 
+from channels import autoplay
+from channels import filtertools
 from core import tmdb
 from core import servertools
 from core import httptools
@@ -14,19 +14,32 @@ from channelselector import get_thumb
 
 host = "https://maxipelis24.tv"
 
+IDIOMAS = {'Latino': 'Latino', 'Sub':'VOSE', 'Subtitulado': 'VOSE', 'Español': 'CAST', 'Castellano':'CAST'}
+list_language = IDIOMAS.values()
+list_quality = []
+list_servers = ['rapidvideo', 'vidoza', 'openload', 'streamango', 'okru']
+
 
 def mainlist(item):
     logger.info()
     itemlist = []
+    autoplay.init(item.channel, list_servers, list_quality)
 
-    itemlist.append(Item(channel = item.channel, title = "peliculas", action = "movies", url = host, thumbnail = get_thumb('movies', auto = True)))
-    itemlist.append(Item(channel = item.channel, action = "category", title = "Año de Estreno", url = host, cat = 'year', thumbnail = get_thumb('year', auto = True)))
-    itemlist.append(Item(channel = item.channel, action = "category", title = "Géneros", url = host, cat = 'genre', thumbnail = get_thumb('genres', auto = True)))
-    itemlist.append(Item(channel = item.channel, action = "category", title = "Calidad", url = host, cat = 'quality', thumbnail = get_thumb("quality", auto = True)))
-    itemlist.append(Item(channel = item.channel, title = "Buscar", action = "search", url = host + "?s=", thumbnail = get_thumb("search", auto = True)))
-    
+    itemlist.append(Item(channel=item.channel, title="Peliculas",
+                         action="movies", url=host, page=0, thumbnail=get_thumb('movies', auto=True)))
+    itemlist.append(Item(channel=item.channel, action="category", title="Año de Estreno",
+                         url=host, cat='year', thumbnail=get_thumb('year', auto=True)))
+    itemlist.append(Item(channel=item.channel, action="category", title="Géneros",
+                         url=host, cat='genre', thumbnail=get_thumb('genres', auto=True)))
+    itemlist.append(Item(channel=item.channel, action="category", title="Calidad",
+                         url=host, cat='quality', thumbnail=get_thumb("quality", auto=True)))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search",
+                         url=host + "?s=", page=0, thumbnail=get_thumb("search", auto=True)))
+
+    autoplay.show_option(item.channel, itemlist)
     return itemlist
 
+
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
@@ -34,105 +47,132 @@ def search(item, texto):
     if texto != '':
         return movies(item)
 
+
 def category(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","", data)
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     if item.cat == 'genre':
-        data = scrapertools.find_single_match(data, '<h3>Géneros <span class="icon-sort">.*?</ul>')
-        patron = '<li class="cat-item cat-item.*?<a href="([^"]+)" >([^<]+)<'
+        data = scrapertools.find_single_match(
+            data, '<h3>Géneros <span class="icon-sort">.*?</ul>')
+        patron = '<li class="cat-item cat-item.*?<a href="([^"]+)".*?>([^<]+)<'
     elif item.cat == 'year':
-        data = scrapertools.find_single_match(data, '<h3>Año de estreno.*?</div>')
-        patron = 'li><a href="([^"]+)">([^<]+).*?<'
+        data = scrapertools.find_single_match(
+            data, '<h3>Año de estreno.*?</div>')
+        patron = 'li><a href="([^"]+)".*?>([^<]+).*?<'
     elif item.cat == 'quality':
         data = scrapertools.find_single_match(data, '<h3>Calidad.*?</div>')
-        patron = 'li><a href="([^"]+)">([^<]+)<'
+        patron = 'li><a href="([^"]+)".*?>([^<]+)<'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedurl, scrapedtitle in matches:
-        itemlist.append(Item(channel = item.channel, action = 'movies', title =scrapedtitle, url = scrapedurl, type = 'cat', first = 0))
+        itemlist.append(Item(channel=item.channel, action='movies',
+                             title=scrapedtitle, url=scrapedurl, type='cat', page=0))
     return itemlist
 
+
 def movies(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","", data)
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     patron = '<div id="mt.+?href="([^"]+)".+?'
     patron += '<img src="([^"]+)" alt="([^"]+)".+?'
     patron += '<span class="ttx">([^<]+).*?'
     patron += 'class="year">([^<]+).+?class="calidad2">([^<]+)<'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, img, scrapedtitle, resto,  year, quality in matches:
-        scrapedtitle = re.sub(r'\d{4}|[()]','', scrapedtitle)
+    for scrapedurl, img, scrapedtitle, resto,  year, quality in matches[item.page:item.page + 20]:
+        scrapedtitle = re.sub(r' \((\d+)\)', '', scrapedtitle)
         plot = scrapertools.htmlclean(resto).strip()
         title = ' %s [COLOR red][%s][/COLOR]' % (scrapedtitle, quality)
-        itemlist.append(Item(channel = item.channel,
-                             title = title, 
-                             url = scrapedurl, 
-                             action = "findvideos",
-                             plot = plot,
-                             thumbnail = img,
-                             contentTitle = scrapedtitle,
-                             contentType = "movie",
-                             quality = quality,
-                             infoLabels = {'year': year}))
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb = True)
-    #Paginacion
-    matches = re.compile('class="respo_pag"><div class="pag.*?<a href="([^"]+)" >Siguiente</a><', re.DOTALL).findall(data)
-    if matches:
-        url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(Item(channel = item.channel, action = "movies", title = "Página siguiente >>", url = url))
+        itemlist.append(Item(channel=item.channel,
+                             title=title,
+                             url=scrapedurl,
+                             action="findvideos",
+                             plot=plot,
+                             thumbnail=img,
+                             contentTitle=scrapedtitle,
+                             contentType="movie",
+                             quality=quality,
+                             infoLabels={'year': year}))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    # Paginacion
+    if item.page + 20 < len(matches):
+        itemlist.append(item.clone(page=item.page + 20, title=">> Siguiente"))
+    else:
+        next_page = scrapertools.find_single_match(
+            data, '<link rel="next" href="([^"]+)" />')
+        if next_page:
+            itemlist.append(item.clone(url=next_page, page=0,
+                                       title=" Siguiente »"))
     return itemlist
 
+
 def findvideos(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","", data)
-    patron = '<div id="div.*?<div class="movieplay".*?(?:iframe.*?src|IFRAME SRC)="([^&]+)&'
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron = '<div id="div(\d+)".*?<div class="movieplay".*?(?:iframe.*?src|IFRAME SRC)="([^&]+)&'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for link in matches:
+    for ot, link in matches:
+        data1 = scrapertools.find_single_match(data, '<ul class="idTabs">.*?</ul></div>')
+        patron = 'li>.*?href="#div%s.*?>.*?([^<|\s]+)' % ot
+        matches1 = re.compile(patron, re.DOTALL).findall(data1)
+        for lang in matches1:
+            if "VIP" in lang:
+                continue
+            idioma = lang
+
+        if 'ok.ru' in link:
+            patron = '<div id="div.*?<div class="movieplay".*?(?:iframe.*?src|IFRAME SRC)="([^"]+)"'
+            matches = re.compile(patron, re.DOTALL).findall(data)
+            for link in matches:
+                if not link.startswith("https"):
+                    url = "https:%s" % link
+                    title = '%s'
+                    new_item = Item(channel=item.channel, title=title, url=url,
+                                    action='play', language=IDIOMAS[idioma], infoLabels=item.infoLabels)
+                    itemlist.append(new_item)
+
         if 'maxipelis24.tv/hideload/?' in link:
-            if 'id=' in link:
-                id_type = 'id'
-                ir_type = 'ir'
-            elif 'ud=' in link:
-                id_type = 'ud'
-                ir_type = 'ur'
-            elif 'od=' in link:
-                id_type = 'od'
-                ir_type = 'or'
-            elif 'ad=' in link:
-                id_type = 'ad'
-                ir_type = 'ar'
-            elif 'ed=' in link:
-                id_type = 'ed'
-                ir_type = 'er'
+            id_letter = scrapertools.find_single_match(link, '?(\w)d')
+            id_type = '%sd' % id_letter
+            ir_type = '%sr' % id_letter
             id = scrapertools.find_single_match(link, '%s=(.*)' % id_type)
-            base_link = scrapertools.find_single_match(link, '(.*?)%s=' % id_type)
+            base_link = scrapertools.find_single_match(
+                link, '(.*?)%s=' % id_type)
             ir = id[::-1]
             referer = base_link+'%s=%s&/' % (id_type, ir)
-            video_data = httptools.downloadpage('%s%s=%s' % (base_link, ir_type, ir), headers={'Referer':referer},
-                                            follow_redirects=False)
+            video_data = httptools.downloadpage('%s%s=%s' % (base_link, ir_type, ir), headers={'Referer': referer},
+                                                follow_redirects=False)
             url = video_data.headers['location']
             title = '%s'
-            new_item = Item(channel=item.channel, title=title, url=url, action='play', language = '', infoLabels=item.infoLabels)
-            itemlist.append(new_item)
         else:
             patron = '<div id="div.*?<div class="movieplay".*?(?:iframe.*?src|IFRAME SRC)="([^"]+)"'
             matches = re.compile(patron, re.DOTALL).findall(data)
             for link in matches:
                 url = link
                 title = '%s'
-                new_item = Item(channel=item.channel, title=title, url=url, action='play', language = '', infoLabels=item.infoLabels)
-                itemlist.append(new_item)
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % x.server.capitalize())        
+        new_item = Item(channel=item.channel, title=title, url=url,
+                        action='play', language=IDIOMAS[idioma], infoLabels=item.infoLabels)
+        itemlist.append(new_item)
+    itemlist = servertools.get_servers_itemlist(
+        itemlist, lambda i: i.title % '%s [%s]' % (i.server.capitalize(), i.language))
+    #itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     if itemlist:
         if config.get_videolibrary_support():
-                itemlist.append(Item(channel = item.channel, action = ""))
-                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
-                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
-                                     contentTitle = item.contentTitle
-                                     ))
-    return itemlist
\ No newline at end of file
+            itemlist.append(Item(channel=item.channel, action=""))
+            itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
+                                 action="add_pelicula_to_library", url=item.url, thumbnail=item.thumbnail,
+                                 contentTitle=item.contentTitle
+                                 ))
+    # Requerido para FilterTools
+
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+
+    return itemlist
diff --git a/plugin.video.alfa/channels/mejortorrent.json b/plugin.video.alfa/channels/mejortorrent.json
index 19468219..efa5fc65 100755
--- a/plugin.video.alfa/channels/mejortorrent.json
+++ b/plugin.video.alfa/channels/mejortorrent.json
@@ -18,7 +18,7 @@
       "id": "domain_name",
       "type": "text",
       "label": "URL actual de la Web Mejor Torrent",
-      "default": "http://www.mejortorrent.org/",
+      "default": "http://www.mejortorrent.tv/",
       "enabled": true,
       "visible": true
     },
diff --git a/plugin.video.alfa/channels/mejortorrent.py b/plugin.video.alfa/channels/mejortorrent.py
index 63e25330..e8e9dfe8 100755
--- a/plugin.video.alfa/channels/mejortorrent.py
+++ b/plugin.video.alfa/channels/mejortorrent.py
@@ -26,7 +26,8 @@ list_servers = ['torrent']
 
 channel = "mejortorrent"
 
-host = 'http://www.mejortorrent.org/'
+host = 'http://www.mejortorrent.tv/'
+host_sufix = '.tv'
 #host = config.get_setting('domain_name', channel)
 
 categoria = channel.capitalize()
@@ -296,8 +297,8 @@ def listado(item):
 
         item_local.title = scrapertools.get_match(scrapedurl, patron_enlace)
         item_local.title = item_local.title.replace("-", " ")
-        item_local.url = urlparse.urljoin(item_local.url, scrapedurl)
-        item_local.thumbnail = host + urllib.quote(scrapedthumbnail)
+        item_local.url = verificar_url(urlparse.urljoin(item_local.url, scrapedurl))
+        item_local.thumbnail = verificar_url(host + urllib.quote(scrapedthumbnail))
         item_local.contentThumbnail = item_local.thumbnail
         item_local.infoLabels['year'] = '-'  # Al no saber el año, le ponemos "-" y TmDB lo calcula automáticamente
         
@@ -660,7 +661,7 @@ def listado_busqueda(item):
             item_local.quality = scrapertools.remove_htmltags(scrapedinfo).decode('iso-8859-1').encode('utf8')
         item_local.quality = item_local.quality.replace("(", "").replace(")", "").replace("[", "").replace("]", "").replace("Documental", "").replace("documental", "")
         
-        item_local.url = urlparse.urljoin(item.url, scrapedurl)
+        item_local.url = verificar_url(urlparse.urljoin(item.url, scrapedurl))
         
         #Preparamos la información básica para TMDB
         if "/serie-" in scrapedurl or "/doc-" in scrapedurl:
@@ -829,10 +830,10 @@ def findvideos(item):
     for scrapedurl in matches:
         #Generamos una copia de Item para trabajar sobre ella
         item_local = item.clone()
-        url = urlparse.urljoin(item.url, scrapedurl)
+        url = verificar_url(urlparse.urljoin(item.url, scrapedurl))
         
         # Localiza el .torrent en el siguiente link
-        if not item.post and not item.armagedon:                            # Si no es llamada con Post, hay que bajar un nivel más
+        if not item.post and not item.armagedon:                    # Si no es llamada con Post, hay que bajar un nivel más
             try:
                 torrent_data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)", "", httptools.downloadpage(url).data)
             except:                                                                     #error
@@ -849,15 +850,15 @@ def findvideos(item):
                     if item.videolibray_emergency_urls:                                 #Si es llamado desde creación de Videoteca...
                         return item                                                     #Devolvemos el Item de la llamada
                     else:
-                        return itemlist                                         #si no hay más datos, algo no funciona, pintamos lo que tenemos
+                        return itemlist                     #si no hay más datos, algo no funciona, pintamos lo que tenemos
             
             #logger.debug(torrent_data)
             if not item.armagedon:
                 item_local.url = scrapertools.get_match(torrent_data, ">Pincha.*?<a href='(.*?\/uploads\/torrents\/\w+\/.*?\.torrent)'")
-                item_local.url = urlparse.urljoin(url, item_local.url)
+                item_local.url = verificar_url(urlparse.urljoin(url, item_local.url))
         
         elif not item.armagedon:
-            item_local.url = url          # Ya teníamos el link desde el primer nivel (documentales)
+            item_local.url = url                                # Ya teníamos el link desde el primer nivel (documentales)
         item_local.url = item_local.url.replace(" ", "%20")
         
         if item.armagedon and item.emergency_urls and not item.videolibray_emergency_urls:
@@ -867,10 +868,10 @@ def findvideos(item):
                     del item.emergency_urls[0][0]
         if not item.armagedon and item.emergency_urls and not item.videolibray_emergency_urls:
             if len(item.emergency_urls[0]):
-                item_local.torrent_alt = item.emergency_urls[0][0]                      #Guardamos la primera url del .Torrent ALTERNATIVA
+                item_local.torrent_alt = item.emergency_urls[0][0]      #Guardamos la primera url del .Torrent ALTERNATIVA
         
         if item.videolibray_emergency_urls:
-            item.emergency_urls[0].append(item_local.url)                               #Salvamnos la url...
+            item.emergency_urls[0].verificar_url(append(item_local.url))                #Salvamnos la url...
 
         # Poner la calidad, si es necesario
         if not item_local.quality:
@@ -1003,7 +1004,7 @@ def episodios(item):
         item_local.title = ''
         item_local.context = "['buscar_trailer']"
 
-        item_local.url = urlparse.urljoin(host, scrapedurl)
+        item_local.url = verificar_url(urlparse.urljoin(host, scrapedurl))
         
         scrapedtitle = re.sub('\r\n', '', scrapedtitle).decode('iso-8859-1').encode('utf8').strip()
         if scrapedtitle.endswith('.'):
@@ -1030,7 +1031,7 @@ def episodios(item):
         else:       #Se prepara el Post para documentales
             item_local.contentSeason = 1
             item_local.contentEpisodeNumber = 1
-            item_local.url = host + "/secciones.php?sec=descargas&ap=contar_varios"
+            item_local.url = verificar_url(host + "/secciones.php?sec=descargas&ap=contar_varios")
             item_local.post = urllib.urlencode({name: value, "total_capis": total_capis, "tabla": tabla, "titulo": titulo_post})
         
         if year:
@@ -1050,6 +1051,15 @@ def episodios(item):
     item, itemlist = generictools.post_tmdb_episodios(item, itemlist)
 
     return itemlist
+    
+    
+def verificar_url(url):
+    if '.com' in url or '.net' in url or '.org' in url:
+        url = url.replace('.com', '.tv').replace('.net', '.tv').replace('.org', '.tv')
+        url = url.replace('torrents/tmp/torrent.php?table=peliculas/&name=', 'torrents/peliculas/')
+        url = url.replace('torrents/tmp/torrent.php?table=series/&name=', 'torrents/series/')
+        url = url.replace('torrents/tmp/torrent.php?table=documentales/&name=', 'torrents/documentales/')
+    return url
 
 
 def actualizar_titulos(item):
diff --git a/plugin.video.alfa/channels/mejortorrent1.json b/plugin.video.alfa/channels/mejortorrent1.json
index c5d2aa2f..410891e3 100644
--- a/plugin.video.alfa/channels/mejortorrent1.json
+++ b/plugin.video.alfa/channels/mejortorrent1.json
@@ -18,7 +18,7 @@
       "id": "domain_name",
       "type": "text",
       "label": "URL actual de la Web Mejor Torrent",
-      "default": "https://mejortorrent1.com/",
+      "default": "https://mejortorrent1.net/",
       "enabled": true,
       "visible": true
     },
diff --git a/plugin.video.alfa/channels/mejortorrent1.py b/plugin.video.alfa/channels/mejortorrent1.py
index 23062782..1c82174a 100644
--- a/plugin.video.alfa/channels/mejortorrent1.py
+++ b/plugin.video.alfa/channels/mejortorrent1.py
@@ -809,10 +809,10 @@ def listado_busqueda(item):
 def findvideos(item):
     logger.info()
     itemlist = []
-    itemlist_t = []                                     #Itemlist total de enlaces
-    itemlist_f = []                                     #Itemlist de enlaces filtrados
+    itemlist_t = []                                                 #Itemlist total de enlaces
+    itemlist_f = []                                                 #Itemlist de enlaces filtrados
     if not item.language:
-        item.language = ['CAST']                        #Castellano por defecto
+        item.language = ['CAST']                                    #Castellano por defecto
     matches = []
     
     #logger.debug(item)
@@ -827,7 +827,7 @@ def findvideos(item):
     #Si es un lookup para cargar las urls de emergencia en la Videoteca...
     if item.videolibray_emergency_urls:
         item.emergency_urls = []
-        item.emergency_urls.append([])                                              #Reservamos el espacio para los .torrents locales
+        item.emergency_urls.append([])                              #Reservamos el espacio para los .torrents locales
     
     #Bajamos los datos de la página de todo menos de Documentales y Varios
     if not item.post:
@@ -836,7 +836,7 @@ def findvideos(item):
             data = data.replace('"', "'")
             patron = "<form (?:.*?)?"
             patron += "name='episodios'.+action='([^']+)' method='post'>.*?"
-            patron += "<input.+type='[^']+'.+name='([^']+)'.+value='([^']+)'>.*<input.+type='hidden'.+value='([^']+)'.+name='([^']+)'>"
+            patron += "<input\s*type='[^']+'\s*name='([^']+)'\s*value='([^']+)'>\s*<input\s*type='[^']+'\s*value='([^']+)'\s*name='([^']+)'>(?:\s*<input\s*type='[^']+'\s*value='([^']+)'\s*name='([^']+)'\s*id='([^']+)'>)?"
         except:
             pass
         if not data:
@@ -846,10 +846,10 @@ def findvideos(item):
                 matches = item.emergency_urls[1]                                    #Restauramos matches
                 item.armagedon = True                                               #Marcamos la situación como catastrófica 
             else:
-                if item.videolibray_emergency_urls:                                 #Si es llamado desde creación de Videoteca...
+                if item.videolibray_emergency_urls:         #Si es llamado desde creación de Videoteca...
                     return item                                                     #Devolvemos el Item de la llamada
                 else:
-                    return itemlist                                         #si no hay más datos, algo no funciona, pintamos lo que tenemos
+                    return itemlist                         #si no hay más datos, algo no funciona, pintamos lo que tenemos
 
         if not item.armagedon:                                                      #Si es un proceso normal, seguimos
             matches = re.compile(patron, re.DOTALL).findall(data)
@@ -878,55 +878,72 @@ def findvideos(item):
         if item.videolibray_emergency_urls:
             item.emergency_urls.append(matches)                                 #Salvamnos matches...
         
-        for scrapedurl, name1, value1, value2, name2 in matches:                #Hacemos el FOR aunque solo habrá un item
-            #Generamos una copia de Item para trabajar sobre ella
-            item_local = item.clone()
+        for scrapedurl, name1, value1, value2, name2, value3, name3, id3 in matches: #Hacemos el FOR aunque solo habrá un item
             url = scrapedurl
 
             # Localiza el .torrent en el siguiente link con Post
             post = '%s=%s&%s=%s' % (name1, value1, name2, value2)
+            #post = '%s=%s&%s=%s&%s=%s' % (name1, value1, name2, value2, name3, value3)
             if not item.armagedon:
                 try:
                     torrent_data = httptools.downloadpage(url, post=post, headers=headers, follow_redirects=False)
                 except:                                                         #error
                     pass
 
+                    
     else:
         #Viene de SERIES y DOCUMENTALES. Generamos una copia de Item para trabajar sobre ella
-        item_local = item.clone()
         try:                     #Localiza el .torrent en el siguiente link con Post.  Viene de Documentales y Varios
             url = item.url_post
-            torrent_data = httptools.downloadpage(url, post=item.post, headers=headers, follow_redirects=False)
+            del item.url_post
+            post = item.post
+            torrent_data = httptools.downloadpage(url, post=post, headers=headers, follow_redirects=False)
         except:
             pass
 
-    if not torrent_data or not 'location' in torrent_data.headers or not torrent_data.headers['location']:
+    if not torrent_data and not ('location' in torrent_data.headers or 'zip' in torrent_data.headers['content-type']):
         item = generictools.web_intervenida(item, data)                         #Verificamos que no haya sido clausurada
         if item.intervencion:                                                   #Sí ha sido clausurada judicialmente
             item, itemlist = generictools.post_tmdb_findvideos(item, itemlist)  #Llamamos al método para el pintado del error
         elif not item.armagedon:
-            logger.error("ERROR 02: FINDVIDEOS: El archivo Torrent no existe o ha cambiado la estructura de la Web " + " / URL: " + url + " / DATA: " + data)
+            logger.error("ERROR 02: FINDVIDEOS: El archivo Torrent no existe o ha cambiado la estructura de la Web " + " / URL: " + url + " / POST: " + post + " / DATA: " + str(torrent_data.headers))
             itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 02: FINDVIDEOS: El archivo Torrent no existe o ha cambiado la estructura de la Web.  Verificar en la Web y reportar el error con el log'))
-        
+            
         if item.emergency_urls and not item.videolibray_emergency_urls:         #Hay urls de emergencia?
-            item_local.url = item.emergency_urls[0][0]                          #Restauramos la url del .torrent
+            item.url = item.emergency_urls[0][0]                                #Restauramos la url del .torrent
             item.armagedon = True                                               #Marcamos la situación como catastrófica 
         else:
             if item.videolibray_emergency_urls:                                 #Si es llamado desde creación de Videoteca...
                 return item                                                     #Devolvemos el Item de la llamada
             else:
-                return itemlist                                         #si no hay más datos, algo no funciona, pintamos lo que tenemos
+                return itemlist                             #si no hay más datos, algo no funciona, pintamos lo que tenemos
+    
+    #Si el torrent viene en un .zip en vez de desde una url, lo preparamos todo para el play
+    referer_zip = None
+    post_zip = None
+    if 'location' not in torrent_data.headers and 'zip' in torrent_data.headers['content-type'] and not item.armagedon:
+        item.referer = item.url
+        referer_zip = item.referer
+        item.url = url
+        item.post = post
+        post_zip = item.post
+    
+    #Generamos una copia de Item para trabajar sobre ella
+    item_local = item.clone()
     
     #Capturamos la url del .torrent desde el Header
     if not item.armagedon:
-        item_local.url = torrent_data.headers['location'] if 'location' in torrent_data.headers else item.url_post
+        item_local.url = torrent_data.headers['location'] if 'location' in torrent_data.headers else item.url
         item_local.url = item_local.url.replace(" ", "%20")                     #Quitamos espacios
         if item.emergency_urls:
             item_local.torrent_alt = item.emergency_urls[0][0]                  #Guardamos la url del .Torrent ALTERNATIVA
     
     #Si es un lookup para cargar las urls de emergencia en la Videoteca...
     if item.videolibray_emergency_urls:
-        item.emergency_urls[0].append(item_local.url)                           #Salvamnos la url...
+        if 'location' in torrent_data.headers or config.get_setting("emergency_urls_torrents", item_local.channel):
+            item.emergency_urls[0].append(item_local.url)                       #Salvamnos la url...
+        elif not config.get_setting("emergency_urls_torrents", item_local.channel):
+            item.emergency_urls[0].append(item_local.referer)                   #Salvamnos el referer...
         return item                                                             #... y nos vamos
         
     # Poner la calidad, si es necesario
@@ -947,7 +964,7 @@ def findvideos(item):
         size  = scrapertools.find_single_match(item_local.url, '(\d{1,3},\d{1,2}?\w+)\.torrent')
     size = size.upper().replace(".", ",").replace("G", " G ").replace("M", " M ") #sustituimos . por , porque Unify lo borra
     if not size and not item.armagedon:
-        size = generictools.get_torrent_size(item_local.url)                        #Buscamos el tamaño en el .torrent
+        size = generictools.get_torrent_size(item_local.url, referer_zip, post_zip) #Buscamos el tamaño en el .torrent
     if size:
         item_local.title = re.sub('\s\[\d+,?\d*?\s\w[b|B]\]', '', item_local.title) #Quitamos size de título, si lo traía
         item_local.title = '%s [%s]' % (item_local.title, size)                     #Agregamos size al final del título
@@ -1021,7 +1038,7 @@ def episodios(item):
     # Prepara el patrón de búsqueda
     patron = "<form (?:style='[^']+'\s)?name='episodios' action='([^']+)'"
     url = scrapertools.find_single_match(data, patron)                          #Salvamos la url de descarga
-    url = url.replace('descargar_series.php', 'descargar.php')                  #ESTA DESCARGARÍA EL TORRENT EN VEZ DEL ENLACE
+    url = url.replace('descargar_tv.php', 'descargar_post.php')                 #ESTA DESCARGARÍA EL TORRENT EN VEZ DEL ENLACE
     patron = "<form (?:style='[^']+'\s)?name='episodios' action='[^']+'.*?<input type='hidden' value='([^']+)' name='([^']+)'>"
     value2 = ''                                                                 #Patrón general para Documentales (1)
     name2 = ''
diff --git a/plugin.video.alfa/channels/mirapeliculas.json b/plugin.video.alfa/channels/mirapeliculas.json
new file mode 100644
index 00000000..e420651b
--- /dev/null
+++ b/plugin.video.alfa/channels/mirapeliculas.json
@@ -0,0 +1,62 @@
+{
+  "id": "mirapeliculas",
+  "name": "MiraPeliculas",
+  "active": true,
+  "adult": false,
+  "language": ["cast", "lat"],
+  "thumbnail": "http://mirapeliculas.net/favicon.ico",
+  "banner": "",
+  "categories": [
+    "movie"
+  ],
+  "settings": [
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "LAT",
+        "ESP",
+        "VOSE"
+      ]
+    },
+     {
+      "id": "modo_grafico",
+      "type": "bool",
+      "label": "Buscar información extra",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    } 
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/mirapeliculas.py b/plugin.video.alfa/channels/mirapeliculas.py
new file mode 100644
index 00000000..a5515b54
--- /dev/null
+++ b/plugin.video.alfa/channels/mirapeliculas.py
@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import re, urllib, urlparse
+
+from channels import autoplay
+from platformcode import config, logger, platformtools
+from core.item import Item
+from core import httptools, scrapertools, jsontools, tmdb
+from core import servertools
+from channels import filtertools
+
+host = 'http://mirapeliculas.net'
+
+IDIOMAS = {'Latino': 'LAT', 'Español': 'ESP', 'Subtitulado': 'VOSE'}
+list_language = IDIOMAS.values()
+list_servers = ['streamango', 'streamplay', 'openload', 'okru']
+list_quality = ['BR-Rip', 'HD-Rip', 'DVD-Rip', 'TS-HQ', 'TS-Screner', 'Cam']
+
+__channel__='mirapeliculas'
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__)
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__)
+try:
+    __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
+except:
+    __modo_grafico__ = True
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    autoplay.init(item.channel, list_servers, list_quality)
+    
+    itemlist.append(item.clone(title="Novedades" , action="lista", url= host))
+    itemlist.append(item.clone(title="Castellano" , action="lista", url= host + "/repelis/castellano/"))
+    itemlist.append(item.clone(title="Latino" , action="lista", url= host + "/repelis/latino/"))
+    itemlist.append(item.clone(title="Subtituladas" , action="lista", url= host + "/repelis/subtituladas/"))
+    itemlist.append(item.clone(title="Categorias" , action="categorias", url= host))
+    itemlist.append(item.clone(title="Buscar", action="search"))
+    
+    itemlist.append(item.clone(title="Configurar canal...", text_color="gold", action="configuracion", folder=False))
+    autoplay.show_option(item.channel, itemlist)
+    return itemlist
+
+
+def configuracion(item):
+    ret = platformtools.show_channel_settings()
+    platformtools.itemlist_refresh()
+    return ret
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/buscar/?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
+    patron  = '<li class="cat-item cat-item-3"><a href="([^"]+)" title="([^"]+)">'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append(item.clone(channel=item.channel, action="lista", title=scrapedtitle , url=scrapedurl ,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
+    return itemlist
+
+
+def lista(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+
+    patron  = '<div class="col-mt-5 postsh">.*?<a href="([^"]+)".*?'
+    patron += '<span class="under-title-gnro">([^"]+)</span>.*?'
+    patron += '<p>(\d+)</p>.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += 'title="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl, calidad, scrapedyear, scrapedthumbnail, scrapedtitle in matches:
+        scrapedplot = ""
+        title = '%s [COLOR red] %s [/COLOR] (%s)' % (scrapedtitle, calidad , scrapedyear)
+        itemlist.append(item.clone(action="findvideos", title=title , url=scrapedurl ,
+                              thumbnail=scrapedthumbnail , contentTitle = scrapedtitle, plot=scrapedplot ,
+                              quality=calidad, infoLabels={'year':scrapedyear}) )
+
+    tmdb.set_infoLabels(itemlist, True)
+
+    next_page_url = scrapertools.find_single_match(data,'<span class="current">\d+</span>.*?<a href="([^"]+)"')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append(item.clone(channel=item.channel , action="lista" , title="Next page >>" , 
+                                   text_color="blue", url=next_page_url) )
+
+
+    return itemlist
+
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron = '<td><a rel="nofollow" href=.*?'
+    patron += '<td>([^<]+)</td>.*?'
+    patron += '<td>([^<]+)</td>.*?'
+    patron += '<img src=".*?=([^"]+)"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for lang, calidad, url  in matches:
+        if lang in IDIOMAS:
+            lang = IDIOMAS[lang]
+        if not config.get_setting('unify'):
+            title =  '[COLOR red] %s [/COLOR] (%s)' % (calidad , lang)
+        else:
+            title = ''
+        itemlist.append(item.clone(action="play", title='%s'+title, url=url, language=lang, quality=calidad ))
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) 
+    # Requerido para Filtrar enlaces
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra !='findvideos' :
+        itemlist.append(Item(channel=item.channel, action="add_pelicula_to_library", 
+                             title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+                             extra="findvideos", contentTitle=item.contentTitle)) 
+    return itemlist
+
+
+
diff --git a/plugin.video.alfa/channels/mixtoon.json b/plugin.video.alfa/channels/mixtoon.json
new file mode 100644
index 00000000..bbd85070
--- /dev/null
+++ b/plugin.video.alfa/channels/mixtoon.json
@@ -0,0 +1,12 @@
+{
+  "id": "mixtoon",
+  "name": "MixToon",
+  "active": true,
+  "adult": false,
+  "language": ["cast"],
+  "thumbnail": "http://i.imgur.com/iZzF8gE.png",
+  "banner": "http://i.imgur.com/c1YTgNT.png",
+  "categories": [
+    "tvshow"
+  ]
+}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/mixtoon.py b/plugin.video.alfa/channels/mixtoon.py
new file mode 100644
index 00000000..215b144c
--- /dev/null
+++ b/plugin.video.alfa/channels/mixtoon.py
@@ -0,0 +1,162 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from channels import renumbertools
+from channelselector import get_thumb
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core import tmdb
+from core.item import Item
+from platformcode import config, logger
+from channels import filtertools
+from channels import autoplay
+from lib import gktools
+
+IDIOMAS = {'castellano': 'Castellano'}
+list_language = IDIOMAS.values()
+list_servers = ['openload'
+                ]
+list_quality = ['default']
+
+
+host = "https://mixtoon.com"
+
+
+def mainlist(item):
+    logger.info()
+    thumb_series = get_thumb("channels_tvshow.png")
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist = list()
+
+    itemlist.append(
+        Item(channel=item.channel, action="lista", title="Series", url=host, thumbnail=thumb_series, page=0))
+    itemlist = renumbertools.show_option(item.channel, itemlist)
+    autoplay.show_option(item.channel, itemlist)
+    return itemlist
+
+
+def lista(item):
+    logger.info()
+
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron = '<a href="([^"]+)" '
+    patron += 'class="link">.+?<img src="([^"]+)".*?'
+    patron += 'title="([^"]+)">'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    # Paginacion
+    num_items_x_pagina = 30
+    min = item.page * num_items_x_pagina
+    min=min-item.page
+    max = min + num_items_x_pagina - 1
+    b=0
+    for link, img, name in matches[min:max]:
+        b=b+1
+        if " y " in name:
+            title=name.replace(" y "," & ")
+        else:
+            title = name
+        url = host + link
+        scrapedthumbnail = host + img
+        context = renumbertools.context(item)
+        context2 = autoplay.context
+        context.extend(context2)
+        itemlist.append(item.clone(title=title, url=url, action="episodios", thumbnail=scrapedthumbnail, show=title,contentSerieName=title,
+                                   context=context))
+    if b<29:
+        pass
+    else:    
+        itemlist.append(
+             Item(channel=item.channel, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=item.url, action="lista", page=item.page + 1))
+
+    tmdb.set_infoLabels(itemlist)
+    return itemlist
+
+
+def episodios(item):
+    logger.info()
+
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    # obtener el numero total de episodios
+    total_episode = 0
+
+    patron_caps = '<li><a href="(.*?)">(.*?)-(.*?)<\/a><\/li>'
+    matches = scrapertools.find_multiple_matches(data, patron_caps)
+    patron_info = '<img src="([^"]+)"><div class="ds"><p>(.*?)<\/p>'
+    scrapedthumbnail, scrapedplot = scrapertools.find_single_match(data, patron_info)
+    show = item.title
+    scrapedthumbnail = host + scrapedthumbnail
+
+    for link, cap, name in matches:
+
+        title = ""
+        pat = "/"
+        if "Mike, Lu & Og"==item.title:
+            pat="&/"
+        if "KND" in item.title:
+            pat="-"
+        # varios episodios en un enlace
+        if len(name.split(pat)) > 1:
+            i = 0
+            for pos in name.split(pat):
+                i = i + 1
+                total_episode += 1
+                season, episode = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, 1, total_episode)
+                if len(name.split(pat)) == i:
+                    title += "%sx%s " % (season, str(episode).zfill(2))
+                else:
+                    title += "%sx%s_" % (season, str(episode).zfill(2))
+        else:
+            total_episode += 1
+            season, episode = renumbertools.numbered_for_tratk(item.channel,item.contentSerieName, 1, total_episode)
+
+            title += "%sx%s " % (season, str(episode).zfill(2))
+
+        url = host + "/" + link
+        if "disponible" in link:
+            title += "No Disponible aún"
+        else:
+            title += name
+            itemlist.append(
+                Item(channel=item.channel, action="findvideos", title=title, url=url, show=show, plot=scrapedplot,
+                     thumbnail=scrapedthumbnail))
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(Item(channel=item.channel, title="[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]", url=item.url,
+                             action="add_serie_to_library", extra="episodios", show=show))
+
+    return itemlist
+
+def findvideos(item):
+    import base64
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    _sl = scrapertools.find_single_match(data, 'var _dt=([^;]+);')
+    sl = eval(_sl)
+    buttons = [0,1]
+    for id in buttons:
+        new_url = "https://videoeb.xyz/" + "eb/" + sl[0] + "/" + sl[1] + "/" + str(id) + "/" + sl[2]
+        data_new = httptools.downloadpage(new_url).data
+        valor1, valor2 = scrapertools.find_single_match(data_new, 'var x0x = \["[^"]*","([^"]+)","[^"]*","[^"]*","([^"]+)') 
+        try:
+            url = base64.b64decode(gktools.transforma_gsv(valor2, base64.b64decode(valor1)))
+            if 'download' in url:
+                url = url.replace('download', 'preview')
+            title = '%s'
+            itemlist.append(Item(channel=item.channel, title=title, url=url, action='play', language='latino',
+                         infoLabels=item.infoLabels))
+        except Exception as e:
+            logger.info(e)
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+
+    return itemlist
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/mporno.py b/plugin.video.alfa/channels/mporno.py
index 492b77f9..db256036 100644
--- a/plugin.video.alfa/channels/mporno.py
+++ b/plugin.video.alfa/channels/mporno.py
@@ -2,24 +2,21 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
-from core import jsontools
 
 host = 'http://mporno.tv'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host + "/most-recent/", plot="/most-recent/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="peliculas", url=host + "/top-rated/", plot="/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistas" , action="peliculas", url=host + "/most-viewed/", plot="/most-viewed/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/longest/", plot="/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
@@ -45,10 +42,11 @@ def categorias(item):
     patron  = '<h3><a href="([^"]+)">(.*?)</a> <small>(.*?)</small></h3>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = scrapedurl.replace("http://mporno.unblckd.org/", "").replace("page1.html", "")
+        scrapedplot = ""
         scrapedthumbnail = ""
         scrapedtitle = scrapedtitle + "  " + cantidad
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
     return itemlist
 
 
@@ -64,13 +62,13 @@ def peliculas(item):
         title = scrapedtitle
         scrapedurl = scrapedurl.replace("/thumbs/", "/videos/") + ".mp4"
         thumbnail = scrapedthumbnail
-        plot = item.plot
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
+        plot = ""
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=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(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
         
     return itemlist
 
diff --git a/plugin.video.alfa/channels/muchoporno.py b/plugin.video.alfa/channels/muchoporno.py
index 9f81d700..97214d10 100644
--- a/plugin.video.alfa/channels/muchoporno.py
+++ b/plugin.video.alfa/channels/muchoporno.py
@@ -7,15 +7,15 @@ 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
 
 host = 'https://www.muchoporno.xxx'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host))
+    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="categorias", url=host + "/pornstars/"))
+    #itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/sitios/"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categorias/"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
@@ -26,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -39,22 +39,47 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a class="muestra-escena muestra-categoria" href="([^"]+)" title="([^"]+)">.*?src="([^"]+)"'
+    if "/sitios/" in item.url:
+        patron = '<div class="muestra-escena muestra-canales">.*?href="(.*?)">.*?'
+        patron += 'src="(.*?)".*?'
+        patron += '<a title="(.*?)".*?'
+        patron += '</span> (.*?) videos</span>'
+    if "/pornstars/" in item.url:
+        patron = '<a class="muestra-escena muestra-pornostar" href="([^"]+)">.*?'
+        patron += 'src="([^"]+)".*?'
+        patron += 'alt="([^"]+)".*?'
+        patron += '</span> (\d+) videos</span>'
+    else:
+        patron  = '<a class="muestra-escena muestra-categoria" href="([^"]+)" title="[^"]+">.*?'
+        patron += 'src="([^"]+)".*?'
+        patron += '</span> ([^"]+) </h2>(.*?)>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
-        scrapedtitle = scrapedtitle
+        cantidad =  " (" + cantidad + ")"
+        if "</a" in cantidad:
+            cantidad = ""
+        scrapedtitle = scrapedtitle +  cantidad
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)">Siguiente</a></li>')
+    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) )
+
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a class="muestra-escena"\s*href="([^"]+)".*?data-stats-video-name="([^"]+)".*?<img src="([^"]+)".*?<span class="ico-minutos sprite" title="Length"></span>([^"]+)</span>'
+    patron = '<a class="muestra-escena"\s*href="([^"]+)".*?'
+    patron += 'data-stats-video-name="([^"]+)".*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<span class="ico-minutos sprite" title="Length"></span>([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,duracion  in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
@@ -63,11 +88,12 @@ def peliculas(item):
         thumbnail = scrapedthumbnail
         plot = ""
         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,'<li><a href="([^"]+)">Siguiente</a></li>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                              plot=plot, contentTitle = contentTitle))
+    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)">Siguiente</a></li>')
+    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
 
 
diff --git a/plugin.video.alfa/channels/mundoflv.py b/plugin.video.alfa/channels/mundoflv.py
deleted file mode 100755
index 462ae117..00000000
--- a/plugin.video.alfa/channels/mundoflv.py
+++ /dev/null
@@ -1,655 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from channels import autoplay
-from channels import filtertools
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import tmdb
-from core.item import Item
-from platformcode import config, logger
-from channelselector import get_thumb
-
-host = "http://mundoflv.com"
-thumbmx = 'http://flags.fmcdn.net/data/flags/normal/mx.png'
-thumbes = 'http://flags.fmcdn.net/data/flags/normal/es.png'
-thumben = 'http://flags.fmcdn.net/data/flags/normal/gb.png'
-thumbsub = 'https://s32.postimg.cc/nzstk8z11/sub.png'
-thumbtodos = 'https://s29.postimg.cc/4p8j2pkdj/todos.png'
-patrones = ['<<meta property="og:image" content="([^"]+)" \/>" \/>', '\/><\/a>([^*]+)<p><\/p>.*']
-
-IDIOMAS = {'la': 'Latino',
-           'es': 'Español',
-           'sub': 'VOS',
-           'vosi': 'VOSE',
-           'en': 'VO'
-           }
-list_language = IDIOMAS.values()
-list_quality = []
-list_servers = [
-    'openload',
-    'gamovideo',
-    'powvideo',
-    'streamplay',
-    'streamin',
-    'streame',
-    'flashx',
-    'nowvideo'
-]
-
-list_quality = ['default']
-
-audio = {'la': '[COLOR limegreen]LATINO[/COLOR]', 'es': '[COLOR yellow]ESPAÑOL[/COLOR]',
-         'sub': '[COLOR orange]ORIGINAL SUBTITULADO[/COLOR]', 'en': '[COLOR red]Original[/COLOR]',
-         'vosi': '[COLOR red]ORIGINAL SUBTITULADO INGLES[/COLOR]'
-         }
-
-headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
-           ['Referer', host]]
-
-
-def mainlist(item):
-    logger.info()
-
-    autoplay.init(item.channel, list_servers, list_quality)
-    itemlist = []
-
-    itemlist.append(Item(channel=item.channel,
-                         title="Series",
-                         action="todas",
-                         url=host,
-                         thumbnail=get_thumb('tvshows', auto=True),
-                         fanart='https://s27.postimg.cc/iahczwgrn/series.png'
-                         ))
-
-    itemlist.append(Item(channel=item.channel,
-                         title="Alfabetico",
-                         action="letras",
-                         url=host,
-                         thumbnail=get_thumb('alphabet', auto=True),
-                         fanart='https://s17.postimg.cc/fwi1y99en/a-z.png'
-                         ))
-
-    itemlist.append(Item(channel=item.channel,
-                         title="Mas vistas",
-                         action="masvistas",
-                         url=host,
-                         thumbnail=get_thumb('more watched', auto=True),
-                         fanart='https://s9.postimg.cc/wmhzu9d7z/vistas.png'
-                         ))
-
-    itemlist.append(Item(channel=item.channel,
-                         title="Recomendadas",
-                         action="recomendadas",
-                         url=host,
-                         thumbnail=get_thumb('recomended', auto=True),
-                         fanart='https://s12.postimg.cc/s881laywd/recomendadas.png'
-                         ))
-
-    itemlist.append(Item(channel=item.channel,
-                         title="Ultimas Agregadas",
-                         action="ultimas",
-                         url=host, thumbnail=get_thumb('last', auto=True),
-                         fanart='https://s22.postimg.cc/cb7nmhwv5/ultimas.png'
-                         ))
-
-    itemlist.append(Item(channel=item.channel,
-                         title="Buscar",
-                         action="search",
-                         url='http://mundoflv.com/?s=',
-                         thumbnail=get_thumb('search', auto=True),
-                         fanart='https://s30.postimg.cc/pei7txpa9/buscar.png'
-                         ))
-
-    if autoplay.context:
-        autoplay.show_option(item.channel, itemlist)
-
-    return itemlist
-
-
-def todas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-
-    patron = 'class="item"><a href="(.*?)" title="(.*?)(?:\|.*?|\(.*?|- )(\d{4})(?:\)|-)".*?'
-    patron += '<div class="img">.*?'
-    patron += '<img src="([^"]+)" alt.*?>'
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle, scrapedyear, scrapedthumbnail in matches:
-        url = scrapedurl
-        title = scrapertools.decodeHtmlentities(scrapedtitle)
-        title = title.rstrip(' ')
-        thumbnail = scrapedthumbnail
-        year = scrapedyear
-        plot = ''
-
-        fanart = 'https://s32.postimg.cc/h1ewz9hhx/mundoflv.png'
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="temporadas",
-                 title=title,
-                 url=url,
-                 thumbnail=thumbnail,
-                 plot=plot,
-                 fanart=fanart,
-                 contentSerieName=title,
-                 infoLabels={'year': year},
-                 show=title,
-                 list_language=list_language,
-                 context=autoplay.context
-                 ))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    itemlist = fail_tmdb(itemlist)
-    # Paginacion
-    next_page_url = scrapertools.find_single_match(data, '<link rel="next" href="([^"]+)" />')
-
-    if next_page_url != "":
-        itemlist.append(Item(channel=item.channel,
-                             action="todas",
-                             title=">> Página siguiente",
-                             url=next_page_url,
-                             thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png'
-                             ))
-
-    return itemlist
-
-
-def letras(item):
-    thumbletras = {'0-9': 'https://s32.postimg.cc/drojt686d/image.png',
-                   '0 - 9': 'https://s32.postimg.cc/drojt686d/image.png',
-                   '#': 'https://s32.postimg.cc/drojt686d/image.png',
-                   'a': 'https://s32.postimg.cc/llp5ekfz9/image.png',
-                   'b': 'https://s32.postimg.cc/y1qgm1yp1/image.png',
-                   'c': 'https://s32.postimg.cc/vlon87gmd/image.png',
-                   'd': 'https://s32.postimg.cc/3zlvnix9h/image.png',
-                   'e': 'https://s32.postimg.cc/bgv32qmsl/image.png',
-                   'f': 'https://s32.postimg.cc/y6u7vq605/image.png',
-                   'g': 'https://s32.postimg.cc/9237ib6jp/image.png',
-                   'h': 'https://s32.postimg.cc/812yt6pk5/image.png',
-                   'i': 'https://s32.postimg.cc/6nbbxvqat/image.png',
-                   'j': 'https://s32.postimg.cc/axpztgvdx/image.png',
-                   'k': 'https://s32.postimg.cc/976yrzdut/image.png',
-                   'l': 'https://s32.postimg.cc/fmal2e9yd/image.png',
-                   'm': 'https://s32.postimg.cc/m19lz2go5/image.png',
-                   'n': 'https://s32.postimg.cc/b2ycgvs2t/image.png',
-                   'o': 'https://s32.postimg.cc/c6igsucpx/image.png',
-                   'p': 'https://s32.postimg.cc/jnro82291/image.png',
-                   'q': 'https://s32.postimg.cc/ve5lpfv1h/image.png',
-                   'r': 'https://s32.postimg.cc/nmovqvqw5/image.png',
-                   's': 'https://s32.postimg.cc/zd2t89jol/image.png',
-                   't': 'https://s32.postimg.cc/wk9lo8jc5/image.png',
-                   'u': 'https://s32.postimg.cc/w8s5bh2w5/image.png',
-                   'v': 'https://s32.postimg.cc/e7dlrey91/image.png',
-                   'w': 'https://s32.postimg.cc/fnp49k15x/image.png',
-                   'x': 'https://s32.postimg.cc/dkep1w1d1/image.png',
-                   'y': 'https://s32.postimg.cc/um7j3zg85/image.png',
-                   'z': 'https://s32.postimg.cc/jb4vfm9d1/image.png'}
-
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-
-    patron = '<li><a.*?href="([^"]+)">([^<]+)<\/a><\/li>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        title = scrapedtitle
-        if scrapedtitle.lower() in thumbletras:
-            thumbnail = thumbletras[scrapedtitle.lower()]
-        else:
-            thumbnail = ''
-        plot = ""
-        fanart = item.fanart
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="todas",
-                 title=title,
-                 url=url,
-                 thumbnail=thumbnail,
-                 plot=plot,
-                 fanart=fanart,
-                 contentSerieName=title
-                 ))
-
-    return itemlist
-
-
-def fail_tmdb(itemlist):
-    logger.info()
-    realplot = ''
-    for item in itemlist:
-        if item.infoLabels['plot'] == '':
-            data = httptools.downloadpage(item.url).data
-            if item.thumbnail == '':
-                item.thumbnail = scrapertools.find_single_match(data, patrones[0])
-            realplot = scrapertools.find_single_match(data, patrones[1])
-            item.plot = scrapertools.remove_htmltags(realplot)
-    return itemlist
-
-
-def masvistas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-
-    patron = '<li><a href="(?!http:\/\/mundoflv\.com\/tag\/)(.*?)">.*?'
-    patron += 'div class="im">.*?'
-    patron += '<img src=".*?" alt="(.*?)(?:\|.*?|\(.*?|- )(\d{4})|-" \/>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle, scrapedyear in matches:
-        url = scrapedurl
-        title = scrapedtitle
-        fanart = item.fanart
-        contentSerieName = scrapedtitle
-        year = scrapedyear
-        thumbnail = ''
-        plot = 'nada'
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="temporadas",
-                 title=title,
-                 url=url,
-                 thumbnail=thumbnail,
-                 plot=plot,
-                 fanart=fanart,
-                 contentSerieName=contentSerieName,
-                 infoLabels={'year': year},
-                 context=autoplay.context
-                 ))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    itemlist = fail_tmdb(itemlist)
-    return itemlist
-
-
-def recomendadas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    realplot = ''
-    patron = '<li><A HREF="([^"]+)"><.*?>Ver ([^<]+)<\/A><\/li>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        data = httptools.downloadpage(scrapedurl).data
-        thumbnail = scrapertools.get_match(data, '<meta property="og:image" content="([^"]+)".*?>')
-        realplot = scrapertools.find_single_match(data, '\/><\/a>([^*]+)<p><\/p>.*')
-        plot = scrapertools.remove_htmltags(realplot)
-        title = scrapedtitle.replace('online', '')
-        title = scrapertools.decodeHtmlentities(title)
-        fanart = item.fanart
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="temporadas",
-                 title=title,
-                 url=url,
-                 thumbnail=thumbnail,
-                 plot=plot,
-                 fanart=fanart,
-                 contentSerieName=title,
-                 context=autoplay.context
-                 ))
-
-    return itemlist
-
-
-def ultimas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    realplot = ''
-    patron = '<li><A HREF="([^"]+)"> <.*?>Ver ([^<]+)<\/A><\/li>'
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        data = httptools.downloadpage(scrapedurl).data
-        thumbnail = scrapertools.get_match(data, '<meta property="og:image" content="([^"]+)".*?>')
-        realplot = scrapertools.find_single_match(data, '\/><\/a>([^*]+)<p><\/p>.*')
-        plot = scrapertools.remove_htmltags(realplot)
-        plot = ""
-        title = scrapedtitle.replace('online', '')
-        title = scrapertools.decodeHtmlentities(title)
-        fanart = item.fanart
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="idioma",
-                 title=title,
-                 url=url,
-                 thumbnail=thumbnail,
-                 plot=plot,
-                 fanart=fanart,
-                 contentSerieName=title,
-                 context=autoplay.context
-                 ))
-
-    return itemlist
-
-
-def temporadas(item):
-    logger.info()
-
-    itemlist = []
-    templist = []
-    data = httptools.downloadpage(item.url).data
-    data = data.replace ('"',"'")
-    realplot = ''
-    patron = "<button class='classnamer' onclick='javascript: mostrarcapitulos.*?blank'>([^<]+)<\/button>"
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    serieid = scrapertools.find_single_match(data, "data-nonce='(.*?)'")
-    item.thumbnail = item.thumbvid
-    infoLabels = item.infoLabels
-    for scrapedtitle in matches:
-        url = 'http://mundoflv.com/wp-content/themes/wpRafael/includes/capitulos.php?serie=' + serieid + \
-              '&temporada=' + scrapedtitle
-        title = 'Temporada ' + scrapertools.decodeHtmlentities(scrapedtitle)
-        contentSeasonNumber = scrapedtitle
-        thumbnail = item.thumbnail
-        realplot = scrapertools.find_single_match(data, '\/><\/a>([^*]+)<p><\/p>.*')
-        plot = ''
-        fanart = ''
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="episodiosxtemp",
-                 title=title,
-                 fulltitle=item.title,
-                 url=url,
-                 thumbnail=thumbnail,
-                 plot=plot,
-                 fanart=fanart,
-                 extra1=item.extra1,
-                 contentSerieName=item.contentSerieName,
-                 contentSeasonNumber=contentSeasonNumber,
-                 infoLabels={'season': contentSeasonNumber},
-                 context=item.context
-                 ))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    if config.get_videolibrary_support() and len(itemlist) > 0:
-        itemlist.append(
-            Item(channel=item.channel,
-                 title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]',
-                 url=item.url,
-                 action="add_serie_to_library",
-                 extra="episodios",
-                 contentSerieName=item.contentSerieName,
-                 extra1=item.extra1
-                 ))
-
-    return itemlist
-
-
-def episodios(item):
-    logger.info()
-    itemlist = []
-    templist = temporadas(item)
-    for tempitem in templist:
-        itemlist += episodiosxtemp(tempitem)
-
-    return itemlist
-
-
-def episodiosxtemp(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = data.replace('"', "'")
-    patron = "<button class='classnamer' onclick='javascript: mostrarenlaces\(([^\)]+)\).*?<"
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedtitle in matches:
-        item.url = item.url.replace("&sr", "")
-        item.url = item.url.replace("capitulos", "enlaces")
-        url = item.url + '&capitulo=' + scrapedtitle
-        contentEpisodeNumber = scrapedtitle
-        title = item.contentSerieName + ' ' + item.contentSeasonNumber + 'x' + contentEpisodeNumber
-        thumbnail = item.thumbnail
-        plot = ''
-        infoLabels = item.infoLabels
-        infoLabels['episode'] = contentEpisodeNumber
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="findvideos",
-                 title=title,
-                 fulltitle=item.fulltitle,
-                 url=url,
-                 thumbnail=thumbnail,
-                 plot=plot,
-                 extra1=item.extra1,
-                 idioma='',
-                 contentSerieName=item.contentSerieName,
-                 contentSeasonNumber=item.contentSeasonNumber,
-                 infoLabels=infoLabels,
-                 show=item.contentSerieName,
-                 list_language=list_language,
-                 context=item.context
-                 ))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    return itemlist
-
-
-def idioma(item):
-    logger.info()
-
-    itemlist = []
-    thumbvid = item.thumbnail
-    itemlist.append(
-        Item(channel=item.channel,
-             title="Latino",
-             action="temporadas",
-             url=item.url,
-             thumbnail=thumbmx,
-             fanart='',
-             extra1='la',
-             fulltitle=item.title,
-             thumbvid=thumbvid,
-             contentSerieName=item.contentSerieName,
-             infoLabels=item.infoLabels,
-             language='la'
-             ))
-
-    itemlist.append(
-        Item(channel=item.channel,
-             title="Español",
-             action="temporadas",
-             url=item.url,
-             thumbnail=thumbes,
-             fanart='',
-             extra1='es',
-             fulltitle=item.title,
-             thumbvid=thumbvid,
-             contentSerieName=item.contentSerieName,
-             language='es'
-             ))
-
-    itemlist.append(
-        Item(channel=item.channel,
-             title="Subtitulado",
-             action="temporadas",
-             url=item.url,
-             thumbnail=thumbsub,
-             fanart='',
-             extra1='sub',
-             fulltitle=item.title,
-             thumbvid=thumbvid,
-             contentSerieName=item.contentSerieName,
-             language='sub'
-             ))
-
-    itemlist.append(
-        Item(channel=item.channel,
-             title="Original",
-             action="temporadas",
-             url=item.url,
-             thumbnail=thumben,
-             fanart='',
-             extra1='en',
-             fulltitle=item.title,
-             thumbvid=thumbvid,
-             contentSerieName=item.contentSerieName,
-             language='en'
-             ))
-
-    itemlist.append(
-        Item(channel=item.channel,
-             title="Original Subtitulado en Ingles",
-             action="temporadas",
-             url=item.url,
-             thumbnail=thumben,
-             fanart='',
-             extra1='vosi',
-             fulltitle=item.title,
-             thumbvid=thumbvid,
-             contentSerieName=item.contentSerieName,
-             language='vosi'
-             ))
-
-    itemlist.append(
-        Item(channel=item.channel,
-             title="Todo",
-             action="temporadas",
-             url=item.url,
-             thumbnail=thumbtodos,
-             fanart='',
-             extra1='all',
-             fulltitle=item.title,
-             thumbvid=thumbvid,
-             contentSerieName=item.contentSerieName,
-             language='all'
-             ))
-
-    return itemlist
-
-
-def busqueda(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-
-    patron = '<img class=.*?src="([^"]+)" alt="(.*?)(?:\|.*?|\(.*?|")>.*?h3><a href="(.*?)".*?class="year">(' \
-             '.*?)<\/span>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for scrapedthumbnail, scrapedtitle, scrapedurl, scrapedyear in matches:
-        url = scrapedurl
-        title = scrapertools.decodeHtmlentities(scrapedtitle)
-        thumbnail = scrapedthumbnail
-        plot = ''
-        year = scrapedyear
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="idioma",
-                 title=title,
-                 fulltitle=title,
-                 url=url,
-                 thumbnail=thumbnail,
-                 plot=plot,
-                 contentSerieName=title,
-                 infoLabels={'year': year},
-                 context=autoplay.context
-                 ))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    itemlist = fail_tmdb(itemlist)
-
-    # Paginacion
-    next_page_url = scrapertools.find_single_match(data,
-                                                   "<a rel='nofollow' class=previouspostslink' href='(["
-                                                   "^']+)'>Siguiente &rsaquo;</a>")
-    if next_page_url != "":
-        item.url = next_page_url
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="busqueda",
-                 title=">> Página siguiente",
-                 url=next_page_url,
-                 thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png'
-                 ))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = item.url + texto
-    if texto != '':
-        return busqueda(item)
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    patron = 'href="([^"]+)".*?domain=.*?>([^<]+).*?gold">([^<]+)<'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedserver, scrapedidioma in matches:
-        url = scrapedurl
-        idioma = audio[scrapedidioma]
-        server = scrapedserver.strip(' ')
-        if server == 'streamin':
-            server = 'streaminto'
-        title = item.contentSerieName + ' ' + str(item.contentSeasonNumber) + 'x' + str(
-            item.contentEpisodeNumber) + ' ' + idioma + ' (' + server + ')'
-
-        new_item = item.clone(title=title,
-                              url=url,
-                              action="play",
-                              language=IDIOMAS[scrapedidioma],
-                              server=server,
-                              quality='default',
-                              fulltitle=item.ContentSeriename,
-                              )
-
-        # Requerido para FilterTools
-
-        itemlist = filtertools.get_link(itemlist, new_item, list_language)
-
-    import os
-    for videoitem in itemlist:
-        videoitem.infoLabels = item.infoLabels
-        videoitem.thumbnail = os.path.join(config.get_runtime_path(), "resources", "media", "servers",
-                                           "server_%s.png" % videoitem.server)
-
-    # Requerido para AutoPlay
-
-    autoplay.start(itemlist, item)
-
-    return itemlist
-
-
-def play(item):
-    logger.info()
-
-    data = httptools.downloadpage(item.url).data
-    if item.server not in ['streamplay','streame', 'clipwatching', 'vidoza']:
-        url = scrapertools.find_single_match(data, '<(?:IFRAME|iframe).*?(?:SRC|src)=*([^ ]+) (?!style|STYLE)')
-    else:
-        url = scrapertools.find_single_match(data, '<meta http-equiv="refresh" content="0; url=([^"]+)">')
-
-    itemlist = servertools.find_video_items(data=url)
-    for videoitem in itemlist:
-        videoitem.infoLabels = item.infoLabels
-        videoitem.title = item.title
-        videoitem.thumbnail = videoitem.infoLabels['thumbnail']
-
-    return itemlist
diff --git a/plugin.video.alfa/channels/peliculasdk.json b/plugin.video.alfa/channels/mundopelis.json
similarity index 69%
rename from plugin.video.alfa/channels/peliculasdk.json
rename to plugin.video.alfa/channels/mundopelis.json
index beacc736..a39c05cb 100644
--- a/plugin.video.alfa/channels/peliculasdk.json
+++ b/plugin.video.alfa/channels/mundopelis.json
@@ -1,49 +1,50 @@
-{
-  "id": "peliculasdk",
-  "name": "PeliculasDK",
-  "active": true,
-  "adult": false,
-  "language": ["cast"],
-  "thumbnail": "http://s29.postimg.cc/wzw749oon/pldklog.jpg",
-  "banner": "peliculasdk.png",
-  "categories": [
-    "movie", 
-    "vos", 
-    "adult"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "include_in_newest_castellano",
-      "type": "bool",
-      "label": "Incluir en Novedades - Castellano",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "comprueba_enlaces",
-      "type": "bool",
-      "label": "Verificar si los enlaces existen",
-      "default": false,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "comprueba_enlaces_num",
-      "type": "list",
-      "label": "Número de enlaces a verificar",
-      "default": 1,
-      "enabled": true,
-      "visible": "eq(-1,true)",
-      "lvalues": [ "5", "10", "15", "20" ]
-    }
-  ]
-}
+{
+  "id": "mundopelis",
+  "name": "mundopelis",
+  "active": true,
+  "adult": false,
+  "language": ["vos"],
+  "thumbnail": "https://mundopelis.xyz/images/logo.png",
+  "banner": "",
+  "categories": [
+    "movie",
+    "vos"
+  ],
+  "settings": [
+    {
+      "id": "modo_grafico",
+      "type": "bool",
+      "label": "Buscar información extra",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    } 
+  ]
+}
+
+
diff --git a/plugin.video.alfa/channels/mundopelis.py b/plugin.video.alfa/channels/mundopelis.py
new file mode 100644
index 00000000..3e3e8fca
--- /dev/null
+++ b/plugin.video.alfa/channels/mundopelis.py
@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import re, urllib, urlparse
+
+from channels import autoplay
+from platformcode import config, logger, platformtools
+from core.item import Item
+from core import httptools, scrapertools, jsontools, tmdb
+from core import servertools
+from channels import filtertools
+
+host = 'https://mundopelis.xyz'
+
+list_language = []
+list_servers = ['Rapidvideo', 'Vidoza', 'Openload', 'Youtube']
+list_quality = []
+__channel__='mundopelis'
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__)
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__)
+try:
+    __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
+except:
+    __modo_grafico__ = True
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    autoplay.init(item.channel, list_servers, list_quality)
+    
+    itemlist.append(item.clone(title="Novedades" , action="lista", url= host + "/todos-los-estrenos", first=0))
+    itemlist.append(item.clone(title="Categorias" , action="categorias", url= host))
+    itemlist.append(item.clone(title="Buscar", action="search"))
+    
+    itemlist.append(item.clone(title="Configurar canal...", text_color="gold", action="configuracion", folder=False))
+    autoplay.show_option(item.channel, itemlist)
+    return itemlist
+
+
+def configuracion(item):
+    ret = platformtools.show_channel_settings()
+    platformtools.itemlist_refresh()
+    return ret
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/?option=com_spmoviedb&view=searchresults&searchword=%s&type=movies&Itemid=544" % texto
+    item.first = 0
+    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
+    patron  = '<a class="btn btn-xs btn-primary" href="/index.php([^"]+)".*?</i> ([^"]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        url = urlparse.urljoin(item.url,scrapedurl)
+        title = scrapedtitle 
+        itemlist.append(item.clone(channel=item.channel, action="lista", title=title , url=url, first=0,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
+    return itemlist
+
+
+def lista(item):
+    logger.info()
+    itemlist = []
+    
+    next = False
+    data = httptools.downloadpage(item.url).data
+    patron  = '<div class="movie-poster">.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<a href="/index.php([^"]+)"><h4 class="movie-title">([^<]+)</h4>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    
+    first = item.first
+    last = first+20
+    if last > len(matches):
+        last = len(matches)
+        next = True
+    scrapertools.printMatches(matches)
+    for scrapedthumbnail, scrapedurl, scrapedtitle in matches[first:last]:
+        scrapedyear = "-"
+        title = scrapedtitle.replace(" (2018)", "")
+        url = urlparse.urljoin(item.url,scrapedurl)
+        itemlist.append(item.clone(channel=item.channel, action = 'findvideos', title=title, contentTitle = scrapedtitle,
+                                   url=url, thumbnail=scrapedthumbnail, infoLabels={'year':scrapedyear} ))
+    tmdb.set_infoLabels(itemlist, True)
+    # Paginación    
+    if not next:
+        url_next_page = item.url
+        first = last
+    else:
+        url_next_page = scrapertools.find_single_match(data, '<a title="Siguiente" href="([^"]+)"')
+        url_next_page = urlparse.urljoin(item.url,url_next_page)
+        first = 0
+    if url_next_page:
+        itemlist.append(item.clone(title="Siguiente >>", url=url_next_page, action='lista', first=first))    
+    return itemlist
+
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron = '<(?:iframe|IFRAME).*?(?:src|SRC)="([^"]+)"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for url in matches:
+        lang = "VOSE"
+        if not config.get_setting('unify'):
+            title = ' (%s)' % (lang)
+        else:
+            title = ''
+        if url != '':  
+            itemlist.append(item.clone(action="play", title='%s'+title, url=url, language=lang ))
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+
+    # Requerido para Filtrar enlaces
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+
+
+    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra !='findvideos' and not "/episodios/" in item.url :
+        itemlist.append(Item(channel=item.channel, action="add_pelicula_to_library", 
+                             title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+                             extra="findvideos", contentTitle=item.contentTitle)) 
+    return itemlist
+
+
diff --git a/plugin.video.alfa/channels/newpct1.json b/plugin.video.alfa/channels/newpct1.json
index ae11a835..cb4e2a21 100644
--- a/plugin.video.alfa/channels/newpct1.json
+++ b/plugin.video.alfa/channels/newpct1.json
@@ -93,7 +93,7 @@
       "id": "clonenewpct1_channels_list",
       "type": "text",
       "label": "Lista de clones de NewPct1 y orden de uso",
-      "default": "('1', 'descargas2020', 'http://descargas2020.com/', 'movie, tvshow, season, episode', ''), ('1', 'tumejortorrent', 'http://tumejortorrent.com/', 'movie, tvshow, season, episode', ''), ('1', 'torrentrapid', 'http://torrentrapid.com/', 'movie, tvshow, season, episode', 'serie_episodios'), ('1', 'pctnew', 'http://pctnew.com/', 'movie, tvshow, season, episode', ''), ('1', 'torrentlocura', 'http://torrentlocura.com/', 'movie, tvshow, season, episode', ''), ('1', 'tvsinpagar', 'http://www.tvsinpagar.com/', 'tvshow, season, episode', ''), ('1', 'planetatorrent', 'http://planetatorrent.com/', 'movie, tvshow, season, episode', ''), ('1', 'mispelisyseries', 'http://mispelisyseries.com/', 'movie', 'search, listado_busqueda')",
+      "default": "('1', 'descargas2020', 'https://descargas2020.com/', 'movie, tvshow, season, episode', ''), ('1', 'tumejortorrent', 'https://tumejortorrent.com/', 'movie, tvshow, season, episode', ''), ('1', 'torrentrapid', 'https://torrentrapid.com/', 'movie, tvshow, season, episode', 'serie_episodios'), ('1', 'pctnew', 'https://pctnew.com/', 'movie, tvshow, season, episode', ''), ('1', 'torrentlocura', 'http://torrentlocura.com/', 'movie, tvshow, season, episode', ''), ('1', 'tvsinpagar', 'http://www.tvsinpagar.com/', 'tvshow, season, episode', ''), ('1', 'planetatorrent', 'http://planetatorrent.com/', 'movie, tvshow, season, episode', ''), ('1', 'mispelisyseries', 'http://mispelisyseries.com/', 'movie', 'search, listado_busqueda')",
       "enabled": true,
       "visible": false
     },
diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py
index a55f0871..662351ba 100644
--- a/plugin.video.alfa/channels/newpct1.py
+++ b/plugin.video.alfa/channels/newpct1.py
@@ -7,6 +7,7 @@ import urlparse
 import datetime
 import ast
 import random
+import traceback
 
 from channelselector import get_thumb
 from core import httptools
@@ -172,7 +173,7 @@ def submenu(item):
     except:
         pass
         
-    patron = '<li><a\s?class="[^"]+"\s?href="http:[^"]+"><i\s?class=.*><\/i>.*Inicio<\/a><\/li>(.+)<\/ul>\s?<\/nav>'
+    patron = '<li><a\s*class="[^"]+"\s*href="http.*:[^"]+"><i\s*class=.*><\/i>.*Inicio<\/a><\/li>(.+)<\/ul>\s*<\/nav>'
     #Verificamos si se ha cargado una página, y si además tiene la estructura correcta
     if not data or not scrapertools.find_single_match(data, patron):
         item = generictools.web_intervenida(item, data)                         #Verificamos que no haya sido clausurada
@@ -264,6 +265,7 @@ def submenu_novedades(item):
     itemlist = []
     itemlist_alt = []
     item.extra2 = ''
+    thumb_buscar = get_thumb("search.png")
     
     #Renombramos el canal al nombre de clone inicial desde la URL
     item.channel_host = host
@@ -327,6 +329,9 @@ def submenu_novedades(item):
                 item.post = "date=%s" % value
                 itemlist.append(item.clone(action="listado_busqueda", title=title, url=item.url, post=item.post))
     
+    itemlist.append(
+        Item(channel=item.channel, action="search", title="Buscar", url=item.channel_host + "buscar", thumbnail=thumb_buscar, category=item.category, channel_host=item.channel_host))
+    
     itemlist.append(item.clone(action='', title="[COLOR yellow]Lo Último en la Categoría:[/COLOR]"))
     for value, title in matches:
         if value.isdigit():
@@ -696,8 +701,12 @@ def listado(item):
         
         #Guardamos el resto de variables del vídeo
         item_local.url = scrapedurl
+        if not item_local.url.startswith("http"):                           #Si le falta el http.: lo ponemos
+            item_local.url = scrapertools.find_single_match(item_local.channel_host, '(\w+:)//') + item_local.url
         item_local.thumbnail = scrapedthumbnail
-        item_local.contentThumbnail = scrapedthumbnail
+        if not item_local.thumbnail.startswith("http"):                     #Si le falta el http.: lo ponemos
+            item_local.thumbnail = scrapertools.find_single_match(item_local.channel_host, '(\w+:)//') + item_local.thumbnail
+        item_local.contentThumbnail = item_local.thumbnail
 
         #Guardamos el año que puede venir en la url, por si luego no hay resultados desde TMDB
         year = ''
@@ -1004,7 +1013,7 @@ def listado_busqueda(item):
             if not data_serie:                                                  #Si no ha logrado encontrar nada, salimos
                 title_subs += ["ERR"]
             
-            elif item_local.channel_alt:                                                    #Si ha habido fail-over, lo comento
+            elif item_local.channel_alt:                                        #Si ha habido fail-over, lo comento
                 url = url.replace(item_local.channel_alt, item_local.category.lower())
                 title_subs += ["ALT"]
 
@@ -1025,8 +1034,10 @@ def listado_busqueda(item):
                     title_subs += ["Episodio %sx%s" % (scrapertools.find_single_match(url, '\/temp.*?-(\d+)-?\/cap.*?-(\d+(?:-al-\d+)?)-?\/'))]
                     url = item_local.url
             except:
-                pass
+                logger.error(traceback.format_exc())
                 
+            #logger.debug(item_local.url)
+            
         if item.extra == "novedades" and "/serie" in url:
             if not item_local.url or episodio_serie == 0:
                 item_local.url = url
@@ -1200,8 +1211,12 @@ def listado_busqueda(item):
         
         #Guardamos el resto de variables del vídeo
         item_local.url = url
+        if not item_local.url.startswith("http"):                           #Si le falta el http.: lo ponemos
+            item_local.url = scrapertools.find_single_match(item_local.channel_host, '(\w+:)//') + item_local.url
         item_local.thumbnail = scrapedthumbnail
-        item_local.contentThumbnail = scrapedthumbnail
+        if not item_local.thumbnail.startswith("http"):                     #Si le falta el http.: lo ponemos
+            item_local.thumbnail = scrapertools.find_single_match(item_local.channel_host, '(\w+:)//') + item_local.thumbnail
+        item_local.contentThumbnail = item_local.thumbnail
 
         #Guardamos el año que puede venir en la url, por si luego no hay resultados desde TMDB
         try:
@@ -1311,7 +1326,7 @@ def findvideos(item):
     #Renombramos el canal al nombre de clone elegido.  Actualizados URL
     host = scrapertools.find_single_match(item.url, '(http.?\:\/\/(?:www.)?\w+\.\w+\/)')
     item.channel_host = host
-    item.category = host.capitalize()
+    item.category = scrapertools.find_single_match(item.url, 'http.?\:\/\/(?:www.)?(\w+)\.\w+\/').capitalize()
     
     verify_fo = True                                                #Verificamos si el clone a usar está activo
     item, data = generictools.fail_over_newpct1(item, verify_fo)
@@ -1430,9 +1445,9 @@ def findvideos(item):
         data = data.replace("$!", "#!").replace("'", "\"").replace("ñ", "ñ").replace("//pictures", "/pictures")
         url_servidores = item.url
         category_servidores = item.category
-        data_servidores = data                                                  #salvamos data para verificar servidores, si es necesario
+        data_servidores = data                                  #salvamos data para verificar servidores, si es necesario
         data_servidores_stat = False
-    except:                                                                     #La web no responde.  Probemos las urls de emergencia
+    except:                                                     #La web no responde.  Probemos las urls de emergencia
         pass
     
     patron = 'class="btn-torrent">.*?window.location.href = "(.*?)";'           #Patron para .torrent
@@ -1441,8 +1456,12 @@ def findvideos(item):
         patron_alt = '<a href="([^"]+)"\s?title="[^"]+"\s?class="btn-torrent"'  #Patron para .torrent (planetatorrent)
         if scrapertools.find_single_match(data, patron):
             patron = patron_alt
+    url_torr = scrapertools.find_single_match(data, patron)
+    if not url_torr.startswith("http"):                                         #Si le falta el http.: lo ponemos
+        url_torr = scrapertools.find_single_match(item.channel_host, '(\w+:)//') + url_torr
+    
     #Verificamos si se ha cargado una página, y si además tiene la estructura correcta
-    if not data or not scrapertools.find_single_match(data, patron) or not videolibrarytools.verify_url_torrent(scrapertools.find_single_match(data, patron)):                                                             # Si no hay datos o url, error
+    if not data or not scrapertools.find_single_match(data, patron) or not videolibrarytools.verify_url_torrent(url_torr):                                                                            # Si no hay datos o url, error
         item = generictools.web_intervenida(item, data)                         #Verificamos que no haya sido clausurada
         if item.intervencion:                                                   #Sí ha sido clausurada judicialmente
             item, itemlist = generictools.post_tmdb_findvideos(item, itemlist)  #Llamamos al método para el pintado del error
@@ -1462,7 +1481,7 @@ def findvideos(item):
             #Si no hay datos consistentes, llamamos al método de fail_over para que encuentre un canal que esté activo y pueda gestionar el vídeo
             item, data = generictools.fail_over_newpct1(item, patron_mult)
 
-    if not data:                                                            #Si no ha logrado encontrar nada, verificamos si hay servidores
+    if not data:                                            #Si no ha logrado encontrar nada, verificamos si hay servidores
         cnt_servidores = 0
         item.category = category_servidores                                     #restauramos valores originales
         item.url = url_servidores
@@ -1474,8 +1493,8 @@ def findvideos(item):
         enlaces_ver = re.compile(patron, re.DOTALL).findall(data_servidores)
         enlaces_descargar = enlaces_ver
         
-        for logo, servidor, idioma, calidad, enlace, title in enlaces_ver:          #buscamos enlaces de servidores de ver-online
-            if ver_enlaces_veronline == 0:                                          #Si no se quiere Ver Online, se sale del bloque
+        for logo, servidor, idioma, calidad, enlace, title in enlaces_ver:  #buscamos enlaces de servidores de ver-online
+            if ver_enlaces_veronline == 0:                                  #Si no se quiere Ver Online, se sale del bloque
                 break
             if "ver" in title.lower():
                 cnt_servidores += 1
@@ -1484,13 +1503,13 @@ def findvideos(item):
             item, data_servidores = generictools.fail_over_newpct1(item, patron)    #intentamos recuperar servidores
             
             #Miramos si ha servidores
-            if not data_servidores:                                                 #Si no ha logrado encontrar nada nos vamos
+            if not data_servidores:                                         #Si no ha logrado encontrar nada nos vamos
                 itemlist.append(item.clone(action='', title="[COLOR yellow]" + item.channel.capitalize() + '[/COLOR]: Ningún canal NewPct1 activo'))    
                 itemlist.append(item.clone(action='', title=item.category + ': ERROR 01: FINDVIDEOS:.  La Web no responde o la URL es erronea. Si la Web está activa, reportar el error con el log'))
                 if item.videolibray_emergency_urls:
                     return item
                 else:
-                    return itemlist                                     #si no hay más datos, algo no funciona, pintamos lo que tenemos
+                    return itemlist                         #si no hay más datos, algo no funciona, pintamos lo que tenemos
         
         data = data_servidores                                                      #restauramos los datos
         data_servidores_stat = True                                                 #Marcamos como que los hemos usado
@@ -1502,6 +1521,9 @@ def findvideos(item):
     patron = 'class="btn-torrent">.*?window.location.href = "(.*?)";'               #Patron para .torrent
     if not scrapertools.find_single_match(data, patron):
         patron = '<a href="([^"]+)"\s?title="[^"]+"\s?class="btn-torrent"'          #Patron para .torrent (planetatorrent)
+    url_torr = scrapertools.find_single_match(data, patron)
+    if not url_torr.startswith("http"):                                             #Si le falta el http.: lo ponemos
+        url_torr = scrapertools.find_single_match(item.channel_host, '(\w+:)//') + url_torr
     
     #buscamos el tamaño del .torrent
     size = scrapertools.find_single_match(data, '<div class="entry-left".*?><a href=".*?span class=.*?>Size:<\/strong>?\s(\d+?\.?\d*?\s\w[b|B])<\/span>')
@@ -1510,8 +1532,8 @@ def findvideos(item):
     size = size.replace(".", ",")                                                   #sustituimos . por , porque Unify lo borra
     if not size:
         size = scrapertools.find_single_match(item.quality, '\s?\[(\d+.?\d*?\s?\w\s?[b|B])\]')
-    if not size and not item.armagedon:
-        size = generictools.get_torrent_size(scrapertools.find_single_match(data, patron))  #Buscamos el tamaño en el .torrent
+    if not size and not item.armagedon and not item.videolibray_emergency_urls:
+        size = generictools.get_torrent_size(url_torr)                              #Buscamos el tamaño en el .torrent
     if size:
         item.title = re.sub(r'\s\[\d+,?\d*?\s\w[b|B]\]', '', item.title)            #Quitamos size de título, si lo traía
         item.title = '%s [%s]' % (item.title, size)                                 #Agregamos size al final del título
@@ -1527,13 +1549,13 @@ def findvideos(item):
     
     # Verificamos la url torrent o usamos la de emergencia
     if not item.armagedon:
-        item_local.url = scrapertools.find_single_match(data, patron)
+        item_local.url = url_torr
         if item_local.url == 'javascript:;': 
             item_local.url = ''                                                         #evitamos url vacías
         item_local.url = item_local.url.replace(" ", "%20")                             #sustituimos espacios por %20, por si acaso
     
         if item_local.url and item.emergency_urls:                                      #la url no está verificada
-            item_local.torrent_alt = item.emergency_urls[0][0]                          #Guardamos la url del .Torrent ALTERNATIVA
+            item_local.torrent_alt = item.emergency_urls[0][0]              #Guardamos la url del .Torrent ALTERNATIVA
         
     if not item_local.url:                                                              #error en url?
         logger.error("ERROR 02: FINDVIDEOS: El archivo Torrent no existe o ha cambiado la estructura de la Web " + " / PATRON: " + patron + " / DATA: " + data)
@@ -1877,11 +1899,11 @@ def episodios(item):
         season_display = item.from_num_season_colapse
 
     # Obtener la información actualizada de la Serie.  TMDB es imprescindible para Videoteca
-    if not item.infoLabels['tmdb_id']:
-        try:
-            tmdb.set_infoLabels(item, True)                                 #TMDB de cada Temp
-        except:
-            pass
+    #if not item.infoLabels['tmdb_id']:
+    try:
+        tmdb.set_infoLabels(item, True)                                     #TMDB de cada Temp
+    except:
+        pass
         
     modo_ultima_temp_alt = modo_ultima_temp
     if item.ow_force == "1":                                                #Si hay un traspaso de canal o url, se actualiza todo 
@@ -1965,6 +1987,7 @@ def episodios(item):
         num_temporadas_flag = True
     else:
         num_temporadas_flag = False
+
     for page in list_pages:                                                     #Recorre la lista de páginas
         if not list_pages:
             break
@@ -2007,7 +2030,12 @@ def episodios(item):
             
             item_local = item.clone()                                           #Creamos copia local de Item por episodio
             item_local.url = url
-            item_local.contentThumbnail = thumb
+            if not item_local.url.startswith("http"):                           #Si le falta el http.: lo ponemos
+                item_local.url = scrapertools.find_single_match(item_local.channel_host, '(\w+:)//') + item_local.url
+            item_local.thumbnail = thumb
+            if not item_local.thumbnail.startswith("http"):                     #Si le falta el http.: lo ponemos
+                item_local.thumbnail = scrapertools.find_single_match(item_local.channel_host, '(\w+:)//') + item_local.thumbnail
+            item_local.contentThumbnail = item_local.thumbnail
             estado = True                                                       #Buena calidad de datos por defecto
 
             if "<span" in info:                                                 # new style
@@ -2068,7 +2096,7 @@ def episodios(item):
                 itemlist.append(item.clone(action='', title=item.category + ': ERROR 02: EPISODIOS: Ha cambiado la estructura de la Web.  Reportar el error con el log'))
                 break                                   #si no hay más datos, algo no funciona, pintamos lo que tenemos
 
-            #Si no se encuentran valores, pero poner lo básico
+            #Si no se encuentran valores, se pone lo básico
             if match['season'] is None or match['season'] == "0" or not match['season']: match['season'] = season
             if match['episode'] is None: match['episode'] = "0"
             try:
@@ -2078,6 +2106,7 @@ def episodios(item):
                 if match['season'] > max_temp:
                     logger.error("ERROR 07: EPISODIOS: Error en número de Temporada o Episodio: " + " / TEMPORADA/EPISODIO: " + str(match['season']) + " / " + str(match['episode']) + " / NUM_TEMPORADA: " + str(max_temp) + " / " + str(season) + " / MATCHES: " + str(matches))
                     match['season'] = scrapertools.find_single_match(item_local.url, '\/[t|T]emp\w+-*(\d+)\/')
+                    num_temporadas_flag = False
                     if not match['season']:
                         match['season'] = season_alt
                     else:
@@ -2098,7 +2127,7 @@ def episodios(item):
                 if season > max_temp:
                     max_temp = season
                     
-            if match['quality'] and not item_local.quality and estado == True:
+            if match['quality'] and estado == True:
                 item_local.quality = match['quality']                           #Si hay quality se coge, si no, la de la serie
                 item_local.quality = item_local.quality.replace("ALTA DEFINICION", "HDTV")
             
diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py
index 919a5ee5..0a7417c8 100644
--- a/plugin.video.alfa/channels/news.py
+++ b/plugin.video.alfa/channels/news.py
@@ -534,7 +534,7 @@ def show_channels(item):
 def menu_opciones(item):
     itemlist = list()
     itemlist.append(Item(channel=item.channel, title=config.get_localized_string(60525),
-                         thumbnail=get_thumb("setting_0.png"),
+                         text_bold = True, thumbnail=get_thumb("setting_0.png"),
                          folder=False))
     itemlist.append(Item(channel=item.channel, action="setting_channel", extra="peliculas", title=config.get_localized_string(60526),
                          thumbnail=get_thumb("channels_movie.png"),
diff --git a/plugin.video.alfa/channels/pandamovie.py b/plugin.video.alfa/channels/pandamovie.py
index da454282..36e327d2 100644
--- a/plugin.video.alfa/channels/pandamovie.py
+++ b/plugin.video.alfa/channels/pandamovie.py
@@ -1,25 +1,27 @@
 # -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import jsontools as json
+# ------------------------------------------------------------
+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 tmdb
 
-host= 'https://pandamovies.pw'
+host = 'https://pandamovies.pw'
 
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/list-movies"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/list-movies"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/list-movies"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    itemlist.append(Item(channel=item.channel, title="Peliculas", action="lista", url=host + "/movies"))
+    itemlist.append(Item(channel=item.channel, title="Categorias", action="categorias", url=host + "/movies"))
+    itemlist.append(Item(channel=item.channel, title="Canal", action="categorias", url=host + "/movies"))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
 
@@ -28,7 +30,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -37,43 +39,45 @@ def search(item, texto):
 
 
 def categorias(item):
-        itemlist = []
-        data = scrapertools.cache_page(item.url)
-        if item.title == "Categorias" :
-            data = scrapertools.get_match(data,'<a href="#">Genres</a>(.*?)</ul>')
-        else:
-            data = scrapertools.get_match(data,'<a href="#">Studios</a>(.*?)</ul>')
-        data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-        patron  = '<li><a title=".*?" href="([^"]+)">([^<]+)</a>'
-        matches = re.compile(patron,re.DOTALL).findall(data)
-        for scrapedurl,scrapedtitle in matches:
-            scrapedplot = ""
-            scrapedthumbnail = ""
-            scrapedurl = scrapedurl.replace("https:", "")
-            scrapedurl = "https:" + scrapedurl
-            itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-        return itemlist
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    if item.title == "Categorias":
+        data = scrapertools.get_match(data, '<a href="#">Genres</a>(.*?)</ul>')
+    else:
+        data = scrapertools.get_match(data, '<a href="#">Studios</a>(.*?)</ul>')
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron = '<a href="([^"]+)">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        scrapedurl = scrapedurl.replace("https:", "")
+        scrapedurl = "https:" + scrapedurl
+        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, plot=scrapedplot))
+    return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
-    patron = '<a class="clip-link" title="([^"]+)"  href="([^"]+)".*?'
-    patron += 'src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedtitle,scrapedurl,scrapedthumbnail in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
+    data = httptools.downloadpage(item.url).data
+    patron = '<div data-movie-id="\d+".*?'
+    patron += '<a href="([^"]+)".*?oldtitle="([^"]+)".*?'
+    patron += '<img src="([^"]+)".*?'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
+        url = urlparse.urljoin(item.url, scrapedurl)
         title = scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = title, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
-    if next_page_url =="":
-        next_page_url = scrapertools.find_single_match(data,'<a.*?href="([^"]+)" >Next &raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=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>')
+    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
-
diff --git a/plugin.video.alfa/channels/peliculasdk.py b/plugin.video.alfa/channels/peliculasdk.py
deleted file mode 100644
index 59be39bd..00000000
--- a/plugin.video.alfa/channels/peliculasdk.py
+++ /dev/null
@@ -1,293 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from core.scrapertools import decodeHtmlentities as dhe
-from platformcode import logger
-from platformcode import config
-from core import tmdb
-from channelselector import get_thumb
-
-from channels import filtertools
-from channels import autoplay
-
-
-__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'peliculasdk')
-__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'peliculasdk')
-__adult_mode__ = config.get_setting("adult_mode")
-
-host = "http://www.peliculasdk.com"
-
-
-IDIOMAS = {'es': 'Español', 'la': 'Latino', 'su': 'Subtitulado', 'in': 'Inglés'}
-list_language = IDIOMAS.values()
-list_quality = ['HD-1080', 'HD-720', 'HD-320', 'BR-R', 'BR-S', 'DVD-R', 'DVD-S', 'TS-HQ', 'TS', 'CAM']  # -R:Rip, -S:Screener
-list_servers = ['directo', 'streamango', 'powvideo', 'datoporn', 'gamovideo', 'streamplay', 'okru', 'rapidvideo', 'openload']
-
-
-def mainlist(item):
-    logger.info()
-
-    autoplay.init(item.channel, list_servers, list_quality)
-
-    itemlist = []
-
-    itemlist.append(Item(channel=item.channel, title='Estrenos', action='peliculas', url= host + "/ver/estrenos/",
-                         thumbnail=get_thumb('newest', auto=True), type='movies'))
-
-    itemlist.append(Item(channel=item.channel, title='Por géneros', action='section',
-                         thumbnail=get_thumb('genres', auto=True), type='movies'))
-
-    itemlist.append(Item(channel=item.channel, title='Por calidades', action='section',
-                         thumbnail=get_thumb('quality', auto=True), type='movies'))
-
-    itemlist.append(Item(channel=item.channel, title='Por idiomas', action='section',
-                         thumbnail=get_thumb('language', auto=True), type='movies'))
-
-    if __adult_mode__ != 0:
-        itemlist.append(Item(channel=item.channel, title='Adultos +18', action='peliculas', url= host + "/genero/adultos/",
-                             thumbnail=get_thumb('adults', auto=True), type='movies'))
-
-    itemlist.append(Item(channel=item.channel, title='Buscar...', action='search',
-                         thumbnail=get_thumb('search', auto=True), type='movies'))
-
-    autoplay.show_option(item.channel, itemlist)
-
-    return itemlist
-
-
-def section(item):
-    logger.info()
-    itemlist=[]
-    duplicados=[]
-    data = httptools.downloadpage(host).data
-
-    if 'Por géneros' in item.title:
-        patron = '<li><a href="(\/genero\/[^"]*)">([^<]*)<\/a><\/li>'  #<li><a href="/genero/accion">Acción</a></li>
-    elif 'Por calidades' in item.title:
-        patron = "<li><a href='(\/calidad\/[^']*)'>([^<]*)<\/a><\/li>" #<li><a href='/calidad/HD-1080/'>HD 1080</a></li>
-    elif 'Por idiomas' in item.title:
-        patron = "<li><a href='(\/idioma\/[^']*)'>([^<]*)<\/a><\/li>"  #<li><a href='/idioma/Espanol/'>Español</a></li>
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        if scrapedtitle not in duplicados:
-            itemlist.append(Item(channel=item.channel, url=host + scrapedurl, title=scrapedtitle, action='peliculas',
-                                 type=item.type))
-            duplicados.append(scrapedtitle)
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-
-    item.url = host + "/index.php?s=%s&x=0&y=0" % (texto)
-
-    try:
-        return buscador(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 buscador(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|&#.*?;", "", data)
-
-    patron = 'style="position:relative"> '
-    patron += '<a href="([^"]+)">'
-    patron += '<img src="([^"]+)" alt="([^"]+)"></a><br>'
-    patron += '<div class="titulope">([^<]+)</div>.*?'
-    patron += 'Audio: (.+?)</div>.*?'
-    patron += 'Calidad: (.+?)</div>.*?'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedtitleorig, scrapedlenguaje, scrapedcalidad in matches:
-        
-        year = scrapertools.find_single_match(scrapedtitle, '\((\d+)\)')
-        scrapedtitle = re.sub(r"\(\d+\)", "", scrapedtitle).strip()
-
-        audios = scrapertools.find_multiple_matches(scrapedlenguaje, '<a href="[^"]*" rel="[^"]*">([^<]*)</a>')
-        calidad = scrapertools.find_single_match(scrapedcalidad, '<a href="[^"]*" rel="[^"]*">([^<]*)</a>')
-
-        titulo = '%s [%s][%s]' % (scrapedtitle, ','.join([a[:3] for a in audios]), calidad)
-
-        # Parece que las pelis de adultos se mezclan en la búsqueda y lo único que las diferencia es que no tienen Calidad y Audios
-        if (calidad and audios) or __adult_mode__ != 0:
-            itemlist.append(Item(channel=item.channel,
-                                 action="findvideos", url=scrapedurl,
-                                 title=titulo, contentTitle=scrapedtitle,
-                                 thumbnail=scrapedthumbnail,
-                                 language=audios,
-                                 quality=calidad,
-                                 infoLabels={'year':year}
-                                 ))
-
-    tmdb.set_infoLabels(itemlist)
-
-    # Paginación
-    url_next_page = scrapertools.find_single_match(data,'<a href="([^"]*)">Siguiente &raquo;</a>')
-    if url_next_page:
-        itemlist.append(item.clone(title="Siguiente >>", url=url_next_page))
-
-    return itemlist
-
-
-def peliculas(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|&#.*?;", "", data)
-
-    patron = 'style="position:relative"> '
-    patron += '<a href="([^"]+)">'
-    patron += '<img src="([^"]+)" alt="([^"]+)"></a><br>'
-    patron += '<div class="titulope">([^<]+)</div>.*?'
-    patron += 'Audio: (.+?)</div>.*?'
-    patron += 'Calidad: (.+?)</div>.*?'
-    patron += 'Género: (.+?)</div>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedtitleorig, scrapedlenguaje, scrapedcalidad, scrapedgenero in matches:
-        
-        year = scrapertools.find_single_match(scrapedtitle, '\((\d+)\)')
-        scrapedtitle = re.sub(r"\(\d+\)", "", scrapedtitle).strip()
-
-        audios = scrapertools.find_multiple_matches(scrapedlenguaje, '<a href="[^"]*" rel="[^"]*">([^<]*)</a>')
-        calidad = scrapertools.find_single_match(scrapedcalidad, '<a href="[^"]*" rel="[^"]*">([^<]*)</a>')
-        generos = scrapertools.find_multiple_matches(scrapedgenero, '<a href="[^"]*" rel="[^"]*">([^<]*)</a>')
-
-        titulo = '%s [%s][%s]' % (scrapedtitle, ','.join([a[:3] for a in audios]), calidad)
-
-        if 'Adultos' not in generos or __adult_mode__ != 0:
-            itemlist.append(Item(channel=item.channel,
-                                 action="findvideos", url=scrapedurl,
-                                 title=titulo, contentTitle=scrapedtitle,
-                                 thumbnail=scrapedthumbnail,
-                                 language=audios,
-                                 quality=calidad,
-                                 infoLabels={'year':year}
-                                 ))
-
-    tmdb.set_infoLabels(itemlist)
-
-    # Paginación
-    url_next_page = scrapertools.find_single_match(data,'<a href="([^"]*)">Siguiente &raquo;</a>')
-    if url_next_page:
-        itemlist.append(item.clone(title="Siguiente >>", url=url_next_page))
-
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    
-    tmdb.set_infoLabels(item, True) # para refrescar infolabels y obtener más datos en "segunda pasada"
-
-    data = httptools.downloadpage(item.url).data
-
-    patron = '<li><a href="#(tab\d+)"><span class="re">\d<\/span><span class="([^"]+)"><\/span><span class=.*?>([^<]+)<\/span>'
-    check = re.compile(patron, re.DOTALL).findall(data)
-    if not check:
-        patron = '<li><a href="#(tab\d+)">'
-        check = re.compile(patron, re.DOTALL).findall(data)
-        for i, valor in enumerate(check):
-            check[i] = [valor, '', '']
-
-    patron = '<div id="(tab\d+)" class="tab_content">(.*?)</div>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    servers_data_list = []
-    for i, match in enumerate(matches):
-        if match[0] == check[i][0]:
-            if '<iframe' in match[1]:
-                src = scrapertools.find_single_match(match[1], ' src="([^"]*)"')
-                servers_data_list.append([check[i][1], check[i][2], 'iframe', src])  # idioma, calidad, 'iframe', src 
-
-            elif '<script' in match[1]:
-                src = scrapertools.find_single_match(match[1], '<script>(.*?)<\/script>')
-                if src:
-                    func, parm  = scrapertools.find_single_match(src, '(.*?)\("([^"]*)"\)')
-                    servers_data_list.append([check[i][1], check[i][2], func, parm ])  # idioma, calidad, func, parm 
-
-    data = httptools.downloadpage(host + '/Js/videod.js').data
-    patron = 'function (\w+)\(id\){(.*?)}'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for idioma, calidad, func, parm in servers_data_list:
-        if func == 'iframe':
-            title = "Ver en: %s [" + idioma + "][" + calidad + "]"
-            itemlist.append(
-                item.clone(title=title, url=parm, action="play",
-                     thumbnail=item.category,
-                     language=idioma, quality=calidad))
-
-        else:
-            for funcion, contenido in matches:
-                if funcion == func:
-                    if '<script' in contenido: continue
-                    if '<iframe' in contenido:
-                        src = scrapertools.find_single_match(contenido, 'src="([^"]*)"')
-                    else:
-                        src = scrapertools.find_single_match(contenido, 'href="([^"]*)"')
-                    if "'+codigo+'" not in src: continue
-                    src = src.replace("'+codigo+'", parm)
-
-                    title = "Ver en: %s [" + idioma + "][" + calidad + "]"
-                    itemlist.append(
-                        item.clone(title=title, url=src, action="play",
-                             thumbnail=item.category,
-                             language=idioma, quality=calidad))
-                    break
-
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-
-    if __comprueba_enlaces__:
-        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
-
-    if item.library and config.get_videolibrary_support() and len(itemlist) > 0:
-        infoLabels = {'tmdb_id': item.infoLabels['tmdb_id'],
-                      'title': item.fulltitle}
-        itemlist.append(Item(channel=item.channel, title="Añadir esta película a la videoteca",
-                             action="add_pelicula_to_library", url=item.url, infoLabels=infoLabels,
-                             text_color="0xFFff6666",
-                             thumbnail='http://imgur.com/0gyYvuC.png'))
-
-    itemlist = filtertools.get_links(itemlist, item, list_language)
-
-    autoplay.start(itemlist, item)
-
-    return itemlist
-
-
-def newest(categoria):
-    logger.info()
-    itemlist = []
-    item = Item()
-    try:
-        if categoria == 'castellano':
-            item.url = host + "idioma/Espanol/"
-            item.action = "peliculas"
-        itemlist = peliculas(item)
-        if itemlist[-1].action == "peliculas":
-            itemlist.pop()
-    # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-    return itemlist
diff --git a/plugin.video.alfa/channels/peliculonhd.py b/plugin.video.alfa/channels/peliculonhd.py
index e76f592a..86f400a7 100644
--- a/plugin.video.alfa/channels/peliculonhd.py
+++ b/plugin.video.alfa/channels/peliculonhd.py
@@ -39,7 +39,7 @@ list_servers = [
 __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'peliculonhd')
 __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'peliculonhd')
 
-host = 'https://peliculonhd.com/'
+host = 'https://peliculonhd.tv/'
 
 def mainlist(item):
     logger.info()
@@ -50,7 +50,7 @@ def mainlist(item):
 
     itemlist.append(Item(channel=item.channel, title='Peliculas', action='menu_movies',
                          thumbnail= get_thumb('movies', auto=True)))
-    itemlist.append(Item(channel=item.channel, title='Series', url=host+'serie', action='list_all', type='tv',
+    itemlist.append(Item(channel=item.channel, title='Series', url=host+'ver-serie', action='list_all', type='tv',
                          thumbnail= get_thumb('tvshows', auto=True)))
     itemlist.append(
         item.clone(title="Buscar", action="search", url=host + '?s=', thumbnail=get_thumb("search", auto=True),
@@ -65,7 +65,7 @@ def menu_movies(item):
 
     itemlist=[]
 
-    itemlist.append(Item(channel=item.channel, title='Todas', url=host + 'ver', action='list_all',
+    itemlist.append(Item(channel=item.channel, title='Todas', url=host + 'ver-pelicula', action='list_all',
                          thumbnail=get_thumb('all', auto=True), type='movie'))
     itemlist.append(Item(channel=item.channel, title='Genero', action='section',
                          thumbnail=get_thumb('genres', auto=True), type='movie'))
@@ -145,8 +145,8 @@ def list_all(item):
                                 title=title,
                                 url=url,
                                 thumbnail=thumbnail,
-                                contentTitle=contentTitle,
                                 quality=quality,
+                                contentTitle= contentTitle,
                                 type=item.type,
                                 infoLabels={'year':year}))
 
@@ -221,7 +221,8 @@ def episodesxseasons(item):
     itemlist = []
 
     data=get_source(item.url)
-    patron='class="numerando">%s - (\d+)</div><div class="episodiotitle">.?<a href="([^"]+)">([^<]+)<' % item.infoLabels['season']
+    data = data.replace('"','\'')
+    patron="class='numerando'>%s - (\d+)</div><div class='episodiotitle'>.?<a href='([^']+)'>([^<]+)<" % item.infoLabels['season']
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     infoLabels = item.infoLabels
@@ -262,7 +263,7 @@ def findvideos(item):
         post = {'action': 'doo_player_ajax', 'post': id, 'nume': option, 'type':type}
         post = urllib.urlencode(post)
 
-        test_url = '%swp-admin/admin-ajax.php' % 'https://peliculonhd.com/'
+        test_url = '%swp-admin/admin-ajax.php' % host
         new_data = httptools.downloadpage(test_url, post=post, headers={'Referer':item.url}).data
         test_url = scrapertools.find_single_match(new_data, "src='([^']+)'")
         if 'xyz' in test_url:
diff --git a/plugin.video.alfa/channels/pelis123.json b/plugin.video.alfa/channels/pelis123.json
new file mode 100644
index 00000000..83481820
--- /dev/null
+++ b/plugin.video.alfa/channels/pelis123.json
@@ -0,0 +1,63 @@
+{
+  "id": "pelis123",
+  "name": "Pelis123",
+  "active": true,
+  "adult": false,
+  "language": ["cast", "lat"],
+  "thumbnail": "pelis123.png",
+  "banner": "",
+  "categories": [
+    "movie",
+    "tvshow",
+    "vos"
+  ],
+  "settings": [
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "LAT",
+        "ESP",
+        "VOSE"
+      ]
+    },
+     {
+      "id": "modo_grafico",
+      "type": "bool",
+      "label": "Buscar información extra",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    }  ]
+}
+
diff --git a/plugin.video.alfa/channels/pelis123.py b/plugin.video.alfa/channels/pelis123.py
new file mode 100644
index 00000000..9a1cb75b
--- /dev/null
+++ b/plugin.video.alfa/channels/pelis123.py
@@ -0,0 +1,359 @@
+# -*- coding: utf-8 -*-
+
+import re, urllib
+
+from channels import autoplay
+from platformcode import config, logger, platformtools
+from core.item import Item
+from core import httptools, scrapertools, jsontools, tmdb
+from core import servertools
+from channels import filtertools
+
+
+host = 'https://pelis123.tv/'
+
+
+IDIOMAS = {'LAT': 'LAT', 'ESP':'ESP', 'VOSE': 'VOSE'}
+list_language = IDIOMAS.values()
+list_servers = ['openload', 'fembed', 'directo']
+list_quality = []
+
+__channel__='pelis123'
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__)
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__)
+try:
+    __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
+except:
+    __modo_grafico__ = True
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist.append(item.clone( title = 'Películas', action = 'mainlist_pelis' ))
+    itemlist.append(item.clone( title = 'Series', action = 'mainlist_series' ))
+
+    itemlist.append(item.clone( title = 'Buscar ...', action = 'search', search_type = 'all' ))
+    itemlist.append(item.clone(title="Configurar canal...", text_color="gold", action="configuracion", folder=False))
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+
+def mainlist_pelis(item):
+    logger.info()
+    itemlist = []
+
+    itemlist.append(item.clone( title = 'Nuevas películas', action = 'list_all', url = host + 'film.html', search_type = 'movie' ))
+    itemlist.append(item.clone( title = 'Destacadas', action = 'list_all', url = host + 'featured.html', search_type = 'movie' ))
+    # ~ itemlist.append(item.clone( title = 'Estrenos de cine', action = 'list_all', url = host + 'cinema.html', search_type = 'movie' ))
+
+    itemlist.append(item.clone( title = 'Por género', action = 'generos', search_type = 'movie' ))
+    itemlist.append(item.clone( title = 'Por idioma', action = 'idiomas', search_type = 'movie' ))
+    itemlist.append(item.clone( title = 'Por país', action = 'paises', search_type = 'movie' ))
+    itemlist.append(item.clone( title = 'Por año', action = 'anios', search_type = 'movie' ))
+
+    itemlist.append(item.clone( title = 'Buscar película ...', action = 'search', search_type = 'movie' ))
+
+    return itemlist
+
+
+def mainlist_series(item):
+    logger.info()
+    itemlist = []
+
+    itemlist.append(item.clone( title = 'Nuevas series', action = 'list_all', url = host + 'series.html', search_type = 'tvshow' ))
+
+    itemlist.append(item.clone( title = 'Por género', action = 'generos', search_type = 'tvshow' ))
+
+    itemlist.append(item.clone( title = 'Buscar serie ...', action = 'search', search_type = 'tvshow' ))
+
+    return itemlist
+
+
+def anios(item):
+    logger.info()
+    return extraer_opciones(item, 'year')
+
+def generos(item):
+    logger.info()
+    return extraer_opciones(item, 'genre')
+
+def idiomas(item):
+    logger.info()
+    return extraer_opciones(item, 'lang')
+
+def paises(item):
+    logger.info()
+    return extraer_opciones(item, 'country')
+
+def extraer_opciones(item, select_id):
+    itemlist = []
+
+    url = host + 'search.html'
+    data = httptools.downloadpage(url).data
+    # ~ logger.debug(data)
+    url += '?type=' + ('series' if item.search_type == 'tvshow' else 'movies')
+    url += '&order=last_update&order_by=desc'
+
+    bloque = scrapertools.find_single_match(data, '<select name="%s"[^>]*>(.*?)</select>' % select_id)
+    
+    matches = re.compile('<option value="([^"]+)">([^<]+)', re.DOTALL).findall(bloque)
+    for valor, titulo in matches:
+        itemlist.append(item.clone( title=titulo.capitalize(), url= url + '&' + select_id + '=' + valor, action='list_all' ))
+
+    if select_id == 'year': # años en orden inverso
+        return sorted(itemlist, key=lambda it: it.title, reverse=True)
+    else:
+        return sorted(itemlist, key=lambda it: it.title)
+
+
+def configuracion(item):
+    ret = platformtools.show_channel_settings()
+    platformtools.itemlist_refresh()
+    return ret
+
+
+def detectar_idiomas(txt):
+    languages = []
+    if 'Castellano' in txt: languages.append('ESP')
+    if 'Latino' in txt: languages.append('LAT')
+    if 'Subtitulado' in txt: languages.append('VOSE')
+    return languages
+
+def detectar_idioma(txt):
+    languages = detectar_idiomas(txt)
+    if len(languages) > 0: return languages[0]
+    return '?'
+
+def list_all(item):
+    logger.info()
+    itemlist = []
+    
+    es_busqueda = '&q=' in item.url
+
+    data = httptools.downloadpage(item.url).data
+    # ~ logger.debug(data)
+
+    patron = '<div class="tray-item" episode-tag="([^"]+)">\s*<div class="tray-item-content">'
+    patron += '\s*<a href="([^"]+)">\s*<img class="[^"]*" src="([^"]+)">'
+    patron += '.*?<div class="tray-item-title">([^<]+)</div>'
+    patron += '.*?<div class="tray-item-title-en">([^<]+)</div>'
+    patron += '.*?<div class="tray-item-quality">([^<]+)</div>'
+    patron += '.*?<div class="tray-item-episode">([^<]+)</div>'
+    patron += '.*? data-original-title=".*? \((\d+)\)"'
+    
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for langs, url, thumb, title, title_en, quality, episode, year in matches:
+        th = scrapertools.find_single_match(thumb, r'poster%2F(.*?)$')
+        thumb = 'https://cdn.pelis123.tv/poster/' + th
+        
+        languages = detectar_idiomas(langs)
+        
+        tipo = 'movie' if 'MIN' in episode else 'tvshow'
+        if item.search_type not in ['all', tipo]: continue
+
+        if tipo == 'tvshow':
+            m = re.match('(.*?) S\d+$', title)
+            if m: title = m.group(1)
+
+        title = title.strip()
+        quality = quality.strip().upper()
+        
+        titulo = title
+        if len(languages) > 0: 
+            titulo += ' [COLOR pink][%s][/COLOR]' % ','.join(languages)
+        if quality != '': 
+            titulo += ' [COLOR pink][%s][/COLOR]' % quality
+        if item.search_type == 'all': 
+            titulo += ' [COLOR %s](%s)[/COLOR]' % ('red' if tipo == 'tvshow' else 'green', tipo)
+            
+        if tipo == 'movie':
+            itemlist.append(item.clone( action='findvideos', url=url, title=titulo, thumbnail=thumb, 
+                                        contentType='movie', contentTitle=title, infoLabels={'year': year} ))
+        else:
+            if es_busqueda: # descartar series que se repiten con diferentes temporadas
+                if title in [it.contentSerieName for it in itemlist]: continue
+                
+            itemlist.append(item.clone( action='temporadas', url=url, title=titulo, thumbnail=thumb, 
+                                        contentType='tvshow', contentSerieName=title, infoLabels={'year': year} ))
+
+    tmdb.set_infoLabels(itemlist)
+
+    next_page_link = scrapertools.find_single_match(data, 'active">\d+</a>(?:\s*</div>\s*<div class="btn-group">|)\s*<a href="([^"]+)')
+    if next_page_link:
+        itemlist.append(item.clone( title='>> Página siguiente', url=next_page_link ))
+
+    return itemlist
+
+
+def temporadas(item):
+    logger.info()
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    # ~ logger.debug(data)
+
+    matches = re.compile('href="([^"]+)" class="[^"]*">Temporada (\d+)</a>', re.DOTALL).findall(data)
+    for url, numtempo in matches:
+        itemlist.append(item.clone( action='episodesxseason', title='Temporada %s' % numtempo, url = url,
+                                    contentType='season', contentSeason=numtempo ))
+        
+    m = re.match('.*?-season-(\d+)-[a-z0-9A-Z]+-[a-z0-9A-Z]+\.html$', item.url)
+    if m:
+        itemlist.append(item.clone( action='episodesxseason', title='Temporada %s' % m.group(1), url = item.url,
+                                    contentType='season', contentSeason=m.group(1) ))
+    tmdb.set_infoLabels(itemlist)
+    
+    # if len(itemlist) == 1:
+        # itemlist = seasons_episodes(itemlist[0])
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+            Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                 action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName))
+    
+    
+    # return sorted(itemlist, key=lambda it: it.title)
+    return itemlist
+
+
+# ~ # Si una misma url devuelve los episodios de todas las temporadas, definir rutina tracking_all_episodes para acelerar el scrap en trackingtools.
+# ~ def tracking_all_episodes(item):
+    # ~ return episodios(item)
+    
+    
+def episodios(item):
+    logger.info()
+    itemlist = []
+    templist = temporadas(item)
+    for tempitem in templist:
+        itemlist += episodesxseason(tempitem)
+    return itemlist
+
+
+def episodesxseason(item):
+# def episodios(item):
+    logger.info()
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    # ~ logger.debug(data)
+
+    url = scrapertools.find_single_match(data, 'href="([^"]+)" action="watch"')
+    data = httptools.downloadpage(url).data
+    # ~ logger.debug(data)
+
+    patron = '<div class="watch-playlist-item(?:  playing|) " data-season="(\d+)" data-episode="(\d+)">'
+    patron += '\s*<a href="([^"]+)"'
+    patron += '.*?<img src="([^"]+)"'
+    patron += '.*?<span class="watch-playlist-title">([^<]+)'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for season, episode, url, thumb, title in matches:
+        if item.contentSeason and item.contentSeason != int(season):
+            continue
+
+        titulo = '%sx%s %s' % (season, episode, title)
+        itemlist.append(item.clone( action='findvideos', url=url, title=titulo, thumbnail=thumb, 
+                                    contentType='episode', contentSeason=season, contentEpisodeNumber=episode ))
+
+    tmdb.set_infoLabels(itemlist)
+
+    return itemlist
+
+
+def detectar_server(servidor):
+    servidor = servidor.lower()
+    if 'server ' in servidor: return 'directo'
+    elif servidor == 'fast': return 'fembed'
+    # ~ elif 'server 1' in servidor: return 'fastproxycdn' # inexistente
+    # ~ elif 'server 4' in servidor: return '404' # error 404 !?
+    return servidor
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    
+    data = httptools.downloadpage(item.url).data
+    # ~ logger.debug(data)
+
+    token = scrapertools.find_single_match(data, '<meta name="csrf-token" content="([^"]+)')
+
+    # ~ https://pelis123.tv/watch/blackkklansman-2018-ocffc-ux2.html
+    # ~ https://pelis123.tv/watch/lethal-weapon-season-1-episode-18-oa06e-fds.html
+    movie_id = scrapertools.find_single_match(item.url, '([a-z0-9A-Z]+-[a-z0-9A-Z]+)\.html$')
+    m = re.match('.*?-episode-(\d+)-[a-z0-9A-Z]+-[a-z0-9A-Z]+\.html$', item.url)
+    episode = m.group(1) if m else ''
+
+    url = host + 'ajax/watch/list'
+    post = 'movie_id=%s&episode=%s' % (movie_id, episode)
+    headers = { 'X-CSRF-TOKEN': token }
+    data = jsontools.load(httptools.downloadpage(url, post=post, headers=headers).data)
+    # ~ logger.debug(data)
+    for idioma, enlaces in data['list'].items():
+        for servidor, url in enlaces.items():
+            titulo = detectar_server(servidor)
+            titulo += ' [%s]' % detectar_idioma(idioma)
+            titulo +=  item.quality
+            for url_play in url:
+                itemlist.append(item.clone( channel = item.channel, action = 'play', server = detectar_server(servidor),
+                                      title = titulo, url = url_play, 
+                                      language = detectar_idioma(idioma), quality = 'HD'  #, other = servidor
+                               ))
+                               
+    # Requerido para Filtrar enlaces
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)
+
+    
+    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra !='findvideos' :
+        itemlist.append(Item(channel=item.channel, action="add_pelicula_to_library", 
+                             title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+                             extra="findvideos", contentTitle=item.contentTitle))
+    
+    
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, ignore_response_code=True).data
+    # ~ logger.debug(data)
+    
+    url = scrapertools.find_single_match(data, '<iframe src="([^"]+)')
+    if url == '':
+        url = scrapertools.find_single_match(data, '<source src="([^"]+)')
+
+    if 'fastproxycdn.net' in url: url = '' # ya no existe
+        
+    # ~ logger.debug(url)
+    if url != '':
+        itemlist.append(item.clone(url = url))
+
+    return itemlist
+
+
+def search(item, texto):
+    logger.info("texto: %s" % texto)
+    if item.search_type == "" :
+        item.search_type = 'all'
+    try:
+        item.url = host + 'search.html'
+        item.url += '?type=' + ('series' if item.search_type == 'tvshow' else 'movies' if item.search_type == 'movie' else '')
+        item.url += '&order=last_update&order_by=desc'
+        item.url += '&q=' + texto.replace(" ", "+")
+        return list_all(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
diff --git a/plugin.video.alfa/channels/pelis24.py b/plugin.video.alfa/channels/pelis24.py
index 82ca64b2..340b33cf 100644
--- a/plugin.video.alfa/channels/pelis24.py
+++ b/plugin.video.alfa/channels/pelis24.py
@@ -42,7 +42,6 @@ else:
 headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
            ['Referer', host]]
 
-
 parameters = channeltools.get_channel_parameters(__channel__)
 fanart_host = parameters['fanart']
 thumbnail_host = parameters['thumbnail']
@@ -103,7 +102,7 @@ def sub_search(item):
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     data = scrapertools.find_single_match(data, 'Archivos (.*?)resppages')
-    patron  = 'img alt="([^"]+)".*?'
+    patron = 'img alt="([^"]+)".*?'
     patron += 'src="([^"]+)".*?'
     patron += 'href="([^"]+)".*?'
     patron += 'fechaestreno">([^<]+)'
@@ -111,7 +110,6 @@ def sub_search(item):
 
     for scrapedtitle, scrapedthumbnail, scrapedurl, year in matches:
         if 'tvshows' not in scrapedurl:
-
             itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl, contentTitle=scrapedtitle,
                                        action="findvideos", infoLabels={"year": year},
                                        thumbnail=scrapedthumbnail, text_color=color3))
@@ -137,11 +135,11 @@ def peliculas(item):
     # logger.info(data)
 
     # img, title
-    patron  = '(?is)movie-img img-box.*?alt="([^"]+).*?'
-    patron += 'src="([^"]+).*?'
-    patron += 'href="([^"]+).*?'
-    patron += 'fechaestreno">([^<]+).*?'
-    patron += 'quality">([^<]+)'
+    patron = '(?is)movie-img img-box.*?alt="([^"]+)".*?'
+    patron += 'src="([^"]+)".*?'
+    patron += 'href="([^"]+)".*?'
+    patron += 'fechaestreno">([^<]+)<.*?'
+    patron += 'quality">([^<]+)<'
 
     matches = scrapertools.find_multiple_matches(data, patron)
 
@@ -176,20 +174,19 @@ def genresYears(item):
     if item.title == "Estrenos":
         patron_todas = 'ESTRENOS</a>(.*?)</i> Géneros'
     else:
-        patron_todas = '(?is)genres falsescroll(.*?)</div> </aside'
+        patron_todas = '(?is)data-label="CATEGORIAS">(.*?)show-bigmenu'
         # logger.error(texto='***********uuuuuuu*****' + patron_todas)
 
     data = scrapertools.find_single_match(data, patron_todas)
     # logger.error(texto='***********uuuuuuu*****' + data)
-    patron = '<a href="([^"]+)">([^<]+)</a> <i>([^<]+)</i>'  # url, title, videos
+    patron = '<a href="([^"]+)".*?title="([^"]+)"'  # url, title
     # patron = '<a href="([^"]+)">([^<]+)</a>' # url, title
     matches = scrapertools.find_multiple_matches(data, patron)
 
-    for scrapedurl, scrapedtitle, videos_num in matches:
-        title = '%s (%s)' % (scrapedtitle, videos_num.replace('.', ','))
-
+    for scrapedurl, scrapedtitle in matches:
+        title = '%s' % (scrapedtitle)
+        title = title.replace("Peliculas de ", "").replace(" Online", "")
         itemlist.append(item.clone(title=title, url=scrapedurl, action="peliculas"))
-
     return itemlist
 
 
@@ -197,14 +194,13 @@ def year_release(item):
     logger.info()
     itemlist = []
 
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     # logger.info(data)
     patron = '<li><a href="([^"]+)">([^<]+)</a></li>'  # url, title
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle in matches:
-
         itemlist.append(item.clone(channel=item.channel, action="peliculas", title=scrapedtitle, page=0,
                                    url=scrapedurl, text_color=color3, viewmode="movie_with_plot", extra='next'))
 
@@ -220,13 +216,12 @@ def series(item):
     # logger.info(data)
 
     patron = '<article class="TPost C TPostd">\s*<a href="([^"]+)">.*?'  # url
-    patron += '<img src="([^"]+)".*?'                                   # img
-    patron += '<h3 class="Title">([^<]+)</h3>'                          # title
+    patron += '<img src="([^"]+)".*?'  # img
+    patron += '<h3 class="Title">([^<]+)</h3>'  # title
 
     matches = scrapertools.find_multiple_matches(data, patron)
 
     for scrapedurl, scrapedthumbnail, scrapedtitle in matches[item.page:item.page + 30]:
-
         itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl, action="temporadas",
                                    contentSerieName=scrapedtitle, show=scrapedtitle,
                                    thumbnail='https:' + scrapedthumbnail, contentType='tvshow'))
@@ -292,7 +287,7 @@ def episodios(item):
 
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<td class="MvTbImg B"><a href="([^"]+)".*?'                                     # url
+    patron = '<td class="MvTbImg B"><a href="([^"]+)".*?'  # url
     patron += '<td class="MvTbTtl"><a href="https://cine24h.net/episode/(.*?)/">([^<]+)</a>'  # title de episodios
 
     matches = scrapertools.find_multiple_matches(data, patron)
@@ -325,7 +320,7 @@ def episodios(item):
             if i.infoLabels['title']:
                 # Si el capitulo tiene nombre propio añadirselo al titulo del item
                 i.title = "%sx%s %s" % (i.infoLabels['season'], i.infoLabels[
-                                        'episode'], i.infoLabels['title'])
+                    'episode'], i.infoLabels['title'])
             if i.infoLabels.has_key('poster_path'):
                 # Si el capitulo tiene imagen propia remplazar al poster
                 i.thumbnail = i.infoLabels['poster_path']
@@ -370,7 +365,8 @@ def findvideos(item):
             lang = languages[lang]
 
         server = servertools.get_server_from_url(url)
-        title = "»» [COLOR yellow](%s)[/COLOR] [COLOR goldenrod](%s)[/COLOR] %s ««" % (server.title(), item.quality, lang)
+        title = "»» [COLOR yellow](%s)[/COLOR] [COLOR goldenrod](%s)[/COLOR] %s ««" % (
+            server.title(), item.quality, lang)
         # if 'google' not in url and 'directo' not in server:
 
         itemlist.append(item.clone(action='play', url=url, title=title, language=lang, text_color=color3))
diff --git a/plugin.video.alfa/channels/peliscity.py b/plugin.video.alfa/channels/peliscity.py
index 89ba4cb5..459b91bc 100755
--- a/plugin.video.alfa/channels/peliscity.py
+++ b/plugin.video.alfa/channels/peliscity.py
@@ -1,65 +1,39 @@
 # -*- coding: utf-8 -*-
 
 import re
+import urllib
 
+from channelselector import get_thumb
 from core import httptools
+from core import jsontools
 from core import scrapertools
 from core import servertools
 from core import tmdb
 from core.item import Item
 from platformcode import config, logger
 
-host = "http://peliscity.com"
+host = "https://www.pelisvips.com"
 
 def mainlist(item):
     logger.info()
     itemlist = []
-
-    data = httptools.downloadpage(host).data
-    patron = 'cat-item.*?span>([^<]+)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    can = 0
-    for cantidad in matches:
-        can += int(cantidad.replace(".", ""))
-
-
-    itemlist.append(
-        Item(channel=item.channel, title="Películas: (%s)" %can, text_bold=True))
-    itemlist.append(
-        Item(channel=item.channel, title="    Últimas agregadas", action="agregadas", url= host,
-             viewmode="movie_with_plot"))
-    itemlist.append(Item(channel=item.channel, title="    Peliculas HD", action="agregadas",
-                         url= host + "/calidad/hd-real-720", viewmode="movie_with_plot"))
-    itemlist.append(
-        Item(channel=item.channel, title="    Listado por género", action="porGenero", url= host))
-    itemlist.append(Item(channel=item.channel, title="    Idioma", action="porIdioma", url= host))
-    itemlist.append(Item(channel=item.channel, title="    Buscar", action="search", url= host + "/?s="))
+    itemlist.append(Item(channel=item.channel, title="Ultimas", action="agregadas",
+                         url= host, viewmode="movie_with_plot", thumbnail = get_thumb("last", auto = True)))
+    itemlist.append(Item(channel=item.channel, title="Género", action="porGenero_Idioma", tipo = "g", url= host, thumbnail = get_thumb("genres", auto = True)))
+    itemlist.append(Item(channel=item.channel, title="Audio", action="porGenero_Idioma", tipo = "a", url= host, thumbnail = get_thumb("audio", auto = True)))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url= host + "/?s=", thumbnail = get_thumb("search", auto = True)))
 
     return itemlist
 
 
-def porIdioma(item):
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Castellano", action="agregadas",
-                         url= host + "/idioma/espanol-castellano/", viewmode="movie_with_plot"))
-    itemlist.append(
-        Item(channel=item.channel, title="VOSE", action="agregadas", url= host + "/idioma/subtitulada/",
-             viewmode="movie_with_plot"))
-    itemlist.append(Item(channel=item.channel, title="Latino", action="agregadas",
-                         url= host + "/idioma/espanol-latino/", viewmode="movie_with_plot"))
-
-    return itemlist
-
-
-def porGenero(item):
+def porGenero_Idioma(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = 'cat-item.*?href="([^"]+).*?>(.*?)<.*?span>([^<]+)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for urlgen, genero, cantidad in matches:
-        cantidad = cantidad.replace(".", "")
-        titulo = genero + " (" + cantidad + ")"
+    bloque = scrapertools.find_single_match(data, 'culas por %s(.*?)slidebar-item' %item.tipo)
+    patron = 'href="([^"]+).*?span>([^<]+)'
+    matches = scrapertools.find_multiple_matches(bloque, patron)
+    for urlgen, titulo in matches:
         itemlist.append(Item(channel=item.channel, action="agregadas", title=titulo, url=urlgen, folder=True,
                              viewmode="movie_with_plot"))
 
@@ -80,35 +54,47 @@ def search(item, texto):
         return []
 
 
+def listaBuscar(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron  = '<li class="itemlist".*?href="([^"]+)".*?'
+    patron += 'src="([^"]+)".*?'
+    patron += 'title="([^"]+)".*?'
+    patron += 'text-list">([^<]+)<'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for url, thumbnail, title, sinopsis in matches:
+        itemlist.append(Item(channel=item.channel, action="findvideos", title=title + " ", fulltitle=title, url=url,
+                             thumbnail=thumbnail, show=title, plot=sinopsis))
+    return itemlist
+
+
 def agregadas(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r'\n|\r|\t|\s{2}|&nbsp;|"', "", data)
-    patron = scrapertools.find_multiple_matches (data,'<divclass=col-mt-5 postsh>.*?Duración')
-    for element in patron:
-        info = scrapertools.find_single_match(element,
-                                              "calidad>(.*?)<.*?ahref=(.*?)>.*?'reflectMe' src=(.*?)\/>.*?<h2>(.*?)"
-                                              "<\/h2>.*?sinopsis>(.*?)<\/div>.*?Año:<\/span>(.*?)<\/li>")
-        quality = info[0]
-        url = info[1]
-        thumbnail = info[2]
-        title = info[3]
-        plot = info[4]
-        year = info[5].strip()
-        itemlist.append(Item(channel=item.channel,
-                             action='findvideos',
-                             contentType = "movie",
-                             contentTitle = title,
-                             fulltitle = title,
-                             infoLabels={'year':year},
-                             quality=quality,
-                             thumbnail=thumbnail,
-                             title=title,
-                             url=url
+    bloque = scrapertools.find_single_match(data, '<div id="movie-list"(.*?)<div class="pagination movie-pagination')
+    patron  = '(?is)href="([^"]+)".*?'
+    patron += 'class="_format"> <span class=".*?>([^<]+)<.*?'
+    patron += 'src="([^"]+)".*?'
+    patron += 'alt="([^"]+)".*?'
+    patron += '<div class="_audio">(.*?)/div.*?'
+    patron += 'label_year">([^ ]+) '
+    matches = scrapertools.find_multiple_matches(bloque, patron)
+    for scrapedurl, scrapedquality, scrapedthumbnail, scrapedtitle, scrapedaudio, scrapedyear in matches:
+        title = scrapedtitle + " (%s)" %scrapedyear
+        itemlist.append(Item(channel = item.channel,
+                             action = 'findvideos',
+                             contentTitle = scrapedtitle,
+                             fulltitle = scrapedtitle,
+                             infoLabels = {'year':scrapedyear},
+                             quality = scrapedquality,
+                             thumbnail = scrapedthumbnail,
+                             title = title,
+                             url = scrapedurl
                              ))
     tmdb.set_infoLabels(itemlist, True)
-    next_page = scrapertools.find_single_match(data,'tima>.*?href=(.*?) ><i')
+    next_page = scrapertools.find_single_match(data, "next'.*?href='([^']+)'")
     itemlist.append(Item(channel=item.channel, action="agregadas", title='Pagina Siguiente >>',
                          url=next_page.strip(),
                          viewmode="movie_with_plot"))
@@ -116,23 +102,6 @@ def agregadas(item):
     return itemlist
 
 
-def listaBuscar(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n", " ", data)
-    patron = 'class="row"> <a.*?="([^"]+).*?src="([^"]+).*?title="([^"]+).*?class="text-list">(.*?)</p>'
-
-    matches = scrapertools.find_multiple_matches(data, patron)
-
-    for url, thumbnail, title, sinopsis in matches:
-        itemlist.append(Item(channel=item.channel, action="findvideos", title=title + " ", fulltitle=title, url=url,
-                             thumbnail=thumbnail, show=title, plot=sinopsis))
-
-    return itemlist
-
-
 def findvideos(item):
     logger.info()
     itemlist = []
@@ -144,6 +113,16 @@ def findvideos(item):
         title = "%s [" + scrapedcalidad + "][" + scrapedidioma +"]"
         quality = scrapedcalidad
         language = scrapedidioma
+        if "pelisup.com" in scrapedurl:
+            scrapedurl = scrapedurl.replace("/v/","/api/source/")
+            post = urllib.urlencode({"r":item.url,"d":"www.pelisup.com"})
+            data1 = httptools.downloadpage(scrapedurl, post=post).data
+            json_data = jsontools.load(data1)
+            for dataj in json_data["data"]:
+                itemlist.append(
+                    item.clone(channel=item.channel, action="play", title=title + " - %s" %dataj["label"], fulltitle=item.title, url="https://www.pelisup.com" + dataj["file"],
+                         quality= quality, language=language, extra = item.thumbnail))
+            scrapedurl = "omina.farlante1"  # para ya no agregar al itemlist
         if not ("omina.farlante1" in scrapedurl or "404" in scrapedurl):
             itemlist.append(
                 item.clone(channel=item.channel, action="play", title=title, fulltitle=item.title, url=scrapedurl,
@@ -151,7 +130,7 @@ def findvideos(item):
     tmdb.set_infoLabels(itemlist, True)
     itemlist=servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     # Opción "Añadir esta película a la biblioteca de KODI"
-    if item.extra != "library":
+    if itemlist and item.contentChannel != "videolibrary":
         if config.get_videolibrary_support():
             itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
                                  action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
diff --git a/plugin.video.alfa/channels/pelisfox.py b/plugin.video.alfa/channels/pelisfox.py
index c2cf1252..2eb55087 100644
--- a/plugin.video.alfa/channels/pelisfox.py
+++ b/plugin.video.alfa/channels/pelisfox.py
@@ -60,7 +60,7 @@ def mainlist(item):
 
     itemlist.append(item.clone(title="Buscar",
                                action="search",
-                               url=host + '/api/suggest?query=',
+                               url=host + '/api/suggest/?query=',
                                thumbnail=get_thumb('search', auto=True)
                                ))
 
@@ -185,31 +185,31 @@ def seccion(item):
 def busqueda(item):
     logger.info()
     itemlist = []
-    headers = {'referer':host, 'X-Requested-With': 'XMLHttpRequest'}
+    headers = {'referer':host, 'X-Requested-With': 'XMLHttpRequest',
+               'Accept': 'application/json, text/javascript, */*; q=0.01'}
     data = httptools.downloadpage(item.url, headers=headers).data
     dict_data = jsontools.load(data)
-    resultados = dict_data['suggest']['result'][0]['options']
+    resultados = dict_data['data']['m']
 
     for resultado in resultados:
-        if 'title' in resultado['_source']:
-            title = resultado['_source']['title']
-            thumbnail = 'https://static.pelisfox.tv/static/movie' + '/' + resultado['_source']['cover']
-            plot = resultado['_source']['sinopsis']
-            url = host + resultado['_source']['url'] + '/'
+        title = resultado['title']
+        thumbnail = 'https://static.pelisfox.tv/' + '/' + resultado['cover']
+        plot = resultado['synopsis']
+        url = host + resultado['slug'] + '/'
 
-            itemlist.append(item.clone(title=title,
-                                       thumbnail=thumbnail,
-                                       plot=plot,
-                                       url=url,
-                                       action='findvideos',
-                                       contentTitle=title
-                                       ))
+        itemlist.append(item.clone(title=title,
+                                   thumbnail=thumbnail,
+                                   plot=plot,
+                                   url=url,
+                                   action='findvideos',
+                                   contentTitle=title
+                                   ))
     return itemlist
 
 
 def search(item, texto):
     logger.info()
-    texto = texto.replace(" ", "+")
+    texto = texto.replace(" ", "%20")
     item.url = item.url + texto
 
     if texto != '':
@@ -224,6 +224,7 @@ def findvideos(item):
     data = httptools.downloadpage(item.url).data
     data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
     links = scrapertools.find_single_match(data, '<script>var.*?_SOURCE.?=.?(.*?);')
+    links = links.replace('null', '"null"')
     links = links.replace('false', '"false"').replace('true', '"true"')
     links = eval(links)
     for link in links:
diff --git a/plugin.video.alfa/channels/pelisgratis.py b/plugin.video.alfa/channels/pelisgratis.py
index 081c66c1..b8e786f6 100755
--- a/plugin.video.alfa/channels/pelisgratis.py
+++ b/plugin.video.alfa/channels/pelisgratis.py
@@ -1,274 +1,292 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-import base64
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import tmdb
-from core import jsontools
-from core.item import Item
-from platformcode import config, logger
-from channelselector import get_thumb
-
-
-thumbletras = {'#': 'https://s32.postimg.cc/drojt686d/image.png',
-               'a': 'https://s32.postimg.cc/llp5ekfz9/image.png',
-               'b': 'https://s32.postimg.cc/y1qgm1yp1/image.png',
-               'c': 'https://s32.postimg.cc/vlon87gmd/image.png',
-               'd': 'https://s32.postimg.cc/3zlvnix9h/image.png',
-               'e': 'https://s32.postimg.cc/bgv32qmsl/image.png',
-               'f': 'https://s32.postimg.cc/y6u7vq605/image.png',
-               'g': 'https://s32.postimg.cc/9237ib6jp/image.png',
-               'h': 'https://s32.postimg.cc/812yt6pk5/image.png',
-               'i': 'https://s32.postimg.cc/6nbbxvqat/image.png',
-               'j': 'https://s32.postimg.cc/axpztgvdx/image.png',
-               'k': 'https://s32.postimg.cc/976yrzdut/image.png',
-               'l': 'https://s32.postimg.cc/fmal2e9yd/image.png',
-               'm': 'https://s32.postimg.cc/m19lz2go5/image.png',
-               'n': 'https://s32.postimg.cc/b2ycgvs2t/image.png',
-               'o': 'https://s32.postimg.cc/c6igsucpx/image.png',
-               'p': 'https://s32.postimg.cc/jnro82291/image.png',
-               'q': 'https://s32.postimg.cc/ve5lpfv1h/image.png',
-               'r': 'https://s32.postimg.cc/nmovqvqw5/image.png',
-               's': 'https://s32.postimg.cc/zd2t89jol/image.png',
-               't': 'https://s32.postimg.cc/wk9lo8jc5/image.png',
-               'u': 'https://s32.postimg.cc/w8s5bh2w5/image.png',
-               'v': 'https://s32.postimg.cc/e7dlrey91/image.png',
-               'w': 'https://s32.postimg.cc/fnp49k15x/image.png',
-               'x': 'https://s32.postimg.cc/dkep1w1d1/image.png',
-               'y': 'https://s32.postimg.cc/um7j3zg85/image.png',
-               'z': 'https://s32.postimg.cc/jb4vfm9d1/image.png'
-               }
-
-audio = {'Latino': '[COLOR limegreen]LATINO[/COLOR]', 'Español': '[COLOR yellow]ESPAÑOL[/COLOR]',
-         'Sub Español': '[COLOR red]SUB ESPAÑOL[/COLOR]'}
-
-host = 'http://pelisgratis.me/'
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(item.clone(title="Estrenos",
-                               action="lista",
-                               thumbnail=get_thumb('premieres', auto=True),
-                               url=host + 'estrenos'
-                               ))
-
-    itemlist.append(item.clone(title="Todas",
-                               action="lista",
-                               thumbnail=get_thumb('all', auto=True),
-                               url=host
-                               ))
-
-    itemlist.append(item.clone(title="Generos",
-                               action="seccion",
-                               url=host,
-                               thumbnail=get_thumb('genres', auto=True),
-                               extra='generos'
-                               ))
-
-    itemlist.append(item.clone(title="Alfabetico",
-                               action="seccion",
-                               url=host,
-                               thumbnail=get_thumb('alphabet', auto=True),
-                               extra='a-z'
-                               ))
-
-    itemlist.append(item.clone(title="Mas Vistas",
-                               action="lista",
-                               thumbnail=get_thumb('more watched', auto=True),
-                               url=host + 'peliculas-mas-vistas'
-                               ))
-
-    itemlist.append(item.clone(title="Mas Votadas",
-                               action="lista",
-                               thumbnail=get_thumb('more voted', auto=True),
-                               url=host + 'peliculas-mas-votadas'
-                               ))
-
-    itemlist.append(item.clone(title="Buscar",
-                               action="search",
-                               url=host + '?s=',
-                               thumbnail=get_thumb('search', auto=True)
-                               ))
-
-    return itemlist
-
-
-def get_source(url):
-    logger.info()
-    data = httptools.downloadpage(url, add_referer=True).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    return data
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = get_source(item.url)
-    patron = 'class=(?:MvTbImg|TPostMv).*?href=(.*?)\/(?:>| class).*?src=(.*?) '
-    patron += 'class=Title>(.*?)<.*?(?:<td|class=Year)>(.*?)<.*?(?:<td|class=Description)>(.*?)<(?:\/td|\/p)>'
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, scrapedplot in matches:
-        url = scrapedurl
-        thumbnail = scrapedthumbnail
-        plot = scrapedplot
-        quality = ''
-        contentTitle = scrapedtitle
-        title = contentTitle
-        year = scrapedyear
-
-        itemlist.append(item.clone(action='findvideos',
-                                   title=title,
-                                   url=url,
-                                   thumbnail=thumbnail,
-                                   plot=plot,
-                                   contentTitle=contentTitle,
-                                   quality=quality,
-                                   infoLabels={'year': year}
-                                   ))
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    # Paginacion
-
-    if itemlist != []:
-        actual_page_url = item.url
-        next_page = scrapertools.find_single_match(data, '<a class=nextpostslink rel=next href=(.*?)>')
-        if next_page != '':
-            itemlist.append(item.clone(action="lista",
-                                       title='Siguiente >>>',
-                                       url=next_page,
-                                       thumbnail='https://s32.postimg.cc/4zppxf5j9/siguiente.png'
-                                       ))
-    return itemlist
-
-
-def seccion(item):
-    logger.info()
-    itemlist = []
-    data = get_source(item.url)
-    if item.extra == 'generos':
-        patron = '<li class=cat-item cat-item-.*?><a href=(.*?)>(.*?)</a><\/li>'
-    elif item.extra == 'a-z':
-        patron = '<li><a href=(.*?)>(\w|#)<\/a><\/li>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        url = scrapedurl
-        thumbnail = ''
-        if item.extra == 'generos':
-            #cantidad = re.findall(r'.*?<\/a> \((\d+)\)', scrapedtitle)
-            title = scrapedtitle
-        else:
-            title = scrapedtitle
-            if title.lower() in thumbletras:
-                thumbnail = thumbletras[title.lower()]
-
-        itemlist.append(item.clone(action='lista', title=title, url=url, thumbnail=thumbnail))
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = item.url + texto
-    if texto != '':
-        return lista(item)
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    global new_data
-    new_data = []
-    data = get_source(item.url)
-    data = data.replace("&lt;","<").replace("&quot;",'"').replace("&gt;",">").replace("&amp;","&").replace('\"',"")
-    patron = '<div class=TPlayerTb.*?id=(.*?)>.*?src=(.*?) frameborder'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    headers = {'referer':item.url}
-    for opt, urls_page in matches:
-        language = scrapertools.find_single_match (data,'TPlayerNv>.*?tplayernv=%s><span>Opción.*?<span>(.*?)</span>' % opt)
-        if 'trembed' in urls_page:
-            urls_page = scrapertools.decodeHtmlentities(urls_page)
-            sub_data = httptools.downloadpage(urls_page).data
-            urls_page = scrapertools.find_single_match(sub_data, 'src="([^"]+)" ')
-            if "repro.live" in urls_page:
-                server_repro(urls_page)
-            if "itatroniks.com" in urls_page:
-                server_itatroniks(urls_page)
-        for url in new_data:
-            itemlist.append(item.clone(title='[%s][%s]',
-                            url=url,
-                            action='play',
-                            language=language,
-                            ))
-        new_data = []
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % (x.server.capitalize(), x.language))
-    return itemlist
-
-
-def server_itatroniks(urls_page):
-    logger.info()
-    headers = {"Referer":urls_page}
-    id = scrapertools.find_single_match(urls_page, 'embed/(\w+)')
-    sub_data = httptools.downloadpage(urls_page, headers = headers).data
-    matches = scrapertools.find_multiple_matches(sub_data, 'button id="([^"]+)')
-    headers1 = ({"X-Requested-With":"XMLHttpRequest"})
-    for serv in matches:
-        data1 = httptools.downloadpage("https://itatroniks.com/get/%s/%s" %(id, serv), headers = headers1).data
-        data_json = jsontools.load(data1)
-        urls_page = ""
-        try:
-            if "finished" == data_json["status"]: urls_page = "https://%s/embed/%s" %(data_json["server"], data_json["extid"])
-            if "propio" == data_json["status"]: urls_page = "https://%s/e/%s" %(data_json["server"], data_json["extid"])
-        except:
-            continue
-        new_data.append(urls_page)
-
-
-def server_repro(urls_page):
-    logger.info()
-    headers = {"Referer":urls_page}
-    sub_data = httptools.downloadpage(urls_page, headers = headers).data
-    urls_page1 = scrapertools.find_multiple_matches(sub_data, 'data-embed="([^"]+)"')
-    for urls_page in urls_page1:
-        urls_page += "=="   # base64.decode no decodifica si no tiene al final "=="
-        urls_page = base64.b64decode(urls_page)
-        if "repro.live" in urls_page:
-            data1 = httptools.downloadpage(urls_page, headers = headers).data
-            urls_page1 = scrapertools.find_multiple_matches(data1, 'source src="([^"]+)')
-            for urls_page in urls_page1:
-                new_data.append(urls_page)
-        else:
-            new_data.append(urls_page)
-
-
-def newest(categoria):
-    logger.info()
-    itemlist = []
-    item = Item()
-    # categoria='peliculas'
-    try:
-        if categoria == 'peliculas':
-            item.url = host + 'estrenos'
-        elif categoria == 'infantiles':
-            item.url = host + 'animacion'
-        elif categoria == 'terror':
-            item.url = host + 'terror'
-        itemlist = lista(item)
-        if itemlist[-1].title == 'Siguiente >>>':
-            itemlist.pop()
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
-    return itemlist
+# -*- coding: utf-8 -*-
+
+import re
+import urllib
+import base64
+
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core import tmdb
+from core import jsontools
+from core.item import Item
+from platformcode import config, logger
+from channelselector import get_thumb
+
+
+thumbletras = {'#': 'https://s32.postimg.cc/drojt686d/image.png',
+               'a': 'https://s32.postimg.cc/llp5ekfz9/image.png',
+               'b': 'https://s32.postimg.cc/y1qgm1yp1/image.png',
+               'c': 'https://s32.postimg.cc/vlon87gmd/image.png',
+               'd': 'https://s32.postimg.cc/3zlvnix9h/image.png',
+               'e': 'https://s32.postimg.cc/bgv32qmsl/image.png',
+               'f': 'https://s32.postimg.cc/y6u7vq605/image.png',
+               'g': 'https://s32.postimg.cc/9237ib6jp/image.png',
+               'h': 'https://s32.postimg.cc/812yt6pk5/image.png',
+               'i': 'https://s32.postimg.cc/6nbbxvqat/image.png',
+               'j': 'https://s32.postimg.cc/axpztgvdx/image.png',
+               'k': 'https://s32.postimg.cc/976yrzdut/image.png',
+               'l': 'https://s32.postimg.cc/fmal2e9yd/image.png',
+               'm': 'https://s32.postimg.cc/m19lz2go5/image.png',
+               'n': 'https://s32.postimg.cc/b2ycgvs2t/image.png',
+               'o': 'https://s32.postimg.cc/c6igsucpx/image.png',
+               'p': 'https://s32.postimg.cc/jnro82291/image.png',
+               'q': 'https://s32.postimg.cc/ve5lpfv1h/image.png',
+               'r': 'https://s32.postimg.cc/nmovqvqw5/image.png',
+               's': 'https://s32.postimg.cc/zd2t89jol/image.png',
+               't': 'https://s32.postimg.cc/wk9lo8jc5/image.png',
+               'u': 'https://s32.postimg.cc/w8s5bh2w5/image.png',
+               'v': 'https://s32.postimg.cc/e7dlrey91/image.png',
+               'w': 'https://s32.postimg.cc/fnp49k15x/image.png',
+               'x': 'https://s32.postimg.cc/dkep1w1d1/image.png',
+               'y': 'https://s32.postimg.cc/um7j3zg85/image.png',
+               'z': 'https://s32.postimg.cc/jb4vfm9d1/image.png'
+               }
+
+audio = {'Latino': '[COLOR limegreen]LATINO[/COLOR]', 'Español': '[COLOR yellow]ESPAÑOL[/COLOR]',
+         'Sub Español': '[COLOR red]SUB ESPAÑOL[/COLOR]'}
+
+host = 'http://pelisgratis.me/'
+
+
+def mainlist(item):
+    logger.info()
+
+    itemlist = []
+
+    itemlist.append(item.clone(title="Estrenos",
+                               action="lista",
+                               thumbnail=get_thumb('premieres', auto=True),
+                               url=host + 'estrenos'
+                               ))
+
+    itemlist.append(item.clone(title="Todas",
+                               action="lista",
+                               thumbnail=get_thumb('all', auto=True),
+                               url=host
+                               ))
+
+    itemlist.append(item.clone(title="Generos",
+                               action="seccion",
+                               url=host,
+                               thumbnail=get_thumb('genres', auto=True),
+                               extra='generos'
+                               ))
+
+    itemlist.append(item.clone(title="Alfabetico",
+                               action="seccion",
+                               url=host,
+                               thumbnail=get_thumb('alphabet', auto=True),
+                               extra='a-z'
+                               ))
+
+    itemlist.append(item.clone(title="Mas Vistas",
+                               action="lista",
+                               thumbnail=get_thumb('more watched', auto=True),
+                               url=host + 'peliculas-mas-vistas'
+                               ))
+
+    itemlist.append(item.clone(title="Mas Votadas",
+                               action="lista",
+                               thumbnail=get_thumb('more voted', auto=True),
+                               url=host + 'peliculas-mas-votadas'
+                               ))
+
+    itemlist.append(item.clone(title="Buscar",
+                               action="search",
+                               url=host + '?s=',
+                               thumbnail=get_thumb('search', auto=True)
+                               ))
+
+    return itemlist
+
+
+def get_source(url, referer=None):
+    logger.info()
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+
+def lista(item):
+    logger.info()
+    itemlist = []
+    data = get_source(item.url)
+    patron = 'article id=post-\d+.*?href=([^>]+)>.*?src=(.*?)\s.*?"Title">([^<]+)<(.*?)</a>.*?<p>([^<]+)</p>'
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedthumbnail, scrapedtitle, year_data, scrapedplot in matches:
+        year = scrapertools.find_single_match(year_data, 'Year>(\d{4})<')
+
+        url = scrapedurl
+        thumbnail = scrapedthumbnail
+        plot = scrapedplot
+        quality = ''
+        contentTitle = scrapedtitle
+        title = contentTitle
+        year = year
+
+        itemlist.append(item.clone(action='findvideos',
+                                   title=title,
+                                   url=url,
+                                   thumbnail=thumbnail,
+                                   plot=plot,
+                                   contentTitle=contentTitle,
+                                   quality=quality,
+                                   infoLabels={'year': year}
+                                   ))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    # Paginacion
+
+    if itemlist != []:
+        actual_page_url = item.url
+        next_page = scrapertools.find_single_match(data, 'href=([^>]+)>Siguiente &raquo;</a>')
+        if next_page != '':
+            itemlist.append(item.clone(action="lista",
+                                       title='Siguiente >>>',
+                                       url=next_page,
+                                       thumbnail='https://s32.postimg.cc/4zppxf5j9/siguiente.png'
+                                       ))
+    return itemlist
+
+
+def seccion(item):
+    logger.info()
+    itemlist = []
+    data = get_source(item.url)
+    if item.extra == 'generos':
+        patron = 'menu-item-object-category.*?<a href=([^<]+)>([^<]+)</a>'
+    elif item.extra == 'a-z':
+        patron = '<li><a href=([^<]+)>(\w|#)<\/a><\/li>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+        url = scrapedurl
+        thumbnail = ''
+        if item.extra == 'generos':
+            title = scrapedtitle
+        else:
+            title = scrapedtitle
+            if title.lower() in thumbletras:
+                thumbnail = thumbletras[title.lower()]
+
+        itemlist.append(item.clone(action='lista', title=title, url=url, thumbnail=thumbnail))
+
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = item.url + texto
+    if texto != '':
+        return lista(item)
+
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    global new_data
+    new_data = []
+    data = get_source(item.url)
+    data = data.replace("&lt;","<").replace("&quot;",'"').replace("&gt;",">").replace("&amp;","&").replace('\"',"")
+    patron = '<div class=TPlayerTb.*?id=(.*?)>.*?src=(.*?) frameborder'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for opt, urls_page in matches:
+        language = scrapertools.find_single_match (data,'TPlayerNv>.*?tplayernv=%s><span>Opción.*?<span>(.*?)</span>' % opt)
+        if 'trembed' in urls_page:
+            urls_page = scrapertools.decodeHtmlentities(urls_page)
+            sub_data = httptools.downloadpage(urls_page).data
+            urls_page = scrapertools.find_single_match(sub_data, 'src="([^"]+)" ')
+            if "repro.live" in urls_page:
+                server_repro(urls_page)
+            if "repros.live" in urls_page:
+                server_repros(urls_page)
+            if "itatroniks.com" in urls_page:
+                server_itatroniks(urls_page)
+        for url in new_data:
+            itemlist.append(item.clone(title='[%s][%s]',
+                            url=url,
+                            action='play',
+                            language=language,
+                            ))
+        new_data = []
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % (x.server.capitalize(), x.language))
+    return itemlist
+
+
+def server_itatroniks(urls_page):
+    logger.info()
+    headers = {"Referer":urls_page}
+    id = scrapertools.find_single_match(urls_page, 'embed/(\w+)')
+    sub_data = httptools.downloadpage(urls_page, headers = headers).data
+    matches = scrapertools.find_multiple_matches(sub_data, 'button id="([^"]+)')
+    headers1 = ({"X-Requested-With":"XMLHttpRequest"})
+    for serv in matches:
+        data1 = httptools.downloadpage("https://itatroniks.com/get/%s/%s" %(id, serv), headers = headers1).data
+        data_json = jsontools.load(data1)
+        urls_page = ""
+        try:
+            if "finished" == data_json["status"]: urls_page = "https://%s/embed/%s" %(data_json["server"], data_json["extid"])
+            if "propio" == data_json["status"]: urls_page = "https://%s/e/%s" %(data_json["server"], data_json["extid"])
+        except:
+            continue
+        new_data.append(urls_page)
+
+
+def server_repros(urls_page):
+    logger.info()
+    headers  = {"Referer":host}
+    headers1 = {"X-Requested-With":"XMLHttpRequest"}
+    sub_data = httptools.downloadpage(urls_page, headers = headers).data
+    urls_page1 = scrapertools.find_multiple_matches(sub_data, 'data-embed="([^"]+)"')
+    for idurl in urls_page1:
+        #post = {"codigo":idurl}
+        #post = urllib.urlencode(post)
+        dd1 = httptools.downloadpage("https://repros.live/player/ajaxdata", post = urllib.urlencode({"codigo":idurl}), headers = headers1).data
+        data_json = jsontools.load(dd1)
+        new_data.append(data_json["url"])
+
+
+def server_repro(urls_page):
+    logger.info()
+    headers = {"Referer":urls_page}
+    sub_data = httptools.downloadpage(urls_page, headers = headers).data
+    urls_page1 = scrapertools.find_multiple_matches(sub_data, 'data-embed="([^"]+)"')
+    for urls_page in urls_page1:
+        urls_page += "=="   # base64.decode no decodifica si no tiene al final "=="
+        urls_page = base64.b64decode(urls_page)
+        if "repro.live" in urls_page:
+            data1 = httptools.downloadpage(urls_page, headers = headers).data
+            urls_page1 = scrapertools.find_multiple_matches(data1, 'source src="([^"]+)')
+            for urls_page in urls_page1:
+                new_data.append(urls_page)
+        else:
+            new_data.append(urls_page)
+
+
+def newest(categoria):
+    logger.info()
+    itemlist = []
+    item = Item()
+    # categoria='peliculas'
+    try:
+        if categoria == 'peliculas':
+            item.url = host + 'estrenos'
+        elif categoria == 'infantiles':
+            item.url = host + 'animacion'
+        elif categoria == 'terror':
+            item.url = host + 'terror'
+        itemlist = lista(item)
+        if itemlist[-1].title == 'Siguiente >>>':
+            itemlist.pop()
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("{0}".format(line))
+        return []
+
+    return itemlist
diff --git a/plugin.video.alfa/channels/pelismagnet.py b/plugin.video.alfa/channels/pelismagnet.py
index 414e772a..70bec39e 100644
--- a/plugin.video.alfa/channels/pelismagnet.py
+++ b/plugin.video.alfa/channels/pelismagnet.py
@@ -348,7 +348,7 @@ def listado(item):
             title = re.sub(r'- $', '', title)
 
             #Limpiamos el título de la basura innecesaria
-            title = re.sub(r'TV|Online|Spanish|Torrent|en Espa\xc3\xb1ol|Español|Latino|Subtitulado|Blurayrip|Bluray rip|\[.*?\]|R2 Pal|\xe3\x80\x90 Descargar Torrent \xe3\x80\x91|Completa|Temporada|Descargar|Torren', '', title, flags=re.IGNORECASE)
+            title = re.sub(r'(?i)TV|Online|Spanish|Torrent|en Espa\xc3\xb1ol|Español|Latino|Subtitulado|Blurayrip|Bluray rip|\[.*?\]|R2 Pal|\xe3\x80\x90 Descargar Torrent \xe3\x80\x91|Completa|Temporada|Descargar|Torren', '', title)
 
             #Terminamos de limpiar el título
             title = re.sub(r'\??\s?\d*?\&.*', '', title)
diff --git a/plugin.video.alfa/channels/pelismundo.py b/plugin.video.alfa/channels/pelismundo.py
index a7a2ceb4..b73e9d2f 100644
--- a/plugin.video.alfa/channels/pelismundo.py
+++ b/plugin.video.alfa/channels/pelismundo.py
@@ -12,7 +12,7 @@ from core import tmdb
 from core.item import Item
 from platformcode import config, logger
 
-host = "http://www.pelismundo.com"
+host = "https://www.pelisvips.com"
 idiomas = {"Castellano":"CAST","Subtitulad":"VOSE","Latino":"LAT"}
 
 def mainlist(item):
@@ -209,17 +209,14 @@ def findvideos(item):
                                    ))
     tmdb.set_infoLabels(itemlist)
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    if itemlist:
+    if itemlist and item.contentChannel != "videolibrary":
         itemlist.append(Item(channel = item.channel))
         itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="",
                                    text_color="magenta"))
-        # Opción "Añadir esta película a la biblioteca de KODI"
-        if item.extra != "library":
-            if config.get_videolibrary_support():
-                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
-                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
-                                     fulltitle = item.contentTitle
-                                     ))
+        if config.get_videolibrary_support():
+            itemlist.append(item.clone(title="Añadir a la videoteca", text_color="green",
+                                 action="add_pelicula_to_library", url=item.url, fulltitle = item.contentTitle
+                                 ))
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/pelisplanet.py b/plugin.video.alfa/channels/pelisplanet.py
index 996d72f4..efb30e9d 100644
--- a/plugin.video.alfa/channels/pelisplanet.py
+++ b/plugin.video.alfa/channels/pelisplanet.py
@@ -200,7 +200,6 @@ def peliculas(item):
 
     paginacion = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)">')
     if paginacion:
-
         itemlist.append(Item(channel=item.channel, action="peliculas",
                              title="» Siguiente »", url=paginacion, plot="Página Siguiente",
                              thumbnail='https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/next.png'))
@@ -219,7 +218,7 @@ def generos(item):
     logger.info()
     itemlist = []
 
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     # logger.info(data)
     patron = '<div class="todos">.*?'
@@ -270,8 +269,9 @@ def findvideos(item):
                 server = servertools.get_server_from_url(scrapedurl)
                 quality = scrapertools.find_single_match(
                     datas, '<p class="hidden-xs hidden-sm">.*?class="magnet-download">([^<]+)p</a>')
-                title = "Ver en: [COLOR yellowgreen][{}][/COLOR] [COLOR yellow][{}][/COLOR]".format(servidores.capitalize(),
-                                                                                                    quality.upper())
+                title = "Ver en: [COLOR yellowgreen][{}][/COLOR] [COLOR yellow][{}][/COLOR]".format(
+                    servidores.capitalize(),
+                    quality.upper())
 
                 itemlist.append(item.clone(action='play', title=title, url=scrapedurl, quality=item.quality,
                                            server=server, language=lang.replace('Español ', ''),
diff --git a/plugin.video.alfa/channels/pelisplay.py b/plugin.video.alfa/channels/pelisplay.py
index 50e920cc..25ef007f 100644
--- a/plugin.video.alfa/channels/pelisplay.py
+++ b/plugin.video.alfa/channels/pelisplay.py
@@ -173,6 +173,8 @@ def p_portipo(item):
 def peliculas(item):
     logger.info()
     itemlist = []
+    # action = ''
+    # contentType = ''
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<br>", "", data)
     patron = '<img class="posterentrada" src="/([^"]+)".*?'         # img
@@ -184,12 +186,22 @@ def peliculas(item):
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedthumbnail, scrapedurl, year, plot, scrapedtitle in matches:
+        if 'serie' in scrapedurl:
+            action = 'temporadas'
+            contentType = 'tvshow'
+            title = scrapedtitle + ' [COLOR blue](Serie)[/COLOR]'
+
+        else:
+            action = 'findvideos'
+            contentType = 'movie'
+            title = scrapedtitle
+
         if item.infoLabels['plot'] == '':
             item.plot = plot
 
-        itemlist.append(Item(channel=item.channel, action="findvideos", contentTitle=scrapedtitle,
+        itemlist.append(Item(channel=item.channel, action=action, contentTitle=scrapedtitle, contentType=contentType,
                              infoLabels={"year": year}, thumbnail=host + scrapedthumbnail,
-                             url=scrapedurl, title=scrapedtitle, plot=plot))
+                             url=scrapedurl, title=title, plot=plot))
 
     tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__)
 
@@ -308,7 +320,8 @@ def temporadas(item):
                              text_color=color1, thumbnail=get_thumb("videolibrary_tvshow.png"), fanart=fanart_host))
         return itemlist
     else:
-        return episdesxseason(item)
+        return episodesxseason(item)
+
 
 def episodios(item):
     logger.info()
@@ -339,12 +352,12 @@ def episodesxseason(item):
         episode = element['metas_formateadas']['nepisodio']
         season = element['metas_formateadas']['ntemporada']
         scrapedurl = element['url_directa']
+
         if 'season' in item.infoLabels and int(item.infoLabels['season']) != int(season):
             continue
-        title = "%sx%s: %s" % (season, episode.zfill(
-            2), scrapertools.unescape(scrapedname))
-        new_item = item.clone(title=title, url=scrapedurl, action="findvideos", text_color=color3, fulltitle=title,
-                              contentType="episode", extra='serie')
+        title = "%sx%s: %s" % (season, episode.zfill(2), scrapertools.unescape(scrapedname))
+        new_item = item.clone(title=title, url=scrapedurl, action="findvideos", text_color=color3,
+                              fulltitle=title, contentType="episode", extra='serie')
         if 'infoLabels' not in new_item:
             new_item.infoLabels = {}
         new_item.infoLabels['season'] = season
@@ -365,11 +378,7 @@ def episodesxseason(item):
     itemlist.sort(key=lambda it: int(it.infoLabels['episode']),
                   reverse=config.get_setting('orden_episodios', __channel__))
     tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__)
-    # Opción "Añadir esta serie a la videoteca"
-    # if config.get_videolibrary_support() and len(itemlist) > 0:
-    #     itemlist.append(Item(channel=__channel__, title="Añadir esta serie a la videoteca", url=item.url,
-    #                          action="add_serie_to_library", extra="episodios", show=item.show, category="Series",
-    #                          text_color=color1, thumbnail=get_thumb("videolibrary_tvshow.png"), fanart=fanart_host))
+
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/pelisplus.py b/plugin.video.alfa/channels/pelisplus.py
index 90d249e5..17a9f985 100644
--- a/plugin.video.alfa/channels/pelisplus.py
+++ b/plugin.video.alfa/channels/pelisplus.py
@@ -148,7 +148,7 @@ def seasons(item):
     itemlist=[]
 
     data=get_source(item.url)
-    patron='data-toggle="tab">TEMPORADA.?(\d+)</a>'
+    patron='data-toggle="tab">TEMPORADA\s?(\d+)</a>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     infoLabels = item.infoLabels
@@ -216,6 +216,28 @@ def section(item):
     return itemlist
 
 
+def add_vip(item, video_url, language=None):
+    logger.info()
+    itemlist = []
+    referer = video_url
+    post = {'r': item.url, 'd': 'www.pelisplus.net'}
+    post = urllib.urlencode(post)
+    video_url = video_url.replace('/v/', '/api/source/')
+    url_data = httptools.downloadpage(video_url, post=post, headers={'Referer': referer}).data
+    patron = '"file":"([^"]+)","label":"([^"]+)"'
+    matches = re.compile(patron, re.DOTALL).findall(url_data)
+    if not config.get_setting('unify'):
+        title = ' [%s]' % language
+    else:
+        title = ''
+
+    for url, quality in matches:
+        url = url.replace('\/', '/')
+        itemlist.append(
+            Item(channel=item.channel, title='%s'+title, url=url, action='play', language=language,
+                 quality=quality, infoLabels=item.infoLabels))
+    return itemlist
+
 def findvideos(item):
     logger.info()
     import urllib
@@ -227,34 +249,22 @@ def findvideos(item):
 
     for video_url in matches:
         language = 'latino'
+        url = ''
         if not config.get_setting('unify'):
-            title = ' [%s]' % language.capitalize()
+            title = ' [%s]' % IDIOMAS[language]
         else:
             title = ''
 
         if 'pelisplus.net' in video_url:
-            referer = video_url
-            post = {'r':item.url, 'd': 'www.pelisplus.net'}
-            post = urllib.urlencode(post)
-            video_url = video_url.replace('/v/', '/api/source/')
-            url_data = httptools.downloadpage(video_url, post=post, headers={'Referer':referer}).data
-            patron = '"file":"([^"]+)","label":"([^"]+)"'
-            matches = re.compile(patron, re.DOTALL).findall(url_data)
-            for url, quality in matches:
-                url = 'https://www.pelisplus.net' + url.replace('\/', '/')
-                itemlist.append(
-                    Item(channel=item.channel, title='%s' + title, url=url, action='play', language=IDIOMAS[language],
-                         quality=quality, infoLabels=item.infoLabels))
+            itemlist += add_vip(item, video_url, IDIOMAS[language])
 
-        else:
-            if not 'vidoza' in video_url:
-                url_data = get_source(video_url)
-
-
-        if 'vidoza' not in video_url:
+        elif not 'vidoza' in video_url and not 'pelishd' in video_url:
+            url_data = get_source(video_url)
             url = scrapertools.find_single_match(url_data, '<iframe src="([^"]+)"')
+
         else:
             url = video_url
+
         if not 'server' in url:
             url = url
 
@@ -262,14 +272,21 @@ def findvideos(item):
                 vip_data = httptools.downloadpage(url, headers={'Referer':item.url}, follow_redirects=False)
                 try:
                     dejuiced = generictools.dejuice(vip_data.data)
-                    url = scrapertools.find_single_match(dejuiced, '"file":"([^"]+)"')
+                    urls = scrapertools.find_multiple_matches(dejuiced, '"file":"([^"]+)","label":"([^"]+)"')
+                    for new_url, quality in urls:
+                        new_url = new_url.replace('unicorn', 'dragon')
+                        new_url = new_url + '|referer:%s' % url
+                        itemlist.append(
+                            Item(channel=item.channel, title='%s' + title, url=new_url, action='play',
+                                 language=IDIOMAS[language], quality=quality, infoLabels=item.infoLabels))
                 except:
                     pass
 
-        if url != '' and 'rekovers' not in url:
+        if url != '' and 'rekovers' not in url and not 'pelishd' in url:
             itemlist.append(Item(channel=item.channel, title='%s'+title, url=url, action='play', language=IDIOMAS[language],
             infoLabels=item.infoLabels))
 
+
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
 
     # Requerido para FilterTools
diff --git a/plugin.video.alfa/channels/pelisplusco.py b/plugin.video.alfa/channels/pelisplusco.py
index 570a4082..4f199b29 100644
--- a/plugin.video.alfa/channels/pelisplusco.py
+++ b/plugin.video.alfa/channels/pelisplusco.py
@@ -324,14 +324,15 @@ def season_episodes(item):
     logger.info()
     itemlist = []
 
-    full_data = httptools.downloadpage(item.url).data
+    full_data = httptools.downloadpage(item.url+'/').data
     full_data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", full_data)
+
     season = str(item.infoLabels['season'])
     if int(season) <= 9:
         season = '0'+season
     data = scrapertools.find_single_match(full_data, '</i>Temporada %s</div>(.*?)(?:down arrow|cuadre_comments)' % season)
     patron = '<a href="([^"]+)" title=".*?i-play"><\/i> (.*?)<\/a>'
-    matches = matches = re.compile(patron, re.DOTALL).findall(data)
+    matches = re.compile(patron, re.DOTALL).findall(data)
     infoLabels = item.infoLabels
     for url, episode in matches:
         episodenumber = re.sub('C.* ','',episode)
@@ -354,7 +355,7 @@ def get_links_by_language(item, data):
     video_list = []
 
     language = scrapertools.find_single_match(data, 'ul id="level\d_([^"]+)"\s*class=')
-    patron = 'data-source="([^"]+)"data-quality="([^"]+)"data-srt="([^"]+)"'
+    patron = 'data-source="([^"]+)"data-quality="([^"]+)"data-srt="([^"]+)?"'
     matches = re.compile(patron, re.DOTALL).findall(data)
     if language in IDIOMAS:
         language = IDIOMAS[language]
@@ -399,7 +400,6 @@ def findvideos(item):
         new_url = base_url.replace('/serie/', '/player/serie/')
         new_url += '|%s|%s/'  % (item.contentSeason, item.contentEpisodeNumber)
     data = get_source(new_url, referer=item.url)
-
     patron_language ='(<ul id="level\d_.*?"*class=.*?ul>)'
     matches = re.compile(patron_language, re.DOTALL).findall(data)
 
diff --git a/plugin.video.alfa/channels/goodpelis.json b/plugin.video.alfa/channels/pelisrex.json
similarity index 61%
rename from plugin.video.alfa/channels/goodpelis.json
rename to plugin.video.alfa/channels/pelisrex.json
index d4811917..7f40359b 100644
--- a/plugin.video.alfa/channels/goodpelis.json
+++ b/plugin.video.alfa/channels/pelisrex.json
@@ -1,30 +1,37 @@
 {
-  "id": "goodpelis",
-  "name": "GoodPelis",
-  "active": false,
+  "id": "pelisrex",
+  "name": "PelisRex",
+  "active": true,
   "adult": false,
   "language": ["lat"],
-  "thumbnail": "http://goodpelis.net/wp-content/uploads/2017/11/Logo-GP.png",
+  "thumbnail": "https://www.pelisrex.com/wp-content/uploads/2018/11/hjko.png",
   "banner": "",
+  "version": 1,
   "categories": [
-    "movie"
+    "movie",
+    "vos"
   ],
   "settings": [
     {
       "id": "include_in_global_search",
       "type": "bool",
       "label": "Incluir en busqueda global",
-      "default": true,
-      "enabled": true,
-      "visible": true
+      "default": false,
+      "enabled": false,
+      "visible": false
     },
     {
-      "id": "include_in_newest_latino",
-      "type": "bool",
-      "label": "Incluir en Novedades - Latino",
-      "default": true,
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
       "enabled": true,
-      "visible": true
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "LAT",
+        "VOSE"
+      ]
     },
     {
       "id": "include_in_newest_peliculas",
@@ -42,6 +49,14 @@
       "enabled": true,
       "visible": true
     },
+    {
+      "id": "include_in_newest_latino",
+      "type": "bool",
+      "label": "Incluir en Novedades - latino",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
     {
       "id": "include_in_newest_terror",
       "type": "bool",
diff --git a/plugin.video.alfa/channels/pelisrex.py b/plugin.video.alfa/channels/pelisrex.py
new file mode 100644
index 00000000..b14c5cbd
--- /dev/null
+++ b/plugin.video.alfa/channels/pelisrex.py
@@ -0,0 +1,321 @@
+# -*- coding: utf-8 -*-
+# -*- Channel PelisRex -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the Alfa Develop Group -*-
+
+import re
+import urllib
+from channelselector import get_thumb
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core import tmdb
+from core.item import Item
+from platformcode import config, logger
+from channels import autoplay
+from channels import filtertools
+
+
+
+host = 'https://www.pelisrex.com/'
+
+IDIOMAS = {'Latino': 'LAT', 'Subtitulada': 'VOSE'}
+list_language = IDIOMAS.values()
+list_quality = []
+list_servers = ['gounlimited', 'rapidvideo', 'vshare', 'clipwatching', 'jawclowd', 'streamango']
+
+
+def mainlist(item):
+    logger.info()
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist = list()
+
+    itemlist.append(Item(channel=item.channel, title="Películas", action="sub_menu", url=host,
+                         thumbnail=get_thumb('last', auto=True), type='MovieList'))
+
+    itemlist.append(Item(channel=item.channel, title="Series", action="sub_menu", url=host,
+                         thumbnail=get_thumb('last', auto=True), type='Series'))
+
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + '?s=',
+                         thumbnail=get_thumb('search', auto=True)))
+
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+
+def sub_menu(item):
+    logger.info()
+
+    itemlist = []
+
+    itemlist.append(Item(channel=item.channel, title="Ultimas", action="list_all", url=host,
+                         thumbnail=get_thumb('last', auto=True), type=item.type))
+
+    itemlist.append(Item(channel=item.channel, title="Generos", action="section", section='genre',
+                         thumbnail=get_thumb('genres', auto=True), type=item.type ))
+
+    if item.type != 'Series':
+        itemlist.append(Item(channel=item.channel, title="Alfabetico", action="section", section='alpha',
+                             thumbnail=get_thumb('alphabet', auto=True), type=item.type))
+
+
+
+    return itemlist
+
+def get_source(url, referer=None):
+    logger.info()
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+
+def list_all(item):
+    logger.info()
+    itemlist = []
+
+    data = get_source(item.url)
+    full_data = data
+    if item.section != '':
+        data = scrapertools.find_single_match(data, 'class="MovieList NoLmtxt(.*?)</ul>')
+    else:
+        data = scrapertools.find_single_match(data, '<!--<%s>.*?class="MovieList NoLmtxt(.*?)</ul>' % item.type)
+
+    if item.section == 'alpha':
+        patron = '<span class="Num">\d+.*?<a href="([^"]+)" class.*?<img src="([^"]+)" alt=.*?'
+        patron += '<strong>([^"]+)</strong>.*?<td>(\d{4})</td>'
+        matches = re.compile(patron, re.DOTALL).findall(full_data)
+    else:
+        patron = '<article.*?<a href="(.*?)">.*?<img src="(.*?)" alt=.*?'
+        patron += '<h3 class="Title">(.*?)<\/h3>.*?date_range">(\d+)<'
+        matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle, year in matches:
+
+        url = scrapedurl
+        if year == '':
+            year = '-'
+        if "|" in scrapedtitle:
+            scrapedtitle= scrapedtitle.split("|")
+            cleantitle = scrapedtitle[0].strip()
+        else:
+            cleantitle = scrapedtitle
+
+        cleantitle = re.sub('\(.*?\)', '', cleantitle)
+
+        if not config.get_setting('unify'):
+            title = '%s [%s]'%(cleantitle, year)
+        else:
+            title = cleantitle
+        thumbnail = 'http:'+scrapedthumbnail
+
+        new_item = Item(channel=item.channel,
+                        title=title,
+                        url=url,
+                        thumbnail=thumbnail,
+                        infoLabels = {'year': year}
+                        )
+
+        if 'series' not in url:
+            new_item.contentTitle = cleantitle
+            new_item.action='findvideos'
+
+        else:
+            new_item.contentSerieName = cleantitle
+            new_item.action = 'seasons'
+
+        itemlist.append(new_item)
+
+    tmdb.set_infoLabels_itemlist(itemlist, True)
+
+    #  Paginación
+
+    url_next_page = scrapertools.find_single_match(full_data,'<a class="next.*?href="([^"]+)">')
+    if url_next_page:
+        itemlist.append(Item(channel=item.channel, title="Siguiente >>", url=url_next_page, action='list_all',
+                             type=item.type))
+    return itemlist
+
+def section(item):
+    logger.info()
+    itemlist = []
+
+    if item.type == 'Series':
+        url = host + '?tr_post_type=2'
+    else:
+        url = host + '?tr_post_type=1'
+
+    data = get_source(url)
+    action = 'list_all'
+
+
+    if item.section == 'genre':
+        patron = '<a href="([^ ]+)" class="Button STPb">(.*?)</a>'
+    elif item.section == 'alpha':
+        patron = '<li><a href="(.*?letter.*?)">(.*?)</a>'
+        action = 'list_all'
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for data_one, data_two in matches:
+
+        url = data_one
+        title = data_two
+        if title != 'Ver más':
+            if item.type == 'Series':
+                url =url + '?tr_post_type=2'
+            else:
+                url = url + '?tr_post_type=1'
+                if 'serie'in title.lower():
+                    continue
+            new_item = Item(channel=item.channel, title= title, url=url, action=action, section=item.section,
+                            type=item.type)
+            itemlist.append(new_item)
+
+    return itemlist
+
+
+def seasons(item):
+    logger.info()
+
+    itemlist=[]
+
+    data=get_source(item.url)
+    patron='Temporada <span>(\d+)'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    infoLabels = item.infoLabels
+    for season in matches:
+        season = season.lower().replace('temporada','')
+        infoLabels['season']=season
+        title = 'Temporada %s' % season
+        itemlist.append(Item(channel=item.channel, title=title, url=item.url, action='episodesxseasons',
+                             infoLabels=infoLabels))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+                Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                     action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName))
+
+    return itemlist
+
+def episodios(item):
+    logger.info()
+    itemlist = []
+    templist = seasons(item)
+    for tempitem in templist:
+        itemlist += episodesxseasons(tempitem)
+
+    return itemlist
+
+def episodesxseasons(item):
+    logger.info()
+
+    itemlist = []
+
+    full_data=get_source(item.url)
+    data = scrapertools.find_single_match(full_data, 'Temporada <span>\d+.*?</ul>')
+    patron='<span class="Num">(\d+)<.*?<a href="([^"]+)".*?"MvTbTtl".*?">([^<]+)<'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    infoLabels = item.infoLabels
+
+    for scrapedepisode, scrapedurl, scrapedtitle in matches:
+
+        infoLabels['episode'] = scrapedepisode
+        url = scrapedurl
+        title = '%sx%s - %s' % (infoLabels['season'], infoLabels['episode'], scrapedtitle)
+
+        itemlist.append(Item(channel=item.channel, title= title, url=url, action='findvideos', infoLabels=infoLabels))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+
+
+def findvideos(item):
+    logger.info()
+
+    itemlist = []
+    data = get_source(item.url)
+    data = scrapertools.decodeHtmlentities(data)
+    patron = 'id="(Opt\d+)">.*?src="([^"]+)" frameborder.*?</iframe>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for option, scrapedurl in matches:
+        scrapedurl = scrapedurl.replace('"','').replace('&#038;','&')
+        data_video = get_source(scrapedurl)
+        url = scrapertools.find_single_match(data_video, '<div class="Video">.*?src="([^"]+)" frameborder')
+        opt_data = scrapertools.find_single_match(data,'"%s"><span>.*?</span>.*?<span>(.*?)</span>'%option).split('-')
+        language = opt_data[0].strip()
+        language = re.sub('\(|\)', '', language)
+        quality = opt_data[1].strip()
+        if url != '' and 'youtube' not in url:
+            itemlist.append(Item(channel=item.channel, title='%s', url=url, language=IDIOMAS[language], quality=quality,
+                                 action='play', infoLabels=item.infoLabels))
+        elif 'youtube' in url:
+            trailer = Item(channel=item.channel, title='Trailer', url=url, action='play', server='youtube')
+
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % '%s [%s] [%s]'%(i.server.capitalize(),
+                                                                                              i.language, i.quality))
+    try:
+        itemlist.append(trailer)
+    except:
+        pass
+
+    # Requerido para FilterTools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+        itemlist.append(
+            Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+                 action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle))
+
+
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = item.url + texto
+    item.section = 'search'
+    if texto != '':
+        return list_all(item)
+    else:
+        return []
+
+
+def newest(categoria):
+    logger.info()
+    itemlist = []
+    item = Item()
+    try:
+        if categoria in ['peliculas','latino']:
+            item.url = host
+        elif categoria == 'infantiles':
+            item.url = host+'animacion/?tr_post_type=1'
+        elif categoria == 'terror':
+            item.url = host+'terror/?tr_post_type=1'
+        item.type = 'MovieList'
+        item.section = 'search'
+        itemlist = list_all(item)
+        if itemlist[-1].title == 'Siguiente >>':
+            itemlist.pop()
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("{0}".format(line))
+        return []
+
+    return itemlist
diff --git a/plugin.video.alfa/channels/pelix.json b/plugin.video.alfa/channels/pelix.json
new file mode 100644
index 00000000..56e91975
--- /dev/null
+++ b/plugin.video.alfa/channels/pelix.json
@@ -0,0 +1,78 @@
+{
+"id": "pelix",
+  "name": "Pelix",
+  "active": true,
+  "adult": false,
+  "language": ["lat", "cast"],
+  "thumbnail": "https://pelix.tv/build/images/logo.png",
+  "banner": "",
+  "categories": [
+    "movie",
+    "tvshow"
+  ],
+  "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "Latino",
+        "Castellano",
+        "VOSE"
+      ]
+    },
+    {
+      "id": "include_in_newest_peliculas",
+      "type": "bool",
+      "label": "Incluir en Novedades - Peliculas",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_infantiles",
+      "type": "bool",
+      "label": "Incluir en Novedades - Infantiles",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_terror",
+      "type": "bool",
+      "label": "Incluir en Novedades - terror",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    }
+  ]
+}
diff --git a/plugin.video.alfa/channels/pelix.py b/plugin.video.alfa/channels/pelix.py
new file mode 100644
index 00000000..ee58bd00
--- /dev/null
+++ b/plugin.video.alfa/channels/pelix.py
@@ -0,0 +1,352 @@
+# -*- coding: utf-8 -*-
+# -*- Channel Pelix -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the Alfa Develop Group -*-
+
+import re
+import urllib
+import base64
+
+from channelselector import get_thumb
+from core import httptools
+from core import jsontools
+from core import scrapertools
+from core import servertools
+from core import tmdb
+from lib import jsunpack
+from core.item import Item
+from channels import filtertools
+from channels import autoplay
+from platformcode import config, logger
+
+
+IDIOMAS = {'6': 'Latino', '7': 'Castellano'}
+list_language = IDIOMAS.values()
+CALIDADES = {'1': '1080p', '3': '720p', '4':'720p'}
+list_quality = CALIDADES.values()
+
+list_servers = [
+    'openload',
+    'streamango',
+    'fastplay',
+    'rapidvideo',
+    'netutv'
+]
+
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'pelix')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'pelix')
+
+host = 'https://pelix.tv/'
+
+def mainlist(item):
+    logger.info()
+
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist = []
+
+    itemlist.append(Item(channel=item.channel, title='Peliculas', action='menu_movies',
+                         thumbnail= get_thumb('movies', auto=True), page=0))
+    itemlist.append(Item(channel=item.channel, title='Series', url=host+'home/genero/5', action='list_all',
+                         type='tvshows', thumbnail= get_thumb('tvshows', auto=True), page=0))
+    itemlist.append(
+        item.clone(title="Buscar", action="search", url=host + 'movies/headserach', thumbnail=get_thumb("search", auto=True),
+                   extra='movie'))
+
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+def menu_movies(item):
+    logger.info()
+
+    itemlist=[]
+
+    itemlist.append(Item(channel=item.channel, title='Ultimas', url=host, path='home/newest?show=', action='list_all',
+                         thumbnail=get_thumb('last', auto=True), type='movies', page=0))
+
+    #itemlist.append(Item(channel=item.channel, title='Mas Vistas', url=host, path='home/views?show=', action='list_all',
+    #                     thumbnail=get_thumb('all', auto=True), type='movies', page=0))
+
+    itemlist.append(Item(channel=item.channel, title='Genero', action='section',
+                         thumbnail=get_thumb('genres', auto=True), type='movies'))
+    itemlist.append(Item(channel=item.channel, title='Por Año', action='section',
+                         thumbnail=get_thumb('year', auto=True), type='movies'))
+
+    return itemlist
+
+def get_source(url):
+    logger.info()
+    data = httptools.downloadpage(url).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+
+def get_language(lang_data):
+    logger.info()
+    language = []
+    lang_list = scrapertools.find_multiple_matches(lang_data, '/flags/(.*?).png\)')
+    for lang in lang_list:
+        if lang == 'en':
+            lang = 'vose'
+        if lang not in language:
+            language.append(lang)
+    return language
+
+def section(item):
+    logger.info()
+    itemlist=[]
+    data = get_source(host)
+    if 'Genero' in item.title:
+        data = scrapertools.find_single_match(data, '<a href="#">Género</a>(.*?)</ul>')
+    elif 'Año' in item.title:
+        data = scrapertools.find_single_match(data, '<a href="#">Año</a>(.*?)</ul>')
+
+    patron = '<a href="([^"]+)">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+        itemlist.append(Item(channel=item.channel, url=scrapedurl, title=scrapedtitle, action='list_all',
+                             type=item.type, page=0))
+
+    return itemlist
+
+
+def list_all(item):
+    logger.info()
+    import urllib
+    itemlist = []
+    if item.page == 0:
+        data = get_source(item.url+item.path)
+    else:
+        post = {'page': str(item.page)}
+        post = urllib.urlencode(post)
+        data = httptools.downloadpage(host+'home/%sAjax/%s' % ('newest', str(item.page)), post=post).data
+        data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+
+    patron = '<div class="base-used">.*?<a href="([^"]+)">.*?<img class="img-thumbnail" src="([^"]+)".*?'
+    patron += '<h2>([^<]+)</h2><p class="year">(\d{4})</p>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle, year in matches:
+
+        title = '%s [%s]' % (scrapedtitle, year)
+        contentTitle = scrapedtitle
+        thumbnail = scrapedthumbnail
+        url = scrapedurl
+
+        new_item= Item(channel=item.channel,
+                       title=title,
+                       url=url,
+                       thumbnail=thumbnail,
+                       infoLabels={'year':year})
+
+        if item.type == 'movies':
+            new_item.action = 'findvideos'
+            new_item.contentTitle = contentTitle
+        else:
+            new_item.action = 'seasons'
+            new_item.contentSerieName = contentTitle
+
+        itemlist.append(new_item)
+
+    tmdb.set_infoLabels(itemlist, seekTmdb=True)
+    #  Paginación
+
+    next_page = item.page + 30
+    itemlist.append(item.clone(title="Siguiente >>", url=item.url, action='list_all', page=next_page, path=item.path))
+
+    return itemlist
+
+def seasons(item):
+    logger.info()
+
+    itemlist=[]
+
+    data=get_source(item.url)
+    patron='data-type="host">(Temporada \d+)<'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    if matches is None:
+        return findvideos(item)
+    infoLabels = item.infoLabels
+    for season in matches:
+        season = season.lower().replace('temporada','')
+        infoLabels['season']=season
+        title = 'Temporada %s' % season
+        itemlist.append(Item(channel=item.channel, title=title, url=item.url, action='episodesxseasons',
+                             infoLabels=infoLabels))
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+                Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                     action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName))
+
+    return itemlist
+
+def episodios(item):
+    logger.info()
+    itemlist = []
+    templist = seasons(item)
+    for tempitem in templist:
+        itemlist += episodesxseasons(tempitem)
+
+    return itemlist
+
+def episodesxseasons(item):
+    logger.info()
+
+    itemlist = []
+    duplicados = []
+    data=get_source(item.url)
+    patron='data-id="(\d+)" season="%s" id_lang="(\d+)" id_movies_types="\d".*?' \
+           'block;">([^<]+)</a>' % item.infoLabels['season']
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    infoLabels = item.infoLabels
+
+    for scrapedepisode, lang, scrapedtitle in matches:
+
+        infoLabels['episode'] = scrapedepisode
+        url = item.url
+        title = '%sx%s - %s' % (infoLabels['season'], infoLabels['episode'], scrapedtitle)
+
+        if scrapedepisode not in duplicados:
+            itemlist.append(Item(channel=item.channel, title= title, url=url, action='findvideos', infoLabels=infoLabels))
+            duplicados.append(scrapedepisode)
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    return itemlist
+
+
+def findvideos(item):
+    logger.info()
+
+    itemlist = []
+
+    data = get_source(item.url)
+    if 'episode="0" season="0"' not in data and item.contentType != 'episode':
+        item.contentSerieName = item.contentTitle
+        item.contentTitle = None
+        item.contentType = None
+        item.infoLabels = None
+        tmdb.set_infoLabels_item(item, seekTmdb=True)
+        return seasons(item)
+
+    if 'episode="0" season="0"' not in data:
+        season = item.infoLabels['season']
+        episode = item.infoLabels['episode']
+    else:
+        season = '0'
+        episode = '0'
+
+    patron = '<span class="movie-online-list" id_movies_types="(\d)".*?'
+    patron += 'episode="%s" season="%s" id_lang="([^"]+)".*?online-link="([^"]+)" link-id="\d+">' % (episode, season)
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for quality_value, lang_value, scrapedurl in matches:
+
+        if lang_value not in IDIOMAS:
+            lang_value = '6'
+        if quality_value not in CALIDADES:
+            quality_value = '3'
+        language = IDIOMAS[lang_value]
+
+        quality = CALIDADES[quality_value]
+        if not config.get_setting("unify"):
+            title = ' [%s] [%s]' % (quality, language)
+        else:
+            title = ''
+        itemlist.append(Item(channel=item.channel, url=scrapedurl, title='%s'+title, action='play',
+                             language=language, quality=quality, infoLabels=item.infoLabels))
+
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+
+    # Requerido para Filtrar enlaces
+
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+
+    # Requerido para FilterTools
+
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+
+    itemlist = sorted(itemlist, key=lambda it: it.language)
+
+    if item.contentType != 'episode':
+        if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+            itemlist.append(
+                Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+                     action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle))
+
+    return itemlist
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    post = 'search=%s' % texto
+    item.post = post
+    item.url = item.url
+
+    if texto != '':
+        return search_results(item)
+    else:
+        return []
+
+def search_results(item):
+    logger.info()
+
+    itemlist=[]
+
+    headers = {'Referer': host, 'X-Requested-With': 'XMLHttpRequest'}
+    data = httptools.downloadpage(item.url, headers=headers, post=item.post).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    patron = 'class="results\d+".*?<a href="([^"]+)"><img src="([^"]+)".*?#\w+">([^<]+)<'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumb, scrapedtitle in matches:
+
+        if '(' in scrapedtitle:
+            title = scrapertools.find_single_match(scrapedtitle, '(.*?)\(').strip()
+            year = scrapertools.find_single_match(scrapedtitle, '\((\d+)\)')
+        else:
+            title = scrapedtitle
+            year = '-'
+        url = scrapedurl
+        thumbnail = scrapedthumb
+
+        new_item=Item(channel=item.channel, title=title, url=url, thumbnail=thumbnail,
+                             action='findvideos', infoLabels={'year':year})
+
+        itemlist.append(new_item)
+
+    return itemlist
+
+def newest(categoria):
+    logger.info()
+    itemlist = []
+    item = Item()
+    try:
+        item.type = 'movies'
+        item.page = 0
+        if categoria in ['peliculas']:
+            item.url = host + 'home/newest?show='
+        elif categoria == 'infantiles':
+            item.url = host + 'home/genero/54'
+        elif categoria == 'terror':
+            item.url = host + 'home/genero/49'
+        itemlist = list_all(item)
+        if itemlist[-1].title == 'Siguiente >>':
+            itemlist.pop()
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("{0}".format(line))
+        return []
+
+    return itemlist
diff --git a/plugin.video.alfa/channels/perfectgirls.py b/plugin.video.alfa/channels/perfectgirls.py
index 22b127a6..0a7a19d9 100644
--- a/plugin.video.alfa/channels/perfectgirls.py
+++ b/plugin.video.alfa/channels/perfectgirls.py
@@ -7,7 +7,6 @@ from core import scrapertools
 from core.item import Item
 from core import servertools
 from core import httptools
-from core import tmdb
 
 host = 'http://www.perfectgirls.net'
 
@@ -17,7 +16,6 @@ def mainlist(item):
     itemlist = []
     itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host))
     itemlist.append( Item(channel=item.channel, title="Top" , action="peliculas", url=host + "/top/3days/"))
-    
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
@@ -47,7 +45,8 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = ""
         url = urlparse.urljoin(item.url,scrapedurl) + "/1"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=url , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url,
+                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
@@ -61,24 +60,21 @@ def peliculas(item):
     patron  += '<time>(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,time in matches:
+    for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
         plot = ""
-        contentTitle = scrapedtitle
-        scrapedhd = scrapertools.find_single_match(time, '<div class="hd">([^"]+)</div>')
-        if scrapedhd == 'HD':
-            time = scrapertools.find_single_match(time, '([^"]+)</time>')
-            title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + scrapedhd  + "[/COLOR]  " + scrapedtitle
-        else:
-            time = scrapertools.find_single_match(time, '([^"]+)</time>')
+        time = scrapertools.find_single_match(duracion, '([^"]+)</time>')
+        if not 'HD' in duracion :
             title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
+        else:
+            title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR]  " + scrapedtitle
         scrapedthumbnail = "http:" + scrapedthumbnail
         url = urlparse.urljoin(item.url,scrapedurl)
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=scrapedthumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=scrapedthumbnail,
+                              plot=plot, contentTitle = title))
     next_page = scrapertools.find_single_match(data, '<a class="btn_wrapper__btn" href="([^"]+)">Next</a></li>')
     if next_page:
         next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>" , text_color="blue", url=next_page ))
+        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page ))
     return itemlist
 
 
@@ -89,6 +85,6 @@ def play(item):
     patron  = '<source src="([^"]+)" res="\d+" label="([^"]+)" type="video/mp4" default/>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle  in matches:
-        itemlist.append(item.clone(action="play", title=scrapedtitle, fulltitle = item.title, url=scrapedurl))
+        itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl))
     return itemlist
 
diff --git a/plugin.video.alfa/channels/pordede.json b/plugin.video.alfa/channels/pordede.json
deleted file mode 100644
index 65c0cde2..00000000
--- a/plugin.video.alfa/channels/pordede.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "id": "pordede",
-  "name": "Pordede",
-  "active": true,
-  "adult": false,
-  "language": ["cast"],
-  "thumbnail": "pordede.png",
-  "banner": "pordede.png",
-  "categories": [
-    "movie",
-    "tvshow"
-  ],
-  "settings": [
-    {
-      "id": "pordedeuser",
-      "type": "text",
-      "label": "@30014",
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "pordedepassword",
-      "type": "text",
-      "hidden": true,
-      "label": "@30015",
-      "enabled": "!eq(-1,'')",
-      "visible": true
-    },
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": false,
-      "enabled": "!eq(-1,'') + !eq(-2,'')",
-      "visible": true
-    },
-    {
-      "id": "pordedesortlinks",
-      "type": "list",
-      "label": "Ordenar enlaces",
-      "default": 0,
-      "enabled": true,
-      "visible": "!eq(-2,'') + !eq(-3,'')",
-      "lvalues": [
-        "No",
-        "Por no Reportes",
-        "Por Idioma",
-        "Por Calidad",
-        "Por Idioma y Calidad",
-        "Por Idioma y no Reportes",
-        "Por Idioma, Calidad y no Reportes"
-      ]
-    },
-    {
-      "id": "pordedeshowlinks",
-      "type": "list",
-      "label": "Mostrar enlaces",
-      "default": 0,
-      "enabled": true,
-      "visible": "!eq(-3,'') + !eq(-4,'')",
-      "lvalues": [
-        "Todos",
-        "Ver online",
-        "Descargar"
-      ]
-    },
-    {
-      "id": "pordedenumberlinks",
-      "type": "list",
-      "label": "Limitar número de enlaces",
-      "default": 0,
-      "enabled": true,
-      "visible": "!eq(-4,'') + !eq(-5,'')",
-      "lvalues": [
-        "No",
-        "5",
-        "10",
-        "15",
-        "20",
-        "25",
-        "30"
-      ]
-    }
-  ]
-}
diff --git a/plugin.video.alfa/channels/pordede.py b/plugin.video.alfa/channels/pordede.py
deleted file mode 100644
index 29347d39..00000000
--- a/plugin.video.alfa/channels/pordede.py
+++ /dev/null
@@ -1,665 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import re
-import sys
-import urlparse
-
-from core import channeltools
-from core import httptools
-from core import jsontools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from platformcode import platformtools
-
-def login():
-    url_origen = "http://www.pordede.com"
-    data = httptools.downloadpage(url_origen).data
-    if config.get_setting("pordedeuser", "pordede") in data:
-        return True
-
-    url = "http://www.pordede.com/api/login/auth?response_type=code&client_id=appclient&redirect_uri=http%3A%2F%2Fwww.pordede.com%2Fapi%2Flogin%2Freturn&state=none"
-    post = "username=%s&password=%s&authorized=autorizar" % (config.get_setting("pordedeuser", "pordede"), config.get_setting("pordedepassword", "pordede"))
-    data = httptools.downloadpage(url, post).data
-    if '"ok":true' in data:
-        return True
-    else:
-        return False
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-
-    if not config.get_setting("pordedeuser", "pordede"):
-       itemlist.append( Item( channel=item.channel , title="Habilita tu cuenta en la configuración..." , action="settingCanal" , url="") )
-    else:
-       result = login()
-       if not result:
-          itemlist.append(Item(channel=item.channel, action="mainlist", title="Login fallido. Volver a intentar..."))
-          return itemlist
-       itemlist.append( Item(channel=item.channel, action="menuseries"    , title="Series"                   , url="" ))
-       itemlist.append( Item(channel=item.channel, action="menupeliculas" , title="Películas y documentales" , url="" ))
-       itemlist.append( Item(channel=item.channel, action="listas_sigues" , title="Listas que sigues"        , url="http://www.pordede.com/lists/following" ))
-       itemlist.append( Item(channel=item.channel, action="tus_listas"    , title="Tus listas"               , url="http://www.pordede.com/lists/yours" ))
-       itemlist.append( Item(channel=item.channel, action="listas_sigues" , title="Top listas"               , url="http://www.pordede.com/lists" ))
-       itemlist.append( Item(channel=item.channel, action="settingCanal"    , title="Configuración..."     , url="" ))
-
-    return itemlist
-
-def settingCanal(item):
-    return platformtools.show_channel_settings()
-
-def menuseries(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Novedades"            , url="http://www.pordede.com/series/loadmedia/offset/0/showlist/hot" ))
-    itemlist.append( Item(channel=item.channel, action="generos"   , title="Por géneros"          , url="http://www.pordede.com/series" ))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Siguiendo"            , url="http://www.pordede.com/series/following" ))
-    itemlist.append( Item(channel=item.channel, action="siguientes" , title="Siguientes Capítulos" , url="http://www.pordede.com/main/index" , viewmode="movie"))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Favoritas"            , url="http://www.pordede.com/series/favorite" ))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Pendientes"           , url="http://www.pordede.com/series/pending" ))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Terminadas"           , url="http://www.pordede.com/series/seen" ))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Recomendadas"         , url="http://www.pordede.com/series/recommended" ))
-    itemlist.append( Item(channel=item.channel, action="search"    , title="Buscar..."            , url="http://www.pordede.com/series" ))
-
-    return itemlist
-
-def menupeliculas(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Novedades"            , url="http://www.pordede.com/pelis/loadmedia/offset/0/showlist/hot" ))
-    itemlist.append( Item(channel=item.channel, action="generos" , title="Por géneros"            , url="http://www.pordede.com/pelis" ))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Favoritas"            , url="http://www.pordede.com/pelis/favorite" ))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Pendientes"           , url="http://www.pordede.com/pelis/pending" ))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Vistas"               , url="http://www.pordede.com/pelis/seen" ))
-    itemlist.append( Item(channel=item.channel, action="peliculas" , title="Recomendadas"         , url="http://www.pordede.com/pelis/recommended" ))
-    itemlist.append( Item(channel=item.channel, action="search"  , title="Buscar..."              , url="http://www.pordede.com/pelis" ))
-
-    return itemlist
-
-def generos(item):
-    logger.info()
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-
-    # Extrae las entradas (carpetas)
-    data = scrapertools.find_single_match(data,'<div class="section genre">(.*?)</div>')
-    patron  = '<a class="mediaFilterLink" data-value="([^"]+)" href="([^"]+)">([^<]+)<span class="num">\((\d+)\)</span></a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-
-    for textid,scrapedurl,scrapedtitle,cuantos in matches:
-        title = scrapedtitle.strip()+" ("+cuantos+")"
-        thumbnail = ""
-        plot = ""
-
-        if "/pelis" in item.url:
-            url = "http://www.pordede.com/pelis/loadmedia/offset/0/genre/"+textid.replace(" ","%20")+"/showlist/all"
-        else:
-            url = "http://www.pordede.com/series/loadmedia/offset/0/genre/"+textid.replace(" ","%20")+"/showlist/all"
-
-        itemlist.append( Item(channel=item.channel, action="peliculas" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
-
-    return itemlist
-
-def search(item,texto):
-    logger.info()
-
-    if item.url=="":
-       item.url="http://www.pordede.com/pelis"
-
-    texto = texto.replace(" ","-")
-
-    item.extra = item.url
-    item.url = item.url+"/loadmedia/offset/0/query/"+texto+"/years/1950/on/undefined/showlist/all"
-
-    try:
-       return buscar(item)
-    except:
-      import sys
-      for line in sys.exc_info():
-          logger.error("%s" % line)
-      return []
-
-def buscar(item):
-    logger.info()
-
-    # Descarga la pagina
-    headers = {"X-Requested-With": "XMLHttpRequest"}
-    data = httptools.downloadpage(item.url, headers=headers).data
-
-    # Extrae las entradas (carpetas)
-    json_object = jsontools.load(data)
-    data = json_object["html"]
-
-    return parse_mixed_results(item,data)
-
-def parse_mixed_results(item,data):
-    patron  = '<a class="defaultLink extended" href="([^"]+)"[^<]+'
-    patron += '<div class="coverMini     shadow tiptip" title="([^"]+)"[^<]+'
-    patron += '<img class="centeredPic.*?src="([^"]+)"'
-    patron += '[^<]+<img[^<]+<div class="extra-info">'
-    patron += '<span class="year">([^<]+)</span>'
-    patron += '<span class="value"><i class="icon-star"></i>([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedyear,scrapedvalue in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        if scrapedyear != '':
-           title += " ("+scrapedyear+")"
-        fulltitle = title
-        if scrapedvalue != '':
-           title += " ("+scrapedvalue+")"
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        fanart = thumbnail.replace("mediathumb","mediabigcover")
-        plot = ""
-
-        if "/peli/" in scrapedurl or "/docu/" in scrapedurl:
-
-            if "/peli/" in scrapedurl:
-                sectionStr = "peli" 
-            else:
-                sectionStr = "docu"
-
-            referer = urlparse.urljoin(item.url,scrapedurl)
-            url = referer.replace("/{0}/".format(sectionStr),"/links/view/slug/")+"/what/{0}".format(sectionStr)
-
-            itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , extra=referer, url=url, thumbnail=thumbnail, plot=plot, fulltitle=fulltitle, fanart=fanart,
-                                  contentTitle=scrapedtitle, contentType="movie", context=["buscar_trailer"]))
-        else:
-            referer = item.url
-            url = urlparse.urljoin(item.url,scrapedurl)
-            itemlist.append( Item(channel=item.channel, action="episodios" , title=title , extra=referer, url=url, thumbnail=thumbnail, plot=plot, fulltitle=fulltitle, show=title, fanart=fanart,
-                                  contentTitle=scrapedtitle, contentType="tvshow", context=["buscar_trailer"]))
-
-    next_page = scrapertools.find_single_match(data, '<div class="loadingBar" data-url="([^"]+)"')
-    if next_page != "":
-       url = urlparse.urljoin("http://www.pordede.com", next_page)
-       itemlist.append(
-               Item(channel=item.channel, action="lista", title=">> Página siguiente", extra=item.extra, url=url))
-
-    try:
-       import xbmcplugin
-       xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_UNSORTED)
-       xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_VIDEO_TITLE)
-    except:
-       pass
-
-    return itemlist
-
-def siguientes(item):
-    logger.info()
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-
-    # Extrae las entradas (carpetas)
-    bloque = scrapertools.find_single_match(data, '<h2>Siguiendo</h2>(.*?)<div class="box">')
-    patron = '<div class="coverMini     shadow tiptip" title="([^"]+)">[^<]+'
-    patron += '<img class="centeredPic centeredPicFalse"  onerror="[^"]+"  src="([^"]+)"[^<]+'
-    patron += '<img src="/images/loading-mini.gif" class="loader"/>[^<]+'
-    patron += '<div class="extra-info"><span class="year">[^<]+'
-    patron += '</span><span class="value"><i class="icon-star"></i>[^<]+'
-    patron += '</span></div>[^<]+'
-    patron += '</div>[^<]+'
-    patron += '</a>[^<]+'
-    patron += '<a class="userepiinfo defaultLink" href="([^"]+)">(\d+)x(\d+)'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedtitle,scrapedthumbnail,scrapedurl,scrapedsession,scrapedepisode in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        session = scrapertools.htmlclean(scrapedsession)
-        episode = scrapertools.htmlclean(scrapedepisode)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        fanart = thumbnail.replace("mediathumb","mediabigcover")
-        plot = ""
-        title = session + "x" + episode + " - " + title
-
-        referer = urlparse.urljoin(item.url,scrapedurl)
-        url = referer
-
-        itemlist.append( Item(channel=item.channel, action="episodio" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, show=title, fanart=fanart, extra=session+"|"+episode))
-
-    return itemlist
-
-def episodio(item):
-    logger.info()
-    itemlist = []
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-
-    session = str(int(item.extra.split("|")[0]))
-    episode = str(int(item.extra.split("|")[1]))
-    patrontemporada = '<div class="checkSeason"[^>]+>Temporada '+session+'<div class="right" onclick="controller.checkSeason(.*?)\s+</div></div>'
-    matchestemporadas = re.compile(patrontemporada,re.DOTALL).findall(data)
-
-    for bloque_episodios in matchestemporadas:
-        # Extrae los episodios
-        patron  = '<span class="title defaultPopup" href="([^"]+)"><span class="number">'+episode+' </span>([^<]+)</span>(\s*</div>\s*<span[^>]*><span[^>]*>[^<]*</span><span[^>]*>[^<]*</span></span><div[^>]*><button[^>]*><span[^>]*>[^<]*</span><span[^>]*>[^<]*</span></button><div class="action([^"]*)" data-action="seen">)?'
-        matches = re.compile(patron,re.DOTALL).findall(bloque_episodios)
-
-        for scrapedurl,scrapedtitle,info,visto in matches:
-            if visto.strip()=="active":
-               visto_string = "[visto] "
-            else:
-               visto_string = ""
-            numero=episode
-            title = visto_string+session+"x"+numero+" "+scrapertools.htmlclean(scrapedtitle)
-            thumbnail = ""
-            plot = ""
-
-            epid = scrapertools.find_single_match(scrapedurl,"id/(\d+)")
-            url = "http://www.pordede.com/links/viewepisode/id/"+epid
-            itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, fanart=item.fanart, show=item.show))
-
-    itemlist2 = []
-    for capitulo in itemlist:
-        itemlist2 = findvideos(capitulo)
-
-    return itemlist2
-
-def peliculas(item):
-    logger.info()
-
-    # Descarga la pagina
-    headers = {"X-Requested-With": "XMLHttpRequest"}
-    data = httptools.downloadpage(item.url, headers=headers).data
-
-    # Extrae las entradas (carpetas)
-    json_object = jsontools.load(data)
-    data = json_object["html"]
-
-    return parse_mixed_results(item,data)
-
-def episodios(item):
-    logger.info()
-
-    itemlist = []
-
-    # Descarga la pagina
-    idserie = ''
-    data = httptools.downloadpage(item.url).data
-
-    patrontemporada = '<div class="checkSeason"[^>]+>([^<]+)<div class="right" onclick="controller.checkSeason(.*?)\s+</div></div>'
-    matchestemporadas = re.compile(patrontemporada,re.DOTALL).findall(data)
-
-    idserie = scrapertools.find_single_match(data,'<div id="layout4" class="itemProfile modelContainer" data-model="serie" data-id="(\d+)"')
-
-    for nombre_temporada,bloque_episodios in matchestemporadas:
-        # Extrae los episodios
-        patron  = '<span class="title defaultPopup" href="([^"]+)"><span class="number">([^<]+)</span>([^<]+)</span>(\s*</div>\s*<span[^>]*><span[^>]*>[^<]*</span><span[^>]*>[^<]*</span></span><div[^>]*><button[^>]*><span[^>]*>[^<]*</span><span[^>]*>[^<]*</span></button><div class="action([^"]*)" data-action="seen">)?'
-        matches = re.compile(patron,re.DOTALL).findall(bloque_episodios)
-
-        for scrapedurl,numero,scrapedtitle,info,visto in matches:
-            if visto.strip()=="active":
-               visto_string = "[visto] "
-            else:
-               visto_string = ""
-
-            title = visto_string+nombre_temporada.replace("Temporada ", "").replace("Extras", "Extras 0")+"x"+numero+" "+scrapertools.htmlclean(scrapedtitle)
-            thumbnail = item.thumbnail
-            fanart= item.fanart
-            plot = ""
-
-            epid = scrapertools.find_single_match(scrapedurl,"id/(\d+)")
-            url = "http://www.pordede.com/links/viewepisode/id/"+epid
-            itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, fanart= fanart, show=item.show))
-
-    if config.get_videolibrary_support():
-       show = re.sub(r"\s\(\d+\)\s\(\d+\.\d+\)", "", item.show)
-
-       itemlist.append( Item(channel='pordede', title="Añadir esta serie a la biblioteca de XBMC", url=item.url, action="add_serie_to_library", extra="episodios###", show=show) )
-       itemlist.append( Item(channel='pordede', title="Descargar todos los episodios de la serie", url=item.url, action="download_all_episodes", extra="episodios", show=show))
-       itemlist.append( Item(channel='pordede', title="Marcar como Pendiente", tipo="serie", idtemp=idserie, valor="1", action="pordede_check", show=show))
-       itemlist.append( Item(channel='pordede', title="Marcar como Siguiendo", tipo="serie", idtemp=idserie, valor="2", action="pordede_check", show=show))
-       itemlist.append( Item(channel='pordede', title="Marcar como Finalizada", tipo="serie", idtemp=idserie, valor="3", action="pordede_check", show=show))
-       itemlist.append( Item(channel='pordede', title="Marcar como Favorita", tipo="serie", idtemp=idserie, valor="4", action="pordede_check", show=show))
-       itemlist.append( Item(channel='pordede', title="Quitar marca", tipo="serie", idtemp=idserie, valor="0", action="pordede_check", show=show))
-
-    return itemlist
-
-def parse_listas(item, patron):
-    logger.info()
-
-    # Descarga la pagina
-    headers = {"X-Requested-With": "XMLHttpRequest"}
-    data = httptools.downloadpage(item.url, headers=headers).data
-
-    # Extrae las entradas (carpetas)
-    json_object = jsontools.load(data)
-    data = json_object["html"]
-
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedurl,scrapedtitle,scrapeduser,scrapedfichas in matches:
-        title = scrapertools.htmlclean(scrapedtitle + ' (' + scrapedfichas + ' fichas, por ' + scrapeduser + ')')
-        url = urlparse.urljoin(item.url,scrapedurl) + "/offset/0/loadmedia"
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista" , title=title , url=url))
-
-    nextpage = scrapertools.find_single_match(data,'data-url="(/lists/loadlists/offset/[^"]+)"')
-    if nextpage != '':
-       url = urlparse.urljoin(item.url,nextpage)
-       itemlist.append( Item(channel=item.channel, action="listas_sigues" , title=">> Página siguiente" , extra=item.extra, url=url))
-
-    try:
-       import xbmcplugin
-       xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_UNSORTED)
-       xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_VIDEO_TITLE)
-    except:
-       pass
-
-    return itemlist
-
-def listas_sigues(item):
-    logger.info()
-
-    patron  = '<div class="clearfix modelContainer" data-model="lista"[^<]+'
-    patron += '<span class="title"><span class="name"><a class="defaultLink" href="([^"]+)">([^<]+)</a>'
-    patron += '</span>[^<]+<a[^>]+>([^<]+)</a></span>\s+<div[^<]+<div[^<]+</div>\s+<div class="info">\s+<p>([0-9]+)'
-
-    return parse_listas(item, patron)
-
-def tus_listas(item):
-    logger.info()
-
-    patron  = '<div class="clearfix modelContainer" data-model="lista"[^<]+'
-    patron += '<div class="right"[^<]+'
-    patron += '<button[^<]+</button[^<]+'
-    patron += '<button[^<]+</button[^<]+'
-    patron += '</div[^<]+'
-    patron += '<span class="title"><span class="name"><a class="defaultLink" href="([^"]+)">([^<]+)</a>'
-    patron += '</span>[^<]+<a[^>]+>([^<]+)</a></span>\s+<div[^<]+<div[^<]+</div>\s+<div class="info">\s+<p>([0-9]+)'
-
-    return parse_listas(item, patron)
-
-def lista(item):
-    logger.info()
-
-    # Descarga la pagina
-    headers = {"X-Requested-With": "XMLHttpRequest"}
-    data = httptools.downloadpage(item.url, headers=headers).data
-
-    # Extrae las entradas (carpetas)
-    json_object = jsontools.load(data)
-    data = json_object["html"]
-
-    return parse_mixed_results(item,data)
-
-def findvideos(item, verTodos=False):
-    logger.info()
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-    logger.info(data)
-
-    sesion = scrapertools.find_single_match(data,'SESS = "([^"]+)";')
-
-    patron  = '<a target="_blank" class="a aporteLink(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-
-    idpeli = scrapertools.find_single_match(data,'<div class="buttons"><button class="defaultPopup onlyLogin" href="/links/create/ref_id/(\d+)/ref_model/4">Añadir enlace')
-
-    if (config.get_platform().startswith("xbmc") or config.get_platform().startswith("kodi")) and "/what/peli" in item.url:
-        itemlist.append( Item(channel=item.channel, action="infosinopsis" , title="INFO / SINOPSIS" , url=item.url, thumbnail=item.thumbnail, fanart=item.fanart,  folder=False ))
-
-    itemsort = []
-    sortlinks = config.get_setting("pordedesortlinks",item.channel)
-    showlinks = config.get_setting("pordedeshowlinks",item.channel)
-
-    if sortlinks != '' and sortlinks !="No":
-       sortlinks = int(sortlinks)
-    else:
-       sortlinks = 0
-
-    if showlinks != '' and showlinks !="No":
-       showlinks = int(showlinks)
-    else:
-       showlinks = 0
-
-    for match in matches:
-        jdown = scrapertools.find_single_match(match,'<div class="jdownloader">[^<]+</div>')
-        if (showlinks == 1 and jdown != '') or (showlinks == 2 and jdown == ''):
-            continue
-
-        idiomas = re.compile('<div class="flag([^"]+)">([^<]+)</div>',re.DOTALL).findall(match)
-        idioma_0 = (idiomas[0][0].replace("&nbsp;","").strip() + " " + idiomas[0][1].replace("&nbsp;","").strip()).strip()
-        if len(idiomas) > 1:
-           idioma_1 = (idiomas[1][0].replace("&nbsp;","").strip() + " " + idiomas[1][1].replace("&nbsp;","").strip()).strip()
-           idioma = idioma_0 + ", " + idioma_1
-        else:
-           idioma_1 = ''
-           idioma = idioma_0
-
-        calidad_video = scrapertools.find_single_match(match,'<div class="linkInfo quality"><i class="icon-facetime-video"></i>([^<]+)</div>')
-        calidad_audio = scrapertools.find_single_match(match,'<div class="linkInfo qualityaudio"><i class="icon-headphones"></i>([^<]+)</div>')
-
-        thumb_servidor = scrapertools.find_single_match(match,'<div class="hostimage"[^<]+<img\s*src="([^"]+)">')
-        nombre_servidor = scrapertools.find_single_match(thumb_servidor,"popup_([^\.]+)\.png")
-
-        if jdown != '':
-           title = "Download "+nombre_servidor+" ("+idioma+") (Calidad "+calidad_video.strip()+", audio "+calidad_audio.strip()+")"
-        else:
-           title = "Ver en "+nombre_servidor+" ("+idioma+") (Calidad "+calidad_video.strip()+", audio "+calidad_audio.strip()+")"
-
-        cuenta = []
-        valoracion = 0
-        for idx, val in enumerate(['1', '2', 'report']):
-            nn = scrapertools.find_single_match(match,'<span\s+data-num="([^"]+)"\s+class="defaultPopup"\s+href="/likes/popup/value/'+val+'/')
-            if nn != '0' and nn != '':
-               cuenta.append(nn + ' ' + ['ok', 'ko', 'rep'][idx])
-
-               if val == '1':
-                  valoracion += int(nn)
-               else: 
-                  valoracion += -int(nn)
-
-        if len(cuenta) > 0:
-           title += ' (' + ', '.join(cuenta) + ')'
-
-        url = urlparse.urljoin( item.url , scrapertools.find_single_match(match,'href="([^"]+)"') )
-        thumbnail = thumb_servidor
-        plot = ""
-
-        if sortlinks > 0:
-            if sortlinks == 1:
-               orden = valoracion
-            elif sortlinks == 2:
-               orden = valora_idioma(idioma_0, idioma_1)
-            elif sortlinks == 3:
-               orden = valora_calidad(calidad_video, calidad_audio)
-            elif sortlinks == 4:
-               orden = (valora_idioma(idioma_0, idioma_1) * 100) + valora_calidad(calidad_video, calidad_audio)
-            elif sortlinks == 5:
-               orden = (valora_idioma(idioma_0, idioma_1) * 1000) + valoracion
-            elif sortlinks == 6:
-               orden = (valora_idioma(idioma_0, idioma_1) * 100000) + (valora_calidad(calidad_video, calidad_audio) * 1000) + valoracion
-
-            itemsort.append({'action': "play", 'title': title, 'url':url, 'thumbnail':thumbnail, 'fanart':item.fanart, 'plot':plot, 'extra':sesion+"|"+item.url, 'fulltitle':item.fulltitle, 'orden1': (jdown == ''), 'orden2':orden})
-        else:
-            itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, fanart= item.fanart, plot=plot, extra=sesion+"|"+item.url, fulltitle=item.fulltitle))
-
-    if sortlinks > 0:
-        numberlinks = config.get_setting("pordedenumberlinks",item.channel)
-
-        if numberlinks != '' and numberlinks !="No":
-           numberlinks = int(numberlinks) 
-        else:
-           numberlinks = 0
-
-        if numberlinks == 0:
-           verTodos = True
-
-        itemsort = sorted(itemsort, key=lambda k: (k['orden1'], k['orden2']), reverse=True)
-        for i, subitem in enumerate(itemsort):
-            if verTodos == False and i >= numberlinks:
-               itemlist.append(Item(channel=item.channel, action='findallvideos' , title='Ver todos los enlaces', url=item.url, extra=item.extra ))
-               break
-
-            itemlist.append( Item(channel=item.channel, action=subitem['action'] , title=subitem['title'] , url=subitem['url'] , thumbnail=subitem['thumbnail'] , fanart= subitem['fanart'], plot=subitem['plot'] , extra=subitem['extra'] , fulltitle=subitem['fulltitle'] ))
-    
-    if "/what/peli" in item.url or "/what/docu" in item.url:
-	    itemlist.append( Item(channel=item.channel, action="pordede_check" , tipo="peli", title="Marcar como Pendiente" , valor="1", idtemp=idpeli))
-	    itemlist.append( Item(channel=item.channel, action="pordede_check" , tipo="peli", title="Marcar como Vista" , valor="3", idtemp=idpeli))
-	    itemlist.append( Item(channel=item.channel, action="pordede_check" , tipo="peli", title="Marcar como Favorita" , valor="4", idtemp=idpeli))
-	    itemlist.append( Item(channel=item.channel, action="pordede_check" , tipo="peli", title="Quitar Marca" , valor="0", idtemp=idpeli))
-
-    return itemlist
-
-def findallvideos(item):
-    return findvideos(item, True)
-
-def play(item):
-    # Marcar como visto
-    checkseen(item.extra.split("|")[1])
-
-    headers = {'Referer': item.extra.split("|")[1]}
-
-    data = httptools.downloadpage(item.url, post="_s="+item.extra.split("|")[0], headers=headers).data
-    url = scrapertools.find_single_match(data,'<p class="nicetry links">\s+<a href="([^"]+)" target="_blank"')
-    url = urlparse.urljoin(item.url,url)
-
-    headers = {'Referer': item.url}
-    media_url = httptools.downloadpage(url, headers=headers, follow_redirects=False).headers.get("location")
-
-    itemlist = servertools.find_video_items(data=media_url)
-
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-
-    return itemlist
-
-def checkseen(item):
-    logger.info(item)
-
-    if "/viewepisode/" in item:
-        episode = item.split("/")[-1]
-        httptools.downloadpage("http://www.pordede.com/ajax/action", post="model=episode&id="+episode+"&action=seen&value=1")
-
-    if "/what/peli" in item:
-        data = httptools.downloadpage(item).data
-
-        movieid = scrapertools.find_single_match(data,'href="/links/create/ref_id/([0-9]+)/ref_model/')
-        httptools.downloadpage("http://www.pordede.com/ajax/mediaaction", post="model=peli&id="+movieid+"&action=status&value=3")
-
-    return True
-
-def infosinopsis(item):
-    logger.info()
-
-    url_aux = item.url.replace("/links/view/slug/", "/peli/").replace("/what/peli", "")
-    # Descarga la pagina
-
-    data = httptools.downloadpage(url_aux).data
-
-    scrapedtitle = scrapertools.find_single_match(data,'<h1>([^<]+)</h1>')
-    scrapedvalue = scrapertools.find_single_match(data,'<span class="puntuationValue" data-value="([^"]+)"')
-    scrapedyear = scrapertools.find_single_match(data,'<h2 class="info">[^<]+</h2>\s*<p class="info">([^<]+)</p>')
-    scrapedduration = scrapertools.find_single_match(data,'<h2 class="info">[^<]+</h2>\s*<p class="info">([^<]+)</p>', 1)
-    scrapedplot = scrapertools.find_single_match(data,'<div class="info text"[^>]+>([^<]+)</div>')
-    scrapedgenres = re.compile('href="/pelis/index/genre/[^"]+">([^<]+)</a>',re.DOTALL).findall(data)
-    scrapedcasting = re.compile('href="/star/[^"]+">([^<]+)</a><br/><span>([^<]+)</span>',re.DOTALL).findall(data)
-
-    title = scrapertools.htmlclean(scrapedtitle)
-    plot = "Año: [B]"+scrapedyear+"[/B]"
-    plot += " , Duración: [B]"+scrapedduration+"[/B]"
-    plot += " , Puntuación usuarios: [B]"+scrapedvalue+"[/B]"
-    plot += "\nGéneros: "+", ".join(scrapedgenres)
-    plot += "\n\nSinopsis:\n"+scrapertools.htmlclean(scrapedplot)
-    plot += "\n\nCasting:\n"
-    for actor,papel in scrapedcasting:
-    	plot += actor+" ("+papel+"). "
-
-    tbd = TextBox("DialogTextViewer.xml", os.getcwd(), "Default")
-    tbd.ask(title, plot)
-
-    del tbd
-    return
-
-try:
-    import xbmcgui
-
-    class TextBox( xbmcgui.WindowXML ):
-        """ Create a skinned textbox window """
-        def __init__( self, *args, **kwargs):
-            pass
-
-        def onInit( self ):
-            try:
-               self.getControl( 5 ).setText( self.text )
-               self.getControl( 1 ).setLabel( self.title )
-            except: pass
-
-        def onClick( self, controlId ):
-            pass
-
-        def onFocus( self, controlId ):
-            pass
-
-        def onAction( self, action ):
-            if action == 7:
-               self.close()
-
-        def ask(self, title, text ):
-            self.title = title
-            self.text = text
-            self.doModal()
-except:
-    pass
-
-def valora_calidad(video, audio):
-    prefs_video = [ 'hdmicro', 'hd1080', 'hd720', 'hdrip', 'dvdrip', 'rip', 'tc-screener', 'ts-screener' ]
-    prefs_audio = [ 'dts', '5.1', 'rip', 'line', 'screener' ]
-
-    video = ''.join(video.split()).lower()
-    if video in prefs_video:
-       pts = (9 - prefs_video.index(video)) * 10
-    else:
-       pts = (9 - 1) * 10
-
-    audio = ''.join(audio.split()).lower()
-    if audio in prefs_audio:
-       pts = (9 - prefs_audio.index(audio)) * 10
-    else:
-       pts = (9 - 1) * 10
-
-    return pts
-
-def valora_idioma(idioma_0, idioma_1):
-    prefs = [ 'spanish', 'spanish LAT', 'catalan', 'english', 'french' ]
-
-    if idioma_0 in prefs:
-       pts = (9 - prefs.index(idioma_0)) * 10
-    else:
-       pts = (9 - 1) * 10
-
-    if idioma_1 != '':
-        idioma_1 = idioma_1.replace(' SUB', '')
-
-        if idioma_1 in prefs:
-           pts += 8 - prefs.index(idioma_1)
-        else:
-           pts += 8 - 1
-
-    else:
-        pts += 9
-
-    return pts
-
-def pordede_check(item):
-    httptools.downloadpage("http://www.pordede.com/ajax/mediaaction", post="model="+item.tipo+"&id="+item.idtemp+"&action=status&value="+item.valor)
-
diff --git a/plugin.video.alfa/channels/porn300.py b/plugin.video.alfa/channels/porn300.py
index 37f5970f..58566951 100644
--- a/plugin.video.alfa/channels/porn300.py
+++ b/plugin.video.alfa/channels/porn300.py
@@ -7,20 +7,18 @@ 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
 
 host = 'https://www.porn300.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/es/videos/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/es/mas-vistos/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/es/mas-votados/"))
+    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/"))
-    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="catalogo", url=host + "/es/pornostars/?sort=views"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/es/categorias/?sort=videos"))
+    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="categorias", url=host + "/es/pornostars/"))
+    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
 
@@ -30,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/es/buscar/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -38,63 +36,56 @@ 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 itemprop="url" href="([^"]+)".*?title="([^"]+)">.*?<img itemprop="image" src=([^"]+) alt=.*?</svg>\s+([^"]+)           </li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad +")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="btn btn-primary--light btn-pagination" itemprop="name" href="([^"]+)" title="Siguiente">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
-    return itemlist
-
-
 def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a itemprop="url" href="([^"]+)".*?title="([^"]+)">.*?<img itemprop="image" src="([^"]+)".*?</svg>([^"]+)               </small>'
+    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,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
+        cantidad = re.compile("\s+", re.DOTALL).sub(" ", cantidad)
         scrapedtitle = scrapedtitle + " (" + cantidad +")"
         scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/?sort=latest"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="btn btn-primary--light btn-pagination" itemprop="name" href="([^"]+)" title="Siguiente">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="categorias" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
+    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="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a itemprop="url" href="([^"]+)" data-video-id="\d+" title="([^"]+)">.*?<img itemprop="thumbnailUrl" src="([^"]+)".*?</svg>\s+(.*?)         </li>'
+    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,scrapedtitle,scrapedthumbnail,duracion  in matches:
+    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad  in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        cantidad = re.compile("\s+", re.DOTALL).sub(" ", cantidad)
+        title = "[COLOR yellow]" + cantidad + "[/COLOR] " + scrapedtitle
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        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="btn btn-primary--light btn-pagination" itemprop="name" href="([^"]+)" title="Siguiente">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
+                              plot=plot, contentTitle = contentTitle) )
+    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
 
 def play(item):
diff --git a/plugin.video.alfa/channels/pornboss.py b/plugin.video.alfa/channels/pornboss.py
index 2523f78a..d0886ca6 100644
--- a/plugin.video.alfa/channels/pornboss.py
+++ b/plugin.video.alfa/channels/pornboss.py
@@ -15,11 +15,11 @@ host = 'http://pornboss.org'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/category/movies/"))
+    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="peliculas", url=host + "/category/clips/"))
-    itemlist.append( Item(channel=item.channel, title="     categorias" , action="peliculas", url=host + "/category/clips/"))
+    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 + "/category/clips/"))
     return itemlist
 
 
@@ -28,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -41,35 +41,40 @@ def categorias(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    if item.url == host + "/category/movies/":
+    if "/category/movies/" in item.url:
         data = scrapertools.get_match(data,'>Movies</a>(.*?)</ul>')
     else:
         data = scrapertools.get_match(data,'>Clips</a>(.*?)</ul>')
-    patron  = '<a href="([^"]+)">([^"]+)</a>'
+    patron  = '<a href=([^"]+)>([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
-    patron  = '<article id="post-\d+".*?<img class="center cover" src="([^"]+)" alt="([^"]+)".*?<blockquote>.*?<a href=\'([^\']+)\''
+    patron = '<article id=post-\d+.*?'
+    patron += '<img class="center cover" src=([^"]+) alt="([^"]+)".*?'
+    patron += '<blockquote>.*?<a href=(.*?) target=_blank>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedthumbnail,scrapedtitle,scrapedurl in matches:
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
-    if next_page_url!="":
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    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 = servertools.find_video_items(data=item.url)
diff --git a/plugin.video.alfa/channels/porneq.py b/plugin.video.alfa/channels/porneq.py
index 527f83d8..c37c6250 100644
--- a/plugin.video.alfa/channels/porneq.py
+++ b/plugin.video.alfa/channels/porneq.py
@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-
-from core import jsontools as json
+# ------------------------------------------------------------
+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 tmdb
 
 host = 'http://porneq.com'
 
@@ -17,11 +18,11 @@ host = 'http://porneq.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host + "/videos/browse/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistos" , action="peliculas", url=host + "/videos/most-viewed/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Votado" , action="peliculas", url=host + "/videos/most-liked/"))
-    itemlist.append( Item(channel=item.channel, title="Big Tits" , action="peliculas", url=host + "/show/big+tits&sort=w"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    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+tits&sort=w"))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
 
@@ -30,7 +31,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/show/%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -38,20 +39,23 @@ def search(item, texto):
         return []
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a class="clip-link" data-id="\d+" title="([^"]+)" href="([^"]+)">.*?<img src="([^"]+)".*?<span class="timer">(.*?)</span></div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedtitle,scrapedurl,scrapedthumbnail,scrapedtime in matches:
+    patron = '<a class="clip-link" data-id="\d+" title="([^"]+)" href="([^"]+)">.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<span class="timer">(.*?)</span></div>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedtitle, scrapedurl, scrapedthumbnail, scrapedtime in matches:
         scrapedplot = ""
         scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + scrapedtitle
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<nav id="page_nav"><a href="(.*?)"')
-    if next_page_url!="":
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append(Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, plot=scrapedplot))
+    next_page = scrapertools.find_single_match(data, '<nav id="page_nav"><a href="(.*?)"')
+    if next_page != "":
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
     return itemlist
 
 
@@ -59,11 +63,8 @@ def play(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '"video-setup".*?file: "(.*?)",'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl in matches:
-        scrapedurl = str(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))
+    scrapedurl = scrapertools.find_single_match(data, '<source src="([^"]+)"')
+    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/plugin.video.alfa/channels/pornhive.py b/plugin.video.alfa/channels/pornhive.py
index 966ef744..599194d3 100644
--- a/plugin.video.alfa/channels/pornhive.py
+++ b/plugin.video.alfa/channels/pornhive.py
@@ -2,23 +2,19 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://www.pornhive.tv/en'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="MOVIES" , action="peliculas", url=host))
-	# No busca los videos tiene un capchka
-    # itemlist.append( Item(channel=item.channel, title="CHANNELS" , action="catalogo", url=host))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , 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"))
     return itemlist
@@ -29,7 +25,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search?keyword=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -41,18 +37,22 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'Categories(.*?)<li class="divider"')
+    if item.title == "Categorias" :
+        data = scrapertools.get_match(data,'Categories(.*?)Channels')
+    else:
+        data = scrapertools.get_match(data,'Channels(.*?)</ul>')
     patron  = '<li><a href="([^"]+)" title="[^"]+">(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -66,11 +66,11 @@ def peliculas(item):
         title = scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=title, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)" data-ci-pagination-page="\d+" rel="next">Next &rsaquo;')
-    if next_page_url!="":
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="play" , title=title, url=scrapedurl, thumbnail=thumbnail,
+                              plot=plot, contentTitle=title))
+    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)" data-ci-pagination-page="\d+" rel="next">Next &rsaquo;')
+    if next_page != "" :
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
@@ -79,9 +79,8 @@ def play(item):
     itemlist = servertools.find_video_items(data=item.url)
     data = scrapertools.cachePage(item.url)
     itemlist = servertools.find_video_items(data=data)
-
     for videoitem in itemlist:
-        videoitem.title = item.fulltitle
+        videoitem.title = item.title
         videoitem.fulltitle = item.fulltitle
         videoitem.thumbnail = item.thumbnail
         videochannel=item.channel
diff --git a/plugin.video.alfa/channels/pornhub.py b/plugin.video.alfa/channels/pornhub.py
index 22699893..232030ae 100755
--- a/plugin.video.alfa/channels/pornhub.py
+++ b/plugin.video.alfa/channels/pornhub.py
@@ -14,7 +14,7 @@ def mainlist(item):
     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?o=al"))
+                         url="http://es.pornhub.com/categories"))
     itemlist.append(Item(channel=item.channel, action="search", title="Buscar", fanart=item.fanart,
                          url="http://es.pornhub.com/video/search?search=%s&o=mr"))
     return itemlist
@@ -38,19 +38,18 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '<div id="categoriesStraightImages">(.*?)</ul>')
-    
-    
     patron = '<li class="cat_pic" data-category=".*?'
     patron += '<a href="([^"]+)".*?'
-    patron += 'src="([^"]+)".*?'
-    patron += 'alt="([^"]+)"'
+    patron += 'data-thumb_url="(.*?)".*?'
+    patron += 'alt="([^"]+)".*?'
+    patron += '<var>(.*?)</var>'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
+    for scrapedurl, scrapedthumbnail, scrapedtitle, cantidad in matches:
         if "?" in scrapedurl:
             url = urlparse.urljoin(item.url, scrapedurl + "&o=cm")
         else:
             url = urlparse.urljoin(item.url, scrapedurl + "?o=cm")
+        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         itemlist.append(Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url, fanart=item.fanart,
                              thumbnail=scrapedthumbnail))
     itemlist.sort(key=lambda x: x.title)
@@ -64,10 +63,10 @@ def peliculas(item):
     videodata = scrapertools.find_single_match(data, 'videos search-video-thumbs">(.*?)<div class="reset"></div>')
     patron = '<div class="phimage">.*?'
     patron += '<a href="([^"]+)" title="([^"]+).*?'
-    patron += '<var class="duration">([^<]+)</var>(.*?)</div>.*?'
-    patron += 'data-mediumthumb="([^"]+)"'
+    patron += 'data-mediumthumb="([^"]+)".*?'
+    patron += '<var class="duration">([^<]+)</var>(.*?)</div>'
     matches = re.compile(patron, re.DOTALL).findall(videodata)
-    for url, scrapedtitle, duration, scrapedhd, thumbnail in matches:
+    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':
@@ -90,7 +89,7 @@ def play(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
-    patron  = '"defaultQuality":true,"format":"","quality":"\d+","videoUrl":"(.*?)"'
+    patron  = '"defaultQuality":true,"format":"mp4","quality":"\d+","videoUrl":"(.*?)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl  in matches:
         url = scrapedurl.replace("\/", "/")
diff --git a/plugin.video.alfa/channels/pornrewind.py b/plugin.video.alfa/channels/pornrewind.py
index e9d659dc..d2ad196d 100644
--- a/plugin.video.alfa/channels/pornrewind.py
+++ b/plugin.video.alfa/channels/pornrewind.py
@@ -7,20 +7,15 @@ 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
-
 
 host = 'https://www.pornrewind.com'
 
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/videos/?sort_by=post_date"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="peliculas", url=host + "/videos/?sort_by=rating"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="peliculas", url=host + "/videos/?sort_by=video_viewed"))
-
+    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/videos/?sort_by=post_date"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/videos/?sort_by=rating"))
+    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/videos/?sort_by=video_viewed"))
     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
@@ -31,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/%s/" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -49,11 +44,12 @@ def categorias(item):
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -66,11 +62,11 @@ def peliculas(item):
         title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = title, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
+                              plot=plot, contentTitle = title))
     next_page = scrapertools.find_single_match(data, '<li class="direction"><a href="([^"]+)" data-ajax="pagination">')
     if next_page:
         next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>" , text_color="blue", url=next_page ) )
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page ) )
     return itemlist
 
diff --git a/plugin.video.alfa/channels/porntrex.py b/plugin.video.alfa/channels/porntrex.py
index 1fc59e4d..ae821844 100644
--- a/plugin.video.alfa/channels/porntrex.py
+++ b/plugin.video.alfa/channels/porntrex.py
@@ -64,15 +64,14 @@ def lista(item):
     action = "play"
     if config.get_setting("menu_info", "porntrex"):
         action = "menu_info"
-
-    # Extrae las entradas
-    patron  = '<div class="video-item.*?href="([^"]+)" '
-    patron += 'title="([^"]+)".*?'
-    patron += 'data-src="([^"]+)"'
-    patron += '(.*?)<div class="durations">.*?'
+    # 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">(.*?)<.*?'
     patron += '</i>([^<]+)<'
     matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle, scrapedthumbnail, quality, duration in matches:
+    for scrapedurl, scrapedthumbnail, scrapedtitle, quality, duration in matches:
         if "go.php?" in scrapedurl:
             scrapedurl = urllib.unquote(scrapedurl.split("/go.php?u=")[1].split("&")[0])
             if not scrapedthumbnail.startswith("https"):
@@ -81,13 +80,10 @@ def lista(item):
             scrapedurl = urlparse.urljoin(host, scrapedurl)
             if not scrapedthumbnail.startswith("https"):
                 scrapedthumbnail = "https:%s" % scrapedthumbnail
-        if duration:
-            scrapedtitle = "%s - %s" % (duration, scrapedtitle)
-        if '>HD<' in quality:
-            scrapedtitle += "  [COLOR red][HD][/COLOR]"
-
-        itemlist.append(item.clone(action=action, title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, contentThumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail))
+        scrapedtitle = "%s - [COLOR red]%s[/COLOR] %s" % (duration, quality, scrapedtitle)
+        scrapedthumbnail += "|Referer=https://www.porntrex.com/"
+        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.extra:
         next_page = scrapertools.find_single_match(data, '<li class="next">.*?from_videos\+from_albums:(\d+)')
@@ -95,7 +91,7 @@ def lista(item):
             if "from_videos=" in item.url:
                 next_page = re.sub(r'&from_videos=(\d+)', '&from_videos=%s' % next_page, item.url)
             else:
-                next_page = "%s?mode=async&function=get_block&block_id=list_videos_videos_list_search_result" \
+                next_page = "%s?mode=async&function=get_block&block_id=list_videos_videos" \
                             "&q=%s&category_ids=&sort_by=post_date&from_videos=%s" % (item.url, item.extra, next_page)
             itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
     else:
@@ -107,12 +103,13 @@ def lista(item):
                 next_page = urlparse.urljoin(host, next_page)
             itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
         else:
-            next_page = scrapertools.find_single_match(data, '<li class="next">.*?from:(\d+)')
+            next_page = scrapertools.find_single_match(data, '<li class="next">.*?from4:(\d+)')
             if next_page:
-                if "from=" in item.url:
-                    next_page = re.sub(r'&from=(\d+)', '&from=%s' % next_page, item.url)
+                if "from4" in item.url:
+                    next_page = re.sub(r'&from4=(\d+)', '&from4=%s' % next_page, item.url)
                 else:
-                    next_page = "%s?mode=async&function=get_block&block_id=list_videos_common_videos_list&sort_by=post_date&from=%s" % (
+                    next_page = "%s?mode=async&function=get_block&block_id=list_videos_common_videos_list_norm" \
+                                "&sort_by=post_date&from4=%s" % (
                         item.url, next_page)
                 itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
     return itemlist
@@ -260,6 +257,7 @@ def menu_info(item):
         if i == 0:
             continue
         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))
 
diff --git a/plugin.video.alfa/channels/qwertty.py b/plugin.video.alfa/channels/qwertty.py
index 8113ad60..d8e5651b 100644
--- a/plugin.video.alfa/channels/qwertty.py
+++ b/plugin.video.alfa/channels/qwertty.py
@@ -2,23 +2,21 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://qwertty.net'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Recientes" , action="peliculas", url=host))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/?filter=most-viewed"))
-    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="peliculas", url=host + "/?filter=popular"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="peliculas", url=host + "/?filter=random"))
+    itemlist.append( Item(channel=item.channel, title="Recientes" , action="lista", url=host))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/?filter=most-viewed"))
+    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="lista", url=host + "/?filter=popular"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="lista", url=host + "/?filter=random"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -28,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -46,28 +44,33 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
+    data = scrapertools.get_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+".*?<a href="([^"]+)" title="([^"]+)">.*?<img data-src="(.*?)".*?<span class="duration"><i class="fa fa-clock-o"></i>([^<]+)</span>'
+    patron = '<article id="post-\d+".*?'
+    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
+    patron += '<img data-src="(.*?)".*?'
+    patron += '<span class="duration"><i class="fa fa-clock-o"></i>([^<]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
         scrapedplot = ""
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        itemlist.append( Item(channel=item.channel, action="play", title=title , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)">Next</a>')
-    if next_page_url=="":
-        next_page_url = scrapertools.find_single_match(data,'<li><a class="current">.*?<li><a href=\'([^\']+)\' class="inactive">')
-    
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, 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">')
+    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
 
 
@@ -75,13 +78,54 @@ def play(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
-    pornhub = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
-    data = scrapertools.cachePage(pornhub)
-    patron  = '"videoUrl":"(.*?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl in matches:
-        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))
+    url = scrapertools.find_single_match(data,'<meta itemprop="embedURL" content="([^"]+)"')
+    url = url.replace("pornhub.com/embed/", "pornhub.com/view_video.php?viewkey=")
+    data = scrapertools.cachePage(url)
+    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/plugin.video.alfa/channels/rarbg.json b/plugin.video.alfa/channels/rarbg.json
new file mode 100644
index 00000000..fdae0170
--- /dev/null
+++ b/plugin.video.alfa/channels/rarbg.json
@@ -0,0 +1,77 @@
+{
+  "id": "rarbg",
+  "name": "Rarbg",
+  "active": true,
+  "adult": false,
+  "language": [],
+  "thumbnail": "https://dyncdn.me/static/20/img/logo_dark_nodomain2_optimized.png",
+  "categories": [
+    "torrent",
+    "movie",
+    "tvshow",
+    "vos"
+  ],
+  "settings": [
+    {
+      "default": false, 
+      "enabled": true, 
+      "id": "include_in_global_search", 
+      "label": "Incluir en busqueda global", 
+      "type": "bool", 
+      "visible": true
+    }, 
+    {
+      "default": true, 
+      "enabled": true, 
+      "id": "modo_grafico", 
+      "label": "Buscar información extra (TMDB)", 
+      "type": "bool", 
+      "visible": true
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "CAST",
+        "LAT",
+        "VO",
+        "VOS",
+        "VOSE"
+      ]
+    },
+    {
+      "id": "timeout_downloadpage",
+      "type": "list",
+      "label": "Timeout (segs.) en descarga de páginas o verificación de servidores",
+      "default": 5,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "None",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5",
+        "6",
+        "7",
+        "8",
+        "9",
+        "10"
+      ]
+    },
+    {
+      "id": "seleccionar_ult_temporadda_activa",
+      "type": "bool",
+      "label": "Seleccionar para Videoteca si estará activa solo la última Temporada",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/rarbg.py b/plugin.video.alfa/channels/rarbg.py
new file mode 100644
index 00000000..374b36b5
--- /dev/null
+++ b/plugin.video.alfa/channels/rarbg.py
@@ -0,0 +1,832 @@
+# -*- coding: utf-8 -*-
+
+import re
+import sys
+import urllib
+import urlparse
+import time
+
+from channelselector import get_thumb
+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 tmdb
+from lib import generictools
+from channels import filtertools
+from channels import autoplay
+
+
+#IDIOMAS = {'CAST': 'Castellano', 'LAT': 'Latino', 'VO': 'Version Original'}
+IDIOMAS = {'Castellano': 'CAST', 'Latino': 'LAT', 'Version Original': 'VO'}
+list_language = IDIOMAS.values()
+list_quality = []
+list_servers = ['torrent']
+
+host = 'https://rarbgmirror.xyz/'
+channel = 'rarbg'
+categoria = channel.capitalize()
+__modo_grafico__ = config.get_setting('modo_grafico', channel)
+modo_ultima_temp = config.get_setting('seleccionar_ult_temporadda_activa', channel)        #Actualización sólo últ. Temporada?
+timeout = config.get_setting('timeout_downloadpage', channel)
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    
+    thumb_cartelera = get_thumb("now_playing.png")
+    thumb_pelis = get_thumb("channels_movie.png")
+    thumb_pelis_hd = get_thumb("channels_movie_hd.png")
+    thumb_pelis_VO = get_thumb("channels_vos.png")
+    thumb_series = get_thumb("channels_tvshow.png")
+    thumb_series_hd = get_thumb("channels_tvshow_hd.png")
+    thumb_series_VOD = get_thumb("videolibrary_tvshow.png")
+    thumb_generos = get_thumb("genres.png")
+    thumb_buscar = get_thumb("search.png")
+    thumb_separador = get_thumb("next.png")
+    thumb_settings = get_thumb("setting_0.png")
+    
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist.append(Item(channel=item.channel, url=host, title="[COLOR yellow]NOTA: Esta web puede considerar una intrusión[/COLOR]", folder=False, thumbnail=thumb_separador))
+    itemlist.append(Item(channel=item.channel, url=host, title="[COLOR yellow]más de 1 usuario o 10 accesos por IP/Router.[/COLOR]", folder=False, thumbnail=thumb_separador))
+    itemlist.append(Item(channel=item.channel, url=host, title="[COLOR yellow]Si es bloqueado, renueve la IP en el Router[/COLOR]", folder=False, thumbnail=thumb_separador))
+    
+    itemlist.append(Item(channel=item.channel, title="Películas", action="listado", url=host + "torrents.php?category=movies&search=&order=data&by=DESC", thumbnail=thumb_pelis_VO, extra="peliculas"))
+    itemlist.append(Item(channel=item.channel, title="    - Calidades", action="calidades", url=host + "torrents.php?category=movies&search=&order=data&by=DESC", thumbnail=thumb_pelis_hd, extra="peliculas"))
+    #itemlist.append(Item(channel=item.channel, title="    - Géneros", action="generos", url=host + "catalog/movies/", thumbnail=thumb_generos, extra="peliculas"))
+
+    itemlist.append(Item(channel=item.channel, title="Series", action="listado", url=host + "torrents.php?category=2;18;41;49&search=&order=data&by=DESC", thumbnail=thumb_series_VOD, extra="series"))
+    itemlist.append(Item(channel=item.channel, title="    - Calidades", action="calidades", url=host + "torrents.php?category=2;18;41;49&search=&order=data&by=DESC", thumbnail=thumb_series_hd, extra="series"))
+    #itemlist.append(Item(channel=item.channel, title="    - Géneros", action="generos", url=host + "catalog/tv/", thumbnail=thumb_generos, extra="series"))
+    
+    itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url=host + "?s=%s", thumbnail=thumb_buscar, extra="search"))
+
+    itemlist.append(Item(channel=item.channel, url=host, title="[COLOR yellow]Configuración:[/COLOR]", folder=False, thumbnail=thumb_separador))
+    
+    itemlist.append(Item(channel=item.channel, action="configuracion", title="Configurar canal", thumbnail=thumb_settings))
+    
+    autoplay.show_option(item.channel, itemlist)            #Activamos Autoplay
+
+    return itemlist
+    
+    
+def configuracion(item):
+    from platformcode import platformtools
+    ret = platformtools.show_channel_settings()
+    platformtools.itemlist_refresh()
+    return
+
+
+def calidades(item):
+    logger.info()
+    itemlist = []
+
+    data = ''
+    try:
+        data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)", "", httptools.downloadpage(item.url, timeout=timeout).data)
+        data = unicode(data, "utf-8", errors="replace").encode("utf-8")
+    except:
+        pass
+        
+    patron = '<div align="[^"]+"><div style="[^"]+" id="divadvsearch">(.*?)<\/a><\/div><\/div><\/form><\/div>'
+    #Verificamos si se ha cargado una página, y si además tiene la estructura correcta
+    if not data or not scrapertools.find_single_match(data, patron):
+        status, itemlist = check_blocked_IP(data, itemlist)                     #Comprobamos si la IP ha sido bloqueada
+        if status:
+            return itemlist                                                     #IP bloqueada
+        
+        item = generictools.web_intervenida(item, data)                         #Verificamos que no haya sido clausurada
+        if item.intervencion:                                                   #Sí ha sido clausurada judicialmente
+            for clone_inter, autoridad in item.intervencion:
+                thumb_intervenido = get_thumb(autoridad)
+                itemlist.append(item.clone(action='', title="[COLOR yellow]" + clone_inter.capitalize() + ': [/COLOR]' + intervenido_judicial + '. Reportar el problema en el foro', thumbnail=thumb_intervenido))
+            return itemlist                                                     #Salimos
+        
+        logger.error("ERROR 01: SUBMENU: La Web no responde o ha cambiado de URL: " + item.url + data)
+    
+    if not data:    #Si no ha logrado encontrar nada, salimos
+        itemlist.append(item.clone(action='', title=item.category + ': ERROR 01: SUBMENU: La Web no responde o ha cambiado de URL. Si la Web está activa, reportar el error con el log'))
+        return itemlist                                 #si no hay más datos, algo no funciona, pintamos lo que tenemos
+
+    data = scrapertools.find_single_match(data, patron)                         #Seleccionamos el bloque
+    patron = '<div class="divadvscat"><input class="inputadvscat" type="checkbox" name="category\[.*?\]" value="[^"]+"\s*(?:.*?)?\/> <a href="([^"]+)">(.*?)<\/a>\s*<\/div>\s*'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    if not matches:
+        logger.error("ERROR 02: SUBMENU: Ha cambiado la estructura de la Web " + " / PATRON: " + patron + " / DATA: " + data)
+        itemlist.append(item.clone(action='', title=item.category + ': ERROR 02: SUBMENU: Ha cambiado la estructura de la Web.  Reportar el error con el log'))
+        return itemlist                                 #si no hay más datos, algo no funciona, pintamos lo que tenemos
+
+    #logger.debug(patron)
+    #logger.debug(matches)
+    #logger.debug(data)
+    
+    itemlist.append(item.clone(action="listado", title="ALL", extra2="calidades"))
+    
+    for scrapedurl, scrapedtitle in matches:
+        if not "Mov" in scrapedtitle and item.extra == 'peliculas':
+            continue
+        if not "TV" in scrapedtitle and item.extra == 'series':
+            continue
+        
+        title = scrapedtitle.strip().replace('Movs/', '').replace('Movies/', '')
+        url = urlparse.urljoin(host, scrapedurl + "&search=&order=data&by=DESC")
+
+        itemlist.append(item.clone(action="listado", title=title, url=url, extra2="calidades"))
+
+    return itemlist
+
+    
+def listado(item):
+    logger.info()
+    itemlist = []
+    item.category = categoria
+
+    #logger.debug(item)
+    
+    curr_page = 1                                                               # Página inicial
+    last_page = 99999                                                           # Última página inicial
+    if item.curr_page:
+        curr_page = int(item.curr_page)                                         # Si viene de una pasada anterior, lo usamos
+        del item.curr_page                                                      # ... y lo borramos
+    if item.last_page:
+        last_page = int(item.last_page)                                         # Si viene de una pasada anterior, lo usamos
+        del item.last_page                                                      # ... y lo borramos
+    
+    cnt_tot = 40                                                                # Poner el num. máximo de items por página
+    cnt_title = 0                                                               # Contador de líneas insertadas en Itemlist
+    inicio = time.time()                                    # Controlaremos que el proceso no exceda de un tiempo razonable
+    fin = inicio + 3                                                            # Después de este tiempo pintamos (segundos)
+    timeout_search = timeout                                                    # Timeout para descargas
+    if item.extra == 'search':
+        timeout_search = timeout * 2                                            # Timeout un poco más largo para las búsquedas
+        if timeout_search < 5:
+            timeout_search = 5                                                  # Timeout un poco más largo para las búsquedas
+
+    #Sistema de paginado para evitar páginas vacías o semi-vacías en casos de búsquedas con series con muchos episodios
+    title_lista = []                            # Guarda la lista de series que ya están en Itemlist, para no duplicar lineas
+    if item.title_lista:                                    # Si viene de una pasada anterior, la lista ya estará guardada
+        title_lista.extend(item.title_lista)                                    # Se usa la lista de páginas anteriores en Item
+        del item.title_lista                                                    # ... limpiamos
+        
+    if not item.extra2:                                                         # Si viene de Catálogo o de Alfabeto
+        item.extra2 = ''
+    
+    next_page_url = item.url
+    #Máximo num. de líneas permitidas por TMDB. Máx de 3 segundos por Itemlist para no degradar el rendimiento
+    while cnt_title <= cnt_tot * 0.50 and curr_page <= last_page and fin > time.time():
+    
+        # Descarga la página
+        data = ''
+        try:
+            data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)|&nbsp;", "", httptools.downloadpage(next_page_url, timeout=timeout_search).data)
+            data = unicode(data, "utf-8", errors="replace").encode("utf-8")
+        except:
+            pass
+        
+        curr_page += 1                                                          #Apunto ya a la página siguiente
+        if not data and not item.extra2:                                        #Si la web está caída salimos sin dar error
+            logger.error("ERROR 01: LISTADO: La Web no responde o ha cambiado de URL: " + item.url + " / DATA: " + data)
+            itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 01: LISTADO:.  La Web no responde o ha cambiado de URL. Si la Web está activa, reportar el error con el log'))
+            break                                       #si no hay más datos, algo no funciona, pintamos lo que tenemos
+            
+        status, itemlist = check_blocked_IP(data, itemlist)                     #Comprobamos si la IP ha sido bloqueada
+        if status:
+            return itemlist                                                     #IP bloqueada
+
+        #Patrón para todo, incluido búsquedas en cualquier caso
+        patron = '<tr class="lista2"><td align="(?:[^"]+)?"\s*class="(?:[^"]+)?"\s*width="(?:[^"]+)?"\s*style="(?:[^"]+)?"><a href="[^"]+"><img src="([^"]+)?"\s*border="(?:[^"]+)?"\s*alt="(?:[^"]+)?"\s*\/><\/a><\/td><td\s*align="(?:[^"]+)?"\s*class="(?:[^"]+)?"><a onmouseover="(?:[^"]+)?"\s*onmouseout="(?:[^"]+)?"\s*href="[^"]+" title="[^"]+">([^<]+)<\/a>\s*<a href="([^"]+)"><img src="[^"]+"\s*border="(?:[^"]+)?"\s*alt="(?:[^"]+)?"\s*><\/a>\s*(?:<a href="([^"]+)"><img src="[^"]+"\s*border="(?:[^"]+)?"\s*alt="(?:[^"]+)?"\s*><\/a>)?\s*<br><span.*?<\/span>\s*<\/td><td align="(?:[^"]+)?"\s*width="(?:[^"]+)?"\s*class="(?:[^"]+)?">.*?<\/td><td align="(?:[^"]+)?"\s*width="(?:[^"]+)?"\s*class="(?:[^"]+)?">([^<]+)?<\/td><td align="(?:[^"]+)?"\s*width="(?:[^"]+)?"\s*class="(?:[^"]+)?">\s*<font color="(?:[^"]+)?">(\d+)?<\/font>'
+            
+        matches = re.compile(patron, re.DOTALL).findall(data)
+        if not matches and item.extra != 'search':                                  #error
+            item = generictools.web_intervenida(item, data)                         #Verificamos que no haya sido clausurada
+            if item.intervencion:                                                   #Sí ha sido clausurada judicialmente
+                item, itemlist = generictools.post_tmdb_episodios(item, itemlist)   #Llamamos al método para el pintado del error
+                return itemlist                                                     #Salimos
+            
+            logger.error("ERROR 02: LISTADO: Ha cambiado la estructura de la Web " + " / PATRON: " + patron + " / DATA: " + data)
+            itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 02: LISTADO: Ha cambiado la estructura de la Web.  Reportar el error con el log'))
+            break                                       #si no hay más datos, algo no funciona, pintamos lo que tenemos
+        if not matches and item.extra == 'search':                                  #búsqueda vacía
+            return itemlist                                                         #Salimos
+        
+        #logger.debug("PATRON: " + patron)
+        #logger.debug(matches)
+        #logger.debug(data)
+        
+        #Buscamos la próxima y la última página
+        patron_next = '<a href="([^"]+page=(\d+))" title="next page">'
+        if item.extra == 'search':
+            patron_last = '<a href="[^"]+"\s*title="page\s*\d+">\d+<\/a>\s*<b>(\d+)<\/b><\/div><\/div><\/td>'
+        else:
+            patron_last = 'title="previous page"[^<]+<\/a>\s*<a href="[^>]+>(\d+)<\/a>'
+
+        try:
+            next_page_url, next_page = scrapertools.find_single_match(data, patron_next)
+            next_page = int(next_page)
+            next_page_url = item.url + '&page=' + str(next_page)
+        except:                                                                         #Si no lo encuentra, lo ponemos a 1
+            #logger.error('ERROR 03: LISTADO: Al obtener la paginación: ' + patron_next + ' / ' + patron_last + ' / ' + scrapertools.find_single_match(data, "<ul class=\"pagination\">.*?<\/span><\/a><\/li><\/ul><\/nav><\/div><\/div><\/div>"))
+            next_page = 1
+        #logger.debug('curr_page: ' + str(curr_page) + ' / next_page: ' + str(next_page) + ' / last_page: ' + str(last_page))
+        
+        if last_page == 99999:                                                          #Si es el valor inicial, buscamos
+            if item.extra == 'search':
+                last_page = 99
+            try:
+                data_last = ''
+                data_last = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)|&nbsp;", "", httptools.downloadpage(item.url + '&page=%s' % last_page, timeout=timeout_search).data)
+                data_last = unicode(data_last, "utf-8", errors="replace").encode("utf-8")
+                last_page = int(scrapertools.find_single_match(data_last, patron_last)) #lo cargamos como entero
+            except:                                                                     #Si no lo encuentra, lo ponemos a 1
+                #logger.error('ERROR 03: LISTADO: Al obtener la paginación: ' + patron_next + ' / ' + patron_last + ' / ' + scrapertools.find_single_match(data, "<ul class=\"pagination\">.*?<\/span><\/a><\/li><\/ul><\/nav><\/div><\/div><\/div>"))
+                last_page = next_page
+            #logger.debug('curr_page: ' + str(curr_page) + ' / next_page: ' + str(next_page) + ' / last_page: ' + str(last_page))
+        
+        #Empezamos el procesado de matches
+        for scrapedthumbnail, scrapedtitle, scrapedurl, scrapedepisodes, scrapedsize, scrapedseeds in matches:
+            
+            title = scrapedtitle
+            if scrapedepisodes:
+                url = scrapedepisodes
+            else:
+                url = scrapedurl
+            size = scrapedsize
+            title = title.replace("á", "a").replace("é", "e").replace("í", "i").replace("ó", "o").replace("ú", "u").replace("ü", "u").replace("�", "ñ").replace("ñ", "ñ").replace("&atilde;", "a").replace("&etilde;", "e").replace("&itilde;", "i").replace("&otilde;", "o").replace("&utilde;", "u").replace("&ntilde;", "ñ").replace("&#8217;", "'")
+
+            if scrapedurl in title_lista:                                   #Si ya hemos procesado el título, lo ignoramos
+                continue
+            else:
+                title_lista += [scrapedurl]                                 #la añadimos a la lista de títulos
+            
+            #cnt_title += 1
+            item_local = item.clone()                                       #Creamos copia de Item para trabajar
+            if item_local.tipo:                                             #... y limpiamos
+                del item_local.tipo
+            if item_local.totalItems:
+                del item_local.totalItems
+            if item_local.intervencion:
+                del item_local.intervencion
+            if item_local.viewmode:
+                del item_local.viewmode
+            item_local.extra2 = True
+            del item_local.extra2
+            item_local.text_bold = True
+            del item_local.text_bold
+            item_local.text_color = True
+            del item_local.text_color
+                
+            title_subs = []                                                 #creamos una lista para guardar info importante
+            item_local.language = ['VO']                                            #creamos lista para los idiomas
+            item_local.quality = ''                                                 #iniciamos calidad
+            item_local.thumbnail = scrapedthumbnail                                 #iniciamos thumbnail
+
+            if item.extra == 'search':
+                if scrapedepisodes:
+                    item_local.extra = 'series'
+                else:
+                    item_local.extra = 'peliculas'
+                
+            item_local.url = urlparse.urljoin(host, url)                            #guardamos la url final
+            if item_local.extra != 'series':
+                item_local.url += '&order=size&by=ASC'                              #guardamos la url final
+            item_local.context = "['buscar_trailer']"
+            
+            item_local.contentType = "movie"                                        #por defecto, son películas
+            item_local.action = "findvideos"
+            
+            #Analizamos los formatos de la películas
+            if item_local.extra == 'peliculas':
+                patron_title = '(.*?)\.([1|2][9|0]\d{2})?\.(.*?)(?:-.*?)?$'
+                if not scrapertools.find_single_match(title, patron_title):
+                    logger.error('ERROR tratando título PELI: ' + title)
+                    continue
+                try:
+                    title, year, item_local.quality = scrapertools.find_single_match(title, patron_title)
+                except:
+                    title = scrapedtitle
+                    year = ''
+                    item_local.quality = ''
+                title = title.replace('.', ' ')
+                item_local.quality = item_local.quality.replace('.', ' ')
+
+            #Analizamos los formatos de series, temporadas y episodios
+            elif item_local.extra == 'series':
+                patron_title = '(.*?)(\.[1|2][9|0]\d{2})?\.S\d{2}.*?\.([\d|A-Z]{2}.*?)(?:-.*?)?$'
+                if not scrapertools.find_single_match(title, patron_title):
+                    patron_title = '(.*?)\.*([1|2][9|0]\d{2})?(?:\.\d{2}\.\d{2}).*?\.([\d|A-Z]{2}.*?)(?:-.*?)?$'
+                    if not scrapertools.find_single_match(title, patron_title):
+                        logger.error('ERROR tratando título SERIE: ' + title)
+                        continue
+                try:
+                    title, year, item_local.quality = scrapertools.find_single_match(title, patron_title)
+                except:
+                    title = scrapedtitle
+                    year = ''
+                    item_local.quality = ''
+                title = title.replace('.', ' ')
+                item_local.quality = item_local.quality.replace('.', ' ')
+                year = '-'
+                
+                item_local.contentType = "tvshow"
+                item_local.action = "episodios"
+                item_local.season_colapse = True                            #Muestra las series agrupadas por temporadas
+
+            #Limpiamos el título de la basura innecesaria
+            title = re.sub(r'(?i)TV|Online', '', title).strip()
+            item_local.quality = re.sub(r'(?i)proper|unrated|directors|cut|german|repack|internal|real|korean|extended|masted|docu|oar|super|duper|amzn|uncensored|hulu', '', item_local.quality).strip()
+
+            #Analizamos el año.  Si no está claro ponemos '-'
+            try:
+                year_int = int(year)
+                if year_int >= 1940 and year_int <= 2050:
+                    item_local.infoLabels["year"] = year_int
+                else:
+                    item_local.infoLabels["year"] = '-'
+            except:
+                item_local.infoLabels["year"] = '-'
+            
+            #Terminamos de limpiar el título
+            title = re.sub(r'[\(|\[]\s+[\)|\]]', '', title)
+            title = title.replace('()', '').replace('[]', '').strip().lower().title()
+            item_local.from_title = title.strip().lower().title()           #Guardamos esta etiqueta para posible desambiguación de título
+
+            #Salvamos el título según el tipo de contenido
+            if item_local.contentType == "movie":
+                item_local.contentTitle = title
+            else:
+                item_local.contentSerieName = title.strip().lower().title()
+
+            item_local.title = title.strip().lower().title()
+                
+            #Guarda la variable temporal que almacena la info adicional del título a ser restaurada después de TMDB
+            item_local.title_subs = title_subs
+                
+            #Salvamos y borramos el número de temporadas porque TMDB a veces hace tonterias.  Lo pasamos como serie completa
+            if item_local.contentSeason and (item_local.contentType == "season" or item_local.contentType == "tvshow"):
+                item_local.contentSeason_save = item_local.contentSeason
+                del item_local.infoLabels['season']
+
+            #Ahora se filtra por idioma, si procede, y se pinta lo que vale
+            if config.get_setting('filter_languages', channel) > 0:     #Si hay idioma seleccionado, se filtra
+                itemlist = filtertools.get_link(itemlist, item_local, list_language)
+            else:
+                itemlist.append(item_local.clone())                     #Si no, pintar pantalla
+            
+            cnt_title = len(itemlist)                                   #Contador de líneas añadidas
+            
+            #logger.debug(item_local)
+
+    #Pasamos a TMDB la lista completa Itemlist
+    tmdb.set_infoLabels(itemlist, __modo_grafico__)
+    
+    #Llamamos al método para el maquillaje de los títulos obtenidos desde TMDB
+    item, itemlist = generictools.post_tmdb_listado(item, itemlist)
+
+    # Si es necesario añadir paginacion
+    if curr_page <= last_page:
+        if last_page:
+            title = '%s de %s' % (curr_page-1, last_page)
+        else:
+            title = '%s' % curr_page-1
+
+        itemlist.append(Item(channel=item.channel, action="listado", title=">> Página siguiente " + title, title_lista=title_lista, url=next_page_url, extra=item.extra, extra2=item.extra2, last_page=str(last_page), curr_page=str(curr_page)))
+
+    return itemlist
+
+    
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    itemlist_t = []                                                                 #Itemlist total de enlaces
+    itemlist_f = []                                                                 #Itemlist de enlaces filtrados
+    if not item.language:
+        item.language = ['VO']                                                      #VO por defecto
+    matches = []
+    item.category = categoria
+    
+    #logger.debug(item)
+
+    #Bajamos los datos de la página
+    data = ''
+    patron = '<tr class="lista2">\s*<td align="(?:[^"]+)?"\s*class="(?:[^"]+)?"\s*width="(?:[^"]+)?"\s*style="(?:[^"]+)?">\s*<a href="[^"]+">\s*<img src="([^"]+)?"\s*border="(?:[^"]+)?"\s*alt="(?:[^"]+)?"\s*\/><\/a><\/td>\s*<td\s*align="(?:[^"]+)?"(?:\s*width="[^"]+")?\s*class="(?:[^"]+)?">\s*<a onmouseover="(?:[^"]+)?"\s*onmouseout="(?:[^"]+)?"\s*href="([^"]+)" title="[^"]+">(.*?)<\/a>\s*<a href="[^"]+">\s*<img src="[^"]+"\s*border="(?:[^"]+)?"\s*alt="(?:[^"]+)?"\s*><\/a>(?:\s*<a.*?<\/a>)?\s*<br><span.*?<\/span>\s*<\/td>\s*<td align="(?:[^"]+)?"\s*width="(?:[^"]+)?"\s*class="(?:[^"]+)?">.*?<\/td>\s*<td align="(?:[^"]+)?"\s*width="(?:[^"]+)?"\s*class="(?:[^"]+)?">(.*?)?<\/td>\s*<td align="(?:[^"]+)?"\s*width="(?:[^"]+)?"\s*class="(?:[^"]+)?">\s*<font color="(?:[^"]+)?">(\d+)?<\/font>'
+        
+    try:
+        data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)", "", httptools.downloadpage(item.url, timeout=timeout).data)
+        data = unicode(data, "utf-8", errors="replace").encode("utf-8")
+    except:
+        pass
+        
+    if not data:
+        logger.error("ERROR 01: FINDVIDEOS: La Web no responde o la URL es erronea: " + item.url)
+        itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 01: FINDVIDEOS:.  La Web no responde o la URL es erronea. Si la Web está activa, reportar el error con el log'))
+        return itemlist                             #si no hay más datos, algo no funciona, pintamos lo que tenemos
+
+    status, itemlist = check_blocked_IP(data, itemlist)                         #Comprobamos si la IP ha sido bloqueada
+    if status:
+        return itemlist                                                         #IP bloqueada
+    
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    if not matches:                                                             #error
+        item = generictools.web_intervenida(item, data)                         #Verificamos que no haya sido clausurada
+        if item.intervencion:                                                   #Sí ha sido clausurada judicialmente
+            item, itemlist = generictools.post_tmdb_findvideos(item, itemlist)  #Llamamos al método para el pintado del error
+        else:
+            logger.error("ERROR 02: FINDVIDEOS: No hay enlaces o ha cambiado la estructura de la Web " + " / PATRON: " + patron + data)
+            itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 02: FINDVIDEOS: No hay enlaces o ha cambiado la estructura de la Web.  Verificar en la Web esto último y reportar el error con el log'))
+            return itemlist                         #si no hay más datos, algo no funciona, pintamos lo que tenemos
+
+    #logger.debug("PATRON: " + patron)
+    #logger.debug(matches)
+    #logger.debug(data)
+
+    #Llamamos al método para crear el título general del vídeo, con toda la información obtenida de TMDB
+    item, itemlist = generictools.post_tmdb_findvideos(item, itemlist)
+
+    #Ahora tratamos los enlaces .torrent con las diferentes calidades
+    for scrapedthumbnail, scrapedurl, scrapedtitle, scrapedsize, scrapedseeds in matches:
+        #Generamos una copia de Item para trabajar sobre ella
+        item_local = item.clone()
+        title = scrapedtitle
+
+        #Analizamos los formatos de la películas y series
+        if item_local.contentType == 'movie':
+            patron_title = '(.*?)\.([1|2][9|0]\d{2})?\.(.*?)(?:-.*?)?$'
+            if not scrapertools.find_single_match(title, patron_title):
+                continue
+        else:
+            patron_title = '(.*?)(\.[1|2][9|0]\d{2})?\.S\d{2}.*?\.([\d|A-Z]{2}.*?)(?:-.*?)?$'
+            if not scrapertools.find_single_match(title, patron_title):
+                patron_title = '(.*?)\.*([1|2][9|0]\d{2})?(?:\.\d{2}\.\d{2}).*?\.([\d|A-Z]{2}.*?)(?:-.*?)?$'
+                if not scrapertools.find_single_match(title, patron_title):
+                    continue
+        
+        try:
+            title, year, item_local.quality = scrapertools.find_single_match(title, patron_title)
+        except:
+            title = scrapedtitle
+            year = ''
+            item_local.quality = ''
+        title = title.replace('.', ' ')
+        item_local.quality = item_local.quality.replace('.', ' ')
+        item_local.quality = re.sub(r'(?i)proper|unrated|directors|cut|german|repack|internal|real|korean|extended|masted|docu|oar|super|duper|amzn|uncensored|hulu', '', item_local.quality).strip()
+        
+        #Buscamos si ya tiene tamaño, si no, los buscamos en el archivo .torrent
+        size = scrapedsize
+        if size:
+            item_local.title = '%s [%s]' % (item_local.title, size)                 #Agregamos size al final del título
+            size = size.replace('GB', 'G B').replace('Gb', 'G b').replace('MB', 'M B').replace('Mb', 'M b')
+            item_local.quality = '%s [%s]' % (item_local.quality, size)             #Agregamos size al final de la calidad
+        
+        #Añadimos los seeds en calidad, como información adicional
+        if scrapedseeds:
+            item_local.quality = '%s [Seeds: %s]' % (item_local.quality, scrapedseeds)  #Agregamos seeds a la calidad
+
+        #Ahora pintamos el link del Torrent
+        item_local.url = urlparse.urljoin(host, scrapedurl)
+        item_local.title = '[COLOR yellow][?][/COLOR] [COLOR yellow][Torrent][/COLOR] [COLOR limegreen][%s][/COLOR] [COLOR red]%s[/COLOR]' % (item_local.quality, str(item_local.language))
+        
+        #Preparamos título y calidad, quitamos etiquetas vacías
+        item_local.title = re.sub(r'\s?\[COLOR \w+\]\[\[?\s?\]?\]\[\/COLOR\]', '', item_local.title)    
+        item_local.title = re.sub(r'\s?\[COLOR \w+\]\s?\[\/COLOR\]', '', item_local.title)
+        item_local.title = item_local.title.replace("--", "").replace("[]", "").replace("()", "").replace("(/)", "").replace("[/]", "").strip()
+        item_local.quality = re.sub(r'\s?\[COLOR \w+\]\[\[?\s?\]?\]\[\/COLOR\]', '', item_local.quality)
+        item_local.quality = re.sub(r'\s?\[COLOR \w+\]\s?\[\/COLOR\]', '', item_local.quality)
+        item_local.quality = item_local.quality.replace("--", "").replace("[]", "").replace("()", "").replace("(/)", "").replace("[/]", "").strip()
+        
+        item_local.alive = "??"                                                     #Calidad del link sin verificar
+        item_local.action = "play"                                                  #Visualizar vídeo
+        item_local.server = "torrent"                                               #Seridor Torrent
+        
+        itemlist_t.append(item_local.clone())                                       #Pintar pantalla, si no se filtran idiomas
+        
+        # Requerido para FilterTools
+        if config.get_setting('filter_languages', channel) > 0:                     #Si hay idioma seleccionado, se filtra
+            itemlist_f = filtertools.get_link(itemlist_f, item_local, list_language)  #Pintar pantalla, si no está vacío
+
+        #logger.debug("TORRENT: " + scrapedurl + " / title gen/torr: " + item.title + " / " + item_local.title + " / calidad: " + item_local.quality + " / content: " + item_local.contentTitle + " / " + item_local.contentSerieName)
+        #logger.debug(item_local)
+
+    if len(itemlist_f) > 0:                                                     #Si hay entradas filtradas...
+        itemlist.extend(itemlist_f)                                             #Pintamos pantalla filtrada
+    else:                                                                       
+        if config.get_setting('filter_languages', channel) > 0 and len(itemlist_t) > 0: #Si no hay entradas filtradas ...
+            thumb_separador = get_thumb("next.png")                             #... pintamos todo con aviso
+            itemlist.append(Item(channel=item.channel, url=host, title="[COLOR red][B]NO hay elementos con el idioma seleccionado[/B][/COLOR]", thumbnail=thumb_separador))
+        itemlist.extend(itemlist_t)                                             #Pintar pantalla con todo si no hay filtrado
+    
+    # Requerido para AutoPlay
+    autoplay.start(itemlist, item)                                              #Lanzamos Autoplay
+    
+    return itemlist
+    
+    
+def play(item):                                 #Permite preparar la descarga de los .torrents y subtítulos externos
+    logger.info()
+    itemlist = []
+    headers = []
+    import os
+    from core import downloadtools
+    from core import ziptools
+    
+    #buscamos la url del .torrent
+    patron = '<tr><td align="(?:[^"]+)?"\s*class="(?:[^"]+)?"\s*width="(?:[^"]+)?">\s*Torrent:<\/td><td class="(?:[^"]+)?">\s*<img src="(?:[^"]+)?"\s*alt="(?:[^"]+)?"\s*border="(?:[^"]+)?"\s*\/>\s*<a onmouseover="(?:[^"]+)?"\s*onmouseout="(?:[^"]+)?" href="([^"]+)".*?<\/a>'
+    try:
+        data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)", "", httptools.downloadpage(item.url, timeout=timeout).data)
+        data = unicode(data, "utf-8", errors="replace").encode("utf-8")
+    except:
+        pass
+    status, itemlist = check_blocked_IP(data, itemlist)                 #Comprobamos si la IP ha sido bloqueada
+    if status:
+        return itemlist                                                 #IP bloqueada
+    if not scrapertools.find_single_match(data, patron):
+        logger.error('ERROR 02: PLAY: No hay enlaces o ha cambiado la estructura de la Web.  Verificar en la Web esto último y reportar el error con el log: PATRON: ' + patron + ' / DATA: ' + data)
+        itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 02: PLAY: No hay enlaces o ha cambiado la estructura de la Web.  Verificar en la Web esto último y reportar el error con el log'))
+        return itemlist
+    item.url = urlparse.urljoin(host, scrapertools.find_single_match(data, patron))
+    
+    #buscamos subtítulos en español
+    patron = '<tr><td align="(?:[^"]+)?"\s*class="(?:[^"]+)?"\s*>\s*Subs.*?<\/td><td class="(?:[^"]+)?"\s*>(.*?)(?:<br\/>)?<\/td><\/tr>'
+    data_subt = scrapertools.find_single_match(data, patron)
+    if data_subt:
+        patron = '<a href="([^"]+)"\s*onmouseover="return overlib\('
+        patron += "'Download Spanish subtitles'"
+        patron += '\)"\s*onmouseout="(?:[^"]+)?"\s*><img src="(?:[^"]+)?"\s*><\/a>'
+        subt = scrapertools.find_single_match(data_subt, patron)
+        if subt:
+            item.subtitle = urlparse.urljoin(host, subt)
+    
+    if item.subtitle:                                                   #Si hay urls de sub-títulos, se descargan
+        headers.append(["User-Agent", httptools.get_user_agent()])      #Se busca el User-Agent por defecto
+        videolibrary_path = config.get_videolibrary_path()              #Calculamos el path absoluto a partir de la Videoteca
+        if videolibrary_path.lower().startswith("smb://"):              #Si es una conexión SMB, usamos userdata local
+            videolibrary_path = config.get_data_path()                  #Calculamos el path absoluto a partir de Userdata
+        videolibrary_path = os.path.join(videolibrary_path, "subtitles")
+        #Primero se borra la carpeta de subtitulos para limpiar y luego se crea
+        if os.path.exists(videolibrary_path):   
+            import shutil
+            shutil.rmtree(videolibrary_path, ignore_errors=True)
+            time.sleep(1)
+        if not os.path.exists(videolibrary_path):   
+            os.mkdir(videolibrary_path)
+        subtitle_name = 'Rarbg-ES_SUBT.zip'                                     #Nombre del archivo de sub-títulos
+        subtitle_folder_path = os.path.join(videolibrary_path, subtitle_name)   #Path de descarga
+        ret = downloadtools.downloadfile(item.subtitle, subtitle_folder_path, headers=headers, continuar=True, silent=True)
+
+        if os.path.exists(subtitle_folder_path):
+            # Descomprimir zip dentro del addon
+            # ---------------------------------
+            try:
+                unzipper = ziptools.ziptools()
+                unzipper.extract(subtitle_folder_path, videolibrary_path)
+            except:
+                import xbmc
+                xbmc.executebuiltin('XBMC.Extract("%s", "%s")' % (subtitle_folder_path, videolibrary_path))
+                time.sleep(1)
+            
+            # Borrar el zip descargado
+            # ------------------------
+            os.remove(subtitle_folder_path)
+            
+            #Tomo el primer archivo de subtítulos como valor por defecto
+            for raiz, subcarpetas, ficheros in os.walk(videolibrary_path):
+                for f in ficheros:
+                    if f.endswith(".srt"):
+                        #f_es = 'rarbg_subtitle.spa.srt'
+                        f_es = scrapertools.find_single_match(item.url, '&f=(.*?).torrent$').replace('.', ' ').replace('-', ' ').lower() + '.spa.srt'
+                        if not f_es:
+                            f_es = item.infoLabels['originaltitle'] + '.spa.srt'
+                            f_es = f_es.replace(':', '').lower()
+                        os.rename(os.path.join(videolibrary_path, f), os.path.join(videolibrary_path, f_es))
+                        item.subtitle = os.path.join(videolibrary_path, f_es)   #Archivo de subtitulos
+                        break
+                break
+        
+    itemlist.append(item.clone())                                               #Reproducción normal
+        
+    return itemlist
+
+    
+def episodios(item):
+    logger.info()
+    itemlist = []
+    item.category = categoria
+    
+    #logger.debug(item)
+
+    if item.from_title:
+        item.title = item.from_title
+    
+    #Limpiamos num. Temporada y Episodio que ha podido quedar por Novedades
+    season_display = 0
+    if item.contentSeason:
+        if item.season_colapse:                                                             #Si viene del menú de Temporadas...
+            season_display = item.contentSeason                                             #... salvamos el num de sesión a pintar
+            item.from_num_season_colapse = season_display
+            del item.season_colapse
+            item.contentType = "tvshow"
+            if item.from_title_season_colapse:
+                item.title = item.from_title_season_colapse
+                del item.from_title_season_colapse
+                if item.infoLabels['title']:
+                    del item.infoLabels['title']
+        del item.infoLabels['season']
+    if item.contentEpisodeNumber:
+        del item.infoLabels['episode']
+    if season_display == 0 and item.from_num_season_colapse:
+        season_display = item.from_num_season_colapse
+
+    # Obtener la información actualizada de la Serie.  TMDB es imprescindible para Videoteca
+    if not item.infoLabels['tmdb_id']:
+        tmdb.set_infoLabels(item, True)
+        
+    modo_ultima_temp_alt = modo_ultima_temp
+    if item.ow_force == "1":                                    #Si hay un traspaso de canal o url, se actualiza todo 
+        modo_ultima_temp_alt = False
+    
+    max_temp = 1
+    if item.infoLabels['number_of_seasons']:
+        max_temp = item.infoLabels['number_of_seasons']
+    y = []
+    if modo_ultima_temp_alt and item.library_playcounts:        #Averiguar cuantas temporadas hay en Videoteca
+        patron = 'season (\d+)'
+        matches = re.compile(patron, re.DOTALL).findall(str(item.library_playcounts))
+        for x in matches:
+            y += [int(x)]
+        max_temp = max(y)
+
+    # Descarga la página
+    data = ''                                                                   #Inserto en num de página en la url
+    try:
+        data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)|&nbsp;", "", httptools.downloadpage(item.url, timeout=timeout).data)
+        data = unicode(data, "utf-8", errors="replace").encode("utf-8")
+    except:                                                                     #Algún error de proceso, salimos
+        pass
+        
+    if not data:
+        logger.error("ERROR 01: EPISODIOS: La Web no responde o la URL es erronea" + item.url)
+        itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 01: EPISODIOS:.  La Web no responde o la URL es erronea. Si la Web está activa, reportar el error con el log'))
+        return itemlist
+    
+    status, itemlist = check_blocked_IP(data, itemlist)                         #Comprobamos si la IP ha sido bloqueada
+    if status:
+        return itemlist                                                         #IP bloqueada
+
+    #Capturamos las temporadas de episodios dentro de la serie
+    patron_temp = '<h1\s*class="[^"]+">Season\s*(\d+)<\/h1><div class="tvcontent"><div id="[^"]+"><\/div>(.*?<\/div><\/div>)(?:<script>.*?<\/script>)?<\/div>'
+    temp_serie = re.compile(patron_temp, re.DOTALL).findall(data)
+    
+    for season_num, temporada in temp_serie:
+        patron = '<div id="episode_(\d+)"><div class="[^"]+">\s*<a onclick="[^"]+"\s*class="[^"]+"><div class="[^"]+">.*?\s*(\d+)<\/div>\s*(.*?)\s*<'
+        matches = re.compile(patron, re.DOTALL).findall(temporada)
+        if not matches:                                                             #error
+            item = generictools.web_intervenida(item, data)                         #Verificamos que no haya sido clausurada
+            if item.intervencion:                                                   #Sí ha sido clausurada judicialmente
+                item, itemlist = generictools.post_tmdb_episodios(item, itemlist)   #Llamamos al método para el pintado del error
+                return itemlist                                                     #Salimos
+            
+            logger.error("ERROR 02: EPISODIOS: Ha cambiado la estructura de la Web " + " / PATRON: " + patron + " / DATA: " + data)
+            itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 02: EPISODIOS: Ha cambiado la estructura de la Web.  Reportar el error con el log'))
+            return itemlist                         #si no hay más datos, algo no funciona, pintamos lo que tenemos
+
+        #logger.debug("PATRON: " + patron)
+        #logger.debug(matches)
+        #logger.debug(data)
+        
+        season = max_temp
+        #Comprobamos si realmente sabemos el num. máximo de temporadas
+        if item.library_playcounts or (item.infoLabels['number_of_seasons'] and item.tmdb_stat):
+            num_temporadas_flag = True
+        else:
+            num_temporadas_flag = False
+
+        if modo_ultima_temp_alt and item.library_playcounts:    #Si solo se actualiza la última temporada de Videoteca
+            if int(season_num) < max_temp:
+                break                                           #Sale del bucle actual del FOR
+        
+        # Recorremos todos los episodios generando un Item local por cada uno en Itemlist
+        for epi_id, episode_num, scrapedtitle in matches:
+            item_local = item.clone()
+            item_local.action = "findvideos"
+            item_local.contentType = "episode"
+            item_local.extra = "episodios"
+            if item_local.library_playcounts:
+                del item_local.library_playcounts
+            if item_local.library_urls:
+                del item_local.library_urls
+            if item_local.path:
+                del item_local.path
+            if item_local.update_last:
+                del item_local.update_last
+            if item_local.update_next:
+                del item_local.update_next
+            if item_local.channel_host:
+                del item_local.channel_host
+            if item_local.active:
+                del item_local.active
+            if item_local.contentTitle:
+                del item_local.infoLabels['title']
+            if item_local.season_colapse:
+                del item_local.season_colapse
+
+            item_local.title = ''
+            item_local.context = "['buscar_trailer']"
+            item_local.url = urlparse.urljoin(host, 'tv.php?ajax=1&tvepisode=%s' % epi_id)
+            title = scrapedtitle
+            item_local.language = ['VO']
+            if not item_local.infoLabels['poster_path']:
+                item_local.thumbnail = item_local.infoLabels['thumbnail']
+            epi_rango = False
+
+            try:
+                item_local.contentSeason = int(season_num)
+                if 'season pack' in title.lower():
+                    item_local.contentEpisodeNumber = 1
+                    epi_rango = True
+                else:
+                    item_local.contentEpisodeNumber = int(episode_num)
+            except:
+                logger.error('ERROR al extraer Temporada/Episodio: ' + title)
+                item_local.contentSeason = 1
+                item_local.contentEpisodeNumber = 0
+            
+            #Si son episodios múltiples, lo extraemos
+            if epi_rango:
+                item_local.infoLabels['episodio_titulo'] = 'al 99'
+                item_local.title = '%sx%s al 99 - Season Pack' % (str(item_local.contentSeason), str(item_local.contentEpisodeNumber).zfill(2))
+            else:
+                item_local.title = '%sx%s - ' % (str(item_local.contentSeason), str(item_local.contentEpisodeNumber).zfill(2))
+
+            if season_display > 0:
+                if item_local.contentSeason > season_display:
+                    continue
+                elif item_local.contentSeason < season_display:
+                    break
+            
+            itemlist.append(item_local.clone())
+
+            #logger.debug(item_local)
+            
+    if len(itemlist) > 1:
+        itemlist = sorted(itemlist, key=lambda it: (int(it.contentSeason), int(it.contentEpisodeNumber)))       #clasificamos
+        
+    if item.season_colapse and not item.add_videolibrary:                       #Si viene de listado, mostramos solo Temporadas
+        item, itemlist = generictools.post_tmdb_seasons(item, itemlist)
+
+    if not item.season_colapse:                                                 #Si no es pantalla de Temporadas, pintamos todo
+        # Pasada por TMDB y clasificación de lista por temporada y episodio
+        tmdb.set_infoLabels(itemlist, True)
+
+        #Llamamos al método para el maquillaje de los títulos obtenidos desde TMDB
+        item, itemlist = generictools.post_tmdb_episodios(item, itemlist)
+    
+    #logger.debug(item)
+
+    return itemlist
+    
+    
+def check_blocked_IP(data, itemlist):
+    logger.info()
+    thumb_separador = get_thumb("next.png")
+    
+    if 'Please wait while we try to verify your browser...' in data:
+        logger.error("ERROR 99: La IP ha sido bloqueada por la Web" + " / DATA: " + data)
+        itemlist.append(Item(channel=channel, url=host, title="[COLOR yellow]La IP ha sido bloqueada por la Web.[/COLOR]", folder=False, thumbnail=thumb_separador))
+        itemlist.append(Item(channel=channel, url=host, title="[COLOR yellow]Fuerce la renovación de la IP en el Router[/COLOR]", folder=False, thumbnail=thumb_separador))
+        from platformcode import platformtools
+        platformtools.dialog_notification("IP bloqueada", "RARBG: Reiniciar ROUTER")
+    
+        return (True, itemlist)
+    return (False, itemlist)
+    
+    
+def actualizar_titulos(item):
+    logger.info()
+    
+    item = generictools.update_title(item) #Llamamos al método que actualiza el título con tmdb.find_and_set_infoLabels
+    
+    #Volvemos a la siguiente acción en el canal
+    return item
+
+    
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    
+    try:
+        item.url = host + 'torrents.php?category=2;18;41;49;14;48;17;44;45;47;50;51;52;42;46&search=%s' % texto
+        item.extra = 'search'
+
+        if texto != '':
+            return listado(item)
+    except:
+        import sys
+        import traceback
+        for line in sys.exc_info():
+            logger.error("{0}".format(line))
+        logger.error(traceback.format_exc())
+        return []
+ 
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/repelis.py b/plugin.video.alfa/channels/repelis.py
index 8f64886b..d921c349 100644
--- a/plugin.video.alfa/channels/repelis.py
+++ b/plugin.video.alfa/channels/repelis.py
@@ -25,7 +25,7 @@ list_servers = ['rapidvideo', 'streamango', 'fastplay', 'openload', 'netu', 'vid
 
 __channel__='repelis'
 
-host = "https://repelisgo.io"
+host = "https://repelisgo.com"
 
 try:
     __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
@@ -207,23 +207,23 @@ def findvideos(item):
 
     autoplay.start(itemlist, item)
 
-    if itemlist:
+    if itemlist and item.contentChannel != "videolibrary":
         itemlist.append(Item(channel = item.channel))
         itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="",
                                    text_color="magenta"))
         # Opción "Añadir esta película a la biblioteca de KODI"
-        if item.extra != "library":
-            if config.get_videolibrary_support():
-                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
-                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
-                                     contentTitle = item.contentTitle
-                                     ))
+        if config.get_videolibrary_support():
+            itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
+                                 action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
+                                 contentTitle = item.contentTitle
+                                 ))
     return itemlist
 
 
 def play(item):
     logger.info()
     itemlist = []
+    #headers = {"}
     url1 = httptools.downloadpage(host + item.url, follow_redirects=False, only_headers=True).headers.get("location", "")
     itemlist.append(item.clone(url=url1))
     itemlist = servertools.get_servers_itemlist(itemlist)
diff --git a/plugin.video.alfa/channels/retroseriestv.py b/plugin.video.alfa/channels/retroseriestv.py
index 7878a441..ddbeb527 100644
--- a/plugin.video.alfa/channels/retroseriestv.py
+++ b/plugin.video.alfa/channels/retroseriestv.py
@@ -46,9 +46,12 @@ def mainlist(item):
     return itemlist
 
 
-def get_source(url):
+def get_source(url, referer=None):
     logger.info()
-    data = httptools.downloadpage(url).data
+    if referer is None:
+        data = httptools.downloadpage(url, ignore_response_code=True).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
     data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
     return data
 
diff --git a/plugin.video.alfa/channels/reyanime.json b/plugin.video.alfa/channels/reyanime.json
new file mode 100644
index 00000000..5d48ad9d
--- /dev/null
+++ b/plugin.video.alfa/channels/reyanime.json
@@ -0,0 +1,53 @@
+{
+  "id": "reyanime",
+  "name": "Rey Anime",
+  "active": true,
+  "adult": false,
+  "language": ["cast", "lat"],
+  "thumbnail": "https://reyanimeonline.com/assets/img/logo.png",
+  "banner": "",
+  "categories": [
+    "anime",
+    "vos"
+  ],
+  "settings": [
+    {
+      "id": "include_in_global_search",
+      "type": "bool",
+      "label": "Incluir en busqueda global",
+      "default": false,
+      "enabled": false,
+      "visible": false
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostrar enlaces en idioma...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "LAT",
+        "VOSE"
+      ]
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    },
+    {
+      "id": "include_in_newest_anime",
+      "type": "bool",
+      "label": "Incluir en Novedades - Episodios de anime",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
+  ]
+}
diff --git a/plugin.video.alfa/channels/reyanime.py b/plugin.video.alfa/channels/reyanime.py
new file mode 100644
index 00000000..23b2275e
--- /dev/null
+++ b/plugin.video.alfa/channels/reyanime.py
@@ -0,0 +1,303 @@
+# -*- coding: utf-8 -*-
+# -*- Channel ReyAnime -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the Alfa Develop Group -*-
+
+import re
+import urllib
+
+from core import httptools
+from core import scrapertools
+from core import servertools
+from channelselector import get_thumb
+from core import tmdb
+from core.item import Item
+from platformcode import logger, config
+from channels import autoplay
+from channels import filtertools
+
+
+host = "https://reyanimeonline.com/"
+
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'reyanime')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'reyanime')
+
+IDIOMAS = {'latino':'LAT', 'VOSE': 'VOSE'}
+list_language = IDIOMAS.values()
+list_quality = []
+list_servers = ['directo', 'openload', 'streamango', 'mp4upload', 'gvideo']
+
+
+def mainlist(item):
+    logger.info()
+
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist = []
+
+
+    itemlist.append(Item(channel=item.channel, title="Anime",
+                              action="sub_menu",
+                              thumbnail=''
+                              ))
+
+    itemlist.append(Item(channel=item.channel, title="Películas",
+                         action="list_all",
+                         thumbnail=get_thumb('movies', auto=True),
+                         url=host + 'inc/a.pelicula.php', page='1'))
+
+    itemlist.append(Item(channel=item.channel, title="Géneros",
+                         action="section",
+                         thumbnail=get_thumb('genres', auto=True),
+                         url=host + 'estrenos/'))
+
+    itemlist.append(Item(channel=item.channel, title="Alfabetico",
+                         action="section",
+                         thumbnail=get_thumb('alphabet', auto=True),
+                         url=host + 'estrenos/'))
+
+    itemlist.append(Item(channel=item.channel, title="Buscar",
+                               action="search",
+                               url=host + 'resultado/?buscar=',
+                               thumbnail=get_thumb('search', auto=True),
+                               fanart='https://s30.postimg.cc/pei7txpa9/buscar.png'
+                               ))
+
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+def sub_menu(item):
+
+    itemlist = []
+
+    itemlist.append(Item(channel=item.channel, title="Nuevos Capitulos",
+                         action="new_episodes",
+                         thumbnail=get_thumb('new episodes', auto=True),
+                         url=host))
+
+    itemlist.append(Item(channel=item.channel, title="Recientes",
+                         action="list_all",
+                         thumbnail=get_thumb('recents', auto=True),
+                         url=host + 'inc/a.emision.php', page='1'))
+
+    itemlist.append(Item(channel=item.channel, title="Todas",
+                         action="list_all",
+                         thumbnail=get_thumb('all', auto=True),
+                         url=host + 'inc/a.animes.php', page='1'))
+
+    itemlist.append(Item(channel=item.channel, title="Mas Vistos",
+                         action="list_all",
+                         thumbnail=get_thumb('more watched', auto=True),
+                         url=host + 'mas-vistos/'))
+
+    itemlist.append(Item(channel=item.channel, title="Recomendados",
+                         action="list_all",
+                         thumbnail=get_thumb('recomended', auto=True),
+                         url=host + 'recomendado/'))
+
+    return itemlist
+
+def get_source(url, referer=None):
+    logger.info()
+    if referer is None:
+        data = httptools.downloadpage(url).data
+    else:
+        data = httptools.downloadpage(url, headers={'Referer':referer}).data
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+def section(item):
+    logger.info()
+
+    itemlist = []
+    listed = []
+    param = ''
+    full_data = get_source(item.url)
+
+    if item.title == 'Géneros':
+        data = scrapertools.find_single_match(full_data, 'id="generos"(.*?)"letras')
+    elif item.title == 'Alfabetico':
+        data = scrapertools.find_single_match(full_data,'class="letras(.*?)<h2')
+
+    patron = 'href="([^"]+)">(?:<i class="fa fa-circle-o"></i>|)([^<]+)<'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+        param = scrapedtitle.strip()
+        title = param.capitalize()
+        if item.title == 'Géneros':
+
+            url = 'inc/a.genero.php'
+        elif item.title == 'Alfabetico':
+            url = 'inc/a.letra.php'
+
+        if scrapedurl not in listed:
+            itemlist.append(Item(channel=item.channel, title=title, url=host+url, action='list_all', param=param,
+                                 page='1'))
+            listed.append(scrapedurl)
+
+    return sorted(itemlist, key=lambda i: i.title)
+
+def list_all(item):
+    logger.info()
+
+    itemlist = []
+
+    if item.param == '':
+
+        data = httptools.downloadpage(item.url, post='page=%s' % item.page).data
+    else:
+        if len(item.param) > 1:
+            var = 'genero'
+        else:
+            var = 'letra'
+        data = httptools.downloadpage(item.url, post='%s=%s&page=%s' % (var, item.param, item.page)).data
+
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    patron = '<div class="col-md-4"><a href="([^"]+)" class="front"><img src="([^"]+)" alt="([^"]+)".*?'
+    patron += '<div class="categoria">([^"]+).*?"sinopsis">.*?<p>([^<]+)</p>'
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle, type, scrapedplot in matches:
+        url = scrapedurl
+        thumbnail = scrapedthumbnail
+        new_item= Item(channel=item.channel,
+                       action='episodios',
+                       title=scrapedtitle,
+                       url=url,
+                       thumbnail=thumbnail,
+                       plot = scrapedplot,
+                       )
+
+        if 'pelicula' in url:
+            new_item.contentTitle=scrapedtitle
+            new_item.infoLabels['year':'-']
+        else:
+            new_item.contentSerieName = scrapedtitle
+        if 'reyanime' not in scrapedtitle:
+            itemlist.append(new_item)
+        # Paginacion
+    if len(itemlist) > 0 and item.page != '':
+        next_page_value = int(item.page)+1
+        next_page = str(next_page_value)
+        itemlist.append(item.clone(title=">> Página siguiente",
+                             page=next_page,
+                             thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png'
+                             ))
+    tmdb.set_infoLabels(itemlist, seekTmdb=True)
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = item.url + texto
+    try:
+        if texto != '':
+            return list_all(item)
+        else:
+            return []
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+def new_episodes(item):
+    logger.info()
+
+    itemlist = []
+
+    data = get_source(item.url)
+    patron = 'class="overarchingdiv"> <a href="([^"]+)".*?src="([^"]+)".*?"overtitle">([^<]+)<.*?"overepisode">([^<]+)<'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle, episode in matches:
+        title = '%s - Episodio %s' % (scrapedtitle, episode)
+        itemlist.append(Item(channel=item.channel, title=title, url=scrapedurl, thumbnail=scrapedthumbnail,
+                             action='findvideos'))
+
+    return itemlist
+
+def episodios(item):
+    logger.info()
+    itemlist = []
+
+    full_data = get_source(item.url)
+    data = scrapertools.find_single_match(full_data, '>Lista de episodios:(.*?)</ul>')
+    patron = '<li class="item_cap"> <a href="([^"]+)" class=".*?">.*?</i>.*?Episodio (\d+)([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    infoLabels = item.infoLabels
+    for scrapedurl, episode, lang in matches:
+        if 'latino' in scrapedurl:
+            lang = 'LAT'
+        elif 'sub' in lang.lower() or lang.strip() == '':
+            lang='VOSE'
+
+
+        title = "1x" + episode + " - Episodio %s" % episode
+        url = scrapedurl
+        infoLabels['season'] = '1'
+        infoLabels['episode'] = episode
+        itemlist.append(Item(channel=item.channel, title=title, contentSerieName=item.contentSerieName, url=url,
+                             action='findvideos', language=lang, infoLabels=infoLabels))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    itemlist = itemlist[::-1]
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(
+            Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url,
+                 action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName,
+                 extra1='library'))
+
+    if 'pelicula' in item.url and len(itemlist) > 0:
+        return findvideos(itemlist[0])
+    else:
+        return itemlist
+
+
+def findvideos(item):
+    logger.info()
+
+    itemlist = []
+
+    data = get_source(item.url)
+    patron = "tabsArray\['\d+'\] =.*?src='([^']+)'"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl in matches:
+
+        if 'reyanimeonline' in scrapedurl:
+            new_data = get_source(scrapedurl)
+            scrapedurl = scrapertools.find_single_match(new_data, '"file":"([^"]+)",')
+
+        if scrapedurl != '':
+            itemlist.append(Item(channel=item.channel, title='%s', url=scrapedurl, action='play', language = item.language,
+                                       infoLabels=item.infoLabels))
+
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % x.server.capitalize())
+
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+
+    # Requerido para FilterTools
+
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+
+    # Requerido para AutoPlay
+
+    autoplay.start(itemlist, item)
+
+    return itemlist
+
+def newest(categoria):
+    itemlist = []
+    item = Item()
+    if categoria == 'anime':
+        item.url=host
+        itemlist = new_episodes(item)
+    return itemlist
diff --git a/plugin.video.alfa/channels/search.py b/plugin.video.alfa/channels/search.py
index 90ea7199..c6a2dd20 100644
--- a/plugin.video.alfa/channels/search.py
+++ b/plugin.video.alfa/channels/search.py
@@ -481,19 +481,16 @@ def do_search(item, categories=None):
     time.sleep(0.5)
     progreso = platformtools.dialog_progress(config.get_localized_string(30993) % tecleado, "")
     channel_files = sorted(glob.glob(channels_path), key=lambda x: os.path.basename(x))
-
     import math
-    # fix float porque la division se hace mal en python 2.x
-    number_of_channels = float(100) / len(channel_files)
 
     threads = []
     search_results = {}
     start_time = time.time()
+    list_channels_search = []
 
+    # Extrae solo los canales a buscar
     for index, infile in enumerate(channel_files):
         try:
-            percentage = int(math.ceil((index + 1) * number_of_channels))
-
             basename = os.path.basename(infile)
             basename_without_extension = basename[:-5]
             logger.info("%s..." % basename_without_extension)
@@ -539,29 +536,40 @@ def do_search(item, categories=None):
             if not include_in_global_search:
                 logger.info("%s -no incluido en lista a buscar-" % basename_without_extension)
                 continue
+            list_channels_search.append(infile)
+        except:
+            logger.error("No se puede buscar en: %s" % channel_parameters["title"])
+            import traceback
+            logger.error(traceback.format_exc())
+            continue
 
+
+    for index, infile in enumerate(list_channels_search):
+        try:
+           # fix float porque la division se hace mal en python 2.x
+            percentage = int(float((index+1))/len(list_channels_search)*float(100))
+            basename = os.path.basename(infile)
+            basename_without_extension = basename[:-5]
+            logger.info("%s..." % basename_without_extension)
+            channel_parameters = channeltools.get_channel_parameters(basename_without_extension)
+            # Movido aqui el progreso, para que muestre el canal exacto que está buscando
+            progreso.update(percentage,
+                            config.get_localized_string(60520) % (channel_parameters["title"]))
+            # Modo Multi Thread
             if progreso.iscanceled():
                 progreso.close()
                 logger.info("Búsqueda cancelada")
                 return itemlist
-
-            # Modo Multi Thread
             if multithread:
                 t = Thread(target=channel_search, args=[search_results, channel_parameters, tecleado],
                            name=channel_parameters["title"])
                 t.setDaemon(True)
                 t.start()
                 threads.append(t)
-
             # Modo single Thread
             else:
                 logger.info("Intentado búsqueda en %s de %s " % (basename_without_extension, tecleado))
                 channel_search(search_results, channel_parameters, tecleado)
-
-            logger.info("%s incluido en la búsqueda" % basename_without_extension)
-            progreso.update(percentage,
-                            config.get_localized_string(60520) % channel_parameters["title"])
-
         except:
             logger.error("No se puede buscar en: %s" % channel_parameters["title"])
             import traceback
@@ -581,24 +589,18 @@ def do_search(item, categories=None):
 
             list_pendent_names = [a.getName() for a in pendent]
             mensaje = config.get_localized_string(70282) % (", ".join(list_pendent_names))
-            progreso.update(percentage, config.get_localized_string(60521) % (len(threads) - len(pendent), len(threads)),
+            progreso.update(percentage, config.get_localized_string(60521) % (len(threads) - len(pendent) + 1, len(threads)),
                             mensaje)
-            logger.debug(mensaje)
-
             if progreso.iscanceled():
                 logger.info("Búsqueda cancelada")
                 break
-
             time.sleep(0.5)
             pendent = [a for a in threads if a.isAlive()]
-
     total = 0
-
     for channel in sorted(search_results.keys()):
         for element in search_results[channel]:
             total += len(element["itemlist"])
             title = channel
-
             # resultados agrupados por canales
             if item.contextual == True or item.action == 'search_tmdb':
                 result_mode = 1
@@ -606,10 +608,8 @@ def do_search(item, categories=None):
                 if len(search_results[channel]) > 1:
                     title += " -%s" % element["item"].title.strip()
                 title += " (%s)" % len(element["itemlist"])
-
                 title = re.sub("\[COLOR [^\]]+\]", "", title)
                 title = re.sub("\[/COLOR]", "", title)
-
                 itemlist.append(Item(title=title, channel="search", action="show_result", url=element["item"].url,
                                      extra=element["item"].extra, folder=True, adult=element["adult"],
                                      from_action="search", from_channel=element["item"].channel, tecleado=tecleado))
@@ -625,13 +625,10 @@ def do_search(item, categories=None):
                             i.infoPlus = True
                         itemlist.append(i.clone(title=title, from_action=i.action, from_channel=i.channel,
                                                 channel="search", action="show_result", adult=element["adult"]))
-
     title = config.get_localized_string(59972) % (
     tecleado, total, time.time() - start_time)
     itemlist.insert(0, Item(title=title, text_color='yellow'))
-
     progreso.close()
-
     #Para opcion Buscar en otros canales
     if item.contextual == True:
         return exact_results(itemlist, tecleado)
diff --git a/plugin.video.alfa/channels/seodiv.py b/plugin.video.alfa/channels/seodiv.py
index 1fca076f..83cf2aaa 100755
--- a/plugin.video.alfa/channels/seodiv.py
+++ b/plugin.video.alfa/channels/seodiv.py
@@ -47,8 +47,7 @@ def todas(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    patron = '<div class=shortf><div><div class=shortf-img><a href=(.*?)><img src=(.*?) alt=.*?quality>(.*?)<.*?Ver ' \
-             'Serie><span>(.*?)<\/span>'
+    patron = '<div class=shortstory-in><div class=shortstory radius-3><div class=short-images radius-3><a href=(.*?) title=(.*?) class=.*?><img src=(.*?) alt.*?><\/a><\/div>'
 
     matches = re.compile(patron, re.DOTALL).findall(data)
     # Paginacion
@@ -57,16 +56,15 @@ def todas(item):
     min=int(min)-int(item.page)
     max = min + num_items_x_pagina - 1
     
-    for scrapedurl, scrapedthumbnail, scrapedcalidad, scrapedtitle in matches[min:max]:
+    for scrapedurl, scrapedtitle, scrapedthumbnail,  in matches[min:max]:
         url = host + scrapedurl
-        calidad = scrapedcalidad
         title = scrapedtitle.decode('utf-8')
         thumbnail = scrapedthumbnail
         fanart = 'https://s32.postimg.cc/gh8lhbkb9/seodiv.png'
-        if not 'xxxxxx' in scrapedtitle:
+        if 'TITULO' != title:
             itemlist.append(
                 Item(channel=item.channel,
-                 action="temporadas",
+                 action="episodios",
                  title=title, url=url,
                  thumbnail=thumbnail,
                  fanart=fanart,
@@ -85,153 +83,70 @@ def todas(item):
     return itemlist
 
 
-def temporadas(item):
-    logger.info()
-    itemlist = []
-    data = get_source(item.url)
-    url_base = item.url
-    patron = '<li class=item\d+><a href=#>(.*?) <\/a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    temp = 1
-    if matches:
-        for scrapedtitle in matches:
-            url = url_base
-            tempo = re.findall(r'\d+', scrapedtitle)
-            # if tempo:
-            #    title = 'Temporada' + ' ' + tempo[0]
-            # else:
-            title = scrapedtitle
-            thumbnail = item.thumbnail
-            plot = item.plot
-            fanart = scrapertools.find_single_match(data, '<img src="([^"]+)"/>.*?</a>')
-            itemlist.append(
-                Item(channel=item.channel,
-                     action="episodiosxtemp",
-                     title=title,
-                     fulltitle=item.title,
-                     url=url,
-                     thumbnail=thumbnail,
-                     plot=plot, fanart=fanart,
-                     temp=str(temp),
-                     contentSerieName=item.contentSerieName,
-                     context=item.context
-                     ))
-            temp = temp + 1
-
-        if config.get_videolibrary_support() and len(itemlist) > 0:
-            itemlist.append(
-                Item(channel=item.channel,
-                     title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]',
-                     url=item.url,
-                     action="add_serie_to_library",
-                     extra="episodios",
-                     contentSerieName=item.contentSerieName,
-                     extra1=item.extra1,
-                     temp=str(temp)
-                     ))
-        return itemlist
-    else:
-        itemlist = episodiosxtemp(item)
-        if config.get_videolibrary_support() and len(itemlist) > 0:
-            itemlist.append(
-                Item(channel=item.channel,
-                     title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]',
-                     url=item.url,
-                     action="add_serie_to_library",
-                     extra="episodios",
-                     contentSerieName=item.contentSerieName,
-                     extra1=item.extra1,
-                     temp=str(temp)
-                     ))
-        return itemlist
-
-
 def episodios(item):
     logger.info()
     itemlist = []
-    templist = temporadas(item)
-    for tempitem in templist:
-        itemlist += episodiosxtemp(tempitem)
-
-    return itemlist
-
-
-def get_source(url):
-    logger.info()
-    data = httptools.downloadpage(url, add_referer=True).data
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    return data
-
-
-def episodiosxtemp(item):
-    logger.info()
-
-    logger.info()
-    itemlist = []
-    item.title = 'Temporada %s' % item.temp.zfill(2)
-    patron_temp = '<li class=item\d+><a href=#>%s <\/a><ul><!--initiate accordion-->.*?<!--initiate ' \
-                  'accordion-->' % item.title
-    all_data = get_source(item.url)
-    data = scrapertools.find_single_match(all_data, patron_temp)
-    tempo = item.title
-    if 'Temporada' in item.title:
-        item.title = 'temporada-%s'%item.temp.zfill(2)
-    patron = '<li><a href=(.*?)>.*?(Capitulo|Pelicula).*?(\d+).*?<'
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtipo, scrapedtitle in matches:
-        url = host + scrapedurl
-        plot = item.plot
-        if scrapedtipo == 'Capitulo' and item.temp != '':
-            title = item.contentSerieName + ' ' + item.temp + 'x' + scrapedtitle
-            itemlist.append(
-                Item(channel=item.channel,
-                     action="findvideos",
-                     title=title,
-                     fulltitle=item.fulltitle,
-                     url=url,
-                     thumbnail=item.thumbnail,
-                     plot=plot,
-                     language=language,
-                     contentSerieName=item.contentSerieName,
-                     context=item.context
-                     ))
-
-        if item.title not in scrapedurl and scrapedtipo == 'Capitulo' and item.temp \
-                == '':
-            if item.temp == '': temp = '1'
-            title = item.contentSerieName + ' ' + temp + 'x' + scrapedtitle
-            if '#' not in scrapedurl:
-                itemlist.append(
-                    Item(channel=item.channel,
-                         action="findvideos",
-                         title=title,
-                         fulltitle=item.fulltitle,
-                         url=url,
-                         thumbnail=item.thumbnail,
-                         plot=plot,
-                         contentSerieName=item.contentSerieName,
-                         context=item.context
-                         ))
-
-        if 'temporada' not in item.title and item.title not in scrapedurl and scrapedtipo == 'Pelicula':
-            title = scrapedtipo + ' ' + scrapedtitle
-            itemlist.append(
-                Item(channel=item.channel,
-                     action="findvideos",
-                     title=title,
-                     fulltitle=item.fulltitle,
-                     url=url,
-                     thumbnail=item.thumbnail,
-                     plot=plot,
-                     language=language,
-                     contentSerieName=item.contentSerieName,
-                     context=item.context
-                     ))
-
+    patronpags = "<div class=pages>.+?<\/div><div class=col-lg-1 col-sm-2 col-xs-2 pages-next>"
+    data2 = scrapertools.find_single_match(data, patronpags)
+    patrontotal = "<a href=.*?>(.*?)<\/a>"
+    matches = scrapertools.find_multiple_matches(data2, patrontotal)
+    itemlist = capitulosxpagina(item,item.url)
+    total = 0
+    for totales in matches:
+        total = int(totales)
+    for x in range(1, total):
+        url = item.url+"page/"+str(x+1)+"/"
+        listitem = capitulosxpagina(item,url)
+        if isinstance(listitem, list):
+            itemlist= itemlist + listitem
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(Item(channel=item.channel, title="[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]", url=item.url,
+                             action="add_serie_to_library", extra="episodios", show=item.contentSerieName))
     return itemlist
 
+def capitulosxpagina(item,url):
+    itemlist = []
+    data = httptools.downloadpage(url).data
+    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    patron = '<div class=col-sm-4 col-xs-12><a href=(.*?) title=(.*?) class=.*?><img src=(.*?) class.*?>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    temp = 1
+    if matches:
+        for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+            url = scrapedurl
+            serieName = item.contentSerieName
+            title = scrapedtitle.lower()
+            logger.info
+            if serieName.lower() in title:
+            	title = title.split(serieName.lower())
+            	title = title[1]
+            thumbnail = scrapedthumbnail
+            plot = item.plot
+            fanart = scrapertools.find_single_match(data, '<img src="([^"]+)"/>.*?</a>')
+            if "audio" not in title:
+                if "temporada" in title:
+                    title = title.split("temporada")
+                    title = title[1]
+                elif "capitulo" in title:
+                    title = "01"+title
+                if "capitulo" in title:
+                    title = title.replace(" capitulo ","x")
+                if len(title) > 3:
+                    itemlist.append(
+                        Item(channel=item.channel,
+                        action="findvideos",
+                        title=title,
+                        fulltitle=item.title,
+                        url=url,
+                        thumbnail=thumbnail,
+                        plot=plot, fanart=fanart,
+                        temp=str(temp),
+                        contentSerieName=item.contentSerieName,
+                        context=item.context
+                        ))
+        return itemlist
 
 def findvideos(item):
     logger.info()
diff --git a/plugin.video.alfa/channels/seriesblanco.py b/plugin.video.alfa/channels/seriesblanco.py
index 0eed39d9..aebecc79 100644
--- a/plugin.video.alfa/channels/seriesblanco.py
+++ b/plugin.video.alfa/channels/seriesblanco.py
@@ -114,6 +114,49 @@ def list_all(item):
                                  ))
     return itemlist
 
+def list_from_genre(item):
+    logger.info()
+
+    itemlist = []
+    data = get_source(item.url)
+    contentSerieName = ''
+
+    patron = '<div style="float.*?<a href="([^"]+)">.*?src="([^"]+)"'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail in matches:
+        url = scrapedurl
+        thumbnail = scrapedthumbnail
+        title = scrapertools.find_single_match(scrapedurl, 'https://seriesblanco.org/capitulos/([^/]+)/')
+        title = title.replace('-', ' ').capitalize()
+
+        itemlist.append(Item(channel=item.channel,
+                             action='seasons',
+                             title=title,
+                             url=url,
+                             thumbnail=thumbnail,
+                             contentSerieName=title,
+                             context=filtertools.context(item, list_language, list_quality),
+                             ))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    # #Paginacion
+
+    if itemlist != []:
+        next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" ><i class="Next')
+        if next_page != '':
+            itemlist.append(Item(channel=item.channel,
+                                 action="list_from_genre",
+                                 title='Siguiente >>>',
+                                 url=next_page,
+                                 thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png',
+                                 ))
+    return itemlist
+
+
+
+
 def section(item):
     logger.info()
 
@@ -121,8 +164,10 @@ def section(item):
     data = get_source(item.url)
     if item.title == 'Generos':
         patron = '<li><a href="([^ ]+)"><i class="fa fa-bookmark-o"></i> ([^<]+)</a></li>'
+        action = 'list_from_genre'
     elif item.title == 'A - Z':
         patron = '<a dir="ltr" href="([^"]+)" class="label label-primary">([^<]+)</a>'
+        action = 'list_all'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle in matches:
@@ -130,7 +175,7 @@ def section(item):
         url = scrapedurl
         title = scrapedtitle
         itemlist.append(Item(channel=item.channel,
-                             action='list_all',
+                             action=action,
                              title=title,
                              url=url
                              ))
diff --git a/plugin.video.alfa/channels/serieslan.py b/plugin.video.alfa/channels/serieslan.py
index cd00863c..5bb9c701 100644
--- a/plugin.video.alfa/channels/serieslan.py
+++ b/plugin.video.alfa/channels/serieslan.py
@@ -12,6 +12,7 @@ from core.item import Item
 from platformcode import config, logger
 from channels import filtertools
 from channels import autoplay
+from lib import gktools
 
 IDIOMAS = {'latino': 'Latino'}
 list_language = IDIOMAS.values()
@@ -31,13 +32,46 @@ def mainlist(item):
     itemlist = list()
 
     itemlist.append(
-        Item(channel=item.channel, action="lista", title="Series", url=host, thumbnail=thumb_series, page=0))
+        Item(channel=item.channel, action="lista", title="Series", contentSerieName="Series", url=host, thumbnail=thumb_series, page=0))
     itemlist.append(
-        Item(channel=item.channel, action="lista", title="Live Action", url=host+"/liveaction", thumbnail=thumb_series, page=0))
+        Item(channel=item.channel, action="lista", title="Live Action", contentSerieName="Live Action", url=host+"/liveaction", thumbnail=thumb_series, page=0))
+    #itemlist.append(
+    #    Item(channel=item.channel, action="peliculas", title="Películas", contentSerieName="Películas", url=host+"/peliculas", thumbnail=thumb_series, page=0))
+    itemlist.append(Item(channel=item.channel, action="search", title="Buscar",
+                         thumbnail=thumb_series))
     itemlist = renumbertools.show_option(item.channel, itemlist)
     autoplay.show_option(item.channel, itemlist)
     return itemlist
 
+def search(item, texto):
+    logger.info()
+    #texto = texto.replace(" ", "+")
+    item.url = host +"/buscar.php"
+    item.texto = texto
+    if texto != '':
+        return sub_search(item)
+    else:
+        return []
+
+def sub_search(item):
+    logger.info()
+    itemlist = []
+    post = "k=" + item.texto
+    results = httptools.downloadpage(item.url, post=post).data
+    results = eval(results)
+    for result in results:
+        scrapedthumbnail = host + "/tb/" + result[0] + ".jpg"
+        scrapedtitle = result[1].decode('unicode_escape')
+        scrapedurl = host + "/" + result[2]
+        #scrapedyear = result[3]
+        itemlist.append(item.clone(action = "episodios",
+                                   title = scrapedtitle,
+                                   thumbnail = scrapedthumbnail,
+                                   url = scrapedurl,
+                                   contentSerieName = scrapedtitle
+                        ))
+    tmdb.set_infoLabels(itemlist, seekTmdb=True)
+    return itemlist
 
 def lista(item):
     logger.info()
@@ -47,7 +81,7 @@ def lista(item):
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
     patron = '<a href="([^"]+)" '
-    if item.title == "Series":
+    if item.contentSerieName == "Series":
         patron += 'class="link">.+?<img src="([^"]+)".*?'
     else:
         patron += 'class="link-la">.+?<img src="([^"]+)".*?'
@@ -84,14 +118,46 @@ def lista(item):
         url=host+"/pag-"+str(a)
         if b>10:
             itemlist.append(
-                Item(channel=item.channel, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=url, action="lista", page=0))
+                Item(channel=item.channel, contentSerieName=item.contentSerieName, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=url, action="lista", page=0))
     else:    
         itemlist.append(
-             Item(channel=item.channel, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=item.url, action="lista", page=item.page + 1))
+             Item(channel=item.channel, contentSerieName=item.contentSerieName, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=item.url, action="lista", page=item.page + 1))
 
     tmdb.set_infoLabels(itemlist)
     return itemlist
 
+def peliculas(item):
+    logger.info()
+
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron = '<div class="pel play" dt="(.+?)" .+?><img src="(.+?)" .+? title="(.*?)"><span class=".+?">(.+?)<\/span><a href="(.+?)" class.+?>'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    # Paginacion
+    num_items_x_pagina = 30
+    min = item.page * num_items_x_pagina
+    min=min-item.page
+    max = min + num_items_x_pagina - 1
+    b=0
+    for scrapedplot,scrapedthumbnail, scrapedtitle, scrapedyear, scrapedurl in matches[min:max]:
+        b=b+1
+        url = host + scrapedurl
+        thumbnail = host +scrapedthumbnail
+        context = renumbertools.context(item)
+        context2 = autoplay.context
+        context.extend(context2)
+        itemlist.append(item.clone(title=scrapedtitle+"-"+scrapedyear, url=url, action="findvideos", thumbnail=thumbnail, plot=scrapedplot,
+                show=scrapedtitle,contentSerieName=scrapedtitle,context=context))
+    if b<29:
+        pass
+    else:    
+        itemlist.append(
+             Item(channel=item.channel, contentSerieName=item.contentSerieName, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=item.url, action="peliculas", page=item.page + 1))
+
+    tmdb.set_infoLabels(itemlist)
+    return itemlist
 
 def episodios(item):
     logger.info()
@@ -160,10 +226,40 @@ def findvideos(item):
     for id in buttons:
         new_url = golink(int(id), _sa, sl)
         data_new = httptools.downloadpage(new_url).data
-        _x0x = scrapertools.find_single_match(data_new, 'var x0x = ([^;]+);')
+        logger.info(data_new)
+        valor = scrapertools.find_single_match(data_new, '\+ x92\((.*?)\)\+ ')
+        valores = valor.split("atob")
+        valor2 = valores[1].replace('(','').replace(')','')
+        valor1 = valores[0].split('+')
+        datos = []
+        logger.info("f4d5as6f")
+        logger.info(valor1)
+        stringTodo = ''
+        for val in valor1:
+            if '()' in val:
+                funcion = val.split('(')[0]
+                scrapedvalue = scrapertools.find_single_match(data_new, funcion+'.+?return (.+?);')
+                datos.append(scrapedvalue)
+            elif '.charAt' in val:
+                funcion = val.split('.charAt(')
+                stringTodo = funcion[0]
+                position = funcion[1].split(')')[0]
+        posiciones = []
+        logger.info(datos)
+        if datos:
+            for dato in datos:
+                logger.info(dato)
+                try:
+                    posiciones.append(int(dato))
+                except Exception as e:
+                    scrapedvalue = scrapertools.find_single_match(data_new, 'var %s = (.+?);'  % (dato))
+                    logger.info("scrapedvalue")
+                    logger.info(scrapedvalue)
+                    posiciones.append(int(scrapedvalue))
+        logger.info("positiones"+posiciones)
         try:
-            x0x = eval(_x0x)
-            url = resolve(x0x[4], base64.b64decode(x0x[1]))
+            logger.info(base64.b64decode(data1, data2))
+            url = x92(data1, data2)
             if 'download' in url:
                 url = url.replace('download', 'preview')
             title = '%s'
@@ -184,34 +280,65 @@ def findvideos(item):
 def golink (num, sa, sl):
     import urllib
     b = [3, 10, 5, 22, 31]
-    d = ''
-    for i in range(len(b)):
-        d += sl[2][b[i]+num:b[i]+num+1]
+    #d = ''
+    #for i in range(len(b)):
+    #    d += sl[2][b[i]+num:b[i]+num+1]
 
     SVR = "https://viteca.stream" if sa == 'true' else "http://serieslan.com"
     TT = "/" + urllib.quote_plus(sl[3].replace("/", "><")) if num == 0 else ""
+    url_end = link(num,sl)
+    #return SVR + "/el/" + sl[0] + "/" + sl[1] + "/" + str(num) + "/" + sl[2] + d + TT
+    return SVR + "/el/" + sl[0] + "/" + sl[1] + "/" + str(num) + "/" + sl[2] + url_end + TT
 
-    return SVR + "/el/" + sl[0] + "/" + sl[1] + "/" + str(num) + "/" + sl[2] + d + TT
+def link(ida,sl):
+    a=ida
+    b=[3,10,5,22,31]
+    c=1
+    d=""
+    e=sl[2]
+    for i in range(len(b)):
+      d=d+substr(e,b[i]+a,c)
+    return d
 
+def substr(st,a,b):
+    return st[a:a+b]
 
-def resolve(value1, value2):
-    reto = ''
-    lista = range(256)
-    j = 0
-    for i in range(256):
-        j = (j + lista[i] + ord(value1[i % len(value1)])) % 256
-        k = lista[i]
-        lista[i] = lista[j]
-        lista[j] = k
+def x92(data1, data2):
+    data3 = []
+    data4 = 0
+    data5 = ""
+    data6 = ""
+    for i in range(len(256)):
+      data3[i] = i
+    for i in range(len(256)):
+      data4 = (data4 + data3[i] + ord(data1[i])) % 256
+      data5 = data3[i]
+      data3[i] = data3[data4]
+      data3[data4] = data5
+    i = 0
+    data4 = 0
+    for j in range(len(data2)):
+        i = (i + 1) % 256
+        data4 = (data4 + data3[i]) % 256
+        data5 = data3[i]
+        data3[i] = data3[data4]
+        data3[data4] = data5
+        data6 =1#+= str(unichr(data2[ord(str(j)) ^ data3[(data3[i] + data3[data4]) % 256]))
+    return data6
 
-    m = 0;
-    j = 0;
-    for i in range(len(value2)):
-        m = (m + 1) % 256
-        j = (j + lista[m]) % 256
-        k = lista[m]
-        lista[m] = lista[j]
-        lista[j] = k
-        reto += chr(ord(value2[i]) ^ lista[(lista[m] + lista[j]) % 256])
+def _ieshlgagkP(umZFJ):
+    return umZFJ
+def _RyHChsfwdd(ZBKux):
+    return ZBKux
+def _eladjkKtjf(czuwk):
+    return czuwk
+def _slSekoKrHb():
+    return ''
+def _VySdeBApGO():
+    return 'Z'
 
-    return reto
+def _nEgqhkiRub():
+    return 28
+
+def _lTjZxWGNnE():
+    return 57
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/seriespapaya.py b/plugin.video.alfa/channels/seriespapaya.py
index 10a1b196..6b18245f 100644
--- a/plugin.video.alfa/channels/seriespapaya.py
+++ b/plugin.video.alfa/channels/seriespapaya.py
@@ -18,7 +18,7 @@ from platformcode import config, logger
 
 HOST = "http://www.seriespapaya.com"
 
-IDIOMAS = {'es': 'Español', 'lat': 'Latino', 'in': 'Inglés', 'ca': 'Catalán', 'sub': 'VOSE', 'Español Latino':'lat',
+IDIOMAS = {'es': 'Español', 'lat': 'Latino', 'in': 'Inglés', 'ca': 'Catalán', 'sub': 'VOSE', 'Español Latino':'Latino',
            'Español Castellano':'es', 'Sub Español':'VOSE'}
 list_idiomas = IDIOMAS.values()
 list_quality = ['360p', '480p', '720p HD', '1080p HD', 'default']
@@ -199,12 +199,13 @@ def findvideos(item):
                     server=server.rstrip().capitalize(),
                     quality=quality,
                     uploader=uploader),
-                server=server.lower().rstrip(),
+                server=server.rstrip().lower(),
                 url=urlparse.urljoin(HOST, url),
                 language=IDIOMAS.get(lang,lang),
                 quality=quality
             )
         )
+
     # Requerido para FilterTools
     itemlist = filtertools.get_links(itemlist, item, list_idiomas, list_quality)
     # Requerido para AutoPlay
@@ -216,9 +217,11 @@ def play(item):
     logger.info("play: %s" % item.url)
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    item.url = scrapertools.find_single_match(data, "location.href='([^']+)")
-    item.server = ""
+    if item.server not in ['openload', 'streamcherry', 'streamango']:
+        item.server = ''
+    item.url = scrapertools.find_single_match(data, "location.href='([^']+)'")
     itemlist.append(item.clone())
     itemlist = servertools.get_servers_itemlist(itemlist)
-    itemlist[0].thumbnail=item.contentThumbnail
+
     return itemlist
+
diff --git a/plugin.video.alfa/channels/setting.py b/plugin.video.alfa/channels/setting.py
index 4ba74103..65659b6c 100644
--- a/plugin.video.alfa/channels/setting.py
+++ b/plugin.video.alfa/channels/setting.py
@@ -22,25 +22,25 @@ def mainlist(item):
 
     itemlist.append(Item(channel=CHANNELNAME, title="", action="", folder=False, thumbnail=get_thumb("setting_0.png")))
 
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60536), action="", folder=False,
+    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60536) + ":", text_bold=True, action="", folder=False,
                          thumbnail=get_thumb("setting_0.png")))
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60537), action="menu_channels", folder=True,
+    itemlist.append(Item(channel=CHANNELNAME, title="     " + config.get_localized_string(60537), action="menu_channels", folder=True,
                          thumbnail=get_thumb("channels.png")))
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60538), action="menu_servers", folder=True,
+    itemlist.append(Item(channel=CHANNELNAME, title="     " + config.get_localized_string(60538), action="menu_servers", folder=True,
                          thumbnail=get_thumb("channels.png")))
-    itemlist.append(Item(channel="news", title=config.get_localized_string(60539), action="menu_opciones",
+    itemlist.append(Item(channel="news", title="     " + config.get_localized_string(60539), action="menu_opciones",
                          folder=True, thumbnail=get_thumb("news.png")))
-    itemlist.append(Item(channel="search", title=config.get_localized_string(60540), action="opciones", folder=True,
+    itemlist.append(Item(channel="search", title="     " + config.get_localized_string(60540), action="opciones", folder=True,
                          thumbnail=get_thumb("search.png")))
-    #itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60541), action="channel_config",
-    #                     config="downloads", folder=True, thumbnail=get_thumb("downloads.png")))
+    itemlist.append(Item(channel=CHANNELNAME, title="     " + config.get_localized_string(60541), action="channel_config",
+                         config="downloads", folder=True, thumbnail=get_thumb("downloads.png")))
 
     if config.get_videolibrary_support():
-        itemlist.append(Item(channel="videolibrary", title=config.get_localized_string(60542), action="channel_config",
+        itemlist.append(Item(channel="videolibrary", title="     " + config.get_localized_string(60542), action="channel_config",
                              folder=True, thumbnail=get_thumb("videolibrary.png")))
 
     if config.is_xbmc():
-        itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(70253), action="setting_torrent",
+        itemlist.append(Item(channel=CHANNELNAME, title="     " + config.get_localized_string(70253), action="setting_torrent",
                              folder=True, thumbnail=get_thumb("channels_torrent.png")))
 
     itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False, thumbnail=get_thumb("setting_0.png")))
@@ -57,31 +57,25 @@ def menu_channels(item):
     itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60545), action="conf_tools", folder=False,
                          extra="channels_onoff", thumbnail=get_thumb("setting_0.png")))
 
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60546), action="", folder=False,
-                         thumbnail=get_thumb("setting_0.png")))
+    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60546) + ":", action="", folder=False,
+                         text_bold = True, thumbnail=get_thumb("setting_0.png")))
 
     # Inicio - Canales configurables
     import channelselector
     from core import channeltools
-
     channel_list = channelselector.filterchannels("all")
-
     for channel in channel_list:
         channel_parameters = channeltools.get_channel_parameters(channel.channel)
-
         if channel_parameters["has_settings"]:
-            itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60547) % channel.title,
+            itemlist.append(Item(channel=CHANNELNAME, title=".    " + config.get_localized_string(60547) % channel.title,
                                  action="channel_config", config=channel.channel, folder=False,
                                  thumbnail=channel.thumbnail))
     # Fin - Canales configurables
-
     itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False, thumbnail=get_thumb("setting_0.png")))
-
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60548), action="", folder=False,
-                         thumbnail=get_thumb("channels.png")))
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60549), action="conf_tools",
+    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60548) + ":", action="", folder=False,
+                         text_bold=True, thumbnail=get_thumb("channels.png")))
+    itemlist.append(Item(channel=CHANNELNAME, title=".    " + config.get_localized_string(60549), action="conf_tools",
                          folder=True, extra="lib_check_datajson", thumbnail=get_thumb("channels.png")))
-
     return itemlist
 
 
@@ -129,7 +123,7 @@ def menu_servers(item):
                          action="servers_favorites", folder=False, thumbnail=get_thumb("setting_0.png")))
 
     itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60552),
-                         action="", folder=False, thumbnail=get_thumb("setting_0.png")))
+                         action="", folder=False, text_bold = True, thumbnail=get_thumb("setting_0.png")))
 
     # Inicio - Servidores configurables
 
@@ -138,11 +132,11 @@ def menu_servers(item):
         server_parameters = servertools.get_server_parameters(server)
         if server_parameters["has_settings"]:
             itemlist.append(
-                Item(channel=CHANNELNAME, title=config.get_localized_string(60553) % server_parameters["name"],
+                Item(channel=CHANNELNAME, title = ".    " + config.get_localized_string(60553) % server_parameters["name"],
                      action="server_config", config=server, folder=False, thumbnail=""))
 
     itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60554),
-                         action="", folder=False, thumbnail=get_thumb("setting_0.png")))
+                         action="", folder=False, text_bold = True, thumbnail=get_thumb("setting_0.png")))
 
     server_list = servertools.get_servers_list().keys()
 
@@ -152,7 +146,7 @@ def menu_servers(item):
         if server_parameters["has_settings"] and filter(lambda x: x["id"] not in ["black_list", "white_list"],
                                                         server_parameters["settings"]):
             itemlist.append(
-                Item(channel=CHANNELNAME, title=config.get_localized_string(60553) % server_parameters["name"],
+                Item(channel=CHANNELNAME, title=".    " + config.get_localized_string(60553) % server_parameters["name"],
                      action="server_config", config=server, folder=False, thumbnail=""))
 
     # Fin - Servidores configurables
@@ -306,25 +300,27 @@ def submenu_tools(item):
 
     itemlist.append(Item(channel=CHANNELNAME, action="check_quickfixes", folder=False,
                          title="Comprobar actualizaciones urgentes", plot="Versión actual: %s" % config.get_addon_version() ))
+    itemlist.append(Item(channel=CHANNELNAME, action="update_quasar", folder=False,
+                         title="Actualizar addon externo Quasar"))
     itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False,
                          thumbnail=get_thumb("setting_0.png")))
 
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60564), action="", folder=False,
-                         thumbnail=get_thumb("channels.png")))
+    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60564) + ":", action="", folder=False,
+                         text_bold=True, thumbnail=get_thumb("channels.png")))
     itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60565), action="conf_tools",
                          folder=True, extra="lib_check_datajson", thumbnail=get_thumb("channels.png")))
 
     if config.get_videolibrary_support():
         itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False,
                              thumbnail=get_thumb("setting_0.png")))
-        itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60566), action="", folder=False,
-                             thumbnail=get_thumb("videolibrary.png")))
+        itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60566) + ":", action="", folder=False,
+                             text_bold=True, thumbnail=get_thumb("videolibrary.png")))
         itemlist.append(Item(channel=CHANNELNAME, action="overwrite_tools", folder=False,
                              thumbnail=get_thumb("videolibrary.png"),
-                             title=config.get_localized_string(60567)))
+                             title="- " + config.get_localized_string(60567)))
         itemlist.append(Item(channel="videolibrary", action="update_videolibrary", folder=False,
                              thumbnail=get_thumb("videolibrary.png"),
-                             title=config.get_localized_string(60568)))
+                             title="- " + config.get_localized_string(60568)))
 
     return itemlist
 
@@ -336,6 +332,18 @@ def check_quickfixes(item):
     return updater.check_addon_updates(verbose=True)
 
 
+def update_quasar(item):
+    logger.info()
+    
+    from platformcode import custom_code, platformtools
+    stat = False
+    stat = custom_code.update_external_addon("quasar")
+    if stat:
+        platformtools.dialog_notification("Actualización Quasar", "Realizada con éxito")
+    else:
+        platformtools.dialog_notification("Actualización Quasar", "Ha fallado. Consulte el log")
+    
+    
 def conf_tools(item):
     logger.info()
 
diff --git a/plugin.video.alfa/channels/sexgalaxy.json b/plugin.video.alfa/channels/sexgalaxy.json
index f9c356d2..36fadfbd 100644
--- a/plugin.video.alfa/channels/sexgalaxy.json
+++ b/plugin.video.alfa/channels/sexgalaxy.json
@@ -4,7 +4,7 @@
   "active": true,
   "adult": true,
   "language": ["*"],
-  "thumbnail": "http://sexgalaxy.net/wp-content/uploads/2016/11/logogalaxy_red.png",
+  "thumbnail": "https://sexgalaxy.net/wp-content/themes/redwaves-lite/images/logo.png",
   "banner": "",
   "categories": [
     "adult"
diff --git a/plugin.video.alfa/channels/sexgalaxy.py b/plugin.video.alfa/channels/sexgalaxy.py
index 0967ce96..eecfa5f3 100644
--- a/plugin.video.alfa/channels/sexgalaxy.py
+++ b/plugin.video.alfa/channels/sexgalaxy.py
@@ -14,11 +14,11 @@ host = 'http://sexgalaxy.net'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host + "/new-releases/"))
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/full-movies/"))
-    itemlist.append( Item(channel=item.channel, title="Canales" , action="canales", url=host))
-    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="Ultimos", action="lista", url=host + "/new-releases/"))
+    itemlist.append(Item(channel=item.channel, title="Peliculas", action="lista", url=host + "/full-movies/"))
+    itemlist.append(Item(channel=item.channel, title="Canales", action="canales", 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
 
 
@@ -27,7 +27,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -35,19 +35,20 @@ def search(item, texto):
         return []
 
 
-def canales (item):
+def canales(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cache_page(host)
-    data = scrapertools.get_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:
+    data = httptools.downloadpage(host).data
+    data = scrapertools.get_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:
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedtitle = str(scrapedtitle)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
+        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, plot=scrapedplot))
     return itemlist
 
 
@@ -55,36 +56,41 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_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:
+    data = scrapertools.get_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 = ""
         scrapedthumbnail = ""
         scrapedtitle = str(scrapedtitle)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
+        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, plot=scrapedplot))
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron =  '<div class="post-img small-post-img">.*?<a href="(.*?)" title="(.*?)">.*?<img src="(.*?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+    patron = '<div class="post-img small-post-img">.*?<a href="(.*?)" title="(.*?)">.*?<img src="(.*?)"'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , fulltitle=scrapedtitle , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)"')
-    if next_page_url!="":
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Next page >>" , text_color="blue", url=next_page_url , folder=True) )
+        calidad = scrapertools.find_single_match(scrapedtitle, '\(.*?/(\w+)\)')
+        if calidad:
+            scrapedtitle = "[COLOR red]" + calidad + "[/COLOR] " + scrapedtitle
+        itemlist.append(Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
+                             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="Next page >>", text_color="blue", url=next_page))
     return itemlist
 
 
 def play(item):
     logger.info()
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
@@ -92,4 +98,3 @@ def play(item):
         videoitem.thumbnail = item.thumbnail
         videoitem.channel = item.channel
     return itemlist
-
diff --git a/plugin.video.alfa/channels/sexofilm.py b/plugin.video.alfa/channels/sexofilm.py
index f11d758f..4e220359 100644
--- a/plugin.video.alfa/channels/sexofilm.py
+++ b/plugin.video.alfa/channels/sexofilm.py
@@ -2,26 +2,23 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://sexofilm.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/xtreme-adult-wing/adult-dvds/"))
-    itemlist.append( Item(channel=item.channel, title="Parody" , action="peliculas", url=host + "/xtreme-adult-wing/porn-parodies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/xtreme-adult-wing/porn-clips-movie-scene/"))
-    itemlist.append( Item(channel=item.channel, title="SexMUSIC" , action="peliculas", url=host + "/topics/sexo-music-videos/"))
-    itemlist.append( Item(channel=item.channel, title="Xshows" , action="peliculas", url=host + "/xshows/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/xtreme-adult-wing/adult-dvds/"))
+    itemlist.append( Item(channel=item.channel, title="Parody" , action="lista", url=host + "/xtreme-adult-wing/porn-parodies/"))
+    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/xtreme-adult-wing/porn-clips-movie-scene/"))
+    itemlist.append( Item(channel=item.channel, title="SexMUSIC" , action="lista", url=host + "/topics/sexo-music-videos/"))
+    itemlist.append( Item(channel=item.channel, title="Xshows" , action="lista", url=host + "/xshows/"))
+    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"))
     return itemlist
@@ -32,7 +29,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url =host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -44,11 +41,17 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'<div class="tagcloud">(.*?)<p>')
+    if item.title == "Canal" :
+        data = scrapertools.get_match(data,'>Best Porn Studios</a>(.*?)</ul>')
+    else:
+        data = scrapertools.get_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"))
+
+
     patron  = '<a href="(.*?)".*?>(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle  in matches:
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl) )
     return itemlist
 
 
@@ -56,11 +59,11 @@ def catalogo(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'>Best Porn Studios</a>(.*?)</ul>')
+    data = scrapertools.get_match(data,'<div class="nav-wrap">(.*?)<ul class="sub-menu">')
     patron  = '<a href="(.*?)">(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle  in matches:
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl) )
     return itemlist
 
 def anual(item):
@@ -72,24 +75,25 @@ def anual(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     patron  = '<div class="post-thumbnail.*?<a href="([^"]+)" title="(.*?)".*?src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle.replace(" Porn DVD", "").replace("Permalink to ", "").replace(" Porn Movie", "")
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        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="([^"]+)">&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) )
     return itemlist
 
 
@@ -103,3 +107,4 @@ def play(item):
         videoitem.thumbnail = item.thumbnail
         videoitem.channel = item.channel
     return itemlist
+
diff --git a/plugin.video.alfa/channels/spankbang.py b/plugin.video.alfa/channels/spankbang.py
index 11d65293..538eabe8 100644
--- a/plugin.video.alfa/channels/spankbang.py
+++ b/plugin.video.alfa/channels/spankbang.py
@@ -7,21 +7,16 @@ 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
-
 
 host = 'https://es.spankbang.com'
 
-
 def mainlist(item):
     logger.info()
     itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos", action="peliculas", url= host + "/new_videos/"))
-    itemlist.append( Item(channel=item.channel, title="Mas valorados", action="peliculas", url=host + "/trending_videos/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos", action="peliculas", url= host + "/most_popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mas largos", action="peliculas", url= host + "/longest_videos/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevos", action="lista", url= host + "/new_videos/"))
+    itemlist.append( Item(channel=item.channel, title="Mas valorados", action="lista", url=host + "/trending_videos/"))
+    itemlist.append( Item(channel=item.channel, title="Mas vistos", action="lista", url= host + "/most_popular/"))
+    itemlist.append( Item(channel=item.channel, title="Mas largos", action="lista", url= host + "/longest_videos/"))
     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
@@ -32,7 +27,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/s/%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -51,12 +46,12 @@ def categorias(item):
         scrapedplot = ""
         scrapedurl =  urlparse.urljoin(item.url,scrapedurl)
         scrapedthumbnail =  urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , 
-                              thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle , url=scrapedurl , 
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -70,18 +65,18 @@ def peliculas(item):
         scrapedhd = scrapertools.find_single_match(scrapedtime, '<span class="i-hd">(.*?)</span>')
         duration = scrapertools.find_single_match(scrapedtime, '<i class="fa fa-clock-o"></i>(.*?)</span>')
         if scrapedhd != '':
-            title = "[COLOR yellow]" +duration+ " min[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
+            title = "[COLOR yellow]" + duration + " min[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
         else:
             title = "[COLOR yellow]" + duration + " min[/COLOR] " + scrapedtitle
         thumbnail = "http:" + scrapedthumbnail
         plot = ""
         year = ""
         itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, 
-                              plot=plot, contentTitle=title ))
+                              fanart=thumbnail, plot=plot, contentTitle=title) )
     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="peliculas", title="Página Siguiente >>" , text_color="blue",
+        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>" , text_color="blue",
                               url=next_page ) )
     return itemlist
 
diff --git a/plugin.video.alfa/channels/streamingporn.py b/plugin.video.alfa/channels/streamingporn.py
index 0334b185..f8504a4f 100644
--- a/plugin.video.alfa/channels/streamingporn.py
+++ b/plugin.video.alfa/channels/streamingporn.py
@@ -7,16 +7,14 @@ 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
 
 host = 'http://streamingporn.xyz'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/category/movies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/category/stream/"))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/category/movies/"))
+    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/stream/"))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
@@ -28,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -48,8 +46,8 @@ def catalogo(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , 
-                        thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle , url=scrapedurl , 
+                        thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
@@ -67,12 +65,12 @@ def categorias(item):
         scrapedthumbnail = ""
         scrapedtitle = scrapedtitle
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , 
-                        thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle , url=scrapedurl , 
+                        thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -82,17 +80,21 @@ def peliculas(item):
     for scrapedurl,scrapedthumbnail,scrapedtitle  in matches:
         url = scrapedurl
         title = scrapedtitle
+        if 'HD' in scrapedtitle :
+            calidad = scrapertools.find_single_match(scrapedtitle, '(\d+)p')
+            title = "[COLOR red]" + "HD" +"[/COLOR] "+ scrapedtitle
+            if calidad :
+                title = "[COLOR red]" + "HD" + calidad +" [/COLOR] "+ scrapedtitle
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
         itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, 
-                        plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+                              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!="":
         next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel , action="lista" , title="Página Siguiente >>" , 
+                        text_color="blue", url=next_page_url) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/streamporno.py b/plugin.video.alfa/channels/streamporno.py
index c0bdfde5..04bf6b28 100644
--- a/plugin.video.alfa/channels/streamporno.py
+++ b/plugin.video.alfa/channels/streamporno.py
@@ -7,15 +7,13 @@ 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
 
 host = 'http://streamporno.eu'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , 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"))
@@ -27,7 +25,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -42,7 +40,7 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<li id="menu-item-.*?<a href="([^"]+)">([^"]+)</a>'
     if item.title == "Categorias":
-        itemlist.append( Item(channel=item.channel, title="Big Tits" , action="peliculas", url=host + "/?s=big+tits"))
+        itemlist.append( Item(channel=item.channel, title="Big Tits" , action="lista", url=host + "/?s=big+tits"))
         patron  = '<li class="cat-item.*?<a href="([^"]+)" >([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
@@ -51,11 +49,12 @@ def categorias(item):
         scrapedthumbnail = ""
         scrapedtitle = scrapedtitle
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -68,11 +67,11 @@ def peliculas(item):
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url,
+                              thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle = contentTitle))
+    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) )
     return itemlist
 
diff --git a/plugin.video.alfa/channels/submityouflicks.py b/plugin.video.alfa/channels/submityouflicks.py
index a329f349..9a02bf1a 100755
--- a/plugin.video.alfa/channels/submityouflicks.py
+++ b/plugin.video.alfa/channels/submityouflicks.py
@@ -8,25 +8,25 @@ from core import scrapertools
 from core.item import Item
 from platformcode import logger
 
+host = 'http://www.submityourflicks.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append(
-        Item(channel=item.channel, action="videos", title="Útimos videos", url="http://www.submityourflicks.com/",
-             viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar",
-                         url="http://www.submityourflicks.com/index.php?mode=search&q=%s&submit=Search"))
+    
+    itemlist.append(Item(channel=item.channel, action="videos", title="Útimos videos", url= host))
+    itemlist.append(Item(channel=item.channel, action="videos", title="Mas vistos", url= host + "/most-viewed/"))
+    itemlist.append(Item(channel=item.channel, action="videos", title="Mejor valorados", url= host + "/top-rated/"))
+    itemlist.append(Item(channel=item.channel, action="search", title="Buscar", url= host))
     return itemlist
 
 
 def search(item, texto):
     logger.info()
-    tecleado = texto.replace(" ", "+")
-    item.url = item.url % tecleado
+    texto = texto.replace(" ", "-")
+    item.url = host + "/search/%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():
@@ -38,24 +38,21 @@ def videos(item):
     logger.info()
     itemlist = []
     data = scrapertools.downloadpageGzip(item.url)
-    patron = '<div class="item-block[^<]+'
-    patron += '<div class="inner-block[^<]+'
-    patron += '<a href="([^"]+)" title="([^"]+)"[^<]+'
-    patron += '<span class="image".*?'
-    patron += '<img src="([^"]+)"'
+    patron = '<div class="item-block item-normal col" >.*?'
+    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
+    patron += 'data-src="([^"]+)".*?'
+    patron += '</span> ([^"]+)<'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
-        title = scrapedtitle
+    for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedtime in matches:
+        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
         url = scrapedurl
         thumbnail = scrapedthumbnail.replace(" ", "%20")
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
         itemlist.append(Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                             folder=False))
-    next_page_url = scrapertools.find_single_match(data, "<a href='([^']+)' class=\"next\">NEXT</a>")
-    if next_page_url != "":
-        url = urlparse.urljoin(item.url, next_page_url)
-        itemlist.append(Item(channel=item.channel, action="videos", title=">> Página siguiente", url=url, folder=True,
-                             viewmode="movie"))
+                             fanart=thumbnail))
+    next_page = scrapertools.find_single_match(data, "<a href='([^']+)' class=\"next\">NEXT</a>")
+    if next_page != "":
+        url = urlparse.urljoin(item.url, next_page)
+        itemlist.append(Item(channel=item.channel, action="videos", title=">> Página siguiente", url=url))
     return itemlist
 
 
@@ -67,3 +64,4 @@ def play(item):
     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/plugin.video.alfa/channels/subtorrents.py b/plugin.video.alfa/channels/subtorrents.py
index 9fa441c7..2f1e4950 100644
--- a/plugin.video.alfa/channels/subtorrents.py
+++ b/plugin.video.alfa/channels/subtorrents.py
@@ -294,7 +294,7 @@ def listado(item):
             title = re.sub(r'\d+[M|m|G|g][B|b]', '', title)
 
             #Limpiamos el título de la basura innecesaria
-            title = re.sub(r'TV|Online|Spanish|Torrent|en Espa\xc3\xb1ol|Español|Latino|Subtitulado|Blurayrip|Bluray rip|\[.*?\]|R2 Pal|\xe3\x80\x90 Descargar Torrent \xe3\x80\x91|Completa|Temporada|Descargar|Torren|\(iso\)|\(dvd.*?\)|(?:\d+\s*)?\d{3,4}p.*?$|extended|(?:\d+\s*)?bdrip.*?$|\(.*?\).*?$|iso$|unrated|\[.*?$|\d{4}$', '', title, flags=re.IGNORECASE)
+            title = re.sub(r'(?i)TV|Online|Spanish|Torrent|en Espa\xc3\xb1ol|Español|Latino|Subtitulado|Blurayrip|Bluray rip|\[.*?\]|R2 Pal|\xe3\x80\x90 Descargar Torrent \xe3\x80\x91|Completa|Temporada|Descargar|Torren|\(iso\)|\(dvd.*?\)|(?:\d+\s*)?\d{3,4}p.*?$|extended|(?:\d+\s*)?bdrip.*?$|\(.*?\).*?$|iso$|unrated|\[.*?$|\d{4}$', '', title)
 
             #Obtenemos temporada y episodio si se trata de Episodios
             if item_local.contentType == "episode":
diff --git a/plugin.video.alfa/channels/sunporno.py b/plugin.video.alfa/channels/sunporno.py
index fb062d74..b98349f9 100644
--- a/plugin.video.alfa/channels/sunporno.py
+++ b/plugin.video.alfa/channels/sunporno.py
@@ -7,18 +7,17 @@ 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
 
 host = 'https://www.sunporno.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host +"/most-recent/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-viewed/date-last-week/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top-rated/date-last-week/"))
-    itemlist.append( Item(channel=item.channel, title="Mas largas" , action="peliculas", url=host + "/long-movies/date-last-month/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host +"/most-recent/"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/most-viewed/date-last-week/"))
+    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="Buscar", action="search"))
     return itemlist
@@ -29,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/%s/" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -49,16 +48,39 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedurl = scrapedurl + "/most-recent/"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def catalogo(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron = '<div class="starec">.*?'
+    patron += '<a href="([^"]+)".*?'
+    patron += '<img class="thumb" src="([^"]+)"  alt="([^"]+)".*?'
+    patron += '<p class="videos">(\d+)</p>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl, scrapedthumbnail, scrapedtitle, cantidad in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<li><a class="pag-next" href="(.*?)">Next &gt;</a>')
+    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 = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.get_match(data,'<div id="mainThumbsContainer" class="thumbs-container">(.*?)<div class="clearfix">')
+    data = scrapertools.get_match(data,'class="thumbs-container">(.*?)<div class="clearfix">')
     patron  = '<p class="btime">([^"]+)</p>.*?href="([^"]+)".*?src="([^"]+)".*?title="([^"]+)">'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for duracion,scrapedurl,scrapedthumbnail,scrapedtitle in matches:
@@ -67,12 +89,12 @@ def peliculas(item):
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        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,'<li><a class="pag-next" href="(.*?)">Next &gt;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
+                              fanart=scrapedthumbnail, plot=plot, contentTitle = contentTitle))
+    next_page = scrapertools.find_single_match(data,'<li><a class="pag-next" href="(.*?)">Next &gt;</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
 
 
@@ -84,7 +106,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, fulltitle=item.fulltitle, url=scrapedurl,
+        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/plugin.video.alfa/channels/tabooshare.py b/plugin.video.alfa/channels/tabooshare.py
index d4ecb8b8..2da9a319 100644
--- a/plugin.video.alfa/channels/tabooshare.py
+++ b/plugin.video.alfa/channels/tabooshare.py
@@ -2,13 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://tabooshare.com'
 
@@ -16,7 +14,7 @@ host = 'http://tabooshare.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
     return itemlist
 
@@ -32,11 +30,12 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedtitle = str(scrapedtitle)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -45,13 +44,13 @@ def peliculas(item):
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle.replace(" &#8211; Free Porn Download", "")
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<span class="current">.*?<a href="(.*?)"')
-    if next_page_url=="http://NaughtyPorn.net/":
-        next_page_url = scrapertools.find_single_match(data,'<span class="current">.*?<a href=\'(.*?)\'')
-    if next_page_url!="":
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
-
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<span class="current">.*?<a href="(.*?)"')
+    if next_page=="http://NaughtyPorn.net/":
+        next_page = scrapertools.find_single_match(data,'<span class="current">.*?<a href=\'(.*?)\'')
+    if next_page!="":
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/todopeliculas.py b/plugin.video.alfa/channels/todopeliculas.py
index 5c3cc0fd..f07280f7 100644
--- a/plugin.video.alfa/channels/todopeliculas.py
+++ b/plugin.video.alfa/channels/todopeliculas.py
@@ -24,7 +24,7 @@ list_language = IDIOMAS.values()
 list_quality = []
 list_servers = ['torrent']
 
-host = 'http://www.todo-peliculas.com/'
+host = 'http://www.todo-peliculas.net/'
 channel = "todopeliculas"
 
 categoria = channel.capitalize()
@@ -274,7 +274,7 @@ def listado(item):
             
             #Limpiamos el título de la basura innecesaria
             title = re.sub(r'- $', '', title)
-            title = re.sub(r'TV|Online|Spanish|Torrent|en Espa\xc3\xb1ol|Español|Latino|Subtitulado|Blurayrip|Bluray rip|\[.*?\]|R2 Pal|\xe3\x80\x90 Descargar Torrent \xe3\x80\x91|Completa|Temporada|Descargar|Torren', '', title, flags=re.IGNORECASE)
+            title = re.sub(r'(?i)TV|Online|Spanish|Torrent|en Espa\xc3\xb1ol|Español|Latino|Subtitulado|Blurayrip|Bluray rip|\[.*?\]|R2 Pal|\xe3\x80\x90 Descargar Torrent \xe3\x80\x91|Completa|Temporada|Descargar|Torren', '', title)
 
             #Terminamos de limpiar el título
             title = re.sub(r'\??\s?\d*?\&.*', '', title)
diff --git a/plugin.video.alfa/channels/tryboobs.py b/plugin.video.alfa/channels/tryboobs.py
index 3d94886a..eaa0ace9 100644
--- a/plugin.video.alfa/channels/tryboobs.py
+++ b/plugin.video.alfa/channels/tryboobs.py
@@ -7,18 +7,16 @@ 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
 
 host = 'http://www.tryboobs.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/week/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor Valorado" , action="peliculas", url=host + "/top-rated/week/"))
-    itemlist.append( Item(channel=item.channel, title="Modelos" , action="modelos", url=host + "/models/model-viewed/1/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/most-popular/week/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor Valorado" , action="lista", url=host + "/top-rated/week/"))
+    itemlist.append( Item(channel=item.channel, title="Modelos" , action="categorias", url=host + "/models/model-viewed/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
@@ -29,7 +27,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -37,44 +35,37 @@ def search(item, texto):
         return []
 
 
-def modelos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)" class="th-model">.*?src="([^"]+)".*?<span class="roliks"><span>(\d+)</span>.*?<span class="title">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + "   (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li><a class="pag-next" href="([^"]+)"><ins>Next</ins></a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="modelos" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
-    return itemlist
-
-
 def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)" class="th-cat">.*?<img src="([^"]+)".*?<span>(\d+)</span>.*?<span class="title">([^"]+)</span>'
+    patron = '<a href="([^"]+)" class="th-[^"]+">.*?'
+    patron += 'src="([^"]+)".*?'
+    patron += '<span>(\d+)</span>.*?'
+    patron += '<span class="title">([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<li><a class="pag-next" href="([^"]+)"><ins>Next</ins></a>')
+    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) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = 'href="([^"]+)"\s*class="th-video.*?<img src="([^"]+)".*?<span class="time">([^"]+)</span>.*?<span class="title">([^"]+)</span>'
+    patron = 'href="([^"]+)"\s*class="th-video.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<span class="time">([^"]+)</span>.*?'
+    patron += '<span class="title">([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,duracion,scrapedtitle  in matches:
         url = scrapedurl
@@ -82,12 +73,12 @@ def peliculas(item):
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        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,'<li><a class="pag-next" href="([^"]+)"><ins>Next</ins></a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        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,'<li><a class="pag-next" href="([^"]+)"><ins>Next</ins></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
 
 
diff --git a/plugin.video.alfa/channels/tubedupe.py b/plugin.video.alfa/channels/tubedupe.py
index 4c146cec..ae014ad6 100644
--- a/plugin.video.alfa/channels/tubedupe.py
+++ b/plugin.video.alfa/channels/tubedupe.py
@@ -7,19 +7,15 @@ 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
-
 
 host = 'https://tubedupe.com'
 
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="peliculas", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="peliculas", url=host + "/most-popular/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/top-rated/"))
+    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-popular/"))
     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"))
@@ -32,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -44,27 +40,31 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    if item.title == "Categorias" or "Canal" :
-        patron  = '<a href="([^"]+)" class="list-item" title="([^"]+)">.*?'
-        patron  += '<img src="([^"]+)".*?'
-        patron  += '<var class="duree">([^"]+) </var>'
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron = '<div class="block-[^"]+">.*?'
+    patron += '<a href="([^"]+)".*?title="([^"]+)".*?'
+    patron += 'src="([^"]+)".*?'
+    if '/models/' in item.url:
+        patron += '<span class="strong">Videos</span>(.*?)</div>'
     else:
-        patron = '<div class="block-pornstar">.*?<a href="([^"]+)" title="([^"]+)" >.*?src="([^"]+)".*?<div class="col-lg-4-fixed nb-videos">.*?<br>(\d+)</div>'
+        patron += '<var class="duree">([^"]+) </var>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad  in matches:
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        cantidad = cantidad.strip()
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail,fanart=scrapedthumbnail, plot=scrapedplot) )
     next_page = scrapertools.find_single_match(data, '<li class="active">.*?<a href="([^"]+)" title="Page')
     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 ) )
+        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page ) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -78,12 +78,12 @@ def peliculas(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, contentTitle = title, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                              fanart=thumbnail,plot=plot, contentTitle = title))
     next_page = scrapertools.find_single_match(data, '<li class="active">.*?<a href="([^"]+)" title="Page')
     if next_page:
         next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title="Página Siguiente >>" , text_color="blue", url=next_page ) )
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page ) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/tvmoviedb.json b/plugin.video.alfa/channels/tvmoviedb.json
index e82411cb..4f07d4dc 100755
--- a/plugin.video.alfa/channels/tvmoviedb.json
+++ b/plugin.video.alfa/channels/tvmoviedb.json
@@ -15,7 +15,7 @@
       "id": "tmdb",
       "type": "list",
       "label": "@70418",
-      "default": 3,
+      "default": 4,
       "enabled": true,
       "visible": true,
       "lvalues": [
@@ -52,7 +52,7 @@
       "type": "list",
       "label": "@70427",
       "color": "0xFFE0F04B",
-      "default": 3,
+      "default": 4,
       "enabled": true,
       "visible": true,
       "lvalues": [
diff --git a/plugin.video.alfa/channels/tvseriesdk.py b/plugin.video.alfa/channels/tvseriesdk.py
index d6b1b7c2..3f0a8a80 100644
--- a/plugin.video.alfa/channels/tvseriesdk.py
+++ b/plugin.video.alfa/channels/tvseriesdk.py
@@ -154,15 +154,15 @@ def search(item, texto):
 def findvideos(item):
     logger.info()
     itemlist = []
-    servers = {'netu': 'https://hqq.tv/player/embed_player.php?vid=',
+    servers = {'netu': 'http://hqq.tv/player/embed_player.php?vid=',
                'open': 'https://openload.co/embed/',
                'netv': 'http://goo.gl/',
                'gamo': 'http://gamovideo.com/embed-',
                'powvideo': 'http://powvideo.net/embed-',
                'play': 'http://streamplay.to/embed-',
                'vido': 'http://vidoza.net/embed-',
-               'net': 'https://hqq.tv/player/embed_player.php?vid=',
-               'ntu': 'https://hqq.tv/player/embed_player.php?vid='
+               'net': 'http://hqq.tv/player/embed_player.php?vid=',
+               'ntu': 'http://hqq.tv/player/embed_player.php?vid='
                }
     data = get_source(item.url)
     noemitido = scrapertools.find_single_match(data, '<p><img src=(http://darkiller.com/images/subiendo.png) border=0\/><\/p>')
diff --git a/plugin.video.alfa/channels/vi2.py b/plugin.video.alfa/channels/vi2.py
index c2933a5e..c19ae543 100644
--- a/plugin.video.alfa/channels/vi2.py
+++ b/plugin.video.alfa/channels/vi2.py
@@ -304,7 +304,7 @@ def findvideos(item):
 def search(item, texto):
     logger.info()
     texto = texto.replace(" ", "+")
-    item.url = item.url + texto
+    item.url = '%spelicula+%s+%s&o=2' % (item.url, texto, item.link_type)
 
     if texto != '':
         return list_all(item)
diff --git a/plugin.video.alfa/channels/videolibrary.json b/plugin.video.alfa/channels/videolibrary.json
index abfd28d6..c039c436 100755
--- a/plugin.video.alfa/channels/videolibrary.json
+++ b/plugin.video.alfa/channels/videolibrary.json
@@ -270,13 +270,6 @@
         "@60649"
       ]
     },
-    {
-      "id": "lab_1",
-      "type": "label",
-      "label": "@60650",
-      "enabled": true,
-      "visible": true
-    },
     {
       "id": "lowerize_title",
       "type": "list",
@@ -287,6 +280,13 @@
         "No"
       ]
     },
+    {
+      "id": "lab_1",
+      "type": "label",
+      "label": "@60650",
+      "enabled": true,
+      "visible": true
+    },
     {
       "id": "scraper_movies",
       "type": "list",
diff --git a/plugin.video.alfa/channels/videosXYZ.py b/plugin.video.alfa/channels/videosXYZ.py
index 73a44dcd..489efdc5 100644
--- a/plugin.video.alfa/channels/videosXYZ.py
+++ b/plugin.video.alfa/channels/videosXYZ.py
@@ -2,25 +2,21 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://free-porn-videos.xyz'
 
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/topics/porn-videos/"))
-    itemlist.append( Item(channel=item.channel, title="Parody" , action="peliculas", url=host + "/topics/free-porn-parodies/"))
-    itemlist.append( Item(channel=item.channel, title="BigTits" , action="peliculas", url=host + "/?s=big+tit"))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/topics/adult-movie/"))
+    itemlist.append( Item(channel=item.channel, title="Parody" , action="lista", url=host + "/topics/free-porn-parodies/"))
+    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/topics/porn-videos/"))
+    itemlist.append( Item(channel=item.channel, title="BigTits" , action="lista", url=host + "/?s=big+tit"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -30,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -38,21 +34,22 @@ def search(item, texto):
         return []
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<article id="post-\d+".*?<a href="([^"]+)" title="([^"]+)">.*?data-src="([^"]+)"'
+    patron = '<article id="post-\d+".*?<a href="([^"]+)".*?data-src="([^"]+)".*?alt="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle.replace("Permalink to Watch ", "").replace("Porn Online", "").replace("Permalink to ", "")
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , contentTitle=scrapedtitle,  plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, contentTitle=scrapedtitle, plot=scrapedplot) )
     next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">&raquo;</a>')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/vintagetube.py b/plugin.video.alfa/channels/vintagetube.py
index 725fd907..1bd20636 100644
--- a/plugin.video.alfa/channels/vintagetube.py
+++ b/plugin.video.alfa/channels/vintagetube.py
@@ -2,17 +2,14 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://www.vintagetube.club'
 
-
 def mainlist(item):
     logger.info()
     itemlist = []
@@ -41,14 +38,17 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = '<div class="prev prev-ct">.*?<a href="(.*?)">.*?<img src="(.*?)".*?<span class="prev-tit">(.*?)</span>'
+    patron  = '<div class="prev prev-ct">.*?'
+    patron += '<a href="([^"]+)">.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<span class="prev-tit">([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         scrapedplot = ""
-        scrapedtitle = str(scrapedtitle)
         scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
@@ -56,21 +56,25 @@ def peliculas(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<div class="prev">.*?<a href="(.*?)">.*?<img src="(.*?)">.*?<span class="prev-tit">(.*?)</span>.*?<div class="prev-dur"><span>(.*?)</span>'
+    patron = '<div class="prev">.*?'
+    patron += '<a href="([^"]+)">.*?'
+    patron += '<img src="([^"]+)">.*?'
+    patron += '<span class="prev-tit">([^"]+)</span>.*?'
+    patron += '<div class="prev-dur"><span>([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
         scrapedplot = ""
         scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + str(scrapedtitle)
         scrapedurl = scrapedurl.replace("/xxx.php?tube=", "")
         scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    current_page = scrapertools.find_single_match(data,'<li><span class="page">(.*?)</span></li>')
-    next_page = int(current_page) + 1
-    url = item.url
-    url_page = current_page + "/"
-    url = url.replace(url_page, "")
-    next_page_url = url + str(next_page)+"/"
-    itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<span class="page">.*?<a target="_self" href="([^"]+)"')
+
+    if next_page!="":
+        next_page = urlparse.urljoin(item.url,next_page)
+        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page) )
+                
     return itemlist
 
 
@@ -80,16 +84,15 @@ def play(item):
     data = httptools.downloadpage(item.url).data
     scrapedurl = scrapertools.find_single_match(data,'<iframe frameborder=0 scrolling="no"  src=\'(.*?)\'')
     if scrapedurl == "":
-        scrapedurl = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
-        scrapedurl = scrapedurl.replace ("http:", "")
-        data = httptools.downloadpage("http:" + scrapedurl).data
+        scrapedurl = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
+        data = httptools.downloadpage(scrapedurl).data
     else:
         data = httptools.downloadpage(scrapedurl).data
-        scrapedurl = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
+        scrapedurl = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
         data = httptools.downloadpage("https:" + scrapedurl).data
-    media_url = scrapertools.find_single_match(data,'<source src="(.*?)"')
+    scrapedurl = scrapertools.find_single_match(data,'<source src="([^"]+)"')
     itemlist = []
-    itemlist.append(Item(channel=item.channel, action="play", title=media_url, fulltitle=media_url, url=media_url,
+    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/plugin.video.alfa/channels/vintagexxxsex.py b/plugin.video.alfa/channels/vintagexxxsex.py
index 17018db9..3e1650f9 100644
--- a/plugin.video.alfa/channels/vintagexxxsex.py
+++ b/plugin.video.alfa/channels/vintagexxxsex.py
@@ -2,13 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://www.vintagexxxsex.com'
 
@@ -16,9 +14,9 @@ host = 'http://www.vintagexxxsex.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Top" , action="peliculas", url=host + "/all-top/1/"))
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host + "/all-new/1/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/all-longest/1/"))
+    itemlist.append( Item(channel=item.channel, title="Top" , action="lista", url=host + "/all-top/1/"))
+    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host + "/all-new/1/"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/all-longest/1/"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
@@ -29,7 +27,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -48,15 +46,20 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = '<div class="th">.*?<a href="([^"]+)".*?<img src="([^"]+)".*?<span class="th_nm">([^"]+)</span>.*?<i class="fa fa-clock-o"></i>([^"]+)</span>'
+    patron = '<div class="th">.*?'
+    patron += '<a href="([^"]+)".*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<span class="th_nm">([^"]+)</span>.*?'
+    patron += '<i class="fa fa-clock-o"></i>([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,time in matches:
         contentTitle = scrapedtitle
@@ -65,21 +68,12 @@ def peliculas(item):
         scrapedurl = host + scrapedurl
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
-
-
-    next_page_url = scrapertools.find_single_match(data,'<li><span class="pg_nm">\d+</span></li>.*?href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
-
-
-    # else:
-        # patron  = '<li><span class="pg_nm">\d+</span></li>.*?href="([^"]+)"'
-        # next_page = re.compile(patron,re.DOTALL).findall(data)
-        # next_page = item.url + next_page[0]
-        # itemlist.append( Item(channel=item.channel, action="peliculas", title=next_page[0] , text_color="blue", url=next_page[0] ) )
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail,
+                              fanart=thumbnail, plot=plot, contentTitle=contentTitle))
+    next_page = scrapertools.find_single_match(data,'<li><span class="pg_nm">\d+</span></li>.*?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
 
 
@@ -88,13 +82,13 @@ def play(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
+    scrapedurl = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
     data = httptools.downloadpage(scrapedurl).data
-    scrapedurl = scrapertools.find_single_match(data,'<source src="(.*?)"')
+    scrapedurl = scrapertools.find_single_match(data,'<source src="([^"]+)"')
     if scrapedurl == "":
-        scrapedurl = "http:" + scrapertools.find_single_match(data,'<iframe src="(.*?)"')
+        scrapedurl = "http:" + scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
         data = httptools.downloadpage(scrapedurl).data
-        scrapedurl = scrapertools.find_single_match(data,'file: "(.*?)"')
+        scrapedurl = scrapertools.find_single_match(data,'file: "([^"]+)"')
     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/plugin.video.alfa/channels/vporn.py b/plugin.video.alfa/channels/vporn.py
index 3b5bddb6..2b52f171 100644
--- a/plugin.video.alfa/channels/vporn.py
+++ b/plugin.video.alfa/channels/vporn.py
@@ -16,12 +16,12 @@ host = 'https://www.vporn.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host + "/newest/month/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/views/month/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor Valoradas" , action="peliculas", url=host + "/rating/month/"))
-    itemlist.append( Item(channel=item.channel, title="Favoritas" , action="peliculas", url=host + "/favorites/month/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Votada" , action="peliculas", url=host + "/votes/month/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/longest/month/"))
+    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host + "/newest/month/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/views/month/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor Valoradas" , action="lista", url=host + "/rating/month/"))
+    itemlist.append( Item(channel=item.channel, title="Favoritas" , action="lista", url=host + "/favorites/month/"))
+    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))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
@@ -33,7 +33,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search?q=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -46,18 +46,21 @@ def catalogo(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class=\'star\'>.*?<a href="([^"]+)">.*?<img src="([^"]+)" alt="([^"]+)".*?<span> (\d+) Videos'
+    patron = '<div class=\'star\'>.*?'
+    patron += '<a href="([^"]+)">.*?'
+    patron += '<img src="([^"]+)" alt="([^"]+)".*?'
+    patron += '<span> (\d+) Videos'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="next" href="([^"]+)">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Next page >>" , text_color="blue", url=next_page_url , folder=True) )
-    return itemlist
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<a class="next" href="([^"]+)">')
+    if next_page!="":
+        next_page = urlparse.urljoin(item.url,next_page)
+        itemlist.append(item.clone(action="catalogo", title="Next page >>", text_color="blue", url=next_page) )
     return itemlist
 
 
@@ -73,27 +76,31 @@ def categorias(item):
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="video">.*?<a href="([^"]+)".*?<span class="time">(.*?)</span>.*?<img src="([^"]+)" alt="([^"]+)"'
+    patron = '<div class="video">.*?'
+    patron += '<a href="([^"]+)".*?'
+    patron += '<span class="time">(.*?)</span>.*?'
+    patron += '<img src="([^"]+)" alt="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,time,scrapedthumbnail,scrapedtitle in matches:
         title = "[COLOR yellow]" + time + "  [/COLOR]" + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle = title, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<a class="next.*?title="Next Page" href="([^"]+)">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Next page >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl,
+                              thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle = title))
+    next_page = scrapertools.find_single_match(data,'<a class="next.*?title="Next Page" href="([^"]+)">')
+    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) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/watchpornfree.py b/plugin.video.alfa/channels/watchpornfree.py
index f2745a6f..1a12015d 100644
--- a/plugin.video.alfa/channels/watchpornfree.py
+++ b/plugin.video.alfa/channels/watchpornfree.py
@@ -2,13 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 # https://playpornfree.org/    https://mangoporn.net/   https://watchfreexxx.net/   https://losporn.org/  https://xxxstreams.me/  https://speedporn.net/
 
@@ -17,9 +15,9 @@ host = 'https://watchpornfree.ws'
 def mainlist(item):
     logger.info("")
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/movies"))
-    itemlist.append( Item(channel=item.channel, title="Parodia" , action="peliculas", url=host + "/category/parodies-hd"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/category/clips-scenes"))
+    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="Videos" , action="lista", url=host + "/category/clips-scenes"))
     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))
@@ -32,14 +30,15 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
             logger.error("%s" % line)
         return []
 
-
+# <li class="cat-item cat-item-6"><a href="https://watchpornfree.ws/category/all-girl" >All Girl</a> (2,777)
+# </li>
 def categorias(item):
     logger.info("")
     itemlist = []
@@ -50,15 +49,17 @@ def categorias(item):
         data = scrapertools.get_match(data,'>Years</a>(.*?)</ul>')
     if item.title == "Categorias":
         data = scrapertools.get_match(data,'>XXX Genres</div>(.*?)</ul>')
-    patron  = '<a href="(.*?)".*?>(.*?)</a>'
+    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 + cantidad
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
-def peliculas(item):
+def lista(item):
     logger.info("")
     itemlist = []
     data = scrapertools.cachePage(item.url)
@@ -66,10 +67,11 @@ def peliculas(item):
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next &raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next &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) )
     return itemlist
 
diff --git a/plugin.video.alfa/channels/webpeliculasporno.py b/plugin.video.alfa/channels/webpeliculasporno.py
index b1382d98..9b1d474d 100644
--- a/plugin.video.alfa/channels/webpeliculasporno.py
+++ b/plugin.video.alfa/channels/webpeliculasporno.py
@@ -1,36 +1,39 @@
 # -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-
-from core import jsontools as json
+# ------------------------------------------------------------
+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 tmdb
 
 host = 'http://www.webpeliculasporno.com'
 
 
 def mainlist(item):
-    logger.info("pelisalacarta.webpeliculasporno mainlist")
+    logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimas" , action="peliculas", url= host))
-    itemlist.append( Item(channel=item.channel, title="Mas vistas" , action="peliculas", url= host + "/?display=tube&filtre=views"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="peliculas", url= host + "/?display=tube&filtre=rate"))
-    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="Ultimas", action="lista", url=host))
+    itemlist.append(
+        Item(channel=item.channel, title="Mas vistas", action="lista", url=host + "/?display=tube&filtre=views"))
+    itemlist.append(
+        Item(channel=item.channel, title="Mejor valoradas", action="lista", url=host + "/?display=tube&filtre=rate"))
+    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("pelisalacarta.gmobi mainlist")
+    logger.info()
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -40,35 +43,35 @@ def search(item, texto):
 
 def categorias(item):
     itemlist = []
-    data = scrapertools.cache_page(item.url)
-    patron  = '<li class="cat-item [^>]+><a href="([^"]+)" >([^<]+)'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
+    data = httptools.downloadpage(item.url).data
+    patron = '<li class="cat-item [^>]+><a href="([^"]+)" >([^<]+)'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, plot=scrapedplot))
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
-    patron  = '<li class="border-radius-5 box-shadow">.*?'
-    patron  += 'src="([^"]+)".*?'
+    data = httptools.downloadpage(item.url).data
+    patron = '<li class="border-radius-5 box-shadow">.*?'
+    patron += 'src="([^"]+)".*?'
     patron += '<a href="([^"]+)" title="([^"]+)">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedurl,scrapedtitle  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedthumbnail, scrapedurl, scrapedtitle in matches:
+        url = urlparse.urljoin(item.url, scrapedurl)
         title = scrapedtitle
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle ))
-    next_page_url = scrapertools.find_single_match(data,'<li><a class="next page-numbers" href="([^"]+)">Next')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+        itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
+                             fanart=thumbnail, plot=plot, contentTitle=contentTitle))
+    next_page = scrapertools.find_single_match(data, '<li><a class="next page-numbers" href="([^"]+)">Next')
+    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
-
diff --git a/plugin.video.alfa/channels/woodrocket.py b/plugin.video.alfa/channels/woodrocket.py
index e9706cc2..521617c3 100644
--- a/plugin.video.alfa/channels/woodrocket.py
+++ b/plugin.video.alfa/channels/woodrocket.py
@@ -2,13 +2,11 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://woodrocket.com'
 
@@ -16,9 +14,8 @@ host = 'http://woodrocket.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host + "/porn"))
-    itemlist.append( Item(channel=item.channel, title="Parodias" , action="peliculas", url=host + "/parodies"))
+    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host + "/porn"))
+    itemlist.append( Item(channel=item.channel, title="Parodias" , action="lista", url=host + "/parodies"))
     itemlist.append( Item(channel=item.channel, title="Shows" , action="categorias", url=host + "/series"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
     return itemlist
@@ -33,11 +30,12 @@ def categorias(item):
     for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail =  host + scrapedthumbnail
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
@@ -50,11 +48,12 @@ def peliculas(item):
         thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
         title = scrapedtitle
         year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)" rel="next">&raquo;</a></li>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail,
+                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
+    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)" rel="next">&raquo;</a></li>')
+    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
 
 
@@ -62,12 +61,10 @@ def play(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
-    patron  = '<iframe src="(.*?)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        scrapedurl = scrapedurl
+    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,'"quality":"\d*","videoUrl":"(.*?)"')
+    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/plugin.video.alfa/channels/wopelis.json b/plugin.video.alfa/channels/wopelis.json
deleted file mode 100755
index 04110e74..00000000
--- a/plugin.video.alfa/channels/wopelis.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "id": "wopelis",
-  "name": "WoPelis",
-  "active": true,
-  "adult": false,
-  "language": ["cast", "lat"],
-  "banner": "https://github.com/master-1970/resources/raw/master/images/bannermenu/wopelis.png",
-  "fanart": "https://github.com/master-1970/resources/raw/master/images/fanart/wopelis.png",
-  "thumbnail": "https://github.com/master-1970/resources/raw/master/images/squares/wopelis.png",
-  "categories": [
-    "movie",
-    "tvshow"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "include_in_newest_peliculas",
-      "type": "bool",
-      "label": "Incluir en Novedades - Películas",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "include_in_newest_series",
-      "type": "bool",
-      "label": "Incluir en Novedades - Series",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/wopelis.py b/plugin.video.alfa/channels/wopelis.py
deleted file mode 100755
index 99fd1111..00000000
--- a/plugin.video.alfa/channels/wopelis.py
+++ /dev/null
@@ -1,366 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import channeltools
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import tmdb
-from core.item import Item
-from platformcode import config, logger
-
-HOST = 'http://www.wopelis.com'
-__channel__ = 'wopelis'
-parameters = channeltools.get_channel_parameters(__channel__)
-fanart_host = parameters['fanart']
-thumbnail_host = parameters['thumbnail']
-color1, color2, color3 = ['0xFF58D3F7', '0xFF2E64FE', '0xFF0404B4']
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    item.url = HOST
-    item.text_color = color2
-    item.fanart = fanart_host
-
-    item.thumbnail = "https://github.com/master-1970/resources/raw/master/images/genres/0/Directors%20Chair.png"
-    url = HOST + "/galep.php?solo=cenlaces&empen=0"
-    itemlist.append(item.clone(title="Películas:", folder=False, text_color=color3, text_bold=True))
-    itemlist.append(item.clone(title="    Recientes", action="listado", url=url))
-    itemlist.append(item.clone(title="    Mas populares de la semana", action="listado", url=url + "&ord=popu"))
-    itemlist.append(item.clone(title="    Por géneros", action="generos", url=HOST + "/index.php"))
-    itemlist.append(item.clone(title="    Buscar película", action="search", url=url))
-
-    itemlist.append(item.clone(title="", folder=False, thumbnail=thumbnail_host))
-
-    item.thumbnail = "https://github.com/master-1970/resources/raw/master/images/genres/0/TV%20Series.png"
-    url = HOST + "/gales.php?empen=0"
-    itemlist.append(item.clone(title="Series:", folder=False, text_color=color3, text_bold=True))
-    itemlist.append(item.clone(title="    Nuevos episodios", action="listado", url=url + "&ord=reci"))
-    itemlist.append(item.clone(title="    Mas populares de la semana", action="listado", url=url + "&ord=popu"))
-    itemlist.append(item.clone(title="    Por géneros", action="generos", url=HOST + "/series.php"))
-    itemlist.append(item.clone(title="    Buscar serie", action="search", url=url + "&ord=popu"))
-
-    return itemlist
-
-
-def newest(categoria):
-    logger.info()
-    itemlist = []
-    item = Item()
-    try:
-        if categoria == 'peliculas':
-            item.url = HOST + "/galep.php?solo=cenlaces&empen=0"
-
-        elif categoria == 'series':
-            item.url = HOST + "/gales.php?empen=0&ord=reci"
-
-        else:
-            return []
-
-        itemlist = listado(item)
-        if itemlist[-1].title == ">> Página siguiente":
-            itemlist.pop()
-
-    # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info("search:" + texto)
-    try:
-        if texto:
-            item.url = "%s&busqueda=%s" % (item.url, texto.replace(" ", "+"))
-            return listado(item)
-        else:
-            return []
-    # 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 generos(item):
-    logger.info()
-    itemlist = []
-    dict_gender = {"acción": "accion", "animación": "animacion", "ciencia ficción": "ciencia%20ficcion",
-                   "fantasía": "fantasia", "música": "musica", "película de la televisión": "pelicula%20de%20tv"}
-
-    data = downloadpage(item.url)
-    data = scrapertools.find_single_match(data, '<select name="gener">(.*?)</select>')
-
-    for genero in scrapertools.find_multiple_matches(data, '<option value="([^"]+)'):
-        if genero != 'Todos':
-            if 'series' in item.url:
-                url = HOST + "/gales.php?empen=0&gener=%s" % genero
-            else:
-                url = HOST + "/galep.php?solo=cenlaces&empen=0&gener=%s" % genero
-
-            thumbnail = "https://raw.githubusercontent.com/master-1970/resources/master/images/genres/4/azul/%s.png"
-            thumbnail = thumbnail % dict_gender.get(genero.lower(), genero.lower())
-
-            itemlist.append(Item(channel=item.channel, action="listado", title=genero, url=url, text_color=color1,
-                                 contentType='movie', folder=True,
-                                 thumbnail=thumbnail))  # ,viewmode="movie_with_plot"))
-
-    return sorted(itemlist, key=lambda i: i.title.lower())
-
-
-def listado(item):
-    logger.info(item)
-    itemlist = []
-
-    data = downloadpage(item.url)
-
-    patron = '<a class="extended" href=".([^"]+).*?'
-    patron += '<img class="centeredPicFalse"([^>]+).*?'
-    patron += '<span class="year">(\d{4})</span>.*?'
-    patron += '<span class="title">(.*?)</span>'
-
-    for url, pic, year, title in scrapertools.find_multiple_matches(data, patron):
-        thumbnail = scrapertools.find_single_match(pic, 'src="([^"]+)')
-        if not thumbnail:
-            thumbnail = HOST + "/images/cover-notfound.png"
-
-        new_item = Item(channel=__channel__, thumbnail=thumbnail, text_color=color2, infoLabels={"year": year})
-
-        if "galep.php" in item.url:
-            # movie
-            new_item.contentTitle = title
-            new_item.action = "findvideos"
-            new_item.url = HOST + url.replace('peli.php?id=', 'venlaces.php?npl=')
-
-
-        elif "gales.php" in item.url:
-            # tvshow
-            title = title.replace(' - 0x0', '')
-            new_item.contentSerieName = title
-            new_item.action = "temporadas"
-            new_item.url = HOST + url
-            if "ord=reci" in item.url:
-                # episode
-                season_episode = scrapertools.get_season_and_episode(title)
-                if season_episode:
-                    new_item.contentSeason, new_item.contentEpisodeNumber = season_episode.split('x')
-                    new_item.action = "get_episodio"
-                    new_item.contentSerieName = title.split('-', 1)[1].strip()
-
-            elif "gener=" in item.url and scrapertools.get_season_and_episode(title):
-                # Las series filtrada por genero devuelven capitulos y series completas
-                title = title.split('-', 1)[1].strip()
-                new_item.contentSerieName = title
-
-        else:
-            return []
-
-        new_item.title = "%s (%s)" % (title, year)
-
-        itemlist.append(new_item)
-
-    if itemlist:
-        # Obtenemos los datos basicos mediante multihilos
-        tmdb.set_infoLabels(itemlist)
-
-    # Si es necesario añadir paginacion
-    if len(itemlist) == 35:
-        empen = scrapertools.find_single_match(item.url, 'empen=(\d+)')
-        url_next_page = item.url.replace('empen=%s' % empen, 'empen=%s' % (int(empen) + 35))
-        itemlist.append(Item(channel=item.channel, action="listado", title=">> Página siguiente",
-                             thumbnail=thumbnail_host, url=url_next_page, folder=True,
-                             text_color=color3, text_bold=True))
-
-    return itemlist
-
-
-def temporadas(item):
-    logger.info(item)
-    itemlist = []
-
-    data = downloadpage(item.url)
-    patron = '<div class="checkSeason" data-num="([^"]+)[^>]+>([^<]+)'
-
-    for num_season, title in scrapertools.find_multiple_matches(data, patron):
-        itemlist.append(item.clone(contentSeason=num_season, title="%s - %s" % (item.contentSerieName, title),
-                                   action="episodios"))
-
-    if itemlist:
-        # Obtenemos los datos de las temporadas mediante multihilos
-        tmdb.set_infoLabels(itemlist)
-
-        if config.get_videolibrary_support():
-            itemlist.append(item.clone(title="Añadir esta serie a la videoteca",
-                                       action="add_serie_to_library", extra="episodios",
-                                       text_color=color1, thumbnail=thumbnail_host, fanart=fanart_host))
-
-    return itemlist
-
-
-def episodios(item):
-    logger.info()
-    itemlist = []
-
-    data = downloadpage(item.url)
-    patron = '<div class="checkSeason" data-num="([^"]+)(.*?)</div></div></div>'
-    for num_season, data in scrapertools.find_multiple_matches(data, patron):
-        if item.contentSeason and item.contentSeason != int(num_season):
-            # Si buscamos los episodios de una temporada concreta y no es esta (num_season)...
-            continue
-
-        patron = '<div class="info"><a href="..([^"]+).*?class="number">([^<]+)'
-        for url, num_episode in scrapertools.find_multiple_matches(data, patron):
-            if item.contentEpisodeNumber and item.contentEpisodeNumber != int(num_episode):
-                # Si buscamos un episodio concreto y no es este (num_episode)...
-                continue
-
-            title = "%sx%s - %s" % (num_season, num_episode.strip().zfill(2), item.contentSerieName)
-            itemlist.append(item.clone(title=title, url=HOST + url, action="findvideos",
-                                       contentSeason=num_season, contentEpisodeNumber=num_episode))
-
-    if itemlist and hasattr(item, 'contentSeason'):
-        # Obtenemos los datos de los episodios de esta temporada mediante multihilos
-        tmdb.set_infoLabels(itemlist)
-
-        for i in itemlist:
-            if i.infoLabels['title']:
-                # Si el capitulo tiene nombre propio añadirselo al titulo del item
-                i.title = "%sx%s %s" % (
-                    i.infoLabels['season'], str(i.infoLabels['episode']).zfill(2), i.infoLabels['title'])
-
-    return itemlist
-
-
-def get_episodio(item):
-    logger.info()
-    itemlist = episodios(item)
-    if itemlist:
-        itemlist = findvideos(itemlist[0])
-
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    dic_langs = {'esp': 'Español', 'english': 'Ingles', 'japo': 'Japones', 'argentina': 'Latino', 'ntfof': ''}
-    dic_servers = {'ntfof': 'Servidor Desconocido', 'stramango': 'streamango', 'flasht': 'flashx'}
-
-    data1 = downloadpage(item.url)
-    patron = '(?s)onclick="redir\(([^\)]+).*?'
-    patron += '<img style="float:left" src="./[^/]+/([^\.]+).+?'
-    patron += '<span[^>]+>([^<]+).*?'
-    patron += '<img(.*?)on'
-
-    if "Descarga:</h1>" in data1:
-        list_showlinks = [('Online:', 'Online:</h1>(.*?)Descarga:</h1>'),
-                          ('Download:', 'Descarga:</h1>(.*?)</section>')]
-    else:
-        list_showlinks = [('Online:', 'Online:</h1>(.*?)</section>')]
-
-    for t in list_showlinks:
-        data = scrapertools.find_single_match(data1, t[1])
-
-        if data:
-            itemlist.append(Item(title=t[0], text_color=color3, text_bold=True,
-                                 folder=False, thumbnail=thumbnail_host))
-
-            for redir, server, quality, langs in scrapertools.find_multiple_matches(data,
-                                                                                    patron):  # , server, quality, langs
-                redir = redir.split(",")
-                url = redir[0][1:-1]
-                id = redir[1][1:-1]
-                # type = redir[2][1:-1]
-                # url = url.split("','")[0] # [2] = 0 movies, [2] = 1 tvshows
-
-                langs = scrapertools.find_multiple_matches(langs, 'src="./images/([^\.]+)')
-                idioma = dic_langs.get(langs[0], langs[0])
-                subtitulos = dic_langs.get(langs[1], langs[1])
-                if subtitulos:
-                    idioma = "%s (Sub: %s)" % (idioma, subtitulos)
-
-                if server in dic_servers: server = dic_servers[server]
-
-                itemlist.append(
-                    item.clone(url=url, action="play", language=idioma, contentQuality=quality, server=server,
-                               title="    %s: %s [%s]" % (server.capitalize(), idioma, quality)))
-
-    if itemlist and config.get_videolibrary_support() and not "library" in item.extra:
-        if item.contentType == 'movie':
-            itemlist.append(item.clone(title="Añadir película a la videoteca",
-                                       action="add_pelicula_to_library", text_color=color1,
-                                       contentTitle=item.contentTitle, extra="library", thumbnail=thumbnail_host))
-        else:
-            # http://www.wopelis.com/serie.php?id=275641
-            item.url = "http://www.wopelis.com/serie.php?id=" + id
-            item.contentSeason = 0
-            item.contentEpisodeNumber = 0
-            # logger.error(item)
-            itemlist.append(item.clone(title="Añadir esta serie a la videoteca",
-                                       action="add_serie_to_library", extra="episodios###library",
-                                       text_color=color1, thumbnail=thumbnail_host))
-
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-
-    # Buscamos video por servidor ...
-    devuelve = servertools.findvideosbyserver(item.url, item.server)
-    if not devuelve:
-        # ...sino lo encontramos buscamos en todos los servidores disponibles
-        devuelve = servertools.findvideos(item.url, skip=True)
-
-    if devuelve:
-        # logger.debug(devuelve)
-        itemlist.append(Item(channel=item.channel, title=item.contentTitle, action="play", server=devuelve[0][2],
-                             url=devuelve[0][1], thumbnail=item.thumbnail, folder=False))
-
-    return itemlist
-
-
-def downloadpage(url):
-    cookievalue = config.get_setting("cookie", "wopelis")
-    if not cookievalue:
-        data = httptools.downloadpage(url).data
-        cookievalue = get_cookie(data)
-
-    headers = {'Cookie': '%s' % cookievalue}
-    data = httptools.downloadpage(url, headers=headers).data
-    if "Hola bienvenido" in data:
-        cookievalue = get_cookie(data)
-        headers = {'Cookie': '%s' % cookievalue}
-        data = httptools.downloadpage(url, headers=headers).data
-
-    return re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-
-
-def get_cookie(data):
-    import random
-    cookievalue = ""
-    cookiename = scrapertools.find_single_match(data, 'document.cookie\s*=\s*"([^"]+)"')
-    cookiename = cookiename.replace("=", "")
-    posible = scrapertools.find_single_match(data, 'var possible\s*=\s*"([^"]+)"')
-    bloque = scrapertools.find_single_match(data, 'function cok(.*?);')
-    lengths = scrapertools.find_multiple_matches(bloque, '([\S]{1}\d+)')
-    for numero in lengths:
-        if numero.startswith("("):
-            for i in range(0, int(numero[1:])):
-                cookievalue += posible[int(random.random() * len(posible))]
-        else:
-            cookievalue += numero[1:]
-
-    cookievalue = "%s=%s" % (cookiename, cookievalue)
-    config.set_setting("cookie", cookievalue, "wopelis")
-
-    return cookievalue
diff --git a/plugin.video.alfa/channels/xhamster.py b/plugin.video.alfa/channels/xhamster.py
index afa45db4..ea97213a 100755
--- a/plugin.video.alfa/channels/xhamster.py
+++ b/plugin.video.alfa/channels/xhamster.py
@@ -5,28 +5,34 @@ import sys
 import urlparse
 
 from platformcode import logger
-from core import scrapertools
+from core import scrapertools, httptools
 from core.item import Item
 
 HOST = "http://es.xhamster.com/"
 
+
 def mainlist(item):
     logger.info()
 
     itemlist = []
-    itemlist.append( Item(channel=item.channel, action="videos"      , title="Útimos videos" , url=HOST, viewmode="movie"))
-    itemlist.append( Item(channel=item.channel, action="categorias"    , title="Categorías", url=HOST))
-    itemlist.append( Item(channel=item.channel, action="votados"    , title="Lo mejor"))
-    itemlist.append( Item(channel=item.channel, action="vistos"    , title="Los mas vistos"))
-    itemlist.append( Item(channel=item.channel, action="videos"    , title="Recomendados", url=urlparse.urljoin(HOST,"/videos/recommended")))
-    itemlist.append( Item(channel=item.channel, action="search"    , title="Buscar", url=urlparse.urljoin(HOST,"/search?q=%s")))
+    itemlist.append(Item(channel=item.channel, action="videos", title="Útimos videos", url=HOST, viewmode="movie"))
+    itemlist.append(Item(channel=item.channel, action="categorias", title="Categorías", url=HOST))
+    itemlist.append(Item(channel=item.channel, action="votados", title="Lo mejor"))
+    itemlist.append(Item(channel=item.channel, action="vistos", title="Los mas vistos"))
+    itemlist.append(Item(channel=item.channel, action="videos", title="Recomendados",
+                         url=urlparse.urljoin(HOST, "/videos/recommended")))
+    itemlist.append(
+        Item(channel=item.channel, action="search", title="Buscar", url=urlparse.urljoin(HOST, "/search?q=%s")))
 
     return itemlist
 
+
 # REALMENTE PASA LA DIRECCION DE BUSQUEDA
-def search(item,texto):
+
+
+def search(item, texto):
     logger.info()
-    tecleado = texto.replace( " ", "+" )
+    tecleado = texto.replace(" ", "+")
     item.url = item.url % tecleado
     item.extra = "buscar"
     try:
@@ -37,71 +43,95 @@ def search(item,texto):
         for line in sys.exc_info():
             logger.error("%s" % line)
         return []
+
+
 # SECCION ENCARGADA DE BUSCAR
 
+
 def videos(item):
     logger.info()
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     itemlist = []
 
-    data = scrapertools.get_match(data,'<article.+?>(.*?)</article>')
-    
-    #Patron
+    data = scrapertools.get_match(data, '<article.+?>(.*?)</article>')
+
+    # Patron
     patron = '(?s)<div class="thumb-list__item.*?href="([^"]+)".*?src="([^"]+)".*?alt="([^"]+)">.*?'
     patron += '<div class="thumb-image-container__duration">(.+?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duration in matches:
-        #logger.debug("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
+    for scrapedurl, scrapedthumbnail, scrapedtitle, duration in matches:
+        # logger.debug("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
         fullTitle = scrapedtitle.strip() + " [" + duration + "]"
-        itemlist.append( Item(channel=item.channel, action="play" , title=fullTitle , url=scrapedurl, thumbnail=scrapedthumbnail, folder=True))     
+        itemlist.append(
+            Item(channel=item.channel, action="play", title=fullTitle, url=scrapedurl, thumbnail=scrapedthumbnail,
+                 folder=True))
 
-    #Paginador
+    # Paginador
     patron = '(?s)<div class="pager-container".*?<li class="next">.*?href="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)  
-    if len(matches) >0:
-      itemlist.append( Item(channel=item.channel, action="videos", title="Página Siguiente" , url=matches[0] , thumbnail="" , folder=True, viewmode="movie") )
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    if len(matches) > 0:
+        itemlist.append(
+            Item(channel=item.channel, action="videos", title="Página Siguiente", url=matches[0], thumbnail="",
+                 folder=True, viewmode="movie"))
 
     return itemlist
 
+
 # SECCION ENCARGADA DE VOLCAR EL LISTADO DE CATEGORIAS CON EL LINK CORRESPONDIENTE A CADA PAGINA
-    
+
+
 def categorias(item):
     logger.info()
     itemlist = []
 
+    data = httptools.downloadpage(item.url).data
 
-    data = scrapertools.cache_page(item.url)
-
-    data = scrapertools.get_match(data,'(?s)<div class="all-categories">(.*?)</aside>')    
+    data = scrapertools.get_match(data, '(?s)<div class="all-categories">(.*?)</aside>')
 
     patron = '(?s)<li>.*?<a href="([^"]+)".*?>([^<]+).*?</a></li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle in matches:
         fullTitle = scrapedtitle.strip()
-        itemlist.append( Item(channel=item.channel, action="videos" , title=fullTitle , url=scrapedurl))     
-
+        itemlist.append(Item(channel=item.channel, action="videos", title=fullTitle, url=scrapedurl))
 
     return itemlist
 
+
 def votados(item):
     logger.info()
     itemlist = []
 
-    itemlist.append( Item(channel=item.channel, action="videos" , title="Día", url=urlparse.urljoin(HOST,"/best/daily"), viewmode="movie"))
-    itemlist.append( Item(channel=item.channel, action="videos" , title="Semana"  , url=urlparse.urljoin(HOST,"/best/weekly"), viewmode="movie"))
-    itemlist.append( Item(channel=item.channel, action="videos" , title="Mes"  , url=urlparse.urljoin(HOST,"/best/monthly"), viewmode="movie"))
-    itemlist.append( Item(channel=item.channel, action="videos" , title="De siempre"  , url=urlparse.urljoin(HOST,"/best/"), viewmode="movie"))
+    itemlist.append(Item(channel=item.channel, action="videos", title="Día", url=urlparse.urljoin(HOST, "/best/daily"),
+                         viewmode="movie"))
+    itemlist.append(
+        Item(channel=item.channel, action="videos", title="Semana", url=urlparse.urljoin(HOST, "/best/weekly"),
+             viewmode="movie"))
+    itemlist.append(
+        Item(channel=item.channel, action="videos", title="Mes", url=urlparse.urljoin(HOST, "/best/monthly"),
+             viewmode="movie"))
+    itemlist.append(
+        Item(channel=item.channel, action="videos", title="De siempre", url=urlparse.urljoin(HOST, "/best/"),
+             viewmode="movie"))
     return itemlist
 
+
 def vistos(item):
     logger.info()
     itemlist = []
 
-    itemlist.append( Item(channel=item.channel, action="videos" , title="Día", url=urlparse.urljoin(HOST,"/most-viewed/daily"), viewmode="movie"))
-    itemlist.append( Item(channel=item.channel, action="videos" , title="Semana"  , url=urlparse.urljoin(HOST,"/most-viewed/weekly"), viewmode="movie"))
-    itemlist.append( Item(channel=item.channel, action="videos" , title="Mes"  , url=urlparse.urljoin(HOST,"/most-viewed/monthly"), viewmode="movie"))
-    itemlist.append( Item(channel=item.channel, action="videos" , title="De siempre"  , url=urlparse.urljoin(HOST,"/most-viewed/"), viewmode="movie"))
+    itemlist.append(
+        Item(channel=item.channel, action="videos", title="Día", url=urlparse.urljoin(HOST, "/most-viewed/daily"),
+             viewmode="movie"))
+    itemlist.append(
+        Item(channel=item.channel, action="videos", title="Semana", url=urlparse.urljoin(HOST, "/most-viewed/weekly"),
+             viewmode="movie"))
+    itemlist.append(
+        Item(channel=item.channel, action="videos", title="Mes", url=urlparse.urljoin(HOST, "/most-viewed/monthly"),
+             viewmode="movie"))
+    itemlist.append(
+        Item(channel=item.channel, action="videos", title="De siempre", url=urlparse.urljoin(HOST, "/most-viewed/"),
+             viewmode="movie"))
 
     return itemlist
 
@@ -111,15 +141,15 @@ def play(item):
     logger.info()
     itemlist = []
 
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     logger.debug(data)
 
     patron = '"([0-9]+p)":"([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
     for res, url in matches:
         url = url.replace("\\", "")
-        logger.debug("url="+url)
-        itemlist.append(["%s %s [directo]" % (res, scrapertools.get_filename_from_url(url)[-4:]), url])  
-        
+        logger.debug("url=" + url)
+        itemlist.append(["%s %s [directo]" % (res, scrapertools.get_filename_from_url(url)[-4:]), url])
+
     return itemlist
diff --git a/plugin.video.alfa/channels/xms.py b/plugin.video.alfa/channels/xms.py
index 3e4413de..3f4440c4 100644
--- a/plugin.video.alfa/channels/xms.py
+++ b/plugin.video.alfa/channels/xms.py
@@ -12,7 +12,7 @@ from platformcode import config, logger
 
 __channel__ = "xms"
 
-host = 'https://xxxmoviestream.com/'
+host = 'https://xtheatre.org'
 host1 = 'https://www.cam4.com/'
 try:
     __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
@@ -90,8 +90,6 @@ def peliculas(item):
 
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>|#038;", "", data)
-    patron_todos = '<div id="content">(.*?)<div id="footer"'
-    data = scrapertools.find_single_match(data, patron_todos)
     patron = 'src="([^"]+)" class="attachment-thumb_site.*?'  # img
     patron += '<a href="([^"]+)" title="([^"]+)".*?'          # url, title
     patron += '<div class="right"><p>([^<]+)</p>'             # plot
@@ -119,20 +117,19 @@ def peliculas(item):
 def webcam(item):
     logger.info()
     itemlist = []
-
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>|#038;", "", data)
     patron = '<div class="profileBox">.*?<a href="/([^"]+)".*?'  # url
     patron += 'data-hls-preview-url="([^"]+)">.*?'               # video_url
     patron += 'data-username="([^"]+)".*?'                       # username
     patron += 'title="([^"]+)".*?'                               # title
-    patron += 'data-profile="([^"]+)" />'                        # img
+    patron += 'data-profile="([^"]+)"'                        # img
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, video_url, username, scrapedtitle, scrapedthumbnail in matches:
         scrapedtitle = scrapedtitle.replace(' Chat gratis con webcam.', '')
 
-        itemlist.append(item.clone(channel=__channel__, action="play", title=scrapedtitle,
+        itemlist.append(item.clone(channel=__channel__, action="play", title=username,
                                    url=video_url, thumbnail=scrapedthumbnail, fanart=scrapedthumbnail,
                                    viewmode="movie_with_plot", folder=True, contentTitle=scrapedtitle))
     # Extrae el paginador
diff --git a/plugin.video.alfa/channels/xozilla.py b/plugin.video.alfa/channels/xozilla.py
index 54e6baf4..4b5640ed 100644
--- a/plugin.video.alfa/channels/xozilla.py
+++ b/plugin.video.alfa/channels/xozilla.py
@@ -1,15 +1,17 @@
 # -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+# ------------------------------------------------------------
+import urlparse
+import urllib2
+import urllib
+import re
+import os
+import sys
 
 from platformcode import config, logger
 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
 
 host = 'https://www.xozilla.com'
 
@@ -17,12 +19,14 @@ host = 'https://www.xozilla.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    itemlist.append(Item(channel=item.channel, title="Nuevas", action="lista", url=host + "/latest-updates/"))
+    itemlist.append(Item(channel=item.channel, title="Popular", 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="PornStar", action="categorias", url=host + "/models/"))
+    itemlist.append(Item(channel=item.channel, title="Canal", action="categorias", url=host + "/channels/"))
+    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
 
 
@@ -31,7 +35,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/%s/" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -39,69 +43,70 @@ 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="item" href="([^"]+)" title="([^"]+)">.*?<img class="thumb" src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        scrapedplot = ""
-        thumbnail = "http:" + scrapedthumbnail
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=thumbnail , plot=scrapedplot , folder=True) )
-    return itemlist
-
-
 def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?<img class="thumb" src="([^"]+)".*?</i> (\d+) videos</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
+    patron = '<a class="item" href="([^"]+)" title="([^"]+)">.*?'
+    patron += '<img class="thumb" src="([^"]+)".*?'
+    patron += '(.*?)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle, scrapedthumbnail, cantidad in matches:
         scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        cantidad = scrapertools.find_single_match(cantidad, '(\d+) videos</div>')
+        if cantidad:
+            scrapedtitle += " (" + cantidad + ")"
+        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot))
+    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
+    if next_page != "#videos":
+        next_page = urlparse.urljoin(item.url, next_page)
+        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page))
+    if next_page == "#videos":
+        next_page = scrapertools.find_single_match(data, 'from:(\d+)">Next</a>')
+        next_page = urlparse.urljoin(item.url, next_page) + "/"
+        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page))
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)" class="item.*?data-original="([^"]+)".*?alt="([^"]+)".*?<div class="duration">(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion in matches:
+    patron = '<a href="([^"]+)" class="item.*?'
+    patron += 'data-original="([^"]+)".*?'
+    patron += 'alt="([^"]+)".*?'
+    patron += '<div class="duration">(.*?)</div>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedthumbnail, scrapedtitle, duracion in matches:
         url = scrapedurl
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
         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,'<li class="next"><a href="([^"]+)"')
-    if next_page_url!="#videos":
-        next_page_url = urlparse.urljoin(item.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) )
-    if next_page_url=="#videos":
-        next_page_url = scrapertools.find_single_match(data,'from:(\d+)">Next</a>')
-        next_page_url = urlparse.urljoin(item.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) )
+        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, '<li class="next"><a href="([^"]+)"')
+    if next_page != "#videos":
+        next_page = urlparse.urljoin(item.url, next_page)
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
+    if next_page == "#videos":
+        next_page = scrapertools.find_single_match(data, 'from:(\d+)">Next</a>')
+        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 play(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cache_page(item.url)
+    data = httptools.downloadpage(item.url).data
     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, fulltitle=item.fulltitle, url=media_url,
                          thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
-
-
diff --git a/plugin.video.alfa/channels/xtapes.py b/plugin.video.alfa/channels/xtapes.py
index ab9a3802..2fec2ecc 100644
--- a/plugin.video.alfa/channels/xtapes.py
+++ b/plugin.video.alfa/channels/xtapes.py
@@ -2,27 +2,24 @@
 #------------------------------------------------------------
 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
-from core import tmdb
-from core import jsontools
 
 host = 'http://hd.xtapes.to'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/full-porn-movies/?display=tube&filtre=date"))
-    itemlist.append( Item(channel=item.channel, title="Peliculas Estudio" , action="catalogo", url=host))
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/?filtre=date&cat=0"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistos" , action="peliculas", url=host + "/?display=tube&filtre=views"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorado" , action="peliculas", url=host + "/?display=tube&filtre=rate"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/?display=tube&filtre=duree"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host))
+    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"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorado" , action="lista", url=host + "/?display=tube&filtre=rate"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/?display=tube&filtre=duree"))
+    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"))
     return itemlist
@@ -33,7 +30,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -41,33 +38,17 @@ def search(item, texto):
         return []
 
 
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    if item.title=="Canal":
-        data = scrapertools.get_match(data,'<div class="footer-banner">(.*?)<div id="footer-copyright">')
-    else:
-       data = scrapertools.get_match(data,'<li id="menu-item-16"(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<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="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
-    return itemlist
-
 def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'<a>Categories</a>(.*?)</ul>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    if item.title=="Canal":
+        data = scrapertools.get_match(data,'<div class="footer-banner">(.*?)<div id="footer-copyright">')
+    if item.title=="Productora" :
+       data = scrapertools.get_match(data,'<li id="menu-item-16"(.*?)</ul>')
+    if item.title=="Categorias" :
+       data = scrapertools.get_match(data,'<a>Categories</a>(.*?)</ul>')
     patron  = '<a href="([^"]+)">([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle in matches:
@@ -75,16 +56,19 @@ def categorias(item):
         scrapedthumbnail = ""
         scrapedtitle = scrapedtitle
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li class="border-radius-5 box-shadow">.*?src="([^"]+)".*?<a href="([^"]+)" title="([^"]+)">.*?<div class="time-infos".*?>([^"]+)<span class="time-img">'
+    patron = '<li class="border-radius-5 box-shadow">.*?'
+    patron += 'src="([^"]+)".*?<a href="([^"]+)" title="([^"]+)">.*?'
+    patron += '<div class="time-infos".*?>([^"]+)<span class="time-img">'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedthumbnail,scrapedurl,scrapedtitle,duracion  in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
@@ -93,13 +77,14 @@ def peliculas(item):
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle = title,  contentTitle = contentTitle, infoLabels={'year':year} ))
-    next_page_url = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next video')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        next_page_url = next_page_url.replace("#038;cat=0#038;", "").replace("#038;filtre=views#038;", "").replace("#038;filtre=rate#038;", "").replace("#038;filtre=duree#038;", "")
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        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)
+        next_page = next_page.replace("#038;cat=0#038;", "")
+        next_page = next_page.replace("#038;filtre=views#038;", "").replace("&#038;filtre=rate#038;", "&").replace("#038;filtre=duree#038;", "")
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/xxxdan.py b/plugin.video.alfa/channels/xxxdan.py
index b699bfc8..dc9c7926 100644
--- a/plugin.video.alfa/channels/xxxdan.py
+++ b/plugin.video.alfa/channels/xxxdan.py
@@ -8,20 +8,16 @@ 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
 
 host = 'http://xxxdan.com'
 
-#NO SE REPRODUCE EL VIDEO QUE ENCUENTRA
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/newest"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/popular30"))
-    itemlist.append( Item(channel=item.channel, title="Dururacion" , action="peliculas", url=host + "/longest"))
-    itemlist.append( Item(channel=item.channel, title="HD" , action="peliculas", url=host + "/channel30/hd"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/newest"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/popular30"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest"))
+    itemlist.append( Item(channel=item.channel, title="HD" , action="lista", url=host + "/channel30/hd"))
     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
@@ -32,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search?query=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -40,58 +36,54 @@ def search(item, texto):
         return []
 
 
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'<h3>CLIPS</h3>(.*?)<h3>FILM</h3>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li><a href="([^"]+)" title="">.*?<span class="videos-count">([^"]+)</span><span class="title">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,cantidad,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    return itemlist
-
-
 def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)" rel="tag".*?title="([^"]+)".*?data-original="([^"]+)".*?<span class="score">(\d+)</span>'
+    patron = '<a href="([^"]+)" rel="tag".*?'
+    patron += 'title="([^"]+)".*?'
+    patron += 'data-original="([^"]+)".*?'
+    patron += '<span class="score">(\d+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedurl = scrapedurl.replace("channel", "channel30")
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , fanart=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li><figure>\s*<a href="([^"]+)" class="img\s*" title="([^"]+)".*?data-original="([^"]+)".*?<time datetime="\w+">([^"]+)</time>'
+    
+    
+    patron = '<li><figure>\s*<a href="([^"]+)".*?'
+    patron += 'data-original="([^"]+)".*?'
+    patron += '<time datetime="\w+">([^"]+)</time>'
+    patron += '(.*?)</ul>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,duracion  in matches:
+    for scrapedurl,scrapedthumbnail,duracion,calidad in matches:
         url = scrapedurl
+        scrapedtitle = scrapertools.find_single_match(scrapedurl,'https://xxxdan.com/es/.*?/(.*?).html')
         contentTitle = scrapedtitle
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        if '<li class="hd">' in calidad :
+            title = "[COLOR yellow]" + duracion + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
         thumbnail = scrapedthumbnail
         plot = ""
-        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,'<li><a href="([^"]+)" rel="next">&rarr;</a>')
-    if next_page_url!="":
-        next_page_url = next_page_url.replace("http://xxxdan.com/","")
-        next_page_url = "/" + next_page_url
-        next_page_url = urlparse.urljoin(item.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) )
+        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,'<li><a href="([^"]+)" rel="next">&rarr;</a>')
+    if next_page!="":
+        next_page = next_page.replace("http://xxxdan.com/","")
+        next_page = "/" + 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
 
 
diff --git a/plugin.video.alfa/channels/xxxparodyhd.py b/plugin.video.alfa/channels/xxxparodyhd.py
index 1933b4b6..cccfe07c 100644
--- a/plugin.video.alfa/channels/xxxparodyhd.py
+++ b/plugin.video.alfa/channels/xxxparodyhd.py
@@ -2,7 +2,6 @@
 #------------------------------------------------------------
 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
@@ -12,14 +11,13 @@ from core import tmdb
 
 host = 'https://xxxparodyhd.net'
 
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/genre/new-release/"))
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/movies/"))
-    itemlist.append( Item(channel=item.channel, title="Parodias" , action="peliculas", url=host + "/genre/parodies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/genre/clips-scenes/"))
+    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/genre/clips-scenes/"))
+    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 + "/categories"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
@@ -31,7 +29,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -46,29 +44,34 @@ def categorias(item):
     if item.title == "Canal" :
         data = scrapertools.get_match(data,'>Studios</a>(.*?)</ul>')
     else:
-        data = scrapertools.get_match(data,'<div class=\'sub-container\' style=\'display: none;\'><ul class=\'sub-menu\'>(.*?)</ul>')
+        data = scrapertools.get_match(data,'>Categories</a>(.*?)</ul>')
     patron  = '<a href="([^"]+)">([^<]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = '<div data-movie-id="\d+" class="ml-item">.*?<a href="([^"]+)".*?oldtitle="([^"]+)".*?<img src="([^"]+)".*?rel="tag">(.*?)</a>'
+    patron = '<div data-movie-id="\d+" class="ml-item">.*?'
+    patron += '<a href="([^"]+)".*?'
+    patron += 'oldtitle="([^"]+)".*?'
+    patron += '<img src="([^"]+)".*?rel="tag">(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,year in matches:
+    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedyear in matches:
         scrapedplot = ""
-        scrapedtitle = str(scrapedtitle) + " " + year
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li class=\'active\'>.*?href=\'([^\']+)\'>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        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)
+        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
diff --git a/plugin.video.alfa/channels/xxxstreams.py b/plugin.video.alfa/channels/xxxstreams.py
index e0b8f8f3..6a2bfa68 100644
--- a/plugin.video.alfa/channels/xxxstreams.py
+++ b/plugin.video.alfa/channels/xxxstreams.py
@@ -2,24 +2,21 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://xxxstreams.org'
 
-
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url= host + "/category/full-porn-movie-stream/"))
-    itemlist.append( Item(channel=item.channel, title="Clips" , action="peliculas", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/category/full-porn-movie-stream/"))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url= host + "/category/full-porn-movie-stream/"))
+    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"))
     return itemlist
 
@@ -29,7 +26,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -40,50 +37,63 @@ def search(item, texto):
 def categorias(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
-    patron  = '<li id="menu-item.*?class="menu-item menu-item-type-taxonomy.*?<a href="([^<]+)">(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
+    data = httptools.downloadpage(item.url).data
+    data1 = scrapertools.get_match(data,'<h5>Popular Categories<br />(.*?)</aside>')
+    if item.title == "Canal" :
+        data1 = scrapertools.get_match(data,'>Top sites</a>(.*?)</ul>')
+        data1 += scrapertools.get_match(data,'Downloads</h2>(.*?)</ul>')
+    patron  = '<a href="([^<]+)">([^<]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data1)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
     return itemlist
 
-
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
-    patron  = '<div class="entry-content">.*?<img src="([^"]+)".*?<a href="([^<]+)".*?<span class="screen-reader-text">(.*?)</span>'
+    data = httptools.downloadpage(item.url).data
+    patron = '<div class="entry-content">.*?'
+    patron += '<img src="([^"]+)".*?'
+    patron += '<a href="([^<]+)".*?'
+    patron += '<span class="screen-reader-text">(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next &rarr;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Next page >>" , text_color="blue", url=next_page_url , folder=True) )
+        if '/HD' in scrapedtitle : title= "[COLOR red]" + "HD" + "[/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
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next &rarr;</a>')
+    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) )
     return itemlist
 
 
 def findvideos(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
-    data = scrapertools.get_match(data,'--more--></p>(.*?)/a></p>')
+    data = httptools.downloadpage(item.url).data
+    data = scrapertools.get_match(data,'--more-->(.*?)/a>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a href="([^"]+)".*?class="external">(.*?)<'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, fulltitle=item.title, url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot, folder=True) )
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, fulltitle=item.title,
+                              url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
 def play(item):
     logger.info()
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
diff --git a/plugin.video.alfa/channels/youjizz.py b/plugin.video.alfa/channels/youjizz.py
index 4f2fedf6..d7982fdb 100644
--- a/plugin.video.alfa/channels/youjizz.py
+++ b/plugin.video.alfa/channels/youjizz.py
@@ -1,25 +1,29 @@
 # -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+# ------------------------------------------------------------
+import urlparse
+import urllib2
+import urllib
+import re
+import os
+import sys
 from platformcode import config, logger
 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
 
 host = 'https://www.youjizz.com'
 
+
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/newest-clips/1.html"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/1.html"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top-rated-week/1.html"))
-    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="Nuevas", action="lista", url=host + "/newest-clips/1.html"))
+    itemlist.append(Item(channel=item.channel, title="Popular", action="lista", url=host + "/most-popular/1.html"))
+    itemlist.append(
+        Item(channel=item.channel, title="Mejor valorada", action="lista", url=host + "/top-rated-week/1.html"))
+    itemlist.append(Item(channel=item.channel, title="Categorias", action="categorias", url=host))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
 
@@ -28,7 +32,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/%s-1.html" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -40,49 +44,68 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'<h4>Trending Categories</h4>(.*?)</ul>')
+    data = scrapertools.get_match(data, '<h4>Trending(.*?)</ul>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    itemlist.append( Item(channel=item.channel, action="peliculas", title="Big Tits" , url="https://www.youjizz.com/search/big-tits-1.html?" , folder=True) )
-    patron  = '<li><a href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
+    patron = '<li><a href="([^"]+)">([^"]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
         scrapedtitle = scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        scrapedurl = urlparse.urljoin(item.url, scrapedurl)
+        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, plot=scrapedplot))
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="video-item">.*?class="frame image" href="([^"]+)".*?data-original="([^"]+)" />.*?<div class="video-title">.*?>(.*?)</a>.*?<span class="time">(.*?)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
+    patron = '<div class="video-item">.*?'
+    patron += 'class="frame image" href="([^"]+)".*?'
+    patron += 'data-original="([^"]+)" />.*?'
+    patron += '<div class="video-title">.*?'
+    patron += '>(.*?)</a>.*?'
+    patron += '<span class="time">(.*?)</span>'
+    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
+        quality = ""
+        if '-720-' in scrapedthumbnail:
+            quality = "720"
+        if '-1080-' in scrapedthumbnail:
+            quality = "1080"
+        if quality:
+            title = "[COLOR yellow]" + duracion + "[/COLOR] " + "[COLOR red]" + quality + "p[/COLOR] " + scrapedtitle
         contentTitle = title
         thumbnail = "http:" + scrapedthumbnail
         plot = ""
         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,'<li><a class="pagination-next" href="([^"]+)">Next &raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append(Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
+                             plot=plot, quality=quality, contentTitle=contentTitle))
+    next_page = scrapertools.find_single_match(data, '<li><a class="pagination-next" href="([^"]+)">Next &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))
     return itemlist
 
 
 def play(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cache_page(item.url)
-    media_url = scrapertools.find_single_match(data, '"filename"\:"(.*?)"')
+    data = httptools.downloadpage(item.url).data
+    data = scrapertools.get_match(data, 'var encodings(.*?)var')
+    if '360' in data:
+        patron = '"360".*?"filename"\:"(.*?)"'
+    if '720' in data:
+        patron = '"720".*?"filename"\:"(.*?)"'
+    if '1080' in data:
+        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, fulltitle=item.fulltitle, url=media_url,
                          thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
-
diff --git a/plugin.video.alfa/channels/youporn.py b/plugin.video.alfa/channels/youporn.py
index aa65ff46..44d9fa27 100644
--- a/plugin.video.alfa/channels/youporn.py
+++ b/plugin.video.alfa/channels/youporn.py
@@ -7,19 +7,18 @@ 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
 
 host = 'https://www.youporn.com'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/browse/time/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/browse/views/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top_rated/"))
-    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="catalogo", url=host + "/pornstars/most_popular/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/alphabetical/"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas", action="lista", url=host + "/browse/time/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas", action="lista", url=host + "/browse/views/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada", action="lista", url=host + "/top_rated/"))
+    itemlist.append( Item(channel=item.channel, title="Canal", action="categorias", url=host + "/channels/rating/"))
+    itemlist.append( Item(channel=item.channel, title="Pornstars", action="catalogo", url=host + "/pornstars/most_popular/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias", action="categorias", url=host + "/categories/alphabetical/"))
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -29,7 +28,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host + "/search/?query=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -41,19 +40,23 @@ def catalogo(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'<a href="/pornstars/most_popular/" class="selected">All</a>(.*?)<i class=\'icon-menu-right\'></i></a>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)".*?data-original="([^"]+)".*?<span class="porn-star-name">([^"]+)</span>.*?<span class="video-count">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
+    data1 = scrapertools.get_match(data,'>Most Popular Pornstars<(.*?)<i class=\'icon-menu-right\'></i></a>')
+    patron = '<a href="([^"]+)".*?'
+    patron += 'data-original="([^"]+)".*?'
+    patron += '<span class="porn-star-name">([^"]+)</span>.*?'
+    patron += '<span class="video-count">([^"]+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data1)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)" data-page-number=.*?>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<div class="currentPage".*?<a href="([^"]+)"')
+    if next_page!="":
+        next_page = urlparse.urljoin(item.url,next_page)
+        itemlist.append(item.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=next_page) )
     return itemlist
 
 
@@ -61,25 +64,41 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'<div class=\'row alphabetical\'.*?>(.*?)<h2 class="heading4">Popular by Country</h2>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)".*?data-original="([^"]+)".*?<p>([^"]+)<span>([^"]+)</span>'
+    if item.title == "Canal":
+        data = scrapertools.get_match(data,'>All</div>(.*?)<i class=\'icon-menu-right\'></i></a>')
+    if item.title == "Categorias":
+        data = scrapertools.get_match(data,'<div class=\'row alphabetical\'.*?>(.*?)>Popular by Country</h2>')
+    patron = '<a href="([^"]+)".*?'
+    patron += '<img src=(.*?)>.*?'
+    patron += '>([^<]+) (?:Videos|videos)<'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
+    for scrapedurl,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
-        scrapedthumbnail = "http:" + scrapedthumbnail
-        scrapedtitle = scrapedtitle + " (" + cantidad +")"
+        thumbnail = scrapertools.find_single_match(scrapedthumbnail,'data-original="([^"]+)"') 
+        scrapedtitle = scrapertools.find_single_match(scrapedthumbnail,'alt="([^"]+)"')
+        if scrapedtitle == "" :
+            scrapedtitle = scrapertools.find_single_match(scrapedthumbnail,'alt=\'([^\']+)\'')
+        title = scrapedtitle + " (" + cantidad +")"
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
+                              thumbnail=thumbnail, fanart=thumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<div class="currentPage".*?<a href="([^"]+)"')
+    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) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)" class=\'video-box-image\'.*?data-original="([^"]+)".*?<div class="video-box-title">([^"]+)</div>.*?<div class="video-duration">(.*?)</div>'
+    patron  = '<a href="([^"]+)" class=\'video-box-image\'.*?'
+    patron += 'data-original="([^"]+)".*?'
+    patron += '<div class="video-box-title">([^"]+)</div>.*?'
+    patron += '<div class="video-duration">(.*?)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
@@ -87,12 +106,12 @@ def peliculas(item):
         contentTitle = title
         thumbnail = scrapedthumbnail
         plot = ""
-        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,'<div class="prev-next"><a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        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,'<div class="currentPage".*?<a 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
 
 
diff --git a/plugin.video.alfa/channels/youtube_channel.py b/plugin.video.alfa/channels/youtube_channel.py
index 24dc4368..3ce7ab47 100755
--- a/plugin.video.alfa/channels/youtube_channel.py
+++ b/plugin.video.alfa/channels/youtube_channel.py
@@ -19,7 +19,7 @@ def youtube_api_call(method, parameters):
     url = "https://www.googleapis.com/youtube/v3/" + method + "?" + encoded_parameters + "&key=" + YOUTUBE_V3_API_KEY;
     logger.info("url=" + url)
 
-    data = scrapertools.cache_page(url)
+    data = httptools.downloadpage(url).data
     logger.info("data=" + data)
 
     json_object = jsontools.load(data)
@@ -37,7 +37,7 @@ def youtube_get_user_playlists(user_id, pageToken=""):
                                    {"part": "snippet,contentDetails", "channelId": channel_id, "maxResults": 50,
                                     "pageToken": pageToken})
 
-    return json_object;
+    return json_object
 
 
 def youtube_get_playlist_items(playlist_id, pageToken=""):
diff --git a/plugin.video.alfa/channels/yuuk.py b/plugin.video.alfa/channels/yuuk.py
index 13a1ce44..c423d3be 100644
--- a/plugin.video.alfa/channels/yuuk.py
+++ b/plugin.video.alfa/channels/yuuk.py
@@ -2,21 +2,18 @@
 #------------------------------------------------------------
 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
 from core import httptools
-from core import tmdb
 
 host = 'http://yuuk.net'
 
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/list-genres/"))
     itemlist.append( Item(channel=item.channel, title="Buscar" , action="search"))
     return itemlist
@@ -27,7 +24,7 @@ def search(item, texto):
     texto = texto.replace(" ", "+")
     item.url = host+ "/?s=%s" % texto
     try:
-        return peliculas(item)
+        return lista(item)
     except:
         import sys
         for line in sys.exc_info():
@@ -39,34 +36,40 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    itemlist.append( Item(channel=item.channel, title="Censored" , action="peliculas", url=host + "/category/censored/"))
-    itemlist.append( Item(channel=item.channel, title="Uncensored" , action="peliculas", url=host + "/category/uncensored/"))
-    patron  = '<li><a href="([^"]+)" title="[^"]+"><span>([^"]+)</span><span>([^"]+)</span></a></li>'
+    itemlist.append( Item(channel=item.channel, title="Censored" , action="lista", url=host + "/category/censored/"))
+    itemlist.append( Item(channel=item.channel, title="Uncensored" , action="lista", url=host + "/category/uncensored/"))
+    patron = '<li><a href="([^"]+)" title="[^"]+"><span>([^"]+)</span><span>([^"]+)</span></a></li>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,cantidad in matches:
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
     return itemlist
 
 
-def peliculas(item):
+def lista(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<div class="featured-wrap clearfix">.*?<a href="([^"]+)" title="([^"]+)".*?src="([^"]+)".*?>#([^"]+) Full HD JAV</a>'
+    patron = '<div class="featured-wrap clearfix">.*?'
+    patron += '<a href="([^"]+)" title="([^"]+)".*?'
+    patron += 'src="([^"]+)".*?'
+    patron += '>#([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,calidad in matches:
         scrapedplot = ""
+        calidad = calidad.replace(" Full HD JAV", "")
         scrapedtitle = "[COLOR red]" + calidad + "[/COLOR] " + scrapedtitle
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li><a rel=\'nofollow\' href=\'([^\']+)\' class=\'inactive\'>Next')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.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) )
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
+                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
+    next_page = scrapertools.find_single_match(data,'<li class=\'current\'>.*?<a rel=\'nofollow\' 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) )
 
     return itemlist
 
diff --git a/plugin.video.alfa/channels/zonatorrent.py b/plugin.video.alfa/channels/zonatorrent.py
index 3f08b208..f73bd7e1 100644
--- a/plugin.video.alfa/channels/zonatorrent.py
+++ b/plugin.video.alfa/channels/zonatorrent.py
@@ -353,7 +353,7 @@ def listado(item):
                     item_local.quality += " 3D"
                 else:
                     item_local.quality = "3D"
-                title = re.sub('3D', '', title, flags=re.IGNORECASE)
+                title = re.sub('(?i)3D', '', title)
                 title = title.replace('[]', '')
             if item_local.quality:
                 item_local.quality += ' %s' % scrapertools.find_single_match(title, '\[(.*?)\]')
@@ -418,7 +418,7 @@ def listado(item):
             title = re.sub(r'- $', '', title)
 
             #Limpiamos el título de la basura innecesaria
-            title = re.sub(r'TV|Online|Spanish|Torrent|en Espa\xc3\xb1ol|Español|Latino|Subtitulado|Blurayrip|Bluray rip|\[.*?\]|R2 Pal|\xe3\x80\x90 Descargar Torrent \xe3\x80\x91|Completa|Temporada|Descargar|Torren', '', title, flags=re.IGNORECASE)
+            title = re.sub(r'(?i)TV|Online|Spanish|Torrent|en Espa\xc3\xb1ol|Español|Latino|Subtitulado|Blurayrip|Bluray rip|\[.*?\]|R2 Pal|\xe3\x80\x90 Descargar Torrent \xe3\x80\x91|Completa|Temporada|Descargar|Torren', '', title)
             
             title = title.replace("Dual", "").replace("dual", "").replace("Subtitulada", "").replace("subtitulada", "").replace("Subt", "").replace("subt", "").replace("(Proper)", "").replace("(proper)", "").replace("Proper", "").replace("proper", "").replace("#", "").replace("(Latino)", "").replace("Latino", "").replace("LATINO", "").replace("Spanish", "").replace("Trailer", "").replace("Audio", "")
             title = title.replace("HDTV-Screener", "").replace("DVDSCR", "").replace("TS ALTA", "").replace("- HDRip", "").replace("(HDRip)", "").replace("- Hdrip", "").replace("(microHD)", "").replace("(DVDRip)", "").replace("HDRip", "").replace("(BR-LINE)", "").replace("(HDTS-SCREENER)", "").replace("(BDRip)", "").replace("(BR-Screener)", "").replace("(DVDScreener)", "").replace("TS-Screener", "").replace(" TS", "").replace(" Ts", "").replace(" 480p", "").replace(" 480P", "").replace(" 720p", "").replace(" 720P", "").replace(" 1080p", "").replace(" 1080P", "").replace("DVDRip", "").replace(" Dvd", "").replace(" DVD", "").replace(" V.O", "").replace(" Unrated", "").replace(" UNRATED", "").replace(" unrated", "").replace("screener", "").replace("TS-SCREENER", "").replace("TSScreener", "").replace("HQ", "").replace("AC3 5.1", "").replace("Telesync", "").replace("Line Dubbed", "").replace("line Dubbed", "").replace("LineDuB", "").replace("Line", "").replace("XviD", "").replace("xvid", "").replace("XVID", "").replace("Mic Dubbed", "").replace("HD", "").replace("V2", "").replace("CAM", "").replace("VHS.SCR", "").replace("Dvd5", "").replace("DVD5", "").replace("Iso", "").replace("ISO", "").replace("Reparado", "").replace("reparado", "").replace("DVD9", "").replace("Dvd9", "")
diff --git a/plugin.video.alfa/channels/zonaworld.py b/plugin.video.alfa/channels/zonaworld.py
index 6ad4cc49..903090d8 100644
--- a/plugin.video.alfa/channels/zonaworld.py
+++ b/plugin.video.alfa/channels/zonaworld.py
@@ -33,8 +33,8 @@ def mainlist(item):
     itemlist.append(Item(channel=item.channel, title="Todas", action="list_all", url=host + 'pelicula/',
                          thumbnail=get_thumb('all', auto=True)))
 
-    itemlist.append(Item(channel=item.channel, title="Generos", action="section", section='genre',
-                         thumbnail=get_thumb('genres', auto=True)))
+    # itemlist.append(Item(channel=item.channel, title="Generos", action="section", section='genre',
+    #                      thumbnail=get_thumb('genres', auto=True)))
 
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + '?s=',
                          thumbnail=get_thumb('search', auto=True)))
@@ -48,7 +48,6 @@ def get_source(url):
     logger.info()
     data = httptools.downloadpage(url).data
     data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    logger.debug(data)
     return data
 
 
@@ -56,43 +55,45 @@ def list_all(item):
     logger.info()
     itemlist = []
 
-    try:
-        patron = '<article id="post-.*?<a href="([^"]+)">.*?"Langu">([^<]+)<.*?src="([^"]+)".*?'
-        patron += '<h3 class="Title">([^<]+)<\/h3>.*?date_range">(\d{4})<'
-        data = get_source(item.url)
-        matches = re.compile(patron, re.DOTALL).findall(data)
+    #try:
+    data = get_source(item.url)
 
-        for scrapedurl, language, scrapedthumbnail, scrapedtitle, year in matches:
+    patron = '<article id="post-.*?<a href="([^"]+)">.*?"Langu">([^ ]+) .*?<.*?src="([^"]+)".*?'
+    patron += '<h3 class="Title">([^<]+)<\/h3>.*?date_range">(\d{4})<'
 
-            url = scrapedurl
-            if "|" in scrapedtitle:
-                scrapedtitle = scrapedtitle.split("|")
-                contentTitle = scrapedtitle[0].strip()
-            else:
-                contentTitle = scrapedtitle
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
-            contentTitle = re.sub('\(.*?\)', '', contentTitle)
+    for scrapedurl, language, scrapedthumbnail, scrapedtitle, year in matches:
 
-            title = '%s [%s]' % (contentTitle, year)
-            thumbnail = 'http:' + scrapedthumbnail
-            itemlist.append(Item(channel=item.channel, action='findvideos',
-                                 title=title,
-                                 url=url,
-                                 thumbnail=thumbnail,
-                                 contentTitle=contentTitle,
-                                 language=IDIOMAS[language],
-                                 infoLabels={'year': year}
-                                 ))
-        tmdb.set_infoLabels_itemlist(itemlist, True)
+        url = scrapedurl
+        if "|" in scrapedtitle:
+            scrapedtitle = scrapedtitle.split("|")
+            contentTitle = scrapedtitle[0].strip()
+        else:
+            contentTitle = scrapedtitle
 
-        #  Paginación
+        contentTitle = re.sub('\(.*?\)', '', contentTitle)
 
-        url_next_page = scrapertools.find_single_match(data, '<a class="next page-numbers" href="([^"]+)">')
-        if url_next_page:
-            itemlist.append(Item(channel=item.channel, title="Siguiente >>", url=url_next_page, action='list_all',
-                                 section=item.section))
-    except:
-        pass
+        title = '%s [%s]' % (contentTitle, year)
+        thumbnail = 'http:' + scrapedthumbnail
+        itemlist.append(Item(channel=item.channel, action='findvideos',
+                             title=title,
+                             url=url,
+                             thumbnail=thumbnail,
+                             contentTitle=contentTitle,
+                             language=IDIOMAS[language],
+                             infoLabels={'year': year}
+                             ))
+    tmdb.set_infoLabels_itemlist(itemlist, True)
+
+    #  Paginación
+
+    url_next_page = scrapertools.find_single_match(data, '<a class="next page-numbers" href="([^"]+)">')
+    if url_next_page:
+        itemlist.append(Item(channel=item.channel, title="Siguiente >>", url=url_next_page, action='list_all',
+                             section=item.section))
+    #except:
+    #    pass
     return itemlist
 
 def search_results(item):
@@ -100,7 +101,7 @@ def search_results(item):
     itemlist = []
 
     try:
-        patron = '<article id="post-.*?<a href="([^"]+)">.*?src="([^"]+)".*?"Langu">([^<]+)<.*?'
+        patron = '<article id="post-.*?<a href="([^"]+)">.*?src="([^"]+)".*?"Langu">([^ ]+) .*?<.*?'
         patron += '<h3 class="Title">([^<]+)<\/h3>.*?date_range">(\d{4})<'
         data = get_source(item.url)
         matches = re.compile(patron, re.DOTALL).findall(data)
@@ -169,7 +170,7 @@ def findvideos(item):
         data_video = get_source(scrapedurl)
         opt_data = scrapertools.find_single_match(data, '"%s"><span>.*?</span>.*?<span>([^<]+)</span>' %
                                                   option).split('-')
-        language = opt_data[0].strip()
+        language = scrapertools.find_single_match(opt_data[0].strip(), '([^ ]+) ')
         quality = opt_data[1].strip()
         quality = re.sub('Full|HD', '', quality).strip()
         if 'rip' in quality.lower():
diff --git a/plugin.video.alfa/core/httptools.py b/plugin.video.alfa/core/httptools.py
index 03d8fd29..d846c118 100644
--- a/plugin.video.alfa/core/httptools.py
+++ b/plugin.video.alfa/core/httptools.py
@@ -99,7 +99,7 @@ load_cookies()
 
 
 def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=True, cookies=True, replace_headers=False,
-                 add_referer=False, only_headers=False, bypass_cloudflare=True, count_retries=0, random_headers=False, ignore_response_code=False):
+                 add_referer=False, only_headers=False, bypass_cloudflare=True, count_retries=0, random_headers=False, ignore_response_code=False, alfa_s=False):
     """
     Abre una url y retorna los datos obtenidos
 
@@ -164,22 +164,23 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
     if timeout is None and HTTPTOOLS_DEFAULT_DOWNLOAD_TIMEOUT is not None: timeout = HTTPTOOLS_DEFAULT_DOWNLOAD_TIMEOUT
     if timeout == 0: timeout = None
 
-    logger.info("----------------------------------------------")
-    logger.info("downloadpage Alfa: %s" %__version)
-    logger.info("----------------------------------------------")
-    logger.info("Timeout: %s" % timeout)
-    logger.info("URL: " + url)
-    logger.info("Dominio: " + urlparse.urlparse(url)[1])
-    if post:
-        logger.info("Peticion: POST")
-    else:
-        logger.info("Peticion: GET")
-    logger.info("Usar Cookies: %s" % cookies)
-    logger.info("Descargar Pagina: %s" % (not only_headers))
-    logger.info("Fichero de Cookies: " + ficherocookies)
-    logger.info("Headers:")
-    for header in request_headers:
-        logger.info("- %s: %s" % (header, request_headers[header]))
+    if not alfa_s:
+        logger.info("----------------------------------------------")
+        logger.info("downloadpage Alfa: %s" %__version)
+        logger.info("----------------------------------------------")
+        logger.info("Timeout: %s" % timeout)
+        logger.info("URL: " + url)
+        logger.info("Dominio: " + urlparse.urlparse(url)[1])
+        if post:
+            logger.info("Peticion: POST")
+        else:
+            logger.info("Peticion: GET")
+            logger.info("Usar Cookies: %s" % cookies)
+            logger.info("Descargar Pagina: %s" % (not only_headers))
+            logger.info("Fichero de Cookies: " + ficherocookies)
+            logger.info("Headers:")
+            for header in request_headers:
+                logger.info("- %s: %s" % (header, request_headers[header]))
 
     # Handlers
     handlers = [urllib2.HTTPHandler(debuglevel=False)]
@@ -192,7 +193,8 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
 
     opener = urllib2.build_opener(*handlers)
 
-    logger.info("Realizando Peticion")
+    if not alfa_s:
+        logger.info("Realizando Peticion")
 
     # Contador
     inicio = time.time()
@@ -243,15 +245,17 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
         response["time"] = time.time() - inicio
         response["url"] = handle.geturl()
 
-    logger.info("Terminado en %.2f segundos" % (response["time"]))
-    logger.info("Response sucess: %s" % (response["sucess"]))
-    logger.info("Response code: %s" % (response["code"]))
-    logger.info("Response error: %s" % (response["error"]))
-    logger.info("Response data length: %s" % (len(response["data"])))
-    logger.info("Response headers:")
+    if not alfa_s:
+        logger.info("Terminado en %.2f segundos" % (response["time"]))
+        logger.info("Response sucess: %s" % (response["sucess"]))
+        logger.info("Response code: %s" % (response["code"]))
+        logger.info("Response error: %s" % (response["error"]))
+        logger.info("Response data length: %s" % (len(response["data"])))
+        logger.info("Response headers:")
     server_cloudflare = ""
     for header in response["headers"]:
-        logger.info("- %s: %s" % (header, response["headers"][header]))
+        if not alfa_s:
+            logger.info("- %s: %s" % (header, response["headers"][header]))
         if "cloudflare" in response["headers"][header]:
             server_cloudflare = "cloudflare"
 
@@ -266,22 +270,27 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
     if cookies:
         save_cookies()
 
-    logger.info("Encoding: %s" % (response["headers"].get('content-encoding')))
+    if not alfa_s:
+        logger.info("Encoding: %s" % (response["headers"].get('content-encoding')))
 
     if response["headers"].get('content-encoding') == 'gzip':
-        logger.info("Descomprimiendo...")
+        if not alfa_s:
+            logger.info("Descomprimiendo...")
         data_alt = response["data"]
         try:
             response["data"] = gzip.GzipFile(fileobj=StringIO(response["data"])).read()
-            logger.info("Descomprimido")
+            if not alfa_s:
+                logger.info("Descomprimido")
         except:
-            logger.info("No se ha podido descomprimir con gzip.  Intentando con zlib")
+            if not alfa_s:
+                logger.info("No se ha podido descomprimir con gzip.  Intentando con zlib")
             response["data"] = data_alt
             try:
                 import zlib
                 response["data"] = zlib.decompressobj(16 + zlib.MAX_WBITS).decompress(response["data"])
             except:
-                logger.info("No se ha podido descomprimir con zlib")
+                if not alfa_s:
+                    logger.info("No se ha podido descomprimir con zlib")
                 response["data"] = data_alt
 
     # Anti Cloudflare
@@ -289,11 +298,14 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
         cf = Cloudflare(response)
         if cf.is_cloudflare:
             count_retries += 1
-            logger.info("cloudflare detectado, esperando %s segundos..." % cf.wait_time)
+            if not alfa_s:
+                logger.info("cloudflare detectado, esperando %s segundos..." % cf.wait_time)
             auth_url = cf.get_url()
-            logger.info("Autorizando... intento %d url: %s" % (count_retries, auth_url))
+            if not alfa_s:
+                logger.info("Autorizando... intento %d url: %s" % (count_retries, auth_url))
             if downloadpage(auth_url, headers=request_headers, replace_headers=True, count_retries=count_retries).sucess:
-                logger.info("Autorización correcta, descargando página")
+                if not alfa_s:
+                    logger.info("Autorización correcta, descargando página")
                 resp = downloadpage(url=response["url"], post=post, headers=headers, timeout=timeout,
                                     follow_redirects=follow_redirects,
                                     cookies=cookies, replace_headers=replace_headers, add_referer=add_referer)
@@ -305,7 +317,8 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
                 response["time"] = resp.time
                 response["url"] = resp.url
             else:
-                logger.info("No se ha podido autorizar")
+                if not alfa_s:
+                    logger.info("No se ha podido autorizar")
 
     return type('HTTPResponse', (), response)
     
diff --git a/plugin.video.alfa/core/scraper.py b/plugin.video.alfa/core/scraper.py
index ea229982..7f02a470 100755
--- a/plugin.video.alfa/core/scraper.py
+++ b/plugin.video.alfa/core/scraper.py
@@ -151,7 +151,7 @@ def cuadro_completar(item):
                           'default': mediatype_default,
                           'enabled': True,
                           'visible': True,
-                          'lvalues': [config.get_localized_string(60244), config.get_localized_string(60245)]
+                          'lvalues': [config.get_localized_string(60244), config.get_localized_string(70136)]
                           }]
 
     for i, c in enumerate(controls):
diff --git a/plugin.video.alfa/core/servertools.py b/plugin.video.alfa/core/servertools.py
index 7b80331d..64b5030c 100644
--- a/plugin.video.alfa/core/servertools.py
+++ b/plugin.video.alfa/core/servertools.py
@@ -144,17 +144,16 @@ def findvideos(data, skip=False):
     for serverid in servers_list:
         if not is_server_enabled(serverid):
             continue
-        if config.get_setting("black_list", server=serverid):
+        if config.get_setting("filter_servers") == True and config.get_setting("black_list", server=serverid):
             is_filter_servers = True
             continue
-
         devuelve.extend(findvideosbyserver(data, serverid))
         if skip and len(devuelve) >= skip:
             devuelve = devuelve[:skip]
             break
-
+    if config.get_setting("filter_servers") == False:  is_filter_servers = False
     if not devuelve and is_filter_servers:
-        platformtools.dialog_ok(config.get_localized_string(60001))
+        platformtools.dialog_ok(config.get_localized_string(60000), config.get_localized_string(60001))
 
     return devuelve
 
@@ -166,7 +165,6 @@ def findvideosbyserver(data, serverid):
 
     server_parameters = get_server_parameters(serverid)
     devuelve = []
-
     if "find_videos" in server_parameters:
         # Recorre los patrones
         for pattern in server_parameters["find_videos"].get("patterns", []):
diff --git a/plugin.video.alfa/core/tmdb.py b/plugin.video.alfa/core/tmdb.py
index 72c709e5..a72bea42 100644
--- a/plugin.video.alfa/core/tmdb.py
+++ b/plugin.video.alfa/core/tmdb.py
@@ -455,7 +455,7 @@ def find_and_set_infoLabels(item):
         title = item.contentTitle
     else:
         tipo_busqueda = "tv"
-        tipo_contenido = config.get_localized_string(70529)
+        tipo_contenido = config.get_localized_string(60245)
         title = item.contentSerieName
 
     # Si el titulo incluye el (año) se lo quitamos
@@ -478,7 +478,7 @@ def find_and_set_infoLabels(item):
     if len(results) > 1:
         from platformcode import platformtools
         tmdb_result = platformtools.show_video_info(results, item=item,
-                                                    caption="[%s]: Selecciona la %s correcta" % (title, tipo_contenido))
+                                                    caption=config.get_localized_string(60247) %(title, tipo_contenido))
     elif len(results) > 0:
         tmdb_result = results[0]
 
diff --git a/plugin.video.alfa/core/videolibrarytools.py b/plugin.video.alfa/core/videolibrarytools.py
index e062b43a..d3619863 100644
--- a/plugin.video.alfa/core/videolibrarytools.py
+++ b/plugin.video.alfa/core/videolibrarytools.py
@@ -394,11 +394,11 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
         p_dialog = platformtools.dialog_progress(config.get_localized_string(20000), config.get_localized_string(60064))
         p_dialog.update(0, config.get_localized_string(60065))
 
-    channel_alt = generictools.verify_channel(serie.channel)                        #Preparamos para añadir las urls de emergencia
+    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
     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
+    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
     
@@ -420,28 +420,29 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
             if emergency_urls_stat == 1 and not e.emergency_urls and e.contentType == 'episode':     #Guardamos urls de emergencia?
                 if not silent:
                     p_dialog.update(0, 'Cacheando enlaces y archivos .torrent...', e.title)     #progress dialog
-                if json_path in ficheros:                                                       #Si existe el .json sacamos de ahí las urls
-                    if overwrite:                                                               #pero solo si se se sobrescriben los .json
+                if json_path in ficheros:                                   #Si existe el .json sacamos de ahí las urls
+                    if overwrite:                                           #pero solo si se se sobrescriben los .json
                         json_epi = Item().fromjson(filetools.read(json_path))                   #Leemos el .json
-                        if json_epi.emergency_urls:                                             #si existen las urls de emergencia...
+                        if json_epi.emergency_urls:                         #si existen las urls de emergencia...
                             e.emergency_urls = json_epi.emergency_urls                          #... las copiamos
                         else:                                                                   #y si no...
                             e = emergency_urls(e, channel, json_path)                           #... las generamos
                 else:
-                    e = emergency_urls(e, channel, json_path)                                   #Si el episodio no existe, generamos las urls
+                    e = emergency_urls(e, channel, json_path)               #Si el episodio no existe, generamos las urls
                 if e.emergency_urls:                                                            #Si ya tenemos urls...
-                    emergency_urls_succ = True                                                  #... es un éxito y vamos a marcar el .nfo
+                    emergency_urls_succ = True                              #... es un éxito y vamos a marcar el .nfo
             elif emergency_urls_stat == 2 and e.contentType == 'episode':                       #Borramos urls de emergencia?
                 if e.emergency_urls: del e.emergency_urls
-                emergency_urls_succ = True                                                      #... es un éxito y vamos a marcar el .nfo
-            elif emergency_urls_stat == 3 and e.contentType == 'episode':                       #Actualizamos urls de emergencia?
+                emergency_urls_succ = True                                  #... es un éxito y vamos a marcar el .nfo
+            elif emergency_urls_stat == 3 and e.contentType == 'episode':   #Actualizamos urls de emergencia?
                 if not silent:
                     p_dialog.update(0, 'Cacheando enlaces y archivos .torrent...', e.title)     #progress dialog
                 e = emergency_urls(e, channel, json_path)                                       #generamos las urls
                 if e.emergency_urls:                                                            #Si ya tenemos urls...
-                    emergency_urls_succ = True                                                  #... es un éxito y vamos a marcar el .nfo
+                    emergency_urls_succ = True                              #... es un éxito y vamos a marcar el .nfo
             
-            e.infoLabels = serie.infoLabels
+            if not e.infoLabels["tmdb_id"] or (serie.infoLabels["tmdb_id"] and e.infoLabels["tmdb_id"] != serie.infoLabels["tmdb_id"]):                         #en series multicanal, prevalece el infolabels...
+                e.infoLabels = serie.infoLabels                             #... del canal actual y no el del original
             e.contentSeason, e.contentEpisodeNumber = season_episode.split("x")
             new_episodelist.append(e)
         except:
@@ -503,6 +504,8 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
 
             item_nfo = e.clone(channel="videolibrary", url="", action='findvideos',
                                strm_path=strm_path.replace(TVSHOWS_PATH, ""))
+            if item_nfo.emergency_urls:
+                del item_nfo.emergency_urls                     #Solo se mantiene en el .json del episodio
 
             nfo_exists = filetools.write(nfo_path, head_nfo + item_nfo.tojson())
 
@@ -513,7 +516,8 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
                 if not item_nfo:
                     head_nfo, item_nfo = read_nfo(nfo_path)
 
-                e.infoLabels = item_nfo.infoLabels
+                if not e.infoLabels["tmdb_id"] or (item_nfo.infoLabels["tmdb_id"] and e.infoLabels["tmdb_id"] != item_nfo.infoLabels["tmdb_id"]):                         #en series multicanal, prevalece el infolabels...
+                    e.infoLabels = item_nfo.infoLabels          #... del canal actual y no el del original
 
                 if filetools.write(json_path, e.tojson()):
                     if not json_exists:
@@ -734,24 +738,28 @@ def emergency_urls(item, channel=None, path=None):
     """
     #lanazamos un "lookup" en el "findvideos" del canal para obtener los enlaces de emergencia
     try:
-        if channel == None:                                                 #Si el llamador no ha aportado la estructura de channel, se crea
+        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])
         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
+            channel_save = item.channel                 #... guarda el canal original por si hay fail-over en Newpct1
             item_res = getattr(channel, 'findvideos')(item)                 #... se procesa Findvideos
-            item_res.channel = channel_save                                 #... restaura el canal original por si hay fail-over en Newpct1
+            item_res.channel = channel_save             #... restaura el canal original por si hay fail-over en Newpct1
             item_res.category = channel_save.capitalize()                   #... y la categoría
             del item_res.videolibray_emergency_urls                         #... y se borra la marca de lookup
     except:
         logger.error('ERROR al procesar el título en Findvideos del Canal: ' + item.channel + ' / ' + item.title)
         logger.error(traceback.format_exc())
-        item_res = item.clone()                                             #Si ha habido un error, se devuelve el Item original
+        item_res = item.clone()                         #Si ha habido un error, se devuelve el Item original
+        if item_res.videolibray_emergency_urls:
+            del item_res.videolibray_emergency_urls                         #... y se borra la marca de lookup
     
     #Si el usuario ha activado la opción "emergency_urls_torrents", se descargarán los archivos .torrent de cada título
     else:                                                                   #Si se han cacheado con éxito los enlaces...
         try:
+            referer = None
+            post = None
             channel_bis = generictools.verify_channel(item.channel)
             if config.get_setting("emergency_urls_torrents", channel_bis) and item_res.emergency_urls and path != None:
                 videolibrary_path = config.get_videolibrary_path()          #detectamos el path absoluto del título
@@ -763,93 +771,149 @@ def emergency_urls(item, channel=None, path=None):
                     folder = series
                 videolibrary_path = filetools.join(videolibrary_path, folder)
                 i = 1
+                if item_res.referer: referer = item_res.referer
+                if item_res.post: post = item_res.post
                 for url in item_res.emergency_urls[0]:                      #Recorremos las urls de emergencia...
                     torrents_path = re.sub(r'(?:\.\w+$)', '_%s.torrent' % str(i).zfill(2), path)
-                    path_real = caching_torrents(url, torrents_path=torrents_path)      #...  para descargar los .torrents
+                    path_real = caching_torrents(url, referer, post, torrents_path=torrents_path)      #...  para descargar los .torrents
                     if path_real:                                           #Si ha tenido éxito...
                         item_res.emergency_urls[0][i-1] = path_real.replace(videolibrary_path, '')  #se guarda el "path" relativo
                     i += 1
+                    
+                #Restauramos variables originales
+                if item.referer:
+                    item_res.referer = item.referer
+                elif item_res.referer:
+                    del item_res.referer
+                if item.referer:
+                    item_res.referer = item.referer
+                elif item_res.referer:
+                    del item_res.referer
+                item_res.url = item.url
+                
         except:
             logger.error('ERROR al cachear el .torrent de: ' + item.channel + ' / ' + item.title)
             logger.error(traceback.format_exc())
-            item_res = item.clone()                                         #Si ha habido un error, se devuelve el Item original
+            item_res = item.clone()                             #Si ha habido un error, se devuelve el Item original
 
     #logger.debug(item_res.emergency_urls)
-    return item_res                                                         #Devolvemos el Item actualizado con los enlaces de emergencia
+    return item_res                                             #Devolvemos el Item actualizado con los enlaces de emergencia
     
     
-def caching_torrents(url, torrents_path=None, timeout=10, lookup=False, data_torrent=False):
+def caching_torrents(url, referer=None, post=None, torrents_path=None, timeout=10, lookup=False, data_torrent=False):
     if torrents_path != None:
         logger.info("path = " + torrents_path)
     else:
         logger.info()
+    if referer and post:
+        logger.info('REFERER: ' + referer)
     import urllib
     import re
     from core import httptools
     torrent_file = ''
+    headers = {'Content-Type': 'application/x-www-form-urlencoded', 'Referer': referer} #Necesario para el Post del .Torrent
     
     """
     Descarga en el path recibido el .torrent de la url recibida, y pasa el decode
     Devuelve el path real del .torrent, o el path vacío si la operación no ha tenido éxito
     """
     
+    videolibrary_path = config.get_videolibrary_path()              #Calculamos el path absoluto a partir de la Videoteca
     if torrents_path == None:
-        videolibrary_path = config.get_videolibrary_path()                          #Calculamos el path absoluto a partir de la Videoteca
         if not videolibrary_path:
             torrents_path = ''
             if data_torrent:
                 return (torrents_path, torrent_file)
-            return torrents_path                                                    #Si hay un error, devolvemos el "path" vacío
+            return torrents_path                                        #Si hay un error, devolvemos el "path" vacío
         torrents_path = filetools.join(videolibrary_path, 'temp_torrents_Alfa', 'cliente_torrent_Alfa.torrent')    #path de descarga temporal
     if '.torrent' not in torrents_path:
-        torrents_path += '.torrent'                                                 #path para dejar el .torrent
-    torrents_path_encode = filetools.encode(torrents_path)                          #encode utf-8 del path
+        torrents_path += '.torrent'                                     #path para dejar el .torrent
+    torrents_path_encode = filetools.encode(torrents_path)              #encode utf-8 del path
     
-    if url.endswith(".rar") or url.startswith("magnet:"):                           #No es un archivo .torrent
+    if url.endswith(".rar") or url.startswith("magnet:"):               #No es un archivo .torrent
         logger.error('No es un archivo Torrent: ' + url)
         torrents_path = ''
         if data_torrent:
             return (torrents_path, torrent_file)
-        return torrents_path                                                        #Si hay un error, devolvemos el "path" vacío
+        return torrents_path                                            #Si hay un error, devolvemos el "path" vacío
     
     try:
-        response = httptools.downloadpage(url, timeout=timeout)                     #Descargamos el .torrent
+        #Descargamos el .torrent
+        if referer and post:                                            #Descarga con POST
+            response = httptools.downloadpage(url, headers=headers, post=post, follow_redirects=False, timeout=timeout)
+        else:                                                           #Descarga sin post
+            response = httptools.downloadpage(url, timeout=timeout)
         if not response.sucess:
             logger.error('Archivo .torrent no encontrado: ' + url)
             torrents_path = ''
             if data_torrent:
                 return (torrents_path, torrent_file)
-            return torrents_path                                                    #Si hay un error, devolvemos el "path" vacío
+            return torrents_path                                        #Si hay un error, devolvemos el "path" vacío
         torrent_file = response.data
 
-        if "used CloudFlare" in torrent_file:                                       #Si tiene CloudFlare, usamos este proceso
+        if "used CloudFlare" in torrent_file:                           #Si tiene CloudFlare, usamos este proceso
             response = httptools.downloadpage("http://anonymouse.org/cgi-bin/anon-www.cgi/" + url.strip(), timeout=timeout)
             if not response.sucess:
                 logger.error('Archivo .torrent no encontrado: ' + url)
                 torrents_path = ''
                 if data_torrent:
                     return (torrents_path, torrent_file)
-                return torrents_path                                                #Si hay un error, devolvemos el "path" vacío
+                return torrents_path                                    #Si hay un error, devolvemos el "path" vacío
             torrent_file = response.data
         
-        if not scrapertools.find_single_match(torrent_file, '^d\d+:.*?\d+:'):       #No es un archivo .torrent (RAR, ZIP, HTML,..., vacío)
+        #Si es un archivo .ZIP tratamos de extraer el contenido
+        if torrent_file.startswith("PK"):
+            logger.info('Es un archivo .ZIP: ' + url)
+            
+            torrents_path_zip = filetools.join(videolibrary_path, 'temp_torrents_zip')  #Carpeta de trabajo
+            torrents_path_zip = filetools.encode(torrents_path_zip)
+            torrents_path_zip_file = filetools.join(torrents_path_zip, 'temp_torrents_zip.zip')     #Nombre del .zip
+            
+            import time
+            filetools.rmdirtree(torrents_path_zip)                      #Borramos la carpeta temporal
+            time.sleep(1)                                               #Hay que esperar, porque si no da error
+            filetools.mkdir(torrents_path_zip)                          #La creamos de nuevo
+            
+            if filetools.write(torrents_path_zip_file, torrent_file):   #Salvamos el .zip
+                torrent_file = ''                                       #Borramos el contenido en memoria
+                try:                                                    #Extraemos el .zip
+                    from core import ziptools
+                    unzipper = ziptools.ziptools()
+                    unzipper.extract(torrents_path_zip_file, torrents_path_zip)
+                except:
+                    import xbmc
+                    xbmc.executebuiltin('XBMC.Extract("%s", "%s")' % (torrents_path_zip_file, torrents_path_zip))
+                    time.sleep(1)
+                
+                import os
+                for root, folders, files in os.walk(torrents_path_zip): #Recorremos la carpeta para leer el .torrent
+                    for file in files:
+                        if file.endswith(".torrent"):
+                            input_file = filetools.join(root, file)                 #nombre del .torrent
+                            torrent_file = filetools.read(input_file)               #leemos el .torrent
+
+            filetools.rmdirtree(torrents_path_zip)                                  #Borramos la carpeta temporal
+
+        #Si no es un archivo .torrent (RAR, HTML,..., vacío) damos error
+        if not scrapertools.find_single_match(torrent_file, '^d\d+:.*?\d+:'):
             logger.error('No es un archivo Torrent: ' + url)
             torrents_path = ''
             if data_torrent:
                 return (torrents_path, torrent_file)
-            return torrents_path                                                    #Si hay un error, devolvemos el "path" vacío
+            return torrents_path                                            #Si hay un error, devolvemos el "path" vacío
         
+        #Salvamos el .torrent
         if not lookup:
-            if not filetools.write(torrents_path_encode, torrent_file):             #Salvamos el .torrent
+            if not filetools.write(torrents_path_encode, torrent_file):
                 logger.error('ERROR: Archivo .torrent no escrito: ' + torrents_path_encode)
-                torrents_path = ''                                                  #Si hay un error, devolvemos el "path" vacío
-                torrent_file = ''                                                   #... y el buffer del .torrent
+                torrents_path = ''                                          #Si hay un error, devolvemos el "path" vacío
+                torrent_file = ''                                           #... y el buffer del .torrent
                 if data_torrent:
                     return (torrents_path, torrent_file)
                 return torrents_path
     except:
-        torrents_path = ''                                                          #Si hay un error, devolvemos el "path" vacío
-        torrent_file = ''                                                           #... y el buffer del .torrent
+        torrents_path = ''                                                  #Si hay un error, devolvemos el "path" vacío
+        torrent_file = ''                                                   #... y el buffer del .torrent
         logger.error('Error en el proceso de descarga del .torrent: ' + url + ' / ' + torrents_path_encode)
         logger.error(traceback.format_exc())
     
diff --git a/plugin.video.alfa/core/ziptools.py b/plugin.video.alfa/core/ziptools.py
index 204a11ac..8a688a9c 100755
--- a/plugin.video.alfa/core/ziptools.py
+++ b/plugin.video.alfa/core/ziptools.py
@@ -22,8 +22,9 @@ class ziptools:
             self._createstructure(file, dir)
         num_files = len(zf.namelist())
 
-        for name in zf.namelist():
-            logger.info("name=%s" % name)
+        for nameo in zf.namelist():
+            name = nameo.replace(':', '_').replace('<', '_').replace('>', '_').replace('|', '_').replace('"', '_').replace('?', '_').replace('*', '_')
+            logger.info("name=%s" % nameo)
             if not name.endswith('/'):
                 logger.info("no es un directorio")
                 try:
@@ -62,9 +63,9 @@ class ziptools:
                             shutil.copy2(outfilename, os.path.join(backup, os.path.basename(outfilename)))
 
                     outfile = open(outfilename, 'wb')
-                    outfile.write(zf.read(name))
+                    outfile.write(zf.read(nameo))
                 except:
-                    logger.error("Error en fichero " + name)
+                    logger.error("Error en fichero " + nameo)
 
     def _createstructure(self, file, dir):
         self._makedirs(self._listdirs(file), dir)
diff --git a/plugin.video.alfa/lib/alfaresolver.py b/plugin.video.alfa/lib/alfaresolver.py
index f1e25c19..6c2703c9 100644
--- a/plugin.video.alfa/lib/alfaresolver.py
+++ b/plugin.video.alfa/lib/alfaresolver.py
@@ -1 +1 @@
-import base64; exec(base64.b64decode('import marshal
exec(marshal.loads(base64.b64decode('YwAAAAAAAAAAGQAAAEAAAABz0gAAAGQAAGQBAGwAAFoAAGQAAGQBAGwBAFoBAGQAAGQBAGwCAFoCAGQAAGQBAGwDAFoDAGQAAGQCAGwEAG0FAFoFAAFkAwBlBgBmAQBkBACEAACDAABZWgcAZAUAhAAAWggAZAYAhAAAWgkAZAcAhAAAWgoAZAgAhAAAWgsAZwAAZAkAZAoAZAsAZAwAZA0AZA4AZA8AZBAAZBEAZBIAZA0AZBMAZA0AZAoAZBQAZBUAZBEAZBYAZBcAZBgAZA0AZBYAZBkAZBoAZxgAZwIAWgwAZAEAUygbAAAAaf////9OKAEAAAB0BgAAAGxvZ2dlcnQGAAAAbGwxbDExYwAAAAAAAAAAAgAAAEIAAABzLwAAAGUAAFoBAGQAAIQAAFoCAGQBAIQAAFoDAGQCAGQDAIQBAFoEAGQEAIQAAFoFAFJTKAUAAABjAgAAAAcAAAAFAAAAQwAAAHPFAwAAfAEAfAAAXwAAZAEAfAAAXwEAZwAAfAAAXwIAfAAAagMAgwAAXAIAfAAAXwQAfAAAXwUAfAAAagQAcsEDdAYAagcAZAIAfAAAagEAFoMBAGoIAHwAAGoAAIMBAH0CAHjUAHQJAHwCAIMBAERdxgBcAgB9AwB9BAB8BABkAwAZZAMAIGQEAGsCAHKeAHwAAGoKAHwEAGQDABmDAQBuBwB8BABkAwAZfQUAfAAAagsAdAwAfAQAZAUAGWQGAIMCAHwFAIMCAH0GAGQHAHwGAGsHAHL6AHwAAGoAAGoNAHwEAGQIABlkBwB8BgAXZAcAF4MCAHwAAF8AAHFrAGQJAHwGAGsHAHItAXwAAGoAAGoNAHwEAGQIABlkCQB8BgAXZAkAF4MCAHwAAF8AAHFrAGQAAFNxawBXdAYAagcAZAoAfAAAagEAFoMBAGoIAHwAAGoAAIMBAH0CAHjUAHQJAHwCAIMBAERdxgBcAgB9AwB9BAB8BABkAwAZZAMAIGQEAGsCAHKXAXwAAGoKAHwEAGQDABmDAQBuBwB8BABkAwAZfQUAfAAAagsAdAwAfAQAZAUAGWQGAIMCAHwFAIMCAH0GAGQHAHwGAGsHAHLzAXwAAGoAAGoNAHwEAGQIABlkCwB8BgAXZAsAF4MCAHwAAF8AAHFkAWQJAHwGAGsHAHImAnwAAGoAAGoNAHwEAGQIABlkDAB8BgAXZAwAF4MCAHwAAF8AAHFkAWQAAFNxZAFXdAYAagcAZA0AfAAAagEAFoMBAGoIAHwAAGoAAIMBAH0CAHijAHQJAHwCAIMBAERdlQBcAgB9AwB9BAB8AABqCwB0DAB8BABkBQAZZAYAgwIAZAEAgwIAfQYAZAcAfAYAawcAcrsCfAAAagAAag0AfAQAZAgAGWQHAHwGABdkBwAXgwIAfAAAXwAAcV0CZAkAfAYAawcAcu4CfAAAagAAag0AfAQAZAgAGWQJAHwGABdkCQAXgwIAfAAAXwAAcV0CZAAAU3FdAld0BgBqBwBkDgB8AABqAQAWgwEAaggAfAAAagAAgwEAfQIAeKYAdAkAfAIAgwEARF2VAFwCAH0DAH0EAHwAAGoLAHQMAHwEAGQFABlkBgCDAgBkAQCDAgB9BgBkBwB8BgBrBwBygwN8AABqAABqDQB8BABkCAAZZAsAfAYAF2QLABeDAgB8AABfAABxJQNkCQB8BgBrBwBytgN8AABqAABqDQB8BABkCAAZZAwAfAYAF2QMABeDAgB8AABfAABxJQNkAABTcSUDV24AAGQAAFMoDwAAAE50AAAAAHMeAAAAKCVzXCgnKFteJ10qKScsXHMqJyhbXiddKiknXCkpaQIAAABzAgAAAFx4aQEAAABpEAAAAHQBAAAAJ2kAAAAAdAEAAAAicyIAAAAoJXNcKFxcJyguKj8pXFwnLFxzKlxcJyguKj8pXFwnXCkpcwIAAABcJ3MCAAAAXCJzEQAAACglc1woJyhbXiddKiknXCkpcxMAAAAoJXNcKFxcJyguKj8pXFwnXCkpKA4AAAB0BAAAAGRhdGF0BwAAAGZ1bmNpb250BQAAAGxpc3RhdAYAAABsMTFsbGx0BgAAAGxsbGxsbHQDAAAAbXNndAIAAAByZXQHAAAAY29tcGlsZXQHAAAAZmluZGFsbHQJAAAAZW51bWVyYXRldAUAAAB1bmhleHQGAAAAbDFsbDFsdAMAAABpbnR0BwAAAHJlcGxhY2UoBwAAAHQEAAAAc2VsZlIFAAAAdAYAAABsbGxsMTF0AQAAAGl0BQAAAG1hdGNodAEAAAB4dAUAAAB2YWxvcigAAAAAKAAAAABzCAAAADxzdHJpbmc+dAgAAABfX2luaXRfXygAAABzTgAAAAABCQIJAQkCGAMJAiIBGQExAR8CDAEnAQwBJwMIAyIBGQExAR8CDAEnAQwBJwMIAyIBGQEfAgwBJwEMAScDCAMiARkBHwIMAScBDAEnA2MBAAAABwAAAAUAAABDAAAAcwACAAB0AABqAQBkAQB8AABqAgCDAgB9AQB8AQBzJQB0AwBkAgBmAgBTfAEAagQAZAMAgwEAfQIAfAEAagQAZAQAgwEAagUAZAUAgwEAfAAAXwYAeDcAdAcAfAAAagYAgwEARF0mAFwCAH0DAH0EAHwEAGoIAIMAAGQDAGQGACF8AABqBgB8AwA8cV8AV3wAAGoGAGQHABlkBAAgZAgAawIActkAeDYAdAcAfAAAagYAgwEARF0iAFwCAH0DAH0EAHwAAGoJAHwEAIMBAHwAAGoGAHwDADxxsABXbgAAfAAAagIAagoAfAEAagQAZAcAgwEAZAIAgwIAfAAAXwIAdAAAagEAZAkAfAIAFnwAAGoCAGQKAHQAAGoLAIMCAX0BAHwBAHMsAXQDAGQCAGYCAFN0DAB8AQBqBABkAwCDAQBkBwCDAgB9BQB8AABqAgBqCgB8AQBqBABkBwCDAQBkAgCDAgB8AABfAgB4MAB0DQB8BQCDAQBEXSIAfQYAfAAAagYAag4AfAAAagYAag8AZAcAgwEAgwEAAXFyAVd0AABqAQBkCwB8AABqAgCDAgB9AQB8AQBzvQF0AwBkAgBmAgBTfAEAagQAZAMAgwEAaggAgwAAfAAAXxAAfAAAagIAagoAfAEAagQAZAcAgwEAZAIAgwIAfAAAXwIAdBEAZAIAZgIAUygMAAAATnMaAAAAdmFyIChcdyopXHMqPVxzKlxbKC4qPylcXTtSAgAAAGkBAAAAaQIAAAB0AQAAACxp/////2kAAAAAcwIAAABceHMlAAAAXChmdW5jdGlvblwoLio/fVwoJXMsXHMqKFteXCldKilcKVwpO3QFAAAAZmxhZ3NzbgAAAHZhciAoXHcqKVxzKj1ccypmdW5jdGlvblxzKlwoXHMqW14sXSosXHMqW15cKV0qXClccypcey4qP1x9XHMqZWxzZVx7XHMqXHcqXHMqPVxzKlx3KjtccypcfVxzKnJldHVybiBcdyo7XHMqXH07KBIAAABSCwAAAHQGAAAAc2VhcmNoUgUAAAB0BQAAAEZhbHNldAUAAABncm91cHQFAAAAc3BsaXRSBwAAAFIOAAAAdAUAAABzdHJpcFIPAAAAUhIAAAB0BgAAAERPVEFMTFIRAAAAdAUAAAByYW5nZXQGAAAAYXBwZW5kdAMAAABwb3BSBgAAAHQEAAAAVHJ1ZSgHAAAAUhMAAAB0AQAAAG10BgAAAG5vbWJyZVIVAAAAdAEAAAB2dAYAAABudW1lcm9SFwAAACgAAAAAKAAAAABzCAAAADxzdHJpbmc+UggAAABrAAAAczAAAAAABBUBBgAKAg8BGwEcAB4CFwEcAB0CIQYiAQYACgIYAiECEwAgBRUBBgAKAhgCIQJSAgAAAGMDAAAACwAAAAgAAABDAAAAc7wBAAB0AAB8AABqAQB8AQAZgwEAfQMAdAIAagMAfAMAgwEAfQMAZAEAfQQAeEQAdAQAdAUAfAMAgwEAgwEARF0wAH0FAHwEAGQCAGQDAHQGAHQHAHwDAHwFABmDAQCDAQBkBAAfF2QFAB8XN30EAHE7AFd0CAB0CQBqCgB8BACDAQBkBgCDAgB9AwB8AgBkAQBrAgBylwB8AwBTdAQAZAcAgwEAfQYAZAgAfQcAZAEAfQgAeGAAdAQAZAcAgwEARF1SAH0FAHwHAHwGAHwFABkXdAcAfAIAfAUAdAUAfAIAgwEAFhmDAQAXZAcAFn0HAHwGAHwFABl9CQB8BgB8BwAZfAYAfAUAPHwJAHwGAHwHADxxvABXZAgAfQoAZAgAfQcAeI4AdAQAdAUAfAMAgwEAgwEARF16AH0FAHwKAGQJABdkBwAWfQoAfAcAfAYAfAoAGRdkBwAWfQcAfAYAfAoAGX0JAHwGAHwHABl8BgB8CgA8fAkAfAYAfAcAPHwIAHQLAHQHAHwDAHwFABmDAQB8BgB8BgB8CgAZfAYAfAcAGRdkBwAWGUGDAQA3fQgAcTEBV3wIAGoMAGQGAIMBAFMoCgAAAE5SAgAAAHQBAAAAJXQCAAAAMDBpAgAAAGn+////dAQAAAB1dGY4aQABAABpAAAAAGkBAAAAKA0AAAB0AwAAAHN0clIHAAAAdAYAAABiYXNlNjR0CQAAAGI2NGRlY29kZVIiAAAAdAMAAABsZW50AwAAAGhleHQDAAAAb3JkdAcAAAB1bmljb2RldAYAAAB1cmxsaWJ0BwAAAHVucXVvdGV0BgAAAHVuaWNocnQGAAAAZW5jb2RlKAsAAABSEwAAAHQDAAAAbnVtdAEAAABzdAEAAAByUhcAAAB0AQAAAHl0AQAAAHR0AQAAAHV0AQAAAHdSKAAAAHQBAAAAQSgAAAAAKAAAAABzCAAAADxzdHJpbmc+UhAAAACXAAAAczQAAAAAARMCDwIGARkBLgIYAQwABAIMAQYABgETASoBCgEOAQ4CBgAGARkBDgESAQoBDgEKATYCYwIAAAACAAAABAAAAEMAAABzFgAAAHQAAGoBAGQBAGQCAIQAAHwBAIMDAFMoAwAAAE5zEwAAAFxceFthLWYwLTldW2EtZjAtOV1jAQAAAAEAAAACAAAAUwAAAHMXAAAAfAAAagAAgwAAZAEAH2oBAGQCAIMBAFMoAwAAAE5pAgAAAFIxAAAAKAIAAABSHgAAAHQGAAAAZGVjb2RlKAEAAABSJgAAACgAAAAAKAAAAABzCAAAADxzdHJpbmc+dAgAAAA8bGFtYmRhProAAABzAAAAACgCAAAAUgsAAAB0AwAAAHN1YigCAAAAUhMAAAB0AwAAAHR4dCgAAAAAKAAAAABzCAAAADxzdHJpbmc+Ug8AAAC5AAAAcwIAAAAAASgGAAAAdAgAAABfX25hbWVfX3QKAAAAX19tb2R1bGVfX1IZAAAAUggAAABSEAAAAFIPAAAAKAAAAAAoAAAAACgAAAAAcwgAAAA8c3RyaW5nPlIBAAAAJgAAAHMIAAAABgIJQwksDCJjAAAAAAQAAAAIAAAAQwAAAHN7AAAAZAEAdAAAawcAchAAdAEAU2QCAGQAAGwCAH0AAHwAAGoDAGQDAIMBAH0BAHhJAHQEAERdQQB9AgB8AQB0BQBqBgBkBABqBwBnAAB8AgBEXRIAfQMAdAgAfAMAgwEAXgIAcU4AgwEAgwEAawIAcjIAdAkAU3EyAFd0AQBTKAUAAABOcw8AAABhbGZhcmVzb2x2ZXIucHlp/////3MUAAAAQ29udGFpbmVyLlBsdWdpbk5hbWVSAgAAACgKAAAAdAgAAABfX2ZpbGVfX1IdAAAAdAQAAAB4Ym1jdAwAAABnZXRJbmZvTGFiZWx0AgAAAGwxUi4AAABSLwAAAHQEAAAAam9pbnQDAAAAY2hyUiUAAAAoBAAAAFJHAAAAdAEAAABhUhcAAABSOwAAACgAAAAAKAAAAABzCAAAADxzdHJpbmc+dAYAAABsbDExMWzBAAAAcxAAAAAAAQwABAEMAQ8BDQE3AAgBYwEAAAAEAAAAAwAAAEMAAABzzAAAAHQAAGoBAGQBAIMBAGoCAHwAAIMBAH0BAHQDAHwBAIMBAGQCAGsEAHJbAHQEAHwBAGQCABlkAgAZZAMAgwIAfQIAdAQAfAEAZAIAGWQEABlkAwCDAgB9AwBuZwB0AABqAQBkBQCDAQBqAgB8AACDAQB9AQB0AwB8AQCDAQBkAgBrBABytgB0BAB8AQBkAgAZZAIAGWQGAIMCAH0CAHQEAHwBAGQCABlkBAAZZAYAgwIAfQMAbgwAZAIAfQIAZAIAfQMAfAIAfAMAZgIAUygHAAAATnMnAAAAMHgoWzAtOWEtZkEtRl0rKVxzKixccyoweChbMC05YS1mQS1GXSspaQAAAABpEAAAAGkBAAAAcxQAAABccyooXGQrKVxzKixccyooXGQrKWkKAAAAKAUAAABSCwAAAFIMAAAAUg0AAABSMAAAAFIRAAAAKAQAAABSQwAAAFIUAAAAdAUAAABkZXNkZVI4AAAAKAAAAAAoAAAAAHMIAAAAPHN0cmluZz50BgAAAGxsbDExbMwAAABzFgAAAAABGAESARcBGgIYARIBFwEaAgYBBgFjAgAAAA8AAAAGAAAAQwAAAHNTAgAAdAAAgwAAcw0AfAAAU3QBAGoCAGQBAIMBAGoDAHwBAIMBAH0CAHwCAHM8AHQEAGoFAHwBAIMBAAF8AABTdAYAfAIAZAIAGYMBAH0DAHwDAGoHAHNmAHQEAGoFAHwBAIMBAAF8AABTdAEAagIAZAMAdAEAaggAgwIAagMAfAAAgwEAZAIAGX0EAHwEAGQAAGQAAGQEAIUDABl9BQB0AQBqCQBkBQBkBgB8AwBqCgCDAwB8AwBfCgB4NQBkBwBkCABkCQBkCgBkCwBnBQBEXR4AfQYAfAMAagoAagsAfAYAZAwAgwIAfAMAXwoAccwAV3QBAGoCAGQNAIMBAGoDAHwDAGoKAIMBAH0CAHwCAHIoAXQMAHwCAGQCABmDAQBcAgB9BwB9CABuRgB0AQBqAgBkDgCDAQBqAwB8AwBqCgCDAQB9AgB8AgByYgF0DAB8AgBkAgAZgwEAXAIAfQcAfQgAbgwAZAIAfQcAZAIAfQgAfAcAZAIAawIAcoQBfAUAfAgAH24TAHwFAHwHACB8BQB8BwB8CAAXHxd9CQB0DQB8CQCDAQB9CgB0AQBqAgBkDwCDAQBqAwB8AwBqCgCDAQB9AgB8AgByNwJ4bQB8AgBEXWIAXAQAfQsAfQwAfQ0AfQ4AfA0AZBAAawIAcs4BfAsAfA4AawIAcs4BfAoAdA4AfAwAgwEAGXwKAHQOAHwLAIMBABkCfAoAdA4AfAsAgwEAPHwKAHQOAHwMAIMBADxxzgFxzgFXbgAAdAEAagkAfAQAZBEAag8AfAoAgwEAfAAAgwMAUygSAAAATnMoAAAAKHZhciBcdytccyo9XHMqXFsuKj9cXTtcKGZ1bmN0aW9uXCguKj8pCmkAAAAAcw0AAABbMC05YS16XXs0MCx9af////9zCAAAAFxzKlwrXHMqdAEAAAArcwkAAABzcGwnKydpY2VzCQAAAHMnKydwbGljZXMJAAAAc3AnKydsaWNlcwkAAABzcGxpJysnY2VzCQAAAHNwbGljJysnZXQGAAAAc3BsaWNlcxMAAABcLnNwbGljZVwoKFteKV0rKVwpcxcAAABcWydzcGxpY2UnXF1cKChbXildKylcKXNMAAAAXHcrXFsoXGQrKVxdXHMqPVxzKlx3K1wuc3BsaWNlXHMqXCgoXGQrKVxzKixccyooXGQrKVxzKixccypcdytcWyhcZCspXF1ccypcKXQBAAAAMVICAAAAKBAAAABSTQAAAFILAAAAUgwAAABSDQAAAFIAAAAAdAQAAABpbmZvUgEAAABSCQAAAHQKAAAASUdOT1JFQ0FTRVJCAAAAUgUAAABSEgAAAFJPAAAAdAQAAABsaXN0UhEAAABSSgAAACgPAAAAdAMAAAB1cmxSBQAAAFIUAAAAdAMAAABuZXR0BgAAAGxsbDFsMXQGAAAAbGxsMWxsdAMAAAByZXBSTgAAAFI4AAAAUhcAAABSOgAAAHQDAAAAdW5vdAMAAABkb3N0AwAAAHRhbXQDAAAAZmluKAAAAAAoAAAAAHMIAAAAPHN0cmluZz50EAAAAGRlY29kZV92aWRlb191cmzcAAAAcz4AAAAAAwkABAQYAQYBDQEEAhABCQENAQQIIgETAxsDHAEcAxsBBgEZAhsBBgEZAgYABgEsBAwCGwEGARkBGAE/A2MBAAAACwAAAAYAAABDAAAAczsBAAB0AACDAABzDQBkAQBTdAEAagIAZAIAgwEAagMAfAAAgwEAfQEAfAEAczwAdAQAagUAfAAAgwEAAWQBAFN0BgB8AQBkAwAZgwEAfQIAfAIAagcAc2YAdAQAagUAfAAAgwEAAWQBAFN0AQBqCABkBABkBQCEAAB8AgBqCQCDAwB8AgBfCQB0AQBqAgBkBgCDAQBqAwB8AgBqCQCDAQB9AwB0CgB8AwCDAQB9BAB0AQBqAgBkBwBkCAB0AQBqCwCDAQFqAwB8AgBqCQCDAQB9BQB0CgB8BQCDAQB9BgBpAAB9BwB4UwB8BgBEXUsAfQgAfAgAfAQAawYAcgQBfAQAfAgAGW4DAGQBAH0JAHQBAGoIAGQJAGQKAHwGAHwIABmDAwB9CgB8CQB8CgBnAgB8BwB8CAA8cegAV3wHAFMoCwAAAE5SAgAAAHMoAAAAKHZhciBcdytccyo9XHMqXFsuKj9cXTtcKGZ1bmN0aW9uXCguKj8pCmkAAAAAcxIAAABwXFsweChbYS1mMC05XSspXF1jAQAAAAEAAAAFAAAAUwAAAHMkAAAAZAEAdAAAdAEAfAAAagIAZAIAgwEAZAMAgwIAgwEAF2QEABdTKAUAAABOcwIAAABwW2kBAAAAaRAAAAB0AQAAAF0oAwAAAFItAAAAUhEAAABSHgAAACgBAAAAUiYAAAAoAAAAACgAAAAAcwgAAAA8c3RyaW5nPlJBAAAALgEAAHMAAAAAcyEAAABwXFsoXGQrKVxdXFsndCdcXVxzKj1ccyonKFteJ10qKSdzJwAAAHBcWyhcZCspXF1cWydsJ1xdXHMqPS4qP3JldHVybiAoW147XSopO1IbAAAAcw4AAAAoXzB4W2EtZjAtOV0rKXQGAAAAX2NvZGVfKAwAAABSTQAAAFILAAAAUgwAAABSDQAAAFIAAAAAUlMAAABSAQAAAFIJAAAAUkIAAABSBQAAAHQEAAAAZGljdFIhAAAAKAsAAABSBQAAAFIUAAAAUlcAAAB0AgAAAHB0dAMAAABkcHR0AgAAAHBsdAMAAABkcGx0AQAAAHBSOAAAAFI8AAAAdAEAAABsKAAAAAAoAAAAAHMIAAAAPHN0cmluZz50EAAAAGhkZnVsbF9wcm92aWRlcnMYAQAAcyoAAAAAAwkABAQYAQYBDQEEAhABCQENAQQHHgIbAQwCJAEMAgYBDQEcARkBFAJpYwAAAGlHAAAAaXgAAABpMQAAAGlaAAAAaTIAAABpbAAAAGl1AAAAaUwAAABpbgAAAGlwAAAAaVYAAABpdgAAAGltAAAAaUYAAABpcwAAAGlFAAAAaT0AAAAoDQAAAFILAAAAdAMAAABzeXNSLgAAAFI0AAAAdAwAAABwbGF0Zm9ybWNvZGVSAAAAAHQGAAAAb2JqZWN0UgEAAABSTQAAAFJPAAAAUl8AAABSaQAAAFJJAAAAKAAAAAAoAAAAACgAAAAAcwgAAAA8c3RyaW5nPnQIAAAAPG1vZHVsZT4DAAAAcw4AAAAwARAiFpsJCwkQCTwJJw==')))'))
\ No newline at end of file
+import base64; exec(base64.b64decode('import marshal
exec(marshal.loads(base64.b64decode('YwAAAAAAAAAAGQAAAEAAAABzHgEAAGQAAGQBAGwAAFoAAGQAAGQBAGwBAFoBAGQAAGQBAGwCAFoCAGQAAGQBAGwDAFoDAGQAAGQBAGwEAFoEAGQAAGQBAGwFAFoFAGQAAGQCAGwGAG0HAFoHAAFkAABkAwBsBgBtCABaCAABZAQAWgkAZAUAWgoAZAYAWgsAZAcAZQwAZgEAZAgAhAAAgwAAWVoNAGQJAIQAAFoOAGQKAIQAAFoPAGQLAIQAAFoQAGQMAIQAAFoRAGQNAIQAAFoSAGQOAIQAAFoTAGcAAGQPAGQQAGQRAGQSAGQTAGQUAGQVAGQWAGQXAGQYAGQTAGQZAGQTAGQQAGQaAGQbAGQXAGQcAGQdAGQeAGQTAGQcAGQfAGQgAGcYAGcCAFoUAGQBAFMoIQAAAGn/////TigBAAAAdAYAAABjb25maWcoAQAAAHQGAAAAbG9nZ2VyaQwAAABpBAAAAGnjBwAAdAYAAABsbDExbGxjAAAAAAAAAAACAAAAQgAAAHMvAAAAZQAAWgEAZAAAhAAAWgIAZAEAhAAAWgMAZAIAZAMAhAEAWgQAZAQAhAAAWgUAUlMoBQAAAGMCAAAABwAAAAUAAABDAAAAc8UDAAB8AQB8AABfAABkAQB8AABfAQBnAAB8AABfAgB8AABqAwCDAABcAgB8AABfBAB8AABfBQB8AABqBABywQN0BgBqBwBkAgB8AABqAQAWgwEAaggAfAAAagAAgwEAfQIAeNQAdAkAfAIAgwEARF3GAFwCAH0DAH0EAHwEAGQDABlkAwAgZAQAawIAcp4AfAAAagoAfAQAZAMAGYMBAG4HAHwEAGQDABl9BQB8AABqCwB0DAB8BABkBQAZZAYAgwIAfAUAgwIAfQYAZAcAfAYAawcAcvoAfAAAagAAag0AfAQAZAgAGWQHAHwGABdkBwAXgwIAfAAAXwAAcWsAZAkAfAYAawcAci0BfAAAagAAag0AfAQAZAgAGWQJAHwGABdkCQAXgwIAfAAAXwAAcWsAZAAAU3FrAFd0BgBqBwBkCgB8AABqAQAWgwEAaggAfAAAagAAgwEAfQIAeNQAdAkAfAIAgwEARF3GAFwCAH0DAH0EAHwEAGQDABlkAwAgZAQAawIAcpcBfAAAagoAfAQAZAMAGYMBAG4HAHwEAGQDABl9BQB8AABqCwB0DAB8BABkBQAZZAYAgwIAfAUAgwIAfQYAZAcAfAYAawcAcvMBfAAAagAAag0AfAQAZAgAGWQLAHwGABdkCwAXgwIAfAAAXwAAcWQBZAkAfAYAawcAciYCfAAAagAAag0AfAQAZAgAGWQMAHwGABdkDAAXgwIAfAAAXwAAcWQBZAAAU3FkAVd0BgBqBwBkDQB8AABqAQAWgwEAaggAfAAAagAAgwEAfQIAeKMAdAkAfAIAgwEARF2VAFwCAH0DAH0EAHwAAGoLAHQMAHwEAGQFABlkBgCDAgBkAQCDAgB9BgBkBwB8BgBrBwByuwJ8AABqAABqDQB8BABkCAAZZAcAfAYAF2QHABeDAgB8AABfAABxXQJkCQB8BgBrBwBy7gJ8AABqAABqDQB8BABkCAAZZAkAfAYAF2QJABeDAgB8AABfAABxXQJkAABTcV0CV3QGAGoHAGQOAHwAAGoBABaDAQBqCAB8AABqAACDAQB9AgB4pgB0CQB8AgCDAQBEXZUAXAIAfQMAfQQAfAAAagsAdAwAfAQAZAUAGWQGAIMCAGQBAIMCAH0GAGQHAHwGAGsHAHKDA3wAAGoAAGoNAHwEAGQIABlkCwB8BgAXZAsAF4MCAHwAAF8AAHElA2QJAHwGAGsHAHK2A3wAAGoAAGoNAHwEAGQIABlkDAB8BgAXZAwAF4MCAHwAAF8AAHElA2QAAFNxJQNXbgAAZAAAUygPAAAATnQAAAAAcx4AAAAoJXNcKCcoW14nXSopJyxccyonKFteJ10qKSdcKSlpAgAAAHMCAAAAXHhpAQAAAGkQAAAAdAEAAAAnaQAAAAB0AQAAACJzIgAAACglc1woXFwnKC4qPylcXCcsXHMqXFwnKC4qPylcXCdcKSlzAgAAAFwncwIAAABcInMRAAAAKCVzXCgnKFteJ10qKSdcKSlzEwAAACglc1woXFwnKC4qPylcXCdcKSkoDgAAAHQEAAAAZGF0YXQHAAAAZnVuY2lvbnQFAAAAbGlzdGF0BgAAAGwxMTFsbHQGAAAAbDExbDExdAMAAABtc2d0AgAAAHJldAcAAABjb21waWxldAcAAABmaW5kYWxsdAkAAABlbnVtZXJhdGV0BQAAAHVuaGV4dAYAAABsbGwxbGx0AwAAAGludHQHAAAAcmVwbGFjZSgHAAAAdAQAAABzZWxmUgYAAAB0BgAAAGwxMTExMXQBAAAAaXQFAAAAbWF0Y2h0AQAAAHh0BQAAAHZhbG9yKAAAAAAoAAAAAHMIAAAAPHN0cmluZz50CAAAAF9faW5pdF9fMgAAAHNOAAAAAAEJAgkBCQIYAwkCIgEZATEBHwIMAScBDAEnAwgDIgEZATEBHwIMAScBDAEnAwgDIgEZAR8CDAEnAQwBJwMIAyIBGQEfAgwBJwEMAScDYwEAAAAHAAAABQAAAEMAAABzAAIAAHQAAGoBAGQBAHwAAGoCAIMCAH0BAHwBAHMlAHQDAGQCAGYCAFN8AQBqBABkAwCDAQB9AgB8AQBqBABkBACDAQBqBQBkBQCDAQB8AABfBgB4NwB0BwB8AABqBgCDAQBEXSYAXAIAfQMAfQQAfAQAaggAgwAAZAMAZAYAIXwAAGoGAHwDADxxXwBXfAAAagYAZAcAGWQEACBkCABrAgBy2QB4NgB0BwB8AABqBgCDAQBEXSIAXAIAfQMAfQQAfAAAagkAfAQAgwEAfAAAagYAfAMAPHGwAFduAAB8AABqAgBqCgB8AQBqBABkBwCDAQBkAgCDAgB8AABfAgB0AABqAQBkCQB8AgAWfAAAagIAZAoAdAAAagsAgwIBfQEAfAEAcywBdAMAZAIAZgIAU3QMAHwBAGoEAGQDAIMBAGQHAIMCAH0FAHwAAGoCAGoKAHwBAGoEAGQHAIMBAGQCAIMCAHwAAF8CAHgwAHQNAHwFAIMBAERdIgB9BgB8AABqBgBqDgB8AABqBgBqDwBkBwCDAQCDAQABcXIBV3QAAGoBAGQLAHwAAGoCAIMCAH0BAHwBAHO9AXQDAGQCAGYCAFN8AQBqBABkAwCDAQBqCACDAAB8AABfEAB8AABqAgBqCgB8AQBqBABkBwCDAQBkAgCDAgB8AABfAgB0EQBkAgBmAgBTKAwAAABOcxoAAAB2YXIgKFx3Kilccyo9XHMqXFsoLio/KVxdO1IDAAAAaQEAAABpAgAAAHQBAAAALGn/////aQAAAABzAgAAAFx4cyUAAABcKGZ1bmN0aW9uXCguKj99XCglcyxccyooW15cKV0qKVwpXCk7dAUAAABmbGFnc3NuAAAAdmFyIChcdyopXHMqPVxzKmZ1bmN0aW9uXHMqXChccypbXixdKixccypbXlwpXSpcKVxzKlx7Lio/XH1ccyplbHNlXHtccypcdypccyo9XHMqXHcqO1xzKlx9XHMqcmV0dXJuIFx3KjtccypcfTsoEgAAAFIMAAAAdAYAAABzZWFyY2hSBgAAAHQFAAAARmFsc2V0BQAAAGdyb3VwdAUAAABzcGxpdFIIAAAAUg8AAAB0BQAAAHN0cmlwUhAAAABSEwAAAHQGAAAARE9UQUxMUhIAAAB0BQAAAHJhbmdldAYAAABhcHBlbmR0AwAAAHBvcFIHAAAAdAQAAABUcnVlKAcAAABSFAAAAHQBAAAAbXQGAAAAbm9tYnJlUhYAAAB0AQAAAHZ0BgAAAG51bWVyb1IYAAAAKAAAAAAoAAAAAHMIAAAAPHN0cmluZz5SCQAAAHUAAABzMAAAAAAEFQEGAAoCDwEbARwAHgIXARwAHQIhBiIBBgAKAhgCIQITACAFFQEGAAoCGAIhAlIDAAAAYwMAAAALAAAACAAAAEMAAABzvAEAAHQAAHwAAGoBAHwBABmDAQB9AwB0AgBqAwB8AwCDAQB9AwBkAQB9BAB4RAB0BAB0BQB8AwCDAQCDAQBEXTAAfQUAfAQAZAIAZAMAdAYAdAcAfAMAfAUAGYMBAIMBAGQEAB8XZAUAHxc3fQQAcTsAV3QIAHQJAGoKAHwEAIMBAGQGAIMCAH0DAHwCAGQBAGsCAHKXAHwDAFN0BABkBwCDAQB9BgBkCAB9BwBkAQB9CAB4YAB0BABkBwCDAQBEXVIAfQUAfAcAfAYAfAUAGRd0BwB8AgB8BQB0BQB8AgCDAQAWGYMBABdkBwAWfQcAfAYAfAUAGX0JAHwGAHwHABl8BgB8BQA8fAkAfAYAfAcAPHG8AFdkCAB9CgBkCAB9BwB4jgB0BAB0BQB8AwCDAQCDAQBEXXoAfQUAfAoAZAkAF2QHABZ9CgB8BwB8BgB8CgAZF2QHABZ9BwB8BgB8CgAZfQkAfAYAfAcAGXwGAHwKADx8CQB8BgB8BwA8fAgAdAsAdAcAfAMAfAUAGYMBAHwGAHwGAHwKABl8BgB8BwAZF2QHABYZQYMBADd9CABxMQFXfAgAagwAZAYAgwEAUygKAAAATlIDAAAAdAEAAAAldAIAAAAwMGkCAAAAaf7///90BAAAAHV0ZjhpAAEAAGkAAAAAaQEAAAAoDQAAAHQDAAAAc3RyUggAAAB0BgAAAGJhc2U2NHQJAAAAYjY0ZGVjb2RlUiMAAAB0AwAAAGxlbnQDAAAAaGV4dAMAAABvcmR0BwAAAHVuaWNvZGV0BgAAAHVybGxpYnQHAAAAdW5xdW90ZXQGAAAAdW5pY2hydAYAAABlbmNvZGUoCwAAAFIUAAAAdAMAAABudW10AQAAAHN0AQAAAHJSGAAAAHQBAAAAeXQBAAAAdHQBAAAAdXQBAAAAd1IpAAAAdAEAAABBKAAAAAAoAAAAAHMIAAAAPHN0cmluZz5SEQAAAKEAAABzNAAAAAABEwIPAgYBGQEuAhgBDAAEAgwBBgAGARMBKgEKAQ4BDgIGAAYBGQEOARIBCgEOAQoBNgJjAgAAAAIAAAAEAAAAQwAAAHMWAAAAdAAAagEAZAEAZAIAhAAAfAEAgwMAUygDAAAATnMTAAAAXFx4W2EtZjAtOV1bYS1mMC05XWMBAAAAAQAAAAIAAABTAAAAcxcAAAB8AABqAACDAABkAQAfagEAZAIAgwEAUygDAAAATmkCAAAAUjIAAAAoAgAAAFIfAAAAdAYAAABkZWNvZGUoAQAAAFInAAAAKAAAAAAoAAAAAHMIAAAAPHN0cmluZz50CAAAADxsYW1iZGE+xAAAAHMAAAAAKAIAAABSDAAAAHQDAAAAc3ViKAIAAABSFAAAAHQDAAAAdHh0KAAAAAAoAAAAAHMIAAAAPHN0cmluZz5SEAAAAMMAAABzAgAAAAABKAYAAAB0CAAAAF9fbmFtZV9fdAoAAABfX21vZHVsZV9fUhoAAABSCQAAAFIRAAAAUhAAAAAoAAAAACgAAAAAKAAAAABzCAAAADxzdHJpbmc+UgIAAAAwAAAAcwgAAAAGAglDCSwMImMAAAAAAwAAAAIAAABDAAAAc0YAAABkAQBkAABsAAB9AAB8AABqAQCDAABqAgBkAgCDAQB9AQB0AwBqBABkAwAZfQIAfAEAZAQAawMAcj4AdAUAU3QGAFNkAABTKAUAAABOaf////90BgAAAGF1dGhvcmkAAAAAcwoAAABBbGZhIEFkZG9uKAcAAAB0CQAAAHhibWNhZGRvbnQFAAAAQWRkb250DAAAAGdldEFkZG9uSW5mb3QDAAAAc3lzdAQAAABhcmd2Uh4AAABSJgAAACgDAAAAUkgAAABSRwAAAHQKAAAAYWRkb25fbmFtZSgAAAAAKAAAAABzCAAAADxzdHJpbmc+dAcAAAB1cGRhdGVkzAAAAHMMAAAAAAIMARUBDQIMAQQCYwAAAAALAAAABQAAAEMAAABzLwEAAGQBAGQAAGwAAH0AAGQBAGQAAGwBAH0BAGQBAGQAAGwCAH0CAHQDAH0DAHQEAGoEAGoFAIMAAH0EAHwBAGoGAHwCAGoHAGQCAGQDAIMAAWoIAGQEAIMBAIMBAH0FAHQJAGoKAGoLAHwFAGQFAGQGAIMDAH0GAGQHAHQMAHwGAIMBAGoNAIMAAGsHAHIrAXwEAGoOAHQOAGsFAHIrAXwEAGoPAHQPAGsFAHIrAXwEAGoQAHQQAGsFAHIrAXwDAAxyKwFkCAB9BwBkCQBkEAAXZAwAF2QRABdkDQAXfQgAeEgAdBEAfAAAahIAfAYAZA4AZA8AgwEBgwEARF0oAFwCAH0JAH0KAHQTAGoUAGoVAHwKAGoWAHwHAHwIAIMCAIMBAAFx+QBXcSsBbgAAZAAAUygSAAAATmn/////dAIAAABpZHMRAAAAcGx1Z2luLnZpZGVvLmFsZmF0BAAAAFBhdGh0DAAAAHBsYXRmb3JtY29kZXMQAAAAcGxhdGZvcm10b29scy5weXMlAAAAZnJvbSBsaWIuYWxmYXJlc29sdmVyIGltcG9ydCBnZXRfaW5mb3MnAAAAIyBzZSBvYnRpZW5lIGxhIGluZm9ybWFjacOzbiBkZWwgdmlkZW8ucygAAAAjIHNlIG9idGllbmUgbGEgaW5mb3JtYWNpw7NuIGRlbCB2aWRlby4KdAEAAAAgaQQAAABzJgAAAGZyb20gbGliLmFsZmFyZXNvbHZlciBpbXBvcnQgZ2V0X2luZm8KcxsAAABtZWRpYXVybD1nZXRfaW5mbyhtZWRpYXVybCl0BwAAAGlucGxhY2VpAQAAAHMEAAAAICAgIHMEAAAAICAgICgXAAAAdAkAAABmaWxlaW5wdXR0BAAAAHhibWNSSAAAAFIeAAAAdAgAAABkYXRldGltZXQDAAAAbm93dA0AAAB0cmFuc2xhdGVQYXRoUkkAAABSSgAAAHQCAAAAb3N0BAAAAHBhdGh0BAAAAGpvaW50BAAAAG9wZW50BAAAAHJlYWR0AwAAAGRheXQFAAAAbW9udGh0BAAAAHllYXJSDwAAAHQFAAAAaW5wdXRSSwAAAHQGAAAAc3Rkb3V0dAUAAAB3cml0ZVITAAAAKAsAAABSVAAAAFJVAAAAUkgAAAB0BwAAAHBhdGNoZWR0BAAAAGRhdGV0CgAAAGFkZG9uX3BhdGh0CQAAAGZpbGVfcGF0aHQJAAAAcmVhbF90ZXh0dAgAAABuZXdfdGV4dFIWAAAAdAQAAABsaW5lKAAAAAAoAAAAAHMIAAAAPHN0cmluZz50CgAAAHVwZGF0ZV9ub3fXAAAAcx4AAAAAAQwBDAEMAQYBDwEkARgBGAE0AQYBDwEHASgBJgFjAQAAAAcAAAAEAAAAQwAAAHPLAAAAZAEAZAAAbAAAfQEAZAEAZAAAbAEAfQIAdAIAagIAagMAgwAAfQMAfAMAagQAdAQAawUAcscAfAMAagUAdAUAawUAcscAdAYAfAAAgwEAZAIAawQAcscAfAEAagcAZAIAdAYAfAAAgwEAgwIAfQQAdAgAfAAAgwEAfQUAfAUAfAQAGX0GAHgqAHwFAHwEABl8BgBrAgBysQB8AQBqCQB8AgBqCgCDAQB8BQB8BAA8cYgAV2QDAGoLAHwFAIMBAH0AAHHHAG4AAHwAAFMoBAAAAE5p/////2kAAAAAUgMAAAAoDAAAAHQGAAAAcmFuZG9tdAYAAABzdHJpbmdSVgAAAFJXAAAAUl8AAABSYAAAAFIxAAAAdAcAAAByYW5kaW50dAQAAABsaXN0dAYAAABjaG9pY2V0BwAAAGxldHRlcnNSWwAAACgHAAAAdAMAAAB1cmxSbAAAAFJtAAAAUmUAAAB0BgAAAGNoYW5nZXQIAAAAdGVtcF91cmx0AwAAAG9sZCgAAAAAKAAAAABzCAAAADxzdHJpbmc+dAgAAABnZXRfaW5mb+kAAABzGAAAAAABDAEMAQ8BHgESARgBDAEKARMBGgEVAWMAAAAABAAAAAgAAABDAAAAc3sAAABkAQB0AABrBwByEAB0AQBTZAIAZAAAbAIAfQAAfAAAagMAZAMAgwEAfQEAeEkAdAQARF1BAH0CAHwBAHQFAGoGAGQEAGoHAGcAAHwCAERdEgB9AwB0CAB8AwCDAQBeAgBxTgCDAQCDAQBrAgByMgB0CQBTcTIAV3QBAFMoBQAAAE5zDwAAAGFsZmFyZXNvbHZlci5weWn/////cxQAAABDb250YWluZXIuUGx1Z2luTmFtZVIDAAAAKAoAAAB0CAAAAF9fZmlsZV9fUh4AAABSVQAAAHQMAAAAZ2V0SW5mb0xhYmVsdAIAAABsMVIvAAAAUjAAAABSWwAAAHQDAAAAY2hyUiYAAAAoBAAAAFJVAAAAdAEAAABhUhgAAABSPAAAACgAAAAAKAAAAABzCAAAADxzdHJpbmc+dAYAAABsbDExMWz5AAAAcxAAAAAAAQwABAEMAQ8BDQE3AAgBYwEAAAAEAAAAAwAAAEMAAABzzAAAAHQAAGoBAGQBAIMBAGoCAHwAAIMBAH0BAHQDAHwBAIMBAGQCAGsEAHJbAHQEAHwBAGQCABlkAgAZZAMAgwIAfQIAdAQAfAEAZAIAGWQEABlkAwCDAgB9AwBuZwB0AABqAQBkBQCDAQBqAgB8AACDAQB9AQB0AwB8AQCDAQBkAgBrBABytgB0BAB8AQBkAgAZZAIAGWQGAIMCAH0CAHQEAHwBAGQCABlkBAAZZAYAgwIAfQMAbgwAZAIAfQIAZAIAfQMAfAIAfAMAZgIAUygHAAAATnMnAAAAMHgoWzAtOWEtZkEtRl0rKVxzKixccyoweChbMC05YS1mQS1GXSspaQAAAABpEAAAAGkBAAAAcxQAAABccyooXGQrKVxzKixccyooXGQrKWkKAAAAKAUAAABSDAAAAFINAAAAUg4AAABSMQAAAFISAAAAKAQAAABSRAAAAFIVAAAAdAUAAABkZXNkZVI5AAAAKAAAAAAoAAAAAHMIAAAAPHN0cmluZz50BgAAAGxsbGwxMQQBAABzFgAAAAABGAESARcBGgIYARIBFwEaAgYBBgFjAgAAAA8AAAAGAAAAQwAAAHNjAgAAdAAAgwAAcw0AfAAAU3QBAGoCAGQBAIMBAGoDAHwBAIMBAH0CAHwCAHM8AHQEAGoFAHwBAIMBAAF8AABTdAYAfAIAZAIAGYMBAH0DAHwDAGoHAHNmAHQEAGoFAHwBAIMBAAF8AABTdAQAagUAfAMAaggAgwEAAXQBAGoCAGQDAHQBAGoJAIMCAGoDAHwAAIMBAGQCABl9BAB8BABkAABkAABkBACFAwAZfQUAdAEAagoAZAUAZAYAfAMAaggAgwMAfAMAXwgAeDUAZAcAZAgAZAkAZAoAZAsAZwUARF0eAH0GAHwDAGoIAGoLAHwGAGQMAIMCAHwDAF8IAHHcAFd0AQBqAgBkDQCDAQBqAwB8AwBqCACDAQB9AgB8AgByOAF0DAB8AgBkAgAZgwEAXAIAfQcAfQgAbkYAdAEAagIAZA4AgwEAagMAfAMAaggAgwEAfQIAfAIAcnIBdAwAfAIAZAIAGYMBAFwCAH0HAH0IAG4MAGQCAH0HAGQCAH0IAHwHAGQCAGsCAHKUAXwFAHwIAB9uEwB8BQB8BwAgfAUAfAcAfAgAFx8XfQkAdA0AfAkAgwEAfQoAdAEAagIAZA8AgwEAagMAfAMAaggAgwEAfQIAfAIAckcCeG0AfAIARF1iAFwEAH0LAH0MAH0NAH0OAHwNAGQQAGsCAHLeAXwLAHwOAGsCAHLeAXwKAHQOAHwMAIMBABl8CgB0DgB8CwCDAQAZAnwKAHQOAHwLAIMBADx8CgB0DgB8DACDAQA8cd4Bcd4BV24AAHQBAGoKAHwEAGQRAGoPAHwKAIMBAHwAAIMDAFMoEgAAAE5zKAAAACh2YXIgXHcrXHMqPVxzKlxbLio/XF07XChmdW5jdGlvblwoLio/KQppAAAAAHMNAAAAWzAtOWEtel17NDAsfWn/////cwgAAABccypcK1xzKnQBAAAAK3MJAAAAc3BsJysnaWNlcwkAAABzJysncGxpY2VzCQAAAHNwJysnbGljZXMJAAAAc3BsaScrJ2NlcwkAAABzcGxpYycrJ2V0BgAAAHNwbGljZXMTAAAAXC5zcGxpY2VcKChbXildKylcKXMXAAAAXFsnc3BsaWNlJ1xdXCgoW14pXSspXClzTAAAAFx3K1xbKFxkKylcXVxzKj1ccypcdytcLnNwbGljZVxzKlwoKFxkKylccyosXHMqKFxkKylccyosXHMqXHcrXFsoXGQrKVxdXHMqXCl0AQAAADFSAwAAACgQAAAAUnwAAABSDAAAAFINAAAAUg4AAABSAQAAAHQEAAAAaW5mb1ICAAAAUgoAAABSBgAAAHQKAAAASUdOT1JFQ0FTRVJDAAAAUhMAAABSfgAAAFJvAAAAUhIAAABSWwAAACgPAAAAUnIAAABSBgAAAFIVAAAAdAMAAABuZXR0BgAAAGxsbGwxbHQGAAAAbDFsbDFsdAMAAAByZXBSfQAAAFI5AAAAUhgAAABSOwAAAHQDAAAAdW5vdAMAAABkb3N0AwAAAHRhbXQDAAAAZmluKAAAAAAoAAAAAHMIAAAAPHN0cmluZz50EAAAAGRlY29kZV92aWRlb191cmwUAQAAc0AAAAAAAwkABAQYAQYBDQEEAhABCQENAQQBEAciARMDGwMcARwDGwEGARkCGwEGARkCBgAGASwEDAIbAQYBGQEYAT8DaWMAAABpRwAAAGl4AAAAaTEAAABpWgAAAGkyAAAAaWwAAABpdQAAAGlMAAAAaW4AAABpcAAAAGlWAAAAaXYAAABpbQAAAGlGAAAAaXMAAABpRQAAAGk9AAAAKBUAAABSDAAAAFJZAAAAUksAAABSLwAAAFI1AAAAUlYAAABSUQAAAFIAAAAAUgEAAABSXgAAAFJfAAAAUmAAAAB0BgAAAG9iamVjdFICAAAAUk4AAABSawAAAFJ2AAAAUnwAAABSfgAAAFKMAAAAUnkAAAAoAAAAACgAAAAAKAAAAABzCAAAADxzdHJpbmc+dAgAAAA8bW9kdWxlPgMAAABzJAAAAAwBDAEMAQwBDAEMARABEAIGAQYBBiIWnAkLCRIJEAkLCRAJPQ==')))'))
\ No newline at end of file
diff --git a/plugin.video.alfa/lib/generictools.py b/plugin.video.alfa/lib/generictools.py
index 2da804cb..1cd22f3f 100644
--- a/plugin.video.alfa/lib/generictools.py
+++ b/plugin.video.alfa/lib/generictools.py
@@ -279,7 +279,9 @@ def post_tmdb_listado(item, itemlist):
     if not item.category_new:
         item.category_new = ''
 
-    for item_local in itemlist:                                 #Recorremos el Itenlist generado por el canal
+    for item_local in itemlist:                                 #Recorremos el Itemlist generado por el canal
+        item_local.title = re.sub(r'(?i)online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title).strip()
+        #item_local.title = re.sub(r'online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title, flags=re.IGNORECASE).strip()
         title = item_local.title
         #logger.debug(item_local)
         
@@ -375,10 +377,13 @@ def post_tmdb_listado(item, itemlist):
                 item_local.contentSerieName = item_local.from_title
             if item_local.contentType == 'season':
                 item_local.title = item_local.from_title
+            item_local.title = re.sub(r'(?i)online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title).strip()
+            title = item_local.title
         
         #Limpiamos calidad de títulos originales que se hayan podido colar
         if item_local.infoLabels['originaltitle'].lower() in item_local.quality.lower():
-            item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality, flags=re.IGNORECASE)
+            item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality)
+            #item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality, flags=re.IGNORECASE)
         
         # Preparamos el título para series, con los núm. de temporadas, si las hay
         if item_local.contentType in ['season', 'tvshow', 'episode']:
@@ -423,10 +428,10 @@ def post_tmdb_listado(item, itemlist):
                 else:
                     title = '%s -Temporada !!!' % (title)
 
-            elif item.action == "search":
+            elif item.action == "search" or item.extra == "search":
                 title += " -Serie-"
         
-        if (item_local.extra == "varios" or item_local.extra == "documentales") and (item.action == "search" or item.action == "listado_busqueda"):
+        if (item_local.extra == "varios" or item_local.extra == "documentales") and (item.action == "search" or item.extra == "search" or item.action == "listado_busqueda"):
             title += " -Varios-"
             item_local.contentTitle += " -Varios-"
         
@@ -764,6 +769,18 @@ def post_tmdb_episodios(item, itemlist):
             del item_local.library_filter_show
         if item_local.extra2:
             del item_local.extra2
+        item_local.wanted = 'xyz'
+        del item_local.wanted
+        item_local.text_color = 'xyz'
+        del item_local.text_color
+        item_local.tmdb_stat = 'xyz'
+        del item_local.tmdb_stat
+        item_local.totalItems = 'xyz'
+        del item_local.totalItems
+        item_local.unify = 'xyz'
+        del item_local.unify
+        item_local.title = re.sub(r'(?i)online|descarga|downloads|trailer|videoteca|gb|autoplay', '', item_local.title).strip()
+        
         #logger.debug(item_local)
         
         #Ajustamos el nombre de la categoría si es un clone de NewPct1
@@ -838,7 +855,8 @@ def post_tmdb_episodios(item, itemlist):
 
         #Limpiamos calidad de títulos originales que se hayan podido colar
         if item_local.infoLabels['originaltitle'].lower() in item_local.quality.lower():
-            item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality, flags=re.IGNORECASE)
+            item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality)
+            #item_local.quality = re.sub(item_local.infoLabels['originaltitle'], '', item_local.quality, flags=re.IGNORECASE)
         
         #Si no está el título del episodio, pero sí está en "title", lo rescatamos
         if not item_local.infoLabels['episodio_titulo'] and item_local.infoLabels['title'].lower() != item_local.infoLabels['tvshowtitle'].lower():
@@ -868,9 +886,9 @@ def post_tmdb_episodios(item, itemlist):
         item_local.title = '%s [%s] [%s] [COLOR limegreen][%s][/COLOR] [COLOR red]%s[/COLOR]' % (item_local.title, item_local.infoLabels['year'], rating, item_local.quality, str(item_local.language))
     
         #Quitamos campos vacíos
-        item_local.infoLabels['episodio_titulo'] = item_local.infoLabels['episodio_titulo'].replace(" []", "").strip()
-        item_local.infoLabels['title'] = item_local.infoLabels['title'].replace(" []", "").strip()
-        item_local.title = item_local.title.replace(" []", "").strip()
+        item_local.infoLabels['episodio_titulo'] = item_local.infoLabels['episodio_titulo'].replace("[]", "").strip()
+        item_local.infoLabels['title'] = item_local.infoLabels['title'].replace("[]", "").strip()
+        item_local.title = item_local.title.replace("[]", "").strip()
         item_local.title = re.sub(r'\s?\[COLOR \w+\]\[\[?-?\s?\]?\]\[\/COLOR\]', '', item_local.title).strip()
         item_local.title = re.sub(r'\s?\[COLOR \w+\]-?\s?\[\/COLOR\]', '', item_local.title).strip()
         item_local.title = item_local.title.replace(".", ",").replace("GB", "G B").replace("Gb", "G b").replace("gb", "g b").replace("MB", "M B").replace("Mb", "M b").replace("mb", "m b")
@@ -1006,9 +1024,11 @@ def post_tmdb_findvideos(item, itemlist):
     # Saber si estamos en una ventana emergente lanzada desde una viñeta del menú principal,
     # con la función "play_from_library"
     item.unify = False
+    Window_IsMedia = False
     try:
         import xbmc
         if xbmc.getCondVisibility('Window.IsMedia') == 1:
+            Window_IsMedia = True
             item.unify = config.get_setting("unify")
     except:
         item.unify = config.get_setting("unify")
@@ -1084,7 +1104,7 @@ def post_tmdb_findvideos(item, itemlist):
     tiempo = 0
     if item.infoLabels['duration']:
         try:
-            if config.get_platform(True)['num_version'] < 18:
+            if config.get_platform(True)['num_version'] < 18 or not Window_IsMedia:
                 tiempo = item.infoLabels['duration']
             elif xbmc.getCondVisibility('Window.IsMedia') == 1:
                 item.quality = re.sub(r'\s?\[\d+:\d+\ h]', '', item.quality)
@@ -1202,7 +1222,7 @@ def post_tmdb_findvideos(item, itemlist):
     return (item, itemlist)
     
     
-def get_torrent_size(url, data_torrent=False):
+def get_torrent_size(url, referer=None, post=None, data_torrent=False):
     logger.info()
     from core import videolibrarytools
     
@@ -1215,6 +1235,8 @@ def get_torrent_size(url, data_torrent=False):
     
     Llamada:            generictools.get_torrent_size(url, data_torrent=False)
     Entrada: url:       url del archivo .torrent
+    Entrada: referer:   url de referer en caso de llamada con post
+    Entrada: post:      contenido del post en caso de llamada con post
     Entrada: data_torrent:  Flag por si se quiere el contenido del .torretn de vuelta
     Salida: size:       str con el tamaño y tipo de medida ( MB, GB, etc)
     Salida: torrent:    dict() con el contenido del .torrent (opcional)
@@ -1294,11 +1316,11 @@ def get_torrent_size(url, data_torrent=False):
         #urllib.urlretrieve(url, torrents_path + "/generictools.torrent")        #desacargamos el .torrent a la carpeta
         #torrent_file = open(torrents_path + "/generictools.torrent", "rb").read()   #leemos el .torrent
         
-        torrents_path, torrent_file = videolibrarytools.caching_torrents(url, timeout=2, lookup=True, data_torrent=True)
+        torrents_path, torrent_file = videolibrarytools.caching_torrents(url, referer=referer, post=post, timeout=2, lookup=True, data_torrent=True)
         if not torrent_file:
             if data_torrent:
                 return (size, torrent)
-            return size                                                         #Si hay un error, devolvemos el "size" y "torrent" vacíos
+            return size                                         #Si hay un error, devolvemos el "size" y "torrent" vacíos
 
         torrent = decode(torrent_file)                                          #decodificamos el .torrent
 
@@ -1472,8 +1494,9 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
             fail_over = settings['default']                             #Carga lista de clones
             break
     fail_over_list = ast.literal_eval(fail_over)
+    #logger.debug(str(fail_over_list))
 
-    if item.from_channel and item.from_channel != 'videolibrary':       #Desde search puede venir con el nombre de canal equivocado
+    if item.from_channel and item.from_channel != 'videolibrary': #Desde search puede venir con el nombre de canal equivocado
         item.channel = item.from_channel
     #Recorremos el Array identificando el canal que falla
     for active, channel, channel_host, contentType, action_excluded in fail_over_list:
@@ -1486,10 +1509,11 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
         channel_failed = channel                                        #salvamos el nombre del canal o categoría
         channel_host_failed = channel_host                              #salvamos el nombre del host
         channel_url_failed = item.url                                   #salvamos la url
+        #logger.debug(channel_failed + ' / ' + channel_host_failed)
         
         if patron == True and active == '1':                            #solo nos han pedido verificar el clone
             return (item, data)                                         #nos vamos, con el mismo clone, si está activo
-        if (item.action == 'episodios' or item.action == 'findvideos') and item.contentType not in contentType:        #soporta el fail_over de este contenido?
+        if (item.action == 'episodios' or item.action == "update_tvshow" or item.action == "get_seasons" or item.action == 'findvideos') and item.contentType not in contentType:          #soporta el fail_over de este contenido?
             logger.error("ERROR 99: " + item.action.upper() + ": Acción no soportada para Fail-Over en canal: " + item.url)
             return (item, data)                         #no soporta el fail_over de este contenido, no podemos hacer nada
         break
@@ -1504,7 +1528,7 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
         data_alt = ''
         if channel == channel_failed or active == '0' or item.action in action_excluded or item.extra2 in action_excluded:  #es válido el nuevo canal?
             continue
-        if (item.action == 'episodios' or item.action == 'findvideos') and item.contentType not in contentType:     #soporta el contenido?
+        if (item.action == 'episodios' or item.action == "update_tvshow" or item.action == "get_seasons" or item.action == 'findvideos') and item.contentType not in contentType:          #soporta el contenido?
             continue
         
         #Hacemos el cambio de nombre de canal y url, conservando las anteriores como ALT
@@ -1514,12 +1538,16 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
         item.category = channel.capitalize()
         item.url_alt = channel_url_failed
         item.url = channel_url_failed
-        item.url = item.url.replace(channel_host_failed, channel_host)
+        channel_host_bis = re.sub(r'(?i)http.*://', '', channel_host)
+        channel_host_failed_bis = re.sub(r'(?i)http.*://', '', channel_host_failed)
+        item.url = item.url.replace(channel_host_failed_bis, channel_host_bis)
+        
         url_alt += [item.url]                               #salvamos la url para el bucle
         item.channel_host = channel_host
+        #logger.debug(str(url_alt))
         
         #quitamos el código de series, porque puede variar entre webs
-        if item.action == "episodios" or item.action == "get_seasons":
+        if item.action == "episodios" or item.action == "get_seasons" or item.action == "update_tvshow":
             item.url = re.sub(r'\/\d+\/?$', '', item.url)   #parece que con el título solo ecuentra la serie, normalmente...
             url_alt = [item.url]    #salvamos la url para el bucle, pero de momento ignoramos la inicial con código de serie
         
@@ -1580,9 +1608,11 @@ def fail_over_newpct1(item, patron, patron2=None, timeout=None):
                     #Función especial para encontrar en otro clone un .torrent válido
                     if verify_torrent == 'torrent:check:status':
                         from core import videolibrarytools
+                        if not data_alt.startswith("http"):                     #Si le falta el http.: lo ponemos
+                            data_alt = scrapertools.find_single_match(item.channel_host, '(\w+:)//') + data_alt
                         if videolibrarytools.verify_url_torrent(data_alt):      #verificamos si el .torrent existe
                             item.url = url                                      #guardamos la url que funciona
-                            break                                               #nos vamos, con la nueva url del .torrent verificada
+                            break                           #nos vamos, con la nueva url del .torrent verificada
                         data = ''
                         continue                                                #no vale el .torrent, continuamos
                     item.url = url                          #guardamos la url que funciona, sin verificar
@@ -1831,11 +1861,11 @@ def redirect_clone_newpct1(item, head_nfo=None, it=None, path=False, overwrite=F
     #Cuando en el .json se activa "Borrar", "emergency_urls = 2", se borran todos los enlaces existentes
     #Cuando en el .json se activa "Actualizar", "emergency_urls = 3", se actualizan todos los enlaces existentes
     
-    status_migration = regenerate_clones()                                  #TEMPORAL: Reparación de Videoteca con Newpct1
-    
     """
-    verify_cached_torrents()                                                #TEMPORAL: verificamos si los .torrents son correctos
-    try:                                                                    #Si ha habido errores, vemos la lista y los reparamos
+    status_migration = regenerate_clones()                          #TEMPORAL: Reparación de Videoteca con Newpct1
+    
+    verify_cached_torrents()                                        #TEMPORAL: verificamos si los .torrents son correctos
+    try:                                                            #Si ha habido errores, vemos la lista y los reparamos
         json_error_path = filetools.join(config.get_runtime_path(), 'error_cached_torrents.json')
         if filetools.exists(json_error_path):                               #hay erroer que hay que reparar?
             from core import jsontools
diff --git a/plugin.video.alfa/lib/quasar/daemon.py b/plugin.video.alfa/lib/quasar/daemon.py
new file mode 100644
index 00000000..3754d8d4
--- /dev/null
+++ b/plugin.video.alfa/lib/quasar/daemon.py
@@ -0,0 +1,294 @@
+import os
+import stat
+import time
+import xbmc
+import shutil
+import socket
+import urllib2
+import xbmcgui
+import threading
+import subprocess
+from quasar.logger import log
+from quasar.osarch import PLATFORM
+from quasar.config import QUASARD_HOST
+from quasar.addon import ADDON, ADDON_ID, ADDON_PATH
+from quasar.util import notify, system_information, getLocalizedString, getWindowsShortPath
+
+def ensure_exec_perms(file_):
+    st = os.stat(file_)
+    os.chmod(file_, st.st_mode | stat.S_IEXEC)
+    return file_
+
+def android_get_current_appid():
+    with open("/proc/%d/cmdline" % os.getpid()) as fp:
+        return fp.read().rstrip("\0")
+
+def get_quasard_checksum(path):
+    try:
+        with open(path) as fp:
+            fp.seek(-40, os.SEEK_END)  # we put a sha1 there
+            return fp.read()
+    except Exception:
+        return ""
+
+def get_quasar_binary():
+    binary = "quasar" + (PLATFORM["os"] == "windows" and ".exe" or "")
+
+    log.info("PLATFORM: %s" % str(PLATFORM))
+    binary_dir = os.path.join(ADDON_PATH, "resources", "bin", "%(os)s_%(arch)s" % PLATFORM)
+    if PLATFORM["os"] == "android":
+        log.info("Detected binary folder: %s" % binary_dir)
+        binary_dir_legacy = binary_dir.replace("/storage/emulated/0", "/storage/emulated/legacy")
+        if os.path.exists(binary_dir_legacy):
+            binary_dir = binary_dir_legacy
+        log.info("Using binary folder: %s" % binary_dir)
+        app_id = android_get_current_appid()
+        xbmc_data_path = os.path.join("/data", "data", app_id)
+        
+        try:                    #Test if there is any permisions problem
+            f = open(os.path.join(xbmc_data_path, "test.txt"), "wb")
+            f.write("test")
+            f.close()
+            os.remove(os.path.join(xbmc_data_path, "test.txt"))
+        except:
+            xbmc_data_path = ''
+        
+        if not os.path.exists(xbmc_data_path):
+            log.info("%s path does not exist, so using %s as xbmc_data_path" % (xbmc_data_path, xbmc.translatePath("special://xbmcbin/")))
+            xbmc_data_path = xbmc.translatePath("special://xbmcbin/")
+
+            try:                    #Test if there is any permisions problem
+                f = open(os.path.join(xbmc_data_path, "test.txt"), "wb")
+                f.write("test")
+                f.close()
+                os.remove(os.path.join(xbmc_data_path, "test.txt"))
+            except:
+                xbmc_data_path = ''
+        
+        if not os.path.exists(xbmc_data_path):
+            log.info("%s path does not exist, so using %s as xbmc_data_path" % (xbmc_data_path, xbmc.translatePath("special://masterprofile/")))
+            xbmc_data_path = xbmc.translatePath("special://masterprofile/")
+        dest_binary_dir = os.path.join(xbmc_data_path, "files", ADDON_ID, "bin", "%(os)s_%(arch)s" % PLATFORM)
+    else:
+        dest_binary_dir = os.path.join(xbmc.translatePath(ADDON.getAddonInfo("profile")).decode('utf-8'), "bin", "%(os)s_%(arch)s" % PLATFORM)
+
+    log.info("Using destination binary folder: %s" % dest_binary_dir)
+    binary_path = os.path.join(binary_dir, binary)
+    dest_binary_path = os.path.join(dest_binary_dir, binary)
+
+    if not os.path.exists(binary_path):
+        notify((getLocalizedString(30103) + " %(os)s_%(arch)s" % PLATFORM), time=7000)
+        system_information()
+        try:
+            log.info("Source directory (%s):\n%s" % (binary_dir, os.listdir(os.path.join(binary_dir, ".."))))
+            log.info("Destination directory (%s):\n%s" % (dest_binary_dir, os.listdir(os.path.join(dest_binary_dir, ".."))))
+        except Exception:
+            pass
+        return False, False
+
+    if os.path.isdir(dest_binary_path):
+        log.warning("Destination path is a directory, expected previous binary file, removing...")
+        try:
+            shutil.rmtree(dest_binary_path)
+        except Exception as e:
+            log.error("Unable to remove destination path for update: %s" % e)
+            system_information()
+            return False, False
+
+    if not os.path.exists(dest_binary_path) or get_quasard_checksum(dest_binary_path) != get_quasard_checksum(binary_path):
+        log.info("Updating quasar daemon...")
+        try:
+            os.makedirs(dest_binary_dir)
+        except OSError:
+            pass
+        try:
+            shutil.rmtree(dest_binary_dir)
+        except Exception as e:
+            log.error("Unable to remove destination path for update: %s" % e)
+            system_information()
+            pass
+        try:
+            shutil.copytree(binary_dir, dest_binary_dir)
+        except Exception as e:
+            log.error("Unable to copy to destination path for update: %s" % e)
+            system_information()
+            return False, False
+
+    # Clean stale files in the directory, as this can cause headaches on
+    # Android when they are unreachable
+    dest_files = set(os.listdir(dest_binary_dir))
+    orig_files = set(os.listdir(binary_dir))
+    log.info("Deleting stale files %s" % (dest_files - orig_files))
+    for file_ in (dest_files - orig_files):
+        path = os.path.join(dest_binary_dir, file_)
+        if os.path.isdir(path):
+            shutil.rmtree(path)
+        else:
+            os.remove(path)
+
+    return dest_binary_dir, ensure_exec_perms(dest_binary_path)
+
+def clear_fd_inherit_flags():
+    # Ensure the spawned quasar binary doesn't inherit open files from Kodi
+    # which can break things like addon updates. [WINDOWS ONLY]
+    from ctypes import windll
+
+    HANDLE_RANGE = xrange(0, 65536)
+    HANDLE_FLAG_INHERIT = 1
+    FILE_TYPE_DISK = 1
+
+    for hd in HANDLE_RANGE:
+        if windll.kernel32.GetFileType(hd) == FILE_TYPE_DISK:
+            if not windll.kernel32.SetHandleInformation(hd, HANDLE_FLAG_INHERIT, 0):
+                log.error("Error clearing inherit flag, disk file handle %x" % hd)
+
+
+def jsonrpc_enabled(notify=False):
+    try:
+        s = socket.socket()
+        s.connect(('127.0.0.1', 9090))
+        s.close()
+        log.info("Kodi's JSON-RPC service is available, starting up...")
+        del s
+        return True
+    except Exception as e:
+        log.error(repr(e))
+        if notify:
+            xbmc.executebuiltin("ActivateWindow(ServiceSettings)")
+            dialog = xbmcgui.Dialog()
+            dialog.ok("Quasar", getLocalizedString(30199))
+    return False
+
+def start_quasard(**kwargs):
+    jsonrpc_failures = 0
+    while jsonrpc_enabled() is False:
+        jsonrpc_failures += 1
+        log.warning("Unable to connect to Kodi's JSON-RPC service, retrying...")
+        if jsonrpc_failures > 1:
+            time.sleep(5)
+            if not jsonrpc_enabled(notify=True):
+                log.error("Unable to reach Kodi's JSON-RPC service, aborting...")
+                return False
+            else:
+                break
+        time.sleep(3)
+
+    quasar_dir, quasar_binary = get_quasar_binary()
+
+    if quasar_dir is False or quasar_binary is False:
+        return False
+
+    lockfile = os.path.join(ADDON_PATH, ".lockfile")
+    if os.path.exists(lockfile):
+        log.warning("Existing process found from lockfile, killing...")
+        try:
+            with open(lockfile) as lf:
+                pid = int(lf.read().rstrip(" \t\r\n\0"))
+            os.kill(pid, 9)
+        except Exception as e:
+            log.error(repr(e))
+
+        if PLATFORM["os"] == "windows":
+            log.warning("Removing library.db.lock file...")
+            try:
+                library_lockfile = os.path.join(xbmc.translatePath(ADDON.getAddonInfo("profile")).decode('utf-8'), "library.db.lock")
+                os.remove(library_lockfile)
+            except Exception as e:
+                log.error(repr(e))
+
+    SW_HIDE = 0
+    STARTF_USESHOWWINDOW = 1
+
+    args = [quasar_binary]
+    kwargs["cwd"] = quasar_dir
+
+    if PLATFORM["os"] == "windows":
+        args[0] = getWindowsShortPath(quasar_binary)
+        kwargs["cwd"] = getWindowsShortPath(quasar_dir)
+        si = subprocess.STARTUPINFO()
+        si.dwFlags = STARTF_USESHOWWINDOW
+        si.wShowWindow = SW_HIDE
+        clear_fd_inherit_flags()
+        kwargs["startupinfo"] = si
+    else:
+        env = os.environ.copy()
+        env["LD_LIBRARY_PATH"] = "%s:%s" % (quasar_dir, env.get("LD_LIBRARY_PATH", ""))
+        kwargs["env"] = env
+        kwargs["close_fds"] = True
+
+    wait_counter = 1
+    while xbmc.getCondVisibility('Window.IsVisible(10140)') or xbmc.getCondVisibility('Window.IsActive(10140)'):
+        if wait_counter == 1:
+            log.info('Add-on settings currently opened, waiting before starting...')
+        if wait_counter > 300:
+            break
+        time.sleep(1)
+        wait_counter += 1
+
+    return subprocess.Popen(args, **kwargs)
+
+def shutdown():
+    try:
+        urllib2.urlopen(QUASARD_HOST + "/shutdown")
+    except:
+        pass
+
+def wait_for_abortRequested(proc, monitor):
+    monitor.closing.wait()
+    log.info("quasard: exiting quasard daemon")
+    try:
+        proc.terminate()
+    except OSError:
+        pass  # Process already exited, nothing to terminate
+    log.info("quasard: quasard daemon exited")
+
+def quasard_thread(monitor):
+    crash_count = 0
+    try:
+        while not xbmc.abortRequested:
+            log.info("quasard: starting quasard")
+            proc = start_quasard(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            if not proc:
+                break
+            threading.Thread(target=wait_for_abortRequested, args=[proc, monitor]).start()
+
+            if PLATFORM["os"] == "windows":
+                while proc.poll() is None:
+                    log.info(proc.stdout.readline())
+            else:
+                # Kodi hangs on some Android (sigh...) systems when doing a blocking
+                # read. We count on the fact that Quasar daemon flushes its log
+                # output on \n, creating a pretty clean output
+                import fcntl
+                import select
+                fd = proc.stdout.fileno()
+                fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+                fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+                while proc.poll() is None:
+                    try:
+                        to_read, _, _ = select.select([proc.stdout], [], [])
+                        for ro in to_read:
+                            line = ro.readline()
+                            if line == "":  # write end is closed
+                                break
+                            log.info(line)
+                    except IOError:
+                        time.sleep(1)  # nothing to read, sleep
+
+            if proc.returncode == 0 or xbmc.abortRequested:
+                break
+
+            crash_count += 1
+            notify(getLocalizedString(30100), time=3000)
+            xbmc.executebuiltin("Dialog.Close(all, true)")
+            system_information()
+            time.sleep(5)
+            if crash_count >= 3:
+                notify(getLocalizedString(30110), time=3000)
+                break
+
+    except Exception as e:
+        import traceback
+        map(log.error, traceback.format_exc().split("\n"))
+        notify("%s: %s" % (getLocalizedString(30226), repr(e).encode('utf-8')))
+        raise
diff --git a/plugin.video.alfa/lib/quasar/navigation.py b/plugin.video.alfa/lib/quasar/navigation.py
new file mode 100644
index 00000000..70658b6c
--- /dev/null
+++ b/plugin.video.alfa/lib/quasar/navigation.py
@@ -0,0 +1,260 @@
+import os
+import sys
+import socket
+import urllib2
+import urlparse
+import xbmc
+import xbmcgui
+import xbmcplugin
+from quasar.logger import log
+from quasar.config import QUASARD_HOST
+from quasar.addon import ADDON, ADDON_ID, ADDON_PATH
+from quasar.util import notify, getLocalizedString, getLocalizedLabel, system_information
+
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+
+HANDLE = int(sys.argv[1])
+
+
+class InfoLabels(dict):
+    def __init__(self, *args, **kwargs):
+        self.update(*args, **kwargs)
+
+    def __getitem__(self, key):
+        return dict.get(self, key.lower(), "")
+
+    def __setitem__(self, key, val):
+        dict.__setitem__(self, key.lower(), val)
+
+    def update(self, *args, **kwargs):
+        for k, v in dict(*args, **kwargs).iteritems():
+            self[k] = v
+
+
+class closing(object):
+    def __init__(self, thing):
+        self.thing = thing
+
+    def __enter__(self):
+        return self.thing
+
+    def __exit__(self, *exc_info):
+        self.thing.close()
+
+
+class NoRedirectHandler(urllib2.HTTPRedirectHandler):
+    def http_error_302(self, req, fp, code, msg, headers):
+        import urllib
+        infourl = urllib.addinfourl(fp, headers, headers["Location"])
+        infourl.status = code
+        infourl.code = code
+        return infourl
+    http_error_300 = http_error_302
+    http_error_301 = http_error_302
+    http_error_303 = http_error_302
+    http_error_307 = http_error_302
+
+
+def getInfoLabels():
+    id_list = [int(s) for s in sys.argv[0].split("/") if s.isdigit()]
+    tmdb_id = id_list[0] if id_list else None
+
+    if not tmdb_id:
+        parsed_url = urlparse.urlparse(sys.argv[0] + sys.argv[2])
+        query = urlparse.parse_qs(parsed_url.query)
+        log.debug("Parsed URL: %s, Query: %s", repr(parsed_url), repr(query))
+        if 'tmdb' in query and 'show' not in query:
+            tmdb_id = query['tmdb'][0]
+            url = "%s/movie/%s/infolabels" % (QUASARD_HOST, tmdb_id)
+        elif 'show' in query:
+            tmdb_id = query['show'][0]
+            if 'season' in query and 'episode' in query:
+                url = "%s/show/%s/season/%s/episode/%s/infolabels" % (QUASARD_HOST, tmdb_id, query['season'][0], query['episode'][0])
+            else:
+                url = "%s/show/%s/infolabels" % (QUASARD_HOST, tmdb_id)
+        else:
+            url = "%s/infolabels" % (QUASARD_HOST)
+    elif 'movie' in sys.argv[0]:
+        url = "%s/movie/%s/infolabels" % (QUASARD_HOST, tmdb_id)
+    elif ('episode' in sys.argv[0] or 'show' in sys.argv[0]) and len(id_list) > 2:
+        url = "%s/show/%s/season/%s/episode/%s/infolabels" % (QUASARD_HOST, tmdb_id, id_list[1], id_list[2])
+    elif 'show' in sys.argv[0] and len(id_list) == 2:
+        url = "%s/show/%s/season/%s/episode/%s/infolabels" % (QUASARD_HOST, tmdb_id, id_list[1], 1)
+    else:
+        url = "%s/infolabels" % (QUASARD_HOST)
+
+    log.debug("Resolving TMDB item by calling %s for %s" % (url, repr(sys.argv)))
+
+    try:
+        with closing(urllib2.urlopen(url)) as response:
+            resolved = json.loads(response.read())
+            if not resolved:
+                return {}
+
+            if 'info' in resolved and resolved['info']:
+                resolved.update(resolved['info'])
+
+            if 'art' in resolved and resolved['art']:
+                resolved['artbanner'] = ''
+                for k, v in resolved['art'].items():
+                    resolved['art' + k] = v
+
+            if 'info' in resolved:
+                del resolved['info']
+            if 'art' in resolved:
+                del resolved['art']
+            if 'stream_info' in resolved:
+                del resolved['stream_info']
+
+            if 'dbtype' not in resolved:
+                resolved['dbtype'] = 'video'
+            if 'mediatype' not in resolved or resolved['mediatype'] == '':
+                resolved['Mediatype'] = resolved['dbtype']
+
+            return resolved
+    except:
+        log.debug("Could not resolve TMDB item: %s" % tmdb_id)
+        return {}
+
+
+def _json(url):
+    with closing(urllib2.urlopen(url)) as response:
+        if response.code >= 300 and response.code <= 307:
+            # Pause currently playing Quasar file to avoid doubling requests
+            if xbmc.Player().isPlaying() and ADDON_ID in xbmc.Player().getPlayingFile():
+                xbmc.Player().pause()
+            _infoLabels = InfoLabels(getInfoLabels())
+
+            item = xbmcgui.ListItem(
+                path=response.geturl(),
+                label=_infoLabels["label"],
+                label2=_infoLabels["label2"],
+                thumbnailImage=_infoLabels["thumbnail"])
+
+            item.setArt({
+                "poster": _infoLabels["artposter"],
+                "banner": _infoLabels["artbanner"],
+                "fanart": _infoLabels["artfanart"]
+            })
+
+            item.setInfo(type='Video', infoLabels=_infoLabels)
+            xbmcplugin.setResolvedUrl(HANDLE, True, item)
+            return
+
+        payload = response.read()
+
+        try:
+            if payload:
+                return json.loads(payload)
+        except:
+            raise Exception(payload)
+
+
+def run(url_suffix=""):
+    if not os.path.exists(os.path.join(ADDON_PATH, ".firstrun")):
+        notify(getLocalizedString(30101))
+        system_information()
+        return
+
+    donatePath = os.path.join(ADDON_PATH, ".donate")
+    if not os.path.exists(donatePath):
+        with open(donatePath, "w"):
+            os.utime(donatePath, None)
+        dialog = xbmcgui.Dialog()
+        dialog.ok("Quasar", getLocalizedString(30141))
+
+    socket.setdefaulttimeout(int(ADDON.getSetting("buffer_timeout")))
+    urllib2.install_opener(urllib2.build_opener(NoRedirectHandler()))
+
+    # Pause currently playing Quasar file to avoid doubling requests
+    if xbmc.Player().isPlaying() and ADDON_ID in xbmc.Player().getPlayingFile():
+        xbmc.Player().pause()
+
+    url = sys.argv[0].replace("plugin://%s" % ADDON_ID, QUASARD_HOST + url_suffix) + sys.argv[2]
+    log.debug("Requesting %s from %s" % (url, repr(sys.argv)))
+
+    try:
+        data = _json(url)
+    except urllib2.URLError as e:
+        if 'Connection refused' in e.reason:
+            notify(getLocalizedString(30116), time=7000)
+        else:
+            import traceback
+            map(log.error, traceback.format_exc().split("\n"))
+            notify(e.reason, time=7000)
+        return
+    except Exception as e:
+        import traceback
+        map(log.error, traceback.format_exc().split("\n"))
+        try:
+            msg = unicode(e)
+        except:
+            try:
+                msg = str(e)
+            except:
+                msg = repr(e)
+        notify(getLocalizedLabel(msg), time=7000)
+        return
+
+    if not data:
+        return
+
+    if data["content_type"]:
+        content_type = data["content_type"]
+        if data["content_type"].startswith("menus"):
+            content_type = data["content_type"].split("_")[1]
+
+        xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_UNSORTED)
+        if content_type != "tvshows":
+            xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_LABEL_IGNORE_THE)
+        xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_DATE)
+        xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_GENRE)
+        xbmcplugin.setContent(HANDLE, content_type)
+
+    listitems = range(len(data["items"]))
+    for i, item in enumerate(data["items"]):
+        # Translate labels
+        if item["label"][0:8] == "LOCALIZE":
+            item["label"] = unicode(getLocalizedLabel(item["label"]), 'utf-8')
+        if item["label2"][0:8] == "LOCALIZE":
+            item["label2"] = getLocalizedLabel(item["label2"])
+
+        listItem = xbmcgui.ListItem(label=item["label"], label2=item["label2"], iconImage=item["icon"], thumbnailImage=item["thumbnail"])
+        if item.get("info"):
+            listItem.setInfo("video", item["info"])
+        if item.get("stream_info"):
+            for type_, values in item["stream_info"].items():
+                listItem.addStreamInfo(type_, values)
+        if item.get("art"):
+            listItem.setArt(item["art"])
+        elif ADDON.getSetting('default_fanart') == 'true' and item["label"] != unicode(getLocalizedString(30218), 'utf-8'):
+            fanart = os.path.join(ADDON_PATH, "fanart.jpg")
+            listItem.setArt({'fanart': fanart})
+        if item.get("context_menu"):
+            # Translate context menus
+            for m, menu in enumerate(item["context_menu"]):
+                if menu[0][0:8] == "LOCALIZE":
+                    menu[0] = getLocalizedLabel(menu[0])
+            listItem.addContextMenuItems(item["context_menu"])
+        listItem.setProperty("isPlayable", item["is_playable"] and "true" or "false")
+        if item.get("properties"):
+            for k, v in item["properties"].items():
+                listItem.setProperty(k, v)
+        listitems[i] = (item["path"], listItem, not item["is_playable"])
+
+    xbmcplugin.addDirectoryItems(HANDLE, listitems, totalItems=len(listitems))
+
+    # Set ViewMode
+    if data["content_type"]:
+        viewMode = ADDON.getSetting("viewmode_%s" % data["content_type"])
+        if viewMode:
+            try:
+                xbmc.executebuiltin('Container.SetViewMode(%s)' % viewMode)
+            except Exception as e:
+                log.warning("Unable to SetViewMode(%s): %s" % (viewMode, repr(e)))
+
+    xbmcplugin.endOfDirectory(HANDLE, succeeded=True, updateListing=False, cacheToDisc=True)
diff --git a/plugin.video.alfa/lib/quasar/osarch.py b/plugin.video.alfa/lib/quasar/osarch.py
new file mode 100644
index 00000000..5b580c28
--- /dev/null
+++ b/plugin.video.alfa/lib/quasar/osarch.py
@@ -0,0 +1,56 @@
+import xbmc
+import sys
+import platform
+
+def get_platform():
+    build = xbmc.getInfoLabel("System.BuildVersion")
+    kodi_version = int(build.split()[0][:2])
+    ret = {
+        "auto_arch": sys.maxsize > 2 ** 32 and "64-bit" or "32-bit",
+        "arch": sys.maxsize > 2 ** 32 and "x64" or "x86",
+        "os": "",
+        "version": platform.release(),
+        "kodi": kodi_version,
+        "build": build
+    }
+    if xbmc.getCondVisibility("system.platform.android"):
+        ret["os"] = "android"
+        if "arm" in platform.machine() or "aarch" in platform.machine():
+            ret["arch"] = "arm"
+            if "64" in platform.machine() and ret["auto_arch"] == "64-bit":
+                ret["arch"] = "arm"
+                #ret["arch"] = "x64"                #The binary is corrupted in install package
+    elif xbmc.getCondVisibility("system.platform.linux"):
+        ret["os"] = "linux"
+        if "aarch" in platform.machine() or "arm64" in platform.machine():
+            if xbmc.getCondVisibility("system.platform.linux.raspberrypi"):
+                ret["arch"] = "armv7"
+            elif ret["auto_arch"] == "32-bit":
+                ret["arch"] = "armv7"
+            elif ret["auto_arch"] == "64-bit":
+                ret["arch"] = "arm64"
+            elif platform.architecture()[0].startswith("32"):
+                ret["arch"] = "arm"
+            else:
+                ret["arch"] = "arm64"
+        elif "armv7" in platform.machine():
+            ret["arch"] = "armv7"
+        elif "arm" in platform.machine():
+            ret["arch"] = "arm"
+    elif xbmc.getCondVisibility("system.platform.xbox"):
+        ret["os"] = "windows"
+        ret["arch"] = "x64"
+    elif xbmc.getCondVisibility("system.platform.windows"):
+        ret["os"] = "windows"
+        if platform.machine().endswith('64'):
+            ret["arch"] = "x64"
+    elif xbmc.getCondVisibility("system.platform.osx"):
+        ret["os"] = "darwin"
+        ret["arch"] = "x64"
+    elif xbmc.getCondVisibility("system.platform.ios"):
+        ret["os"] = "ios"
+        ret["arch"] = "arm"
+    return ret
+
+
+PLATFORM = get_platform()
diff --git a/plugin.video.alfa/lib/quasar/util.py b/plugin.video.alfa/lib/quasar/util.py
new file mode 100644
index 00000000..c3c3b63b
--- /dev/null
+++ b/plugin.video.alfa/lib/quasar/util.py
@@ -0,0 +1,72 @@
+import platform
+import xbmc
+import xbmcgui
+from quasar.logger import log
+from quasar.osarch import PLATFORM
+from quasar.addon import ADDON, ADDON_NAME, ADDON_ICON
+
+
+def notify(message, header=ADDON_NAME, time=5000, image=ADDON_ICON):
+    sound = ADDON.getSetting('do_not_disturb') == 'false'
+    dialog = xbmcgui.Dialog()
+    return dialog.notification(toUtf8(header), toUtf8(message), toUtf8(image), time, sound)
+
+def getLocalizedLabel(label):
+    try:
+        if "LOCALIZE" not in label:
+            return label
+        if ";;" not in label and label.endswith(']'):
+            return getLocalizedString(int(label[9:-1]))
+        else:
+            parts = label.split(";;")
+            translation = getLocalizedString(int(parts[0][9:14]))
+            for i, part in enumerate(parts[1:]):
+                if part[0:8] == "LOCALIZE":
+                    parts[i + 1] = getLocalizedString(int(part[9:14]))
+
+            return (translation.decode('utf-8', 'replace') % tuple(parts[1:])).encode('utf-8', 'ignore')
+    except:
+        return label
+
+def getLocalizedString(stringId):
+    try:
+        return ADDON.getLocalizedString(stringId).encode('utf-8', 'ignore')
+    except:
+        return stringId
+
+def toUtf8(string):
+    if isinstance(string, unicode):
+        return string.encode('utf-8', 'ignore')
+    return string
+
+def system_information():
+    build = xbmc.getInfoLabel("System.BuildVersion")
+    log.info("System information: %(os)s_%(arch)s %(version)s" % PLATFORM)
+    log.info("Kodi build version: %s" % build)
+    log.info("OS type: %s" % platform.system())
+    log.info("uname: %s" % repr(platform.uname()))
+    return PLATFORM
+
+def getShortPath(path):
+    if PLATFORM["os"] == "windows":
+        return getWindowsShortPath(path)
+    return path
+
+def getWindowsShortPath(path):
+    try:
+        import ctypes
+        import ctypes.wintypes
+
+        ctypes.windll.kernel32.GetShortPathNameW.argtypes = [
+            ctypes.wintypes.LPCWSTR,  # lpszLongPath
+            ctypes.wintypes.LPWSTR,  # lpszShortPath
+            ctypes.wintypes.DWORD  # cchBuffer
+        ]
+        ctypes.windll.kernel32.GetShortPathNameW.restype = ctypes.wintypes.DWORD
+
+        buf = ctypes.create_unicode_buffer(1024)  # adjust buffer size, if necessary
+        ctypes.windll.kernel32.GetShortPathNameW(path, buf, len(buf))
+
+        return buf.value
+    except:
+        return path
diff --git a/plugin.video.alfa/lib/unshortenit.py b/plugin.video.alfa/lib/unshortenit.py
index b7165a5e..5287b02d 100755
--- a/plugin.video.alfa/lib/unshortenit.py
+++ b/plugin.video.alfa/lib/unshortenit.py
@@ -26,7 +26,7 @@ def find_in_text(regex, text, flags=re.IGNORECASE | re.DOTALL):
 
 
 class UnshortenIt(object):
-    _adfly_regex = r'adf\.ly|j\.gs|q\.gs|u\.bb|ay\.gy|atominik\.com|tinyium\.com|microify\.com|threadsphere\.bid|clearload\.bid|activetect\.net|swiftviz\.net|briskgram\.net|activetect\.net|baymaleti\.net|thouth\.net'
+    _adfly_regex = r'adf\.ly|j\.gs|q\.gs|u\.bb|ay\.gy|atominik\.com|tinyium\.com|microify\.com|threadsphere\.bid|clearload\.bid|activetect\.net|swiftviz\.net|briskgram\.net|activetect\.net|baymaleti\.net|thouth\.net|uclaut.net'
     _linkbucks_regex = r'linkbucks\.com|any\.gs|cash4links\.co|cash4files\.co|dyo\.gs|filesonthe\.net|goneviral\.com|megaline\.co|miniurls\.co|qqc\.co|seriousdeals\.net|theseblogs\.com|theseforums\.com|tinylinks\.co|tubeviral\.com|ultrafiles\.net|urlbeat\.net|whackyvidz\.com|yyv\.co'
     _adfocus_regex = r'adfoc\.us'
     _lnxlu_regex = r'lnx\.lu'
@@ -76,7 +76,7 @@ class UnshortenIt(object):
         if re.search(self._cryptmango_regex, uri, re.IGNORECASE):
             return self._unshorten_cryptmango(uri)
 
-        return uri, 200
+        return uri, 0
 
     def unwrap_30x(self, uri, timeout=10):
         def unwrap_30x(uri, timeout=10):
@@ -442,12 +442,15 @@ class UnshortenIt(object):
             r = httptools.downloadpage(uri, timeout=self._timeout, cookies=False)
             html = r.data
 
-            uri = re.findall(r'<a class="push_button blue" href=([^>]+)>', html)[0]
+            if 'embed' in uri:
+                uri = re.findall(r'<a class="play-btn" href=([^">]*)>', html)[0]
+            else:
+                uri = re.findall(r'<a class="push_button blue" href=([^>]+)>', html)[0]
 
             return uri, r.code
 
         except Exception as e:
-            return uri, str(e)
+            return uri, 0
 
     def _unshorten_cryptmango(self, uri):
         try:
diff --git a/plugin.video.alfa/platformcode/config.py b/plugin.video.alfa/platformcode/config.py
index 70002c31..c5202d63 100644
--- a/plugin.video.alfa/platformcode/config.py
+++ b/plugin.video.alfa/platformcode/config.py
@@ -57,7 +57,7 @@ def get_platform(full_version=False):
                 "16": "jarvis", "17": "krypton", "18": "leia"}
     code_db = {'10': 'MyVideos37.db', '11': 'MyVideos60.db', '12': 'MyVideos75.db',
                '13': 'MyVideos78.db', '14': 'MyVideos90.db', '15': 'MyVideos93.db',
-               '16': 'MyVideos99.db', '17': 'MyVideos107.db', '18': 'MyVideos113.db'}
+               '16': 'MyVideos99.db', '17': 'MyVideos107.db', '18': 'MyVideos116.db'}
 
     num_version = xbmc.getInfoLabel('System.BuildVersion')
     num_version = re.match("\d+\.\d+", num_version).group(0)
diff --git a/plugin.video.alfa/platformcode/custom_code.py b/plugin.video.alfa/platformcode/custom_code.py
index af06d125..87dcbc97 100644
--- a/plugin.video.alfa/platformcode/custom_code.py
+++ b/plugin.video.alfa/platformcode/custom_code.py
@@ -5,8 +5,11 @@
 
 import os
 import json
+import traceback
+import xbmc
+import xbmcaddon
 
-from platformcode import config, logger
+from platformcode import config, logger, platformtools
 
 from core import jsontools
 from core import filetools
@@ -54,6 +57,15 @@ def init():
     """
     
     try:
+        #QUASAR: Preguntamos si se hacen modificaciones a Quasar
+        if not filetools.exists(os.path.join(config.get_data_path(), "quasar.json")) and not config.get_setting('addon_quasar_update', default=False):
+            question_update_external_addon("quasar")
+        
+        #QUASAR: Hacemos las modificaciones a Quasar, si está permitido, y si está instalado
+        if config.get_setting('addon_quasar_update', default=False):
+            if not update_external_addon("quasar"):
+                platformtools.dialog_notification("Actualización Quasar", "Ha fallado. Consulte el log")
+        
         #Existe carpeta "custom_code" ? Si no existe se crea y se sale
         custom_code_dir = os.path.join(config.get_data_path(), 'custom_code')
         if os.path.exists(custom_code_dir) == False:
@@ -70,7 +82,7 @@ def init():
             #Se verifica si la versión del .json y del add-on son iguales.  Si es así se sale.  Si no se copia "custom_code" al add-on
             verify_copy_folders(custom_code_dir, custom_code_json_path)
     except:
-        pass
+        logger.error(traceback.format_exc())
             
 
 def create_folder_structure(custom_code_dir):
@@ -88,11 +100,11 @@ def create_folder_structure(custom_code_dir):
     return
 
 
-def create_json(custom_code_json_path):
+def create_json(custom_code_json_path, json_name=json_data_file_name):
     logger.info()
 
     #Guardamaos el json con la versión de Alfa vacía, para permitir hacer la primera copia
-    json_data_file = filetools.join(custom_code_json_path, json_data_file_name)
+    json_data_file = filetools.join(custom_code_json_path, json_name)
     json_file = open(json_data_file, "a+")
     json_file.write(json.dumps({"addon_version": ""}))
     json_file.close()
@@ -123,3 +135,55 @@ def verify_copy_folders(custom_code_dir, custom_code_json_path):
     filetools.write(json_data_file, jsontools.dump(json_data))
 
     return
+
+    
+def question_update_external_addon(addon_name):
+    logger.info(addon_name)
+    
+    #Verificamos que el addon está instalado
+    stat = False
+    if xbmc.getCondVisibility('System.HasAddon("plugin.video.%s")' % addon_name):
+        #Si es la primera vez que se pregunta por la actualización del addon externo, recogemos la respuesta,  
+        # guardaos un .json en userdat/alfa para no volver a preguntar otra vez, y se actualiza el setting en Alfa.
+        stat = platformtools.dialog_yesno('Actualización de %s' % addon_name.capitalize(), '¿Quiere que actualicemos Quasar para que sea compatible con las últimas versiones de Kodi? (recomendado: SÍ)', '', 'Si actualiza Quasar, reinicie Kodi en un par de minutos')
+
+        #Con la respuesta actualizamos la variable en Alfa settings.xml.  Se puede cambiar en Ajustes de Alfa, Otros
+        if stat:
+            config.set_setting('addon_quasar_update', True)
+        else:
+            config.set_setting('addon_quasar_update', False)
+            
+        #Creamos un .json en userdata para no volver a preguntar otra vez
+        create_json(config.get_data_path(), "%s.json" % addon_name)
+    
+    return stat
+    
+def update_external_addon(addon_name):
+    logger.info(addon_name)
+    
+    #Verificamos que el addon está instalado
+    if xbmc.getCondVisibility('System.HasAddon("plugin.video.%s")' % addon_name):
+        #Path de actuali<aciones de Alfa
+        alfa_addon_updates = filetools.join(config.get_runtime_path(), filetools.join("lib", addon_name))
+        
+        #Path de destino en addon externo
+        __settings__ = xbmcaddon.Addon(id="plugin.video." + addon_name)
+        if addon_name.lower() in ['quasar', 'elementum']:
+            addon_path = filetools.join(xbmc.translatePath(__settings__.getAddonInfo('Path')), filetools.join("resources", filetools.join("site-packages", addon_name)))
+        else:
+            addon_path = ''
+        
+        #Hay modificaciones en Alfa? Las copiamos al addon
+        if filetools.exists(alfa_addon_updates) and filetools.exists(addon_path):
+            for root, folders, files in os.walk(alfa_addon_updates):
+                for file in files:
+                    input_file = filetools.join(root, file)
+                    output_file = input_file.replace(alfa_addon_updates, addon_path)
+                    if filetools.copy(input_file, output_file, silent=True) == False:
+                        logger.error('Error en la copia: Input: %s o Output: %s' % (input_file, output_file))
+                        return False
+            return True
+        else:
+            logger.error('Alguna carpeta no existe: Alfa: %s o %s: %s' % (alfa_addon_updates, addon_name, addon_path))
+    
+    return False
\ No newline at end of file
diff --git a/plugin.video.alfa/platformcode/launcher.py b/plugin.video.alfa/platformcode/launcher.py
index 1f5b5719..210bc67c 100644
--- a/plugin.video.alfa/platformcode/launcher.py
+++ b/plugin.video.alfa/platformcode/launcher.py
@@ -1,475 +1,478 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-# XBMC Launcher (xbmc / kodi)
-# ------------------------------------------------------------
-
-import os
-import sys
-import urllib2
-
-from core import channeltools
-from core import scrapertools
-from core import servertools
-from core import videolibrarytools
-from core import trakt_tools
-from core.item import Item
-from platformcode import config, logger
-from platformcode import platformtools
-from platformcode.logger import WebErrorException
-
-
-def start():
-    """ Primera funcion que se ejecuta al entrar en el plugin.
-    Dentro de esta funcion deberian ir todas las llamadas a las
-    funciones que deseamos que se ejecuten nada mas abrir el plugin.
-    """
-    logger.info()
-    #config.set_setting('show_once', True)
-    # Test if all the required directories are created
-    config.verify_directories_created()
-
-
-def run(item=None):
-    logger.info()
-
-    if not item:
-        # Extract item from sys.argv
-        if sys.argv[2]:
-            item = Item().fromurl(sys.argv[2])
-
-        # If no item, this is mainlist
-        else:
-            if config.get_setting("start_page"):
-
-                if not config.get_setting("custom_start"):
-                    category = config.get_setting("category").lower()
-                    item = Item(channel="news", action="novedades", extra=category, mode = 'silent')
-                else:
-                    from channels import side_menu
-                    item= Item()
-                    item = side_menu.check_user_home(item)
-                    item.start = True;
-            else:
-                item = Item(channel="channelselector", action="getmainlist", viewmode="movie")
-        if not config.get_setting('show_once'):
-            from platformcode import xbmc_videolibrary
-            xbmc_videolibrary.ask_set_content(1)
-            config.set_setting('show_once', True)
-
-    logger.info(item.tostring())
-
-    try:
-        # If item has no action, stops here
-        if item.action == "":
-            logger.info("Item sin accion")
-            return
-
-        # Action for main menu in channelselector
-        elif item.action == "getmainlist":
-            import channelselector
-
-            itemlist = channelselector.getmainlist()
-
-            platformtools.render_items(itemlist, item)
-
-        # Action for channel types on channelselector: movies, series, etc.
-        elif item.action == "getchanneltypes":
-            import channelselector
-            itemlist = channelselector.getchanneltypes()
-
-            platformtools.render_items(itemlist, item)
-
-        # Action for channel listing on channelselector
-        elif item.action == "filterchannels":
-            import channelselector
-            itemlist = channelselector.filterchannels(item.channel_type)
-
-            platformtools.render_items(itemlist, item)
-
-        # Special action for playing a video from the library
-        elif item.action == "play_from_library":
-            play_from_library(item)
-            return
-
-        elif item.action == "keymap":
-            from platformcode import keymaptools
-            if item.open:
-                return keymaptools.open_shortcut_menu()
-            else:
-                return keymaptools.set_key()
-
-        elif item.action == "script":
-            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)
-
-        # 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
-            if item.action == "mainlist":
-
-
-                # Parental control
-                # If it is an adult channel, and user has configured pin, asks for it
-                if channeltools.is_adult(item.channel) and config.get_setting("adult_request_password"):
-                    tecleado = platformtools.dialog_input("", config.get_localized_string(60334), True)
-                    if tecleado is None or tecleado != config.get_setting("adult_password"):
-                        return
-
-            # # Actualiza el canal individual
-            # if (item.action == "mainlist" and item.channel != "channelselector" and
-            #             config.get_setting("check_for_channel_updates") == True):
-            #     from core import updater
-            #     updater.update_channel(item.channel)
-
-            # Checks if channel exists
-            channel_file = os.path.join(config.get_runtime_path(),
-                                        'channels', item.channel + ".py")
-            logger.info("channel_file=%s" % channel_file)
-
-            channel = None
-
-            if os.path.exists(channel_file):
-                try:
-                    channel = __import__('channels.%s' % item.channel, None,
-                                         None, ["channels.%s" % item.channel])
-                except ImportError:
-                    exec "import channels." + item.channel + " as channel"
-
-            logger.info("Running channel %s | %s" % (channel.__name__, channel.__file__))
-
-            # Special play action
-            if item.action == "play":
-                #define la info para trakt
-                try:
-                    trakt_tools.set_trakt_info(item)
-                except:
-                    pass
-                logger.info("item.action=%s" % item.action.upper())
-                # logger.debug("item_toPlay: " + "\n" + item.tostring('\n'))
-
-                # First checks if channel has a "play" function
-                if hasattr(channel, 'play'):
-                    logger.info("Executing channel 'play' method")
-                    itemlist = channel.play(item)
-                    b_favourite = item.isFavourite
-                    # Play should return a list of playable URLS
-                    if len(itemlist) > 0 and isinstance(itemlist[0], Item):
-                        item = itemlist[0]
-                        if b_favourite:
-                            item.isFavourite = True
-                        platformtools.play_video(item)
-
-                    # Permitir varias calidades desde play en el canal
-                    elif len(itemlist) > 0 and isinstance(itemlist[0], list):
-                        item.video_urls = itemlist
-                        platformtools.play_video(item)
-
-                    # If not, shows user an error message
-                    else:
-                        platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(60339))
-
-                # If player don't have a "play" function, not uses the standard play from platformtools
-                else:
-                    logger.info("Executing core 'play' method")
-                    platformtools.play_video(item)
-
-            # Special action for findvideos, where the plugin looks for known urls
-            elif item.action == "findvideos":
-
-                # First checks if channel has a "findvideos" function
-                if hasattr(channel, 'findvideos'):
-                    itemlist = getattr(channel, item.action)(item)
-                    itemlist = servertools.filter_servers(itemlist)
-
-                # If not, uses the generic findvideos function
-                else:
-                    logger.info("No channel 'findvideos' method, "
-                                "executing core method")
-                    itemlist = servertools.find_video_items(item)
-
-                if config.get_setting("max_links", "videolibrary") != 0:
-                    itemlist = limit_itemlist(itemlist)
-
-                from platformcode import subtitletools
-                subtitletools.saveSubtitleName(item)
-
-                platformtools.render_items(itemlist, item)
-
-            # Special action for adding a movie to the library
-            elif item.action == "add_pelicula_to_library":
-                videolibrarytools.add_movie(item)
-
-            # Special action for adding a serie to the library
-            elif item.action == "add_serie_to_library":
-                videolibrarytools.add_tvshow(item, channel)
-
-            # Special action for downloading all episodes from a serie
-            elif item.action == "download_all_episodes":
-                from channels import downloads
-                item.action = item.extra
-                del item.extra
-                downloads.save_download(item)
-
-            # Special action for searching, first asks for the words then call the "search" function
-            elif item.action == "search":
-                logger.info("item.action=%s" % item.action.upper())
-
-                last_search = ""
-                last_search_active = config.get_setting("last_search", "search")
-                if last_search_active:
-                    try:
-                        current_saved_searches_list = list(config.get_setting("saved_searches_list", "search"))
-                        last_search = current_saved_searches_list[0]
-                    except:
-                        pass
-
-                tecleado = platformtools.dialog_input(last_search)
-                if tecleado is not None:
-                    if last_search_active and not tecleado.startswith("http"):
-                        from channels import search
-                        search.save_search(tecleado)
-
-                    itemlist = channel.search(item, tecleado)
-                else:
-                    return
-
-                platformtools.render_items(itemlist, item)
-
-            # For all other actions
-            else:
-                logger.info("Executing channel '%s' method" % item.action)
-                itemlist = getattr(channel, item.action)(item)
-                if config.get_setting('trakt_sync'):
-                    token_auth = config.get_setting("token_trakt", "trakt")
-                    if not token_auth:
-                        trakt_tools.auth_trakt()
-                    else:
-                        import xbmc
-                        if not xbmc.getCondVisibility('System.HasAddon(script.trakt)') and config.get_setting(
-                                'install_trakt'):
-                            trakt_tools.ask_install_script()
-                    itemlist = trakt_tools.trakt_check(itemlist)
-                else:
-                    config.set_setting('install_trakt', True)
-
-                platformtools.render_items(itemlist, item)
-
-    except urllib2.URLError, e:
-        import traceback
-        logger.error(traceback.format_exc())
-
-        # Grab inner and third party errors
-        if hasattr(e, 'reason'):
-            logger.error("Razon del error, codigo: %s | Razon: %s" % (str(e.reason[0]), str(e.reason[1])))
-            texto = config.get_localized_string(30050)  # "No se puede conectar con el sitio web"
-            platformtools.dialog_ok("alfa", texto)
-
-        # Grab server response errors
-        elif hasattr(e, 'code'):
-            logger.error("Codigo de error HTTP : %d" % e.code)
-            # "El sitio web no funciona correctamente (error http %d)"
-            platformtools.dialog_ok("alfa", config.get_localized_string(30051) % e.code)
-    except WebErrorException, e:
-        import traceback
-        logger.error(traceback.format_exc())
-
-        patron = 'File "' + os.path.join(config.get_runtime_path(), "channels", "").replace("\\",
-                                                                                            "\\\\") + '([^.]+)\.py"'
-        canal = scrapertools.find_single_match(traceback.format_exc(), patron)
-
-        platformtools.dialog_ok(
-            config.get_localized_string(59985) + canal,
-            config.get_localized_string(60013) %(e))
-    except:
-        import traceback
-        logger.error(traceback.format_exc())
-
-        patron = 'File "' + os.path.join(config.get_runtime_path(), "channels", "").replace("\\",
-                                                                                            "\\\\") + '([^.]+)\.py"'
-        canal = scrapertools.find_single_match(traceback.format_exc(), patron)
-
-        try:
-            import xbmc
-            if config.get_platform(True)['num_version'] < 14:
-                log_name = "xbmc.log"
-            else:
-                log_name = "kodi.log"
-            log_message = config.get_localized_string(50004) + xbmc.translatePath("special://logpath") + log_name
-        except:
-            log_message = ""
-
-        if canal:
-            platformtools.dialog_ok(
-                config.get_localized_string(60087) %canal,
-                config.get_localized_string(60014),
-                log_message)
-        else:
-            platformtools.dialog_ok(
-                config.get_localized_string(60038),
-                config.get_localized_string(60015),
-                log_message)
-
-
-
-def reorder_itemlist(itemlist):
-    logger.info()
-    # logger.debug("Inlet itemlist size: %i" % len(itemlist))
-
-    new_list = []
-    mod_list = []
-    not_mod_list = []
-
-    modified = 0
-    not_modified = 0
-
-    to_change = [[config.get_localized_string(60335), '[V]'],
-                 [config.get_localized_string(60336), '[D]']]
-
-    for item in itemlist:
-        old_title = unicode(item.title, "utf8").lower().encode("utf8")
-        for before, after in to_change:
-            if before in item.title:
-                item.title = item.title.replace(before, after)
-                break
-
-        new_title = unicode(item.title, "utf8").lower().encode("utf8")
-        if old_title != new_title:
-            mod_list.append(item)
-            modified += 1
-        else:
-            not_mod_list.append(item)
-            not_modified += 1
-
-            # logger.debug("OLD: %s | NEW: %s" % (old_title, new_title))
-
-    new_list.extend(mod_list)
-    new_list.extend(not_mod_list)
-
-    logger.info("Titulos modificados:%i | No modificados:%i" % (modified, not_modified))
-
-    if len(new_list) == 0:
-        new_list = itemlist
-
-    # logger.debug("Outlet itemlist size: %i" % len(new_list))
-    return new_list
-
-
-def limit_itemlist(itemlist):
-    logger.info()
-    # logger.debug("Inlet itemlist size: %i" % len(itemlist))
-
-    try:
-        opt = config.get_setting("max_links", "videolibrary")
-        if opt == 0:
-            new_list = itemlist
-        else:
-            i_max = 30 * opt
-            new_list = itemlist[:i_max]
-
-        # logger.debug("Outlet itemlist size: %i" % len(new_list))
-        return new_list
-    except:
-        return itemlist
-
-
-def play_from_library(item):
-    """
-        Los .strm al reproducirlos desde kodi, este espera que sea un archivo "reproducible" asi que no puede contener
-        más items, como mucho se puede colocar un dialogo de seleccion.
-        Esto lo solucionamos "engañando a kodi" y haciendole creer que se ha reproducido algo, asi despues mediante
-        "Container.Update()" cargamos el strm como si un item desde dentro del addon se tratara, quitando todas
-        las limitaciones y permitiendo reproducir mediante la funcion general sin tener que crear nuevos métodos para
-        la videoteca.
-        @type item: item
-        @param item: elemento con información
-    """
-    logger.info()
-    #logger.debug("item: \n" + item.tostring('\n'))
-
-    import xbmcgui
-    import xbmcplugin
-    import xbmc
-    # Intentamos reproducir una imagen (esto no hace nada y ademas no da error)
-    xbmcplugin.setResolvedUrl(int(sys.argv[1]), True,
-                              xbmcgui.ListItem(
-                                  path=os.path.join(config.get_runtime_path(), "resources", "subtitle.mp4")))
-
-    # Por si acaso la imagen hiciera (en futuras versiones) le damos a stop para detener la reproduccion
-    xbmc.Player().stop()
-
-    # modificamos el action (actualmente la videoteca necesita "findvideos" ya que es donde se buscan las fuentes
-    item.action = "findvideos"
-
-    window_type = config.get_setting("window_type", "videolibrary")
-
-    # y volvemos a lanzar kodi
-    if xbmc.getCondVisibility('Window.IsMedia') and not window_type == 1:
-        # Ventana convencional
-        xbmc.executebuiltin("Container.Update(" + sys.argv[0] + "?" + item.tourl() + ")")
-
-    else:
-        # Ventana emergente
-        from channels import videolibrary
-        p_dialog = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(70004))
-        p_dialog.update(0, '')
-
-        itemlist = videolibrary.findvideos(item)
-
-
-        while platformtools.is_playing():
-                # Ventana convencional
-                from time import sleep
-                sleep(5)
-        p_dialog.update(50, '')
-
-        '''# Se filtran los enlaces segun la lista negra
-        if config.get_setting('filter_servers', "servers"):
-            itemlist = servertools.filter_servers(itemlist)'''
-
-        # Se limita la cantidad de enlaces a mostrar
-        if config.get_setting("max_links", "videolibrary") != 0:
-            itemlist = limit_itemlist(itemlist)
-
-        # Se "limpia" ligeramente la lista de enlaces
-        if config.get_setting("replace_VD", "videolibrary") == 1:
-            itemlist = reorder_itemlist(itemlist)
-
-
-        import time
-        p_dialog.update(100, '')
-        time.sleep(0.5)
-        p_dialog.close()
-
-
-        if len(itemlist) > 0:
-            while not xbmc.Monitor().abortRequested():
-                # El usuario elige el mirror
-                opciones = []
-                for item in itemlist:
-                    opciones.append(item.title)
-
-                # Se abre la ventana de seleccion
-                if (item.contentSerieName != "" and
-                            item.contentSeason != "" and
-                            item.contentEpisodeNumber != ""):
-                    cabecera = ("%s - %sx%s -- %s" %
-                                (item.contentSerieName,
-                                 item.contentSeason,
-                                 item.contentEpisodeNumber,
-                                 config.get_localized_string(30163)))
-                else:
-                    cabecera = config.get_localized_string(30163)
-
-                seleccion = platformtools.dialog_select(cabecera, opciones)
-
-                if seleccion == -1:
-                    return
-                else:
-                    item = videolibrary.play(itemlist[seleccion])[0]
-                    platformtools.play_video(item)
-
-                from channels import autoplay
-                if (platformtools.is_playing() and item.action) or item.server == 'torrent' or autoplay.is_active(item.contentChannel):
-                    break
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# XBMC Launcher (xbmc / kodi)
+# ------------------------------------------------------------
+
+import os
+import sys
+import urllib2
+import time
+
+from core import channeltools
+from core import scrapertools
+from core import servertools
+from core import videolibrarytools
+from core import trakt_tools
+from core.item import Item
+from platformcode import config, logger
+from platformcode import platformtools
+from platformcode.logger import WebErrorException
+
+
+def start():
+    """ Primera funcion que se ejecuta al entrar en el plugin.
+    Dentro de esta funcion deberian ir todas las llamadas a las
+    funciones que deseamos que se ejecuten nada mas abrir el plugin.
+    """
+    logger.info()
+    #config.set_setting('show_once', True)
+    # Test if all the required directories are created
+    config.verify_directories_created()
+
+
+def run(item=None):
+    logger.info()
+
+    if not item:
+        # Extract item from sys.argv
+        if sys.argv[2]:
+            item = Item().fromurl(sys.argv[2])
+
+        # If no item, this is mainlist
+        else:
+            if config.get_setting("start_page"):
+
+                if not config.get_setting("custom_start"):
+                    category = config.get_setting("category").lower()
+                    item = Item(channel="news", action="novedades", extra=category, mode = 'silent')
+                else:
+                    from channels import side_menu
+                    item= Item()
+                    item = side_menu.check_user_home(item)
+                    item.start = True;
+            else:
+                item = Item(channel="channelselector", action="getmainlist", viewmode="movie")
+        if not config.get_setting('show_once'):
+            from platformcode import xbmc_videolibrary
+            xbmc_videolibrary.ask_set_content(1)
+            config.set_setting('show_once', True)
+
+    logger.info(item.tostring())
+
+    try:
+        # If item has no action, stops here
+        if item.action == "":
+            logger.info("Item sin accion")
+            return
+
+        # Action for main menu in channelselector
+        elif item.action == "getmainlist":
+            import channelselector
+
+            itemlist = channelselector.getmainlist()
+
+            platformtools.render_items(itemlist, item)
+
+        # Action for channel types on channelselector: movies, series, etc.
+        elif item.action == "getchanneltypes":
+            import channelselector
+            itemlist = channelselector.getchanneltypes()
+
+            platformtools.render_items(itemlist, item)
+
+        # Action for channel listing on channelselector
+        elif item.action == "filterchannels":
+            import channelselector
+            itemlist = channelselector.filterchannels(item.channel_type)
+
+            platformtools.render_items(itemlist, item)
+
+        # Special action for playing a video from the library
+        elif item.action == "play_from_library":
+            play_from_library(item)
+            return
+
+        elif item.action == "keymap":
+            from platformcode import keymaptools
+            if item.open:
+                return keymaptools.open_shortcut_menu()
+            else:
+                return keymaptools.set_key()
+
+        elif item.action == "script":
+            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)
+
+        # 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
+            if item.action == "mainlist":
+
+
+                # Parental control
+                # If it is an adult channel, and user has configured pin, asks for it
+                if channeltools.is_adult(item.channel) and config.get_setting("adult_request_password"):
+                    tecleado = platformtools.dialog_input("", config.get_localized_string(60334), True)
+                    if tecleado is None or tecleado != config.get_setting("adult_password"):
+                        return
+
+            # # Actualiza el canal individual
+            # if (item.action == "mainlist" and item.channel != "channelselector" and
+            #             config.get_setting("check_for_channel_updates") == True):
+            #     from core import updater
+            #     updater.update_channel(item.channel)
+
+            # Checks if channel exists
+            channel_file = os.path.join(config.get_runtime_path(),
+                                        'channels', item.channel + ".py")
+            logger.info("channel_file=%s" % channel_file)
+
+            channel = None
+
+            if os.path.exists(channel_file):
+                try:
+                    channel = __import__('channels.%s' % item.channel, None,
+                                         None, ["channels.%s" % item.channel])
+                except ImportError:
+                    exec "import channels." + item.channel + " as channel"
+
+            logger.info("Running channel %s | %s" % (channel.__name__, channel.__file__))
+
+            # Special play action
+            if item.action == "play":
+                #define la info para trakt
+                try:
+                    trakt_tools.set_trakt_info(item)
+                except:
+                    pass
+                logger.info("item.action=%s" % item.action.upper())
+                # logger.debug("item_toPlay: " + "\n" + item.tostring('\n'))
+
+                # First checks if channel has a "play" function
+                if hasattr(channel, 'play'):
+                    logger.info("Executing channel 'play' method")
+                    itemlist = channel.play(item)
+                    b_favourite = item.isFavourite
+                    # Play should return a list of playable URLS
+                    if len(itemlist) > 0 and isinstance(itemlist[0], Item):
+                        item = itemlist[0]
+                        if b_favourite:
+                            item.isFavourite = True
+                        platformtools.play_video(item)
+
+                    # Permitir varias calidades desde play en el canal
+                    elif len(itemlist) > 0 and isinstance(itemlist[0], list):
+                        item.video_urls = itemlist
+                        platformtools.play_video(item)
+
+                    # If not, shows user an error message
+                    else:
+                        platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(60339))
+
+                # If player don't have a "play" function, not uses the standard play from platformtools
+                else:
+                    logger.info("Executing core 'play' method")
+                    platformtools.play_video(item)
+
+            # Special action for findvideos, where the plugin looks for known urls
+            elif item.action == "findvideos":
+
+                # First checks if channel has a "findvideos" function
+                if hasattr(channel, 'findvideos'):
+                    itemlist = getattr(channel, item.action)(item)
+                    itemlist = servertools.filter_servers(itemlist)
+
+                # If not, uses the generic findvideos function
+                else:
+                    logger.info("No channel 'findvideos' method, "
+                                "executing core method")
+                    itemlist = servertools.find_video_items(item)
+
+                if config.get_setting("max_links", "videolibrary") != 0:
+                    itemlist = limit_itemlist(itemlist)
+
+                from platformcode import subtitletools
+                subtitletools.saveSubtitleName(item)
+
+                platformtools.render_items(itemlist, item)
+
+            # Special action for adding a movie to the library
+            elif item.action == "add_pelicula_to_library":
+                videolibrarytools.add_movie(item)
+
+            # Special action for adding a serie to the library
+            elif item.action == "add_serie_to_library":
+                videolibrarytools.add_tvshow(item, channel)
+
+            # Special action for downloading all episodes from a serie
+            elif item.action == "download_all_episodes":
+                from channels import downloads
+                item.action = item.extra
+                del item.extra
+                downloads.save_download(item)
+
+            # Special action for searching, first asks for the words then call the "search" function
+            elif item.action == "search":
+                logger.info("item.action=%s" % item.action.upper())
+
+                last_search = ""
+                last_search_active = config.get_setting("last_search", "search")
+                if last_search_active:
+                    try:
+                        current_saved_searches_list = list(config.get_setting("saved_searches_list", "search"))
+                        last_search = current_saved_searches_list[0]
+                    except:
+                        pass
+
+                tecleado = platformtools.dialog_input(last_search)
+                if tecleado is not None:
+                    if last_search_active and not tecleado.startswith("http"):
+                        from channels import search
+                        search.save_search(tecleado)
+
+                    itemlist = channel.search(item, tecleado)
+                else:
+                    return
+
+                platformtools.render_items(itemlist, item)
+
+            # For all other actions
+            else:
+                logger.info("Executing channel '%s' method" % item.action)
+                itemlist = getattr(channel, item.action)(item)
+                if config.get_setting('trakt_sync'):
+                    token_auth = config.get_setting("token_trakt", "trakt")
+                    if not token_auth:
+                        trakt_tools.auth_trakt()
+                    else:
+                        import xbmc
+                        if not xbmc.getCondVisibility('System.HasAddon(script.trakt)') and config.get_setting(
+                                'install_trakt'):
+                            trakt_tools.ask_install_script()
+                    itemlist = trakt_tools.trakt_check(itemlist)
+                else:
+                    config.set_setting('install_trakt', True)
+
+                platformtools.render_items(itemlist, item)
+
+    except urllib2.URLError, e:
+        import traceback
+        logger.error(traceback.format_exc())
+
+        # Grab inner and third party errors
+        if hasattr(e, 'reason'):
+            logger.error("Razon del error, codigo: %s | Razon: %s" % (str(e.reason[0]), str(e.reason[1])))
+            texto = config.get_localized_string(30050)  # "No se puede conectar con el sitio web"
+            platformtools.dialog_ok("alfa", texto)
+
+        # Grab server response errors
+        elif hasattr(e, 'code'):
+            logger.error("Codigo de error HTTP : %d" % e.code)
+            # "El sitio web no funciona correctamente (error http %d)"
+            platformtools.dialog_ok("alfa", config.get_localized_string(30051) % e.code)
+    except WebErrorException, e:
+        import traceback
+        logger.error(traceback.format_exc())
+
+        patron = 'File "' + os.path.join(config.get_runtime_path(), "channels", "").replace("\\",
+                                                                                            "\\\\") + '([^.]+)\.py"'
+        canal = scrapertools.find_single_match(traceback.format_exc(), patron)
+
+        platformtools.dialog_ok(
+            config.get_localized_string(59985) + canal,
+            config.get_localized_string(60013) %(e))
+    except:
+        import traceback
+        logger.error(traceback.format_exc())
+
+        patron = 'File "' + os.path.join(config.get_runtime_path(), "channels", "").replace("\\",
+                                                                                            "\\\\") + '([^.]+)\.py"'
+        canal = scrapertools.find_single_match(traceback.format_exc(), patron)
+
+        try:
+            import xbmc
+            if config.get_platform(True)['num_version'] < 14:
+                log_name = "xbmc.log"
+            else:
+                log_name = "kodi.log"
+            log_message = config.get_localized_string(50004) + xbmc.translatePath("special://logpath") + log_name
+        except:
+            log_message = ""
+
+        if canal:
+            platformtools.dialog_ok(
+                config.get_localized_string(60087) %canal,
+                config.get_localized_string(60014),
+                log_message)
+        else:
+            platformtools.dialog_ok(
+                config.get_localized_string(60038),
+                config.get_localized_string(60015),
+                log_message)
+
+
+
+def reorder_itemlist(itemlist):
+    logger.info()
+    # logger.debug("Inlet itemlist size: %i" % len(itemlist))
+
+    new_list = []
+    mod_list = []
+    not_mod_list = []
+
+    modified = 0
+    not_modified = 0
+
+    to_change = [[config.get_localized_string(60335), '[V]'],
+                 [config.get_localized_string(60336), '[D]']]
+
+    for item in itemlist:
+        old_title = unicode(item.title, "utf8").lower().encode("utf8")
+        for before, after in to_change:
+            if before in item.title:
+                item.title = item.title.replace(before, after)
+                break
+
+        new_title = unicode(item.title, "utf8").lower().encode("utf8")
+        if old_title != new_title:
+            mod_list.append(item)
+            modified += 1
+        else:
+            not_mod_list.append(item)
+            not_modified += 1
+
+            # logger.debug("OLD: %s | NEW: %s" % (old_title, new_title))
+
+    new_list.extend(mod_list)
+    new_list.extend(not_mod_list)
+
+    logger.info("Titulos modificados:%i | No modificados:%i" % (modified, not_modified))
+
+    if len(new_list) == 0:
+        new_list = itemlist
+
+    # logger.debug("Outlet itemlist size: %i" % len(new_list))
+    return new_list
+
+
+def limit_itemlist(itemlist):
+    logger.info()
+    # logger.debug("Inlet itemlist size: %i" % len(itemlist))
+
+    try:
+        opt = config.get_setting("max_links", "videolibrary")
+        if opt == 0:
+            new_list = itemlist
+        else:
+            i_max = 30 * opt
+            new_list = itemlist[:i_max]
+
+        # logger.debug("Outlet itemlist size: %i" % len(new_list))
+        return new_list
+    except:
+        return itemlist
+
+
+def play_from_library(item):
+    """
+        Los .strm al reproducirlos desde kodi, este espera que sea un archivo "reproducible" asi que no puede contener
+        más items, como mucho se puede colocar un dialogo de seleccion.
+        Esto lo solucionamos "engañando a kodi" y haciendole creer que se ha reproducido algo, asi despues mediante
+        "Container.Update()" cargamos el strm como si un item desde dentro del addon se tratara, quitando todas
+        las limitaciones y permitiendo reproducir mediante la funcion general sin tener que crear nuevos métodos para
+        la videoteca.
+        @type item: item
+        @param item: elemento con información
+    """
+    logger.info()
+    #logger.debug("item: \n" + item.tostring('\n'))
+
+    import xbmcgui
+    import xbmcplugin
+    import xbmc
+    from time import sleep
+    
+    # Intentamos reproducir una imagen (esto no hace nada y ademas no da error)
+    xbmcplugin.setResolvedUrl(int(sys.argv[1]), True,
+                              xbmcgui.ListItem(
+                                  path=os.path.join(config.get_runtime_path(), "resources", "subtitle.mp4")))
+
+    # Por si acaso la imagen hiciera (en futuras versiones) le damos a stop para detener la reproduccion
+    sleep(0.5)              ### Si no se pone esto se bloquea Kodi
+    xbmc.Player().stop()
+
+    # modificamos el action (actualmente la videoteca necesita "findvideos" ya que es donde se buscan las fuentes
+    item.action = "findvideos"
+
+    window_type = config.get_setting("window_type", "videolibrary")
+
+    # y volvemos a lanzar kodi
+    if xbmc.getCondVisibility('Window.IsMedia') and not window_type == 1:
+        # Ventana convencional
+        xbmc.executebuiltin("Container.Update(" + sys.argv[0] + "?" + item.tourl() + ")")
+
+    else:
+        # Ventana emergente
+        from channels import videolibrary
+        p_dialog = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(70004))
+        p_dialog.update(0, '')
+
+        itemlist = videolibrary.findvideos(item)
+
+
+        while platformtools.is_playing():
+                # Ventana convencional
+                sleep(5)
+        p_dialog.update(50, '')
+
+        '''# Se filtran los enlaces segun la lista negra
+        if config.get_setting('filter_servers', "servers"):
+            itemlist = servertools.filter_servers(itemlist)'''
+
+        # Se limita la cantidad de enlaces a mostrar
+        if config.get_setting("max_links", "videolibrary") != 0:
+            itemlist = limit_itemlist(itemlist)
+
+        # Se "limpia" ligeramente la lista de enlaces
+        if config.get_setting("replace_VD", "videolibrary") == 1:
+            itemlist = reorder_itemlist(itemlist)
+
+
+        import time
+        p_dialog.update(100, '')
+        time.sleep(0.5)
+        p_dialog.close()
+
+
+        if len(itemlist) > 0:
+            while not xbmc.Monitor().abortRequested():
+                # El usuario elige el mirror
+                opciones = []
+                for item in itemlist:
+                    opciones.append(item.title)
+
+                # Se abre la ventana de seleccion
+                if (item.contentSerieName != "" and
+                            item.contentSeason != "" and
+                            item.contentEpisodeNumber != ""):
+                    cabecera = ("%s - %sx%s -- %s" %
+                                (item.contentSerieName,
+                                 item.contentSeason,
+                                 item.contentEpisodeNumber,
+                                 config.get_localized_string(30163)))
+                else:
+                    cabecera = config.get_localized_string(30163)
+
+                seleccion = platformtools.dialog_select(cabecera, opciones)
+
+                if seleccion == -1:
+                    return
+                else:
+                    item = videolibrary.play(itemlist[seleccion])[0]
+                    platformtools.play_video(item)
+
+                from channels import autoplay
+                if (platformtools.is_playing() and item.action) or item.server == 'torrent' or autoplay.is_active(item.contentChannel):
+                    break
diff --git a/plugin.video.alfa/platformcode/platformtools.py b/plugin.video.alfa/platformcode/platformtools.py
index 51140971..b9b1beef 100644
--- a/plugin.video.alfa/platformcode/platformtools.py
+++ b/plugin.video.alfa/platformcode/platformtools.py
@@ -19,7 +19,7 @@ import xbmcplugin
 from channelselector import get_thumb
 from platformcode import unify
 from core import channeltools
-from core import trakt_tools
+from core import trakt_tools, scrapertoolsV2
 from core.item import Item
 from platformcode import logger
 
@@ -739,15 +739,53 @@ def get_seleccion(default_action, opciones, seleccion, video_urls):
         seleccion = dialog_select(config.get_localized_string(30163), opciones)
     # Ver en calidad baja
     elif default_action == 1:
-        seleccion = 0
+        resolutions = []
+        for url in video_urls:
+            res = calcResolution(url[0])
+            if res:
+                resolutions.append(res)
+        if resolutions:
+            seleccion = resolutions.index(min(resolutions))
+        else:
+            seleccion = 0
     # Ver en alta calidad
     elif default_action == 2:
-        seleccion = len(video_urls) - 1
+        resolutions = []
+        for url in video_urls:
+            res = calcResolution(url[0])
+            if res:
+                resolutions.append(res)
+        if resolutions:
+            seleccion = resolutions.index(max(resolutions))
+        else:
+            seleccion = len(video_urls) - 1
     else:
         seleccion = 0
     return seleccion
 
 
+def calcResolution(option):
+    match = scrapertoolsV2.find_single_match(option, '([0-9]{2,4})x([0-9]{2,4})')
+    resolution = False
+    if match:
+        resolution = int(match[0])*int(match[1])
+    else:
+        if '240p' in option:
+            resolution = 320 * 240
+        elif '360p' in option:
+            resolution = 480 * 360
+        elif ('480p' in option) or ('480i' in option):
+            resolution = 720 * 480
+        elif ('576p' in option) or ('576p' in option):
+            resolution = 720 * 576
+        elif ('720p' in option) or ('HD' in option):
+            resolution = 1280 * 720
+        elif ('1080p' in option) or ('1080i' in option) or ('Full HD' in option):
+            resolution = 1920 * 1080
+
+    return resolution
+
+
 def show_channel_settings(**kwargs):
     """
     Muestra un cuadro de configuracion personalizado para cada canal y guarda los datos al cerrarlo.
@@ -1109,6 +1147,8 @@ def play_torrent(item, xlistitem, mediaurl):
         url = ''
         url_stat = False
         torrents_path = ''
+        referer = None
+        post = None
         videolibrary_path = config.get_videolibrary_path()                  #Calculamos el path absoluto a partir de la Videoteca
         if videolibrary_path.lower().startswith("smb://"):                  #Si es una conexión SMB, usamos userdata local
             videolibrary_path = config.get_data_path()                      #Calculamos el path absoluto a partir de Userdata
@@ -1124,7 +1164,11 @@ def play_torrent(item, xlistitem, mediaurl):
             timeout = 10
             if item.torrent_alt:
                 timeout = 5
-            url = videolibrarytools.caching_torrents(item.url, torrents_path=torrents_path, timeout=timeout)  #Descargamos el .torrent
+            #Si es una llamada con POST, lo preparamos
+            if item.referer: referer = item.referer
+            if item.post: post = item.post
+            #Descargamos el .torrent
+            url = videolibrarytools.caching_torrents(item.url, referer, post, torrents_path=torrents_path, timeout=timeout)
             if url:
                 url_stat = True
                 item.url = url
diff --git a/plugin.video.alfa/resources/language/English/strings.po b/plugin.video.alfa/resources/language/English/strings.po
index 35faa2f0..2cdf9131 100644
--- a/plugin.video.alfa/resources/language/English/strings.po
+++ b/plugin.video.alfa/resources/language/English/strings.po
@@ -498,11 +498,11 @@ msgid "Search for actor/actress"
 msgstr ""
 
 msgctxt "#60000"
-msgid "Filtra server (Black List)"
+msgid "Filter server (Black List)"
 msgstr ""
 
 msgctxt "#60001"
-msgid "Filtra server (Black List)\nNessun collegamento disponibile che soddisfi i requisiti della Black list.\nRiprova modificando il filtro in 'Configurazione Server"
+msgid "No links available that meets the requirements of the Black list. Try again by changing the filter in 'Server Configuration"
 msgstr ""
 
 msgctxt "#60003"
@@ -1046,7 +1046,7 @@ msgid "Movie"
 msgstr ""
 
 msgctxt "#60245"
-msgid "Series"
+msgid "tv show"
 msgstr ""
 
 msgctxt "#60246"
@@ -1249,10 +1249,6 @@ msgctxt "#60297"
 msgid "Find %s possible matches"
 msgstr ""
 
-msgctxt "#60298"
-msgid "[%s]: Select the correct TV series"
-msgstr ""
-
 msgctxt "#60299"
 msgid "Not found in the language '%s'"
 msgstr ""
@@ -2550,7 +2546,7 @@ msgid "Show option \"All Seasons\"."
 msgstr ""
 
 msgctxt "#60643"
-msgid "Do not combine the seasons of the series""
+msgid "Do not combine the seasons of the series"
 msgstr ""
 
 msgctxt "#60644"
@@ -4267,10 +4263,6 @@ msgctxt "#70392"
 msgid "Rate with a [COLOR %s]%s[/ COLOR]"
 msgstr ""
 
-msgctxt "#70393"
-msgid "[%s]: Select the correct %s "
-msgstr ""
-
 msgctxt "#70394"
 msgid "Action"
 msgstr ""
@@ -4811,10 +4803,6 @@ msgctxt "#70528"
 msgid "Default folder"
 msgstr ""
 
-msgctxt "#70529"
-msgid "Repeated link"
-msgstr ""
-
 msgctxt "#70530"
 msgid "You already have this link in the folder"
 msgstr ""
@@ -4943,3 +4931,6 @@ msgctxt "#70561"
 msgid "Search Similar
 msgstr ""
 
+msgctxt "#70562"
+msgid "autoplay"
+msgstr "Enable autoplay in all channels"
\ No newline at end of file
diff --git a/plugin.video.alfa/resources/language/Italian/strings.po b/plugin.video.alfa/resources/language/Italian/strings.po
index 21484f69..43a4812a 100644
--- a/plugin.video.alfa/resources/language/Italian/strings.po
+++ b/plugin.video.alfa/resources/language/Italian/strings.po
@@ -498,12 +498,12 @@ msgid "Search for actor/actress"
 msgstr "Cerca attore/attrice"
 
 msgctxt "#60000"
-msgid "Filtra server (Black List)"
+msgid "Filter server (Black List)"
 msgstr "Filtra server (Black List)"
 
 msgctxt "#60001"
-msgid "Filtra server (Black List)\nNessun collegamento disponibile che soddisfi i requisiti della Black list.\nRiprova modificando il filtro in 'Configurazione Server"
-msgstr "Filtra server (Black List)\nNessun collegamento disponibile che soddisfi i requisiti della Black list.\nRiprova modificando il filtro in 'Configurazione Server"
+msgid "No links available that meets the requirements of the Black list. Try again by changing the filter in 'Server Configuration"
+msgstr "Nessun collegamento disponibile che soddisfi i requisiti della Black list. Riprova modificando il filtro in 'Configurazione Server"
 
 msgctxt "#60003"
 msgid "Connessione con %s"
@@ -1034,8 +1034,8 @@ msgid "Movie"
 msgstr "Film"
 
 msgctxt "#60245"
-msgid "Series"
-msgstr "Serie"
+msgid "tv show"
+msgstr "serie"
 
 msgctxt "#60246"
 msgid "Full information"
@@ -1237,10 +1237,6 @@ msgctxt "#60297"
 msgid "Find %s possible matches"
 msgstr "Trovate %s possibili corrispondenze"
 
-msgctxt "#60298"
-msgid "[%s]: Select the correct TV series"
-msgstr "[%s]: Seleziona la serie corretta"
-
 msgctxt "#60299"
 msgid "Not found in the language '%s'"
 msgstr "Non trovato nella lingua '%s'"
@@ -4247,10 +4243,6 @@ msgctxt "#70392"
 msgid "Rate with a [COLOR %s]%s[/ COLOR]"
 msgstr "Dai un punteggio con un [COLOR %s]%s[/COLOR]"
 
-msgctxt "#70393"
-msgid "[%s]: Select the correct %s "
-msgstr "[%s]: Seleziona il %s corretto"
-
 msgctxt "#70394"
 msgid "Action"
 msgstr "Azione"
@@ -4799,10 +4791,6 @@ msgctxt "#70528"
 msgid "Default folder"
 msgstr "Cartella di Default"
 
-msgctxt "#70529"
-msgid "Repeated link"
-msgstr "Link ripetuto"
-
 msgctxt "#70530"
 msgid "You already have this link in the folder"
 msgstr "C'è già un link nella cartella"
@@ -4932,3 +4920,6 @@ msgid "Search Similar
 msgstr "Cerca Simili"
 
 
+msgctxt "#70562"
+msgid "autoplay"
+msgstr "Abilita autoplay in tutti i canali"
\ No newline at end of file
diff --git a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po
index cfbbad13..8986f352 100644
--- a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po	
+++ b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po	
@@ -502,8 +502,8 @@ msgid "Filter server (Black List)"
 msgstr "Filtrar servidores (Lista Negra)"
 
 msgctxt "#60001"
-msgid "Filter server (Black List)\nNo connection available that meets the requirements of the Black list.\nTry again by changing the filter in 'Server Configuration"
-msgstr "Filtrar servidores (Lista Negra)\nNo hay enlaces disponibles que cumplan los requisitos de su Lista Negra.\nPruebe de nuevo modificando el fíltro en 'Configuracíon Servidores"
+msgid "No links available that meets the requirements of the Black list. Try again by changing the filter in 'Server Configuration"
+msgstr "No hay enlaces disponibles que cumplan los requisitos de su Lista Negra. Pruebe de nuevo modificando el filtro en 'Configuracíon - Servidores"
 
 msgctxt "#60003"
 msgid "Connecting with %s"
@@ -1046,8 +1046,8 @@ msgid "Movie"
 msgstr "Película"
 
 msgctxt "#60245"
-msgid "Series"
-msgstr "Serie"
+msgid "tv show"
+msgstr "serie"
 
 msgctxt "#60246"
 msgid "Full information"
@@ -1249,10 +1249,6 @@ msgctxt "#60297"
 msgid "Find %s possible matches"
 msgstr "Encontrados %s posibles coincidencias"
 
-msgctxt "#60298"
-msgid "[%s]: Select the correct TV series"
-msgstr "[%s]: Selecciona la serie correcta"
-
 msgctxt "#60299"
 msgid "Not found in the language '%s'"
 msgstr "No se ha encontrado en idioma '%s'"
@@ -3358,8 +3354,16 @@ msgid "Press to 'Clear cache' saved"
 msgstr "Pulse para 'Borrar caché' guardada"
 
 msgctxt "#70164"
-msgid "Free First|Premium First|Debriders First"
-msgstr "Free primero|Premium primero|Debriders primero"
+msgid "Free First"
+msgstr "Free primero"
+
+msgctxt "#70165"
+msgid "Premium First"
+msgstr "Premium primero"
+
+msgctxt "#70166"
+msgid "Debriders First"
+msgstr "Debriders primero"
 
 msgctxt "#70167"
 msgid "Titles Options"
@@ -3674,7 +3678,7 @@ msgid "Reorder"
 msgstr "Reordenar"
 
 msgctxt "#70246"
-msgid "  - Lingua preferita"
+msgid "  - Preferred language"
 msgstr "  - Idioma preferido"
 
 msgctxt "#70247"
@@ -4255,10 +4259,6 @@ msgctxt "#70392"
 msgid "Rate with a [COLOR %s]%s[/ COLOR]"
 msgstr "Puntuar con un [COLOR %s]%s[/COLOR]"
 
-msgctxt "#70393"
-msgid "[%s]: Select the correct %s "
-msgstr "[%s]: Selecciona la %s correcta"
-
 msgctxt "#70394"
 msgid "Action"
 msgstr "Accion"
@@ -4803,10 +4803,6 @@ msgctxt "#70528"
 msgid "Default folder"
 msgstr "Carpeta por defecto"
 
-msgctxt "#70529"
-msgid "Repeated link"
-msgstr "Enlace repetido"
-
 msgctxt "#70530"
 msgid "You already have this link in the folder"
 msgstr "Ya tienes este enlace en la carpeta"
diff --git a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po
index cfbbad13..8986f352 100644
--- a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po	
+++ b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po	
@@ -502,8 +502,8 @@ msgid "Filter server (Black List)"
 msgstr "Filtrar servidores (Lista Negra)"
 
 msgctxt "#60001"
-msgid "Filter server (Black List)\nNo connection available that meets the requirements of the Black list.\nTry again by changing the filter in 'Server Configuration"
-msgstr "Filtrar servidores (Lista Negra)\nNo hay enlaces disponibles que cumplan los requisitos de su Lista Negra.\nPruebe de nuevo modificando el fíltro en 'Configuracíon Servidores"
+msgid "No links available that meets the requirements of the Black list. Try again by changing the filter in 'Server Configuration"
+msgstr "No hay enlaces disponibles que cumplan los requisitos de su Lista Negra. Pruebe de nuevo modificando el filtro en 'Configuracíon - Servidores"
 
 msgctxt "#60003"
 msgid "Connecting with %s"
@@ -1046,8 +1046,8 @@ msgid "Movie"
 msgstr "Película"
 
 msgctxt "#60245"
-msgid "Series"
-msgstr "Serie"
+msgid "tv show"
+msgstr "serie"
 
 msgctxt "#60246"
 msgid "Full information"
@@ -1249,10 +1249,6 @@ msgctxt "#60297"
 msgid "Find %s possible matches"
 msgstr "Encontrados %s posibles coincidencias"
 
-msgctxt "#60298"
-msgid "[%s]: Select the correct TV series"
-msgstr "[%s]: Selecciona la serie correcta"
-
 msgctxt "#60299"
 msgid "Not found in the language '%s'"
 msgstr "No se ha encontrado en idioma '%s'"
@@ -3358,8 +3354,16 @@ msgid "Press to 'Clear cache' saved"
 msgstr "Pulse para 'Borrar caché' guardada"
 
 msgctxt "#70164"
-msgid "Free First|Premium First|Debriders First"
-msgstr "Free primero|Premium primero|Debriders primero"
+msgid "Free First"
+msgstr "Free primero"
+
+msgctxt "#70165"
+msgid "Premium First"
+msgstr "Premium primero"
+
+msgctxt "#70166"
+msgid "Debriders First"
+msgstr "Debriders primero"
 
 msgctxt "#70167"
 msgid "Titles Options"
@@ -3674,7 +3678,7 @@ msgid "Reorder"
 msgstr "Reordenar"
 
 msgctxt "#70246"
-msgid "  - Lingua preferita"
+msgid "  - Preferred language"
 msgstr "  - Idioma preferido"
 
 msgctxt "#70247"
@@ -4255,10 +4259,6 @@ msgctxt "#70392"
 msgid "Rate with a [COLOR %s]%s[/ COLOR]"
 msgstr "Puntuar con un [COLOR %s]%s[/COLOR]"
 
-msgctxt "#70393"
-msgid "[%s]: Select the correct %s "
-msgstr "[%s]: Selecciona la %s correcta"
-
 msgctxt "#70394"
 msgid "Action"
 msgstr "Accion"
@@ -4803,10 +4803,6 @@ msgctxt "#70528"
 msgid "Default folder"
 msgstr "Carpeta por defecto"
 
-msgctxt "#70529"
-msgid "Repeated link"
-msgstr "Enlace repetido"
-
 msgctxt "#70530"
 msgid "You already have this link in the folder"
 msgstr "Ya tienes este enlace en la carpeta"
diff --git a/plugin.video.alfa/resources/language/Spanish/strings.po b/plugin.video.alfa/resources/language/Spanish/strings.po
index 674068a7..cd36581a 100644
--- a/plugin.video.alfa/resources/language/Spanish/strings.po
+++ b/plugin.video.alfa/resources/language/Spanish/strings.po
@@ -502,8 +502,8 @@ msgid "Filter server (Black List)"
 msgstr "Filtrar servidores (Lista Negra)"
 
 msgctxt "#60001"
-msgid "Filter server (Black List)\nNo connection available that meets the requirements of the Black list.\nTry again by changing the filter in 'Server Configuration"
-msgstr "Filtrar servidores (Lista Negra)\nNo hay enlaces disponibles que cumplan los requisitos de su Lista Negra.\nPruebe de nuevo modificando el fíltro en 'Configuracíon Servidores"
+msgid "No links available that meets the requirements of the Black list. Try again by changing the filter in 'Server Configuration"
+msgstr "No hay enlaces disponibles que cumplan los requisitos de su Lista Negra. Pruebe de nuevo modificando el filtro en 'Configuracíon - Servidores"
 
 msgctxt "#60003"
 msgid "Connecting with %s"
@@ -1046,8 +1046,8 @@ msgid "Movie"
 msgstr "Película"
 
 msgctxt "#60245"
-msgid "Series"
-msgstr "Serie"
+msgid "tv show"
+msgstr "serie"
 
 msgctxt "#60246"
 msgid "Full information"
@@ -1249,10 +1249,6 @@ msgctxt "#60297"
 msgid "Find %s possible matches"
 msgstr "Encontrados %s posibles coincidencias"
 
-msgctxt "#60298"
-msgid "[%s]: Select the correct TV series"
-msgstr "[%s]: Selecciona la serie correcta"
-
 msgctxt "#60299"
 msgid "Not found in the language '%s'"
 msgstr "No se ha encontrado en idioma '%s'"
@@ -3682,7 +3678,7 @@ msgid "Reorder"
 msgstr "Reordenar"
 
 msgctxt "#70246"
-msgid "  - Lingua preferita"
+msgid "  - Preferred language"
 msgstr "  - Idioma preferido"
 
 msgctxt "#70247"
@@ -4263,10 +4259,6 @@ msgctxt "#70392"
 msgid "Rate with a [COLOR %s]%s[/ COLOR]"
 msgstr "Puntuar con un [COLOR %s]%s[/COLOR]"
 
-msgctxt "#70393"
-msgid "[%s]: Select the correct %s "
-msgstr "[%s]: Selecciona la %s correcta"
-
 msgctxt "#70394"
 msgid "Action"
 msgstr "Accion"
@@ -4811,10 +4803,6 @@ msgctxt "#70528"
 msgid "Default folder"
 msgstr "Carpeta por defecto"
 
-msgctxt "#70529"
-msgid "Repeated link"
-msgstr "Enlace repetido"
-
 msgctxt "#70530"
 msgid "You already have this link in the folder"
 msgstr "Ya tienes este enlace en la carpeta"
@@ -4943,7 +4931,9 @@ msgctxt "#70561"
 msgid "Search Similar"
 msgstr "Buscar Similares"
 
-
+msgctxt "#70562"
+msgid "autoplay"
+msgstr "Habilitar reproducción automática en todos los canales"
 
 
 
diff --git a/plugin.video.alfa/resources/media/channels/banner/cinefoxtv.png b/plugin.video.alfa/resources/media/channels/banner/cinefoxtv.png
deleted file mode 100755
index 2e3dbfa3..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/cinefoxtv.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/copiapop.png b/plugin.video.alfa/resources/media/channels/banner/copiapop.png
deleted file mode 100755
index 5ed89106..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/copiapop.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/cuelgame.png b/plugin.video.alfa/resources/media/channels/banner/cuelgame.png
deleted file mode 100755
index 1a912ee3..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/cuelgame.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/descargasmix.png b/plugin.video.alfa/resources/media/channels/banner/descargasmix.png
deleted file mode 100755
index 45a2d21c..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/descargasmix.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/filesmonster_catalogue.png b/plugin.video.alfa/resources/media/channels/banner/filesmonster_catalogue.png
deleted file mode 100755
index e5993bcf..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/filesmonster_catalogue.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/mundiseries.png b/plugin.video.alfa/resources/media/channels/banner/mundiseries.png
deleted file mode 100644
index aa698e5b..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/mundiseries.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/mundoflv.png b/plugin.video.alfa/resources/media/channels/banner/mundoflv.png
deleted file mode 100755
index a983d662..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/mundoflv.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/peliculasdk.png b/plugin.video.alfa/resources/media/channels/banner/peliculasdk.png
deleted file mode 100755
index e861c509..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/peliculasdk.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/peliculasrey.png b/plugin.video.alfa/resources/media/channels/banner/peliculasrey.png
deleted file mode 100755
index a78e2197..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/peliculasrey.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/pelispekes.png b/plugin.video.alfa/resources/media/channels/banner/pelispekes.png
deleted file mode 100755
index 21eaca72..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/pelispekes.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/plusdede.png b/plugin.video.alfa/resources/media/channels/banner/plusdede.png
deleted file mode 100644
index 2f9d37de..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/plusdede.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/pordede.png b/plugin.video.alfa/resources/media/channels/banner/pordede.png
deleted file mode 100755
index 71aacd64..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/pordede.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/seriecanal.png b/plugin.video.alfa/resources/media/channels/banner/seriecanal.png
deleted file mode 100755
index 6fbbb8d3..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/seriecanal.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/seriesmeme.png b/plugin.video.alfa/resources/media/channels/banner/seriesmeme.png
deleted file mode 100755
index a314d492..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/seriesmeme.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/seriesyonkis.png b/plugin.video.alfa/resources/media/channels/banner/seriesyonkis.png
deleted file mode 100755
index dbcf8236..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/seriesyonkis.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/tupornotv.png b/plugin.video.alfa/resources/media/channels/banner/tupornotv.png
deleted file mode 100755
index 96c679ec..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/tupornotv.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/tvsinpagar.png b/plugin.video.alfa/resources/media/channels/banner/tvsinpagar.png
deleted file mode 100644
index ea43d487..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/tvsinpagar.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/banner/zentorrents.png b/plugin.video.alfa/resources/media/channels/banner/zentorrents.png
deleted file mode 100755
index 95971665..00000000
Binary files a/plugin.video.alfa/resources/media/channels/banner/zentorrents.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/fanart/seriesyonkis.jpg b/plugin.video.alfa/resources/media/channels/fanart/seriesyonkis.jpg
deleted file mode 100755
index 8526a8bd..00000000
Binary files a/plugin.video.alfa/resources/media/channels/fanart/seriesyonkis.jpg and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/cuelgame.png b/plugin.video.alfa/resources/media/channels/thumb/cuelgame.png
deleted file mode 100755
index bd92d915..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/cuelgame.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/descargasmix.png b/plugin.video.alfa/resources/media/channels/thumb/descargasmix.png
deleted file mode 100755
index 9ba3b48e..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/descargasmix.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/filesmonster_catalogue.png b/plugin.video.alfa/resources/media/channels/thumb/filesmonster_catalogue.png
deleted file mode 100755
index c917cb24..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/filesmonster_catalogue.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/mocosoftx.png b/plugin.video.alfa/resources/media/channels/thumb/mocosoftx.png
deleted file mode 100755
index 8bed38e7..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/mocosoftx.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/mundiseries.png b/plugin.video.alfa/resources/media/channels/thumb/mundiseries.png
deleted file mode 100644
index 5e051bf6..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/mundiseries.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/peliculasrey.png b/plugin.video.alfa/resources/media/channels/thumb/peliculasrey.png
deleted file mode 100755
index ea01ae6c..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/peliculasrey.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/pelis123.png b/plugin.video.alfa/resources/media/channels/thumb/pelis123.png
new file mode 100644
index 00000000..0c129a19
Binary files /dev/null and b/plugin.video.alfa/resources/media/channels/thumb/pelis123.png differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/pelisadicto.png b/plugin.video.alfa/resources/media/channels/thumb/pelisadicto.png
deleted file mode 100755
index 0d421a94..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/pelisadicto.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/pelispekes.png b/plugin.video.alfa/resources/media/channels/thumb/pelispekes.png
deleted file mode 100755
index 7b2dedee..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/pelispekes.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/plusdede.png b/plugin.video.alfa/resources/media/channels/thumb/plusdede.png
deleted file mode 100644
index 7cbf5259..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/plusdede.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/pordede.png b/plugin.video.alfa/resources/media/channels/thumb/pordede.png
deleted file mode 100755
index 16d545de..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/pordede.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/seriesmeme.png b/plugin.video.alfa/resources/media/channels/thumb/seriesmeme.png
deleted file mode 100755
index cfa593b8..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/seriesmeme.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/seriesyonkis.png b/plugin.video.alfa/resources/media/channels/thumb/seriesyonkis.png
deleted file mode 100755
index 2cecf9c7..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/seriesyonkis.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/channels/thumb/tvsinpagar.png b/plugin.video.alfa/resources/media/channels/thumb/tvsinpagar.png
deleted file mode 100644
index 103e4d8b..00000000
Binary files a/plugin.video.alfa/resources/media/channels/thumb/tvsinpagar.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/servers/server_movshare.png b/plugin.video.alfa/resources/media/servers/server_movshare.png
deleted file mode 100755
index 4838828a..00000000
Binary files a/plugin.video.alfa/resources/media/servers/server_movshare.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/servers/server_nowvideo.png b/plugin.video.alfa/resources/media/servers/server_nowvideo.png
deleted file mode 100755
index d994b971..00000000
Binary files a/plugin.video.alfa/resources/media/servers/server_nowvideo.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/media/servers/server_vidspot.png b/plugin.video.alfa/resources/media/servers/server_vidspot.png
deleted file mode 100755
index ec598b87..00000000
Binary files a/plugin.video.alfa/resources/media/servers/server_vidspot.png and /dev/null differ
diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml
index d6046bcb..5c95ae12 100644
--- a/plugin.video.alfa/resources/settings.xml
+++ b/plugin.video.alfa/resources/settings.xml
@@ -3,6 +3,7 @@
     <category label="70168">
         <setting id="player_mode" type="enum" values="Direct|SetResolvedUrl|Built-In|Download and Play" label="30044" default="0"/>
         <setting id="default_action" type="enum" lvalues="30006|30007|30008" label="30005" default="0"/>
+        <setting id="autoplay" type="bool" label="70562" default="false" visible="true"/>
         <setting id="thumbnail_type" type="enum" lvalues="30011|30012|30200" label="30010" default="2"/>
         <setting id="channel_language" type="labelenum" values="all|cast|lat" label="30019" default="all"/>
         <setting id="trakt_sync" type="bool" label="70109" default="false"/>
@@ -124,9 +125,13 @@
         <setting type="sep"/>
         <setting label="Gestión de actualizaciones urgentes de módulos de Alfa (Quick Fixes):" type="lsep"/>
         <setting id="addon_update_timer" type="labelenum" values="0|6|12|24" label="Intervalo entre actualizaciones automáticas (horas)" default="12"/>
-        <setting id="addon_update_message" type="bool" label="Quiere ver mensajes de las actualizaciones" default="false"/>
+        <setting id="addon_update_message" type="bool" label="¿Quiere ver mensajes de las actualizaciones?" default="false"/>
 
         <setting label="Lista activa" type="text" id="lista_activa" default="alfavorites-default.json" visible="false"/>
+        
+        <setting type="sep"/>
+        <setting label="Gestión de actualizaciones de otros addon relacionados con Alfa:" type="lsep"/>
+        <setting id="addon_quasar_update" type="bool" label="¿Quiere actualizar Quasar para evitar errores?" default="false"/>
     </category>
 
 </settings>
diff --git a/plugin.video.alfa/servers/anonfile.json b/plugin.video.alfa/servers/anonfile.json
new file mode 100644
index 00000000..4e18d4f5
--- /dev/null
+++ b/plugin.video.alfa/servers/anonfile.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "(https://(?:anonfile|bayfiles).com/\\w+)",
+        "url": "\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "anonfile",
+  "name": "anonfile",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "https://anonfile.com/img/logo/logo-anonfile.png"
+}
diff --git a/plugin.video.alfa/servers/anonfile.py b/plugin.video.alfa/servers/anonfile.py
new file mode 100644
index 00000000..385e3cb0
--- /dev/null
+++ b/plugin.video.alfa/servers/anonfile.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector anonfile By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    response = httptools.downloadpage(page_url)
+    if not response.sucess or "Not Found" in response.data or "File was deleted" in response.data or "is no longer available" in response.data:
+        return False, "[anonfile] El fichero no existe o ha sido borrado"
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("(page_url='%s')" % page_url)
+    video_urls = []
+    data = httptools.downloadpage(page_url).data
+    patron = 'id="download-quality-(\w+).*?href="([^"]+)"'
+    match = scrapertools.find_multiple_matches(data, patron)
+    for calidad, media_url in match:
+        title = "%s [anonfile]" % (calidad)
+        video_urls.append([title, media_url, int(calidad.replace("p", ""))])
+
+    video_urls.sort(key=lambda x: x[2])
+    for video_url in video_urls:
+        video_url[2] = 0
+        logger.info("%s - %s" % (video_url[0], video_url[1]))
+
+    return video_urls
diff --git a/plugin.video.alfa/servers/archiveorg.json b/plugin.video.alfa/servers/archiveorg.json
new file mode 100644
index 00000000..c2473bcc
--- /dev/null
+++ b/plugin.video.alfa/servers/archiveorg.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "https://archive.org/embed/(.*)",
+        "url": "https://archive.org/embed/\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "ArchiveOrg",
+  "name": "archiveorg",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "https://i.postimg.cc/P5ZYJM4L/archiveorg.png"
+}
diff --git a/plugin.video.alfa/servers/archiveorg.py b/plugin.video.alfa/servers/archiveorg.py
new file mode 100644
index 00000000..a954cc35
--- /dev/null
+++ b/plugin.video.alfa/servers/archiveorg.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector ArchiveOrg By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url)
+    if data.code == 404:
+        return False, "[ArchiveOrg] El archivo no existe o ha sido borrado"
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("url=" + page_url)
+    video_urls = []
+    data = httptools.downloadpage(page_url).data
+    logger.debug(data)
+    patron = '<meta property="og:video" content="([^"]+)">'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for url in matches:
+        video_urls.append(['.MP4 [ArchiveOrg]', url])
+    return video_urls
diff --git a/plugin.video.alfa/servers/debriders/alldebrid.py b/plugin.video.alfa/servers/debriders/alldebrid.py
index 650a0916..ecad8eb5 100755
--- a/plugin.video.alfa/servers/debriders/alldebrid.py
+++ b/plugin.video.alfa/servers/debriders/alldebrid.py
@@ -1,26 +1,23 @@
 # -*- coding: utf-8 -*-
 
-from core import jsontools
+from core import httptools
 from core import scrapertools
 from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s' , user='%s' , password='%s', video_password=%s)" % (
-        page_url, user, "**************************"[0:len(password)], video_password))
+    logger.info()
     page_url = correct_url(page_url)
-
-    url = 'http://www.alldebrid.com/service.php?pseudo=%s&password=%s&link=%s&nb=0&json=true&pw=' % (
-        user, password, page_url)
-
-    data = jsontools.load(scrapertools.downloadpage(url))
-
+    dd1 = httptools.downloadpage("https://api.alldebrid.com/user/login?agent=mySoft&username=%s&password=%s" %(user, password)).data
+    token = scrapertools.find_single_match(dd1, 'token":"([^"]+)')
+    dd2 = httptools.downloadpage("https://api.alldebrid.com/link/unlock?agent=mySoft&token=%s&link=%s" %(token, page_url)).data
+    link = scrapertools.find_single_match(dd2, 'link":"([^"]+)')
+    link = link.replace("\\","")
     video_urls = []
-    if data and data["link"] and not data["error"]:
-        extension = ".%s [alldebrid]" % data["filename"].rsplit(".", 1)[1]
-        video_urls.append([extension, data["link"]])
-
+    if link:
+        extension = "mp4 [alldebrid]"
+        video_urls.append([extension, link])
     else:
         try:
             server_error = "Alldebrid: " + data["error"].decode("utf-8", "ignore")
@@ -30,16 +27,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
                          "Servidor no soportado o en mantenimiento")
         except:
             server_error = "Alldebrid: Error en el usuario/password o en la web"
-
         video_urls.append([server_error, ''])
-
     return video_urls
 
 
 def correct_url(url):
     if "userporn.com" in url:
         url = url.replace("/e/", "/video/")
-
     if "putlocker" in url:
         url = url.replace("/embed/", "/file/")
     return url
diff --git a/plugin.video.alfa/servers/decrypters/expurl.py b/plugin.video.alfa/servers/decrypters/expurl.py
index e3b025fe..3d7e217c 100755
--- a/plugin.video.alfa/servers/decrypters/expurl.py
+++ b/plugin.video.alfa/servers/decrypters/expurl.py
@@ -1,23 +1,14 @@
 # -*- coding: utf-8 -*-
 
-import urlparse
-
 from lib import unshortenit
 
-SERVICES_SHORT = ["adf.ly", "sh.st", "bit.ly", "ul.to"]
-
-
 def expand_url(url):
     e = unshortenit.UnshortenIt()
+    estado = 200
 
-    while Es_Corto(url):
+    while estado != 0:
         long_url, estado = e.unshorten(url)
         url = long_url
 
     return long_url
 
-
-def Es_Corto(url):
-    server = urlparse.urlsplit(url).netloc
-    Corto = (server in SERVICES_SHORT)
-    return Corto
diff --git a/plugin.video.alfa/servers/fembed.json b/plugin.video.alfa/servers/fembed.json
index b3ebbfcc..e54d5ad3 100644
--- a/plugin.video.alfa/servers/fembed.json
+++ b/plugin.video.alfa/servers/fembed.json
@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "((?:fembed|divload).com/v/[A-z0-9]+)",
+        "pattern": "((?:fembed|divload).com/v/[A-z0-9_-]+)",
         "url": "https://www.\\1"
       }
     ]
diff --git a/plugin.video.alfa/servers/fembed.py b/plugin.video.alfa/servers/fembed.py
index 1b0bef72..9f7edbc2 100644
--- a/plugin.video.alfa/servers/fembed.py
+++ b/plugin.video.alfa/servers/fembed.py
@@ -20,5 +20,7 @@ def get_video_url(page_url, user="", password="", video_password=""):
     data = httptools.downloadpage(page_url, post={}).data
     data = jsontools.load(data)
     for videos in data["data"]:
-        video_urls.append([videos["label"] + " [fembed]", "https://www.fembed.com" + videos["file"]])
+        v = videos["file"]
+        if not v.startswith("http"): v = "https://www.fembed.com" + videos["file"]
+        video_urls.append([videos["label"] + " [fembed]", v])
     return video_urls
diff --git a/plugin.video.alfa/servers/filepup.json b/plugin.video.alfa/servers/filepup.json
new file mode 100644
index 00000000..35f9e32a
--- /dev/null
+++ b/plugin.video.alfa/servers/filepup.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "(https://www.filepup.net/play/\\w+)",
+        "url": "\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "filepup",
+  "name": "filepup",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "http://static.filepup.net/fplogoV2s.png"
+}
diff --git a/plugin.video.alfa/servers/filepup.py b/plugin.video.alfa/servers/filepup.py
new file mode 100644
index 00000000..e016e107
--- /dev/null
+++ b/plugin.video.alfa/servers/filepup.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector filepup By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    response = httptools.downloadpage(page_url)
+    if "File was deleted" in response.data or "is no longer available" in response.data:
+        return False, "[filepup] El fichero no existe o ha sido borrado"
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("(page_url='%s')" % page_url)
+    video_urls = []
+    page_url = page_url.replace("https","http") + "?wmode=transparent"
+    data = httptools.downloadpage(page_url).data
+    media_url = scrapertools.find_single_match(data, 'src: "([^"]+)"')
+    qualities = scrapertools.find_single_match(data, 'qualities: (\[.*?\])')
+    qualities = scrapertools.find_multiple_matches(qualities, ' "([^"]+)')
+    for calidad in qualities:
+        media = media_url
+        title = "%s [filepup]" % (calidad)
+        if "480" not in calidad:
+            med = media_url.split(".mp4")
+            media = med[0] + "-%s.mp4" %calidad + med[1]
+        media += "|Referer=%s" %page_url
+        media += "&User-Agent=" + httptools.get_user_agent()
+        video_urls.append([title, media, int(calidad.replace("p", ""))])
+    video_urls.sort(key=lambda x: x[2])
+    for video_url in video_urls:
+        video_url[2] = 0
+        logger.info("%s - %s" % (video_url[0], video_url[1]))
+    return video_urls
diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py
index b67149ff..8a5c6e7d 100755
--- a/plugin.video.alfa/servers/gamovideo.py
+++ b/plugin.video.alfa/servers/gamovideo.py
@@ -7,10 +7,15 @@ from core import scrapertools
 from lib import jsunpack
 from platformcode import logger
 
+headers = {"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:61.0) Gecko/20100101 Firefox/61.0"}
+
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
+    data = httptools.downloadpage(page_url)
+    if data.code==404:
+        data = httptools.downloadpage(page_url, headers=headers, add_referer=True)
+    data = data.data
 
     if "File was deleted" in data or "Not Found" in data or "File was locked by administrator" in data:
         return False, "[Gamovideo] El archivo no existe o ha sido borrado"
@@ -23,7 +28,10 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
+    data = httptools.downloadpage(page_url)
+    if data.code==404:
+        data = httptools.downloadpage(page_url, headers=headers, add_referer=True)
+    data = data.data
     packer = scrapertools.find_single_match(data,
                                             "<script type='text/javascript'>(eval.function.p,a,c,k,e,d..*?)</script>")
     if packer != "":
diff --git a/plugin.video.alfa/servers/mp4upload.py b/plugin.video.alfa/servers/mp4upload.py
index 83134cb1..a99f864a 100644
--- a/plugin.video.alfa/servers/mp4upload.py
+++ b/plugin.video.alfa/servers/mp4upload.py
@@ -7,25 +7,24 @@ from core import scrapertools
 from lib import jsunpack
 from platformcode import logger
 
+def test_video_exists(page_url):
+    data = httptools.downloadpage(page_url).data
+    if data == "File was deleted" or data == '':
+        return False, "[mp4upload] El video ha sido borrado"
+
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
-
     data = re.sub(r"\n|\r|\t|\s{2}", "", httptools.downloadpage(page_url).data)
-
     match = scrapertools.find_single_match(data, "<script type='text/javascript'>(.*?)</script>")
     data = jsunpack.unpack(match)
     data = data.replace("\\'", "'")
-
     media_url = scrapertools.find_single_match(data, '{type:"video/mp4",src:"([^"]+)"}')
     if not media_url:
         media_url = scrapertools.find_single_match(data, '"file":"([^"]+)')
     logger.info("media_url=" + media_url)
-
     video_urls = list()
     video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [mp4upload]", media_url])
-
     for video_url in video_urls:
         logger.info("%s - %s" % (video_url[0], video_url[1]))
-
     return video_urls
diff --git a/plugin.video.alfa/servers/nofile.json b/plugin.video.alfa/servers/nofile.json
new file mode 100644
index 00000000..ac6349b2
--- /dev/null
+++ b/plugin.video.alfa/servers/nofile.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "(https://nofile.io/f/\\w+)",
+        "url": "\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "nofile",
+  "name": "nofile",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "https://nofile.io/img/icons/icon-128.png"
+}
diff --git a/plugin.video.alfa/servers/nofile.py b/plugin.video.alfa/servers/nofile.py
new file mode 100644
index 00000000..af3cae83
--- /dev/null
+++ b/plugin.video.alfa/servers/nofile.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector nofile By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    response = httptools.downloadpage(page_url)
+    if not response.sucess or "Not Found" in response.data or "File was deleted" in response.data or "is no longer available" in response.data:
+        return False, "[nofile] El fichero no existe o ha sido borrado"
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("(page_url='%s')" % page_url)
+    video_urls = []
+    data = httptools.downloadpage(page_url).data
+    url = scrapertools.find_single_match(data, '<source src="([^"]+)')
+    url = httptools.downloadpage("https://nofile.io" + url, follow_redirects=False, only_headers=True).headers.get("location", "")
+    title = "mp4 [nofile]"
+    video_urls.append([title, url])
+    return video_urls
diff --git a/plugin.video.alfa/servers/openload.py b/plugin.video.alfa/servers/openload.py
index 60f7fdda..3821773d 100644
--- a/plugin.video.alfa/servers/openload.py
+++ b/plugin.video.alfa/servers/openload.py
@@ -34,7 +34,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     subtitle = scrapertools.find_single_match(data, '<track kind="captions" src="([^"]+)" srclang="es"')
 
     try:
-        code = scrapertools.find_single_match(data, '<p style="" id="[^"]+">(.*?)</p>' )
+        code = scrapertools.find_single_match(data, '<p id="[^"]+" style="">(.*?)</p>' )
         _0x59ce16 = eval(scrapertools.find_single_match(data, '_0x59ce16=([^;]+)').replace('parseInt', 'int'))
         _1x4bfb36 = eval(scrapertools.find_single_match(data, '_1x4bfb36=([^;]+)').replace('parseInt', 'int'))
         parseInt  = eval(scrapertools.find_single_match(data, '_0x30725e,(\(parseInt.*?)\),').replace('parseInt', 'int'))
diff --git a/plugin.video.alfa/servers/powvideo.json b/plugin.video.alfa/servers/powvideo.json
index b7670faf..901bd15f 100755
--- a/plugin.video.alfa/servers/powvideo.json
+++ b/plugin.video.alfa/servers/powvideo.json
@@ -4,8 +4,8 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "powvideo.(?:net|xyz|cc)/(?:embed-|iframe-|preview-|)([a-z0-9]+)",
-        "url": "http://powvideo.net/iframe-\\1-954x562.html"
+        "pattern": "(?:powvideo|povw1deo).(?:net|xyz|com)/(?:embed-|iframe-|preview-|)([a-z0-9]+)",
+        "url": "http://powvideo.net/iframe-\\1-1536x701.html"
       }
     ]
   },
diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py
index 7d32954b..6375f4d3 100644
--- a/plugin.video.alfa/servers/powvideo.py
+++ b/plugin.video.alfa/servers/powvideo.py
@@ -14,6 +14,9 @@ headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/2
 
 def test_video_exists(page_url):
     referer = page_url.replace('iframe', 'preview')
+
+    httptools.downloadpage(referer)
+
     data = httptools.downloadpage(page_url, headers={'referer': referer}).data
     if data == "File was deleted" or data == '':
         return False, "[powvideo] El video ha sido borrado"
diff --git a/plugin.video.alfa/servers/thevid.json b/plugin.video.alfa/servers/thevid.json
index e90af13e..574cb21a 100644
--- a/plugin.video.alfa/servers/thevid.json
+++ b/plugin.video.alfa/servers/thevid.json
@@ -38,5 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": ""
+  "thumbnail": "http://thevid.net/imgs/thevid.png"
 }
diff --git a/plugin.video.alfa/servers/thevid.py b/plugin.video.alfa/servers/thevid.py
index 17e13d90..0b0f6b59 100644
--- a/plugin.video.alfa/servers/thevid.py
+++ b/plugin.video.alfa/servers/thevid.py
@@ -25,7 +25,7 @@ def get_video_url(page_url, user="", password="", video_password=""):
         unpacked = jsunpack.unpack(pack)
         logger.info("Intel11 %s" %unpacked)
         if "ldaa" in unpacked:
-            videos = scrapertools.find_multiple_matches(unpacked, 'lda.="([^"]+)')
+            videos = scrapertools.find_multiple_matches(unpacked, '(?is)lda.="([^"]+)')
     video_urls = []
     for video in videos:
         if not video.startswith("//"):
diff --git a/plugin.video.alfa/servers/thevideobee.json b/plugin.video.alfa/servers/thevideobee.json
new file mode 100644
index 00000000..3e1fb059
--- /dev/null
+++ b/plugin.video.alfa/servers/thevideobee.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "(https://thevideobee.to/embed-[A-z0-9]+.html)",
+        "url": "\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "thevideobee",
+  "name": "thevideobee",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "https://thevideobee.to/img/logo.png"
+}
diff --git a/plugin.video.alfa/servers/thevideobee.py b/plugin.video.alfa/servers/thevideobee.py
new file mode 100644
index 00000000..a0b51967
--- /dev/null
+++ b/plugin.video.alfa/servers/thevideobee.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector thevideobee By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
+    if "no longer exists" in data or "to copyright issues" in data:
+        return False, "[thevideobee] El video ha sido borrado"
+    return True, ""
+
+
+def get_video_url(page_url, user="", password="", video_password=""):
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
+    video_urls = []
+    videourl = scrapertools.find_single_match(data, 'src: "([^"]+)')
+    video_urls.append([".MP4 [thevideobee]", videourl])
+
+    return video_urls
diff --git a/plugin.video.alfa/servers/thevimeo.json b/plugin.video.alfa/servers/thevimeo.json
new file mode 100644
index 00000000..360159ff
--- /dev/null
+++ b/plugin.video.alfa/servers/thevimeo.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "(https://thevimeo.pw/[a-zA-Z0-9]+)",
+        "url": "\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "thevimeo",
+  "name": "thevimeo",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "https://smmsquare.com/wp-content/uploads/2017/12/Vimeo_smmsquare.png"
+}
diff --git a/plugin.video.alfa/servers/thevimeo.py b/plugin.video.alfa/servers/thevimeo.py
new file mode 100644
index 00000000..a737d231
--- /dev/null
+++ b/plugin.video.alfa/servers/thevimeo.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# -*- Server Thevimeo -*-
+
+import re
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def get_source(url):
+    #logger.info()
+    data = httptools.downloadpage(url).data
+    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+def test_video_exists(page_url):
+    #logger.info("(page_url='%s')" % page_url)
+    data = get_source(page_url)
+
+    if "File was deleted" in data or "File Not Found" in data:
+        return False, "[Thevimeo] El video ha sido borrado"
+
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    #logger.info("url=" + page_url)
+    video_urls = []
+    data = get_source(page_url)
+    #logger.debug(data)
+    patron = "{file:(.*?),label:(.*?),"
+
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    #url = scrapertools.find_single_match(data, "sources.*?{file:(.*?),")
+    for url, qual in matches:
+        url = url.replace("\/", "/")
+        qual = qual.replace("M\u00f3vil","360")
+        video_urls.append([qual+"p [Thevimeo]", url])
+    video_urls.sort(key=lambda it: int(it[0].split("p ", 1)[0]))
+
+    return video_urls
diff --git a/plugin.video.alfa/servers/tusfiles.json b/plugin.video.alfa/servers/tusfiles.json
new file mode 100644
index 00000000..1221c6a9
--- /dev/null
+++ b/plugin.video.alfa/servers/tusfiles.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "(https://tusfiles.com/embed-[A-z0-9]+.html)",
+        "url": "\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "tusfiles",
+  "name": "tusfiles",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "https://tusfiles.com/i/TFLOGO.png"
+}
diff --git a/plugin.video.alfa/servers/tusfiles.py b/plugin.video.alfa/servers/tusfiles.py
new file mode 100644
index 00000000..ef37b5e8
--- /dev/null
+++ b/plugin.video.alfa/servers/tusfiles.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector tusfiles By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
+    if "no longer exists" in data or "to copyright issues" in data:
+        return False, "[tusfiles] El video ha sido borrado"
+    return True, ""
+
+
+def get_video_url(page_url, user="", password="", video_password=""):
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
+    video_urls = []
+    videourl = scrapertools.find_single_match(data, 'source src="([^"]+)')
+    video_urls.append([".MP4 [tusfiles]", videourl])
+
+    return video_urls
diff --git a/plugin.video.alfa/servers/vk.json b/plugin.video.alfa/servers/vk.json
index 63b379b7..7ea37f4a 100755
--- a/plugin.video.alfa/servers/vk.json
+++ b/plugin.video.alfa/servers/vk.json
@@ -4,12 +4,12 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "/video_ext.php\\?oid=([^&]+)(?:&||)id=([^&]+)(?:&||)hash=([a-z0-9]+)",
-        "url": "http://vk.com/video_ext.php?oid=\\1=\\2=\\3"
+        "pattern": "/video_ext.php\\?oid=([^&]+)(?:&|)id=([^&]+)(?:&|)hash=([a-z0-9]+)",
+        "url": "https://vk.com/video_ext.php?oid=\\1&id=\\2&hash=\\3"
       },
       {
         "pattern": "(vk\\.[a-z]+\\/video[0-9]+_[0-9]+)",
-        "url": "http://\\1"
+        "url": "https://\\1"
       }
     ]
   },
@@ -17,6 +17,21 @@
   "id": "vk",
   "name": "vk",
   "settings": [
+    {
+      "id": "vkemail",
+      "type": "text",
+      "label": "E-mail",
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "vkpassword",
+      "type": "text",
+      "hidden": true,
+      "label": "@30015",
+      "enabled": "!eq(-1,'')",
+      "visible": true
+    },
     {
       "default": false,
       "enabled": true,
diff --git a/plugin.video.alfa/servers/vk.py b/plugin.video.alfa/servers/vk.py
index b5062745..5eeae28a 100755
--- a/plugin.video.alfa/servers/vk.py
+++ b/plugin.video.alfa/servers/vk.py
@@ -1,15 +1,17 @@
 # -*- coding: utf-8 -*-
 
+import urllib
+
 from core import httptools
 from core import scrapertools
-from platformcode import logger
+from platformcode import config, logger
 
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-
+    if not login():
+        return False, "Falta Ingresar/Actualizar las credenciales en el servidor vk. Configuracion - Preferencias - Ajustes de servidores - Configuración del servidor vk"
     data = httptools.downloadpage(page_url).data
-
     if "This video has been removed from public access" in data or "Video not found." in data:
         return False, "El archivo ya no esta disponible<br/>en VK (ha sido borrado)"
     return True, ""
@@ -19,17 +21,29 @@ def test_video_exists(page_url):
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
     video_urls = []
-    try:
-        oid, id = scrapertools.find_single_match(page_url, 'oid=([^&]+)&id=(\d+)')
-    except:
-        oid, id = scrapertools.find_single_match(page_url, 'video(\d+)_(\d+)')
-    headers = {'User-Agent': 'Mozilla/5.0'}
-    url = "http://vk.com/al_video.php?act=show_inline&al=1&video=%s_%s" % (oid, id)
-    data = httptools.downloadpage(url, headers=headers).data
+    data = httptools.downloadpage(page_url).data
     matches = scrapertools.find_multiple_matches(data, '<source src="([^"]+)" type="video/(\w+)')
     for media_url, ext in matches:
         calidad = scrapertools.find_single_match(media_url, '(\d+)\.%s' % ext)
-        video_urls.append(["." + ext + " [vk:" + calidad + "]", media_url])
+        video_urls.append([calidad + "p ." + ext + " [vk]", media_url])
+    video_urls.sort(key=lambda it: int(it[0].split("p ", 1)[0]))
     for video_url in video_urls:
         logger.info("%s - %s" % (video_url[0], video_url[1]))
     return video_urls
+
+
+def login():
+    data = httptools.downloadpage("https://vk.com").data
+    if "data-href" in data:
+        return True
+    ip_h = scrapertools.find_single_match(data, 'ip_h=(\w+)')
+    lg_h = scrapertools.find_single_match(data, 'lg_h=(\w+)')
+    vkemail = config.get_setting("vkemail",server="vk")
+    vkpassword = config.get_setting("vkpassword",server="vk")
+    post = {"act":"login","role":"al_frame","expire":"","recaptcha":"","captcha_sid":"","captcha_key":"","_origin":"https://vk.com","email":vkemail,"pass":vkpassword, "ip_h":ip_h, "lg_h":lg_h}
+    url = "https://login.vk.com/?act=login"
+    url = httptools.downloadpage(url, follow_redirects=False, only_headers=True, post=urllib.urlencode(post)).headers.get("location", "")
+    data = httptools.downloadpage(url).data
+    if "name: " not in data:
+        return False
+    return True
diff --git a/plugin.video.alfa/servers/vshare.py b/plugin.video.alfa/servers/vshare.py
index 2f7f5aca..06e79ade 100644
--- a/plugin.video.alfa/servers/vshare.py
+++ b/plugin.video.alfa/servers/vshare.py
@@ -19,7 +19,8 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("url = " + page_url)
-    data = httptools.downloadpage(page_url).data
+    headers = {"Referer":page_url}
+    data = httptools.downloadpage(page_url, headers=headers).data
     flowplayer = re.search("url: [\"']([^\"']+)", data)
     if flowplayer:
         return [["FLV", flowplayer.group(1)]]
@@ -37,6 +38,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
             logger.debug(strResult)
             videoSources = re.findall("<source[\s]+src=[\"'](?P<url>[^\"']+)[^>]+label=[\"'](?P<label>[^\"']+)", strResult)
             for url, label in videoSources:
+                url += "|Referer=%s" %page_url
                 video_urls.append([label, url])
             video_urls.sort(key=lambda i: int(i[0].replace("p","")))
     except:
diff --git a/plugin.video.alfa/servers/vup.json b/plugin.video.alfa/servers/vup.json
new file mode 100644
index 00000000..1d5ecb23
--- /dev/null
+++ b/plugin.video.alfa/servers/vup.json
@@ -0,0 +1,42 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "(https://vup.to/embed-[A-z0-9]+.html)",
+        "url": "\\1"
+      }
+    ]
+  },
+  "free": true,
+  "id": "vup",
+  "name": "vup",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@60654",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "@60655",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "https://i.postimg.cc/ZKjvqXxj/vup.png"
+}
diff --git a/plugin.video.alfa/servers/vup.py b/plugin.video.alfa/servers/vup.py
new file mode 100644
index 00000000..9eba027d
--- /dev/null
+++ b/plugin.video.alfa/servers/vup.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector vup By Alfa development Group
+# --------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
+    if "no longer exists" in data or "to copyright issues" in data:
+        return False, "[vup] El video ha sido borrado"
+    return True, ""
+
+
+def get_video_url(page_url, user="", password="", video_password=""):
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
+    bloque = scrapertools.find_single_match(data, 'sources:.*?\]')
+    video_urls = []
+    videourl = scrapertools.find_multiple_matches(bloque, '"(http[^"]+)')
+    for video in videourl:
+        video_urls.append([".MP4 [vup]", video])
+    video_urls = video_urls[::-1]
+    return video_urls
diff --git a/plugin.video.alfa/videolibrary_service.py b/plugin.video.alfa/videolibrary_service.py
index e0163325..f9d31d16 100644
--- a/plugin.video.alfa/videolibrary_service.py
+++ b/plugin.video.alfa/videolibrary_service.py
@@ -12,6 +12,7 @@ from channels import videolibrary
 from lib import generictools
 
 
+
 def update(path, p_dialog, i, t, serie, overwrite):
     logger.info("Actualizando " + path)
     insertados_total = 0
@@ -96,7 +97,6 @@ def update(path, p_dialog, i, t, serie, overwrite):
 
 def check_for_update(overwrite=True):
     logger.info("Actualizando series...")
-
     p_dialog = None
     serie_actualizada = False
     update_when_finished = False
@@ -284,7 +284,9 @@ def start(thread=True):
 
 def monitor_update():
     update_setting = config.get_setting("update", "videolibrary")
+
     # "Actualizar "Una sola vez al dia" o "al inicar Kodi y al menos una vez al dia"
+
     if update_setting == 2 or update_setting == 3:
         hoy = datetime.date.today()
         last_check = config.get_setting("updatelibrary_last_check", "videolibrary")
@@ -310,9 +312,14 @@ if __name__ == "__main__":
     import xbmc
     import time
 
+
     # modo adulto:
     # sistema actual 0: Nunca, 1:Siempre, 2:Solo hasta que se reinicie Kodi
     # si es == 2 lo desactivamos.
+    if config.get_platform(True)['num_version'] >= 17.0:
+        from lib.alfaresolver import updated, update_now
+        if not updated():
+            update_now()
     if config.get_setting("adult_mode") == 2:
         config.set_setting("adult_mode", 0)
 
@@ -321,6 +328,7 @@ if __name__ == "__main__":
     if wait > 0:
         xbmc.sleep(wait)
 
+
     # Verificar quick-fixes al abrirse Kodi, y dejarlo corriendo como Thread
     from platformcode import updater
     updater.check_addon_init()