diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py
index 22b39433..84a69863 100644
--- a/plugin.video.alfa/channels/newpct1.py
+++ b/plugin.video.alfa/channels/newpct1.py
@@ -1,470 +1,89 @@
 # -*- coding: utf-8 -*-
 
 import re
+import urllib
+import urlparse
 
-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 platformcode import logger
+from core import httptools
+
+Host='http://descargas2020.com'
 
-host = 'http://newpct1.com/'
 
 def mainlist(item):
     logger.info()
 
     itemlist = []
-
-    thumb_pelis=get_thumb("channels_movie.png")
-    thumb_series=get_thumb("channels_tvshow.png")
-    thumb_search = get_thumb("search.png")
-
-    itemlist.append(Item(channel=item.channel, action="submenu", title="Películas", url=host,
-                         extra="peliculas", thumbnail=thumb_pelis ))
-
-    itemlist.append(Item(channel=item.channel, action="submenu", title="Series", url=host, extra="series",
-                         thumbnail=thumb_series))
-    itemlist.append(
-        Item(channel=item.channel, action="search", title="Buscar", url=host + "buscar", thumbnail=thumb_search))
-
+    itemlist.append(Item(channel=item.channel, action="submenu", title="Películas",url=Host+"/peliculas/"))
+    itemlist.append(Item(channel=item.channel, action="submenu", title="Series",url=Host+"/series/"))
+    #itemlist.append(Item(channel=item.channel, action="listado", title="Anime", url=Host+"/anime/",
+    #                     viewmode="movie_with_plot"))
+    #itemlist.append(
+    #    Item(channel=item.channel, action="listado", title="Documentales", url=Host+"/documentales/",
+    #         viewmode="movie_with_plot"))
+    #itemlist.append(Item(channel=item.channel, action="search", title="Buscar"))
     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")
-
-    patron = '<li><a href="http://(?:www.)?newpct1.com/' + item.extra + '/">.*?<ul>(.*?)</ul>'
-    data = scrapertools.get_match(data, patron)
-
-    patron = '<a href="([^"]+)".*?>([^>]+)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron = '<li><a href="'+item.url+'"><i.+?<ul>(.+?)<\/ul>' #Filtrado por url
+    data_cat = scrapertools.find_single_match(data, patron)
+    patron_cat='<li><a href="(.+?)" title="(.+?)".+?<\/a><\/li>'
+    matches = scrapertools.find_multiple_matches(data_cat, patron_cat)
     for scrapedurl, scrapedtitle in matches:
-        title = scrapedtitle.strip()
-        url = scrapedurl
-
-        itemlist.append(Item(channel=item.channel, action="listado", title=title, url=url, extra="pelilist"))
-        itemlist.append(
-            Item(channel=item.channel, action="alfabeto", title=title + " [A-Z]", url=url, extra="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")
-
-    patron = '<ul class="alfabeto">(.*?)</ul>'
-    data = scrapertools.get_match(data, patron)
-
-    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, extra=item.extra))
-
+        itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl,action="listado"))
     return itemlist
 
 
 def listado(item):
     logger.info()
     itemlist = []
-    url_next_page =''
-
-    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)
-    logger.debug('item.modo: %s'%item.modo)
-    logger.debug('item.extra: %s'%item.extra)
-
-    if item.modo != 'next' or item.modo =='':
-        logger.debug('item.title: %s'% item.title)
-        patron = '<ul class="' + item.extra + '">(.*?)</ul>'
-        logger.debug("patron=" + patron)
-        fichas = scrapertools.get_match(data, patron)
-        page_extra = item.extra
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron_data='<ul class="pelilist">(.+?)</ul>'
+    data_listado = scrapertools.find_single_match(data, patron_data)
+    logger.info("sadas"+data_listado)
+    patron_listado='<li><a href="(.+?)" title=".+?"><img src="(.+?)".+?><h2'
+    if 'Serie' in item.title:
+        patron_listado+='.+?>'
     else:
-        fichas = data
-        page_extra = item.extra
-
-    patron = '<a href="([^"]+).*?'  # la url
-    patron += 'title="([^"]+).*?'  # el titulo
-    patron += '<img src="([^"]+)"[^>]+>.*?'  # el thumbnail
-    patron += '<span>([^<].*?)<'  # la calidad
-
-    matches = re.compile(patron, re.DOTALL).findall(fichas)
-    logger.debug('item.next_page: %s'%item.next_page)
-
-
-    # Paginacion
-    if item.next_page != 'b':
-        if len(matches) > 30:
-            url_next_page = item.url
-        matches = matches[:30]
-        next_page = 'b'
-        modo = 'continue'
-    else:
-        matches = matches[30:]
-        next_page = 'a'
-        patron_next_page = '<a href="([^"]+)">Next<\/a>'
-        matches_next_page = re.compile(patron_next_page, re.DOTALL).findall(data)
-        modo = 'continue'
-        if len(matches_next_page) > 0:
-            url_next_page = matches_next_page[0]
-            modo = 'next'
-
-    for scrapedurl, scrapedtitle, scrapedthumbnail, calidad in matches:
-        url = scrapedurl
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        action = "findvideos"
-        extra = ""
-        year = scrapertools.find_single_match(scrapedthumbnail, r'-(\d{4})')
-        if "1.com/series" in url:
-            action = "episodios"
-            extra = "serie"
-
-
-            title = scrapertools.find_single_match(title, '([^-]+)')
-            title = title.replace("Ver online", "", 1).replace("Descarga Serie HD", "", 1).replace("Ver en linea", "",
-                                                                                                   1).strip()
+        patron_listado+='>'
+    patron_listado+='(.+?)<\/h2><span>(.+?)<\/span><\/a><\/li>'
+    logger.info("sasssss"+patron_listado)
 
+    matches = scrapertools.find_multiple_matches(data_listado, patron_listado)
+    for scrapedurl, scrapedthumbnail,scrapedtitle,scrapedquality in matches:
+        if 'Serie' in item.title:
+            action="episodios"
         else:
-            title = title.replace("Descargar", "", 1).strip()
-            if title.endswith("gratis"): title = title[:-7]
-
-        show = title
-        if item.extra != "buscar-list":
-            title = title + ' ' + calidad
-
-        context = ""
-        context_title = scrapertools.find_single_match(url, "http://(?:www.)?newpct1.com/(.*?)/(.*?)/")
-        if context_title:
-            try:
-                context = context_title[0].replace("descargar-", "").replace("pelicula", "movie").replace("series",
-                                                                                                              "tvshow")
-                context_title = context_title[1].replace("-", " ")
-                if re.search('\d{4}', context_title[-4:]):
-                    context_title = context_title[:-4]
-                elif re.search('\(\d{4}\)', context_title[-6:]):
-                    context_title = context_title[:-6]
-
-            except:
-                context_title = show
-        logger.debug('contxt title: %s'%context_title)
-        logger.debug('year: %s' % year)
-
-        logger.debug('context: %s' % context)
-        if not 'array' in title:
-            itemlist.append(Item(channel=item.channel, action=action, title=title, url=url, thumbnail=thumbnail,
-                            extra = extra,
-                     show = context_title, contentTitle=context_title, contentType=context,
-                     context=["buscar_trailer"], infoLabels= {'year':year}))
-
-    tmdb.set_infoLabels(itemlist, True)
-
-
-
-    if url_next_page:
-        itemlist.append(Item(channel=item.channel, action="listado", title=">> Página siguiente",
-                             url=url_next_page, next_page=next_page, folder=True,
-                             text_color='yellow', text_bold=True, modo = modo, plot = extra,
-                             extra = page_extra))
+            action="findvideos"     
+        itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl,thumbnail=scrapedthumbnail, action=action, quality=scrapedquality,show=scrapedtitle))
+    # Página siguiente
+    patron_pag='<ul class="pagination"><li><a class="current" href=".+?">.+?<\/a>.+?<a href="(.+?)">'
+    siguiente = scrapertools.find_single_match(data, patron_pag)
+    itemlist.append(
+             Item(channel=item.channel, title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=siguiente, action="listado"))
     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:
-        get, post = scrapertools.find_single_match(data, '<ul class="pagination">.*?<a class="current" href.*?'
-                                                         '<a\s*href="([^"]+)"(?:\s*onClick=".*?\'([^"]+)\'.*?")')
-    except:
-        post = False
-
-    if post:
-        if "pg" in item.post:
-            item.post = re.sub(r"pg=(\d+)", "pg=%s" % post, item.post)
-        else:
-            item.post += "&pg=%s" % post
-
-    pattern = '<ul class="%s">(.*?)</ul>' % item.pattern
-    data = scrapertools.get_match(data, pattern)
-    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
-        real_title = scrapertools.find_single_match(title, r'font color.*?font.*?><b>(.*?)<\/b><\/font>')
-        title = scrapertools.htmlclean(title)
-        title = title.replace("�", "ñ")
-
-        # no mostramos lo que no sean videos
-        if "/juego/" in url or "/varios/" in url:
-            continue
-
-        if ".com/series" in url:
-
-            show = real_title
-
-            itemlist.append(Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumb,
-                                 context=["buscar_trailer"], contentSerieName=show))
-        else:
-
-                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 findvideos(item):
-    logger.info()
-    itemlist = []
-
-    ## Cualquiera de las tres opciones son válidas
-    # item.url = item.url.replace("1.com/","1.com/ver-online/")
-    # item.url = item.url.replace("1.com/","1.com/descarga-directa/")
-    item.url = item.url.replace("1.com/", "1.com/descarga-torrent/")
-
-    # Descarga la página
-    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")
-
-    title = scrapertools.find_single_match(data, "<h1><strong>([^<]+)</strong>[^<]+</h1>")
-    title += scrapertools.find_single_match(data, "<h1><strong>[^<]+</strong>([^<]+)</h1>")
-    caratula = scrapertools.find_single_match(data, '<div class="entry-left">.*?src="([^"]+)"')
-
-    # <a href="http://tumejorjuego.com/download/index.php?link=descargar-torrent/058310_yo-frankenstein-blurayrip-ac3-51.html" title="Descargar torrent de Yo Frankenstein " class="btn-torrent" target="_blank">Descarga tu Archivo torrent!</a>
-
-    patron = 'openTorrent.*?"title=".*?" class="btn-torrent">.*?function openTorrent.*?href = "(.*?)";'
-
-    # escraped torrent
-    url = scrapertools.find_single_match(data, patron)
-    if url != "":
-        itemlist.append(
-            Item(channel=item.channel, action="play", server="torrent", title=title + " [torrent]", fulltitle=title,
-                 url=url, thumbnail=caratula, plot=item.plot, folder=False))
-
-    logger.debug("matar %s" % data)
-    # escraped ver vídeos, descargar vídeos un link, múltiples liks
-    data = data.replace("'", '"')
-    data = data.replace(
-        'javascript:;" onClick="popup("http://www.newpct1.com/pct1/library/include/ajax/get_modallinks.php?links=', "")
-    data = data.replace("http://tumejorserie.com/descargar/url_encript.php?link=", "")
-    data = data.replace("$!", "#!")
-
-    patron_descargar = '<div id="tab2"[^>]+>.*?</ul>'
-    patron_ver = '<div id="tab3"[^>]+>.*?</ul>'
-
-    match_ver = scrapertools.find_single_match(data, patron_ver)
-    match_descargar = scrapertools.find_single_match(data, patron_descargar)
-
-    patron = '<div class="box1"><img src="([^"]+)".*?'  # logo
-    patron += '<div class="box2">([^<]+)</div>'  # servidor
-    patron += '<div class="box3">([^<]+)</div>'  # idioma
-    patron += '<div class="box4">([^<]+)</div>'  # calidad
-    patron += '<div class="box5"><a href="([^"]+)".*?'  # enlace
-    patron += '<div class="box6">([^<]+)</div>'  # titulo
-
-    enlaces_ver = re.compile(patron, re.DOTALL).findall(match_ver)
-    enlaces_descargar = re.compile(patron, re.DOTALL).findall(match_descargar)
-
-    for logo, servidor, idioma, calidad, enlace, titulo in enlaces_ver:
-        servidor = servidor.replace("streamin", "streaminto")
-        titulo = titulo + " [" + servidor + "]"
-        mostrar_server = True
-        if config.get_setting("hidepremium"):
-            mostrar_server = servertools.is_server_enabled(servidor)
-        if mostrar_server:
-            try:
-                devuelve = servertools.findvideosbyserver(enlace, servidor)
-                if devuelve:
-                    enlace = devuelve[0][1]
-                    itemlist.append(
-                        Item(fanart=item.fanart, channel=item.channel, action="play", server=servidor, title=titulo,
-                             fulltitle=item.title, url=enlace, thumbnail=logo, plot=item.plot, folder=False))
-            except:
-                pass
-
-    for logo, servidor, idioma, calidad, enlace, titulo in enlaces_descargar:
-        servidor = servidor.replace("uploaded", "uploadedto")
-        partes = enlace.split(" ")
-        p = 1
-        for enlace in partes:
-            parte_titulo = titulo + " (%s/%s)" % (p, len(partes)) + " [" + servidor + "]"
-            p += 1
-            mostrar_server = True
-            if config.get_setting("hidepremium"):
-                mostrar_server = servertools.is_server_enabled(servidor)
-            if mostrar_server:
-                try:
-                    devuelve = servertools.findvideosbyserver(enlace, servidor)
-                    if devuelve:
-                        enlace = devuelve[0][1]
-                        itemlist.append(Item(fanart=item.fanart, channel=item.channel, action="play", server=servidor,
-                                             title=parte_titulo, fulltitle=item.title, url=enlace, thumbnail=logo,
-                                             plot=item.plot, folder=False))
-                except:
-                    pass
-    return itemlist
-
-
 def episodios(item):
     logger.info()
     itemlist = []
-    infoLabels = item.infoLabels
-    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="%s">(.*?)</ul>' % "pagination"  # item.pattern
-    pagination = scrapertools.find_single_match(data, pattern)
-    if pagination:
-        pattern = '<li><a href="([^"]+)">Last<\/a>'
-        full_url = scrapertools.find_single_match(pagination, pattern)
-        url, last_page = scrapertools.find_single_match(full_url, r'(.*?\/pg\/)(\d+)')
-        list_pages = [item.url]
-        for x in range(2, int(last_page) + 1):
-            response = httptools.downloadpage('%s%s'% (url,x))
-            if response.sucess:
-                list_pages.append("%s%s" % (url, x))
-    else:
-        list_pages = [item.url]
-
-    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")
-
-        pattern = '<ul class="%s">(.*?)</ul>' % "buscar-list"  # item.pattern
-        data = scrapertools.get_match(data, pattern)
-
-        pattern = '<li[^>]*><a href="(?P<url>[^"]+).*?<img src="(?P<thumb>[^"]+)".*?<h2[^>]+>(?P<info>.*?)</h2>'
-        matches = re.compile(pattern, re.DOTALL).findall(data)
-
-        for url, thumb, info in matches:
-
-            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:
-                        title = "%s (%sx%s-%sx%s) %s[%s]" % (item.show, match["season"], match["episode"],
-                                                             match["season2"], match["episode2"], str_lang,
-                                                             match["quality"])
-                else:
-                    title = "%s (%sx%s) %s[%s]" % (item.show, match["season"], match["episode"], str_lang,
-                                                   match["quality"])
-                    multi = False
-
-            season = match['season']
-            episode = match['episode']
-            itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumb,
-                                 quality=item.quality, multi=multi, contentSeason=season,
-                                 contentEpisodeNumber=episode, infoLabels = infoLabels))
-
-    # order list
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb = True)
-    if len(itemlist) > 1:
-        itemlist = sorted(itemlist, key=lambda it: (int(it.contentSeason), int(it.contentEpisodeNumber)))
-
-    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"))
-
-    return itemlist
-
-def search(item, texto):
-    logger.info("search:" + texto)
-    # texto = texto.replace(" ", "+")
-
-    try:
-        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
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-def newest(categoria):
-    logger.info()
-    itemlist = []
-    item = Item()
-    try:
-        item.extra = 'pelilist'
-        if categoria == 'torrent':
-            item.url = host+'peliculas/'
-
-            itemlist = listado(item)
-            if itemlist[-1].title == ">> Página siguiente":
-                itemlist.pop()
-            item.url = host+'series/'
-            itemlist.extend(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
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron_data='<ul class="buscar-list">(.+?)</ul>'
+    data_listado = scrapertools.find_single_match(data, patron_data)
+    patron = '<img src="(.+?)" alt=".+?">.+?<div class=".+?">.+?<a href=(.+?)" title=".+?">.+?>Serie.+?>(.+?)<'
+    matches = scrapertools.find_multiple_matches(data_listado, patron)
+    for scrapedthumbnail,scrapedurl, scrapedtitle in matches:
+        if " al " in scrapedtitle:
+            #action="episodios"
+            titulo=scrapedurl.split('http')
+            scrapedurl="http"+titulo[1]
+        itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl,thumbnail=scrapedthumbnail, action="findvideos", show=scrapedtitle))
+    return itemlist
\ No newline at end of file