diff --git a/plugin.video.alfa/channels/torrentlocura.json b/plugin.video.alfa/channels/torrentlocura.json
index 1dc0d89c..6f6b7fc7 100755
--- a/plugin.video.alfa/channels/torrentlocura.json
+++ b/plugin.video.alfa/channels/torrentlocura.json
@@ -6,23 +6,12 @@
     "language": "es",
     "banner": "torrentlocura.png",
     "thumbnail": "http://imgur.com/EWmLS3d.png",
+    "fanart": "http://imgur.com/V7QZLAL.jpg",
     "version": 1,
     "changes": [
         {
-            "date": "31/12/2016",
-            "description": "Release"
-        },
-        {
-            "date": "13/01/2017",
-            "description": "Añadida info a cápitulos en bloque"
-        },
-        {
-            "date": "04/04/2017",
-            "description": "Reparación cambios web"
-        },
-        {
-            "date": "28/06/2017",
-            "description": "Corrección código y algunas mejoras"
+            "date": "25/08/2017",
+            "description": "revamp"
         }
     ],
     "categories": [
diff --git a/plugin.video.alfa/channels/torrentlocura.py b/plugin.video.alfa/channels/torrentlocura.py
index 20777ab0..e40696b9 100755
--- a/plugin.video.alfa/channels/torrentlocura.py
+++ b/plugin.video.alfa/channels/torrentlocura.py
@@ -1,117 +1,50 @@
 # -*- coding: utf-8 -*-
 
-import os
 import re
-import urllib
 
-import xbmc
-import xbmcgui
+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 core.scrapertools import decodeHtmlentities as dhe
-from platformcode import config, logger
+from platformcode import logger
 
-ACTION_SHOW_FULLSCREEN = 36
-ACTION_GESTURE_SWIPE_LEFT = 511
-ACTION_SELECT_ITEM = 7
-ACTION_PREVIOUS_MENU = 10
-ACTION_MOVE_LEFT = 1
-ACTION_MOVE_RIGHT = 2
-ACTION_MOVE_DOWN = 4
-ACTION_MOVE_UP = 3
-OPTION_PANEL = 6
-OPTIONS_OK = 5
-
-
-# Para la busqueda en bing evitando baneos
-
-def browser(url):
-    import mechanize
-
-    # Utilizamos Browser mechanize para saltar problemas con la busqueda en bing
-    br = mechanize.Browser()
-    # Browser options
-    br.set_handle_equiv(False)
-    br.set_handle_gzip(True)
-    br.set_handle_redirect(True)
-    br.set_handle_referer(False)
-    br.set_handle_robots(False)
-    # Follows refresh 0 but not hangs on refresh > 0
-    br.set_handle_refresh(mechanize._http.HTTPRefreshProcessor(), max_time=1)
-    # Want debugging messages?
-    # br.set_debug_http(True)
-    # br.set_debug_redirects(True)
-    # br.set_debug_responses(True)
-
-    # User-Agent (this is cheating, ok?)
-    # br.addheaders = [('User-agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/600.7.12 (KHTML, like Gecko) Version/7.1.7 Safari/537.85.16')]
-    # br.addheaders =[('Cookie','SRCHD=AF=QBRE; domain=.bing.com; expires=25 de febrero de 2018 13:00:28 GMT+1; MUIDB=3B942052D204686335322894D3086911; domain=www.bing.com;expires=24 de febrero de 2018 13:00:28 GMT+1')]
-    # Open some site, let's pick a random one, the first that pops in mind
-    r = br.open(url)
-    response = r.read()
-    print response
-    if "img,divreturn" in response:
-        r = br.open("http://ssl-proxy.my-addr.org/myaddrproxy.php/" + url)
-        print "prooooxy"
-        response = r.read()
-
-    return response
-
-
-api_key = "2e2160006592024ba87ccdf78c28f49f"
-api_fankey = "dffe90fba4d02c199ae7a9e71330c987"
+host = "http://torrentlocura.com/"
 
 
 def mainlist(item):
     logger.info()
-    itemlist = []
-    itemlist.append(item.clone(title="[COLOR crimson][B]Películas[/B][/COLOR]", action="scraper",
-                               url="http://torrentlocura.com/peliculas/", thumbnail="http://imgur.com/RfZjMBi.png",
-                               fanart="http://imgur.com/V7QZLAL.jpg", contentType="movie"))
-    itemlist.append(itemlist[-1].clone(title="[COLOR crimson][B]   Películas HD[/B][/COLOR]", action="scraper",
-                                       url="http://torrentlocura.com/peliculas-hd/",
-                                       thumbnail="http://imgur.com/RfZjMBi.png", fanart="http://imgur.com/V7QZLAL.jpg",
-                                       contentType="movie"))
-    itemlist.append(itemlist[-1].clone(title="   [COLOR crimson][B]Estrenos[/B][/COLOR]", action="scraper",
-                                       url="http://torrentlocura.com/estrenos-de-cine/",
-                                       thumbnail="http://imgur.com/RfZjMBi.png", fanart="http://imgur.com/V7QZLAL.jpg",
-                                       contentType="movie"))
-    itemlist.append(itemlist[-1].clone(title="[COLOR crimson][B]   Películas 3D[/B][/COLOR]", action="scraper",
-                                       url="http://torrentlocura.com/peliculas-3d/",
-                                       thumbnail="http://imgur.com/RfZjMBi.png", fanart="http://imgur.com/V7QZLAL.jpg",
-                                       contentType="movie"))
+
+    thumb_movie = get_thumb("channels_movie.png")
+    thumb_tvshow = get_thumb("channels_tvshow.png")
+    thumb_anime = get_thumb("channels_anime.png")
+    thumb_search = get_thumb("search.png")
+
+    itemlist = list()
+    itemlist.append(Item(channel=item.channel, action="submenu", title="Películas", url=host,
+                         thumbnail=thumb_movie, pattern="peliculas"))
     itemlist.append(
-        itemlist[-1].clone(title="   [COLOR crimson][B]Películas subtituladas[/B][/COLOR]", action="scraper",
-                           url="http://torrentlocura.com/peliculas-vo/", thumbnail="http://imgur.com/RfZjMBi.png",
-                           fanart="http://imgur.com/V7QZLAL.jpg", contentType="movie"))
+        Item(channel=item.channel, action="submenu", title="Series", url=host,
+             thumbnail=thumb_tvshow, pattern="series"))
     itemlist.append(
-        itemlist[-1].clone(title="[COLOR crimson][B]   Películas Audio Latino[/B][/COLOR]", action="scraper",
-                           url="http://torrentlocura.com/peliculas-latino/", thumbnail="http://imgur.com/RfZjMBi.png",
-                           fanart="http://imgur.com/V7QZLAL.jpg", contentType="movie"))
-    itemlist.append(itemlist[-1].clone(title="[COLOR crimson][B]Series[/B][/COLOR]", action="scraper",
-                                       url="http://torrentlocura.com/series/", thumbnail="http://imgur.com/vX2dUYl.png",
-                                       contentType="tvshow"))
-    itemlist.append(itemlist[-1].clone(title="   [COLOR crimson][B]Series HD[/B][/COLOR]", action="scraper",
-                                       url="http://torrentlocura.com/series-hd/",
-                                       thumbnail="http://imgur.com/vX2dUYl.png", fanart="http://imgur.com/V7QZLAL.jpg",
-                                       contentType="tvshow"))
-    itemlist.append(itemlist[-1].clone(title="[COLOR crimson][B]Buscar[/B][/COLOR]", action="search", url="",
-                                       thumbnail="http://imgur.com/rSttk79.png", fanart="http://imgur.com/V7QZLAL.jpg"))
+        Item(channel=item.channel, action="anime", title="Anime", url=host,
+             thumbnail=thumb_anime, pattern="anime"))
+    itemlist.append(Item(channel=item.channel, action="search", title="Buscar", url=host + "buscar",
+                         thumbnail=thumb_search))
 
     return itemlist
 
 
 def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = "http://torrentlocura.com/buscar"
-    item.extra = urllib.urlencode({'q': texto})
-    item.contentType != "movie"
+    logger.info("search:" + texto)
+    # texto = texto.replace(" ", "+")
+
     try:
-        return buscador(item)
+        item.post = "q=%s" % texto
+        item.pattern = "buscar-list"
+        itemlist = listado2(item)
+
+        return itemlist
+
     # Se captura la excepción, para no interrumpir al buscador global si un canal falla
     except:
         import sys
@@ -120,1079 +53,309 @@ def search(item, texto):
         return []
 
 
-def buscador(item):
+def anime(item):
     logger.info()
     itemlist = []
-    data = httptools.downloadpage(item.url, post=item.extra, ).data
-    data = unicode(data, "latin1").encode("utf8")
-    data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
-    check_item = []
-    bloque_enlaces = scrapertools.find_single_match(data, 'Resultados(.*?)end .page-box')
-    result_0 = scrapertools.find_multiple_matches(bloque_enlaces,
-                                                  'a href="([^"]+)" title="Descargar (.*?) ([^<]+)"><img src="([^"]+)".*?Descargar</a>')
-    for url, tipo, title, thumb in result_0:
-        try:
-            year = scrapertools.find_single_match(title, '(\d\d\d\d)')
-        except:
-            year = ""
-        if tipo == "Serie":
-            contentType = "tv"
-            title = re.sub(r'-.*', '', title)
-            title_check = title.strip()
-        else:
-            contentType = "movie"
-            # tipo="Pelicula"
-            title = re.sub(r'de Cine', 'Screener', title)
-            title = title.replace("RIP", "HdRip")
-            title_check = (title + " " + tipo).strip()
-            if "pc" in tipo or "PC" in tipo or "XBOX" in tipo or "Nintendo" in tipo or "Windows" in tipo or "varios" in url or "juego" in url:
-                continue
+    title = "Anime"
+    url = host + "anime"
+    itemlist.append(item.clone(channel=item.channel, action="listado", title=title, url=url,
+                               pattern="pelilist"))
+    itemlist.append(
+        item.clone(channel=item.channel, action="alfabeto", title=title + " [A-Z]", url=url,
+                   thumbnail=item.thumbnail[:-4] + "_az.png", pattern="pelilist"))
 
-        if title_check in str(check_item):
+    return itemlist
+
+
+def submenu(item):
+    logger.info()
+    itemlist = []
+
+    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
+    # data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
+
+    pattern = '<li><a href="%s%s/">.*?<ul>(.*?)</ul>' % (host, item.pattern)
+    data = scrapertools.get_match(data, pattern)
+
+    pattern = '<a href="([^"]+)".*?>([^>]+)</a>'
+    matches = re.compile(pattern, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+        title = scrapedtitle.strip()
+        url = scrapedurl
+
+        if item.pattern in title.lower():
+            itemlist.append(item.clone(channel=item.channel, action="listado", title=title, url=url,
+                                       pattern="pelilist"))
+            itemlist.append(
+                item.clone(channel=item.channel, action="alfabeto", title=title + " [A-Z]", url=url,
+                           thumbnail=item.thumbnail[:-4] + "_az.png", pattern="pelilist"))
+
+    return itemlist
+
+
+def alfabeto(item):
+    logger.info()
+    itemlist = []
+
+    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
+    # data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
+
+    pattern = '<ul class="alfabeto">(.*?)</ul>'
+    data = scrapertools.get_match(data, pattern)
+
+    patron = '<a href="([^"]+)"[^>]+>([^>]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+        title = scrapedtitle.upper()
+        url = scrapedurl
+
+        itemlist.append(Item(channel=item.channel, action="listado", title=title, url=url, pattern=item.pattern))
+
+    return itemlist
+
+
+def listado(item):
+    logger.info()
+    itemlist = []
+
+    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
+    data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
+
+    # logger.debug("data %s " % data)
+    next_page = scrapertools.find_single_match(data, '<ul class="pagination">.*?<a class="current" href.*?'
+                                                     '<a\s*href="([^"]+)">')
+    # logger.debug("data %s " % next_page)
+
+    pattern = '<ul class="%s">(.*?)</ul>' % item.pattern
+    data = scrapertools.get_match(data, pattern)
+    # logger.debug("data %s " % data)
+    pattern = '<li><a href="(?P<url>[^"]+)" title="(?P<title_to_fix>[^"]+)".*?<img src="(?P<img>[^"]+)"[^>]+>' \
+              '<h2.*?>\s*(?P<title>.*?)\s*</h2><span>(?P<quality>[^<]*)</span>'
+
+    matches = re.compile(pattern, re.DOTALL).findall(data)
+    # logger.debug("data %s " % matches)
+
+    for url, title_to_fix, thumb, title, quality in matches:
+        # fix encoding for title
+        title = title.replace("�", "ñ")
+
+        # title is the clean way but it doesn't work if it's a long, so we have to use title_to_fix
+        title_fix = False
+        if title.endswith(".."):
+            title = title_to_fix
+            title_fix = True
+
+        if ".com/series" in url:
+            if title_fix:
+                title = scrapertools.find_single_match(title, '([^-]+)')
+                title = title.replace("Ver online", "", 1).replace("Ver en linea", "", 1). \
+                    replace("Descarga Serie HD", "", 1).strip()
+
+            show = title
+            if quality:
+                title = "%s [%s]" % (title, quality)
+
+            itemlist.append(Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumb,
+                                 quality=quality, context=["buscar_trailer"], show=show))
+
+        else:
+            if title_fix:
+                title = title.replace("Descargar", "", 1).strip()
+                if title.endswith("gratis"):
+                    title = title[:-6].strip()
+
+            if quality:
+                title = "%s [%s]" % (title, quality)
+
+            itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumb,
+                                 quality=quality, context=["buscar_trailer"]))
+
+    if next_page:
+        itemlist.append(Item(channel=item.channel, action="listado", title=">> Página siguiente", url=next_page,
+                             pattern="pagination", thumbnail=get_thumb("next.png")))
+
+    return itemlist
+
+
+def listado2(item):
+    logger.info()
+    itemlist = []
+
+    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url, post=item.post).data)
+    data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
+
+    list_chars = [["ñ", "ñ"]]
+
+    for el in list_chars:
+        data = re.sub(r"%s" % el[0], el[1], data)
+
+    try:
+        # logger.debug("data %s " % data)
+        get, post = scrapertools.find_single_match(data, '<ul class="pagination">.*?<a class="current" href.*?'
+                                                         '<a\s*href="([^"]+)"(?:\s*onClick=".*?\'([^"]+)\'.*?")')
+    except:
+        post = False
+
+    if post:
+        # logger.debug("post %s" % post)
+        # logger.debug("item.post %s" % item.post)
+        if "pg" in item.post:
+            item.post = re.sub(r"pg=(\d+)", "pg=%s" % post, item.post)
+            # logger.debug("item.post %s" % item.post)
+        else:
+            item.post += "&pg=%s" % post
+            # logger.debug("item.post %s" % item.post)
+
+    # logger.debug("data %s " % next_page)
+
+    pattern = '<ul class="%s">(.*?)</ul>' % item.pattern
+    data = scrapertools.get_match(data, pattern)
+    # logger.debug("data %s " % data)
+
+    pattern = '<li><a href="(?P<url>[^"]+)".*?<img src="(?P<img>[^"]+)"[^>]+>.*?<h2.*?>\s*(?P<title>.*?)\s*</h2>'
+
+    matches = re.compile(pattern, re.DOTALL).findall(data)
+
+    for url, thumb, title in matches:
+        # fix encoding for title
+        title = scrapertools.htmlclean(title)
+        title = title.replace("�", "ñ")
+
+        # logger.debug("\n\nu %s " % url)
+        # logger.debug("\nb %s " % thumb)
+        # logger.debug("\nt %s " % title)
+
+        # title is the clean way but it doesn't work if it's a long, so we have to use title_to_fix
+        # title_fix = False
+        # if title.endswith(".."):
+        #     title = title_to_fix
+        #     title_fix = True
+
+        # no mostramos lo que no sean videos
+        if "/juego/" in url or "/varios/" in url:
             continue
-        check_item.append([title_check])
-        if "�" in title:
-            title = title.replace("�", "ñ")
-        title_fan = title
-        title_fan = re.sub(
-            r"\(.*?\)|-Remastered|Black And Chrome Edition|V.extendidaHD|1080p|Screener|V.O|HdRip|.*?--|\(\d+\)|\d\d\d\d|HD",
-            "", title_fan)
-        itemlist.append(Item(channel=item.channel,
-                             title="[COLOR firebrick][B]" + tipo + "[/B][/COLOR]--" + "[COLOR red][B]" + title + "[/B][/COLOR]",
-                             url=url, action="fanart", thumbnail=thumb, fanart="", contentType=contentType,
-                             extra=title_fan + "|" + "[COLOR red][B]" + title_fan + "[/B][/COLOR]" + "|" + year,
-                             folder=True))
-    return itemlist
 
+        if ".com/series" in url:
+            # title = scrapertools.find_single_match(title, '([^-]+)')
+            # title = title.replace("Ver online", "", 1).replace("Ver en linea", "", 1). \
+            #     replace("Descarga Serie HD", "", 1).strip()
+
+            show = title
+            # if quality:
+            #     title = "%s [%s]" % (title, quality)
+
+            itemlist.append(Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumb,
+                                 context=["buscar_trailer"], show=show))
 
-def scraper(item):
-    logger.info()
-    itemlist = []
-    # Descarga la página
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    bloque_enlaces = scrapertools.find_single_match(data, '<ul class="pelilist">(.*?)end .page-box')
-    if item.contentType != "movie":
-        matches = scrapertools.find_multiple_matches(bloque_enlaces,
-                                                     '<a href="([^"]+)".*?src="([^"]+)".*?28px;">([^<]+)<\/h2><span>([^<]+)<\/span>')
-    else:
-        matches = scrapertools.find_multiple_matches(bloque_enlaces,
-                                                     '<a href="([^"]+)".*?src="([^"]+)".*?Descargar ([^<]+) gratis">.*?<\/h2><span>([^<]+)<\/span>')
-    for url, thumb, title, quality in matches:
-        try:
-            year = scrapertools.find_single_match(title, '(\d\d\d\d)')
-        except:
-            year = ""
-        title = unicode(title, "latin1").encode("utf8")
-        if "�" in title:
-            title = title.replace("�", "ñ")
-        title = re.sub(r'\(\d+\)|\d\d\d\d', '', title)
-        title_fan = title
-        title_item = "[COLOR red][B]" + title + "[/B][/COLOR]"
-        if "HD" in item.title and item.contentType != "movie":
-            title = "[COLOR red][B]" + title + "[/B][/COLOR]"
         else:
-            title = "[COLOR red][B]" + title + "[/B][/COLOR]" + "[COLOR floralwhite] " + quality + "[/COLOR]"
-        itemlist.append(
-            Item(channel=item.channel, title=title, url=url, action="fanart", thumbnail=thumb, fanart=item.fanart,
-                 extra=title_fan + "|" + title_item + "|" + year, contentType=item.contentType, folder=True))
-    ## Paginación
-    next = scrapertools.find_single_match(data, 'href="([^"]+)">Next<\/a>')
-    if len(next) > 0:
-        url = next
-        itemlist.append(
-            Item(channel=item.channel, action="scraper", title="[COLOR darkred][B]siguiente[/B][/COLOR]", url=url,
-                 thumbnail="http://imgur.com/D4ZgFri.png", fanart=item.fanart, extra=item.extra,
-                 contentType=item.contentType, folder=True))
+            # title = title.replace("Descargar", "", 1).strip()
+            # if title.endswith("gratis"):
+            #     title = title[:-6].strip()
+
+            # if quality:
+            #     title = "%s [%s]" % (title, quality)
+
+                itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumb,
+                                     context=["buscar_trailer"]))
+
+    if post:
+        itemlist.append(item.clone(channel=item.channel, action="listado2", title=">> Página siguiente",
+                                   thumbnail=get_thumb("next.png")))
 
     return itemlist
 
 
-def fanart(item):
+def episodios(item):
     logger.info()
     itemlist = []
-    year = item.extra.split("|")[2]
-    if item.contentType != "movie":
-        tipo_ps = "tv"
+
+    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
+    data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
+
+    # logger.debug("data %s " % data)
+    pattern = '<ul class="%s">(.*?)</ul>' % "pagination"  # item.pattern
+    pagination = scrapertools.find_single_match(data, pattern)
+    # logger.debug("pagination %s" % pagination)
+    if pagination:
+        pattern = 'Next</a></li><li><a href="(.*?)(\d+)">Last</a>'
+        url, last_page = scrapertools.find_single_match(pagination, pattern)
+        # logger.debug("data %s " % last_page)
+        list_pages = []
+        for x in range(1, int(last_page) + 1):
+            list_pages.append("%s%s" % (url, x))
+            # logger.debug("data %s%s" % (url, x))
+            # logger.debug("list_pages %s" % list_pages)
     else:
-        tipo_ps = "movie"
-    url = item.url
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    title = item.extra.split("|")[0]
-    title_o = scrapertools.find_single_match(data, '<meta name="description"[^<]+original(.*?)&')
-    item.title = item.extra.split("|")[1]
-    title_imdb = re.sub(r'\[.*?\]', '', item.extra.split("|")[1])
-    title = re.sub(
-        r"\(.*?\)|-Remastered|Black And Chrome Edition|V.extendida|Version Extendida|V.Extendida|HEVC|X\d+|x\d+|LINE|HD|1080p|Screeener|V.O|Hdrip|.*?--|3D|SBS|HOU",
-        "", title)
+        list_pages = [item.url]
 
-    sinopsis = scrapertools.find_single_match(data, 'Sinopsis<br \/>(.*?)<\/div>')
-    if sinopsis == "":
-        try:
-            sinopsis = scrapertools.find_single_match(data, 'sinopsis\'>(.*?)<\/div>')
-        except:
-            sinopsis = ""
-    if "Miniserie" in sinopsis:
-        tipo_ps = "tv"
-        year = scrapertools.find_single_match(sinopsis, 'de TV \((\d+)\)')
-    if year == "":
-        if item.contentType != "movie":
-            try:
-                year = scrapertools.find_single_match(data, '<strong>Estreno:<\/strong>(\d+)<\/span>')
-            except:
-                year = ""
-        else:
-            year = scrapertools.find_single_match(data, '<br \/>A.*?(\d+)<br \/>')
-            if year == "":
-                year = scrapertools.find_single_match(data, 'Estreno.*?\d+/\d+/(\d+)')
-                if year == "":
-                    year = scrapertools.find_single_match(data,
-                                                          '<div class=\'descripcion_top\'>.*?A&ntilde;o<br />.*?(\d\d\d\d)')
-                    if year == "":
-                        year = scrapertools.find_single_match(data,
-                                                              '<meta name="description"[^<]+A&ntilde;o[^<]+\d\d\d\d')
-                        if year == "":
-                            year = scrapertools.find_single_match(data, '<h1><strong>.*?(\d\d\d\d).*?<')
-                            if year == "":
-                                year = " "
+    for index, page in enumerate(list_pages):
+        logger.debug("Loading page %s/%s url=%s" % (index, len(list_pages), page))
+        data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(page).data)
+        data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
 
-    infoLabels = {'title': title, 'sinopsis': sinopsis, 'year': year}
-    critica, rating_filma, year_f, sinopsis_f = filmaffinity(item, infoLabels)
-    if sinopsis == "":
-        sinopsis = sinopsis_f
-    if year == "":
-        year = year_f
-    otmdb = tmdb.Tmdb(texto_buscado=title, year=year, tipo=tipo_ps)
-    id = otmdb.result.get("id")
-    posterdb = otmdb.result.get("poster_path")
-    if posterdb == None:
-        otmdb = tmdb.Tmdb(texto_buscado=title, tipo=tipo_ps)
-        id = otmdb.result.get("id")
-        posterdb = otmdb.result.get("poster_path")
-        if posterdb == None:
-            if item.contentType != "movie":
-                urlbing_imdb = "http://www.bing.com/search?q=%s+%s+tv+series+site:imdb.com" % (
-                title_imdb.replace(' ', '+'), year)
-                data = browser(urlbing_imdb)
-                data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|http://ssl-proxy.my-addr.org/myaddrproxy.php/", "", data)
-                subdata_imdb = scrapertools.find_single_match(data,
-                                                              '<li class="b_algo">(.*?)h="ID.*?<strong>.*?TV Series')
-            else:
-                urlbing_imdb = "http://www.bing.com/search?q=%s+%s+site:imdb.com" % (title_imdb.replace(' ', '+'), year)
-                data = browser(urlbing_imdb)
-                data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|http://ssl-proxy.my-addr.org/myaddrproxy.php/", "", data)
-                subdata_imdb = scrapertools.find_single_match(data, '<li class="b_algo">(.*?)h="ID.*?<strong>')
-            try:
-                imdb_id = scrapertools.get_match(subdata_imdb, '<a href=.*?http.*?imdb.com/title/(.*?)/.*?"')
-            except:
-                try:
-                    imdb_id = scrapertools.get_match(subdata_imdb, '<a href=.*?http.*?imdb.com/.*?/title/(.*?)/.*?"')
-                except:
-                    imdb_id = ""
-            otmdb = tmdb.Tmdb(external_id=imdb_id, external_source="imdb_id", tipo=tipo_ps, idioma_busqueda="es")
-            id = otmdb.result.get("id")
-            posterdb = otmdb.result.get("poster_path")
-            if not posterdb:
-                if "(" in title_imdb:
-                    title = scrapertools.find_single_match(title_imdb, '\(.*?\)')
-                    if item.contentType != "movie":
-                        urlbing_imdb = "http://www.bing.com/search?q=%s+%s+tv+series+site:imdb.com" % (
-                        title_imdb.replace(' ', '+'), year)
-                        data = browser(urlbing_imdb)
-                        data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|http://ssl-proxy.my-addr.org/myaddrproxy.php/", "", data)
-                        subdata_imdb = scrapertools.find_single_match(data,
-                                                                      '<li class="b_algo">(.*?)h="ID.*?<strong>.*?TV Series')
+        pattern = '<ul class="%s">(.*?)</ul>' % "buscar-list"  # item.pattern
+        data = scrapertools.get_match(data, pattern)
+        # logger.debug("data %s " % data)
+
+        pattern = '<li[^>]*><a href="(?P<url>[^"]+).*?<img src="(?P<thumb>[^"]+)".*?<h2[^>]+>(?P<info>.*?)</h2>'
+        matches = re.compile(pattern, re.DOTALL).findall(data)
+        # logger.debug("data %s " % matches)
+
+        for url, thumb, info in matches:
+            # logger.debug("info %s" % info)
+
+            if "<span" in info:  # new style
+                pattern = ".*?[^>]+>.*?Temporada\s*(?P<season>\d+)\s*Capitulo(?:s)?\s*(?P<episode>\d+)" \
+                          "(?:.*?(?P<episode2>\d+)?)<.+?<span[^>]+>(?P<lang>.*?)</span>\s*Calidad\s*<span[^>]+>" \
+                          "[\[]\s*(?P<quality>.*?)\s*[\]]</span>"
+                r = re.compile(pattern)
+                match = [m.groupdict() for m in r.finditer(info)][0]
+
+                if match["episode2"]:
+                    multi = True
+                    title = "%s (%sx%s-%s) [%s][%s]" % (item.show, match["season"], str(match["episode"]).zfill(2),
+                                                        str(match["episode2"]).zfill(2), match["lang"],
+                                                        match["quality"])
+                else:
+                    multi = False
+                    title = "%s (%sx%s) [%s][%s]" % (item.show, match["season"], str(match["episode"]).zfill(2),
+                                                     match["lang"], match["quality"])
+
+            else:  # old style
+                pattern = "\[(?P<quality>.*?)\].*?\[Cap.(?P<season>\d+)(?P<episode>\d{2})(?:_(?P<season2>\d+)" \
+                          "(?P<episode2>\d{2}))?.*?\].*?(?:\[(?P<lang>.*?)\])?"
+
+                r = re.compile(pattern)
+                match = [m.groupdict() for m in r.finditer(info)][0]
+                # logger.debug("data %s" % match)
+
+                str_lang = ""
+                if match["lang"] is not None:
+                    str_lang = "[%s]" % match["lang"]
+
+                if match["season2"] and match["episode2"]:
+                    multi = True
+                    if match["season"] == match["season2"]:
+
+                        title = "%s (%sx%s-%s) %s[%s]" % (item.show, match["season"], match["episode"],
+                                                          match["episode2"], str_lang, match["quality"])
                     else:
-                        urlbing_imdb = "http://www.bing.com/search?q=%s+%s+site:imdb.com" % (
-                        title_imdb.replace(' ', '+'), year)
-                        data = browser(urlbing_imdb)
-                        data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|http://ssl-proxy.my-addr.org/myaddrproxy.php/", "", data)
-                        subdata_imdb = scrapertools.find_single_match(data, '<li class="b_algo">(.*?)h="ID.*?<strong>')
-                    try:
-                        imdb_id = scrapertools.get_match(subdata_imdb, '<a href=.*?http.*?imdb.com/title/(.*?)/.*?"')
-                    except:
-                        try:
-                            imdb_id = scrapertools.get_match(subdata_imdb,
-                                                             '<a href=.*?http.*?imdb.com/.*?/title/(.*?)/.*?"')
-                        except:
-                            imdb_id = ""
-                    otmdb = tmdb.Tmdb(external_id=imdb_id, external_source="imdb_id", tipo=tipo_ps,
-                                      idioma_busqueda="es")
-                    id = otmdb.result.get("id")
-                    posterdb = otmdb.result.get("poster_path")
-                    if not posterdb:
-                        id = tiw = rating = tagline = id_tvdb = ""
-                        fanart_4 = fanart_2 = fanart_3 = item.fanart
-                        rating = "Sin Puntuación"
-                        posterdb = tvf = item.thumbnail
-                        fanart_info = item.fanart
-                        thumbnail_art = item.thumbnail
-                        extra = str(fanart_2) + "|" + str(fanart_3) + "|" + str(fanart_4) + "|" + str(id) + "|" + str(
-                            tvf) + "|" + str(id_tvdb) + "|" + str(tiw) + "|" + str(rating)
-                        itemlist.append(Item(channel=item.channel, title=item.title, url=item.url, action="findvideos",
-                                             thumbnail=item.thumbnail, fanart=item.fanart, extra=extra, folder=True))
+                        title = "%s (%sx%s-%sx%s) %s[%s]" % (item.show, match["season"], match["episode"],
+                                                             match["season2"], match["episode2"], str_lang,
+                                                             match["quality"])
                 else:
-                    if tipo_ps != "movie":
-                        action = "findvideos"
-                    else:
-                        action = "findvideos_enlaces"
-                    id = tiw = rating = tagline = id_tvdb = ""
-                    fanart_4 = fanart_2 = fanart_3 = item.fanart
-                    rating = "Sin Puntuación"
-                    posterdb = tvf = item.thumbnail
-                    fanart_info = item.fanart
-                    thumbnail_art = item.thumbnail
-                    extra = str(fanart_2) + "|" + str(fanart_3) + "|" + str(fanart_4) + "|" + str(id) + "|" + str(
-                        tvf) + "|" + str(id_tvdb) + "|" + str(tiw) + "|" + str(rating)
-                    itemlist.append(Item(channel=item.channel, title=item.title, url=item.url, action=action,
-                                         thumbnail=item.thumbnail, fanart=item.fanart, extra=extra,
-                                         contentType=item.contentType, folder=True))
-    if posterdb != item.thumbnail:
-        if not "null" in posterdb:
-            posterdb = "https://image.tmdb.org/t/p/original" + posterdb
-        else:
-            posterdb = item.thumbnail
+                    title = "%s (%sx%s) %s[%s]" % (item.show, match["season"], match["episode"], str_lang,
+                                                   match["quality"])
+                    multi = False
 
-        if otmdb.result.get("backdrop_path"):
-            fanart = "https://image.tmdb.org/t/p/original" + otmdb.result.get("backdrop_path")
-        else:
-            fanart = item.fanart
-        if sinopsis == "":
-            if otmdb.result.get("'overview'"):
-                sinopsis = otmdb.result.get("'overview'")
-            else:
-                sinopsis = ""
-        if otmdb.result.get("vote_average"):
-            rating = otmdb.result.get("vote_average")
-        else:
-            rating = "Sin puntuacíon"
-        imagenes = []
-        itmdb = tmdb.Tmdb(id_Tmdb=id, tipo=tipo_ps)
-        images = itmdb.result.get("images")
-        for key, value in images.iteritems():
-            for detail in value:
-                imagenes.append('https://image.tmdb.org/t/p/original' + detail["file_path"])
-        if item.contentType != "movie":
-            if itmdb.result.get("number_of_seasons"):
-                season_number = itmdb.result.get("number_of_seasons")
-            else:
-                season_episode = ""
-            if itmdb.result.get("number_of_episodes"):
-                season_episode = itmdb.result.get("number_of_episodes")
-            else:
-                season_episode = ""
-            if itmdb.result.get("status"):
-                status = itmdb.result.get("status")
-            else:
-                status = ""
-            if status == "Ended":
-                status = "Finalizada"
-            else:
-                status = "En emisión"
-            tagline = str(status) + " (Temporadas:" + str(season_number) + ",Episodios:" + str(season_episode) + ")"
-            if itmdb.result.get("external_ids").get("tvdb_id"):
-                id_tvdb = itmdb.result.get("external_ids").get("tvdb_id")
-            else:
-                id_tvdb = ""
-        else:
-            id_tvdb = ""
-            if itmdb.result.get("tagline"):
-                tagline = itmdb.result.get("tagline")
-            else:
-                tagline = ""
-        if len(imagenes) >= 5:
-            fanart_info = imagenes[1]
-            fanart_2 = imagenes[2]
-            fanart_3 = imagenes[3]
-            fanart_4 = imagenes[4]
-            if fanart == item.fanart:
-                fanart = fanart_info
-        elif len(imagenes) == 4:
-            fanart_info = imagenes[1]
-            fanart_2 = imagenes[2]
-            fanart_3 = imagenes[3]
-            fanart_4 = imagenes[1]
-            if fanart == item.fanart:
-                fanart = fanart_info
-        elif len(imagenes) == 3:
-            fanart_info = imagenes[1]
-            fanart_2 = imagenes[2]
-            fanart_3 = imagenes[1]
-            fanart_4 = imagenes[0]
-            if fanart == item.fanart:
-                fanart = fanart_info
-        elif len(imagenes) == 2:
-            fanart_info = imagenes[1]
-            fanart_2 = imagenes[0]
-            fanart_3 = imagenes[1]
-            fanart_4 = imagenes[1]
-            if fanart == item.fanart:
-                fanart = fanart_info
-        else:
-            fanart_info = fanart
-            fanart_2 = fanart
-            fanart_3 = fanart
-            fanart_4 = fanart
-        images_fanarttv = fanartv(item, id_tvdb, id)
-        if item.contentType != "movie":
-            action = "findvideos"
-            if images_fanarttv:
-                try:
-                    thumbnail_art = images_fanarttv.get("hdtvlogo")[0].get("url")
-                except:
-                    try:
-                        thumbnail_art = images_fanarttv.get("clearlogo")[0].get("url")
-                    except:
-                        thumbnail_art = posterdb
-                if images_fanarttv.get("tvbanner"):
-                    tvf = images_fanarttv.get("tvbanner")[0].get("url")
-                elif images_fanarttv.get("tvthumb"):
-                    tvf = images_fanarttv.get("tvthumb")[0].get("url")
-                elif images_fanarttv.get("tvposter"):
-                    tvf = images_fanarttv.get("tvposter")[0].get("url")
-                else:
-                    tvf = posterdb
-                if images_fanarttv.get("tvthumb"):
-                    thumb_info = images_fanarttv.get("tvthumb")[0].get("url")
-                else:
-                    thumb_info = thumbnail_art
+            itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumb,
+                                 quality=item.quality, multi=multi, contentSeason=match["season"],
+                                 contentEpisodeNumber=match["episode"]))
+
+    # order list
+    if len(itemlist) > 1:
+        return sorted(itemlist, key=lambda it: (int(it.contentSeason), int(it.contentEpisodeNumber)))
 
-                if images_fanarttv.get("hdclearart"):
-                    tiw = images_fanarttv.get("hdclearart")[0].get("url")
-                elif images_fanarttv.get("characterart"):
-                    tiw = images_fanarttv.get("characterart")[0].get("url")
-                elif images_fanarttv.get("hdtvlogo"):
-                    tiw = images_fanarttv.get("hdtvlogo")[0].get("url")
-                else:
-                    tiw = ""
-            else:
-                tiw = ""
-                tvf = thumbnail_info = thumbnail_art = posterdb
-        else:
-            action = "findvideos_enlaces"
-            if images_fanarttv:
-                if images_fanarttv.get("hdmovielogo"):
-                    thumbnail_art = images_fanarttv.get("hdmovielogo")[0].get("url")
-                elif images_fanarttv.get("moviethumb"):
-                    thumbnail_art = images_fanarttv.get("moviethumb")[0].get("url")
-                elif images_fanarttv.get("moviebanner"):
-                    thumbnail_art = images_fanarttv.get("moviebanner")[0].get("url")
-                else:
-                    thumbnail_art = posterdb
-                if images_fanarttv.get("moviedisc"):
-                    tvf = images_fanarttv.get("moviedisc")[0].get("url")
-                elif images_fanarttv.get("hdmovielogo"):
-                    tvf = images_fanarttv.get("hdmovielogo")[0].get("url")
-                else:
-                    tvf = posterdb
-                if images_fanarttv.get("hdmovieclearart"):
-                    tiw = images_fanarttv.get("hdmovieclearart")[0].get("url")
-                elif images_fanarttv.get("hdmovielogo"):
-                    tiw = images_fanarttv.get("hdmovielogo")[0].get("url")
-                else:
-                    tiw = ""
-            else:
-                tiw = ""
-                tvf = thumbnail_art = posterdb
-        extra = str(fanart_2) + "|" + str(fanart_3) + "|" + str(fanart_4) + "|" + str(id) + "|" + str(tvf) + "|" + str(
-            id_tvdb) + "|" + str(tiw) + "|" + str(rating) + "|" + tipo_ps
-        itemlist.append(
-            Item(channel=item.channel, title=item.title, url=item.url, action=action, thumbnail=thumbnail_art,
-                 fanart=fanart, extra=extra, contentType=item.contentType, folder=True))
-    title_info = "[COLOR indianred][B]Info[/B][/COLOR]"
-    extra = str(rating) + "|" + str(rating_filma) + "|" + str(id) + "|" + str(item.title) + "|" + str(
-        id_tvdb) + "|" + str(tagline) + "|" + str(sinopsis) + "|" + str(critica) + "|" + str(thumbnail_art) + "|" + str(
-        fanart_4)
-    itemlist.append(Item(channel=item.channel, action="info", title=title_info, url=item.url, thumbnail=posterdb,
-                         fanart=fanart_info, extra=extra, contentType=item.contentType, folder=False))
     return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    fanart = ""
-    data = httptools.downloadpage(item.url).data
-    if item.contentType != "movie":
-        itmdb = tmdb.Tmdb(id_Tmdb=item.extra.split("|")[3], tipo=item.extra.split("|")[8])
-        season = itmdb.result.get("seasons")
-        check = "no"
-        bloque_enlaces = scrapertools.find_single_match(data,
-                                                        '<ul class="buscar-list">(.*?)<\/ul><!-- end \.buscar-list -->')
-        if check == "no":
-            check_temp = scrapertools.find_single_match(bloque_enlaces, 'Temporada (\d+)')
-            if check_temp == "":
-                check_temp = 1
-            if len(check_temp) == 1:
-                try:
-                    check_temp = scrapertools.find_single_match(bloque_enlaces, 'Temporada (\d+) Capitulos')
-                    check_temp = None
-                except:
-                    pass
-            thumbnail = ""
-            if season:
-                for detail in season:
-                    if str(detail["season_number"]) == check_temp:
-                        if detail["poster_path"]:
-                            thumbnail = "https://image.tmdb.org/t/p/original" + detail["poster_path"]
-            images_fanarttv = fanartv(item, item.extra.split("|")[5], item.extra.split("|")[3])
-            if images_fanarttv:
-                season_f = images_fanarttv.get("showbackground")
-                if season_f:
-                    for detail in season_f:
-                        if str(detail["season"]) == check_temp:
-                            if detail["url"]:
-                                fanart = detail["url"]
-        if fanart == "":
-            fanart = item.extra.split("|")[0]
-        if thumbnail == "":
-            thumbnail = item.thumbnail
-        if check_temp:
-            itemlist.append(
-                Item(channel=item.channel, title="[COLOR red][B]Temporada " + check_temp + "[/B][/COLOR]", url="",
-                     action="", thumbnail=thumbnail, fanart=fanart, folder=False))
-        temp_bloque = scrapertools.find_multiple_matches(bloque_enlaces,
-                                                         'href="([^"]+).*?" title=".*?Temporada (\d+) Capitulo (\d+).*?Serie <strong style="color:red;background:none;">(.*?)<\/strong>.*?Calidad <span style="color:red;background:none;">(\[.*?\])<\/span>.*?<span>.*?<span>(.*?)<\/span>.*?Descargar')
-        if temp_bloque != "":
-            for url, temp, capi, check_capi, calidad, peso in temp_bloque:
-                if "Capitulos" in check_capi:
-                    extra = item.extra + "|" + check_capi + "|" + temp
-                    title = scrapertools.find_single_match(check_capi, '-.*?(Capitulos.*)')
-                    title = "          [COLOR red][B]" + title + "[/B][/COLOR]"
-                else:
-                    extra = item.extra + "|" + "Nocapi" + "|" + temp + "|" + capi
-                    title = "          [COLOR red][B]Capítulo " + capi + "[/B][/COLOR]"
-                if temp != check_temp:
-                    check_temp = temp
-                    check = "yes"
-                    for detail in season:
-                        if detail["season_number"]:
-                            if str(detail["season_number"]) == temp:
-                                if detail["poster_path"]:
-                                    thumbnail = "https://image.tmdb.org/t/p/original" + detail["poster_path"]
-                                else:
-                                    thumbnail = ""
-                        else:
-                            thumbail = ""
-                        if images_fanarttv:
-                            season_f = images_fanarttv.get("showbackground")
-                            if season_f:
-                                for detail in season_f:
-                                    if str(detail["season"]) == check_temp:
-                                        if detail["season"]:
-                                            fanart = detail["url"]
-                    if fanart == "":
-                        fanart = item.extra.split("|")[0]
-                    if thumbnail == "":
-                        thumbnail = item.thumbnail
-                    itemlist.append(
-                        Item(channel=item.channel, title="[COLOR red][B]Temporada " + temp + "[/B][/COLOR]", url="",
-                             action="", thumbnail=thumbnail, fanart=fanart, folder=False))
-
-                itemlist.append(
-                    Item(channel=item.channel, title=title, url=url, action="findvideos_enlaces", thumbnail=thumbnail,
-                         fanart=item.extra.split("|")[0], extra=extra, contentType=item.contentType, folder=True))
-        else:
-            temp_bloque = scrapertools.find_multiple_matches(bloque_enlaces,
-                                                             'href="([^"]+).*?Temporada (\d+) Capitulo (\d+).*?Calidad.*?\[(.*?)\]<\/span>.*?<span>.*?<span>(.*?)<\/span>')
-            for url, capi, calidad, peso in temp_bloque:
-                itemlist.append(
-                    Item(channel=item.channel, title="          [COLOR red][B]Capítulo " + capi + "[/B][/COLOR]",
-                         url="", action="findvideos_enlaces", thumbnail=item.extra.split("|")[4],
-                         fanart=item.extra.split("|")[0], folder=True))
-
-        ## Paginación
-        next = scrapertools.find_single_match(data, 'href="([^"]+)">Next<\/a>')
-        if len(next) > 0:
-            url = next
-
-            itemlist.append(
-                Item(channel=item.channel, action="findvideos", title="[COLOR darkred][B]siguiente[/B][/COLOR]",
-                     url=url, thumbnail="http://imgur.com/D4ZgFri.png", fanart=item.fanart, extra=item.extra,
-                     contentType=item.contentType, folder=True))
-    return itemlist
-
-
-def findvideos_enlaces(item):
-    logger.info()
-    itemlist = []
-    check_epi2 = ""
-    data = httptools.downloadpage(item.url).data
-
-    url = scrapertools.find_single_match(data, 'window.location.href = "([^"]+)"').strip()
-
-    try:
-
-        if not url.endswith(".torrent"):
-            url = httptools.downloadpage(url, follow_redirects=False)
-            url = url.headers.get("location")
-
-            if not url.endswith(".torrent"):
-                url = httptools.downloadpage(url, follow_redirects=False)
-                url = url.headers.get("location")
-        else:
-            url = httptools.downloadpage(url, follow_redirects=False)
-            url = url.headers.get("location")
-        torrents_path = config.get_videolibrary_path() + '/torrents'
-
-        if not os.path.exists(torrents_path):
-            os.mkdir(torrents_path)
-        try:
-            urllib.URLopener.version = 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:51.0) Gecko/20100101 Firefox/51.0'
-            urllib.urlretrieve(url, torrents_path + "/temp.torrent")
-            pepe = open(torrents_path + "/temp.torrent", "rb").read()
-        except:
-            pepe = ""
-        if "used CloudFlare" in pepe:
-            try:
-                urllib.urlretrieve("http://anonymouse.org/cgi-bin/anon-www.cgi/" + url.strip(),
-                                   torrents_path + "/temp.torrent")
-                pepe = open(torrents_path + "/temp.torrent", "rb").read()
-            except:
-                pepe = ""
-        torrent = decode(pepe)
-
-        try:
-            name = torrent["info"]["name"]
-            sizet = torrent["info"]['length']
-            sizet = convert_size(sizet)
-        except:
-            name = "no disponible"
-        try:
-            check_video = scrapertools.find_multiple_matches(str(torrent["info"]["files"]), "'length': (\d+)}")
-
-            size = max([int(i) for i in check_video])
-
-            for file in torrent["info"]["files"]:
-                manolo = "%r - %d bytes" % ("/".join(file["path"]), file["length"])
-                if str(size) in manolo:
-                    video = manolo
-            size = convert_size(size)
-            ext_v = re.sub(r"-.*? bytes|.*?\[.*?\].|'|.*?COM.|.*?\[.*?\]|\(.*?\)|.*?\.", "", video)
-            try:
-                os.remove(torrents_path + "/temp.torrent")
-            except:
-                pass
-        except:
-            size = sizet
-            ext_v = re.sub(r"-.*? bytes|.*?\[.*?\].|'|.*?COM.|.*?\.es.|.*?\[.*?\]|.*?\(.*?\)\.|.*?\.", "", name)
-            try:
-                os.remove(torrents_path + "/temp.torrent")
-            except:
-                pass
-    except:
-        size = "en estos momentos..."
-        ext_v = "no disponible"
-    if "rar" in ext_v:
-        ext_v = ext_v + " -- No reproducible"
-    if item.contentType != "movie":
-        fanart = item.extra.split("|")[1]
-    else:
-        fanart = item.extra.split("|")[0]
-    itemlist.append(Item(channel=item.channel,
-                         title="[COLOR orangered][B]Torrent[/B][/COLOR] " + "[COLOR lemonchiffon]( Video [/COLOR]" + "[COLOR lemonchiffon]" + ext_v + "--" + size + " )[/COLOR]",
-                         url=url, action="play", server="torrent", thumbnail=item.extra.split("|")[4], fanart=fanart,
-                         folder=False))
-
-    if item.contentType != "movie":
-        if "Capitulos" in item.extra.split("|")[9]:
-            epis = scrapertools.find_multiple_matches(item.extra.split("|")[9], 'Capitulos (\d+) al (\d+)')
-            for epi1, epi2 in epis:
-                len_epis = int(epi2) - int(epi1)
-                if len_epis == 1:
-                    extra = item.extra + "|" + epi1
-                    check_epi2 = "ok"
-                    title_info = "    Info Cap." + epi1
-                    title_info = "[COLOR indianred]" + title_info + "[/COLOR]"
-                    itemlist.append(Item(channel=item.channel, action="info_capitulos", title=title_info, url=item.url,
-                                         thumbnail=item.extra.split("|")[6], fanart=item.extra.split("|")[1],
-                                         extra=extra, folder=False))
-                else:
-                    check_epi2 = ""
-                    epis_len = range(int(epi1), int(epi2) + 1)
-                    extra = item.extra + "|" + str(epis_len)
-                    title_info = "    Info Capítulos"
-                    title_info = "[COLOR indianred]" + title_info + "[/COLOR]"
-                    itemlist.append(Item(channel=item.channel, action="capitulos", title=title_info, url=item.url,
-                                         thumbnail=item.extra.split("|")[6], fanart=item.extra.split("|")[1],
-                                         extra=extra, folder=True))
-        else:
-            title_info = "    Info"
-            title_info = "[COLOR indianred]" + title_info + "[/COLOR]"
-            itemlist.append(Item(channel=item.channel, action="info_capitulos", title=title_info, url=item.url,
-                                 thumbnail=item.extra.split("|")[6], fanart=item.extra.split("|")[1], extra=item.extra,
-                                 folder=False))
-        if check_epi2 == "ok":
-            extra = item.extra + "|" + epi2
-            title_info = "    Info Cap." + epi2
-            title_info = "[COLOR indianred]" + title_info + "[/COLOR]"
-            itemlist.append(Item(channel=item.channel, action="info_capitulos", title=title_info, url=item.url,
-                                 thumbnail=item.extra.split("|")[6], fanart=item.extra.split("|")[1], extra=extra,
-                                 folder=False))
-    dd = scrapertools.find_single_match(data, 'DESCARGAS DIRECTA(.*?)VER ONLINE')
-    if dd:
-        extra = item.extra + "|" + dd
-        itemlist.append(Item(channel=item.channel, title="[COLOR floralwhite][B]Descarga directa y online[/B][/COLOR]",
-                             url=item.url, action="dd_y_o", thumbnail="http://imgur.com/as7Ie6p.png",
-                             fanart=item.extra.split("|")[1], contentType=item.contentType, extra=extra, folder=True))
-    return itemlist
-
-
-def dd_y_o(item):
-    logger.info()
-    itemlist = []
-    if item.contentType == "movie":
-        data = item.extra.split("|")[9]
-    else:
-        data = item.extra.split("|")[12]
-    enlaces = scrapertools.find_multiple_matches(data,
-                                                 "class=\"box1\"><img src='([^']+)'.*?<div class=\"box2\">([^<]+)<\/div>.*?>([^<]+)<\/div>.*?>([^<]+)<\/div>.*?><a href='([^']+)'.*?Des")
-    for thumb, server_name, idioma, calidad, url_d in enlaces:
-        videolist = servertools.find_video_items(data=url_d)
-        for video in videolist:
-            itemlist.append(Item(channel=item.channel, url=video.url, server=video.server,
-                                 title="[COLOR floralwhite][B]" + server_name + "[/B][/COLOR]", thumbnail=thumb,
-                                 fanart=item.extra.split("|")[2], action="play", folder=False))
-    return itemlist
-
-
-def capitulos(item):
-    logger.info()
-    itemlist = []
-    url = item.url
-    Join_extras = "|".join(item.extra.split("|")[0:11])
-    capis = item.extra.split("|")[11]
-    capis = re.sub(r'\[|\]', '', capis)
-    capis = [int(k) for k in capis.split(',')]
-    for i in capis:
-        extra = Join_extras + "|" + str(i)
-        itemlist.append(Item(channel=item.channel, action="info_capitulos",
-                             title="[COLOR indianred]Info Cap." + str(i) + "[/COLOR]", url=item.url,
-                             thumbnail=item.thumbnail, fanart=item.fanart, extra=extra, folder=False))
-    return itemlist
-
-
-def info(item):
-    logger.info()
-    itemlist = []
-    url = item.url
-    rating_tmdba_tvdb = item.extra.split("|")[0]
-    if item.extra.split("|")[6] == "":
-        rating_tmdba_tvdb = "Sin puntuación"
-    rating_filma = item.extra.split("|")[1]
-    filma = "http://s6.postimg.org/6yhe5fgy9/filma.png"
-    title = item.extra.split("|")[3]
-    title = title.replace("%20", " ")
-    try:
-        if "." in rating_tmdba_tvdb:
-            check_rat_tmdba = scrapertools.get_match(rating_tmdba_tvdb, '(\d+).')
-        else:
-            check_rat_tmdba = rating_tmdba_tvdb
-        if int(check_rat_tmdba) >= 5 and int(check_rat_tmdba) < 8:
-            rating = "[COLOR springgreen][B]" + rating_tmdba_tvdb + "[/B][/COLOR]"
-        elif int(check_rat_tmdba) >= 8 or rating_tmdba_tvdb == 10:
-            rating = "[COLOR yellow][B]" + rating_tmdba_tvdb + "[/B][/COLOR]"
-        else:
-            rating = "[COLOR crimson][B]" + rating_tmdba_tvdb + "[/B][/COLOR]"
-            print "lolaymaue"
-    except:
-        rating = "[COLOR crimson][B]" + rating_tmdba_tvdb + "[/B][/COLOR]"
-    if "10." in rating:
-        rating = re.sub(r'10\.\d+', '10', rating)
-    try:
-        check_rat_filma = scrapertools.get_match(rating_filma, '(\d)')
-        print "paco"
-        print check_rat_filma
-        if int(check_rat_filma) >= 5 and int(check_rat_filma) < 8:
-            print "dios"
-            print check_rat_filma
-            rating_filma = "[COLOR springgreen][B]" + rating_filma + "[/B][/COLOR]"
-        elif int(check_rat_filma) >= 8:
-
-            print check_rat_filma
-            rating_filma = "[COLOR yellow][B]" + rating_filma + "[/B][/COLOR]"
-        else:
-            rating_filma = "[COLOR crimson][B]" + rating_filma + "[/B][/COLOR]"
-            print "rojo??"
-            print check_rat_filma
-    except:
-        rating_filma = "[COLOR crimson][B]" + rating_filma + "[/B][/COLOR]"
-    plot = item.extra.split("|")[6]
-    plot = "[COLOR moccasin][B]" + plot + "[/B][/COLOR]"
-    plot = re.sub(r"\\|<br />", "", plot)
-    if item.extra.split("|")[5] != "":
-        tagline = item.extra.split("|")[5]
-        if tagline == "\"\"":
-            tagline = " "
-        tagline = "[COLOR aquamarine][B]" + tagline + "[/B][/COLOR]"
-    else:
-        tagline = ""
-    if item.contentType != "movie":
-        icon = "http://s6.postimg.org/hzcjag975/tvdb.png"
-    else:
-        icon = "http://imgur.com/SenkyxF.png"
-
-    foto = item.extra.split("|")[9]
-    if not "tmdb" in foto:
-        foto = ""
-    if item.extra.split("|")[7] != "":
-        critica = item.extra.split("|")[7]
-    else:
-        critica = "Esta serie no tiene críticas..."
-
-    photo = item.extra.split("|")[8].replace(" ", "%20")
-    if ".jpg" in photo:
-        photo = ""
-    # Tambien te puede interesar
-    peliculas = []
-    if item.contentType != "movie":
-        url_tpi = "http://api.themoviedb.org/3/tv/" + item.extra.split("|")[
-            2] + "/recommendations?api_key=" + api_key + "&language=es"
-        data_tpi = httptools.downloadpage(url_tpi).data
-        tpi = scrapertools.find_multiple_matches(data_tpi,
-                                                 'id":(.*?),.*?"original_name":"(.*?)",.*?"poster_path":(.*?),"popularity"')
-    else:
-        url_tpi = "http://api.themoviedb.org/3/movie/" + item.extra.split("|")[
-            2] + "/recommendations?api_key=" + api_key + "&language=es"
-        data_tpi = httptools.downloadpage(url_tpi).data
-        tpi = scrapertools.find_multiple_matches(data_tpi,
-                                                 'id":(.*?),.*?"original_title":"(.*?)",.*?"poster_path":(.*?),"popularity"')
-
-    for idp, peli, thumb in tpi:
-
-        thumb = re.sub(r'"|}', '', thumb)
-        if "null" in thumb:
-            thumb = "http://s6.postimg.org/tw1vhymj5/noposter.png"
-        else:
-            thumb = "https://image.tmdb.org/t/p/original" + thumb
-        peliculas.append([idp, peli, thumb])
-
-    extra = "" + "|" + item.extra.split("|")[2] + "|" + item.extra.split("|")[2] + "|" + item.extra.split("|")[
-        6] + "|" + ""
-    infoLabels = {'title': title, 'plot': plot, 'thumbnail': photo, 'fanart': foto, 'tagline': tagline,
-                  'rating': rating}
-    item_info = item.clone(info=infoLabels, icon=icon, extra=extra, rating=rating, rating_filma=rating_filma,
-                           critica=critica, contentType=item.contentType, thumb_busqueda="http://imgur.com/j0A9lnu.png")
-    from channels import infoplus
-    infoplus.start(item_info, peliculas)
-
-
-def info_capitulos(item, images={}):
-    logger.info()
-    url = "https://api.themoviedb.org/3/tv/" + item.extra.split("|")[3] + "/season/" + item.extra.split("|")[
-        10] + "/episode/" + item.extra.split("|")[11] + "?api_key=" + api_key + "&language=es"
-    if "/0" in url:
-        url = url.replace("/0", "/")
-    from core import jsontools
-    data = jsontools.load(scrapertools.downloadpage(url))
-    foto = item.extra.split("|")[6]
-    if not ".png" in foto:
-        foto = "http://imgur.com/j0A9lnu.png"
-    if data:
-        if data.get("name"):
-            title = data.get("name")
-        else:
-            title = ""
-        title = "[COLOR red][B]" + title + "[/B][/COLOR]"
-        if data.get("still_path"):
-            image = "https://image.tmdb.org/t/p/original" + data.get("still_path")
-        else:
-            image = "http://imgur.com/ZiEAVOD.png"
-        if data.get("overview"):
-            plot = data.get("overview")
-        else:
-            plot = "Sin informacion del capítulo aún..."
-        plot = "[COLOR floralwhite][B]" + plot + "[/B][/COLOR]"
-        if data.get("vote_average"):
-            rating = data.get("vote_average")
-        else:
-            rating = 0
-        try:
-
-            if rating >= 5 and rating < 8:
-                rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR springgreen][B]" + str(rating) + "[/B][/COLOR]"
-            elif rating >= 8 and rating < 10:
-                rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR yellow][B]" + str(rating) + "[/B][/COLOR]"
-            elif rating == 10:
-                rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR orangered][B]" + str(rating) + "[/B][/COLOR]"
-            else:
-                rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR crimson][B]" + str(rating) + "[/B][/COLOR]"
-        except:
-            rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR crimson][B]" + str(rating) + "[/B][/COLOR]"
-        if "10." in rating:
-            rating = re.sub(r'10\.\d+', '10', rating)
-
-
-    else:
-
-        title = "[COLOR red][B]LO SENTIMOS...[/B][/COLOR]"
-        plot = "Este capitulo no tiene informacion..."
-        plot = "[COLOR yellow][B]" + plot + "[/B][/COLOR]"
-        image = "http://s6.postimg.org/ub7pb76c1/noinfo.png"
-        foto = "http://s6.postimg.org/nm3gk1xox/noinfosup2.png"
-        rating = ""
-
-    ventana = TextBox2(title=title, plot=plot, thumbnail=image, fanart=foto, rating=rating)
-    ventana.doModal()
-
-
-class TextBox2(xbmcgui.WindowDialog):
-    """ Create a skinned textbox window """
-
-    def __init__(self, *args, **kwargs):
-        self.getTitle = kwargs.get('title')
-        self.getPlot = kwargs.get('plot')
-        self.getThumbnail = kwargs.get('thumbnail')
-        self.getFanart = kwargs.get('fanart')
-        self.getRating = kwargs.get('rating')
-
-        self.background = xbmcgui.ControlImage(70, 20, 1150, 630, 'http://imgur.com/sDp4M2R.jpg')
-        self.title = xbmcgui.ControlTextBox(120, 60, 430, 50)
-        self.rating = xbmcgui.ControlTextBox(145, 112, 1030, 45)
-        self.plot = xbmcgui.ControlTextBox(120, 150, 1056, 100)
-        self.thumbnail = xbmcgui.ControlImage(120, 300, 1056, 300, self.getThumbnail)
-        self.fanart = xbmcgui.ControlImage(780, 43, 390, 100, self.getFanart)
-
-        self.addControl(self.background)
-        self.background.setAnimations(
-            [('conditional', 'effect=slide start=1000% end=0% time=1500 condition=true tween=bounce',),
-             ('WindowClose', 'effect=slide delay=800 start=0% end=1000%  time=800 condition=true',)])
-        self.addControl(self.thumbnail)
-        self.thumbnail.setAnimations([('conditional',
-                                       'effect=zoom  start=0% end=100% delay=2700 time=1500 condition=true tween=elastic easing=inout',),
-                                      ('WindowClose', 'effect=slide end=0,700%   time=300 condition=true',)])
-        self.addControl(self.plot)
-        self.plot.setAnimations(
-            [('conditional', 'effect=zoom delay=2000 center=auto start=0 end=100  time=800  condition=true  ',), (
-            'conditional',
-            'effect=rotate  delay=2000 center=auto aceleration=6000 start=0% end=360%  time=800  condition=true',),
-             ('WindowClose', 'effect=zoom center=auto start=100% end=-0%  time=600 condition=true',)])
-        self.addControl(self.fanart)
-        self.fanart.setAnimations(
-            [('WindowOpen', 'effect=slide start=0,-700 delay=1000 time=2500 tween=bounce condition=true',), (
-            'conditional',
-            'effect=rotate center=auto  start=0% end=360% delay=3000 time=2500 tween=bounce condition=true',),
-             ('WindowClose', 'effect=slide end=0,-700%  time=1000 condition=true',)])
-        self.addControl(self.title)
-        self.title.setText(self.getTitle)
-        self.title.setAnimations(
-            [('conditional', 'effect=slide start=-1500% end=0%  delay=1000 time=2000 condition=true tween=elastic',),
-             ('WindowClose', 'effect=slide start=0% end=-1500%  time=800 condition=true',)])
-        self.addControl(self.rating)
-        self.rating.setText(self.getRating)
-        self.rating.setAnimations(
-            [('conditional', 'effect=fade start=0% end=100% delay=3000 time=1500 condition=true',),
-             ('WindowClose', 'effect=slide end=0,-700%  time=600 condition=true',)])
-        xbmc.sleep(200)
-
-        try:
-            self.plot.autoScroll(7000, 6000, 30000)
-        except:
-
-            xbmc.executebuiltin(
-                'Notification([COLOR red][B]Actualiza Kodi a su última versión[/B][/COLOR], [COLOR skyblue]para mejor info[/COLOR],8000,"https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kodi-icon.png")')
-        self.plot.setText(self.getPlot)
-
-    def get(self):
-        self.show()
-
-    def onAction(self, action):
-        if action == ACTION_PREVIOUS_MENU or action.getId() == ACTION_GESTURE_SWIPE_LEFT or action == 110 or action == 92:
-            self.close()
-
-
-def test():
-    return True
-
-
-def tokenize(text, match=re.compile("([idel])|(\d+):|(-?\d+)").match):
-    i = 0
-    while i < len(text):
-        m = match(text, i)
-        s = m.group(m.lastindex)
-        i = m.end()
-        if m.lastindex == 2:
-            yield "s"
-            yield text[i:i + int(s)]
-            i = i + int(s)
-        else:
-            yield s
-
-
-def decode_item(next, token):
-    if token == "i":
-        # integer: "i" value "e"
-        data = int(next())
-        if next() != "e":
-            raise ValueError
-    elif token == "s":
-        # string: "s" value (virtual tokens)
-        data = next()
-    elif token == "l" or token == "d":
-        # container: "l" (or "d") values "e"
-        data = []
-        tok = next()
-        while tok != "e":
-            data.append(decode_item(next, tok))
-            tok = next()
-        if token == "d":
-            data = dict(zip(data[0::2], data[1::2]))
-    else:
-        raise ValueError
-    return data
-
-
-def decode(text):
-    try:
-        src = tokenize(text)
-        data = decode_item(src.next, src.next())
-        for token in src:  # look for more tokens
-            raise SyntaxError("trailing junk")
-    except (AttributeError, ValueError, StopIteration):
-        try:
-            data = data
-        except:
-            data = src
-
-    return data
-
-
-def convert_size(size):
-    import math
-    if (size == 0):
-        return '0B'
-    size_name = ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
-    i = int(math.floor(math.log(size, 1024)))
-    p = math.pow(1024, i)
-    s = round(size / p, 2)
-    return '%s %s' % (s, size_name[i])
-
-
-def fanartv(item, id_tvdb, id, images={}):
-    headers = [['Content-Type', 'application/json']]
-    from core import jsontools
-    if item.contentType == "movie":
-        url = "http://webservice.fanart.tv/v3/movies/%s?api_key=cab16e262d72fea6a6843d679aa10300" \
-              % id
-    else:
-        url = "http://webservice.fanart.tv/v3/tv/%s?api_key=cab16e262d72fea6a6843d679aa10300" % id_tvdb
-    try:
-        data = jsontools.load(scrapertools.downloadpage(url, headers=headers))
-        if data and not "error message" in data:
-            for key, value in data.items():
-                if key not in ["name", "tmdb_id", "imdb_id", "thetvdb_id"]:
-                    images[key] = value
-        else:
-            images = []
-
-    except:
-        images = []
-    return images
-
-
-def filmaffinity(item, infoLabels):
-    title = infoLabels["title"].replace(" ", "+")
-    try:
-        year = infoLabels["year"]
-    except:
-        year = ""
-    sinopsis = infoLabels["sinopsis"]
-
-    if year == "":
-        if item.contentType != "movie":
-            tipo = "serie"
-            url_bing = "http://www.bing.com/search?q=%s+Serie+de+tv+site:filmaffinity.com" % title
-        else:
-            tipo = "película"
-            url_bing = "http://www.bing.com/search?q=%s+site:filmaffinity.com" % title
-        try:
-            data = browser(url_bing)
-            data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-            if "myaddrproxy.php" in data:
-                subdata_bing = scrapertools.get_match(data,
-                                                      'li class="b_algo"><div class="b_title"><h2>(<a href="/myaddrproxy.php/http/www.filmaffinity.com/es/film.*?)"')
-                subdata_bing = re.sub(r'\/myaddrproxy.php\/http\/', '', subdata_bing)
-            else:
-                subdata_bing = scrapertools.get_match(data,
-                                                      'li class="b_algo"><h2>(<a href="http://www.filmaffinity.com/.*?/film.*?)"')
-
-            url_filma = scrapertools.get_match(subdata_bing, '<a href="([^"]+)')
-            if not "http" in url_filma:
-                try:
-                    data = httptools.downloadpage("http://" + url_filma, cookies=False, timeout=1).data
-                except:
-                    data = httptools.downloadpage("http://" + url_filma, cookies=False, timeout=1).data
-            else:
-                try:
-                    data = httptools.downloadpage(url_filma, cookies=False, timeout=1).data
-                except:
-                    data = httptools.downloadpage(url_filma, cookies=False, timeout=1).data
-            data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-        except:
-            pass
-    else:
-        tipo = "Pelicula"
-        url = "http://www.filmaffinity.com/es/advsearch.php?stext={0}&stype%5B%5D=title&country=&genre=&fromyear={1}&toyear={1}".format(
-            title, year)
-        data = httptools.downloadpage(url, cookies=False).data
-        url_filmaf = scrapertools.find_single_match(data, '<div class="mc-poster">\s*<a title="[^"]*" href="([^"]+)"')
-        if url_filmaf:
-            url_filmaf = "http://www.filmaffinity.com%s" % url_filmaf
-            data = httptools.downloadpage(url_filmaf, cookies=False).data
-        else:
-            if item.contentType != "movie":
-                tipo = "serie"
-                url_bing = "http://www.bing.com/search?q=%s+Serie+de+tv+site:filmaffinity.com" % title
-            else:
-                tipo = "película"
-                url_bing = "http://www.bing.com/search?q=%s+site:filmaffinity.com" % title
-            try:
-                data = browser(url_bing)
-                data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-                if "myaddrproxy.php" in data:
-                    subdata_bing = scrapertools.get_match(data,
-                                                          'li class="b_algo"><div class="b_title"><h2>(<a href="/myaddrproxy.php/http/www.filmaffinity.com/es/film.*?)"')
-                    subdata_bing = re.sub(r'\/myaddrproxy.php\/http\/', '', subdata_bing)
-                else:
-                    subdata_bing = scrapertools.get_match(data,
-                                                          'li class="b_algo"><h2>(<a href="http://www.filmaffinity.com/.*?/film.*?)"')
-
-                url_filma = scrapertools.get_match(subdata_bing, '<a href="([^"]+)')
-                if not "http" in url_filma:
-                    data = httptools.downloadpage("http://" + url_filma, cookies=False).data
-                else:
-                    data = httptools.downloadpage(url_filma, cookies=False).data
-                data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-            except:
-                pass
-    sinopsis_f = scrapertools.find_single_match(data, '<dd itemprop="description">(.*?)</dd>')
-    sinopsis_f = sinopsis_f.replace("<br><br />", "\n")
-    sinopsis_f = re.sub(r"\(FILMAFFINITY\)<br />", "", sinopsis_f)
-    try:
-        year_f = scrapertools.get_match(data, '<dt>Año</dt>.*?>(\d+)</dd>')
-    except:
-        year_f = ""
-    try:
-        rating_filma = scrapertools.get_match(data, 'itemprop="ratingValue" content="(.*?)">')
-    except:
-        rating_filma = "Sin puntuacion"
-    critica = ""
-    patron = '<div itemprop="reviewBody">(.*?)</div>.*?itemprop="author">(.*?)\s*<i alt="([^"]+)"'
-    matches_reviews = scrapertools.find_multiple_matches(data, patron)
-
-    if matches_reviews:
-        for review, autor, valoracion in matches_reviews:
-            review = dhe(scrapertools.htmlclean(review))
-            review += "\n" + autor + "[CR]"
-            review = re.sub(r'Puntuac.*?\)', '', review)
-            if "positiva" in valoracion:
-                critica += "[COLOR green][B]%s[/B][/COLOR]\n" % review
-            elif "neutral" in valoracion:
-                critica += "[COLOR yellow][B]%s[/B][/COLOR]\n" % review
-            else:
-                critica += "[COLOR red][B]%s[/B][/COLOR]\n" % review
-    else:
-        critica = "[COLOR floralwhite][B]Esta %s no tiene críticas todavía...[/B][/COLOR]" % tipo
-
-    return critica, rating_filma, year_f, sinopsis_f
diff --git a/plugin.video.alfa/servers/fourshared.json b/plugin.video.alfa/servers/fourshared.json
index dd0c1050..e5aa9ad6 100755
--- a/plugin.video.alfa/servers/fourshared.json
+++ b/plugin.video.alfa/servers/fourshared.json
@@ -7,9 +7,9 @@
     }
   ],
   "find_videos": {
-    "ignore_urls": {
-      "value": "http://www.4shared.com/flash/player.swf"
-    },
+    "ignore_urls": [
+      "http://www.4shared.com/flash/player.swf"
+    ],
     "patterns": [
       {
         "pattern": "(http://www.4shared.com/embed/[A-Z0-9a-z]+/[A-Z0-9a-z]+)",
diff --git a/plugin.video.alfa/servers/mp4upload.json b/plugin.video.alfa/servers/mp4upload.json
index 8bd80293..a69a26e2 100755
--- a/plugin.video.alfa/servers/mp4upload.json
+++ b/plugin.video.alfa/servers/mp4upload.json
@@ -7,9 +7,9 @@
     }
   ],
   "find_videos": {
-    "ignore_urls": {
-      "value": "http://www.mp4upload.com/embed/embed"
-    },
+    "ignore_urls": [
+      "http://www.mp4upload.com/embed/embed"
+    ],
     "patterns": [
       {
         "pattern": "mp4upload.com/embed-([A-Za-z0-9]+)",
diff --git a/plugin.video.alfa/servers/streamcloud.json b/plugin.video.alfa/servers/streamcloud.json
index ffce0565..bd3291a2 100755
--- a/plugin.video.alfa/servers/streamcloud.json
+++ b/plugin.video.alfa/servers/streamcloud.json
@@ -11,23 +11,21 @@
     }
   ],
   "find_videos": {
-    "ignore_urls": {
-      "value": [
-        "http://streamcloud.eu/stylesheets",
-        "http://streamcloud.eu/control",
-        "http://streamcloud.eu/xupload",
-        "http://streamcloud.eu/js",
-        "http://streamcloud.eu/favicon",
-        "http://streamcloud.eu/reward",
-        "http://streamcloud.eu/login",
-        "http://streamcloud.eu/deliver",
-        "http://streamcloud.eu/faq",
-        "http://streamcloud.eu/tos",
-        "http://streamcloud.eu/checkfiles",
-        "http://streamcloud.eu/contact",
-        "http://streamcloud.eu/serve"
-      ]
-    },
+    "ignore_urls": [
+      "http://streamcloud.eu/stylesheets",
+      "http://streamcloud.eu/control",
+      "http://streamcloud.eu/xupload",
+      "http://streamcloud.eu/js",
+      "http://streamcloud.eu/favicon",
+      "http://streamcloud.eu/reward",
+      "http://streamcloud.eu/login",
+      "http://streamcloud.eu/deliver",
+      "http://streamcloud.eu/faq",
+      "http://streamcloud.eu/tos",
+      "http://streamcloud.eu/checkfiles",
+      "http://streamcloud.eu/contact",
+      "http://streamcloud.eu/serve"
+    ],
     "patterns": [
       {
         "pattern": "(streamcloud.eu/[a-z0-9]+)",
diff --git a/plugin.video.alfa/servers/streaminto.json b/plugin.video.alfa/servers/streaminto.json
index 51f1d5ee..c9e60e71 100755
--- a/plugin.video.alfa/servers/streaminto.json
+++ b/plugin.video.alfa/servers/streaminto.json
@@ -11,22 +11,20 @@
     }
   ],
   "find_videos": {
-    "ignore_urls": {
-      "value": [
-        "http://streamin.to/embed-theme.html",
-        "http://streamin.to/embed-jquery.html",
-        "http://streamin.to/embed-s.html",
-        "http://streamin.to/embed-images.html",
-        "http://streamin.to/embed-faq.html",
-        "http://streamin.to/embed-embed.html",
-        "http://streamin.to/embed-ri.html",
-        "http://streamin.to/embed-d.html",
-        "http://streamin.to/embed-css.html",
-        "http://streamin.to/embed-js.html",
-        "http://streamin.to/embed-player.html",
-        "http://streamin.to/embed-cgi.html"
-      ]
-    },
+    "ignore_urls": [
+      "http://streamin.to/embed-theme.html",
+      "http://streamin.to/embed-jquery.html",
+      "http://streamin.to/embed-s.html",
+      "http://streamin.to/embed-images.html",
+      "http://streamin.to/embed-faq.html",
+      "http://streamin.to/embed-embed.html",
+      "http://streamin.to/embed-ri.html",
+      "http://streamin.to/embed-d.html",
+      "http://streamin.to/embed-css.html",
+      "http://streamin.to/embed-js.html",
+      "http://streamin.to/embed-player.html",
+      "http://streamin.to/embed-cgi.html"
+    ],
     "patterns": [
       {
         "pattern": "streamin.to/(?:embed-)?([a-z0-9A-Z]+)",
diff --git a/plugin.video.alfa/servers/uploadedto.json b/plugin.video.alfa/servers/uploadedto.json
index 39fa4b80..fa8cc12f 100755
--- a/plugin.video.alfa/servers/uploadedto.json
+++ b/plugin.video.alfa/servers/uploadedto.json
@@ -7,7 +7,9 @@
     }
   ],
   "find_videos": {
-    "ignore_urls": [],
+    "ignore_urls": [
+      "http://uploaded.net/file/ref"
+    ],
     "patterns": [
       {
         "pattern": "(?:ul|uploaded).(?:net|to)/(?:file/|f/)?([a-zA-Z0-9]+)",
diff --git a/plugin.video.alfa/servers/vidspot.json b/plugin.video.alfa/servers/vidspot.json
index 8760788d..6e49bb6b 100755
--- a/plugin.video.alfa/servers/vidspot.json
+++ b/plugin.video.alfa/servers/vidspot.json
@@ -7,40 +7,38 @@
     }
   ],
   "find_videos": {
-    "ignore_urls": {
-      "value": [
-        "http://vidspot.net/embed-theme.html",
-        "http://vidspot.net/embed-jquery.html",
-        "http://vidspot.net/embed-s.html",
-        "http://vidspot.net/embed-images.html",
-        "http://vidspot.net/embed-faq.html",
-        "http://vidspot.net/embed-embed.html",
-        "http://vidspot.net/embed-ri.html",
-        "http://vidspot.net/embed-d.html",
-        "http://vidspot.net/embed-css.html",
-        "http://vidspot.net/embed-js.html",
-        "http://vidspot.net/embed-player.html",
-        "http://vidspot.net/embed-cgi.html",
-        "http://vidspot.net/embed-i.html",
-        "http://vidspot.net/images",
-        "http://vidspot.net/theme",
-        "http://vidspot.net/xupload",
-        "http://vidspot.net/s",
-        "http://vidspot.net/js",
-        "http://vidspot.net/jquery",
-        "http://vidspot.net/login",
-        "http://vidspot.net/make",
-        "http://vidspot.net/i",
-        "http://vidspot.net/faq",
-        "http://vidspot.net/tos",
-        "http://vidspot.net/premium",
-        "http://vidspot.net/checkfiles",
-        "http://vidspot.net/privacy",
-        "http://vidspot.net/refund",
-        "http://vidspot.net/links",
-        "http://vidspot.net/contact"
-      ]
-    },
+    "ignore_urls": [
+      "http://vidspot.net/embed-theme.html",
+      "http://vidspot.net/embed-jquery.html",
+      "http://vidspot.net/embed-s.html",
+      "http://vidspot.net/embed-images.html",
+      "http://vidspot.net/embed-faq.html",
+      "http://vidspot.net/embed-embed.html",
+      "http://vidspot.net/embed-ri.html",
+      "http://vidspot.net/embed-d.html",
+      "http://vidspot.net/embed-css.html",
+      "http://vidspot.net/embed-js.html",
+      "http://vidspot.net/embed-player.html",
+      "http://vidspot.net/embed-cgi.html",
+      "http://vidspot.net/embed-i.html",
+      "http://vidspot.net/images",
+      "http://vidspot.net/theme",
+      "http://vidspot.net/xupload",
+      "http://vidspot.net/s",
+      "http://vidspot.net/js",
+      "http://vidspot.net/jquery",
+      "http://vidspot.net/login",
+      "http://vidspot.net/make",
+      "http://vidspot.net/i",
+      "http://vidspot.net/faq",
+      "http://vidspot.net/tos",
+      "http://vidspot.net/premium",
+      "http://vidspot.net/checkfiles",
+      "http://vidspot.net/privacy",
+      "http://vidspot.net/refund",
+      "http://vidspot.net/links",
+      "http://vidspot.net/contact"
+    ],
     "patterns": [
       {
         "pattern": "vidspot.(?:net/|php\\?id=)(?:embed-)?([a-z0-9]+)",
diff --git a/plugin.video.alfa/servers/yourupload.json b/plugin.video.alfa/servers/yourupload.json
index 0de5de00..401b7947 100755
--- a/plugin.video.alfa/servers/yourupload.json
+++ b/plugin.video.alfa/servers/yourupload.json
@@ -15,9 +15,9 @@
     }
   ],
   "find_videos": {
-    "ignore_urls": {
-      "value": "http://www.yourupload.com/embed/embed"
-    },
+    "ignore_urls": [
+      "http://www.yourupload.com/embed/embed"
+    ],
     "patterns": [
       {
         "pattern": "yourupload.com/embed/([A-z0-9]+)",