From 9e493fb526a297c87ac8d514427fd7cf1695de4c Mon Sep 17 00:00:00 2001
From: paezner <jsaezu@wanadoo.es>
Date: Sat, 24 Nov 2018 02:19:19 +0100
Subject: [PATCH] Correcciones y nuevos

---
 plugin.video.alfa/channels/LIKUOO.py          |   2 -
 plugin.video.alfa/channels/TXXX.json          |  16 +++
 plugin.video.alfa/channels/TXXX.py            | 135 ++++++++++++++++++
 plugin.video.alfa/channels/absoluporn.py      |   1 -
 plugin.video.alfa/channels/alsoporn.py        |   2 -
 plugin.video.alfa/channels/analdin.py         |   3 -
 plugin.video.alfa/channels/bravoporn.py       |   1 -
 plugin.video.alfa/channels/cliphunter.py      |   2 -
 plugin.video.alfa/channels/coomelonitas.py    |   3 -
 plugin.video.alfa/channels/eroticage.py       |   7 +-
 plugin.video.alfa/channels/fapality.py        |   4 -
 plugin.video.alfa/channels/fetishshrine.py    |   1 -
 plugin.video.alfa/channels/filmoviXXX.py      |  15 +-
 plugin.video.alfa/channels/freeporn.py        |   1 -
 plugin.video.alfa/channels/freepornstreams.py |  27 ++--
 plugin.video.alfa/channels/hclips.py          |   1 -
 plugin.video.alfa/channels/hdzog.py           |   1 -
 plugin.video.alfa/channels/hellporno.py       |   1 -
 plugin.video.alfa/channels/hotmovs.py         |   3 +-
 plugin.video.alfa/channels/javlin.py          |   5 +-
 plugin.video.alfa/channels/justporn.py        |   3 -
 plugin.video.alfa/channels/mporno.py          |  13 --
 plugin.video.alfa/channels/muchoporno.py      |   1 -
 plugin.video.alfa/channels/pandamovie.py      |   2 -
 .../channels/peliculaseroticas.py             |   2 +-
 plugin.video.alfa/channels/perfectgirls.py    |   2 -
 plugin.video.alfa/channels/porn300.py         |   6 +-
 plugin.video.alfa/channels/porneq.py          |   2 -
 plugin.video.alfa/channels/pornhub.py         |  50 ++-----
 plugin.video.alfa/channels/qwertty.py         |   5 +-
 plugin.video.alfa/channels/redtube.py         |   2 -
 plugin.video.alfa/channels/sexgalaxy.py       |   3 -
 plugin.video.alfa/channels/sexofilm.py        |   7 +-
 plugin.video.alfa/channels/sunporno.py        |   1 -
 plugin.video.alfa/channels/tabooshare.py      |   5 -
 plugin.video.alfa/channels/tnaflix.json       |  16 +++
 plugin.video.alfa/channels/tnaflix.py         | 116 +++++++++++++++
 plugin.video.alfa/channels/tryboobs.json      |  16 +++
 plugin.video.alfa/channels/tryboobs.py        | 104 ++++++++++++++
 plugin.video.alfa/channels/videosXYZ.json     |  16 +++
 plugin.video.alfa/channels/videosXYZ.py       |  72 ++++++++++
 plugin.video.alfa/channels/vintagetube.json   |  16 +++
 plugin.video.alfa/channels/vintagetube.py     |  95 ++++++++++++
 plugin.video.alfa/channels/vintagexxxsex.json |  16 +++
 plugin.video.alfa/channels/vintagexxxsex.py   | 101 +++++++++++++
 plugin.video.alfa/channels/vporn.json         |  16 +++
 plugin.video.alfa/channels/vporn.py           | 109 ++++++++++++++
 plugin.video.alfa/channels/watchpornfree.json |  16 +++
 plugin.video.alfa/channels/watchpornfree.py   |  75 ++++++++++
 .../channels/webpeliculasporno.json           |  16 +++
 .../channels/webpeliculasporno.py             |  74 ++++++++++
 plugin.video.alfa/channels/woodrocket.json    |  16 +++
 plugin.video.alfa/channels/woodrocket.py      |  75 ++++++++++
 plugin.video.alfa/channels/xozilla.json       |  16 +++
 plugin.video.alfa/channels/xozilla.py         | 107 ++++++++++++++
 plugin.video.alfa/channels/xtapes.json        |  16 +++
 plugin.video.alfa/channels/xtapes.py          | 121 ++++++++++++++++
 plugin.video.alfa/channels/xxxparodyhd.json   |  16 +++
 plugin.video.alfa/channels/xxxparodyhd.py     |  74 ++++++++++
 plugin.video.alfa/channels/xxxstreams.json    |  16 +++
 plugin.video.alfa/channels/xxxstreams.py      |  94 ++++++++++++
 plugin.video.alfa/channels/youjizz.json       |  16 +++
 plugin.video.alfa/channels/youjizz.py         |  88 ++++++++++++
 plugin.video.alfa/channels/youporn.json       |  16 +++
 plugin.video.alfa/channels/youporn.py         | 110 ++++++++++++++
 plugin.video.alfa/channels/yuuk.json          |  17 +++
 plugin.video.alfa/channels/yuuk.py            |  69 +++++++++
 67 files changed, 1940 insertions(+), 136 deletions(-)
 create mode 100644 plugin.video.alfa/channels/TXXX.json
 create mode 100644 plugin.video.alfa/channels/TXXX.py
 create mode 100644 plugin.video.alfa/channels/tnaflix.json
 create mode 100644 plugin.video.alfa/channels/tnaflix.py
 create mode 100644 plugin.video.alfa/channels/tryboobs.json
 create mode 100644 plugin.video.alfa/channels/tryboobs.py
 create mode 100644 plugin.video.alfa/channels/videosXYZ.json
 create mode 100644 plugin.video.alfa/channels/videosXYZ.py
 create mode 100644 plugin.video.alfa/channels/vintagetube.json
 create mode 100644 plugin.video.alfa/channels/vintagetube.py
 create mode 100644 plugin.video.alfa/channels/vintagexxxsex.json
 create mode 100644 plugin.video.alfa/channels/vintagexxxsex.py
 create mode 100644 plugin.video.alfa/channels/vporn.json
 create mode 100644 plugin.video.alfa/channels/vporn.py
 create mode 100644 plugin.video.alfa/channels/watchpornfree.json
 create mode 100644 plugin.video.alfa/channels/watchpornfree.py
 create mode 100644 plugin.video.alfa/channels/webpeliculasporno.json
 create mode 100644 plugin.video.alfa/channels/webpeliculasporno.py
 create mode 100644 plugin.video.alfa/channels/woodrocket.json
 create mode 100644 plugin.video.alfa/channels/woodrocket.py
 create mode 100644 plugin.video.alfa/channels/xozilla.json
 create mode 100644 plugin.video.alfa/channels/xozilla.py
 create mode 100644 plugin.video.alfa/channels/xtapes.json
 create mode 100644 plugin.video.alfa/channels/xtapes.py
 create mode 100644 plugin.video.alfa/channels/xxxparodyhd.json
 create mode 100644 plugin.video.alfa/channels/xxxparodyhd.py
 create mode 100644 plugin.video.alfa/channels/xxxstreams.json
 create mode 100644 plugin.video.alfa/channels/xxxstreams.py
 create mode 100644 plugin.video.alfa/channels/youjizz.json
 create mode 100644 plugin.video.alfa/channels/youjizz.py
 create mode 100644 plugin.video.alfa/channels/youporn.json
 create mode 100644 plugin.video.alfa/channels/youporn.py
 create mode 100644 plugin.video.alfa/channels/yuuk.json
 create mode 100644 plugin.video.alfa/channels/yuuk.py

diff --git a/plugin.video.alfa/channels/LIKUOO.py b/plugin.video.alfa/channels/LIKUOO.py
index a293fed5..20925e3c 100644
--- a/plugin.video.alfa/channels/LIKUOO.py
+++ b/plugin.video.alfa/channels/LIKUOO.py
@@ -42,7 +42,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<div class="item_p">.*?<a href="([^"]+)" title="([^"]+)"><img src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
         scrapedthumbnail = "https:" + scrapedthumbnail
@@ -78,7 +77,6 @@ def play(item):
     logger.info()
     data = scrapertools.cachePage(item.url)
     itemlist = servertools.find_video_items(data=data)
-
     for videoitem in itemlist:
         videoitem.title = item.fulltitle
         videoitem.fulltitle = item.fulltitle
diff --git a/plugin.video.alfa/channels/TXXX.json b/plugin.video.alfa/channels/TXXX.json
new file mode 100644
index 00000000..ee4be410
--- /dev/null
+++ b/plugin.video.alfa/channels/TXXX.json
@@ -0,0 +1,16 @@
+{
+  "id": "TXXX",
+  "name": "TXXX",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "http://www.txxx.com/images/desktop-logo.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/TXXX.py b/plugin.video.alfa/channels/TXXX.py
new file mode 100644
index 00000000..976d1d4c
--- /dev/null
+++ b/plugin.video.alfa/channels/TXXX.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'http://www.txxx.com'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Ultimas" , action="peliculas", url=host + "/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="peliculas", url=host + "/top-rated/"))
+    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="peliculas", url=host + "/most-popular/"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels-list/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/search/s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def catalogo(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<div class="channel-thumb">.*?<a href="([^"]+)" title="([^"]+)".*?<img src="([^"]+)".*?<span>(.*?)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle,scrapedthumbnail,num in matches:
+        scrapedplot = ""
+        scrapedurl = host + scrapedurl
+        title = scrapedtitle + "[COLOR yellow]  " + num + "[/COLOR]"
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next" href="([^"]+)" title="Next Page"')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron  = '<div class="c-thumb">.*?<a href="([^"]+)".*?<img src="([^"]+)".*?<div class="c-thumb--overlay c-thumb--overlay-title">([^"]+)</div>.*?<span>(.*?)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,num in matches:
+        scrapedplot = ""
+        title = scrapedtitle + "[COLOR yellow]  " + num + "[/COLOR]"
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = 'data-video-id="\d+">.*?<a href="([^"]+)".*?<img src="([^"]+)" alt="([^"]+)".*?<span class="thumb__duration">(.*?)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,time in matches:
+        contentTitle = scrapedtitle
+        title = "[COLOR yellow]" + time + "  [/COLOR]" + scrapedtitle
+        thumbnail = scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next" href="([^"]+)" title="Next Page"')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    video_url = scrapertools.find_single_match(data, 'var video_url = "([^"]*)"')
+    video_url += scrapertools.find_single_match(data, 'video_url \+= "([^"]*)"')
+    partes = video_url.split('||')
+    video_url = decode_url(partes[0])
+    video_url = re.sub('/get_file/\d+/[0-9a-z]{32}/', partes[1], video_url)
+    video_url += '&' if '?' in video_url else '?'
+    video_url += 'lip=' + partes[2] + '&lt=' + partes[3]
+    itemlist.append(item.clone(action="play", title=item.title, url=video_url))
+    return itemlist
+
+
+def decode_url(txt):
+    _0x52f6x15 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.,~'
+    reto = ''; n = 0
+    # En las dos siguientes líneas, ABCEM ocupan 2 bytes cada letra! El replace lo deja en 1 byte. !!!!: АВСЕМ (10 bytes) ABCEM (5 bytes)
+    txt = re.sub('[^АВСЕМA-Za-z0-9\.\,\~]', '', txt)
+    txt = txt.replace('А', 'A').replace('В', 'B').replace('С', 'C').replace('Е', 'E').replace('М', 'M')
+
+    while n < len(txt):
+        a = _0x52f6x15.index(txt[n])
+        n += 1
+        b = _0x52f6x15.index(txt[n])
+        n += 1
+        c = _0x52f6x15.index(txt[n])
+        n += 1
+        d = _0x52f6x15.index(txt[n])
+        n += 1
+
+        a = a << 2 | b >> 4
+        b = (b & 15) << 4 | c >> 2
+        e = (c & 3) << 6 | d
+        reto += chr(a)
+        if c != 64: reto += chr(b)
+        if d != 64: reto += chr(e)
+
+    return urllib.unquote(reto)
+
diff --git a/plugin.video.alfa/channels/absoluporn.py b/plugin.video.alfa/channels/absoluporn.py
index 31b7a1bf..cb79c516 100644
--- a/plugin.video.alfa/channels/absoluporn.py
+++ b/plugin.video.alfa/channels/absoluporn.py
@@ -47,7 +47,6 @@ def categorias(item):
     data = httptools.downloadpage(item.url).data
     patron  = '&nbsp;<a href="([^"]+)" class="link1">([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
diff --git a/plugin.video.alfa/channels/alsoporn.py b/plugin.video.alfa/channels/alsoporn.py
index 3cbc2a9d..d388775b 100644
--- a/plugin.video.alfa/channels/alsoporn.py
+++ b/plugin.video.alfa/channels/alsoporn.py
@@ -43,7 +43,6 @@ def catalogo(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<li><a href="([^"]+)" title="">.*?<span class="videos-count">([^"]+)</span><span class="title">([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,cantidad,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -59,7 +58,6 @@ def categorias(item):
     patron = '<a href="([^"]+)">.*?'
     patron += '<img src="([^"]+)" alt="([^"]+)" />'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         scrapedplot = ""
         scrapedurl = scrapedurl.replace("top", "new")
diff --git a/plugin.video.alfa/channels/analdin.py b/plugin.video.alfa/channels/analdin.py
index c5c2a66a..0eff8b13 100644
--- a/plugin.video.alfa/channels/analdin.py
+++ b/plugin.video.alfa/channels/analdin.py
@@ -45,7 +45,6 @@ def catalogo(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<li><a class="item" href="([^"]+)" title="([^"]+)">'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -66,7 +65,6 @@ def categorias(item):
     patron += 'src="([^"]+)".*?'
     patron += '<div class="videos">([^"]+)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
@@ -105,7 +103,6 @@ def play(item):
     data = httptools.downloadpage(item.url).data
     patron  = 'video_url: \'([^\']+)\''
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl  in matches:
         url = scrapedurl
     itemlist.append(item.clone(action="play", title=url, fulltitle = item.title, url=url))
diff --git a/plugin.video.alfa/channels/bravoporn.py b/plugin.video.alfa/channels/bravoporn.py
index 64e25364..6d69dd60 100644
--- a/plugin.video.alfa/channels/bravoporn.py
+++ b/plugin.video.alfa/channels/bravoporn.py
@@ -44,7 +44,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a href="([^"]+)" class="th">.*?<img src="([^"]+)".*?<span>([^"]+)</span>\s*(\d+) movies.*?</strong>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
diff --git a/plugin.video.alfa/channels/cliphunter.py b/plugin.video.alfa/channels/cliphunter.py
index a97e0b70..52ec1d56 100644
--- a/plugin.video.alfa/channels/cliphunter.py
+++ b/plugin.video.alfa/channels/cliphunter.py
@@ -44,7 +44,6 @@ def catalogo(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a href="([^"]+)">\s*<img src=\'([^\']+)\'/>.*?<span>([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         scrapedplot = ""
         scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/movies"
@@ -63,7 +62,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a href="([^"]+)" title="([^"]+)">.*?<img src="([^"]+)"/>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle
diff --git a/plugin.video.alfa/channels/coomelonitas.py b/plugin.video.alfa/channels/coomelonitas.py
index e641ec02..8745600c 100644
--- a/plugin.video.alfa/channels/coomelonitas.py
+++ b/plugin.video.alfa/channels/coomelonitas.py
@@ -36,11 +36,8 @@ def search(item, texto):
 def categorias(item):
         itemlist = []
         data = scrapertools.cache_page(item.url)
-        #data = scrapertools.get_match(data,'<div class="sidetitle">Categorías</div>(.*?)</ul>')
-		#<li class="cat-item cat-item-203077"><a href="http://www.coomelonitas.com/Categoria/asiaticas">ASIÁTICAS</a>
         patron  = '<li class="cat-item cat-item-\d+"><a href="([^"]+)">([^"]+)</a>'
         matches = re.compile(patron,re.DOTALL).findall(data)
-        scrapertools.printMatches(matches)
         for scrapedurl,scrapedtitle in matches:
             scrapedplot = ""
             scrapedthumbnail = ""
diff --git a/plugin.video.alfa/channels/eroticage.py b/plugin.video.alfa/channels/eroticage.py
index 2949a4f8..a0c283c9 100644
--- a/plugin.video.alfa/channels/eroticage.py
+++ b/plugin.video.alfa/channels/eroticage.py
@@ -43,7 +43,6 @@ def catalogo(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a class=""\s+title="([^"]+)"\s+href="([^"]+)">'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedtitle,scrapedurl in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -59,7 +58,6 @@ def categorias(item):
     data = scrapertools.get_match(data,'<h2>TAGS</h2>(.*?)<div class="sideitem"')
     patron  = '<a href="(.*?)".*?>(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -92,9 +90,8 @@ def findvideos(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = scrapertools.get_match(data,'<div id="wrapper" class="ortala">(.*?)<div class="butonlar">')
-    patron  = '<iframe.*?src="([^"]+)"'
+    patron  = '<iframe\s+src="([^"]+)"'
     matches = scrapertools.find_multiple_matches(data, patron)
-
     for scrapedurl  in matches:
         itemlist.append( Item(action="play", title=scrapedurl, fulltitle = item.title, url=scrapedurl))
     return itemlist
@@ -104,7 +101,7 @@ def play(item):
     data = scrapertools.cachePage(item.url)
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
-        videoitem.title = item.fulltitle
+        videoitem.title = item.title
         videoitem.fulltitle = item.fulltitle
         videoitem.thumbnail = item.thumbnail
         videochannel=item.channel
diff --git a/plugin.video.alfa/channels/fapality.py b/plugin.video.alfa/channels/fapality.py
index 737fa0a0..fc850405 100644
--- a/plugin.video.alfa/channels/fapality.py
+++ b/plugin.video.alfa/channels/fapality.py
@@ -45,7 +45,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<div class="item"><a href="([^"]+)" title="([^"]+)">.*?<img src="([^"]+)">.*?<div class="right">([^"]+)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle.replace("movies", "") + " (" + cantidad + ")"
@@ -79,9 +78,6 @@ def play(item):
     logger.info()
     itemlist = []
     data = scrapertools.cachePage(item.url)
-	#<source id="video_source_1" src="https://fapality.com/get_file/1/f82551e4920151d30f5cf7ffd0307e44/23000/23869/23869.mp4/?br=2052" type="video/mp4" data-is-hd="true" title="720p"><source id="video_source_2" src="https://fapality.com/get_file/1/2bcbf0efc756b6abfbf999c0a788c743/23000/23869/23869_480p.mp4/?br=1271" type="video/mp4" title="480p"><source id="video_source_3" src="https://fapality.com/get_file/1/d7be2e24a8a6bd6d1e10237c10adefb0/23000/23869/23869_240p.mp4/?br=516" type="video/mp4" title="240p"></video><div class="fluid-end-related" id="main_video_fluid_end_related" style='display:none'><div class="fluid-end-related-bg"><div class="fluid-end-tabs"><ul class="fluid-end-tabs-container"><li class="r_share">Share</li><li class="r_related active" onclick="myFP.getRelated('related','/related_videos_html.php?video_id=23869&mode_related=3');">Related Videos</li><li class="r_toprated" onclick="myFP.getRelated('toprated','/related_videos_html.php?video_id=23869&sort_by=rating&mode_related=3');">Related Top Rated Videos</li><li class="r_mostviewed" onclick="myFP.getRelated('mostviewed','/related_videos_html.php?video_id=23869&sort_by=video_viewed&mode_related=3');">Related Popular Videos</li><li class="r_channels" onclick="myFP.getRelated('channels','/related_videos_html.php?video_id=23869&mode_related=1&sort_by=last_time_view_date');">More from Nubiles-Porn</li><li class="r_models" onclick="myFP.getRelated('models','/related_videos_html.php?video_id=23869&mode_related=4&sort_by=last_time_view_date');">More Models Videos</li></ul></div><div class="fluid-end-related-body"><span class="fluid-end-related-close-btn" onclick="myFP.hideRelated(true);"><i class="fa fa-times"></i></span><div class="fluid-end-tab-content"><div id="r_share" class="fluid-end-tab-page"><div class="fluid-end-share-row"><div class="fluid-end-share-title">Share</div><div class="fluid-end-share-content"><div id="share_social" class="fluid-end-social" data-url="https://fapality.com/23869/" data-title="Amia Miley fucks GYM buddy and jiggles her big fake boobs" data-description="Amia Miley is a sporty brunette with ripped six pack and silicone implants in ass and titties. She works out at the GYM with her beefy boy, getting her pussy licked and fucked missionary style on the bench. Her big fake boobs and her round booty jiggle during doggystyle pounding. Amia rides it like a cowgirl and takes cum on face." data-media="https://i.fapality.com/videos_screenshots/23000/23869/preview_480p.mp4.jpg"></div></div></div><div class="fluid-end-share-row"><div class="fluid-end-share-title">Video Url:</div><div class="fluid-end-share-content"><input type="text" onclick="this.select();" id="current_url" readonly="readonly" value="https://fapality.com/23869/"/></div></div><div class="fluid-end-share-row"><div class="fluid-end-share-title">Embed code:</div><div class="fluid-end-share-content"><textarea onclick="this.select();" readonly="readonly" id="share_embed" rows="3"></textarea></div></div></div><div id="r_related" class="fluid-end-tab-page fluid-end-video-thumbs active-page"></div><div id="r_toprated" class="fluid-end-tab-page fluid-end-video-thumbs"></div><div id="r_mostviewed" class="fluid-end-tab-page fluid-end-video-thumbs"></div><div id="r_channels" class="fluid-end-tab-page fluid-end-video-thumbs"></div><div id="r_models" class="fluid-end-tab-page fluid-end-video-thumbs"></div></div></div></div></div></div><script src="/player/fplayers/fplayer.js"></script><link href="/player/fplayers/fplayer.css" rel="stylesheet" type="text/css"><script>var is_playlist = document.querySelector('.watch-list') ? true : false;var allow_download = is_playlist ? false : true;video_id = 23869;if(document.getElementById('video_source_2')) {document.getElementById('video_source_2').setAttribute('data-default','true');} else {document.getElementById('video_source_1').setAttribute('data-default','true');}function getEmbed() {var embedCode = '<iframe width="924" height="521" src="https://fapality.com/embed/23869" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen oallowfullscreen msallowfullscreen>';embedCode += '</iframe>';return embedCode;}document.getElementById('share_embed').value = getEmbed();var adList = [];if(fluidPlayerClass.getCookie('pb_vast')==1) {adList.push({roll: 'preRoll',vastTag: "https://syndication.exosrv.com/splash.php?idzone=3180702",});} else {adList.push({roll: 'preRoll',vastTag: "https://syndication.exosrv.com/splash.php?idzone=2946968",});}adList.push({roll: 'midRoll',vastTag: 'https://syndication.exosrv.com/splash.php?idzone=2947082',size : '728x90',cookieTime : 1,timer:10,});htmlOnPauseBlock = {html : '<div class="fluid-b"><div class="fluid-b-title">Advertisement</div><div class="fluid-b-content"><iframe src="/b/inplayer.html" width="300" height="250" frameborder="0"  scrolling="no" allowtransparency="true" marginheight="0" marginwidth="0"></iframe></div><div class="fluid-b-footer"><span onclick="myFP.play()" class="fluid-b-btn">Continue Play</span></div><span onclick="myFP.play()" class="fluid-b-close-btn"><i class="fa fa-times"></i></span></div>',height: 277,width:304,onBeforeShow : function() {}};var myFP = fluidPlayer('main_video',{layoutControls: {timelinePreview: {file: 'https://fapality.com/thumbnails.vtt?id=23869&i=5&d=420&format=inplayer',type: 'VTT'},allowTheatre: true,allowDownload: allow_download,primaryColor:'#fb5350',shareCs:{url : 'https://fapality.com/cs/nubiles-porn/',title : 'View full video at Nubiles-Porn',},playbackRateEnabled: true,htmlOnPauseBlock: htmlOnPauseBlock,controlBar: {autoHide: true,autoHideTimeout: 3,animated: true,},},vastOptions: {adList: adList,vastAdvanced: {vastLoadedCallback: (function() {if(fluidPlayerClass.getCookie('pb_source')=="1") {fluidPlayerClass.setCookie('pb_vast',1,6);}}),noVastVideoCallback:      (function() {}),vastVideoSkippedCallback: (function() {}),vastVideoEndedCallback:   (function() {})},adCTAText: false,vastTimeout: 5000,}});var player_obj = myFP;</script><div class="cs"><noindex><a href="https://fapality.com/cs/nubiles-porn/" rel="nofollow" target="_blank" title="Nubiles-Porn"><img src="https://fapality.com/contents/content_sources/112/c1_nubiles-porn.png" alt="Nubiles-Porn"></a></noindex></div></div><meta itemprop="duration" content="T7M00S" /><meta itemprop="thumbnailUrl" content="https://i.fapality.com/videos_screenshots/23000/23869/preview_480p.mp4.jpg" /><meta itemprop="embedUrl" content="https://fapality.com/embed/23869/"><meta itemprop="requiresSubscription" content="false"><meta itemprop="uploadDate" content="2018-11-01"><meta itemprop="encodingFormat" content="mpeg4"><div class="simple-toolbar"><div class="btn-group right"><a class="btn toggle" data-toggle-id="#shares"><i class="fa fa-share-alt"></i> Share or Embed <i class="fa fa-caret-down"></i></a></div><div class="btn-group right"><span data-tooltip aria-haspopup="true" title="Report Inappropriate Content" id="report_button" data-dropdown="report" aria-controls="report" aria-expanded="false" class="btn radius"><i class="fa fa-flag"></i></span></div><form id="report" data-abide class="f-dropdown small" data-dropdown-content class="f-dropdown" aria-hidden="true" tabindex="-1"><div class="box"><div class="title">Report Inappropriate Content</div><div class="content"><label for="flag-1"><input type="radio" id="flag-1" value="flag_inappropriate_video" name="flag_id"> Inappropriate Video</label><label for="flag-2"><input type="radio" id="flag-2" value="flag_error" name="flag_id"> Error (no video, no sound)</label><label for="flag-3"><input type="radio" id="flag-3" value="copyrighted_video" name="flag_id"> Copyright material</label><textarea required name="flag_message" id="report_text" rows="3" placeholder="Please tell us the reason"></textarea><small class="error">The field is required</small><input type="hidden" name="action" value="flag"><input type="hidden" name="mode" value="async"><input type="hidden" name="video_id" value="23869"></div><div class="bottom"><span id="send_report" class="btn">Send Report</span></div></div></form><div class="btn-group right"><a href="https://fapality.com/login.php?action=not_allowed" data-reveal-id="login_wrapper" data-reveal-ajax="/login.php?m=1&action=not_allowed" class="btn"><i class="fa fa-plus-circle"></i> Add to Faplist</a></div><div class="btn-group right"><a data-tooltip aria-haspopup="true" href="https://fapality.com/login.php?action=not_allowed" title="Save in favourites" data-reveal-id="login_wrapper" data-reveal-ajax="/login.php?m=1&action=not_allowed" class="btn"><i class="fa fa-heart"></i><i class="fa fa-plus"></i></a><span class="btn btn-content">0</span></div><div class="btn-group likes" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating"><span class="btn" id="like" data-tooltip aria-haspopup="true" title="I Like It"><i class="fa fa-thumbs-up"></i> <span class="g_hidden">I Like It</span></span><meta itemprop="bestRating" content="100"><meta itemprop="worstRating" content="0"><span class="btn btn-content"><span class="rating-info"><span id="rating_value" itemprop="ratingValue">94</span>% (<span class="tiny" id="rating_amount" itemprop="ratingCount">3</span>)</span><span class="rating-line"><span style="width:93.334px"></span></span></span><span class="btn" id="dislike" data-tooltip aria-haspopup="true" title="I Dislike It"><i class="fa fa-thumbs-down"></i> <span class="g_hidden">I Dislike It</span></span></div><div class="btn-group"><a href="https://fapality.com/login.php?action=not_allowed" data-reveal-id="login_wrapper" data-reveal-ajax="/login.php?m=1&action=not_allowed" class="btn downloadVideos"><i class="fa fa-download"></i> Download (105.22 Mb)</a></div><i class="fa fa-spin fa-spinner ajax-loader g_hidden"></i><div class="share toolbox row" id="shares"><div class="columns large-6"><label>Embed code:</label><textarea id="embed_code" readonly class="copy_click" rows="3"></textarea></div><div class="columns large-6"><label>Share video:</label><div class="addthis_sharing_toolbox"></div><input type="text" readonly id="current_url" class="copy_click" value="https://fapality.com/23869/"></div></div></div><div class="simple-footer"><div class="description" itemprop="description">Amia Miley is a sporty brunette with ripped six pack and silicone implants in ass and titties. She works out at the GYM with her beefy boy, getting her pussy licked and fucked missionary style on the bench. Her big fake boobs and her round booty jiggle during doggystyle pounding. Amia rides it like a cowgirl and takes cum on face.</div><div class="right content_source" itemprop="productionCompany" itemscope itemtype="http://schema.org/Organization"><a data-view="/ajax.php?mode=async&function=get_block&block_id=content_source_view_get_channel&cs_id=112" data-dropdown-width="small" class="button" href="https://fapality.com/channels/nubiles-porn/" title="Nubiles-Porn videos"><i class="fa fa-video-camera"></i> Nubiles-Porn</a><meta itemprop="name" content="Nubiles-Porn"><meta itemprop="url" content="https://fapality.com/channels/nubiles-porn/"><script>var addonView = {'name' : 'channel','url'  : '/ajax.php?mode=async&function=get_block&block_id=list_content_sources_channel&q=Nubiles-Porn',}</script></div><div class="right content_source"><a class="button info" data-view="/ajax.php?mode=async&function=get_block&block_id=model_view_get_model&model_id=929" data-dropdown-width="small" href="https://fapality.com/pornstars/amia-miley/" title="Amia Miley videos" itemscope itemprop="actor" itemtype="http://schema.org/Person"><i class="fa fa-female"></i> Amia Miley<meta itemprop="name" content="Amia Miley"><meta itemprop="url" content="https://fapality.com/pornstars/amia-miley/"></a><script>var addonView = {'name' : 'model','url'  : '/ajax.php?mode=async&function=get_block&block_id=list_models_model&model_id=929&q=Amia+Miley',}</script></div><ul class="meta"><li>Added: <span>4 days ago</span> <span>by</span> <a href='/users/1/' data-view='/ajax.php?mode=async&function=get_block&block_id=member_profile_view_get_profile&user_id=1'>Admin</a></li><li>Duration: <span>7:00</span></li><li>Viewed: <span>1,499</span></li></ul><meta itemprop="genre" content="Big tits"><ul class="tags_list"><li>Categories</li><li><a class="main" href="https://fapality.com/categories/big-tits/" title="Big tits videos">Big tits</a></li><li><a href="https://fapality.com/categories/big-tits/workout/" title="Big tits workout videos">workout</a></li><li><a href="https://fapality.com/categories/big-tits/gym/" title="Big tits GYM videos">GYM</a></li><li><a href="https://fapality.com/categories/big-tits/sporty/" title="Big tits sporty videos">sporty</a></li><li><a href="https://fapality.com/categories/big-tits/tanned/" title="Big tits tanned videos">tanned</a></li><li><a href="https://fapality.com/categories/big-tits/athletic/" title="Big tits athletic videos">athletic</a></li><li><a href="https://fapality.com/categories/big-tits/fake-tits/" title="Big tits fake tits videos">fake tits</a></li><li><a href="https://fapality.com/categories/big-tits/fake-ass/" title="Big tits fake ass videos">fake ass</a></li><li><a href="https://fapality.com/categories/big-tits/pussy-licking/" title="Big tits pussy licking videos">pussy licking</a></li><li><a href="https://fapality.com/categories/big-tits/missionary/" title="Big tits missionary videos">missionary</a></li><li><a href="https://fapality.com/categories/big-tits/orgasm/" title="Big tits orgasm videos">orgasm</a></li><li><a href="https://fapality.com/categories/big-tits/doggystyle/" title="Big tits doggystyle videos">doggystyle</a></li><li><a href="https://fapality.com/categories/big-tits/riding/" title="Big tits riding videos">riding</a></li><li><a href="https://fapality.com/categories/big-tits/cumshot/" title="Big tits cumshot videos">cumshot</a></li><li><a href="https://fapality.com/categories/big-tits/tattoos/" title="Big tits tattoos videos">tattoos</a></li></ul></div></div></div>
-		
-	
     patron  = '<source id="video_source_1" src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl  in matches:
diff --git a/plugin.video.alfa/channels/fetishshrine.py b/plugin.video.alfa/channels/fetishshrine.py
index 7f06b2a1..48e45937 100644
--- a/plugin.video.alfa/channels/fetishshrine.py
+++ b/plugin.video.alfa/channels/fetishshrine.py
@@ -44,7 +44,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a href="([^"]+)" title="([^"]+) porn tube" class="thumb">.*?<img src="([^"]+)".*?<span class="total">([^"]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
diff --git a/plugin.video.alfa/channels/filmoviXXX.py b/plugin.video.alfa/channels/filmoviXXX.py
index 5bf7eb4c..44b952c4 100644
--- a/plugin.video.alfa/channels/filmoviXXX.py
+++ b/plugin.video.alfa/channels/filmoviXXX.py
@@ -27,10 +27,23 @@ def mainlist(item):
         thumbnail = scrapedthumbnail
         plot = ""
         year = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
     next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
         itemlist.append( Item(channel=item.channel , action="mainlist" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
     return itemlist
+    
+    
+def play(item):
+    logger.info()
+    data = scrapertools.cachePage(item.url)
+    itemlist = servertools.find_video_items(data=data)
+
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
+    return itemlist
 
diff --git a/plugin.video.alfa/channels/freeporn.py b/plugin.video.alfa/channels/freeporn.py
index 43f149d0..0f60bbba 100644
--- a/plugin.video.alfa/channels/freeporn.py
+++ b/plugin.video.alfa/channels/freeporn.py
@@ -42,7 +42,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<li class="thumb thumb-category">.*?<a href="([^"]+)">.*?<img class="lazy" data-original="([^"]+)">.*?<div class="name">([^"]+)</div>.*?<div class="count">(\d+)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + "  (" + cantidad + ")"
diff --git a/plugin.video.alfa/channels/freepornstreams.py b/plugin.video.alfa/channels/freepornstreams.py
index a6d5e464..c1cee64b 100644
--- a/plugin.video.alfa/channels/freepornstreams.py
+++ b/plugin.video.alfa/channels/freepornstreams.py
@@ -46,7 +46,6 @@ def catalogo(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<li id="menu-item-\d+".*?u=([^"]+)">(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -59,7 +58,6 @@ def categorias(item):
     data = httptools.downloadpage(item.url).data
     patron  = '<li><a href="([^"]+)" rel="nofollow">(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -75,25 +73,26 @@ def peliculas(item):
     patron  = '<article id="post-\d+".*?<a href="([^"]+)" rel="bookmark">(.*?)</a>.*?<img src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        contentTitle = scrapedtitle
         title = scrapedtitle
         thumbnail = scrapedthumbnail.replace("jpg#", "jpg")
         plot = ""
         year = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
-
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, fulltitle=title, infoLabels={'year':year} ))
     next_page_url = scrapertools.find_single_match(data, '<div class="nav-previous"><a href="([^"]+)"')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
         itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
-
-
-    # else:
-        # patron  = '<div class="nav-previous"><a href="(.*?)"'
-        # next_page = re.compile(patron,re.DOTALL).findall(data)
-       #next_page = scrapertools.find_single_match(data,'class="last" title=.*?<a href="([^"]+)">')
-        # next_page =  next_page[0]
-       #next_page = host + next_page
-        # itemlist.append( Item(channel=item.channel, action="peliculas", title=next_page , text_color="blue", url=next_page ) )
     return itemlist
 
+
+def play(item):
+    logger.info()
+    data = scrapertools.cachePage(item.url)
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.fulltitle
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videochannel=item.channel
+    return itemlist
+    
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/hclips.py b/plugin.video.alfa/channels/hclips.py
index ce16f24f..b071e9c2 100644
--- a/plugin.video.alfa/channels/hclips.py
+++ b/plugin.video.alfa/channels/hclips.py
@@ -43,7 +43,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a href="([^"]+)" class="thumb">.*?src="([^"]+)".*?<strong class="title">([^"]+)</strong>.*?<b>(.*?)</b>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle,vidnum in matches:
         scrapedplot = ""
         title = scrapedtitle + " \(" + vidnum + "\)"
diff --git a/plugin.video.alfa/channels/hdzog.py b/plugin.video.alfa/channels/hdzog.py
index 93d6e11b..9e3e7532 100644
--- a/plugin.video.alfa/channels/hdzog.py
+++ b/plugin.video.alfa/channels/hdzog.py
@@ -43,7 +43,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<li>.*?<a href="([^"]+)".*?<img class="thumb" src="([^"]+)" alt="([^"]+)".*?<span class="videos-count">(\d+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle,vidnum in matches:
         scrapedplot = ""
         title = scrapedtitle + " \(" + vidnum + "\)"
diff --git a/plugin.video.alfa/channels/hellporno.py b/plugin.video.alfa/channels/hellporno.py
index bad030cc..abc63bf4 100644
--- a/plugin.video.alfa/channels/hellporno.py
+++ b/plugin.video.alfa/channels/hellporno.py
@@ -41,7 +41,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a href="([^"]+)">.*?<img src="([^"]+)" alt="([^"]+) - Porn videos">.*?<span>(\d+) videos</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
diff --git a/plugin.video.alfa/channels/hotmovs.py b/plugin.video.alfa/channels/hotmovs.py
index 9ff847eb..691de51a 100644
--- a/plugin.video.alfa/channels/hotmovs.py
+++ b/plugin.video.alfa/channels/hotmovs.py
@@ -45,7 +45,6 @@ def catalogo(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a class="thumbnail" href="([^"]+)">.*?<img src="([^"]+)".*?<span class="thumbnail__info__right">\s+([^"]+)\s+</span>.*?<h5>([^"]+)</h5>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
         scrapedplot = ""
         cantidad = cantidad.replace("         ", "")
@@ -66,7 +65,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a class="thumbnail" href="([^"]+)" title="([^"]+)">.*?<img src="([^"]+)".*?<i class="mdi mdi-video"></i>([^"]+)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         cantidad = cantidad.replace("        ", "")
@@ -100,6 +98,7 @@ def peliculas(item):
         itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
     return itemlist
 
+
 def play(item):
     logger.info()
     itemlist = []
diff --git a/plugin.video.alfa/channels/javlin.py b/plugin.video.alfa/channels/javlin.py
index e70da654..562c102e 100644
--- a/plugin.video.alfa/channels/javlin.py
+++ b/plugin.video.alfa/channels/javlin.py
@@ -42,7 +42,6 @@ def categorias(item):
     data = httptools.downloadpage(item.url).data
     patron  = '<option class="level-0" value="([^"]+)">([^"]+)&nbsp;&nbsp;\((.*?)\)<'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,number in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -59,11 +58,10 @@ def peliculas(item):
     data = httptools.downloadpage(item.url).data
     patron = '<div class="featured-wrap clearfix">.*?<a href="([^"]+)" title="([^"]+)".*?src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
         itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-    next_page_url = scrapertools.find_single_match(data,'<li><a rel=\'nofollow\' href=\'([^\']+)\' class=\'inactive\'>Next')
+    next_page_url = scrapertools.find_single_match(data,'<span class=\'currenttext\'>.*?href=\'([^\']+)\' class=\'inactive\'>')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
         itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
@@ -75,7 +73,6 @@ def play(item):
     logger.info()
     data = scrapertools.cachePage(item.url)
     itemlist = servertools.find_video_items(data=data)
-
     for videoitem in itemlist:
         videoitem.title = item.title
         videoitem.fulltitle = item.fulltitle
diff --git a/plugin.video.alfa/channels/justporn.py b/plugin.video.alfa/channels/justporn.py
index 38e424e7..4a1dbccd 100644
--- a/plugin.video.alfa/channels/justporn.py
+++ b/plugin.video.alfa/channels/justporn.py
@@ -44,7 +44,6 @@ def categorias(item):
     data = httptools.downloadpage(item.url).data
     patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?<div class="videos">(\d+) video.*?</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,numero in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -61,7 +60,6 @@ def peliculas(item):
     data = httptools.downloadpage(item.url).data
     patron = '<a href="http://xxx.justporno.tv/videos/(\d+)/.*?" title="([^"]+)" >.*?data-original="([^"]+)".*?<div class="duration">(.*?)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
         scrapedplot = ""
         scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + scrapedtitle
@@ -81,7 +79,6 @@ def play(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
     patron = 'video_url: \'([^\']+)\''
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl in matches:
         scrapedplot = ""
         itemlist.append(item.clone(channel=item.channel, action="play", title=scrapedurl , url=scrapedurl , plot="" , folder=True) )
diff --git a/plugin.video.alfa/channels/mporno.py b/plugin.video.alfa/channels/mporno.py
index 3e8d165c..492b77f9 100644
--- a/plugin.video.alfa/channels/mporno.py
+++ b/plugin.video.alfa/channels/mporno.py
@@ -44,7 +44,6 @@ def categorias(item):
     data = httptools.downloadpage(item.url).data
     patron  = '<h3><a href="([^"]+)">(.*?)</a> <small>(.*?)</small></h3>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,cantidad in matches:
         scrapedplot = scrapedurl.replace("http://mporno.unblckd.org/", "").replace("page1.html", "")
         scrapedthumbnail = ""
@@ -58,9 +57,6 @@ def peliculas(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-	
-
-	
     patron  = '<img class="content_image" src="([^"]+).mp4/.*?" alt="([^"]+)".*?this.src="(.*?)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
@@ -76,14 +72,5 @@ def peliculas(item):
         next_page_url = urlparse.urljoin(item.url,next_page_url)
         itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
         
-
-    # else:
-        # patron  = '<a href=\'([^\']+)\' class="next">Next &gt;&gt;</a>'
-        # next_page = re.compile(patron,re.DOTALL).findall(data)
-        # next_page = scrapertools.find_single_match(data,'class="last" title=.*?<a href="([^"]+)">')
-        # plot = item.plot
-        # next_page =  next_page[0]
-        # next_page = host + plot + next_page
-        # itemlist.append( Item(channel=item.channel, action="peliculas", title=next_page , text_color="blue", url=next_page, plot=plot ) )
     return itemlist
 
diff --git a/plugin.video.alfa/channels/muchoporno.py b/plugin.video.alfa/channels/muchoporno.py
index b4c74ab7..9f81d700 100644
--- a/plugin.video.alfa/channels/muchoporno.py
+++ b/plugin.video.alfa/channels/muchoporno.py
@@ -41,7 +41,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a class="muestra-escena muestra-categoria" href="([^"]+)" title="([^"]+)">.*?src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle
diff --git a/plugin.video.alfa/channels/pandamovie.py b/plugin.video.alfa/channels/pandamovie.py
index 582d084a..da454282 100644
--- a/plugin.video.alfa/channels/pandamovie.py
+++ b/plugin.video.alfa/channels/pandamovie.py
@@ -19,7 +19,6 @@ def mainlist(item):
     itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/list-movies"))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/list-movies"))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/list-movies"))
-
     itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
@@ -47,7 +46,6 @@ def categorias(item):
         data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
         patron  = '<li><a title=".*?" href="([^"]+)">([^<]+)</a>'
         matches = re.compile(patron,re.DOTALL).findall(data)
-        scrapertools.printMatches(matches)
         for scrapedurl,scrapedtitle in matches:
             scrapedplot = ""
             scrapedthumbnail = ""
diff --git a/plugin.video.alfa/channels/peliculaseroticas.py b/plugin.video.alfa/channels/peliculaseroticas.py
index 63d2ddb8..4291ad2f 100755
--- a/plugin.video.alfa/channels/peliculaseroticas.py
+++ b/plugin.video.alfa/channels/peliculaseroticas.py
@@ -46,6 +46,6 @@ def mainlist(item):
         next_page_url = "http://www.peliculaseroticas.net/cine-erotico/" + str(next_page) + ".html"
 
     itemlist.append(
-        Item(channel=item.channel, action="peliculas", title=">> Página siguiente", url=next_page_url, folder=True))
+        Item(channel=item.channel, action="mainlist", title=">> Página siguiente", url=next_page_url, folder=True))
 
     return itemlist
diff --git a/plugin.video.alfa/channels/perfectgirls.py b/plugin.video.alfa/channels/perfectgirls.py
index cc7056a9..1d8d6609 100644
--- a/plugin.video.alfa/channels/perfectgirls.py
+++ b/plugin.video.alfa/channels/perfectgirls.py
@@ -41,7 +41,6 @@ def categorias(item):
 #    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<li class="additional_list__item"><a href="([^"]+)">([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -79,7 +78,6 @@ def findvideos(item):
     data = httptools.downloadpage(item.url).data
     patron  = '<source src="([^"]+)" res="\d+" label="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle  in matches:
         itemlist.append(item.clone(action="play", title=scrapedtitle, fulltitle = item.title, url=scrapedurl))
     return itemlist
diff --git a/plugin.video.alfa/channels/porn300.py b/plugin.video.alfa/channels/porn300.py
index b512ffdd..37f5970f 100644
--- a/plugin.video.alfa/channels/porn300.py
+++ b/plugin.video.alfa/channels/porn300.py
@@ -43,9 +43,8 @@ def catalogo(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a itemprop="url" href="([^"]+)".*?title="([^"]+)">.*?<img itemprop="image" src=([^"]+) alt=.*?</svg>          ([^"]+)</li>'
+    patron  = '<a itemprop="url" href="([^"]+)".*?title="([^"]+)">.*?<img itemprop="image" src=([^"]+) alt=.*?</svg>\s+([^"]+)           </li>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad +")"
@@ -65,11 +64,10 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a itemprop="url" href="([^"]+)".*?title="([^"]+)">.*?<img itemprop="image" src="([^"]+)".*?</svg>([^"]+)               </small>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad +")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/?sort=latest"
         itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
     next_page_url = scrapertools.find_single_match(data,'<a class="btn btn-primary--light btn-pagination" itemprop="name" href="([^"]+)" title="Siguiente">')
     if next_page_url!="":
diff --git a/plugin.video.alfa/channels/porneq.py b/plugin.video.alfa/channels/porneq.py
index 33de1d96..527f83d8 100644
--- a/plugin.video.alfa/channels/porneq.py
+++ b/plugin.video.alfa/channels/porneq.py
@@ -45,7 +45,6 @@ def peliculas(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = '<a class="clip-link" data-id="\d+" title="([^"]+)" href="([^"]+)">.*?<img src="([^"]+)".*?<span class="timer">(.*?)</span></div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedtitle,scrapedurl,scrapedthumbnail,scrapedtime in matches:
         scrapedplot = ""
         scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + scrapedtitle
@@ -62,7 +61,6 @@ def play(item):
     data = httptools.downloadpage(item.url).data
     patron = '"video-setup".*?file: "(.*?)",'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl in matches:
         scrapedurl = str(scrapedurl)
     itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
diff --git a/plugin.video.alfa/channels/pornhub.py b/plugin.video.alfa/channels/pornhub.py
index 7f10160e..22699893 100755
--- a/plugin.video.alfa/channels/pornhub.py
+++ b/plugin.video.alfa/channels/pornhub.py
@@ -2,7 +2,6 @@
 
 import re
 import urlparse
-
 from core import httptools
 from core import scrapertools
 from core.item import Item
@@ -38,27 +37,22 @@ def search(item, texto):
 def categorias(item):
     logger.info()
     itemlist = []
-
-    # Descarga la página
     data = httptools.downloadpage(item.url).data
     data = scrapertools.find_single_match(data, '<div id="categoriesStraightImages">(.*?)</ul>')
-
-    # Extrae las categorias
+    
+    
     patron = '<li class="cat_pic" data-category=".*?'
     patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?'
+    patron += 'src="([^"]+)".*?'
     patron += 'alt="([^"]+)"'
-
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
         if "?" in scrapedurl:
             url = urlparse.urljoin(item.url, scrapedurl + "&o=cm")
         else:
             url = urlparse.urljoin(item.url, scrapedurl + "?o=cm")
-
         itemlist.append(Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url, fanart=item.fanart,
                              thumbnail=scrapedthumbnail))
-
     itemlist.sort(key=lambda x: x.title)
     return itemlist
 
@@ -66,30 +60,21 @@ def categorias(item):
 def peliculas(item):
     logger.info()
     itemlist = []
-
-    # Descarga la página
     data = httptools.downloadpage(item.url).data
     videodata = scrapertools.find_single_match(data, 'videos search-video-thumbs">(.*?)<div class="reset"></div>')
-
-    # Extrae las peliculas
     patron = '<div class="phimage">.*?'
     patron += '<a href="([^"]+)" title="([^"]+).*?'
     patron += '<var class="duration">([^<]+)</var>(.*?)</div>.*?'
     patron += 'data-mediumthumb="([^"]+)"'
-
     matches = re.compile(patron, re.DOTALL).findall(videodata)
-
     for url, scrapedtitle, duration, scrapedhd, thumbnail in matches:
-        title = scrapedtitle.replace("&amp;amp;", "&amp;") + " (" + duration + ")"
-
+        title =  "(" + duration + ") " + scrapedtitle.replace("&amp;amp;", "&amp;")
         scrapedhd = scrapertools.find_single_match(scrapedhd, '<span class="hd-thumbnail">(.*?)</span>')
         if scrapedhd == 'HD':
             title += ' [HD]'
-
         url = urlparse.urljoin(item.url, url)
         itemlist.append(
             Item(channel=item.channel, action="play", title=title, url=url, fanart=item.fanart, thumbnail=thumbnail))
-
     if itemlist:
         # Paginador
         patron = '<li class="page_next"><a href="([^"]+)"'
@@ -99,29 +84,16 @@ def peliculas(item):
             itemlist.append(
                 Item(channel=item.channel, action="peliculas", title=">> Página siguiente", fanart=item.fanart,
                      url=url))
-
     return itemlist
 
-
 def play(item):
     logger.info()
     itemlist = []
-
-    # Descarga la página
-    data = httptools.downloadpage(item.url).data
-
-    quality = scrapertools.find_multiple_matches(data, '"id":"quality([^"]+)"')
-    for q in quality:
-        match = scrapertools.find_single_match(data, 'var quality_%s=(.*?);' % q)
-        match = re.sub(r'(/\*.*?\*/)', '', match).replace("+", "")
-        url = ""
-        for s in match.split():
-            val = scrapertools.find_single_match(data, 'var %s=(.*?);' % s.strip())
-            if "+" in val:
-                values = scrapertools.find_multiple_matches(val, '"([^"]+)"')
-                val = "".join(values)
-
-            url += val.replace('"', "")
-        itemlist.append([".mp4 %s [directo]" % q, url])
-
+    data = scrapertools.cachePage(item.url)
+    patron  = '"defaultQuality":true,"format":"","quality":"\d+","videoUrl":"(.*?)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl  in matches:
+        url = scrapedurl.replace("\/", "/")
+    itemlist.append(item.clone(action="play", title=url, fulltitle = item.title, url=url))
     return itemlist
+
diff --git a/plugin.video.alfa/channels/qwertty.py b/plugin.video.alfa/channels/qwertty.py
index 16374422..8113ad60 100644
--- a/plugin.video.alfa/channels/qwertty.py
+++ b/plugin.video.alfa/channels/qwertty.py
@@ -42,7 +42,6 @@ def categorias(item):
     data = httptools.downloadpage(item.url).data
     patron  = '<li><a href="([^<]+)">(.*?)</a></li>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -58,7 +57,6 @@ def peliculas(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<article id="post-\d+".*?<a href="([^"]+)" title="([^"]+)">.*?<img data-src="(.*?)".*?<span class="duration"><i class="fa fa-clock-o"></i>([^<]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
         scrapedplot = ""
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
@@ -85,4 +83,5 @@ def play(item):
         scrapedurl = scrapedurl.replace("\/", "/")
         itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
                             thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
\ No newline at end of file
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/redtube.py b/plugin.video.alfa/channels/redtube.py
index 7cdf10c3..c26185df 100644
--- a/plugin.video.alfa/channels/redtube.py
+++ b/plugin.video.alfa/channels/redtube.py
@@ -42,7 +42,6 @@ def catalogo(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a class="pornstar_link js_mpop js-pop" href="([^"]+)".*?"([^"]+)"\s+title="([^"]+)".*?<div class="ps_info_count">\s+([^"]+)\s+Videos'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle +  " [COLOR yellow]" + cantidad + "[/COLOR] "
@@ -61,7 +60,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<div class="category_item_wrapper">.*?<a href="([^"]+)".*?data-thumb_url="([^"]+)".*?alt="([^"]+)".*?<span class="category_count">\s+([^"]+) Videos'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle + " (" + cantidad + ")"
diff --git a/plugin.video.alfa/channels/sexgalaxy.py b/plugin.video.alfa/channels/sexgalaxy.py
index 44ad1113..0967ce96 100644
--- a/plugin.video.alfa/channels/sexgalaxy.py
+++ b/plugin.video.alfa/channels/sexgalaxy.py
@@ -42,7 +42,6 @@ def canales (item):
     data = scrapertools.get_match(data,'Top Networks</a>(.*?)</ul>')
     patron  = '<li id=.*?<a href="(.*?)">(.*?)</a></li>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -59,7 +58,6 @@ def categorias(item):
     data = scrapertools.get_match(data,'More Categories</a>(.*?)</ul>')
     patron  = '<li id=.*?<a href="(.*?)">(.*?)</a></li>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -75,7 +73,6 @@ def peliculas(item):
     data = httptools.downloadpage(item.url).data
     patron =  '<div class="post-img small-post-img">.*?<a href="(.*?)" title="(.*?)">.*?<img src="(.*?)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
         itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , fulltitle=scrapedtitle , plot=scrapedplot , folder=True) )
diff --git a/plugin.video.alfa/channels/sexofilm.py b/plugin.video.alfa/channels/sexofilm.py
index a55589a5..f11d758f 100644
--- a/plugin.video.alfa/channels/sexofilm.py
+++ b/plugin.video.alfa/channels/sexofilm.py
@@ -47,7 +47,6 @@ def categorias(item):
     data = scrapertools.get_match(data,'<div class="tagcloud">(.*?)<p>')
     patron  = '<a href="(.*?)".*?>(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle  in matches:
         itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , folder=True) )
     return itemlist
@@ -60,7 +59,6 @@ def catalogo(item):
     data = scrapertools.get_match(data,'>Best Porn Studios</a>(.*?)</ul>')
     patron  = '<a href="(.*?)">(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle  in matches:
         itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , folder=True) )
     return itemlist
@@ -71,7 +69,6 @@ def anual(item):
     data = httptools.downloadpage(item.url).data
     patron  = '<li><a href="([^<]+)">([^<]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -85,16 +82,14 @@ def peliculas(item):
     data = httptools.downloadpage(item.url).data
     patron  = '<div class="post-thumbnail.*?<a href="([^"]+)" title="(.*?)".*?src="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
-        scrapedtitle = scrapedtitle.replace(" Porn DVD", "")
+        scrapedtitle = scrapedtitle.replace(" Porn DVD", "").replace("Permalink to ", "").replace(" Porn Movie", "")
         itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
     next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">&raquo;</a>')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
         itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
-
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/sunporno.py b/plugin.video.alfa/channels/sunporno.py
index 565f9224..fb062d74 100644
--- a/plugin.video.alfa/channels/sunporno.py
+++ b/plugin.video.alfa/channels/sunporno.py
@@ -45,7 +45,6 @@ def categorias(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<a href="([^"]+)">\s*(.*?)\s*<'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
diff --git a/plugin.video.alfa/channels/tabooshare.py b/plugin.video.alfa/channels/tabooshare.py
index aedc7c93..d4ecb8b8 100644
--- a/plugin.video.alfa/channels/tabooshare.py
+++ b/plugin.video.alfa/channels/tabooshare.py
@@ -18,8 +18,6 @@ def mainlist(item):
     itemlist = []
     itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host))
     itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-
-#    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
     return itemlist
 
 
@@ -30,7 +28,6 @@ def categorias(item):
     data = scrapertools.get_match(data,'<h3>Categories</h3>(.*?)</ul>')
     patron  = '<li class="cat-item cat-item-\d+"><a href="(.*?)" >(.*?)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
@@ -45,7 +42,6 @@ def peliculas(item):
     data = httptools.downloadpage(item.url).data
     patron = '<div class="post" id="post-\d+">.*?<a href="([^"]+)" title="(.*?)"><img src="(.*?)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
     for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
         scrapedplot = ""
         scrapedtitle = scrapedtitle.replace(" &#8211; Free Porn Download", "")
@@ -63,7 +59,6 @@ def play(item):
     logger.info()
     data = scrapertools.cachePage(item.url)
     itemlist = servertools.find_video_items(data=data)
-
     for videoitem in itemlist:
         videoitem.title = item.title
         videoitem.fulltitle = item.fulltitle
diff --git a/plugin.video.alfa/channels/tnaflix.json b/plugin.video.alfa/channels/tnaflix.json
new file mode 100644
index 00000000..58caddcd
--- /dev/null
+++ b/plugin.video.alfa/channels/tnaflix.json
@@ -0,0 +1,16 @@
+{
+  "id": "tnaflix",
+  "name": "tnaflix",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "https://www.tnaflix.com/images/favicons/tnaflix/android-icon-192x192.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/tnaflix.py b/plugin.video.alfa/channels/tnaflix.py
new file mode 100644
index 00000000..92707e14
--- /dev/null
+++ b/plugin.video.alfa/channels/tnaflix.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from platformcode import config, logger
+from core import scrapertools
+from core.item import Item
+from core import servertools
+from core import httptools
+from core import tmdb
+from core import jsontools
+
+host = 'https://www.tnaflix.com'
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/new/1"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/popular/?period=month&d=all"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorado" , action="peliculas", url=host + "/toprated/?d=all&period=month"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels/all/top-rated/1/all"))
+    itemlist.append( Item(channel=item.channel, title="PornStars" , action="categorias", url=host + "/pornstars"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/search.php?what=%s&tab=" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def catalogo(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<div class="vidcountSp">(\d+)</div>.*?<a class="categoryTitle channelTitle" href="([^"]+)" title="([^"]+)">.*?data-original="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for cantidad,scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        title = scrapedtitle + " (" + cantidad + ")"
+        scrapedplot = ""
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<a class="llNav" href="([^"]+)">')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    if item.title=="PornStars" :
+        data = scrapertools.get_match(data,'</i> Hall Of Fame Pornstars</h2>(.*?)</section>')
+    patron  = '<a class="thumb" href="([^"]+)">.*?<img src="([^"]+)".*?<div class="vidcountSp">(.*?)</div>.*?<a class="categoryTitle".*?>([^"]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
+        scrapedplot = ""
+        if item.title=="Categorias" :
+            scrapedthumbnail = "http:" + scrapedthumbnail
+            scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        if item.title=="PornStars" :
+            scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "?section=videos"
+        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<a class="llNav" href="([^"]+)">')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="categorias" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a class=\'thumb no_ajax\' href=\'(.*?)\'.*?data-original=\'(.*?)\' alt="([^"]+)"><div class=\'videoDuration\'>([^<]+)</div>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
+        url = urlparse.urljoin(item.url,scrapedurl)
+        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        contentTitle = title
+        thumbnail = scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<a class="llNav" href="([^"]+)">')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<meta itemprop="contentUrl" content="([^"]+)" />'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for url  in matches:
+        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=url,
+                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/tryboobs.json b/plugin.video.alfa/channels/tryboobs.json
new file mode 100644
index 00000000..9fe3080f
--- /dev/null
+++ b/plugin.video.alfa/channels/tryboobs.json
@@ -0,0 +1,16 @@
+{
+  "id": "tryboobs",
+  "name": "tryboobs",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "http://tb3.fuckandcdn.com/tb/tbstatic/v30/common/tryboobs/img/logo.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/tryboobs.py b/plugin.video.alfa/channels/tryboobs.py
new file mode 100644
index 00000000..3d94886a
--- /dev/null
+++ b/plugin.video.alfa/channels/tryboobs.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from platformcode import config, logger
+from core import scrapertools
+from core.item import Item
+from core import servertools
+from core import httptools
+from core import tmdb
+from core import jsontools
+
+host = 'http://www.tryboobs.com'
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/week/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor Valorado" , action="peliculas", url=host + "/top-rated/week/"))
+    itemlist.append( Item(channel=item.channel, title="Modelos" , action="modelos", url=host + "/models/model-viewed/1/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/search/?q=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def modelos(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)" class="th-model">.*?src="([^"]+)".*?<span class="roliks"><span>(\d+)</span>.*?<span class="title">([^"]+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapedtitle + "   (" + cantidad + ")"
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<li><a class="pag-next" href="([^"]+)"><ins>Next</ins></a>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="modelos" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)" class="th-cat">.*?<img src="([^"]+)".*?<span>(\d+)</span>.*?<span class="title">([^"]+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = 'href="([^"]+)"\s*class="th-video.*?<img src="([^"]+)".*?<span class="time">([^"]+)</span>.*?<span class="title">([^"]+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,duracion,scrapedtitle  in matches:
+        url = scrapedurl
+        contentTitle = scrapedtitle
+        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        thumbnail = scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<li><a class="pag-next" href="([^"]+)"><ins>Next</ins></a>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<video src="([^"]+)"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for url  in matches:
+        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=url,
+                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/videosXYZ.json b/plugin.video.alfa/channels/videosXYZ.json
new file mode 100644
index 00000000..b9726ca3
--- /dev/null
+++ b/plugin.video.alfa/channels/videosXYZ.json
@@ -0,0 +1,16 @@
+{
+  "id": "videosXYZ",
+  "name": "videosXYZ",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "https://free-porn-videos.xyz/wp-content/uploads/2018/10/cropped-Logo-org-Free-porn-videos.xyz-app-icon-192x192.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/videosXYZ.py b/plugin.video.alfa/channels/videosXYZ.py
new file mode 100644
index 00000000..73a44dcd
--- /dev/null
+++ b/plugin.video.alfa/channels/videosXYZ.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'http://free-porn-videos.xyz'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/topics/porn-videos/"))
+    itemlist.append( Item(channel=item.channel, title="Parody" , action="peliculas", url=host + "/topics/free-porn-parodies/"))
+    itemlist.append( Item(channel=item.channel, title="BigTits" , action="peliculas", url=host + "/?s=big+tit"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/?s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron = '<article id="post-\d+".*?<a href="([^"]+)" title="([^"]+)">.*?data-src="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapedtitle.replace("Permalink to Watch ", "").replace("Porn Online", "").replace("Permalink to ", "")
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , contentTitle=scrapedtitle,  plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">&raquo;</a>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    scrapedurl = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
+    scrapedurl = scrapedurl.replace("%28", "(").replace("%29", ")")
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/vintagetube.json b/plugin.video.alfa/channels/vintagetube.json
new file mode 100644
index 00000000..ddf36990
--- /dev/null
+++ b/plugin.video.alfa/channels/vintagetube.json
@@ -0,0 +1,16 @@
+{
+  "id": "vintagetube",
+  "name": "vintagetube",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "http://www.vintagexxxsex.com/images/vintagexxxsex.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+  
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/vintagetube.py b/plugin.video.alfa/channels/vintagetube.py
new file mode 100644
index 00000000..725fd907
--- /dev/null
+++ b/plugin.video.alfa/channels/vintagetube.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'http://www.vintagetube.club'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="peliculas", url=host + "/tube/last-1/"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/tube/popular-1/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/search/%s" % texto
+    item.url =     item.url + "/popular-1/"
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron  = '<div class="prev prev-ct">.*?<a href="(.*?)">.*?<img src="(.*?)".*?<span class="prev-tit">(.*?)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedtitle = str(scrapedtitle)
+        scrapedurl = host + scrapedurl
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron = '<div class="prev">.*?<a href="(.*?)">.*?<img src="(.*?)">.*?<span class="prev-tit">(.*?)</span>.*?<div class="prev-dur"><span>(.*?)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
+        scrapedplot = ""
+        scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + str(scrapedtitle)
+        scrapedurl = scrapedurl.replace("/xxx.php?tube=", "")
+        scrapedurl = host + scrapedurl
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    current_page = scrapertools.find_single_match(data,'<li><span class="page">(.*?)</span></li>')
+    next_page = int(current_page) + 1
+    url = item.url
+    url_page = current_page + "/"
+    url = url.replace(url_page, "")
+    next_page_url = url + str(next_page)+"/"
+    itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    scrapedurl = scrapertools.find_single_match(data,'<iframe frameborder=0 scrolling="no"  src=\'(.*?)\'')
+    if scrapedurl == "":
+        scrapedurl = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
+        scrapedurl = scrapedurl.replace ("http:", "")
+        data = httptools.downloadpage("http:" + scrapedurl).data
+    else:
+        data = httptools.downloadpage(scrapedurl).data
+        scrapedurl = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
+        data = httptools.downloadpage("https:" + scrapedurl).data
+    media_url = scrapertools.find_single_match(data,'<source src="(.*?)"')
+    itemlist = []
+    itemlist.append(Item(channel=item.channel, action="play", title=media_url, fulltitle=media_url, url=media_url,
+                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/vintagexxxsex.json b/plugin.video.alfa/channels/vintagexxxsex.json
new file mode 100644
index 00000000..6c51cae5
--- /dev/null
+++ b/plugin.video.alfa/channels/vintagexxxsex.json
@@ -0,0 +1,16 @@
+{
+  "id": "vintagexxxsex",
+  "name": "vintagexxxsex",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "http://www.vintagexxxsex.com/images/vintagexxxsex.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/vintagexxxsex.py b/plugin.video.alfa/channels/vintagexxxsex.py
new file mode 100644
index 00000000..17018db9
--- /dev/null
+++ b/plugin.video.alfa/channels/vintagexxxsex.py
@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'http://www.vintagexxxsex.com'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Top" , action="peliculas", url=host + "/all-top/1/"))
+    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host + "/all-new/1/"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/all-longest/1/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/?s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron  = '<li><a href="([^"]+)"><i class="fa fa-tag"></i>(.*?)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        scrapedurl = host + scrapedurl
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron  = '<div class="th">.*?<a href="([^"]+)".*?<img src="([^"]+)".*?<span class="th_nm">([^"]+)</span>.*?<i class="fa fa-clock-o"></i>([^"]+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,time in matches:
+        contentTitle = scrapedtitle
+        title = "[COLOR yellow]" + time + " [/COLOR]" + scrapedtitle
+        scrapedurl = scrapedurl.replace("/up.php?xxx=", "")
+        scrapedurl = host + scrapedurl
+        thumbnail = scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
+
+
+    next_page_url = scrapertools.find_single_match(data,'<li><span class="pg_nm">\d+</span></li>.*?href="([^"]+)"')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+
+
+    # else:
+        # patron  = '<li><span class="pg_nm">\d+</span></li>.*?href="([^"]+)"'
+        # next_page = re.compile(patron,re.DOTALL).findall(data)
+        # next_page = item.url + next_page[0]
+        # itemlist.append( Item(channel=item.channel, action="peliculas", title=next_page[0] , text_color="blue", url=next_page[0] ) )
+    return itemlist
+
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    scrapedurl = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
+    data = httptools.downloadpage(scrapedurl).data
+    scrapedurl = scrapertools.find_single_match(data,'<source src="(.*?)"')
+    if scrapedurl == "":
+        scrapedurl = "http:" + scrapertools.find_single_match(data,'<iframe src="(.*?)"')
+        data = httptools.downloadpage(scrapedurl).data
+        scrapedurl = scrapertools.find_single_match(data,'file: "(.*?)"')
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
+                    thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/vporn.json b/plugin.video.alfa/channels/vporn.json
new file mode 100644
index 00000000..a6579d50
--- /dev/null
+++ b/plugin.video.alfa/channels/vporn.json
@@ -0,0 +1,16 @@
+{
+  "id": "vporn",
+  "name": "vporn",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "https://th-us2.vporn.com/images/logo%20Dark%20theme.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/vporn.py b/plugin.video.alfa/channels/vporn.py
new file mode 100644
index 00000000..3b5bddb6
--- /dev/null
+++ b/plugin.video.alfa/channels/vporn.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'https://www.vporn.com'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host + "/newest/month/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/views/month/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor Valoradas" , action="peliculas", url=host + "/rating/month/"))
+    itemlist.append( Item(channel=item.channel, title="Favoritas" , action="peliculas", url=host + "/favorites/month/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Votada" , action="peliculas", url=host + "/votes/month/"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/longest/month/"))
+    itemlist.append( Item(channel=item.channel, title="PornStar" , action="catalogo", url=host + "/pornstars/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/search?q=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def catalogo(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<div class=\'star\'>.*?<a href="([^"]+)">.*?<img src="([^"]+)" alt="([^"]+)".*?<span> (\d+) Videos'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
+        scrapedurl = host + scrapedurl
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<a class="next" href="([^"]+)">')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Next page >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+    return itemlist
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    data = scrapertools.get_match(data,'<div class="cats-all categories-list">(.*?)</div>')
+    patron  = '<a href="([^"]+)".*?>([^"]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        scrapedurl = host + scrapedurl
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<div class="video">.*?<a href="([^"]+)".*?<span class="time">(.*?)</span>.*?<img src="([^"]+)" alt="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,time,scrapedthumbnail,scrapedtitle in matches:
+        title = "[COLOR yellow]" + time + "  [/COLOR]" + scrapedtitle
+        thumbnail = scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle = title, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<a class="next.*?title="Next Page" href="([^"]+)">')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Next page >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<source src="([^"]+)" type="video/mp4" label="([^"]+)"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for scrapedurl,scrapedtitle  in matches:
+        itemlist.append(item.clone(action="play", title=scrapedtitle, fulltitle = item.title, url=scrapedurl))
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/watchpornfree.json b/plugin.video.alfa/channels/watchpornfree.json
new file mode 100644
index 00000000..c6ad57a7
--- /dev/null
+++ b/plugin.video.alfa/channels/watchpornfree.json
@@ -0,0 +1,16 @@
+{
+  "id": "watchpornfree",
+  "name": "watchpornfree",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "https://watchpornfree.ws/wp-content/uploads/2018/03/Untitled-2.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/watchpornfree.py b/plugin.video.alfa/channels/watchpornfree.py
new file mode 100644
index 00000000..f2745a6f
--- /dev/null
+++ b/plugin.video.alfa/channels/watchpornfree.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+# https://playpornfree.org/    https://mangoporn.net/   https://watchfreexxx.net/   https://losporn.org/  https://xxxstreams.me/  https://speedporn.net/
+
+host = 'https://watchpornfree.ws'
+
+def mainlist(item):
+    logger.info("")
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/movies"))
+    itemlist.append( Item(channel=item.channel, title="Parodia" , action="peliculas", url=host + "/category/parodies-hd"))
+    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/category/clips-scenes"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Año" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info("")
+    texto = texto.replace(" ", "+")
+    item.url = host + "/?s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def categorias(item):
+    logger.info("")
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    if item.title == "Canal":
+        data = scrapertools.get_match(data,'>Studios</a>(.*?)</ul>')
+    if item.title == "Año":
+        data = scrapertools.get_match(data,'>Years</a>(.*?)</ul>')
+    if item.title == "Categorias":
+        data = scrapertools.get_match(data,'>XXX Genres</div>(.*?)</ul>')
+    patron  = '<a href="(.*?)".*?>(.*?)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle  in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+def peliculas(item):
+    logger.info("")
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<article class="TPost B">.*?<a href="([^"]+)">.*?src="([^"]+)".*?<div class="Title">([^"]+)</div>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
+        scrapedplot = ""
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next &raquo;</a>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/webpeliculasporno.json b/plugin.video.alfa/channels/webpeliculasporno.json
new file mode 100644
index 00000000..a048c974
--- /dev/null
+++ b/plugin.video.alfa/channels/webpeliculasporno.json
@@ -0,0 +1,16 @@
+{
+  "id": "webpeliculasporno",
+  "name": "webpeliculasporno",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "http://www.webpeliculasporno.com/wp-content/uploads/logo.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/webpeliculasporno.py b/plugin.video.alfa/channels/webpeliculasporno.py
new file mode 100644
index 00000000..b1382d98
--- /dev/null
+++ b/plugin.video.alfa/channels/webpeliculasporno.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'http://www.webpeliculasporno.com'
+
+
+def mainlist(item):
+    logger.info("pelisalacarta.webpeliculasporno mainlist")
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Ultimas" , action="peliculas", url= host))
+    itemlist.append( Item(channel=item.channel, title="Mas vistas" , action="peliculas", url= host + "/?display=tube&filtre=views"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="peliculas", url= host + "/?display=tube&filtre=rate"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url= host))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info("pelisalacarta.gmobi mainlist")
+    texto = texto.replace(" ", "+")
+    item.url = host + "/?s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def categorias(item):
+    itemlist = []
+    data = scrapertools.cache_page(item.url)
+    patron  = '<li class="cat-item [^>]+><a href="([^"]+)" >([^<]+)'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<li class="border-radius-5 box-shadow">.*?'
+    patron  += 'src="([^"]+)".*?'
+    patron += '<a href="([^"]+)" title="([^"]+)">'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedthumbnail,scrapedurl,scrapedtitle  in matches:
+        url = urlparse.urljoin(item.url,scrapedurl)
+        title = scrapedtitle
+        contentTitle = title
+        thumbnail = scrapedthumbnail
+        plot = ""
+        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle ))
+    next_page_url = scrapertools.find_single_match(data,'<li><a class="next page-numbers" href="([^"]+)">Next')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel, action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/woodrocket.json b/plugin.video.alfa/channels/woodrocket.json
new file mode 100644
index 00000000..02ea74a1
--- /dev/null
+++ b/plugin.video.alfa/channels/woodrocket.json
@@ -0,0 +1,16 @@
+{
+  "id": "woodrocket",
+  "name": "woodrocket",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "http://woodrocket.com/img//logo.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/woodrocket.py b/plugin.video.alfa/channels/woodrocket.py
new file mode 100644
index 00000000..e9706cc2
--- /dev/null
+++ b/plugin.video.alfa/channels/woodrocket.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'http://woodrocket.com'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+
+    itemlist.append( Item(channel=item.channel, title="Novedades" , action="peliculas", url=host + "/porn"))
+    itemlist.append( Item(channel=item.channel, title="Parodias" , action="peliculas", url=host + "/parodies"))
+    itemlist.append( Item(channel=item.channel, title="Shows" , action="categorias", url=host + "/series"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
+    return itemlist
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron  = '<div class="media-panel-image">.*?<img src="(.*?)".*?<a href="(.*?)">(.*?)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail =  host + scrapedthumbnail
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<div class="media-panel-image">.*?<a href="([^"]+)".*?title="([^"]+)".*?<img src="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+        plot = ""
+        contentTitle = scrapedtitle
+        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
+        title = scrapedtitle
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)" rel="next">&raquo;</a></li>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<iframe src="(.*?)"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for scrapedurl  in matches:
+        scrapedurl = scrapedurl
+    data = httptools.downloadpage(scrapedurl).data
+    scrapedurl = scrapertools.find_single_match(data,'"quality":"\d*","videoUrl":"(.*?)"')
+    scrapedurl = scrapedurl.replace("\/", "/")
+    itemlist.append(item.clone(action="play", title=scrapedurl, fulltitle = item.title, url=scrapedurl))
+    return itemlist
+
+
diff --git a/plugin.video.alfa/channels/xozilla.json b/plugin.video.alfa/channels/xozilla.json
new file mode 100644
index 00000000..aae90940
--- /dev/null
+++ b/plugin.video.alfa/channels/xozilla.json
@@ -0,0 +1,16 @@
+{
+  "id": "xozilla",
+  "name": "xozilla",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "https://www.xozilla.com/images/logo.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/xozilla.py b/plugin.video.alfa/channels/xozilla.py
new file mode 100644
index 00000000..54e6baf4
--- /dev/null
+++ b/plugin.video.alfa/channels/xozilla.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+
+from platformcode import config, logger
+from core import scrapertools
+from core.item import Item
+from core import servertools
+from core import httptools
+from core import tmdb
+from core import jsontools
+
+host = 'https://www.xozilla.com'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/latest-updates/"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top-rated/"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/search/%s/" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def catalogo(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?<img class="thumb" src="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+        scrapedplot = ""
+        thumbnail = "http:" + scrapedthumbnail
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=thumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?<img class="thumb" src="([^"]+)".*?</i> (\d+) videos</div>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)" class="item.*?data-original="([^"]+)".*?alt="([^"]+)".*?<div class="duration">(.*?)</div>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion in matches:
+        url = scrapedurl
+        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        contentTitle = title
+        thumbnail = scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
+    if next_page_url!="#videos":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    if next_page_url=="#videos":
+        next_page_url = scrapertools.find_single_match(data,'from:(\d+)">Next</a>')
+        next_page_url = urlparse.urljoin(item.url,next_page_url) + "/"
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cache_page(item.url)
+    media_url = scrapertools.find_single_match(data, 'video_alt_url: \'([^\']+)/\'')
+    if media_url == "":
+        media_url = scrapertools.find_single_match(data, 'video_url: \'([^\']+)/\'')
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=media_url,
+                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
+    return itemlist
+
+
diff --git a/plugin.video.alfa/channels/xtapes.json b/plugin.video.alfa/channels/xtapes.json
new file mode 100644
index 00000000..9a1cc2fa
--- /dev/null
+++ b/plugin.video.alfa/channels/xtapes.json
@@ -0,0 +1,16 @@
+{
+  "id": "xtapes",
+  "name": "xtapes",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "http://hd.xtapes.to/wp-content/uploads/xtapes.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/xtapes.py b/plugin.video.alfa/channels/xtapes.py
new file mode 100644
index 00000000..ab9a3802
--- /dev/null
+++ b/plugin.video.alfa/channels/xtapes.py
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+
+from platformcode import config, logger
+from core import scrapertools
+from core.item import Item
+from core import servertools
+from core import httptools
+from core import tmdb
+from core import jsontools
+
+host = 'http://hd.xtapes.to'
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/full-porn-movies/?display=tube&filtre=date"))
+    itemlist.append( Item(channel=item.channel, title="Peliculas Estudio" , action="catalogo", url=host))
+    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/?filtre=date&cat=0"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistos" , action="peliculas", url=host + "/?display=tube&filtre=views"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorado" , action="peliculas", url=host + "/?display=tube&filtre=rate"))
+    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/?display=tube&filtre=duree"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/?s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def catalogo(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    if item.title=="Canal":
+        data = scrapertools.get_match(data,'<div class="footer-banner">(.*?)<div id="footer-copyright">')
+    else:
+       data = scrapertools.get_match(data,'<li id="menu-item-16"(.*?)</ul>')
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)">([^"]+)</a></li>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = scrapertools.get_match(data,'<a>Categories</a>(.*?)</ul>')
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)">([^"]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        scrapedtitle = scrapedtitle
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<li class="border-radius-5 box-shadow">.*?src="([^"]+)".*?<a href="([^"]+)" title="([^"]+)">.*?<div class="time-infos".*?>([^"]+)<span class="time-img">'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedthumbnail,scrapedurl,scrapedtitle,duracion  in matches:
+        url = urlparse.urljoin(item.url,scrapedurl)
+        title = scrapedtitle
+        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        contentTitle = title
+        thumbnail = scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle = title,  contentTitle = contentTitle, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next video')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        next_page_url = next_page_url.replace("#038;cat=0#038;", "").replace("#038;filtre=views#038;", "").replace("#038;filtre=rate#038;", "").replace("#038;filtre=duree#038;", "")
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    variable = scrapertools.find_single_match(data,'<script type=\'text/javascript\'> str=\'([^\']+)\'')
+    resuelta = re.sub("@[A-F0-9][A-F0-9]", lambda m: m.group()[1:].decode('hex'), variable)
+    url = scrapertools.find_single_match(resuelta,'<iframe src="([^"]+)"')
+    data = scrapertools.cachePage(url)
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/xxxparodyhd.json b/plugin.video.alfa/channels/xxxparodyhd.json
new file mode 100644
index 00000000..54b05121
--- /dev/null
+++ b/plugin.video.alfa/channels/xxxparodyhd.json
@@ -0,0 +1,16 @@
+{
+  "id": "xxxparodyhd",
+  "name": "xxxparodyhd",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "https://xxxparodyhd.net/wp-content/uploads/2018/04/parodyhd-1.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/xxxparodyhd.py b/plugin.video.alfa/channels/xxxparodyhd.py
new file mode 100644
index 00000000..1933b4b6
--- /dev/null
+++ b/plugin.video.alfa/channels/xxxparodyhd.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'https://xxxparodyhd.net'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/genre/new-release/"))
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host + "/movies/"))
+    itemlist.append( Item(channel=item.channel, title="Parodias" , action="peliculas", url=host + "/genre/parodies/"))
+    itemlist.append( Item(channel=item.channel, title="Videos" , action="peliculas", url=host + "/genre/clips-scenes/"))
+    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/categories"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/?s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    if item.title == "Canal" :
+        data = scrapertools.get_match(data,'>Studios</a>(.*?)</ul>')
+    else:
+        data = scrapertools.get_match(data,'<div class=\'sub-container\' style=\'display: none;\'><ul class=\'sub-menu\'>(.*?)</ul>')
+    patron  = '<a href="([^"]+)">([^<]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron  = '<div data-movie-id="\d+" class="ml-item">.*?<a href="([^"]+)".*?oldtitle="([^"]+)".*?<img src="([^"]+)".*?rel="tag">(.*?)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle,scrapedthumbnail,year in matches:
+        scrapedplot = ""
+        scrapedtitle = str(scrapedtitle) + " " + year
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<li class=\'active\'>.*?href=\'([^\']+)\'>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/xxxstreams.json b/plugin.video.alfa/channels/xxxstreams.json
new file mode 100644
index 00000000..522372fd
--- /dev/null
+++ b/plugin.video.alfa/channels/xxxstreams.json
@@ -0,0 +1,16 @@
+{
+  "id": "xxxstreams",
+  "name": "xxxstreams",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/xxxstreams.py b/plugin.video.alfa/channels/xxxstreams.py
new file mode 100644
index 00000000..e0b8f8f3
--- /dev/null
+++ b/plugin.video.alfa/channels/xxxstreams.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'http://xxxstreams.org'
+
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url= host + "/category/full-porn-movie-stream/"))
+    itemlist.append( Item(channel=item.channel, title="Clips" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/category/full-porn-movie-stream/"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/?s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<li id="menu-item.*?class="menu-item menu-item-type-taxonomy.*?<a href="([^<]+)">(.*?)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = '<div class="entry-content">.*?<img src="([^"]+)".*?<a href="([^<]+)".*?<span class="screen-reader-text">(.*?)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next &rarr;</a>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Next page >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    data = scrapertools.get_match(data,'--more--></p>(.*?)/a></p>')
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)".*?class="external">(.*?)<'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, fulltitle=item.title, url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot, folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    data = scrapertools.cachePage(item.url)
+    itemlist = servertools.find_video_items(data=data)
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/youjizz.json b/plugin.video.alfa/channels/youjizz.json
new file mode 100644
index 00000000..cdc171b9
--- /dev/null
+++ b/plugin.video.alfa/channels/youjizz.json
@@ -0,0 +1,16 @@
+{
+  "id": "youjizz",
+  "name": "youjizz",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "https://cdne-static.yjcontentdelivery.com/app/1/images/yjlogo.jpeg",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/youjizz.py b/plugin.video.alfa/channels/youjizz.py
new file mode 100644
index 00000000..4f2fedf6
--- /dev/null
+++ b/plugin.video.alfa/channels/youjizz.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from platformcode import config, logger
+from core import scrapertools
+from core.item import Item
+from core import servertools
+from core import httptools
+from core import tmdb
+from core import jsontools
+
+host = 'https://www.youjizz.com'
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/newest-clips/1.html"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/1.html"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top-rated-week/1.html"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/search/%s-1.html" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = scrapertools.get_match(data,'<h4>Trending Categories</h4>(.*?)</ul>')
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    itemlist.append( Item(channel=item.channel, action="peliculas", title="Big Tits" , url="https://www.youjizz.com/search/big-tits-1.html?" , folder=True) )
+    patron  = '<li><a href="([^"]+)">([^"]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        scrapedtitle = scrapedtitle
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<div class="video-item">.*?class="frame image" href="([^"]+)".*?data-original="([^"]+)" />.*?<div class="video-title">.*?>(.*?)</a>.*?<span class="time">(.*?)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
+        url = urlparse.urljoin(item.url,scrapedurl)
+        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        contentTitle = title
+        thumbnail = "http:" + scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<li><a class="pagination-next" href="([^"]+)">Next &raquo;</a>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cache_page(item.url)
+    media_url = scrapertools.find_single_match(data, '"filename"\:"(.*?)"')
+    media_url = "https:" + media_url.replace("\\", "")
+    itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=media_url,
+                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
+    return itemlist
+
diff --git a/plugin.video.alfa/channels/youporn.json b/plugin.video.alfa/channels/youporn.json
new file mode 100644
index 00000000..d63d7d3c
--- /dev/null
+++ b/plugin.video.alfa/channels/youporn.json
@@ -0,0 +1,16 @@
+{
+  "id": "youporn",
+  "name": "youporn",
+  "active": true,
+  "adult": false,
+  "language": ["*"],
+  "thumbnail": "https://fs.ypncdn.com/cb/bundles/youpornwebfront/images/l_youporn_black.png",
+  "banner": "",
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/youporn.py b/plugin.video.alfa/channels/youporn.py
new file mode 100644
index 00000000..aa65ff46
--- /dev/null
+++ b/plugin.video.alfa/channels/youporn.py
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+from platformcode import config, logger
+from core import scrapertools
+from core.item import Item
+from core import servertools
+from core import httptools
+from core import tmdb
+from core import jsontools
+
+host = 'https://www.youporn.com'
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/browse/time/"))
+    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/browse/views/"))
+    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top_rated/"))
+    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="catalogo", url=host + "/pornstars/most_popular/"))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/alphabetical/"))
+    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host + "/search/?query=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def catalogo(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = scrapertools.get_match(data,'<a href="/pornstars/most_popular/" class="selected">All</a>(.*?)<i class=\'icon-menu-right\'></i></a>')
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)".*?data-original="([^"]+)".*?<span class="porn-star-name">([^"]+)</span>.*?<span class="video-count">([^"]+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)" data-page-number=.*?>')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = scrapertools.get_match(data,'<div class=\'row alphabetical\'.*?>(.*?)<h2 class="heading4">Popular by Country</h2>')
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)".*?data-original="([^"]+)".*?<p>([^"]+)<span>([^"]+)</span>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
+        scrapedplot = ""
+        scrapedthumbnail = "http:" + scrapedthumbnail
+        scrapedtitle = scrapedtitle + " (" + cantidad +")"
+        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
+    patron  = '<a href="([^"]+)" class=\'video-box-image\'.*?data-original="([^"]+)".*?<div class="video-box-title">([^"]+)</div>.*?<div class="video-duration">(.*?)</div>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
+        url = urlparse.urljoin(item.url,scrapedurl)
+        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
+        contentTitle = title
+        thumbnail = scrapedthumbnail
+        plot = ""
+        year = ""
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+    next_page_url = scrapertools.find_single_match(data,'<div class="prev-next"><a href="([^"]+)"')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+    return itemlist
+
+
+def play(item):
+    logger.info()
+    itemlist = []
+    data = scrapertools.cachePage(item.url)
+    patron  = 'page_params.video.mediaDefinition =.*?"videoUrl":"([^"]+)"'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for scrapedurl  in matches:
+        scrapedurl =  scrapedurl.replace("\/", "/")
+    itemlist.append(item.clone(action="play", title=scrapedurl, fulltitle = item.title, url=scrapedurl))
+    return itemlist
+
+
diff --git a/plugin.video.alfa/channels/yuuk.json b/plugin.video.alfa/channels/yuuk.json
new file mode 100644
index 00000000..9e9f3053
--- /dev/null
+++ b/plugin.video.alfa/channels/yuuk.json
@@ -0,0 +1,17 @@
+{
+  "id": "yuuk",
+  "name": "yuuk",
+  "active": true,
+  "adult": true,
+  "language": ["*"],
+  "thumbnail": "http://yuuk.net/wp-content/uploads/2018/06/yuuk_net_logo.png",
+  "banner": "",
+  ],
+  "categories": [
+    "adult"
+  ],
+  "settings": [
+
+  ]
+}
+
diff --git a/plugin.video.alfa/channels/yuuk.py b/plugin.video.alfa/channels/yuuk.py
new file mode 100644
index 00000000..ff6857d2
--- /dev/null
+++ b/plugin.video.alfa/channels/yuuk.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+import urlparse,urllib2,urllib,re
+import os, sys
+
+from core import jsontools as json
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from platformcode import config, logger
+from core import httptools
+from core import tmdb
+
+host = 'http://yuuk.net'
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="peliculas", url=host))
+    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
+    itemlist.append( Item(channel=item.channel, title="Buscar" , action="search"))
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = host+ "/?s=%s" % texto
+    try:
+        return peliculas(item)
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+
+def categorias(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    itemlist.append( Item(channel=item.channel, action="peliculas", title="Big Tits" , url="http://yuuk.net/?s=big+tit" , folder=True) )
+    patron  = 'menu-item-object-category"><a href="([^"]+)">.*?</style>([^"]+)</a>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+    for scrapedurl,scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedthumbnail = ""
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    return itemlist
+
+
+def peliculas(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron = '<div class="featured-wrap clearfix">.*?<a href="([^"]+)" title="([^"]+)".*?src="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    scrapertools.printMatches(matches)
+    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+        scrapedplot = ""
+        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+    next_page_url = scrapertools.find_single_match(data,'<li><a rel=\'nofollow\' href=\'([^\']+)\' class=\'inactive\'>Next')
+    if next_page_url!="":
+        next_page_url = urlparse.urljoin(item.url,next_page_url)
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+
+    return itemlist
+