From 8bd67a6cd844d9cb436e6ebe3948e57a8c9dd761 Mon Sep 17 00:00:00 2001
From: marco <m.toma99@gmail.com>
Date: Wed, 22 Apr 2020 20:53:50 +0200
Subject: [PATCH] sradicato supporto ai canali per adulti

---
 channels/0example.json.txt             |   3 +-
 channels/altadefinizione01.json        |   1 -
 channels/altadefinizione01_link.json   |   1 -
 channels/altadefinizioneclick.json     |   1 -
 channels/animeforce.json               |   1 -
 channels/animeleggendari.json          |   1 -
 channels/animesaturn.json              |   1 -
 channels/animespace.json               |   1 -
 channels/animesubita.json              |   1 -
 channels/animetubeita.json             |   1 -
 channels/animeunity.json               |   1 -
 channels/animeworld.json               |   1 -
 channels/casacinema.json               |   1 -
 channels/casacinemaInfo.json           |   1 -
 channels/cb01anime.json                |   1 -
 channels/cineblog01.json               |   1 -
 channels/cinemalibero.json             |   1 -
 channels/cinetecadibologna.json        |   1 -
 channels/dreamsub.json                 |   1 -
 channels/dsda.json                     |   1 -
 channels/eurostreaming.json            |   1 -
 channels/fastsubita.json               |   1 -
 channels/filmigratis.json              |   1 -
 channels/filmpertutti.json             |   1 -
 channels/filmsenzalimiticc.json        |   1 -
 channels/guardaserieclick.json         |   1 -
 channels/hd4me.json                    |   1 -
 channels/ilcorsaronero.json            |   1 -
 channels/ilgeniodellostreaming.json    |   1 -
 channels/italiaserie.json              |   1 -
 channels/metalvideo.json               |   1 -
 channels/mondoserietv.json             |   1 -
 channels/netfreex.json                 |   1 -
 channels/piratestreaming.json          |   1 -
 channels/polpotv.json                  |   1 -
 channels/porn/LIKUOO.json              |  16 --
 channels/porn/LIKUOO.py                | 100 --------
 channels/porn/TXXX.json                |  16 --
 channels/porn/TXXX.py                  | 149 -----------
 channels/porn/__init__.py              |  12 -
 channels/porn/absoluporn.json          |  15 --
 channels/porn/absoluporn.py            |  95 -------
 channels/porn/alsoporn.json            |  14 --
 channels/porn/alsoporn.py              |  99 --------
 channels/porn/analdin.json             |  15 --
 channels/porn/analdin.py               | 113 ---------
 channels/porn/beeg.json                |  14 --
 channels/porn/beeg.py                  | 122 ---------
 channels/porn/bravoporn.json           |  15 --
 channels/porn/bravoporn.py             |  89 -------
 channels/porn/camwhoresbay.json        |  15 --
 channels/porn/camwhoresbay.py          | 114 ---------
 channels/porn/canalporno.json          |  12 -
 channels/porn/canalporno.py            |  92 -------
 channels/porn/cat3plus.json            |  14 --
 channels/porn/cat3plus.py              | 130 ----------
 channels/porn/cinetemagay.json         |  12 -
 channels/porn/cinetemagay.py           | 128 ----------
 channels/porn/cliphunter.json          |  15 --
 channels/porn/cliphunter.py            | 108 --------
 channels/porn/coomelonitas.json        |  15 --
 channels/porn/coomelonitas.py          |  65 -----
 channels/porn/cumlouder.json           |  12 -
 channels/porn/cumlouder.py             | 180 --------------
 channels/porn/czechvideo.json          |  15 --
 channels/porn/czechvideo.py            |  87 -------
 channels/porn/datoporn.json            |  12 -
 channels/porn/datoporn.py              |  63 -----
 channels/porn/elreyx.json              |  16 --
 channels/porn/elreyx.py                |  98 --------
 channels/porn/eporner.json             |  12 -
 channels/porn/eporner.py               | 141 -----------
 channels/porn/eroticage.json           |  16 --
 channels/porn/eroticage.py             |  80 ------
 channels/porn/eroticasonlinetv.json    |  17 --
 channels/porn/eroticasonlinetv.py      |  85 -------
 channels/porn/erotik.json              |  14 --
 channels/porn/erotik.py                |  90 -------
 channels/porn/fapality.json            |  15 --
 channels/porn/fapality.py              |  97 --------
 channels/porn/fetishshrine.json        |  15 --
 channels/porn/fetishshrine.py          |  92 -------
 channels/porn/filmoviXXX.json          |  16 --
 channels/porn/filmoviXXX.py            |  46 ----
 channels/porn/filmpornoita.json        |  15 --
 channels/porn/filmpornoita.py          |  57 -----
 channels/porn/foxtube.json             |  16 --
 channels/porn/foxtube.py               | 123 ----------
 channels/porn/freeporn.json            |  16 --
 channels/porn/freeporn.py              | 101 --------
 channels/porn/freepornstreams.json     |  16 --
 channels/porn/freepornstreams.py       |  95 -------
 channels/porn/gotporn.json             |  15 --
 channels/porn/gotporn.py               | 129 ----------
 channels/porn/hclips.json              |  16 --
 channels/porn/hclips.py                | 118 ---------
 channels/porn/hdzog.json               |  16 --
 channels/porn/hdzog.py                 | 119 ---------
 channels/porn/hellporno.json           |  16 --
 channels/porn/hellporno.py             |  89 -------
 channels/porn/hentaiid.json            |  12 -
 channels/porn/hentaiid.py              | 147 -----------
 channels/porn/hotmovs.json             |  16 --
 channels/porn/hotmovs.py               | 147 -----------
 channels/porn/javlin.json              |  15 --
 channels/porn/javlin.py                |  71 ------
 channels/porn/javtasty.json            |  21 --
 channels/porn/javtasty.py              | 118 ---------
 channels/porn/javus.json               |  14 --
 channels/porn/javus.py                 |  51 ----
 channels/porn/javwhores.json           |  15 --
 channels/porn/javwhores.py             | 103 --------
 channels/porn/jizzbunker.json          |  17 --
 channels/porn/jizzbunker.py            |  92 -------
 channels/porn/justporn.json            |  16 --
 channels/porn/justporn.py              | 109 ---------
 channels/porn/kingsizetits.json        |  15 --
 channels/porn/kingsizetits.py          |  95 -------
 channels/porn/mangovideo.json          |  15 --
 channels/porn/mangovideo.py            | 109 ---------
 channels/porn/mporno.json              |  16 --
 channels/porn/mporno.py                |  80 ------
 channels/porn/muchoporno.json          |  16 --
 channels/porn/muchoporno.py            | 112 ---------
 channels/porn/nuvid.json               |  12 -
 channels/porn/nuvid.py                 | 115 ---------
 channels/porn/pandamovie.json          |  16 --
 channels/porn/pandamovie.py            | 110 ---------
 channels/porn/peliculaseroticas.json   |  12 -
 channels/porn/peliculaseroticas.py     |  40 ---
 channels/porn/pelisxporno.json         |  14 --
 channels/porn/pelisxporno.py           |  85 -------
 channels/porn/perfectgirls.json        |  16 --
 channels/porn/perfectgirls.py          |  90 -------
 channels/porn/playpornx.json           |  14 --
 channels/porn/playpornx.py             | 100 --------
 channels/porn/porn300.json             |  16 --
 channels/porn/porn300.py               | 107 --------
 channels/porn/pornboss.json            |  16 --
 channels/porn/pornboss.py              |  91 -------
 channels/porn/porndish.json            |  15 --
 channels/porn/porndish.py              |  78 ------
 channels/porn/porneq.json              |  16 --
 channels/porn/porneq.py                |  72 ------
 channels/porn/pornhive.json            |  16 --
 channels/porn/pornhive.py              |  94 -------
 channels/porn/pornhub.json             |  15 --
 channels/porn/pornhub.py               |  93 -------
 channels/porn/pornohdmega.json         |  15 --
 channels/porn/pornohdmega.py           | 108 --------
 channels/porn/pornrewind.json          |  15 --
 channels/porn/pornrewind.py            |  74 ------
 channels/porn/porntrex.json            |  21 --
 channels/porn/porntrex.py              | 327 -------------------------
 channels/porn/porntv.json              |  15 --
 channels/porn/porntv.py                | 104 --------
 channels/porn/qwertty.json             |  15 --
 channels/porn/qwertty.py               | 116 ---------
 channels/porn/redtube.json             |  15 --
 channels/porn/redtube.py               | 119 ---------
 channels/porn/serviporno.json          |  14 --
 channels/porn/serviporno.py            | 149 -----------
 channels/porn/sexgalaxy.json           |  16 --
 channels/porn/sexgalaxy.py             |  89 -------
 channels/porn/sexkino.json             |  16 --
 channels/porn/sexkino.py               | 137 -----------
 channels/porn/sexofilm.json            |  16 --
 channels/porn/sexofilm.py              | 102 --------
 channels/porn/shameless.json           |  14 --
 channels/porn/shameless.py             |  95 -------
 channels/porn/siska.json               |  15 --
 channels/porn/siska.py                 |  89 -------
 channels/porn/sleazemovies.json        |  14 --
 channels/porn/sleazemovies.py          | 109 ---------
 channels/porn/spankbang.json           |  16 --
 channels/porn/spankbang.py             |  97 --------
 channels/porn/spankwire.json           |  16 --
 channels/porn/spankwire.py             | 133 ----------
 channels/porn/streamingporn.json       |  17 --
 channels/porn/streamingporn.py         |  99 --------
 channels/porn/streamporno.json         |  17 --
 channels/porn/streamporno.py           |  77 ------
 channels/porn/submityouflicks.json     |  14 --
 channels/porn/submityouflicks.py       |  67 -----
 channels/porn/sunporno.json            |  16 --
 channels/porn/sunporno.py              | 119 ---------
 channels/porn/sxyprn.json              |  15 --
 channels/porn/sxyprn.py                |  99 --------
 channels/porn/tabooshare.json          |  16 --
 channels/porn/tabooshare.py            |  68 -----
 channels/porn/thumbzilla.json          |  37 ---
 channels/porn/thumbzilla.py            | 175 -------------
 channels/porn/titsbox.json             |  15 --
 channels/porn/titsbox.py               |  71 ------
 channels/porn/tnaflix.json             |  17 --
 channels/porn/tnaflix.py               | 138 -----------
 channels/porn/tryboobs.json            |  16 --
 channels/porn/tryboobs.py              |  96 --------
 channels/porn/tubedupe.json            |  16 --
 channels/porn/tubedupe.py              | 106 --------
 channels/porn/tubehentai.json          |  14 --
 channels/porn/tubehentai.py            |  65 -----
 channels/porn/videosXYZ.json           |  16 --
 channels/porn/videosXYZ.py             |  68 -----
 channels/porn/vidz7.json               |  22 --
 channels/porn/vidz7.py                 |  94 -------
 channels/porn/vintagetube.json         |  16 --
 channels/porn/vintagetube.py           |  98 --------
 channels/porn/vintagexxxsex.json       |  16 --
 channels/porn/vintagexxxsex.py         |  95 -------
 channels/porn/vivud.json               |  15 --
 channels/porn/vivud.py                 |  71 ------
 channels/porn/vporn.json               |  16 --
 channels/porn/vporn.py                 | 121 ---------
 channels/porn/watchpornfree.json       |  16 --
 channels/porn/watchpornfree.py         |  77 ------
 channels/porn/webpeliculasporno.json   |  16 --
 channels/porn/webpeliculasporno.py     |  75 ------
 channels/porn/woodrocket.json          |  16 --
 channels/porn/woodrocket.py            |  68 -----
 channels/porn/x18hentai.json           |  22 --
 channels/porn/x18hentai.py             | 151 ------------
 channels/porn/xhamster.json            |  22 --
 channels/porn/xhamster.py              | 155 ------------
 channels/porn/xms.json                 |  37 ---
 channels/porn/xms.py                   | 246 -------------------
 channels/porn/xozilla.json             |  16 --
 channels/porn/xozilla.py               | 114 ---------
 channels/porn/xtapes.json              |  16 --
 channels/porn/xtapes.py                |  92 -------
 channels/porn/xvideos.json             |  15 --
 channels/porn/xvideos.py               | 121 ---------
 channels/porn/xxxdan.json              |  17 --
 channels/porn/xxxdan.py                |  99 --------
 channels/porn/xxxfreeinhd.json         |  15 --
 channels/porn/xxxfreeinhd.py           | 122 ---------
 channels/porn/xxxparodyhd.json         |  16 --
 channels/porn/xxxparodyhd.py           |  75 ------
 channels/porn/xxxstreams.json          |  16 --
 channels/porn/xxxstreams.py            |  93 -------
 channels/porn/yespornplease.json       |  22 --
 channels/porn/yespornplease.py         |  90 -------
 channels/porn/youjizz.json             |  16 --
 channels/porn/youjizz.py               | 111 ---------
 channels/porn/youporn.json             |  16 --
 channels/porn/youporn.py               | 129 ----------
 channels/porn/yuuk.json                |  16 --
 channels/porn/yuuk.py                  |  93 -------
 channels/pufimovies.json               |   1 -
 channels/raiplay.json                  |   1 -
 channels/seriehd.json                  |   1 -
 channels/serietvonline.json            |   1 -
 channels/serietvsubita.json            |   1 -
 channels/serietvu.json                 |   1 -
 channels/streamingaltadefinizione.json |   1 -
 channels/streamtime.json               |   1 -
 channels/tantifilm.json                |   1 -
 channels/toonitalia.json               |   3 +-
 channels/tunein.json                   |   1 -
 channels/vedohd.json                   |   1 -
 channels/vvvvid.json                   |   1 -
 channelselector.py                     |  17 +-
 core/channeltools.py                   |  29 +--
 platformcode/config.py                 |  54 +---
 platformcode/launcher.py               |  19 +-
 resources/language/English/strings.po  |  12 +-
 resources/language/Italian/strings.po  |  24 +-
 resources/settings.xml                 |  10 -
 service.py                             |  33 ---
 specials/community.json                |   1 -
 specials/downloads.json                |   1 -
 specials/filmontv.json                 |   1 -
 specials/help.json                     |   1 -
 specials/news.json                     |   1 -
 specials/news.py                       |   8 -
 specials/search.json                   |   1 -
 specials/search.py                     |   2 -
 specials/tvmoviedb.json                |   1 -
 specials/url.json                      |   1 -
 specials/videolibrary.json             |   1 -
 280 files changed, 38 insertions(+), 13026 deletions(-)
 delete mode 100644 channels/porn/LIKUOO.json
 delete mode 100644 channels/porn/LIKUOO.py
 delete mode 100644 channels/porn/TXXX.json
 delete mode 100644 channels/porn/TXXX.py
 delete mode 100644 channels/porn/__init__.py
 delete mode 100644 channels/porn/absoluporn.json
 delete mode 100644 channels/porn/absoluporn.py
 delete mode 100644 channels/porn/alsoporn.json
 delete mode 100644 channels/porn/alsoporn.py
 delete mode 100644 channels/porn/analdin.json
 delete mode 100644 channels/porn/analdin.py
 delete mode 100755 channels/porn/beeg.json
 delete mode 100755 channels/porn/beeg.py
 delete mode 100644 channels/porn/bravoporn.json
 delete mode 100644 channels/porn/bravoporn.py
 delete mode 100644 channels/porn/camwhoresbay.json
 delete mode 100644 channels/porn/camwhoresbay.py
 delete mode 100644 channels/porn/canalporno.json
 delete mode 100644 channels/porn/canalporno.py
 delete mode 100644 channels/porn/cat3plus.json
 delete mode 100644 channels/porn/cat3plus.py
 delete mode 100644 channels/porn/cinetemagay.json
 delete mode 100644 channels/porn/cinetemagay.py
 delete mode 100644 channels/porn/cliphunter.json
 delete mode 100644 channels/porn/cliphunter.py
 delete mode 100644 channels/porn/coomelonitas.json
 delete mode 100644 channels/porn/coomelonitas.py
 delete mode 100644 channels/porn/cumlouder.json
 delete mode 100644 channels/porn/cumlouder.py
 delete mode 100644 channels/porn/czechvideo.json
 delete mode 100644 channels/porn/czechvideo.py
 delete mode 100644 channels/porn/datoporn.json
 delete mode 100644 channels/porn/datoporn.py
 delete mode 100644 channels/porn/elreyx.json
 delete mode 100644 channels/porn/elreyx.py
 delete mode 100644 channels/porn/eporner.json
 delete mode 100644 channels/porn/eporner.py
 delete mode 100644 channels/porn/eroticage.json
 delete mode 100644 channels/porn/eroticage.py
 delete mode 100644 channels/porn/eroticasonlinetv.json
 delete mode 100644 channels/porn/eroticasonlinetv.py
 delete mode 100644 channels/porn/erotik.json
 delete mode 100644 channels/porn/erotik.py
 delete mode 100644 channels/porn/fapality.json
 delete mode 100644 channels/porn/fapality.py
 delete mode 100644 channels/porn/fetishshrine.json
 delete mode 100644 channels/porn/fetishshrine.py
 delete mode 100644 channels/porn/filmoviXXX.json
 delete mode 100644 channels/porn/filmoviXXX.py
 delete mode 100644 channels/porn/filmpornoita.json
 delete mode 100644 channels/porn/filmpornoita.py
 delete mode 100644 channels/porn/foxtube.json
 delete mode 100644 channels/porn/foxtube.py
 delete mode 100644 channels/porn/freeporn.json
 delete mode 100644 channels/porn/freeporn.py
 delete mode 100644 channels/porn/freepornstreams.json
 delete mode 100644 channels/porn/freepornstreams.py
 delete mode 100755 channels/porn/gotporn.json
 delete mode 100755 channels/porn/gotporn.py
 delete mode 100644 channels/porn/hclips.json
 delete mode 100644 channels/porn/hclips.py
 delete mode 100644 channels/porn/hdzog.json
 delete mode 100644 channels/porn/hdzog.py
 delete mode 100644 channels/porn/hellporno.json
 delete mode 100644 channels/porn/hellporno.py
 delete mode 100644 channels/porn/hentaiid.json
 delete mode 100644 channels/porn/hentaiid.py
 delete mode 100644 channels/porn/hotmovs.json
 delete mode 100644 channels/porn/hotmovs.py
 delete mode 100644 channels/porn/javlin.json
 delete mode 100644 channels/porn/javlin.py
 delete mode 100644 channels/porn/javtasty.json
 delete mode 100644 channels/porn/javtasty.py
 delete mode 100644 channels/porn/javus.json
 delete mode 100644 channels/porn/javus.py
 delete mode 100644 channels/porn/javwhores.json
 delete mode 100644 channels/porn/javwhores.py
 delete mode 100644 channels/porn/jizzbunker.json
 delete mode 100644 channels/porn/jizzbunker.py
 delete mode 100644 channels/porn/justporn.json
 delete mode 100644 channels/porn/justporn.py
 delete mode 100755 channels/porn/kingsizetits.json
 delete mode 100755 channels/porn/kingsizetits.py
 delete mode 100755 channels/porn/mangovideo.json
 delete mode 100755 channels/porn/mangovideo.py
 delete mode 100644 channels/porn/mporno.json
 delete mode 100644 channels/porn/mporno.py
 delete mode 100644 channels/porn/muchoporno.json
 delete mode 100644 channels/porn/muchoporno.py
 delete mode 100644 channels/porn/nuvid.json
 delete mode 100644 channels/porn/nuvid.py
 delete mode 100644 channels/porn/pandamovie.json
 delete mode 100644 channels/porn/pandamovie.py
 delete mode 100644 channels/porn/peliculaseroticas.json
 delete mode 100644 channels/porn/peliculaseroticas.py
 delete mode 100644 channels/porn/pelisxporno.json
 delete mode 100644 channels/porn/pelisxporno.py
 delete mode 100644 channels/porn/perfectgirls.json
 delete mode 100644 channels/porn/perfectgirls.py
 delete mode 100644 channels/porn/playpornx.json
 delete mode 100644 channels/porn/playpornx.py
 delete mode 100644 channels/porn/porn300.json
 delete mode 100644 channels/porn/porn300.py
 delete mode 100644 channels/porn/pornboss.json
 delete mode 100644 channels/porn/pornboss.py
 delete mode 100755 channels/porn/porndish.json
 delete mode 100755 channels/porn/porndish.py
 delete mode 100644 channels/porn/porneq.json
 delete mode 100644 channels/porn/porneq.py
 delete mode 100644 channels/porn/pornhive.json
 delete mode 100644 channels/porn/pornhive.py
 delete mode 100644 channels/porn/pornhub.json
 delete mode 100644 channels/porn/pornhub.py
 delete mode 100755 channels/porn/pornohdmega.json
 delete mode 100755 channels/porn/pornohdmega.py
 delete mode 100644 channels/porn/pornrewind.json
 delete mode 100644 channels/porn/pornrewind.py
 delete mode 100644 channels/porn/porntrex.json
 delete mode 100644 channels/porn/porntrex.py
 delete mode 100755 channels/porn/porntv.json
 delete mode 100755 channels/porn/porntv.py
 delete mode 100644 channels/porn/qwertty.json
 delete mode 100644 channels/porn/qwertty.py
 delete mode 100644 channels/porn/redtube.json
 delete mode 100644 channels/porn/redtube.py
 delete mode 100644 channels/porn/serviporno.json
 delete mode 100644 channels/porn/serviporno.py
 delete mode 100644 channels/porn/sexgalaxy.json
 delete mode 100644 channels/porn/sexgalaxy.py
 delete mode 100644 channels/porn/sexkino.json
 delete mode 100644 channels/porn/sexkino.py
 delete mode 100644 channels/porn/sexofilm.json
 delete mode 100644 channels/porn/sexofilm.py
 delete mode 100755 channels/porn/shameless.json
 delete mode 100755 channels/porn/shameless.py
 delete mode 100644 channels/porn/siska.json
 delete mode 100644 channels/porn/siska.py
 delete mode 100644 channels/porn/sleazemovies.json
 delete mode 100644 channels/porn/sleazemovies.py
 delete mode 100644 channels/porn/spankbang.json
 delete mode 100644 channels/porn/spankbang.py
 delete mode 100644 channels/porn/spankwire.json
 delete mode 100644 channels/porn/spankwire.py
 delete mode 100644 channels/porn/streamingporn.json
 delete mode 100644 channels/porn/streamingporn.py
 delete mode 100644 channels/porn/streamporno.json
 delete mode 100644 channels/porn/streamporno.py
 delete mode 100644 channels/porn/submityouflicks.json
 delete mode 100644 channels/porn/submityouflicks.py
 delete mode 100644 channels/porn/sunporno.json
 delete mode 100644 channels/porn/sunporno.py
 delete mode 100755 channels/porn/sxyprn.json
 delete mode 100755 channels/porn/sxyprn.py
 delete mode 100644 channels/porn/tabooshare.json
 delete mode 100644 channels/porn/tabooshare.py
 delete mode 100644 channels/porn/thumbzilla.json
 delete mode 100644 channels/porn/thumbzilla.py
 delete mode 100755 channels/porn/titsbox.json
 delete mode 100755 channels/porn/titsbox.py
 delete mode 100644 channels/porn/tnaflix.json
 delete mode 100644 channels/porn/tnaflix.py
 delete mode 100644 channels/porn/tryboobs.json
 delete mode 100644 channels/porn/tryboobs.py
 delete mode 100644 channels/porn/tubedupe.json
 delete mode 100644 channels/porn/tubedupe.py
 delete mode 100644 channels/porn/tubehentai.json
 delete mode 100644 channels/porn/tubehentai.py
 delete mode 100644 channels/porn/videosXYZ.json
 delete mode 100644 channels/porn/videosXYZ.py
 delete mode 100644 channels/porn/vidz7.json
 delete mode 100644 channels/porn/vidz7.py
 delete mode 100644 channels/porn/vintagetube.json
 delete mode 100644 channels/porn/vintagetube.py
 delete mode 100644 channels/porn/vintagexxxsex.json
 delete mode 100644 channels/porn/vintagexxxsex.py
 delete mode 100755 channels/porn/vivud.json
 delete mode 100755 channels/porn/vivud.py
 delete mode 100644 channels/porn/vporn.json
 delete mode 100644 channels/porn/vporn.py
 delete mode 100644 channels/porn/watchpornfree.json
 delete mode 100644 channels/porn/watchpornfree.py
 delete mode 100644 channels/porn/webpeliculasporno.json
 delete mode 100644 channels/porn/webpeliculasporno.py
 delete mode 100644 channels/porn/woodrocket.json
 delete mode 100644 channels/porn/woodrocket.py
 delete mode 100644 channels/porn/x18hentai.json
 delete mode 100644 channels/porn/x18hentai.py
 delete mode 100644 channels/porn/xhamster.json
 delete mode 100644 channels/porn/xhamster.py
 delete mode 100644 channels/porn/xms.json
 delete mode 100644 channels/porn/xms.py
 delete mode 100644 channels/porn/xozilla.json
 delete mode 100644 channels/porn/xozilla.py
 delete mode 100644 channels/porn/xtapes.json
 delete mode 100644 channels/porn/xtapes.py
 delete mode 100755 channels/porn/xvideos.json
 delete mode 100755 channels/porn/xvideos.py
 delete mode 100644 channels/porn/xxxdan.json
 delete mode 100644 channels/porn/xxxdan.py
 delete mode 100644 channels/porn/xxxfreeinhd.json
 delete mode 100644 channels/porn/xxxfreeinhd.py
 delete mode 100644 channels/porn/xxxparodyhd.json
 delete mode 100644 channels/porn/xxxparodyhd.py
 delete mode 100644 channels/porn/xxxstreams.json
 delete mode 100644 channels/porn/xxxstreams.py
 delete mode 100644 channels/porn/yespornplease.json
 delete mode 100644 channels/porn/yespornplease.py
 delete mode 100644 channels/porn/youjizz.json
 delete mode 100644 channels/porn/youjizz.py
 delete mode 100644 channels/porn/youporn.json
 delete mode 100644 channels/porn/youporn.py
 delete mode 100644 channels/porn/yuuk.json
 delete mode 100644 channels/porn/yuuk.py

diff --git a/channels/0example.json.txt b/channels/0example.json.txt
index 783193c6..1551727f 100644
--- a/channels/0example.json.txt
+++ b/channels/0example.json.txt
@@ -21,10 +21,9 @@ se vanno cancellati tutti deve rimanere la voce:
     "name": "Nome del canale visualizzato in KOD",
     "language": ["ita", "sub-ita"],
     "active": false,
-    "adult": false,
     "thumbnail": "",
     "banner": "",
-    "categories": ["movie", "tvshow", "anime", "vos", "documentary", "adult"],
+    "categories": ["movie", "tvshow", "anime", "vos", "documentary"],
     "not_active": ["include_in_newest"],
     "settings": [
 		{
diff --git a/channels/altadefinizione01.json b/channels/altadefinizione01.json
index f7589d50..3fc2ef26 100644
--- a/channels/altadefinizione01.json
+++ b/channels/altadefinizione01.json
@@ -3,7 +3,6 @@
     "name": "Altadefinizione01",
     "language": ["ita", "sub-ita"],
     "active": true,
-    "adult": false,
     "thumbnail": "altadefinizione01.png",
     "banner": "altadefinizione01.png",
     "categories": ["movie", "vos"],
diff --git a/channels/altadefinizione01_link.json b/channels/altadefinizione01_link.json
index fe102b43..56a48c4f 100644
--- a/channels/altadefinizione01_link.json
+++ b/channels/altadefinizione01_link.json
@@ -2,7 +2,6 @@
   "id": "altadefinizione01_link",
   "name": "Altadefinizione01 L",
   "active": true,
-  "adult": false,
   "language": ["ita","sub-ita"],
   "thumbnail": "altadefinizione01_L.png",
   "banner": "altadefinizione01_L.png",
diff --git a/channels/altadefinizioneclick.json b/channels/altadefinizioneclick.json
index 8ca67198..ec82baa7 100644
--- a/channels/altadefinizioneclick.json
+++ b/channels/altadefinizioneclick.json
@@ -2,7 +2,6 @@
     "id": "altadefinizioneclick",
     "name": "AltadefinizioneClick",
     "active": true,
-    "adult": false,
     "language": ["ita","sub-ita"],
     "thumbnail": "altadefinizioneclick.png",
     "bannermenu": "altadefinizioneciclk.png",
diff --git a/channels/animeforce.json b/channels/animeforce.json
index 386a6e61..95578357 100644
--- a/channels/animeforce.json
+++ b/channels/animeforce.json
@@ -3,7 +3,6 @@
 	"name": "AnimeForce",
 	"language": ["ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "animeforce.png",
 	"banner": "animeforce.png",
 	"categories": ["anime"],
diff --git a/channels/animeleggendari.json b/channels/animeleggendari.json
index 5fd0cf6b..74c686a5 100644
--- a/channels/animeleggendari.json
+++ b/channels/animeleggendari.json
@@ -2,7 +2,6 @@
     "id": "animeleggendari",
     "name": "AnimePerTutti",
     "active": true,
-    "adult": false,
     "language": ["ita", "sub-ita"],
     "thumbnail": "animepertutti.png",
     "bannermenu": "animepertutti.png",
diff --git a/channels/animesaturn.json b/channels/animesaturn.json
index e409d3c4..a3cdd28c 100644
--- a/channels/animesaturn.json
+++ b/channels/animesaturn.json
@@ -2,7 +2,6 @@
     "id": "animesaturn",
     "name": "AnimeSaturn",
     "active": true,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "animesaturn.png",
     "banner": "animesaturn.png",
diff --git a/channels/animespace.json b/channels/animespace.json
index 26fafae6..54a542ae 100644
--- a/channels/animespace.json
+++ b/channels/animespace.json
@@ -2,7 +2,6 @@
   "id": "animespace",
   "name": "AnimeSpace",
   "active": false,
-  "adult": false,
   "language": [],
   "thumbnail": "",
   "banner": "",
diff --git a/channels/animesubita.json b/channels/animesubita.json
index b1d695e1..b612eb16 100644
--- a/channels/animesubita.json
+++ b/channels/animesubita.json
@@ -2,7 +2,6 @@
     "id": "animesubita",
     "name": "AnimeSubIta",
     "active": true,
-    "adult": false,
     "language": ["sub-ita"],
     "thumbnail": "animesubita.png",
     "bannermenu": "animesubita.png",
diff --git a/channels/animetubeita.json b/channels/animetubeita.json
index afb108c2..1565e785 100644
--- a/channels/animetubeita.json
+++ b/channels/animetubeita.json
@@ -2,7 +2,6 @@
     "id": "animetubeita",
     "name": "AnimeTubeITA",
     "active": true,
-    "adult": false,
     "language": ["sub-ita"],
     "thumbnail": "animetubeita.png",
     "bannermenu": "animetubeita.png",
diff --git a/channels/animeunity.json b/channels/animeunity.json
index 99dc0fe0..22e0be35 100644
--- a/channels/animeunity.json
+++ b/channels/animeunity.json
@@ -2,7 +2,6 @@
   "id": "animeunity",
   "name": "AnimeUnity",
   "active": true,
-  "adult": false,
   "language": ["ita", "sub-ita"],
   "thumbnail": "animeunity.png",
   "banner": "animeunity.png",
diff --git a/channels/animeworld.json b/channels/animeworld.json
index 0aa9aa1d..964b9d3d 100644
--- a/channels/animeworld.json
+++ b/channels/animeworld.json
@@ -2,7 +2,6 @@
     "id": "animeworld",
     "name": "AnimeWorld",
     "active": true,
-    "adult": false,
     "language": ["ita", "sub-ita"],
     "thumbnail": "animeworld.png",
     "banner": "animeworld.png",
diff --git a/channels/casacinema.json b/channels/casacinema.json
index 4532df5d..b7d283bd 100644
--- a/channels/casacinema.json
+++ b/channels/casacinema.json
@@ -3,7 +3,6 @@
     "name": "Casacinema",
     "language": ["ita", "sub-ita"],
     "active": true,
-    "adult": false,
     "thumbnail": "casacinema.png",
     "banner": "casacinema.png",
     "categories": ["tvshow", "movie","vos"],
diff --git a/channels/casacinemaInfo.json b/channels/casacinemaInfo.json
index 0bb89bb4..f3953133 100644
--- a/channels/casacinemaInfo.json
+++ b/channels/casacinemaInfo.json
@@ -3,7 +3,6 @@
     "name": "La Casa del Cinema",
     "language": ["ita", "sub-ita"],
     "active": true,
-    "adult": false,
     "thumbnail": "casacinemainfo.png",
     "banner": "casacinemainfo.png",
     "categories": ["movie", "vos"],
diff --git a/channels/cb01anime.json b/channels/cb01anime.json
index 24fd0c8d..621c7c8a 100644
--- a/channels/cb01anime.json
+++ b/channels/cb01anime.json
@@ -3,7 +3,6 @@
 	"name": "Cb01anime",
 	"language": ["ita", "vos", "sub-ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "cb01anime.png",
 	"banner": "cb01anime.png",
 	"categories": ["anime"],
diff --git a/channels/cineblog01.json b/channels/cineblog01.json
index 82faafe3..c97e7d66 100644
--- a/channels/cineblog01.json
+++ b/channels/cineblog01.json
@@ -3,7 +3,6 @@
 	"name": "CB01",
 	"language": ["ita", "sub-ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "cb01.png",
 	"banner": "cb01.png",
 	"categories": ["tvshow", "movie", "vos", "documentary"],
diff --git a/channels/cinemalibero.json b/channels/cinemalibero.json
index 72ca5d06..c64c78a3 100644
--- a/channels/cinemalibero.json
+++ b/channels/cinemalibero.json
@@ -3,7 +3,6 @@
 	"name": "Cinemalibero",
 	"language": ["ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "cinemalibero.png",
 	"banner": "cinemalibero.png",
 	"categories": ["movie","tvshow"],
diff --git a/channels/cinetecadibologna.json b/channels/cinetecadibologna.json
index d398eb63..fd556a17 100644
--- a/channels/cinetecadibologna.json
+++ b/channels/cinetecadibologna.json
@@ -3,7 +3,6 @@
 	"name": "Cineteca di Bologna",
 	"language": ["ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "cinetecadibologna.png",
 	"banner": "cinetecadibologna.png",
 	"categories": ["documentary"],
diff --git a/channels/dreamsub.json b/channels/dreamsub.json
index d0d39ea9..578ab806 100644
--- a/channels/dreamsub.json
+++ b/channels/dreamsub.json
@@ -3,7 +3,6 @@
     "name": "DreamSub",
     "language": ["ita", "sub-ita"],
     "active": true,
-    "adult": false,
     "thumbnail": "dreamsub.png",
     "banner": "dreamsub.png",
     "categories": ["anime", "vos"],
diff --git a/channels/dsda.json b/channels/dsda.json
index f6d4adf6..4ec18a80 100644
--- a/channels/dsda.json
+++ b/channels/dsda.json
@@ -3,7 +3,6 @@
 	"name": "D.S.D.A",
 	"language": ["ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "dsda.png",
 	"banner": "dsda.png",
 	"categories": ["documentary"],
diff --git a/channels/eurostreaming.json b/channels/eurostreaming.json
index 88d7d021..79a3eb99 100644
--- a/channels/eurostreaming.json
+++ b/channels/eurostreaming.json
@@ -2,7 +2,6 @@
     "id": "eurostreaming",
     "name": "Eurostreaming",
     "active": true,
-    "adult": false,
     "language": ["ita","sub-ita"],
     "thumbnail": "eurostreaming.png",
     "banner": "eurostreaming.png",
diff --git a/channels/fastsubita.json b/channels/fastsubita.json
index 3feb7834..c77eaa54 100644
--- a/channels/fastsubita.json
+++ b/channels/fastsubita.json
@@ -3,7 +3,6 @@
     "name": "Fastsubita",
     "language": ["sub-ita"],
     "active": true,
-    "adult": false,
     "thumbnail": "fastsubita.png",
     "banner": "fastsubita.png",
     "categories": ["tvshow", "vos"],
diff --git a/channels/filmigratis.json b/channels/filmigratis.json
index 46290f5b..6a970b15 100644
--- a/channels/filmigratis.json
+++ b/channels/filmigratis.json
@@ -2,7 +2,6 @@
   "id": "filmigratis",
   "name": "Filmi Gratis",
   "active": true,
-  "adult": false,
   "language": ["ita", "sub-ita"],
   "thumbnail": "filmigratis.png",
   "banner": "filmigratis.png",
diff --git a/channels/filmpertutti.json b/channels/filmpertutti.json
index 65179cbe..0130b04a 100644
--- a/channels/filmpertutti.json
+++ b/channels/filmpertutti.json
@@ -2,7 +2,6 @@
   "id": "filmpertutti",
   "name": "Filmpertutti",
   "active": true,
-  "adult": false,
   "language": ["ita", "sub-ita"],
   "thumbnail": "filmpertutti.png",
   "banner": "filmpertutti.png",
diff --git a/channels/filmsenzalimiticc.json b/channels/filmsenzalimiticc.json
index 81f21615..04636231 100644
--- a/channels/filmsenzalimiticc.json
+++ b/channels/filmsenzalimiticc.json
@@ -2,7 +2,6 @@
     "id": "filmsenzalimiticc",
     "name": "Filmsenzalimiti CC",
     "active": false,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "filmsenzalimiticc.png",
     "banner": "",
diff --git a/channels/guardaserieclick.json b/channels/guardaserieclick.json
index 2593ae40..056097f1 100644
--- a/channels/guardaserieclick.json
+++ b/channels/guardaserieclick.json
@@ -2,7 +2,6 @@
     "id": "guardaserieclick",
     "name": "GuardaSerie.click",
     "active": true,
-    "adult": false,
     "language": ["ita", "vos"],
     "thumbnail": "guardaserieclick.png",
     "bannermenu": "guardaserieclick.png",
diff --git a/channels/hd4me.json b/channels/hd4me.json
index 04465df9..e85964a0 100644
--- a/channels/hd4me.json
+++ b/channels/hd4me.json
@@ -3,7 +3,6 @@
     "name": "HD4ME",
     "language": ["ita", "sub-ita"],
     "active": true,
-    "adult": false,
     "thumbnail": "hd4me.png",
     "banner": "hd4me.png",
     "categories": ["movie", "vos"],
diff --git a/channels/ilcorsaronero.json b/channels/ilcorsaronero.json
index eb86a124..129bdc68 100644
--- a/channels/ilcorsaronero.json
+++ b/channels/ilcorsaronero.json
@@ -2,7 +2,6 @@
     "id": "ilcorsaronero",
     "name": "ilCorSaRoNeRo",
     "active": true,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "ilcorsaronero.png",
     "banner": "ilcorsaronero.png",
diff --git a/channels/ilgeniodellostreaming.json b/channels/ilgeniodellostreaming.json
index 960aaabe..61bc398b 100644
--- a/channels/ilgeniodellostreaming.json
+++ b/channels/ilgeniodellostreaming.json
@@ -2,7 +2,6 @@
     "id": "ilgeniodellostreaming",
     "name": "IlGenioDelloStreaming",
     "active": true,
-    "adult": false,
     "language": ["ita", "sub-ita"],
     "thumbnail": "ilgeniodellostreaming.png",
     "banner": "ilgeniodellostreaming.png",
diff --git a/channels/italiaserie.json b/channels/italiaserie.json
index a8d184b6..ad1b8c42 100644
--- a/channels/italiaserie.json
+++ b/channels/italiaserie.json
@@ -2,7 +2,6 @@
     "id": "italiaserie",
     "name": "Italia Serie",
     "active": true,
-    "adult": false,
     "language": ["ita","sub-ita"],
     "thumbnail": "italiaserie.png",
     "bannermenu": "italiaserie.png",
diff --git a/channels/metalvideo.json b/channels/metalvideo.json
index e18004c7..bb2e792a 100644
--- a/channels/metalvideo.json
+++ b/channels/metalvideo.json
@@ -2,7 +2,6 @@
   "id": "metalvideo",
   "name": "Metal Video",
   "active": true,
-  "adult": false,
   "language": ["*"],
   "thumbnail": "metalvideo.png",
   "banner": "metalvideo.png",
diff --git a/channels/mondoserietv.json b/channels/mondoserietv.json
index 3bd6ab63..9a7b1e0b 100644
--- a/channels/mondoserietv.json
+++ b/channels/mondoserietv.json
@@ -2,7 +2,6 @@
     "id": "mondoserietv",
     "name": "MondoSerieTV",
     "active": true,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "mondoserietv.png",
     "bannermenu": "mondoserietv.png",
diff --git a/channels/netfreex.json b/channels/netfreex.json
index 775f3677..6c69f917 100644
--- a/channels/netfreex.json
+++ b/channels/netfreex.json
@@ -3,7 +3,6 @@
 	"name": "Netfreex",
 	"language": ["ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "netfreex.png",
 	"banner": "netfreex.png",
 	"categories": ["tvshow", "movie", "anime"],
diff --git a/channels/piratestreaming.json b/channels/piratestreaming.json
index b52b1c73..1f7ad819 100644
--- a/channels/piratestreaming.json
+++ b/channels/piratestreaming.json
@@ -2,7 +2,6 @@
     "id": "piratestreaming",
     "name": "Pirate Streaming",
     "active": true,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "piratestreaming.png",
     "bannermenu": "piratestreaming.png",
diff --git a/channels/polpotv.json b/channels/polpotv.json
index 26c0610a..d3c8d09a 100644
--- a/channels/polpotv.json
+++ b/channels/polpotv.json
@@ -3,7 +3,6 @@
 	"name": "PolpoTV",
 	"language": ["ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "polpotv.png",
 	"banner": "polpotv.png",
 	"categories": ["movie","tvshow"],
diff --git a/channels/porn/LIKUOO.json b/channels/porn/LIKUOO.json
deleted file mode 100644
index 593db20f..00000000
--- a/channels/porn/LIKUOO.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "LIKUOO",
-  "name": "LIKUOO",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://likuoo.video/files_static/images/logo.jpg",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  
-  ]
-}
-
diff --git a/channels/porn/LIKUOO.py b/channels/porn/LIKUOO.py
deleted file mode 100644
index a0038dc6..00000000
--- a/channels/porn/LIKUOO.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.likuoo.video'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Pornstar" , action="categorias", url=host + "/pornstars/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/all-channels/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="item_p">.*?<a href="([^"]+)" title="([^"]+)"><img src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        scrapedplot = ""
-        scrapedthumbnail = "https:" + scrapedthumbnail
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'...<a href="([^"]+)" class="next">&#187;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="item">.*?'
-    patron += '<a href="([^"]+)" title="(.*?)">.*?'
-    patron += 'src="(.*?)".*?'
-    patron += '<div class="runtime">(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        scrapedtime = scrapedtime.replace("m", ":").replace("s", " ")
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " +scrapedtitle
-        contentTitle = title
-        thumbnail = "https:" + scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'...<a href="([^"]+)" class="next">&#187;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = 'url:\'([^\']+)\'.*?'
-    patron += 'data:\'([^\']+)\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl,post in matches:
-        post = post.replace("%3D", "=")
-        scrapedurl = host + scrapedurl
-        logger.debug( item.url +" , "+ scrapedurl +" , " +post )
-        datas = httptools.downloadpage(scrapedurl, post=post, headers={'Referer':item.url}).data
-        datas = datas.replace("\\", "")
-        url = scrapertools.find_single_match(datas, '<iframe src="([^"]+)"')
-        itemlist.append( Item(channel=item.channel, action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/porn/TXXX.json b/channels/porn/TXXX.json
deleted file mode 100644
index ee4be410..00000000
--- a/channels/porn/TXXX.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "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/channels/porn/TXXX.py b/channels/porn/TXXX.py
deleted file mode 100644
index 32a360b2..00000000
--- a/channels/porn/TXXX.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://www.txxx.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimas" , action="lista", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels-list/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/s=%s" % texto
-    try:
-        return lista(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">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span>(.*?)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,num in matches:
-        scrapedplot = ""
-        scrapedurl = host + scrapedurl
-        title = scrapedtitle + "[COLOR yellow]  " + num + "[/COLOR]"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title , url=scrapedurl , 
-                        thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next" href="([^"]+)" title="Next Page"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , 
-                        text_color="blue", url=next_page) )
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a class="categories-list__link" href="([^"]+)">.*?'
-    patron += '<span class="categories-list__name cat-icon" data-title="([^"]+)">.*?'
-    patron += '<span class="categories-list__badge">(.*?)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,num in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        scrapedthumbnail = ""
-        scrapedplot = ""
-        title = scrapedtitle + "[COLOR yellow]  " + num + "[/COLOR]"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title , url=url , 
-                        thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = 'data-video-id="\d+">.*?<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)".*?'
-    patron += '</div>(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
-        contentTitle = scrapedtitle
-        scrapedhd = scrapertools.find_single_match(scrapedtime, '<span class="thumb__hd">(.*?)</span>')
-        duration = scrapertools.find_single_match(scrapedtime, '<span class="thumb__duration">(.*?)</span>')
-        if scrapedhd != '':
-            title = "[COLOR yellow]" +duration+ "[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
-        else:
-            title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, 
-                        plot=plot, contentTitle=title) )
-    next_page = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next.*?" href="([^"]+)" title="Next Page"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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/channels/porn/__init__.py b/channels/porn/__init__.py
deleted file mode 100644
index 0b95a268..00000000
--- a/channels/porn/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import sys
-
-# Appends the main plugin dir to the PYTHONPATH if an internal package cannot be imported.
-# Examples: In Plex Media Server all modules are under "Code.*" package, and in Enigma2 under "Plugins.Extensions.*"
-try:
-    # from core import logger
-    import core
-except:
-    sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir)))
diff --git a/channels/porn/absoluporn.json b/channels/porn/absoluporn.json
deleted file mode 100644
index b3234d03..00000000
--- a/channels/porn/absoluporn.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "absoluporn",
-  "name": "absoluporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.absoluporn.es/image/deco/logo.gif",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/absoluporn.py b/channels/porn/absoluporn.py
deleted file mode 100644
index 32abc69c..00000000
--- a/channels/porn/absoluporn.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://www.absoluporn.es'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/wall-date-1.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas valorados" , action="lista", url=host + "/wall-note-1.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/wall-main-1.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas largos" , action="lista", url=host + "/wall-time-1.html"))
-
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search-%s-1.html" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '&nbsp;<a href="([^"]+)" class="link1">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedurl = scrapedurl.replace(".html", "_date.html")
-        scrapedurl = host +"/" + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div class="thumb-main-titre"><a href="([^"]+)".*?'
-    patron += 'title="([^"]+)".*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<div class="time">(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                              fanart=thumbnail, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<span class="text16">\d+</span> <a href="..([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = 'servervideo = \'([^\']+)\'.*?'
-    patron += 'path = \'([^\']+)\'.*?'
-    patron += 'filee = \'([^\']+)\'.*?'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for servervideo,path,filee  in matches:
-        scrapedurl = servervideo + path + "56ea912c4df934c216c352fa8d623af3" + filee
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
-                            thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/alsoporn.json b/channels/porn/alsoporn.json
deleted file mode 100644
index 25501c10..00000000
--- a/channels/porn/alsoporn.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "alsoporn",
-  "name": "alsoporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://alsoporn.com/images/alsoporn.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/porn/alsoporn.py b/channels/porn/alsoporn.py
deleted file mode 100644
index 5433405d..00000000
--- a/channels/porn/alsoporn.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-import base64
-
-host = 'http://www.alsoporn.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    # itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/en/g/All/new/1"))
-    itemlist.append( Item(channel=item.channel, title="Top" , action="lista", url=host + "/g/All/top/1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/=%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a href="([^"]+)">.*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)" />'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl, 
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return sorted(itemlist, key=lambda i: i.title)
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="alsoporn_prev">.*?'
-    patron += '<a href="([^"]+)">.*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)">.*?'
-    patron += '<span>([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        if not "0:00" in scrapedtime:
-            itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                                  fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
-
-    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)" target="_self"><span class="alsoporn_page">NEXT</span></a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data,'<iframe frameborder=0 scrolling="no"  src=\'([^\']+)\'')
-    data = httptools.downloadpage(scrapedurl).data
-    scrapedurl1 = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
-    scrapedurl1 = scrapedurl1.replace("//www.playercdn.com/ec/i2.php?url=", "")
-    scrapedurl1 = base64.b64decode(scrapedurl1 + "=")
-    logger.debug(scrapedurl1)
-    data = httptools.downloadpage(scrapedurl1).data
-    if "xvideos" in scrapedurl1:
-        scrapedurl2 = scrapertools.find_single_match(data, 'html5player.setVideoHLS\(\'([^\']+)\'\)')
-    if "xhamster" in scrapedurl1:
-        scrapedurl2 = scrapertools.find_single_match(data, '"[0-9]+p":"([^"]+)"').replace("\\", "")
-
-    logger.debug(scrapedurl2)
-    itemlist.append(item.clone(action="play", title=item.title, url=scrapedurl2))
-    return itemlist
-
diff --git a/channels/porn/analdin.json b/channels/porn/analdin.json
deleted file mode 100644
index f465b719..00000000
--- a/channels/porn/analdin.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "analdin",
-  "name": "analdin",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.analdin.com/images/logo-retina.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/analdin.py b/channels/porn/analdin.py
deleted file mode 100644
index 65cb6793..00000000
--- a/channels/porn/analdin.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-
-host = 'https://www.analdin.com/es'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/más-reciente/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/más-visto/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/mejor-valorado/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categorías/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'<strong class="popup-title">Canales</strong>(.*?)<strong>Models</strong>')
-    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)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-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="([^"]+)">.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<div class="videos">([^"]+)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail,  thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return sorted(itemlist, key=lambda i: i.title)
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a class="popup-video-link" href="([^"]+)".*?'
-    patron += 'thumb="([^"]+)".*?'
-    patron += '<div class="duration">(.*?)</div>.*?'
-    patron += '<strong class="title">\s*([^"]+)</strong>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtime,scrapedtitle  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                              fanart=thumbnail, contentTitle = title))
-    next_page = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue",
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = 'video_url: \'([^\']+)\''
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl  in matches:
-        url = scrapedurl
-    itemlist.append(item.clone(action="play", title=url, url=url))
-    return itemlist
-
diff --git a/channels/porn/beeg.json b/channels/porn/beeg.json
deleted file mode 100755
index 01d595cb..00000000
--- a/channels/porn/beeg.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "beeg",
-  "name": "Beeg",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "beeg.png",
-  "banner": "beeg.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/porn/beeg.py b/channels/porn/beeg.py
deleted file mode 100755
index 3ce4c8f9..00000000
--- a/channels/porn/beeg.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-
-from core import jsontools as json
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-from core import httptools
-
-
-url_api = ""
-Host = "https://beeg.com"
-
-
-def get_api_url():
-    global url_api
-    data = httptools.downloadpage(Host).data
-    version = re.compile('var beeg_version = ([\d]+)').findall(data)[0]
-    url_api = Host + "/api/v6/" + version
-
-
-get_api_url()
-
-
-def mainlist(item):
-    logger.info()
-    get_api_url()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="videos", title="Útimos videos", url=url_api + "/index/main/0/pc",
-                         viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="canal", title="Canal",
-                        url=url_api + "/channels"))
-    itemlist.append(Item(channel=item.channel, action="listcategorias", title="Categorias",
-                         url=url_api + "/index/main/0/pc", extra="nonpopular"))
-    itemlist.append(
-        Item(channel=item.channel, action="search", title="Buscar"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = url_api + "/index/tag/0/pc?tag=%s" % (texto)
-    
-    try:
-        return videos(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-def videos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    JSONData = json.load(data)
-    for Video in JSONData["videos"]:
-        thumbnail = "http://img.beeg.com/236x177/" + str(Video["id"]) + ".jpg"
-        url= '%s/video/%s?v=2&s=%s&e=%s' % (url_api, Video['svid'], Video['start'], Video['end'])
-        title = Video["title"]
-        itemlist.append(
-            Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot="", show="",
-                 folder=True, contentType="movie"))
-    # Paginador
-    Actual = int(scrapertools.find_single_match(item.url, url_api + '/index/[^/]+/([0-9]+)/pc'))
-    if JSONData["pages"] - 1 > Actual:
-        scrapedurl = item.url.replace("/" + str(Actual) + "/", "/" + str(Actual + 1) + "/")
-        itemlist.append(
-            Item(channel=item.channel, action="videos", title="Página Siguiente", url=scrapedurl, thumbnail="",
-                 viewmode="movie"))
-    return itemlist
-
-
-def listcategorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    JSONData = json.load(data)
-    for Tag in JSONData["tags"]:
-        url = url_api + "/index/tag/0/pc?tag=" + Tag["tag"]
-        url = url.replace("%20", "-")
-        title = '%s (%s)' % (str(Tag["tag"]), str(Tag["videos"]))
-        itemlist.append(
-            Item(channel=item.channel, action="videos", title=title, url=url, viewmode="movie", type="item"))
-    return itemlist
-
-
-def canal(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    JSONData = json.load(data)
-    for Tag in JSONData["channels"]:
-        url = url_api + "/index/channel/0/pc?channel=" + Tag["channel"]
-        url = url.replace("%20", "-")
-        title = '%s (%s)' % (str(Tag["ps_name"]), str(Tag["videos"]))
-        itemlist.append(
-            Item(channel=item.channel, action="videos", title=title, url=url, viewmode="movie", type="item"))
-    return itemlist
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    JSONData = json.load(data)
-    for key in JSONData:
-        videourl = re.compile("([0-9]+p)", re.DOTALL).findall(key)
-        if videourl:
-            videourl = videourl[0]
-            if not JSONData[videourl] == None:
-                url = JSONData[videourl]
-                url = url.replace("{DATA_MARKERS}", "data=pc.ES")
-                if not url.startswith("https:"): url = "https:" + url
-                title = videourl
-                itemlist.append(["%s %s [directo]" % (title, url[-4:]), url])
-    itemlist.sort(key=lambda item: item[0])
-    return itemlist
-
diff --git a/channels/porn/bravoporn.json b/channels/porn/bravoporn.json
deleted file mode 100644
index 2ed81efb..00000000
--- a/channels/porn/bravoporn.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "bravoporn",
-  "name": "bravoporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.bravoporn.com/v/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/bravoporn.py b/channels/porn/bravoporn.py
deleted file mode 100644
index 740dd779..00000000
--- a/channels/porn/bravoporn.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://www.bravoporn.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host +"/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/c/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/s/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a href="([^"]+)" class="th">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span>([^"]+)</span>\s*(\d+) movies.*?</strong>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedthumbnail = "http:" + scrapedthumbnail
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/latest/"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class=".*?video_block"><a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?alt="([^"]+)".*?'
-    patron += '<span class="time">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        thumbnail = "https:" + scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next" title="Next">Next</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<source src="([^"]+)" type=\'video/mp4\' title="HQ" />'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl))
-    return itemlist
-
diff --git a/channels/porn/camwhoresbay.json b/channels/porn/camwhoresbay.json
deleted file mode 100644
index f57213ca..00000000
--- a/channels/porn/camwhoresbay.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "camwhoresbay",
-  "name": "camwhoresbay",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.camwhoresbay.com/images/porntrex.ico",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/camwhoresbay.py b/channels/porn/camwhoresbay.py
deleted file mode 100644
index 85ba0b04..00000000
--- a/channels/porn/camwhoresbay.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.camwhoresbay.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    item.url = "%s/search/%s/" % (host, texto.replace("+", "-"))
-    item.extra = texto
-    try:
-        return lista(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?'
-    patron  += '<img class="thumb" src="([^"]+)".*?'
-    patron  += '<div class="videos">([^"]+)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad  in matches:
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return sorted(itemlist, key=lambda i: i.title)
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="video-item   ">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)"  class="thumb">.*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<i class="fa fa-clock-o"></i>(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = "http:" + scrapedthumbnail + "|Referer=%s" % item.url
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                              contentTitle = scrapedtitle, fanart=thumbnail))
-    if item.extra:
-       next_page = scrapertools.find_single_match(data, '<li class="next">.*?from_videos\+from_albums:(\d+)')
-       if next_page:
-           if "from_videos=" in item.url:
-               next_page = re.sub(r'&from_videos=(\d+)', '&from_videos=%s' % next_page, item.url)
-           else:
-               next_page = "%s?mode=async&function=get_block&block_id=list_videos_videos_list_search_result" \
-                           "&q=%s&category_ids=&sort_by=post_date&from_videos=%s" % (item.url, item.extra, next_page)
-           itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    else:
-        next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-        if next_page and not next_page.startswith("#"):
-            next_page = urlparse.urljoin(item.url,next_page)
-            itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-        else:
-            next_page = scrapertools.find_single_match(data, '<li class="next">.*?from:(\d+)')
-            if next_page:
-                if "from" in item.url:
-                    next_page = re.sub(r'&from=(\d+)', '&from=%s' % next_page, item.url)
-                else:
-                    next_page = "%s?mode=async&function=get_block&block_id=list_videos_common_videos_list&sort_by=post_date&from=%s" % (
-                         item.url, next_page)
-                itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data, 'video_alt_url3: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_alt_url2: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_alt_url: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_url: \'([^\']+)\'')
-
-    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, url=scrapedurl,
-                        thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo"))
-    return itemlist
-
-
diff --git a/channels/porn/canalporno.json b/channels/porn/canalporno.json
deleted file mode 100644
index 9d6913b7..00000000
--- a/channels/porn/canalporno.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "canalporno",
-  "name": "Canalporno",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://i.imgur.com/gAbPcvT.png?1",
-  "banner": "canalporno.png",
-  "categories": [
-    "adult"
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/canalporno.py b/channels/porn/canalporno.py
deleted file mode 100644
index 58051909..00000000
--- a/channels/porn/canalporno.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-import urlparse,re
-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-host = "http://www.canalporno.com"
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(item.clone(action="lista", title="Útimos videos", url=host + "/ajax/homepage/?page=1"))
-    itemlist.append(item.clone(action="categorias", title="Canal", url=host + "/ajax/list_producers/?page=1"))
-    itemlist.append(item.clone(action="categorias", title="PornStar", url=host + "/ajax/list_pornstars/?page=1"))
-    itemlist.append(item.clone(action="categorias", title="Categorias",
-                               url=host + "/categorias"))
-    itemlist.append(item.clone(action="search", title="Buscar"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/ajax/new_search/?q=%s&page=1" % texto
-    try:
-        return lista(item)
-    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 "pornstars" in item.url:
-        patron = '<div class="muestra.*?href="([^"]+)".*?src=\'([^\']+)\'.*?alt="([^"]+)".*?'
-    else:
-        patron = '<div class="muestra.*?href="([^"]+)".*?src="([^"]+)".*?alt="([^"]+)".*?'
-    if "Categorias" in item.title:
-        patron += '<div class="numero">([^<]+)</div>'
-    else:
-        patron += '</span> (\d+) vídeos</div>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url, scrapedthumbnail, scrapedtitle, cantidad in matches:
-        title= "%s [COLOR yellow] %s [/COLOR]" % (scrapedtitle, cantidad) 
-        url= url.replace("/videos-porno/", "/ajax/show_category/").replace("/sitio/", "/ajax/show_producer/").replace("/pornstar/", "/ajax/show_pornstar/")
-        url = host + url + "?page=1"
-        itemlist.append(item.clone(action="lista", title=title, url=url, thumbnail=scrapedthumbnail))
-    if "/?page=" in item.url:
-        next_page=item.url
-        num= int(scrapertools.find_single_match(item.url,".*?/?page=(\d+)"))
-        num += 1
-        next_page = "?page=" + str(num)
-        if next_page!="":
-            next_page = urlparse.urljoin(item.url,next_page)
-            itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = 'data-src="([^"]+)" alt="([^"]+)".*?<h2><a href="([^"]+)">.*?' \
-             '<div class="duracion"><span class="ico-duracion sprite"></span> ([^"]+) min</div>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedthumbnail, scrapedtitle, scrapedurl, duration in matches:
-        title = "[COLOR yellow] %s  [/COLOR] %s" % (duration, scrapedtitle)
-        url = host + scrapedurl
-        itemlist.append(item.clone(action="play", title=title, url=url, thumbnail=scrapedthumbnail))
-    last=scrapertools.find_single_match(item.url,'(.*?)page=\d+')
-    num= int(scrapertools.find_single_match(item.url,".*?/?page=(\d+)"))
-    num += 1
-    next_page = "page=" + str(num)
-    if next_page!="":
-        next_page = last + next_page
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, '<source src="([^"]+)"')
-    itemlist.append(item.clone(url=url, server="directo"))
-    return itemlist
diff --git a/channels/porn/cat3plus.json b/channels/porn/cat3plus.json
deleted file mode 100644
index ada3335f..00000000
--- a/channels/porn/cat3plus.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "cat3plus",
-  "name": "Cat3plus",
-  "active": true,
-  "adult": true,
-  "language": [],
-  "thumbnail": "https://i.imgur.com/SJxXKa2.png",
-  "fanart": "https://i.imgur.com/ejCwTxT.jpg",
-  "banner": "https://i.imgur.com/bXUyk6m.png",
-  "categories": [
-    "movie",
-    "vos"
-  ]
-}
diff --git a/channels/porn/cat3plus.py b/channels/porn/cat3plus.py
deleted file mode 100644
index ea0a7234..00000000
--- a/channels/porn/cat3plus.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- Channel SleazeMovies -*-
-# -*- Created for Alfa-addon -*-
-# -*- By Sculkurt -*-
-
-
-import re
-import urllib
-import urlparse
-from channelselector import get_thumb
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import tmdb
-from core.item import Item
-from platformcode import config, logger
-
-host = 'http://www.cat3plus.com/'
-
-headers = [
-    ['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0'],
-    ['Accept-Encoding', 'gzip, deflate'],
-    ['Referer', host]
-]
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = list()
-    itemlist.append(item.clone(title="Todas", action="list_all", url=host, thumbnail=get_thumb('all', auto=True)))
-    itemlist.append(item.clone(title="Años", action="years", url=host, thumbnail=get_thumb('year', auto=True)))
-    itemlist.append(item.clone(title="Buscar", action="search", thumbnail=get_thumb('search', auto=True)))
-
-    return itemlist
-
-def years(item):
-    logger.info()
-    itemlist = list()
-    data = httptools.downloadpage(item.url, cookies=False).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    patron = "<a dir='ltr' href='([^']+)'>([^<]+)</a>"
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle in matches:
-        itemlist.append(item.clone(action='list_all', title=scrapedtitle, url=scrapedurl))
-    return itemlist
-
-def get_source(url):
-    logger.info()
-    data = httptools.downloadpage(url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    return data
-
-
-def list_all(item):
-    logger.info()
-    itemlist = []
-    data = get_source(item.url)
-
-    patron = "<h2 class='post-title entry-title'><a href='([^']+)'>([^(]+).*?\(([^)]+).*?"
-    patron += 'src="([^"]+).*?'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle, year, img in matches:
-        itemlist.append(Item(channel = item.channel,
-                             title = scrapedtitle, 
-                             url = scrapedurl, 
-                             action = "findvideos",
-                             thumbnail = img,
-                             contentTitle = scrapedtitle,
-                             contentType = "movie",
-                             infoLabels = {'year': year}))
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb = True)
-
-    # Extraer la marca de siguiente página
-    next_page = scrapertools.find_single_match(data, "<a class='blog-pager-older-link' href='([^']+)'")
-    if next_page != "":
-	itemlist.append(Item(channel=item.channel, action="list_all", title=">> Página siguiente", url=next_page, folder=True))
-	
-    return itemlist
-
-
-    
-def search(item, texto):
-    logger.info()
-    if texto != "":
-        texto = texto.replace(" ", "+")
-    item.url = host + "search?q=" + texto
-    item.extra = "busqueda"
-    try:
-        return list_all(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-         
-
-def findvideos(item):
-    logger.info()
-
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    
-    patron = '<h2>\s*<a href="([^"]+)" target="_blank">.*?</a></h2>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for url in matches:
-        data = httptools.downloadpage(url,	headers={'Referer': item.url}).data
-
-        itemlist.extend(servertools.find_video_items(data=data)) 
-
-    for video in itemlist: 
-
-        video.channel = item.channel
-        video.contentTitle = item.contentTitle
-        video.title = video.server.capitalize()
-
-	# Opción "Añadir esta pelicula a la videoteca"
-    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
-        itemlist.append(Item(channel = item.channel, 
-                             title = '[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
-                             url = item.url,
-                             action = "add_pelicula_to_library",
-                             extra = "findvideos",
-                             contentTitle = item.contentTitle,
-                             thumbnail = item.thumbnail
-                             ))
-
-    return itemlist
\ No newline at end of file
diff --git a/channels/porn/cinetemagay.json b/channels/porn/cinetemagay.json
deleted file mode 100644
index a94f5844..00000000
--- a/channels/porn/cinetemagay.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "cinetemagay",
-  "name": "Cinetemagay",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "cinetemagay.png",
-  "banner": "cinetemagay.png",
-  "categories": [
-    "adult"
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/cinetemagay.py b/channels/porn/cinetemagay.py
deleted file mode 100644
index ad5f5a6d..00000000
--- a/channels/porn/cinetemagay.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import re
-
-from core import scrapertools
-from core import servertools
-from core import httptools
-from core.item import Item
-from platformcode import config, logger
-
-IMAGES_PATH = os.path.join(config.get_runtime_path(), 'resources', 'images', 'cinetemagay')
-
-
-def strip_tags(value):
-    return re.sub(r'<[^>]*?>', '', value)
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="lista", title="Cine gay latinoamericano",
-                         url="http://cinegaylatinoamericano.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",
-                         thumbnail="http://www.americaeconomia.com/sites/default/files/imagecache/foto_nota/homosexual1.jpg"))
-    itemlist.append(Item(channel=item.channel, action="lista", title="Cine y cortos gay",
-                         url="http://cineycortosgay.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",
-                         thumbnail="http://www.elmolar.org/wp-content/uploads/2015/05/cortometraje.jpg"))
-    itemlist.append(Item(channel=item.channel, action="lista", title="Cine gay online (México)",
-                         url="http://cinegayonlinemexico.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",
-                         thumbnail="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTmmqL6tS2Ced1VoxlGQT0q-ibPEz1DCV3E1waHFDI5KT0pg1lJ"))
-    itemlist.append(Item(channel=item.channel, action="lista", title="Sentido gay",
-                         url="http://www.sentidogay.blogspot.com.es//feeds/posts/default/?max-results=100&start-index=1",
-                         thumbnail="http://1.bp.blogspot.com/-epOPgDD_MQw/VPGZGQOou1I/AAAAAAAAAkI/lC25GrukDuo/s1048/SentidoGay.jpg"))
-    itemlist.append(Item(channel=item.channel, action="lista", title="PGPA",
-                         url="http://pgpa.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",
-                         thumbnail="http://themes.googleusercontent.com/image?id=0BwVBOzw_-hbMNTRlZjk2YWMtYTVlMC00ZjZjLWI3OWEtMWEzZDEzYWVjZmQ4"))
-
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-
-    # Extrae las entradas (carpetas)
-    patronvideos = '&lt;img .*?src=&quot;(.*?)&quot;'
-    patronvideos += "(.*?)<link rel='alternate' type='text/html' href='([^']+)' title='([^']+)'.*?>"
-    matches = re.compile(patronvideos, re.DOTALL).findall(data)
-
-    for match in matches:
-        scrapedtitle = match[3]
-        scrapedtitle = scrapedtitle.replace("&apos;", "'")
-        scrapedtitle = scrapedtitle.replace("&quot;", "'")
-        scrapedtitle = scrapedtitle.replace("&amp;amp;", "'")
-        scrapedtitle = scrapedtitle.replace("&amp;#39;", "'")
-        scrapedurl = match[2]
-        scrapedthumbnail = match[0]
-        imagen = ""
-        scrapedplot = match[1]
-        tipo = match[1]
-        logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
-        scrapedplot = "<" + scrapedplot
-        scrapedplot = scrapedplot.replace("&gt;", ">")
-        scrapedplot = scrapedplot.replace("&lt;", "<")
-        scrapedplot = scrapedplot.replace("</div>", "\n")
-        scrapedplot = scrapedplot.replace("<br />", "\n")
-        scrapedplot = scrapedplot.replace("&amp;", "")
-        scrapedplot = scrapedplot.replace("nbsp;", "")
-        scrapedplot = strip_tags(scrapedplot)
-        itemlist.append(
-            Item(channel=item.channel, action="detail", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                 plot=scrapedurl + scrapedplot, folder=True))
-
-    variable = item.url.split("index=")[1]
-    variable = int(variable)
-    variable += 100
-    variable = str(variable)
-    variable_url = item.url.split("index=")[0]
-    url_nueva = variable_url + "index=" + variable
-    itemlist.append(
-        Item(channel=item.channel, action="lista", title="Ir a la página siguiente (desde " + variable + ")",
-             url=url_nueva, thumbnail="", plot="Pasar a la página siguiente (en grupos de 100)\n\n" + url_nueva))
-
-    return itemlist
-
-
-def detail(item):
-    logger.info()
-    itemlist = []
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-
-    data = data.replace("%3A", ":")
-    data = data.replace("%2F", "/")
-    data = data.replace("%3D", "=")
-    data = data.replace("%3", "?")
-    data = data.replace("%26", "&")
-    descripcion = ""
-    plot = ""
-    patrondescrip = 'SINOPSIS:(.*?)'
-    matches = re.compile(patrondescrip, re.DOTALL).findall(data)
-    if len(matches) > 0:
-        descripcion = matches[0]
-        descripcion = descripcion.replace("&nbsp;", "")
-        descripcion = descripcion.replace("<br/>", "")
-        descripcion = descripcion.replace("\r", "")
-        descripcion = descripcion.replace("\n", " ")
-        descripcion = descripcion.replace("\t", " ")
-        descripcion = re.sub("<[^>]+>", " ", descripcion)
-        descripcion = descripcion
-        try:
-            plot = unicode(descripcion, "utf-8").encode("iso-8859-1")
-        except:
-            plot = descripcion
-
-    # Busca los enlaces a los videos de  servidores
-    video_itemlist = servertools.find_video_items(data=data)
-    for video_item in video_itemlist:
-        itemlist.append(Item(channel=item.channel, action="play", server=video_item.server,
-                             title=item.title + "  " + video_item.title, url=video_item.url, thumbnail=item.thumbnail,
-                             plot=video_item.url, folder=False))
-
-    return itemlist
diff --git a/channels/porn/cliphunter.json b/channels/porn/cliphunter.json
deleted file mode 100644
index 98a6fe42..00000000
--- a/channels/porn/cliphunter.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "cliphunter",
-  "name": "cliphunter",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.cliphunter.com/gfx/new/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/cliphunter.py b/channels/porn/cliphunter.py
deleted file mode 100644
index 16f3d093..00000000
--- a/channels/porn/cliphunter.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-
-host = 'https://www.cliphunter.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/categories/All"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/popular/ratings/yesterday"))
-    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="catalogo", url=host + "/pornstars/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl) + "/movies"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="catalogo", title="Página Siguiente >>", text_color="blue",
-                               url=next_page) )
-    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="([^"]+)" title="([^"]+)">.*?<img src="([^"]+)"/>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<img class=".*?" src="([^"]+)".*?<div class="tr">(.*?)</div>.*?<a href="([^"]+)\s*" class="vttl.*?">(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedtime,scrapedurl,scrapedtitle  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                              fanart=thumbnail, contentTitle = title ))
-    next_page = scrapertools.find_single_match(data,'<li class="arrow"><a rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '"url"\:"(.*?)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        scrapedurl = scrapedurl.replace("\/", "/")
-        title = scrapedurl
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
-                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo"))
-    return itemlist
-
diff --git a/channels/porn/coomelonitas.json b/channels/porn/coomelonitas.json
deleted file mode 100644
index e20668d1..00000000
--- a/channels/porn/coomelonitas.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "coomelonitas",
-  "name": "Coomelonitas",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.coomelonitas.com/wp-content/themes/3xTheme/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/coomelonitas.py b/channels/porn/coomelonitas.py
deleted file mode 100644
index ae943a7d..00000000
--- a/channels/porn/coomelonitas.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host ='http://www.coomelonitas.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host+ "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<li class="cat-item cat-item-\d+"><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="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<div class="all"(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for match in matches:
-        title = scrapertools.find_single_match(match,'title="([^"]+)"')
-        url = scrapertools.find_single_match(match,'<a href="([^"]+)"')
-        plot = scrapertools.find_single_match(match,'<p class="summary">(.*?)</p>')
-        thumbnail = scrapertools.find_single_match(match,'<img src="([^"]+)"')
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=url,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, viewmode="movie") )
-    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="siguiente">')
-    if next_page!="":
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
diff --git a/channels/porn/cumlouder.json b/channels/porn/cumlouder.json
deleted file mode 100644
index 10bcc031..00000000
--- a/channels/porn/cumlouder.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "cumlouder",
-  "name": "Cumlouder",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "cumlouder.png",
-  "banner": "cumlouder.png",
-  "categories": [
-    "adult"
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/cumlouder.py b/channels/porn/cumlouder.py
deleted file mode 100644
index 4380a53a..00000000
--- a/channels/porn/cumlouder.py
+++ /dev/null
@@ -1,180 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import config, logger
-
-
-host = 'https://www.cumlouder.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    config.set_setting("url_error", False, "cumlouder")
-    itemlist.append(item.clone(title="Últimos videos", action="videos", url= host + "/porn/"))
-    itemlist.append(item.clone(title="Pornstars", action="pornstars_list", url=host + "/girls/"))
-    itemlist.append(item.clone(title="Listas", action="series", url= host + "/series/"))
-    itemlist.append(item.clone(title="Categorias", action="categorias", url= host + "/categories/"))
-    itemlist.append(item.clone(title="Buscar", action="search", url= host + "/search?q=%s"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    item.url = item.url % texto
-    item.action = "videos"
-    try:
-        return videos(item)
-    except:
-        import traceback
-        logger.error(traceback.format_exc())
-        return []
-
-
-def pornstars_list(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(item.clone(title="Mas Populares", action="pornstars", url=host + "/girls/1/"))
-    for letra in "abcdefghijklmnopqrstuvwxyz":
-        itemlist.append(item.clone(title=letra.upper(), url=urlparse.urljoin(item.url, letra), action="pornstars"))
-    return itemlist
-
-
-def pornstars(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a girl-url=.*?'
-    patron += 'href="([^"]+)" title="([^"]+)">.*?'
-    patron += 'data-lazy="([^"]+)".*?'
-    patron += '<span class="ico-videos sprite"></span>([^<]+)</span>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, thumbnail, count in matches:
-        if "go.php?" in url:
-            url = urllib.unquote(url.split("/go.php?u=")[1].split("&")[0])
-            thumbnail = urllib.unquote(thumbnail.split("/go.php?u=")[1].split("&")[0])
-        else:
-            url = urlparse.urljoin(item.url, url)
-            if not thumbnail.startswith("https"):
-                thumbnail = "https:%s" % thumbnail
-        itemlist.append(item.clone(title="%s (%s)" % (title, count), url=url, action="videos", fanart=thumbnail, thumbnail=thumbnail))
-    # Paginador
-    matches = re.compile('<li[^<]+<a href="([^"]+)" rel="nofollow">Next[^<]+</a[^<]+</li>', re.DOTALL).findall(data)
-    if matches:
-        if "go.php?" in matches[0]:
-            url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0])
-        else:
-            url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(item.clone(title="Página Siguiente >>", url=url))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    patron = '<a tag-url=.*?'
-    patron += 'href="([^"]+)" title="([^"]+)".*?'
-    patron += 'data-lazy="([^"]+)".*?'
-    patron += '<span class="cantidad">([^<]+)</span>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, thumbnail, count in matches:
-        if "go.php?" in url:
-            url = urllib.unquote(url.split("/go.php?u=")[1].split("&")[0])
-            thumbnail = urllib.unquote(thumbnail.split("/go.php?u=")[1].split("&")[0])
-        else:
-            url = urlparse.urljoin(item.url, url)
-            if not thumbnail.startswith("https"):
-                thumbnail = "https:%s" % thumbnail
-        itemlist.append(
-            item.clone(title="%s (%s videos)" % (title, count), url=url, action="videos", fanart=thumbnail, thumbnail=thumbnail))
-    # Paginador
-    matches = re.compile('<li[^<]+<a href="([^"]+)" rel="nofollow">Next[^<]+</a[^<]+</li>', re.DOTALL).findall(data)
-    if matches:
-        if "go.php?" in matches[0]:
-            url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0])
-        else:
-            url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(item.clone(title="Página Siguiente >>", url=url))
-    return itemlist
-
-
-def series(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    patron = '<a onclick=.*?href="([^"]+)".*?\<img src="([^"]+)".*?h2 itemprop="name">([^<]+).*?p>([^<]+)</p>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, thumbnail, title, count in matches:
-        itemlist.append(
-            item.clone(title="%s (%s) " % (title, count), url=urlparse.urljoin(item.url, url), action="videos", fanart=thumbnail, thumbnail=thumbnail))
-    # Paginador
-    matches = re.compile('<li[^<]+<a href="([^"]+)" rel="nofollow">Next[^<]+</a[^<]+</li>', re.DOTALL).findall(data)
-    if matches:
-        if "go.php?" in matches[0]:
-            url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0])
-        else:
-            url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(item.clone(title="Página Siguiente >>", url=url))
-    return itemlist
-
-
-def videos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a class="muestra-escena" href="([^"]+)" title="([^"]+)".*?'
-    patron += 'data-lazy="([^"]+)".*?'
-    patron += '<span class="ico-minutos sprite"></span>([^<]+)</span>(.*?)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, thumbnail, duration,calidad in matches:
-        if "hd sprite" in calidad:
-            title="[COLOR yellow] %s [/COLOR][COLOR red] HD [/COLOR] %s" % (duration,  title)
-        else:
-            title="[COLOR yellow] %s [/COLOR] %s" % (duration, title)
-        if "go.php?" in url:
-            url = urllib.unquote(url.split("/go.php?u=")[1].split("&")[0])
-            thumbnail = urllib.unquote(thumbnail.split("/go.php?u=")[1].split("&")[0])
-        else:
-            url = urlparse.urljoin(host, url)
-            if not thumbnail.startswith("https"):
-                thumbnail = "https:%s" % thumbnail
-        itemlist.append(item.clone(title=title, url=url,
-                                   action="play", thumbnail=thumbnail, contentThumbnail=thumbnail,
-                                   fanart=thumbnail, contentType="movie", contentTitle=title))
-    # Paginador
-    nextpage = scrapertools.find_single_match(data, '<ul class="paginador"(.*?)</ul>')
-    matches = re.compile('<a href="([^"]+)" rel="nofollow">Next »</a>', re.DOTALL).findall(nextpage)
-    if not matches:
-        matches = re.compile('<li[^<]+<a href="([^"]+)">Next »</a[^<]+</li>', re.DOTALL).findall(nextpage)
-    if matches:
-        if "go.php?" in matches[0]:
-            url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0])
-        else:
-            url = urlparse.urljoin(item.url, matches[0])
-        itemlist.append(item.clone(title="Página Siguiente >>", url=url))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<source src="([^"]+)" type=\'video/([^\']+)\' label=\'[^\']+\' res=\'([^\']+)\''
-    url, type, res = re.compile(patron, re.DOTALL).findall(data)[0]
-    if "go.php?" in url:
-        url = urllib.unquote(url.split("/go.php?u=")[1].split("&")[0])
-    elif not url.startswith("http"):
-        url = "https:" + url.replace("&amp;", "&")
-    itemlist.append(
-        Item(channel='cumlouder', action="play", title='Video' + res, contentTitle=type.upper() + ' ' + res, url=url,
-             server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/czechvideo.json b/channels/porn/czechvideo.json
deleted file mode 100644
index 84b1c775..00000000
--- a/channels/porn/czechvideo.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "czechvideo",
-  "name": "Czechvideo",
-  "active": false,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://czechvideo.org/templates/Default/images/black75.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/czechvideo.py b/channels/porn/czechvideo.py
deleted file mode 100644
index 23b444aa..00000000
--- a/channels/porn/czechvideo.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://czechvideo.org'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="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 + "/tags/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'<div class="category">(.*?)</ul>')
-    patron  = '<li><a href="(.*?)".*?>(.*?)</a></li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="short-story">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)"><img src="([^"]+)".*?'
-    patron += 'div class="short-time">(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        scrapedthumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<del><a href="([^"]+)">Next</a></del>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-
-    itemlist = servertools.find_video_items(data=data)
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.contentTitle = item.contentTitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-    return itemlist
-
diff --git a/channels/porn/datoporn.json b/channels/porn/datoporn.json
deleted file mode 100644
index 1a9f2211..00000000
--- a/channels/porn/datoporn.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "datoporn",
-  "name": "DatoPorn",
-  "language": ["*"],
-  "active": true,
-  "adult": true,
-  "thumbnail": "http://i.imgur.com/tBSWudd.png?1",
-  "banner": "datoporn.png",
-  "categories": [
-    "adult"
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/datoporn.py b/channels/porn/datoporn.py
deleted file mode 100644
index 243e4a8c..00000000
--- a/channels/porn/datoporn.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import httptools
-from core import scrapertools
-from platformcode import config, logger
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append(item.clone(action="categorias", title="Categorías", url="http://dato.porn/categories_all", contentType="movie", viewmode="movie"))
-    itemlist.append(item.clone(title="Buscar...", action="search", contentType="movie", viewmode="movie"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    item.url = "http://dato.porn/?k=%s&op=search" % texto.replace(" ", "+")
-    return lista(item)
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = re.sub(r"\n|\r|\t|\s{2}|(<!--.*?-->)", "", httptools.downloadpage(item.url).data)
-    patron = '<div class="videobox">\s*<a href="([^"]+)".*?'
-    patron += 'url\(\'([^\']+)\'.*?'
-    patron += '<span>(.*?)<\/span>.*?'
-    patron += 'class="title">(.*?)<\/a>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedthumbnail, duration, scrapedtitle in matches:
-        if "/embed-" not in scrapedurl:
-            scrapedurl = scrapedurl.replace("datoporn.co/", "datoporn.co/embed-") + ".html"
-        if not config.get_setting('unify'):
-            scrapedtitle = '[COLOR yellow] %s [/COLOR] %s' % (duration , scrapedtitle)
-        else:
-            scrapedtitle += ' gb'
-            scrapedtitle = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-            scrapedtitle = scrapedtitle.replace(":", "'")
-        # logger.debug(scrapedurl + ' / ' + scrapedthumbnail + ' / ' + duration + ' / ' + scrapedtitle)
-        itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, server="datoporn", 
-                                   fanart=scrapedthumbnail.replace("_t.jpg", ".jpg"), plot = ""))
-    next_page = scrapertools.find_single_match(data, '<a class=["|\']page-link["|\'] href=["|\']([^["|\']+)["|\']>Next')
-    if next_page and itemlist:
-        itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="vid_block">\s*<a href="([^"]+)".*?url\((.*?)\).*?<span>(.*?)</span>.*?<b>(.*?)</b>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedthumbnail, numero, scrapedtitle in matches:
-        if numero:
-            scrapedtitle = "%s  (%s)" % (scrapedtitle, numero)
-        itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail))
-    return itemlist
-
diff --git a/channels/porn/elreyx.json b/channels/porn/elreyx.json
deleted file mode 100644
index af3f59de..00000000
--- a/channels/porn/elreyx.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "elreyx",
-  "name": "elreyx",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.elreyx.com/template/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/elreyx.py b/channels/porn/elreyx.py
deleted file mode 100644
index 8f6a20a7..00000000
--- a/channels/porn/elreyx.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-from platformcode import config
-
-host = 'http://www.elreyx.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/peliculasporno.html") )
-    itemlist.append( Item(channel=item.channel, title="Escenas" , action="lista", url=host + "/index.html"))
-    itemlist.append( Item(channel=item.channel, title="Productora" , action="categorias", url=host + "/index.html") )
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/peliculasporno.html") )
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search") )
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search-%s" % texto + ".html"
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    if item.title == "Categorias" :
-        patron  = '<td><a href="([^<]+)" title="Movies ([^<]+)">.*?</a>'
-    else:
-        patron  = '<a href="([^<]+)" title="View Category ([^<]+)">.*?</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        url="https:" + scrapedurl
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    if not "/peliculasporno" in item.url:
-        patron  = '<div class="notice_image">.*?<a title="([^"]+)" href="([^"]+)">.*?<img src="(.*?)">'
-    else:
-        patron  = '<div class="captura"><a title="([^"]+)" href="([^"]+)".*?><img src="(.*?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedtitle,scrapedurl,scrapedthumbnail in matches:
-        scrapedplot = ""
-        url="https:" + scrapedurl
-        thumbnail="https:" + scrapedthumbnail
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li class="float-xs-right"><a href=\'([^\']+)\' title=\'Pagina \d+\'>')
-    if next_page == "":
-        next_page = scrapertools.find_single_match(data,'<li><a href=\'([^\']+)\' title=\'Pagina \d+\'>&raquo;</a>')
-    if next_page!= "":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, '<IFRAME SRC="(.*?)"')
-    if url == "":
-        url = scrapertools.find_single_match(data,'<iframe src="(.*?)"')
-    data = httptools.downloadpage(url).data
-    itemlist = servertools.find_video_items(data=data)
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-    return itemlist
-
diff --git a/channels/porn/eporner.json b/channels/porn/eporner.json
deleted file mode 100644
index 9bdf1de4..00000000
--- a/channels/porn/eporner.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "eporner",
-  "name": "Eporner",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "eporner.png",
-  "banner": "eporner.png",
-  "categories": [
-    "adult"
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/eporner.py b/channels/porn/eporner.py
deleted file mode 100644
index b82358c0..00000000
--- a/channels/porn/eporner.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-host = 'http://www.eporner.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(item.clone(title="Últimos videos", action="videos", url=host + "/0/"))
-    itemlist.append(item.clone(title="Más visto", action="videos", url=host + "/most-viewed/"))
-    itemlist.append(item.clone(title="Mejor valorado", action="videos", url=host + "/top-rated/"))
-    itemlist.append(item.clone(title="Categorias", action="categorias", url=host + "/categories/"))
-    itemlist.append(item.clone(title="Pornstars", action="pornstars", url=host + "/pornstars/"))
-    itemlist.append(item.clone(title="      Alfabetico", action="pornstars_list", url=host + "/pornstars/"))
-    itemlist.append(item.clone(title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "-")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return videos(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def pornstars_list(item):
-    logger.info()
-    itemlist = []
-    for letra in "ABCDEFGHIJKLMNOPQRSTUVWXYZ":
-        itemlist.append(item.clone(title=letra, url=urlparse.urljoin(item.url, letra), action="pornstars"))
-    return itemlist
-
-
-def pornstars(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="mbprofile">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<div class="mbtim"><span>Videos: </span>([^<]+)</div>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, thumbnail, count in matches:
-        itemlist.append(
-            item.clone(title="%s (%s videos)" % (title, count), url=urlparse.urljoin(item.url, url), action="videos",
-                       thumbnail=thumbnail))
-    # Paginador           
-    next_page = scrapertools.find_single_match(data,"<a href='([^']+)' class='nmnext' title='Next page'>")
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="pornstars", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<span class="addrem-cat">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron +='<div class="cllnumber">([^<]+)</div>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, cantidad in matches:
-        url = urlparse.urljoin(item.url, url)
-        title = title + " " + cantidad
-        thumbnail = ""
-        if not thumbnail:
-            thumbnail = scrapertools.find_single_match(data,'<img src="([^"]+)" alt="%s"> % title')
-        itemlist.append(item.clone(title=title, url=url, action="videos", thumbnail=thumbnail))
-    return sorted(itemlist, key=lambda i: i.title)
-
-
-def videos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="mvhdico"><span>([^<]+)</span>.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)" id="[^"]+">.*?'
-    patron += 'src="([^"]+)"[^>]+>.*?'
-    patron += '<div class="mbtim">([^<]+)</div>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for quality, url, title, thumbnail, duration in matches:
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + "[COLOR red]" + quality + "[/COLOR] " +title
-        itemlist.append(item.clone(title=title, url=urlparse.urljoin(item.url, url),
-                                   action="play", thumbnail=thumbnail, contentThumbnail=thumbnail,
-                                   contentType="movie", contentTitle=title))
-    # Paginador
-    next_page = scrapertools.find_single_match(data,"<a href='([^']+)' class='nmnext' title='Next page'>")
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="videos", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def int_to_base36(num):
-    """Converts a positive integer into a base36 string."""
-    assert num >= 0
-    digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.lower()
-
-    res = ''
-    while not res or num > 0:
-        num, i = divmod(num, 36)
-        res = digits[i] + res
-    return res
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-
-    patron = "EP: { vid: '([^']+)', hash: '([^']+)'"
-
-    vid, hash = re.compile(patron, re.DOTALL).findall(data)[0]
-
-    hash = int_to_base36(int(hash[0:8], 16)) + int_to_base36(int(hash[8:16], 16)) + int_to_base36(
-        int(hash[16:24], 16)) + int_to_base36(int(hash[24:32], 16))
-
-    url = "https://www.eporner.com/xhr/video/%s?hash=%s" % (vid, hash)
-    jsondata = httptools.downloadpage(url).json
-
-    for source in jsondata["sources"]["mp4"]:
-        url = jsondata["sources"]["mp4"][source]["src"]
-        title = source.split(" ")[0]
-
-        itemlist.append(["%s %s [directo]" % (title, url[-4:]), url])
-
-    return sorted(itemlist, key=lambda i: int(i[0].split("p")[0]))
diff --git a/channels/porn/eroticage.json b/channels/porn/eroticage.json
deleted file mode 100644
index e45b4f9b..00000000
--- a/channels/porn/eroticage.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "eroticage",
-  "name": "eroticage",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://eroticage.net/wp-content/themes/oz-movie-v3/img/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/eroticage.py b/channels/porn/eroticage.py
deleted file mode 100644
index fab51da2..00000000
--- a/channels/porn/eroticage.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://www.eroticage.net'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'<h2>TAGS</h2>(.*?)<div class="sideitem"')
-    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="lista", title=scrapedtitle, url=scrapedurl,
-                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<div class="titleFilm"><a href="([^"]+)">([^"]+)</a>.*?src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        contentTitle = scrapedtitle
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                               plot=plot, fanart=scrapedthumbnail, contentTitle=contentTitle ))
-    next_page = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    itemlist = servertools.find_video_items(data=data)
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.thumbnail = item.thumbnail
-        videochannel=item.channel
-    return itemlist
-
diff --git a/channels/porn/eroticasonlinetv.json b/channels/porn/eroticasonlinetv.json
deleted file mode 100644
index fdcdd76f..00000000
--- a/channels/porn/eroticasonlinetv.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "id": "eroticasonlinetv",
-  "name": "eroticasonlinetv",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.peliculaseroticasonline.tv/wp-content/themes/wpeliculaseroticasonlinetv/favicon.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
-
diff --git a/channels/porn/eroticasonlinetv.py b/channels/porn/eroticasonlinetv.py
deleted file mode 100644
index b3d7f3d6..00000000
--- a/channels/porn/eroticasonlinetv.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-from platformcode import config
-
-host = 'http://www.peliculaseroticasonline.tv'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<li class="cat-item cat-item-\d+"><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="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="movie-poster"><a href="([^"]+)".*?<img src="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        plot = ""
-        url = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=url, 
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=plot, contentTitle = scrapedtitle) )
-    next_page = scrapertools.find_single_match(data, '<div class="naviright"><a href="([^"]+)">Siguiente &raquo;</a>')
-    if next_page:
-        next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page ))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, '<iframe src="([^"]+)"')
-    url = urlparse.urljoin(item.url, url)
-    data = httptools.downloadpage(url).data
-    itemlist = servertools.find_video_items(data=data)
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-    return itemlist
-
diff --git a/channels/porn/erotik.json b/channels/porn/erotik.json
deleted file mode 100644
index 8724bd2f..00000000
--- a/channels/porn/erotik.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "erotik",
-  "name": "Erotik",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.youfreeporntube.com/uploads/custom-logo.png",
-  "banner": "http://www.youfreeporntube.com/uploads/custom-logo.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/porn/erotik.py b/channels/porn/erotik.py
deleted file mode 100644
index 55f089fb..00000000
--- a/channels/porn/erotik.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-
-host = "https://www.youfreeporntube.net"
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="lista", title="Útimos videos",
-                         url= host + "/newvideos.html?&page=1"))
-    itemlist.append(Item(channel=item.channel, action="lista", title="Populares",
-                         url=host + "/topvideos.html?page=1"))
-    itemlist.append(
-        Item(channel=item.channel, action="categorias", title="Categorias", url=host + "/browse.html"))
-
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar",
-                         url=host + "/search.php?keywords="))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = "{0}{1}".format(item.url, texto)
-    try:
-        return lista(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}", "", data)
-    patron = '<div class="pm-li-category"><a href="([^"]+)">.*?.<h3>(.*?)</h3></a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, actriz in matches:
-        itemlist.append(Item(channel=item.channel, action="lista", title=actriz, url=url))
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}", "", data)
-    patron = '<li><div class=".*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?alt="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        title = scrapedtitle.strip()
-        itemlist.append(Item(channel=item.channel, action="play", thumbnail=thumbnail, fanart=thumbnail, title=title,
-                             url=url,
-                             viewmode="movie", folder=True))
-    paginacion = scrapertools.find_single_match(data,
-                                                '<li class="active">.*?</li>.*?<a href="([^"]+)">')
-    if paginacion:
-        paginacion = urlparse.urljoin(item.url,paginacion)
-        itemlist.append(Item(channel=item.channel, action="lista", title=">> Página Siguiente",
-                             url= paginacion))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, '<div id="video-wrapper">.*?<iframe.*?src="([^"]+)"')
-    itemlist.append(item.clone(action="play", title=url, url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist)
-    return itemlist
-
-
diff --git a/channels/porn/fapality.json b/channels/porn/fapality.json
deleted file mode 100644
index 564fc8d4..00000000
--- a/channels/porn/fapality.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "fapality",
-  "name": "fapality",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://i.imgur.com/Orguh85.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/fapality.py b/channels/porn/fapality.py
deleted file mode 100644
index d0527c27..00000000
--- a/channels/porn/fapality.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://fapality.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/newest/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/channels/"))
-    itemlist.append( Item(channel=item.channel, title="PornStar" , 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/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="item"><a href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<img src="([^"]+)">.*?'
-    patron += '<div class="right">([^"]+)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle.replace("movies", "") + " (" + cantidad + ")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page_url = scrapertools.find_single_match(data,'<li itemprop="url" class="current">.*?<a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    if "/categories/" in item.url:
-        itemlist = sorted(itemlist, key=lambda i: i.title)
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li class="masonry-item item ".*?'
-    patron += '<a href="([^"]+)" class="kt_imgrc popfire" title="([^"]+)" >.*?'
-    patron += '<img src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail  in matches:
-        title = scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle) )
-    next_page_url = scrapertools.find_single_match(data,'<li itemprop="url" class="current">.*?<a href="([^"]+)"')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<source id="video_source_1" src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl  in matches:
-        url =  scrapedurl
-    itemlist.append(item.clone(action="play", title=url, contentTitle = item.title, url=url))
-    return itemlist
-
diff --git a/channels/porn/fetishshrine.json b/channels/porn/fetishshrine.json
deleted file mode 100644
index 1aa17d67..00000000
--- a/channels/porn/fetishshrine.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "fetishshrine",
-  "name": "fetishshrine",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.fetishshrine.com/images/foot-logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/fetishshrine.py b/channels/porn/fetishshrine.py
deleted file mode 100644
index a0a3971d..00000000
--- a/channels/porn/fetishshrine.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.fetishshrine.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor Valorado" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span class="vids">(\d+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a href="([^"]+)" itemprop="url">.*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)">.*?'
-    patron += '<span itemprop="duration" class="length">(.*?)</span>(.*?)<span class="thumb-info">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion,calidad  in matches:
-        url = scrapedurl
-        if ">HD<" in calidad:
-            title = "[COLOR yellow]" + duracion + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR] " +scrapedtitle
-        else:
-            title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                               plot=plot, fanart=scrapedthumbnail, contentTitle = contentTitle ))
-    next_page = scrapertools.find_single_match(data,'<li><a data=\'\d+\' href="([^"]+)" title="Next">')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista" , title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = 'video_url: \'([^\']+)\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
-                            thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/filmoviXXX.json b/channels/porn/filmoviXXX.json
deleted file mode 100644
index 051c0fbb..00000000
--- a/channels/porn/filmoviXXX.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "filmoviXXX",
-  "name": "filmoviXXX",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.filmovix.net/wp-content/themes/Video/skins/1-default/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/filmoviXXX.py b/channels/porn/filmoviXXX.py
deleted file mode 100644
index 5993b540..00000000
--- a/channels/porn/filmoviXXX.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-# BLOQUEO ESET INTERNET SECURITY
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    if item.url=="":
-        item.url = "http://www.filmovix.net/videoscategory/porno/"
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'<h1 class="cat_head">XXX</h1>(.*?)<h3> Novo dodato </h3>')
-    patron  = '<li class="clearfix">.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<p class="title"><a href="([^"]+)" rel="bookmark" title="([^"]+)">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
-        contentTitle = scrapedtitle
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                               thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle=contentTitle))
-    next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="mainlist", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    return itemlist
-    
-    
-def play(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    itemlist = servertools.find_video_items(data=data)
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-    return itemlist
-
diff --git a/channels/porn/filmpornoita.json b/channels/porn/filmpornoita.json
deleted file mode 100644
index 27329265..00000000
--- a/channels/porn/filmpornoita.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "filmpornoita",
-  "name": "filmpornoita",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.filmpornoita.net/wp-content/uploads/2015/01/header1.jpg",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/filmpornoita.py b/channels/porn/filmpornoita.py
deleted file mode 100644
index 30171546..00000000
--- a/channels/porn/filmpornoita.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-from platformcode import config
-
-host = 'http://www.streamxxxx.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url= host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url= host))
-    return itemlist
-
-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=\'tag-link-.*?>([^<]+)</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="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="post" id="post-\d+">.*?'
-    patron  += '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron  += 'src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail  in matches:
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail , plot=plot , viewmode="movie") )
-    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)">Next')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
diff --git a/channels/porn/foxtube.json b/channels/porn/foxtube.json
deleted file mode 100644
index 6d58342d..00000000
--- a/channels/porn/foxtube.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "foxtube",
-  "name": "foxtube",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://fxtimg.com/xlogo_.png.pagespeed.ic.doVRQMV5ub.png|Referer=http://es.foxtube.com",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/foxtube.py b/channels/porn/foxtube.py
deleted file mode 100644
index ae2fae11..00000000
--- a/channels/porn/foxtube.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://es.foxtube.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="PornStar" , action="catalogo", url=host + '/actrices/'))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/buscador/%s" % texto
-    try:
-        return lista(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="tco5" href="([^"]+)">.*?'
-    patron += 'data-origen="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-                              # <a class="bgco2 tco3" rel="next" href="/actrices/2/">&gt</a>
-    next_page = scrapertools.find_single_match(data,'<a class="bgco2 tco3" rel="next" href="([^"]+)">&gt</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista" , title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-                              
-                              
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li class="bgco1"><a class="tco2" href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    if "/actrices/" in item.url:
-        data=scrapertools.find_single_match(data,'<section class="container">(.*?)>Actrices similares</h3>')
-    patron = '<a class="thumb tco1" href="([^"]+)">.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += 'alt="([^"]+)".*?'
-    patron += '<span class="t">(.*?)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        contentTitle = scrapedtitle
-        time = scrapertools.find_single_match(duracion, '<i class="m tc2">([^"]+)</i>')
-        if not 'HD' in duracion :
-            title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
-        else:
-            title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR]  " + scrapedtitle
-        thumbnail = scrapedthumbnail + "|Referer=%s" %host
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<a class="bgco2 tco3" rel="next" href="([^"]+)">&gt</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista" , title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data,'<iframe title="video" src="([^"]+)"')
-    url = url.replace("https://flashservice.xvideos.com/embedframe/", "https://www.xvideos.com/video") + "/"
-    data = httptools.downloadpage(url).data
-    patron  = 'html5player.setVideoHLS\\(\'([^\']+)\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        scrapedurl = scrapedurl.replace("\/", "/")
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
-                            thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/freeporn.json b/channels/porn/freeporn.json
deleted file mode 100644
index a6fbb792..00000000
--- a/channels/porn/freeporn.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "freeporn",
-  "name": "freeporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://frprn.com/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/freeporn.py b/channels/porn/freeporn.py
deleted file mode 100644
index c2ef1df2..00000000
--- a/channels/porn/freeporn.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://frprn.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-raped/"))
-    itemlist.append( Item(channel=item.channel, title="Modelos" , action="categorias", url=host + "/models/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li class="thumb thumb-\w+">.*?'
-    patron += '<a href="([^"]+)">.*?'
-    patron += '<img class="lazy" data-original="([^"]+)".*?'
-    patron += '<div class="title">(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        title = scrapertools.find_single_match(scrapedtitle,'<div class="text">([^<]+)<')
-        if "/categories/" in item.url:
-            cantidad = scrapertools.find_single_match(scrapedtitle,'<div class="count">(\d+)</div>')
-            scrapedtitle = scrapertools.find_single_match(scrapedtitle,'<div class="name">([^<]+)</div>')
-            title = scrapedtitle + "  (" + cantidad + ")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail,  plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li class="pagination-next"><a href="([^"]+)">')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="thumb">.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img class="lazy" data-original="([^"]+)" alt="([^"]+)".*?'
-    patron += '<span class="duration">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        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,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<li class="pagination-next"><a href="([^"]+)">')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<meta property="og:video" content="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        title = scrapedurl
-    itemlist.append(item.clone(action="play", title=title, contentTitle = scrapedurl, url=scrapedurl))
-    return itemlist
-
diff --git a/channels/porn/freepornstreams.json b/channels/porn/freepornstreams.json
deleted file mode 100644
index f3bf0f7a..00000000
--- a/channels/porn/freepornstreams.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "freepornstreams",
-  "name": "freepornstreams",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://freepornstreams.org/wp-content/uploads/2016/11/FPS_Logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/freepornstreams.py b/channels/porn/freepornstreams.py
deleted file mode 100644
index f5eae9c7..00000000
--- a/channels/porn/freepornstreams.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://freepornstreams.org'    #es http://xxxstreams.org 
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/free-full-porn-movies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/free-stream-porn/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    if item.title == "Categorias" :
-        data = scrapertools.find_single_match(data,'>Top Tags(.*?)</ul>')
-    else:
-        data = scrapertools.find_single_match(data,'>Top Sites</a>(.*?)</aside>')
-    patron  = '<a href="([^"]+)">(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        if not "Featured" in scrapedtitle:
-            scrapedplot = ""
-            scrapedthumbnail = ""
-            scrapedurl = scrapedurl.replace ("http://freepornstreams.org/freepornst/stout.php?s=100,75,65:*&#038;u=" , "")
-            itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                                   thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<article id="post-\d+".*?'
-    patron += '<a href="([^"]+)" rel="bookmark">(.*?)</a>.*?'
-    patron += '<img src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        if '/HD' in scrapedtitle : title= "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        elif 'SD' in scrapedtitle : title= "[COLOR red]" + "SD" + "[/COLOR] " + scrapedtitle
-        elif 'FullHD' in scrapedtitle : title= "[COLOR red]" + "FullHD" + "[/COLOR] " + scrapedtitle
-        elif '1080' in scrapedtitle : title= "[COLOR red]" + "1080p" + "[/COLOR] " + scrapedtitle
-        else: title = scrapedtitle
-        thumbnail = scrapedthumbnail.replace("jpg#", "jpg")
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle=title) )
-    next_page = scrapertools.find_single_match(data, '<div class="nav-previous"><a href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = '<a href="([^"]+)" rel="nofollow"[^<]+>(?:Streaming|Download)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        if not "ubiqfile" in url:
-            itemlist.append(item.clone(action='play',title="%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
diff --git a/channels/porn/gotporn.json b/channels/porn/gotporn.json
deleted file mode 100755
index 96df587b..00000000
--- a/channels/porn/gotporn.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "gotporn",
-  "name": "gotporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://cdn2-static-cf.gotporn.com/desktop/img/gotporn-logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/gotporn.py b/channels/porn/gotporn.py
deleted file mode 100755
index fc42255d..00000000
--- a/channels/porn/gotporn.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.gotporn.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/top-rated?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-viewed?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest?page=1"))
-
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/results?search_query=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-
-
-    patron = '<a href="([^"]+)">'
-    patron += '<span class="text">([^<]+)</span>'
-    patron += '<span class="num">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = "%s %s" % (scrapedtitle,cantidad)
-        scrapedurl = scrapedurl + "?page=1"
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    logger.debug(data)
-    patron = '<header class="clearfix" itemscope>.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = scrapedurl + "?page=1"
-        thumbnail = "https:" + scrapedthumbnail
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" class="btn btn-secondary"><span class="text">Next')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="catalogo", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li class="video-item poptrigger".*?'
-    patron += 'href="([^"]+)" data-title="([^"]+)".*?'
-    patron += '<span class="duration">(.*?)</span>.*?'
-    patron += 'src=\'([^\']+)\'.*?'
-    patron += '<h3 class="video-thumb-title(.*?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedtime,scrapedthumbnail,quality in matches:
-        scrapedtime = scrapedtime.strip()
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        if quality:
-            title = "[COLOR yellow]%s[/COLOR] [COLOR red]HD[/COLOR] %s" % (scrapedtime,scrapedtitle)
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot,))
-    next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" class="btn btn-secondary')
-    if "categories" in item.url:
-        next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" class="btn btn-secondary paginate-show-more')
-    if "search_query" in item.url:
-        next_page = scrapertools.find_single_match(data, '<link rel=\'next\' href="([^"]+)">')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<source src="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        url += "|Referer=%s" % host
-        itemlist.append(item.clone(action="play", title = item.title, url=url ))
-    return itemlist
-
diff --git a/channels/porn/hclips.json b/channels/porn/hclips.json
deleted file mode 100644
index 8207dd3d..00000000
--- a/channels/porn/hclips.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "hclips",
-  "name": "hclips",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.hclips.com/apple-touch-icon-152x152.png?v=3",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/hclips.py b/channels/porn/hclips.py
deleted file mode 100644
index 9ae7ce89..00000000
--- a/channels/porn/hclips.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://www.hclips.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="peliculas", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/most-popular/?"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/longest/?"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/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 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="thumb">.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<strong class="title">([^"]+)</strong>.*?'
-    patron += '<b>(.*?)</b>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,vidnum in matches:
-        scrapedplot = ""
-        title = scrapedtitle + " \(" + vidnum + "\)"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
-                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def peliculas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<a href="([^"]+)" class="thumb">.*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)".*?'
-    patron += '<span class="dur">(.*?)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,time  in matches:
-        title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)" title="Next Page">Next</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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/channels/porn/hdzog.json b/channels/porn/hdzog.json
deleted file mode 100644
index fe66dbd5..00000000
--- a/channels/porn/hdzog.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "hdzog",
-  "name": "hdzog",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.hdzog.com/apple-touch-icon-120x120.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/hdzog.py b/channels/porn/hdzog.py
deleted file mode 100644
index 09ef0158..00000000
--- a/channels/porn/hdzog.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://www.hdzog.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/new/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/popular/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'<ul class="cf">(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<li>.*?<a href="([^"]+)".*?'
-    patron += '<img class="thumb" src="([^"]+)" alt="([^"]+)".*?'
-    patron += '<span class="videos-count">(\d+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,vidnum in matches:
-        scrapedplot = ""
-        
-        url= scrapedurl + "?sortby=post_date"
-        title = scrapedtitle + " \(" + vidnum + "\)"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'<ul class="cf">(.*?)<h2>Advertisement</h2>')
-    patron  = '<li>.*?<a href="([^"]+)".*?'
-    patron += 'src="([^"]+)" alt="([^"]+)".*?'
-    patron += '<span class="time">(.*?)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,time  in matches:
-        contentTitle = scrapedtitle
-        title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                               thumbnail=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" title="Next Page" data-page-num="\d+">Next page &raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info(item)
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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/channels/porn/hellporno.json b/channels/porn/hellporno.json
deleted file mode 100644
index bbb61486..00000000
--- a/channels/porn/hellporno.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "hellporno",
-  "name": "hellporno",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://hellporno.com/apple-touch-icon-152x152.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  
-  ]
-}
-
diff --git a/channels/porn/hellporno.py b/channels/porn/hellporno.py
deleted file mode 100644
index 0dab3be3..00000000
--- a/channels/porn/hellporno.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://hellporno.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)">.*?'
-    patron += '<img src="([^"]+)" alt="([^"]+) - Porn videos">.*?'
-    patron += '<span>(\d+) videos</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next">Next page &raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias" , title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="video-thumb"><a href="([^"]+)" class="title".*?>([^"]+)</a>.*?'
-    patron += '<span class="time">([^<]+)</span>.*?'
-    patron += '<video muted poster="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,duracion,scrapedthumbnail  in matches:
-        url = scrapedurl
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<a href="([^"]+)" class="next">Next page &raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data,'<source data-fluid-hd src="([^"]+)/?br=\d+"')
-    if scrapedurl=="":
-        scrapedurl = scrapertools.find_single_match(data,'<source src="([^"]+)/?br=\d+"')
-    itemlist.append(item.clone(action="play", title=scrapedurl, url=scrapedurl))
-    return itemlist
-
diff --git a/channels/porn/hentaiid.json b/channels/porn/hentaiid.json
deleted file mode 100644
index 0519590a..00000000
--- a/channels/porn/hentaiid.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "hentaiid",
-  "name": "Hentai ID",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.hentai-id.tv/wp-content/themes/moviescript/assets/img/logo.png",
-  "banner": "http://www.hentai-id.tv/wp-content/themes/moviescript/assets/img/background.jpg",
-  "categories": [
-    "adult"
-  ]
-}
diff --git a/channels/porn/hentaiid.py b/channels/porn/hentaiid.py
deleted file mode 100644
index 495fae4d..00000000
--- a/channels/porn/hentaiid.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-
-CHANNEL_HOST = "http://hentai-id.tv/"
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = list()
-    itemlist.append(Item(channel=item.channel, action="series", title="Novedades",
-                         url=urlparse.urljoin(CHANNEL_HOST, "archivos/h2/"), extra="novedades"))
-    itemlist.append(Item(channel=item.channel, action="generos", title="Por géneros", url=CHANNEL_HOST))
-    itemlist.append(Item(channel=item.channel, action="series", title="Sin Censura",
-                         url=urlparse.urljoin(CHANNEL_HOST, "archivos/sin-censura/")))
-    itemlist.append(Item(channel=item.channel, action="series", title="High Definition",
-                         url=urlparse.urljoin(CHANNEL_HOST, "archivos/high-definition/")))
-    itemlist.append(Item(channel=item.channel, action="series", title="Mejores Hentais",
-                         url=urlparse.urljoin(CHANNEL_HOST, "archivos/ranking-hentai/")))
-
-    return itemlist
-
-
-def generos(item):
-    logger.info()
-
-    itemlist = []
-    data = re.sub(r"\n|\r|\t|\s{2}", "", httptools.downloadpage(item.url).data)
-
-    pattern = 'id="hentai2"><div[^>]+>(.*?)</div></div>'
-    data = scrapertools.find_single_match(data, pattern)
-
-    patron = 'href="([^"]+)"[^>]+>(.*?)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for url, title in matches:
-        # logger.debug("title=[{0}], url=[{1}]".format(title, url))
-        itemlist.append(Item(channel=item.channel, action="series", title=title, url=url))
-
-    return itemlist
-
-
-def series(item):
-    logger.info()
-
-    data = re.sub(r"\n|\r|\t|\s{2}", "", httptools.downloadpage(item.url).data)
-
-    pattern = "<div class='wp-pagenavi'>(.*?)</div>"
-    pagination = scrapertools.find_single_match(data, pattern)
-
-    pattern = '<div class="col-xs-12 col-md-12 col-lg-9px-3"><ul>(.*?)</ul><div class="clearfix">'
-    data = scrapertools.find_single_match(data, pattern)
-
-    pattern = '<a href="([^"]+)".*?<img src="([^"]+)" title="([^"]+)"'
-    matches = re.compile(pattern, re.DOTALL).findall(data)
-    itemlist = []
-
-    if item.extra == "novedades":
-        action = "findvideos"
-    else:
-        action = "episodios"
-
-    for url, thumbnail, title in matches:
-        contentTitle = title
-        show = title
-        # logger.debug("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
-        itemlist.append(Item(channel=item.channel, action=action, title=title, url=url, thumbnail=thumbnail,
-                             show=show, fanart=thumbnail, folder=True))
-
-    if pagination:
-        page = scrapertools.find_single_match(pagination, '>(?:Page|Página)\s*(\d+)\s*(?:of|de)\s*\d+<')
-        pattern = 'href="([^"]+)">%s<' % (int(page) + 1)
-        url_page = scrapertools.find_single_match(pagination, pattern)
-
-        if url_page:
-            itemlist.append(Item(channel=item.channel, action="series", title=">> Página Siguiente", url=url_page))
-
-    return itemlist
-
-
-def episodios(item):
-    logger.info()
-    itemlist = []
-
-    data = re.sub(r"\n|\r|\t|\s{2}", "", httptools.downloadpage(item.url).data)
-    pattern = '<div class="box-entry-title text-center">Lista de Capítulos</div>(.*?)</div></div>'
-
-    data = scrapertools.find_single_match(data, pattern)
-    patron = '<a href="([^"]+)"[^>]+>([^<]+)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        title = scrapertools.unescape(scrapedtitle)
-        url = urlparse.urljoin(item.url, scrapedurl)
-        thumbnail = item.thumbnail
-        plot = item.plot
-
-        # logger.debug("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
-        itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url,
-                             thumbnail=thumbnail, plot=plot,
-                             fanart=thumbnail))
-
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-
-    data = httptools.downloadpage(item.url).data
-    video_urls = []
-    down_urls = []
-    patron = '<(?:iframe)?(?:IFRAME)?\s*(?:src)?(?:SRC)?="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for url in matches:
-        if 'goo.gl' in url or 'tinyurl' in url:
-            video = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers["location"]
-            video_urls.append(video)
-        else:
-            video_urls.append(url)
-    paste = scrapertools.find_single_match(data, 'https://gpaste.us/([a-zA-Z0-9]+)')
-    if paste:
-        try:
-            new_data = httptools.downloadpage('https://gpaste.us/'+paste).data
-
-            bloq = scrapertools.find_single_match(new_data, 'id="input_text">(.*?)</div>')
-            matches = bloq.split('<br>')
-            for url in matches:
-                down_urls.append(url)
-        except:
-            pass
-    video_urls.extend(down_urls)
-    from core import servertools
-    itemlist = servertools.find_video_items(data=",".join(video_urls))
-    for videoitem in itemlist:
-        videoitem.contentTitle = item.contentTitle
-        videoitem.channel = item.channel
-        videoitem.thumbnail = item.thumbnail
-
-    return itemlist
diff --git a/channels/porn/hotmovs.json b/channels/porn/hotmovs.json
deleted file mode 100644
index dd056521..00000000
--- a/channels/porn/hotmovs.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "hotmovs",
-  "name": "hotmovs",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://hotmovs.com/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/hotmovs.py b/channels/porn/hotmovs.py
deleted file mode 100644
index 37ec2078..00000000
--- a/channels/porn/hotmovs.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://hotmovs.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/most-popular/?sort_by=video_viewed_week"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-rated/?sort_by=rating_week"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels/?sort_by=cs_viewed"))
-    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="categorias", url=host + "/models/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/?sort_by=title"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a class="thumbnail" href="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span class="thumbnail__info__right">\s+([^"]+)\s+</span>.*?'
-    patron += '<h5>([^"]+)</h5>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
-        scrapedplot = ""
-        cantidad = cantidad.replace("         ", "")
-        scrapedtitle = scrapedtitle + " (" + cantidad +")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-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="thumbnail" href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<i class="mdi mdi-video"></i>([^"]+)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        cantidad = cantidad.replace("        ", "")
-        scrapedtitle = scrapedtitle + " (" + cantidad +")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<article class="item" data-video-id="([^"]+)">.*?src="([^"]+)" alt="([^"]+)".*?<div class="thumbnail__info__right">(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime  in matches:
-        url = urlparse.urljoin(item.url,"/embed/" + scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              plot=plot, contentTitle = title))
-    next_page = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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/channels/porn/javlin.json b/channels/porn/javlin.json
deleted file mode 100644
index 31aa65d0..00000000
--- a/channels/porn/javlin.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "javlin",
-  "name": "javlin",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://javl.in/wp-content/uploads/2015/07/favicon1.ico",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/javlin.py b/channels/porn/javlin.py
deleted file mode 100644
index 6ab1d1f7..00000000
--- a/channels/porn/javlin.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-from platformcode import config
-
-host = 'http://javl.in'
-
-# BLOQUEO ANTIVIRUS
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="lista" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar" , action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info("pelisalacarta.gmobi mainlist")
-    texto = texto.replace(" ", "+")
-    item.url = host+ "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<option class="level-0" value="([^"]+)">([^"]+)&nbsp;&nbsp;\((.*?)\)<'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,number in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = str(scrapedtitle) + " ("+ str(number) + ")"
-        scrapedurl = "http://javl.in/?cat=" + scrapedurl
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(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)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<span class=\'currenttext\'>.*?href=\'([^\']+)\' class=\'inactive\'')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel , action="lista", title="Página Siguiente >>", text_color="blue", 
-                               url=next_page) )
-    return itemlist
-
diff --git a/channels/porn/javtasty.json b/channels/porn/javtasty.json
deleted file mode 100644
index 82151579..00000000
--- a/channels/porn/javtasty.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "id": "javtasty",
-  "name": "JavTasty",
-  "language": ["*"],
-  "active": true,
-  "adult": true,
-  "thumbnail": "http://i.imgur.com/OTYwbAa.png?1",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-    {
-      "id": "menu_info",
-      "type": "bool",
-      "label": "Mostrar menú antes de reproducir con imágenes",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/javtasty.py b/channels/porn/javtasty.py
deleted file mode 100644
index 46c41026..00000000
--- a/channels/porn/javtasty.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from platformcode import config, logger
-
-host = "https://www.javwhores.com"
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(item.clone(action="lista", title="Nuevos Vídeos", url=host + "/latest-updates/"))
-    itemlist.append(item.clone(action="lista", title="Mejor Valorados", url=host + "/top-rated/"))
-    itemlist.append(item.clone(action="lista", title="Más Vistos", url=host + "/most-popular/"))
-    itemlist.append(item.clone(action="categorias", title="Categorías", url=host + "/categories/"))
-    itemlist.append(item.clone(title="Buscar...", action="search"))
-    itemlist.append(item.clone(action="configuracion", title="Configurar canal...", text_color="gold", folder=False))
-    return itemlist
-
-
-def configuracion(item):
-    from platformcode import platformtools
-    ret = platformtools.show_channel_settings()
-    platformtools.itemlist_refresh()
-    return ret
-
-
-def search(item, texto):
-    logger.info()
-    item.url = "%s/search/%s/" % (host, texto)
-    item.extra = texto
-    try:
-        return lista(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    action = "play"
-    if config.get_setting("menu_info", "javtasty"):
-        action = "menu_info"
-    # PURGA los PRIVATE 
-    patron  = 'div class="video-item\s+".*?href="([^"]+)".*?'
-    patron += 'data-original="([^"]+)" '
-    patron += 'alt="([^"]+)"(.*?)fa fa-clock-o"></i>([^<]+)<'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, quality, duration in matches:
-        scrapedurl = urlparse.urljoin(host, scrapedurl)
-        scrapedtitle = scrapedtitle.strip()
-        if duration:
-            scrapedtitle = "%s - %s" % (duration.strip(), scrapedtitle)
-        if '>HD<' in quality:
-            scrapedtitle += "  [COLOR red][HD][/COLOR]"
-        itemlist.append(item.clone(action=action, title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail))
-    # Extrae la marca de siguiente página
-    next_page = scrapertools.find_single_match(data, 'next"><a href="([^"]+)')
-    if next_page:
-        itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=host + next_page))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '(?s)<a class="item" href="([^"]+)".*?'
-    patron += 'src="([^"]+)" '
-    patron += 'alt="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
-        scrapedurl = urlparse.urljoin(host, scrapedurl)
-        scrapedthumbnail = urlparse.urljoin(host, scrapedthumbnail)
-        itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    videourl = scrapertools.find_single_match(data, "video_alt_url2:\s*'([^']+)'")
-    if videourl:
-        itemlist.append(['.mp4 HD [directo]', videourl])
-    videourl = scrapertools.find_single_match(data, "video_alt_url:\s*'([^']+)'")
-    if videourl:
-        itemlist.append(['.mp4 HD [directo]', videourl])
-    videourl = scrapertools.find_single_match(data, "video_url:\s*'([^']+)'")
-    if videourl:
-        itemlist.append(['.mp4 [directo]', videourl])
-    if item.extra == "play_menu":
-        return itemlist, data
-    return itemlist
-
-
-def menu_info(item):
-    logger.info()
-    itemlist = []
-    video_urls, data = play(item.clone(extra="play_menu"))
-    itemlist.append(item.clone(action="play", title="Ver -- %s" % item.title, video_urls=video_urls))
-    matches = scrapertools.find_multiple_matches(data, '<a href="([^"]+)" class="item" rel="screenshots"')
-    for i, img in enumerate(matches):
-        if i == 0:
-            continue
-        title = "Imagen %s" % (str(i))
-        itemlist.append(item.clone(action="", title=title, thumbnail=img, fanart=img))
-    return itemlist
diff --git a/channels/porn/javus.json b/channels/porn/javus.json
deleted file mode 100644
index 17595685..00000000
--- a/channels/porn/javus.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "javus",
-  "name": "javus.net",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://s15.postimg.cc/pzd3h4vy3/javus.png",
-  "banner": "https://s21.postimg.cc/5pqzedp2f/javus_banner.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/javus.py b/channels/porn/javus.py
deleted file mode 100644
index 83979eb7..00000000
--- a/channels/porn/javus.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-
-host = 'http://javus.net/'
-
-
-def mainlist(item):
-    if item.url == "":
-        item.url = host
-
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a href="([^"]+)" title="([^"]+)" rel="nofollow" class="post-image post-image-left".*?\s*<div class="featured-thumbnail"><img width="203" height="150" src="([^"]+)" class="attachment-featured size-featured wp-post-image" alt="" title="" \/><\/div>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
-        url = scrapedurl
-        title = scrapedtitle.decode('utf-8')
-        thumbnail = scrapedthumbnail
-        fanart = ''
-
-        itemlist.append(
-            Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail, fanart=thumbnail))
-
-    # Paginacion
-    title = ''
-    siguiente = scrapertools.find_single_match(data, "<a rel='nofollow' href='([^']+)' class='inactive'>Next <")
-    ultima = scrapertools.find_single_match(data, "<a rel='nofollow' class='inactive' href='([^']+)'>Last <")
-    if siguiente != ultima:
-        titlen = 'Pagina Siguiente >>> '
-        fanart = ''
-        itemlist.append(Item(channel=item.channel, action="mainlist", title=titlen, url=siguiente, fanart=fanart))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = item.url + texto
-
-    if texto != '':
-        return todas(item)
-    else:
-        return []
diff --git a/channels/porn/javwhores.json b/channels/porn/javwhores.json
deleted file mode 100644
index 46a2bf11..00000000
--- a/channels/porn/javwhores.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "javwhores",
-  "name": "javwhores",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.javwhores.com/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/javwhores.py b/channels/porn/javwhores.py
deleted file mode 100644
index 6746f9d9..00000000
--- a/channels/porn/javwhores.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-
-host = 'https://www.javwhores.com/'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?'
-    patron  += '<img class="thumb" src="([^"]+)".*?'
-    patron  += '<div class="videos">([^"]+)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad  in matches:
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return sorted(itemlist, key=lambda i: i.title)
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="video-item   ">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)"  class="thumb">.*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<span class="ico-fav-1(.*?)<p class="inf">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        time = scrapertools.find_single_match(duracion, '<i class="fa fa-clock-o"></i>([^"]+)</div>')
-        if not 'HD' in duracion :
-            title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
-        else:
-            title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR]  " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              plot=plot, contentTitle = title))
-    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-    if "#videos" in next_page:
-        next_page = scrapertools.find_single_match(data, 'data-parameters="sort_by:post_date;from:(\d+)">Next')
-        next = scrapertools.find_single_match(item.url, '(.*?/)\d+')
-        next_page = next + "%s/" % next_page
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title= next_page, text_color="blue", url=next_page ) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data, 'video_alt_url3: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_alt_url2: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_alt_url: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_url: \'([^\']+)\'')
-
-    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, url=scrapedurl,
-                        thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
-
diff --git a/channels/porn/jizzbunker.json b/channels/porn/jizzbunker.json
deleted file mode 100644
index 2f764fc9..00000000
--- a/channels/porn/jizzbunker.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "id": "jizzbunker",
-  "name": "jizzbunker",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://s0.cdn3x.com/jb/i/logo-new.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
-
diff --git a/channels/porn/jizzbunker.py b/channels/porn/jizzbunker.py
deleted file mode 100644
index d6a22407..00000000
--- a/channels/porn/jizzbunker.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://jizzbunker.com/es'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/newest"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/popular1"))
-    itemlist.append( Item(channel=item.channel, title="Tendencia" , action="peliculas", url=host + "/trending"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="peliculas", url=host + "/longest"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/channels/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-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 categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li><figure>.*?<a href="([^"]+)".*?'
-    patron += '<img class="lazy" data-original="([^"]+)" alt="([^"]+)".*?'
-    patron += '<span class="score">(\d+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedurl = scrapedurl.replace("channel", "channel30")
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    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  = '<li><figure>.*?<a href="([^"]+)/([^"]+).html".*?'
-    patron += '<img class="lazy" data-original="([^"]+)".*?'
-    patron += '<time datetime=".*?">([^"]+)</time>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
-        url = scrapedurl + "/" + scrapedtitle + ".html"
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                              plot=plot, contentTitle = contentTitle))
-    next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)" rel="next">&rarr;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = 'type:\'video/mp4\',src:\'([^\']+)\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        scrapedurl = scrapedurl.replace("https", "http")
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
-                            thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/justporn.json b/channels/porn/justporn.json
deleted file mode 100644
index e0b656a5..00000000
--- a/channels/porn/justporn.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "justporn",
-  "name": "justporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://xxx.justporno.tv/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/justporn.py b/channels/porn/justporn.py
deleted file mode 100644
index 50aa533f..00000000
--- a/channels/porn/justporn.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://xxx.justporno.tv'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host + "/latest-updates/1/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas", action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias", action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar" , action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    item.url = "%s/search/%s/" % (host, texto.replace("+", "-"))
-    item.extra = texto
-    try:
-        return lista(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<a class="item" href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<div class="videos">(\d+) video.*?</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,numero in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = scrapedtitle + " (" + numero + ")"
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-
-    return sorted(itemlist, key=lambda i: i.title)
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a href="http://xxx.justporno.tv/videos/(\d+)/.*?" title="([^"]+)" >.*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<div class="duration">(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        scrapedplot = ""
-        scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + scrapedtitle
-        scrapedurl = "http://xxx.justporno.tv/embed/" + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-                              
-    if item.extra:
-        next_page = scrapertools.find_single_match(data, '<li class="next">.*?from_videos\+from_albums:(.*?)>')
-        if next_page:
-            if "from_videos=" in item.url:
-                next_page = re.sub(r'&from_videos=(\d+)', '&from_videos=%s' % next_page, item.url)
-            else:
-                next_page = "%s?mode=async&function=get_block&block_id=list_videos_videos_list_search_result"\
-                            "&q=%s&category_ids=&sort_by=post_date&from_videos=%s" % (item.url, item.extra, next_page)
-            itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    else:
-        next_page = scrapertools.find_single_match(data,'<li class="next"><a href="([^"]+)"')
-        if next_page and not next_page.startswith("#"):
-            next_page = urlparse.urljoin(host, next_page)
-            itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-        else:
-            next_page = scrapertools.find_single_match(data, '<li class="next">.*?from:(\d+)')
-            if next_page:
-                if "from" in item.url:
-                    next_page = re.sub(r'&from=(\d+)', '&from=%s' % next_page, item.url)
-                else:
-                    next_page = "%s?mode=async&function=get_block&block_id=list_videos_common_videos_list" \
-                                "&sort_by=post_date&from=%s" % (item.url, next_page)
-                itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = 'video_url: \'([^\']+)\''
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl in matches:
-        scrapedplot = ""
-        itemlist.append(item.clone(channel=item.channel, action="play", title=item.title , url=scrapedurl , plot="" , folder=True) )
-    return itemlist
-
diff --git a/channels/porn/kingsizetits.json b/channels/porn/kingsizetits.json
deleted file mode 100755
index 69493b3e..00000000
--- a/channels/porn/kingsizetits.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "kingsizetits",
-  "name": "Kingsizetits",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://cdn.images.kingsizetits.com/resources/kingsizetits.com/rwd_5/default/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/kingsizetits.py b/channels/porn/kingsizetits.py
deleted file mode 100755
index c8cdc8a3..00000000
--- a/channels/porn/kingsizetits.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://kingsizetits.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/most-recent/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-viewed-week/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas largos" , action="lista", url=host + "/longest/"))
-    
-
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/videos/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a href="([^"]+)" class="video-box.*?'
-    patron += 'src=\'([^\']+)\' alt=\'([^\']+)\'.*?'
-    patron += 'data-video-count="(\d+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<script>stat.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<span class="video-length">([^<]+)</span>.*?'
-    patron += '<span class="pic-name">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtime,scrapedtitle in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<a class="btn default-btn page-next page-nav" href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    logger.debug(data)
-    url = scrapertools.find_single_match(data,'label:"\d+", file\:"([^"]+)"')
-    itemlist.append(item.clone(action="play", server="directo", url=url ))
-    return itemlist
-
-
diff --git a/channels/porn/mangovideo.json b/channels/porn/mangovideo.json
deleted file mode 100755
index af5b8c23..00000000
--- a/channels/porn/mangovideo.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "mangovideo",
-  "name": "mangovideo",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://mangovideo.pw/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/mangovideo.py b/channels/porn/mangovideo.py
deleted file mode 100755
index 509d2f93..00000000
--- a/channels/porn/mangovideo.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-
-server = {'1': 'https://www.mangovideo.pw/contents/videos', '7' : 'https://server9.mangovideo.pw/contents/videos/',
-          '8' : 'https://s10.mangovideo.pw/contents/videos/', '9' : 'https://server2.mangovideo.pw/contents/videos/',
-          '10' : 'https://server217.mangovideo.pw/contents/videos/', '11' : 'https://234.mangovideo.pw/contents/videos/'
-         }
-
-host = 'http://mangovideo.pw'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Sitios" , action="categorias", url=host + "/sites/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a class="item" href="([^"]+)" title="([^"]+)".*?'
-    patron += '<div class="videos">(\d+) videos</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-                              
-    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="categorias", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-                              
-                              
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div class="item\s+">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)".*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<div class="duration">([^<]+)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    scrapedtitle = ""
-    patron = 'video_url: \'function/0/https://mangovideo.pw/get_file/(\d+)/\w+/(.*?)/\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedtitle,url in matches:
-        scrapedtitle = server.get(scrapedtitle, scrapedtitle)
-        url = scrapedtitle + url
-    if not scrapedtitle:
-        url = scrapertools.find_single_match(data, '<div class="embed-wrap".*?<iframe src="([^"]+)\?ref=')
-    itemlist.append(item.clone(action="play", title="%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) 
-    
-    return itemlist
-
diff --git a/channels/porn/mporno.json b/channels/porn/mporno.json
deleted file mode 100644
index 76b4cf2c..00000000
--- a/channels/porn/mporno.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "mporno",
-  "name": "mporno",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://mporno.tv/templates/fluidporn/img/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/mporno.py b/channels/porn/mporno.py
deleted file mode 100644
index e568594d..00000000
--- a/channels/porn/mporno.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://mporno.tv'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host + "/most-recent/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistas" , action="lista", url=host + "/most-viewed/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/channels/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/videos/%s/page1.html" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<h3><a href="([^"]+)">(.*?)</a> <small>(.*?)</small></h3>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = scrapedtitle + "  " + cantidad
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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:
-        contentTitle = scrapedtitle
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, server= "directo", contentTitle=contentTitle))
-    next_page_url = scrapertools.find_single_match(data,'<a href=\'([^\']+)\' class="next">Next &gt;&gt;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-        
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    url = item.url.replace("/thumbs/", "/videos/") + ".mp4"
-    itemlist.append( Item(channel=item.channel, action="play", title= item.title, server= "directo", url=url))
-    return itemlist
\ No newline at end of file
diff --git a/channels/porn/muchoporno.json b/channels/porn/muchoporno.json
deleted file mode 100644
index a4c4ea81..00000000
--- a/channels/porn/muchoporno.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "muchoporno",
-  "name": "muchoporno",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.muchoporno.xxx/assets/css/logo/images/sprite-muchoporno.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/muchoporno.py b/channels/porn/muchoporno.py
deleted file mode 100644
index 73130718..00000000
--- a/channels/porn/muchoporno.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.pornburst.xxx'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/page3.html"))
-    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="categorias", url=host + "/pornstars/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/sites/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    if "/sites/" in item.url:
-        patron = '<div class="muestra-escena muestra-canales">.*?'
-        patron += 'href="([^"]+)">.*?'
-        patron += 'data-src="([^"]+)".*?'
-        patron += '<a title="([^"]+)".*?'
-        patron += '</span> (\d+) videos</span>'
-    if "/pornstars/" in item.url:
-        patron = '<a class="muestra-escena muestra-pornostar" href="([^"]+)">.*?'
-        patron += 'data-src="([^"]+)".*?'
-        patron += 'alt="([^"]+)".*?'
-        patron += '</span> (\d+) videos</span>'
-    else:
-        patron  = '<a class="muestra-escena muestra-categoria" href="([^"]+)" title="[^"]+">.*?'
-        patron += 'data-src="([^"]+)".*?'
-        patron += '</span> ([^"]+) </h2>(.*?)>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        logger.debug(scrapedurl + ' / ' + scrapedthumbnail + ' / ' + cantidad + ' / ' + scrapedtitle)
-        scrapedplot = ""
-        cantidad =  " (" + cantidad + ")"
-        if "</a" in cantidad:
-            cantidad = ""
-        scrapedtitle = scrapedtitle +  cantidad
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
-
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a class="muestra-escena"\s*href="([^"]+)".*?'
-    patron += 'data-stats-video-name="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span class="ico-minutos sprite" title="Length"></span>([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,duracion  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        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,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<source src="([^"]+)" type="video/mp4"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        title = scrapedurl
-    itemlist.append(item.clone(action="play", title=title, url=scrapedurl))
-    return itemlist
-
diff --git a/channels/porn/nuvid.json b/channels/porn/nuvid.json
deleted file mode 100644
index aee728e6..00000000
--- a/channels/porn/nuvid.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "nuvid",
-  "name": "Nuvid",
-  "language": ["*"],
-  "active": true,
-  "adult": true,
-  "thumbnail": "http://i.imgur.com/rSbuStX.png",
-  "banner": "nuvid.png",
-  "categories": [
-    "adult"
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/nuvid.py b/channels/porn/nuvid.py
deleted file mode 100644
index d87be509..00000000
--- a/channels/porn/nuvid.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import base64
-import hashlib
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-host = "https://www.nuvid.com"
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append(
-        item.clone(action="lista", title="Nuevos Vídeos", url="https://www.nuvid.com/search/videos/_empty_/"))
-    itemlist.append(
-        item.clone(action="lista", title="Mejor Valorados", url="https://www.nuvid.com/search/videos/_empty_/",
-                   extra="rt"))
-    itemlist.append(
-        item.clone(action="lista", title="Solo HD", url="https://www.nuvid.com/search/videos/hd", calidad="1"))
-    itemlist.append(item.clone(action="categorias", title="Categorías", url=host))
-    itemlist.append(item.clone(title="Buscar...", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    item.url = "https://www.nuvid.com/search/videos/" + texto.replace(" ", "%20")
-    item.extra = "buscar"
-    return lista(item)
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-
-    if not item.calidad:
-        item.calidad = "0"
-    filter = 'ch=178.1.2.3.4.191.7.8.5.9.10.169.11.12.13.14.15.16.17.18.28.190.20.21.22.27.23.24.25.26.189.30.31.32.181' \
-             '.35.36.37.180.176.38.33.34.39.40.41.42.177.44.43.45.47.48.46.49.50.51.52.53.54.55.56.57.58.179.59.60.61.' \
-             '62.63.64.65.66.69.68.71.67.70.72.73.74.75.182.183.77.76.78.79.80.81.82.84.85.88.86.188.87.91.90.92.93.94' \
-             '&hq=%s&rate=&dur=&added=&sort=%s' % (item.calidad, item.extra)
-    header = {'X-Requested-With': 'XMLHttpRequest'}
-    if item.extra != "buscar":
-        header['Cookie'] = 'area=EU; lang=en; search_filter_new=%s' % filter
-    # Descarga la pagina 
-    data = httptools.downloadpage(item.url, headers=header, cookies=False).data
-
-    # Extrae las entradas
-    patron = '<div class="box-tumb related_vid.*?href="([^"]+)" title="([^"]+)".*?src="([^"]+)"(.*?)<i class="time">([^<]+)<'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle, scrapedthumbnail, quality, duration in matches:
-        scrapedurl = urlparse.urljoin(host, scrapedurl)
-        if duration:
-            scrapedtitle = "%s - %s" % (duration, scrapedtitle)
-        if item.calidad == "0" and 'class="hd"' in quality:
-            scrapedtitle += "  [COLOR red][HD][/COLOR]"
-        itemlist.append(
-            item.clone(action="play", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, folder=False))
-
-        # Extrae la marca de siguiente página
-    next_page = scrapertools.find_single_match(data, '<li class="next1">.*?href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(host, next_page)
-        itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
-
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-
-    # Descarga la pagina    
-    data = httptools.downloadpage("https://www.nuvid.com/categories").data
-
-    # Extrae las entradas (carpetas)
-    bloques = scrapertools.find_multiple_matches(data, '<h2 class="c-mt-output title2">.*?>([^<]+)</h2>(.*?)</div>')
-    for cat, b in bloques:
-        cat = cat.replace("Straight", "Hetero")
-        itemlist.append(item.clone(action="", title=cat, text_color="gold"))
-        matches = scrapertools.find_multiple_matches(b, '<li>.*?href="([^"]+)" >(.*?)</span>')
-        for scrapedurl, scrapedtitle in matches:
-            scrapedtitle = "   " + scrapedtitle.replace("<span>", "")
-            scrapedurl = urlparse.urljoin(host, scrapedurl)
-            itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl))
-
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url, cookies=False).data
-    h = scrapertools.find_single_match(data, "params\s*\+=\s*'h=([^']+)'")
-    t = scrapertools.find_single_match(data, "params\s*\+=\s*'%26t=([^']+)'")
-    vkey = scrapertools.find_single_match(data, "params\s*\+=\s*'%26vkey='.*?'([^']+)'")
-    pkey = hashlib.md5(vkey + base64.b64decode("aHlyMTRUaTFBYVB0OHhS")).hexdigest()
-
-    url = 'https://www.nuvid.com/player_config/?h=%s&check_speed=1&t=%s&vkey=%s&pkey=%s&aid=&domain_id=' % (
-    h, t, vkey, pkey)
-    data = httptools.downloadpage(url, cookies=False).data
-    videourl = scrapertools.find_single_match(data, '<video_file>.*?(http.*?)\]')
-    if videourl:
-        itemlist.append(['.mp4 [directo]', videourl])
-    videourl = scrapertools.find_single_match(data, '<hq_video_file>.*?(http.*?)\]')
-    if videourl:
-        itemlist.append(['.mp4 HD [directo]', videourl])
-
-    return itemlist
diff --git a/channels/porn/pandamovie.json b/channels/porn/pandamovie.json
deleted file mode 100644
index ce411a6f..00000000
--- a/channels/porn/pandamovie.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "pandamovie",
-  "name": "pandamovie",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.pandamovies.com/templates/pandamovies/images/logo.png?v1482157699",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/pandamovie.py b/channels/porn/pandamovie.py
deleted file mode 100644
index e7961206..00000000
--- a/channels/porn/pandamovie.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-import urlparse
-import re
-import base64
-
-from platformcode import config, logger
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from core import httptools
-
-host = 'https://pandamovies.pw'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Peliculas", action="lista", url=host + "/movies"))
-    itemlist.append(Item(channel=item.channel, title="Categorias", action="categorias", url=host + "/movies"))
-    itemlist.append(Item(channel=item.channel, title="Canal", action="categorias", url=host + "/movies"))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    if item.title == "Categorias":
-        data = scrapertools.find_single_match(data, '<a href="#">Genres</a>(.*?)</ul>')
-    else:
-        data = scrapertools.find_single_match(data, '<a href="#">Studios</a>(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a href="([^"]+)">([^<]+)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedurl = scrapedurl.replace("https:", "")
-        scrapedurl = "https:" + scrapedurl
-        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                             thumbnail=scrapedthumbnail, plot=scrapedplot))
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div data-movie-id="\d+".*?'
-    patron += '<a href="([^"]+)".*?oldtitle="([^"]+)".*?'
-    patron += '<img data-original="([^"]+)".*?'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
-                             fanart=thumbnail, plot=plot, contentTitle=title))
-    next_page = scrapertools.find_single_match(data, '<li class=\'active\'>.*?href=\'([^\']+)\'>')
-    if next_page == "":
-        next_page = scrapertools.find_single_match(data, '<a.*?href="([^"]+)" >Next &raquo;</a>')
-    if next_page != "":
-        next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = '- on ([^"]+)" href="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedtitle,url in matches:
-        if 'aHR0' in url:
-            n = 3
-            while n > 0:
-                url= url.replace("https://vshares.tk/goto/", "").replace("https://waaws.tk/goto/", "").replace("https://openloads.tk/goto/", "")
-                logger.debug (url)
-                url = base64.b64decode(url)
-                n -= 1
-        if "mangovideo" in url:  #Aparece como directo
-            data = httptools.downloadpage(url).data
-            patron = 'video_url: \'function/0/https://mangovideo.pw/get_file/(\d+)/\w+/(.*?)/\?embed=true\''
-            matches = scrapertools.find_multiple_matches(data, patron)
-            for scrapedtitle,url in matches:
-                if scrapedtitle =="1":  scrapedtitle= "https://www.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="7":  scrapedtitle= "https://server9.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="8":  scrapedtitle= "https://s10.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="10": scrapedtitle= "https://server217.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="11": scrapedtitle= "https://234.mangovideo.pw/contents/videos/"
-                url = scrapedtitle + url
-        itemlist.append( Item(channel=item.channel, action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/porn/peliculaseroticas.json b/channels/porn/peliculaseroticas.json
deleted file mode 100644
index 51e679b4..00000000
--- a/channels/porn/peliculaseroticas.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "peliculaseroticas",
-  "name": "PeliculasEroticas",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "peliculaseroticas.png",
-  "banner": "peliculaseroticas.png",
-  "categories": [
-    "adult"
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/peliculaseroticas.py b/channels/porn/peliculaseroticas.py
deleted file mode 100644
index 300cb786..00000000
--- a/channels/porn/peliculaseroticas.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-from platformcode import config
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    if item.url == "":
-        item.url = "http://www.peliculaseroticas.net/"
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="post">.*?'
-    patron += '<a href="([^"]+)">([^<]+)</a>.*?'
-    patron += '<img src="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        title = scrapedtitle.strip()
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, fulltitle=title, url=url,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, viewmode="movie"))
-    # Extrae la marca de siguiente página
-    if item.url == "http://www.peliculaseroticas.net/":
-        next_page_url = "http://www.peliculaseroticas.net/cine-erotico/2.html"
-    else:
-        current_page = scrapertools.find_single_match(item.url, "(\d+)")
-        next_page = int(current_page) + 1
-        next_page_url = "http://www.peliculaseroticas.net/cine-erotico/" + str(next_page) + ".html"
-    itemlist.append( Item(channel=item.channel, action="mainlist", title=">> Página siguiente", url=next_page_url))
-    return itemlist
-
diff --git a/channels/porn/pelisxporno.json b/channels/porn/pelisxporno.json
deleted file mode 100644
index e01fb74e..00000000
--- a/channels/porn/pelisxporno.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "pelisxporno",
-  "name": "Pelisxporno",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://i.imgur.com/ywMHwat.png",
-  "banner": "pelisxporno.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/pelisxporno.py b/channels/porn/pelisxporno.py
deleted file mode 100644
index f8920727..00000000
--- a/channels/porn/pelisxporno.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-import urlparse
-import re
-
-from platformcode import config, logger
-from core import httptools
-from core import scrapertools
-from core import servertools
-
-
-host = 'http://www.pelisxporno.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(item.clone(action="lista", title="Novedades", url= host + "/?order=date"))
-    itemlist.append(item.clone(action="categorias", title="Categorías", url=host + "/categorias/"))
-    itemlist.append(item.clone(action="search", title="Buscar"))
-    return itemlist
-
-def search(item, texto):
-    logger.info("")
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-        
-def search(item, texto):
-    logger.info()
-    item.url = item.url % texto
-    return lista(item)
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<li class="cat-item cat-item-.*?"><a href="(.*?)".*?>(.*?)<'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle in matches:
-        itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl))
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="video.".*?<a href="(.*?)" title="(.*?)">.*?<img src="(.*?)".*?\/>.*?duration.*?>(.*?)<'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle, scrapedthumbnail, duration in matches:
-        if duration:
-            scrapedtitle = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-        itemlist.append(item.clone(action="findvideos", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail))
-    next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)"')
-    if next_page:
-        itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
-    return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '<div class="video_code">(.*?)<h3')
-    patron = '(?:src|SRC)="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl in matches:
-        if not 'mixdrop' in scrapedurl:  #el base64 es netu.tv
-            url = "https://hqq.tv/player/embed_player.php?vid=RODE5Z2Hx3hO&autoplay=none"
-        else:
-            url = "https:" + scrapedurl
-            headers = {'Referer': item.url}
-            data = httptools.downloadpage(url, headers=headers).data
-            url = scrapertools.find_single_match(data, 'vsrc = "([^"]+)"')
-            url= "https:" + url
-        itemlist.append(item.clone(action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/porn/perfectgirls.json b/channels/porn/perfectgirls.json
deleted file mode 100644
index 0ef5b75b..00000000
--- a/channels/porn/perfectgirls.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "perfectgirls",
-  "name": "perfectgirls",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.perfectgirls.net/images/no-sprite/perfect-girl-regular.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/perfectgirls.py b/channels/porn/perfectgirls.py
deleted file mode 100644
index 43503f3c..00000000
--- a/channels/porn/perfectgirls.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://www.perfectgirls.net'
-
-
-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="Top" , action="peliculas", url=host + "/top/3days/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-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 categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        url = urlparse.urljoin(item.url,scrapedurl) + "/1"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url,
-                               thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    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="list__item_link"><a href="([^"]+)" title="([^"]+)">.*?'
-    patron  += 'data-original="([^"]+)".*?'
-    patron  += '<time>(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
-        plot = ""
-        time = scrapertools.find_single_match(duracion, '([^"]+)</time>')
-        if not 'HD' in duracion :
-            title = "[COLOR yellow]" + time + "[/COLOR] " + scrapedtitle
-        else:
-            title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR]  " + scrapedtitle
-        scrapedthumbnail = "http:" + scrapedthumbnail
-        url = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=scrapedthumbnail,
-                              fanart=scrapedthumbnail, plot=plot, contentTitle = title))
-    next_page = scrapertools.find_single_match(data, '<a class="btn_wrapper__btn" href="([^"]+)">Next</a></li>')
-    if next_page:
-        next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page ))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<source src="([^"]+)" res="\d+" label="([^"]+)" type="video/mp4" default/>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle  in matches:
-        itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl))
-    return itemlist
-
diff --git a/channels/porn/playpornx.json b/channels/porn/playpornx.json
deleted file mode 100644
index d7582a98..00000000
--- a/channels/porn/playpornx.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "playpornx",
-  "name": "PlayPornX",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://s3.postimg.cc/3rkfrnypv/playpornx.png",
-  "banner": "https://s3.postimg.cc/it5qa1gyb/playpornx-banner.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/playpornx.py b/channels/porn/playpornx.py
deleted file mode 100644
index c39822b1..00000000
--- a/channels/porn/playpornx.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import servertools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-import base64
-
-host = "https://watchfreexxx.net/"
-
-def mainlist(item):
-    itemlist = []
-
-    itemlist.append(Item(channel=item.channel, title="Peliculas", action="lista",
-                         url = urlparse.urljoin(host, "category/porn-movies/")))
-
-    itemlist.append(Item(channel=item.channel, title="Escenas", action="lista",
-                         url = urlparse.urljoin(host, "category/xxx-scenes/")))
-
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=',
-                         thumbnail='https://s30.postimg.cc/pei7txpa9/buscar.png',
-                         fanart='https://s30.postimg.cc/pei7txpa9/buscar.png'))
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = item.url + texto
-    try:
-        if texto != '':
-            item.extra = 'Buscar'
-            return lista(item)
-        else:
-            return []
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    if item.url == '': item.url = host
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    patron = '<article id=.*?<a href="([^"]+)".*?<img data-src="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for data_1, data_2, data_3 in matches:
-        url = data_1
-        thumbnail = data_2
-        title = data_3
-        itemlist.append(Item(channel=item.channel, action='findvideos', title=title, url=url, thumbnail=thumbnail))
-    #Paginacion
-    if itemlist != []:
-        actual_page_url = item.url
-        next_page = scrapertools.find_single_match(data, '<a href="([^"]+)">Next</a>')
-        if next_page != '':
-            itemlist.append(Item(channel=item.channel, action="lista", title='Siguiente >>>', url=next_page,
-                                 thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png', extra=item.extra))
-    return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = '- on ([^"]+)" href="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedtitle,url in matches:
-        if "tk/goto/" in url:
-            n = 3
-            while n > 0:
-                url= url.replace("https://vshares.tk/goto/", "").replace("https://waaws.tk/goto/", "").replace("https://openloads.tk/goto/", "")
-                logger.debug (url)
-                url = base64.b64decode(url)
-                n -= 1
-        if "mangovideo" in url:  #Aparece como directo
-            data = httptools.downloadpage(url).data
-            patron = 'video_url: \'function/0/https://mangovideo.pw/get_file/(\d+)/\w+/(.*?)/\?embed=true\''
-            matches = scrapertools.find_multiple_matches(data, patron)
-            for scrapedtitle,url in matches:
-                if scrapedtitle =="1":  scrapedtitle= "https://www.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="7":  scrapedtitle= "https://server9.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="8":  scrapedtitle= "https://s10.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="10": scrapedtitle= "https://server217.mangovideo.pw/contents/videos/"
-                if scrapedtitle =="11": scrapedtitle= "https://234.mangovideo.pw/contents/videos/"
-                url = scrapedtitle + url
-        itemlist.append(item.clone(action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
-
diff --git a/channels/porn/porn300.json b/channels/porn/porn300.json
deleted file mode 100644
index 7af7d643..00000000
--- a/channels/porn/porn300.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "porn300",
-  "name": "porn300",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.porn300.com/android-icon-192x192.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/porn300.py b/channels/porn/porn300.py
deleted file mode 100644
index c84840a0..00000000
--- a/channels/porn/porn300.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.porn300.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/en_US/ajax/page/list_videos/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/channels/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="categorias", url=host + "/pornstars/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/?page=1"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-# view-source:https://www.porn300.com/en_US/ajax/page/show_search?q=big+tit&page=1
-# https://www.porn300.com/en_US/ajax/page/show_search?page=2 
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/en_US/ajax/page/show_search?q=%s&?page=1" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a itemprop="url" href="/([^"]+)".*?'
-    patron += 'data-src="([^"]+)" alt=.*?'
-    patron += 'itemprop="name">([^<]+)</h3>.*?'
-    patron += '</svg>([^<]+)<'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        cantidad = re.compile("\s+", re.DOTALL).sub(" ", cantidad)
-        scrapedtitle = scrapedtitle + " (" + cantidad +")"
-        scrapedurl = scrapedurl.replace("channel/", "producer/")
-        scrapedurl = "/en_US/ajax/page/show_" + scrapedurl + "?page=1"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)" />')
-    if next_page=="":
-        if "/?page=1" in item.url:
-            next_page=urlparse.urljoin(item.url,"/?page=2")
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a itemprop="url" href="([^"]+)".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += 'itemprop="name">([^<]+)<.*?'
-    patron += '</svg>([^<]+)<'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        scrapedtime = scrapedtime.strip()
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle) )
-    prev_page = scrapertools.find_single_match(item.url,"(.*?)page=\d+")
-    num= int(scrapertools.find_single_match(item.url,".*?page=(\d+)"))
-    num += 1
-    num_page = "?page=" + str(num)
-    if num_page!="":
-        next_page = urlparse.urljoin(item.url,num_page)
-        if "show_search" in next_page:
-            next_page = prev_page + num_page
-            next_page = next_page.replace("&?", "&")
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<source src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for url  in matches:
-        itemlist.append(item.clone(action="play", title=url, url=url))
-    return itemlist
-
diff --git a/channels/porn/pornboss.json b/channels/porn/pornboss.json
deleted file mode 100644
index c9815e6e..00000000
--- a/channels/porn/pornboss.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "pornboss",
-  "name": "pornboss",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://pornboss.org/wp-content/uploads/2018/10/cropped-bottom-180x180.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/pornboss.py b/channels/porn/pornboss.py
deleted file mode 100644
index ebe0f22b..00000000
--- a/channels/porn/pornboss.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- 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
-
-host = 'http://pornboss.org'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/category/movies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/clips/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data,'<div class="uk-panel uk-panel-box widget_nav_menu">(.*?)</ul>')
-    patron  = '<li><a href=(.*?) class>([^<]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<article id=item-\d+.*?'
-    patron += '<img class=.*?src=(.*?) alt="([^"]+)".*?'
-    patron += 'Duration:</strong>(.*?) / <strong>.*?'
-    patron += '>SHOW<.*?href=([^"]+) target=' 
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedtitle,duration,scrapedurl in matches:
-        scrapedplot = ""
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li><a href=([^<]+)><i class=uk-icon-angle-double-right>')
-    next_page = next_page.replace('"', '')
-    if next_page!="":
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-def play(item):
-    logger.info()
-    itemlist = []
-    if "streamcloud" in item.url:
-         itemlist.append(item.clone(action="play", url=item.url ))
-    else:
-        data = httptools.downloadpage(item.url).data
-        url=scrapertools.find_single_match(data,'<span class="bottext">Streamcloud.eu</span>.*?href="([^"]+)"')
-        url= "https://tolink.to" + url
-        data = httptools.downloadpage(url).data
-        patron = '<input type="hidden" name="id" value="([^"]+)">.*?'
-        patron += '<input type="hidden" name="fname" value="([^"]+)">'
-        matches = re.compile(patron,re.DOTALL).findall(data)
-        for id, url in matches:
-            url= "http://streamcloud.eu/" + id
-            itemlist.append(item.clone(action="play", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist)
-    return itemlist
-
-
diff --git a/channels/porn/porndish.json b/channels/porn/porndish.json
deleted file mode 100755
index c6089759..00000000
--- a/channels/porn/porndish.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "porndish",
-  "name": "porndish",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.porndish.com/wp-content/uploads/2015/09/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/porndish.py b/channels/porn/porndish.py
deleted file mode 100755
index 0a5508aa..00000000
--- a/channels/porn/porndish.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.porndish.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li id="menu-item-\d+".*?'
-    patron += '<a href="([^"]+)">([^<]+)<'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    data = scrapertools.find_single_match(data, 'archive-body">(.*?)<div class="g1-row g1-row-layout-page g1-prefooter">')
-    patron = '<article class=.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += 'title="([^"]+)".*?'
-    patron += '<a href="([^"]+)" rel="bookmark">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedtitle,scrapedurl in matches:
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<a class="g1-delta g1-delta-1st next" href="([^"]+)">Next</a>')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-
-
diff --git a/channels/porn/porneq.json b/channels/porn/porneq.json
deleted file mode 100644
index 4416272a..00000000
--- a/channels/porn/porneq.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "porneq",
-  "name": "porneq",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://porneq.com/uploads/porneq-logo-home-png554cf1a970e6d.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/porneq.py b/channels/porn/porneq.py
deleted file mode 100644
index 044346eb..00000000
--- a/channels/porn/porneq.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-import urlparse
-import urllib2
-import urllib
-import re
-import os
-import sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://porneq.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Ultimos", action="lista", url=host + "/videos/browse/"))
-    itemlist.append(Item(channel=item.channel, title="Mas Vistos", action="lista", url=host + "/videos/most-viewed/"))
-    itemlist.append(Item(channel=item.channel, title="Mas Votado", action="lista", url=host + "/videos/most-liked/"))
-    itemlist.append(Item(channel=item.channel, title="Big Tits", action="lista", url=host + "/show/big+tit"))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/show/%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a class="clip-link" data-id="\d+" title="([^"]+)" href="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span class="timer">(.*?)</span></div>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedtitle, scrapedurl, scrapedthumbnail, scrapedtime in matches:
-        scrapedplot = ""
-        scrapedthumbnail = scrapedthumbnail.replace("https:", "http:")
-        scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + scrapedtitle
-        itemlist.append(Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
-                             fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot))
-    next_page = scrapertools.find_single_match(data, '<nav id="page_nav"><a href="(.*?)"')
-    if next_page != "":
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data, '<source src="([^"]+)"')
-    scrapedurl = scrapedurl.replace("X20", "-")
-    itemlist.append(
-        Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
-             thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
diff --git a/channels/porn/pornhive.json b/channels/porn/pornhive.json
deleted file mode 100644
index f884f1f0..00000000
--- a/channels/porn/pornhive.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "pornhive",
-  "name": "pornhive",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.pornhive.tv/assets/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/pornhive.py b/channels/porn/pornhive.py
deleted file mode 100644
index f34ce0f6..00000000
--- a/channels/porn/pornhive.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-import base64
-
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://www.pornhive.tv/en'
-
-# Algunos link caidos
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search?keyword=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    if item.title == "Categorias" :
-        data = scrapertools.find_single_match(data,'Categories(.*?)Channels')
-    else:
-        data = scrapertools.find_single_match(data,'Channels(.*?)</ul>')
-    patron  = '<li><a href="([^"]+)" title="[^"]+">(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="col-lg-3 col-md-3 col-sm-4 col-xs-6 col-thumb panel-video-\d+">.*?'
-    patron  += '<a href="([^"]+)".*?'
-    patron  += 'data-src="([^"]+)".*?'
-    patron  += 'alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle=title))
-    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)" data-ci-pagination-page="\d+" rel="next">Next &rsaquo;')
-    if next_page != "" :
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = ';extra_urls\[\d+\]=\'([^\']+)\''
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl in matches:
-        scrapedurl = base64.b64decode(scrapedurl)
-        itemlist.append(item.clone(action="play", title="%s", url=scrapedurl))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) 
-    return itemlist
-
-
diff --git a/channels/porn/pornhub.json b/channels/porn/pornhub.json
deleted file mode 100644
index 4a719116..00000000
--- a/channels/porn/pornhub.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "pornhub",
-  "name": "PornHub",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "fanart": "http://i.imgur.com/PwFvoss.jpg",
-  "thumbnail": "http://s22.postimg.cc/5lzcocfqp/pornhub_logo.jpg",
-  "banner": "pornhub.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/porn/pornhub.py b/channels/porn/pornhub.py
deleted file mode 100644
index c485be51..00000000
--- a/channels/porn/pornhub.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-from core import httptools
-from core import servertools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="lista", title="Novedades", fanart=item.fanart,
-                         url="http://es.pornhub.com/video?o=cm"))
-    itemlist.append(Item(channel=item.channel, action="categorias", title="Categorias", fanart=item.fanart,
-                         url="http://es.pornhub.com/categories"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar", fanart=item.fanart,
-                         url="http://es.pornhub.com/video/search?search=%s&o=mr"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-
-    item.url = item.url % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<li class="cat_pic" data-category=".*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'data-thumb_url="(.*?)".*?'
-    patron += 'alt="([^"]+)".*?'
-    patron += '<var>(.*?)</var>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, cantidad in matches:
-        if "?" in scrapedurl:
-            url = urlparse.urljoin(item.url, scrapedurl + "&o=cm")
-        else:
-            url = urlparse.urljoin(item.url, scrapedurl + "?o=cm")
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
-                             fanart=scrapedthumbnail, thumbnail=scrapedthumbnail))
-    itemlist.sort(key=lambda x: x.title)
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    videodata = scrapertools.find_single_match(data, 'videos search-video-thumbs">(.*?)<div class="reset"></div>')
-    patron = '<div class="phimage">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+).*?'
-    patron += 'data-mediumthumb="([^"]+)".*?'
-    patron += '<var class="duration">([^<]+)</var>(.*?)</div>'
-    matches = re.compile(patron, re.DOTALL).findall(videodata)
-    for url, scrapedtitle, thumbnail, duration, scrapedhd in matches:
-        scrapedhd = scrapertools.find_single_match(scrapedhd, '<span class="hd-thumbnail">(.*?)</span>')
-        if scrapedhd  == 'HD':
-            title = "[COLOR yellow]" +duration+ "[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
-        else:
-            title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-        url = urlparse.urljoin(item.url, url)
-        itemlist.append(
-            Item(channel=item.channel, action="play", title=title, url=url, fanart=thumbnail, thumbnail=thumbnail))
-    if itemlist:
-        # Paginador
-        patron = '<li class="page_next"><a href="([^"]+)"'
-        matches = re.compile(patron, re.DOTALL).findall(data)
-        if matches:
-            url = urlparse.urljoin(item.url, matches[0].replace('&amp;', '&'))
-            itemlist.append(
-                Item(channel=item.channel, action="lista", title=">> Página siguiente", fanart=item.fanart,
-                     url=url))
-    return itemlist
-
-def play(item):
-    logger.info(item)
-    itemlist = servertools.find_video_items(item.clone(url = item.url))
-    return itemlist
-    
diff --git a/channels/porn/pornohdmega.json b/channels/porn/pornohdmega.json
deleted file mode 100755
index c8cc0622..00000000
--- a/channels/porn/pornohdmega.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "pornohdmega",
-  "name": "pornohdmega",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.pornohdmega.com/wp-content/uploads/2018/11/dftyu.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/pornohdmega.py b/channels/porn/pornohdmega.py
deleted file mode 100755
index 862a37f1..00000000
--- a/channels/porn/pornohdmega.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.pornohdmega.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/?order=recent"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/?order=top-rated"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/?order=most-viewed"))
-
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li><a href=\'([^\']+)\' title=\'([^\']+) Tag\'>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        if not "tag" in scrapedurl:
-            scrapedurl = ""
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<h2><a href="([^"]+)">([^<]+)</a></h2>.*?'
-    patron += '<strong>(\d+) Videos</strong>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = "%s (%s)" % (scrapedtitle,cantidad)
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<figure class="video-preview"><a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += 'title="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot,))
-    next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<iframe src="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        itemlist.append(item.clone(action="play", title= "%s", url=url))
-        itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/porn/pornrewind.json b/channels/porn/pornrewind.json
deleted file mode 100644
index 8e2ed488..00000000
--- a/channels/porn/pornrewind.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "pornrewind",
-  "name": "pornrewind",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.pornrewind.com/static/images/logo-light-pink.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/pornrewind.py b/channels/porn/pornrewind.py
deleted file mode 100644
index 55d415e8..00000000
--- a/channels/porn/pornrewind.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.pornrewind.com'
-
-# hacer funcionar conector Kt player
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/videos/?sort_by=post_date"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/videos/?sort_by=rating"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/videos/?sort_by=video_viewed"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<a class="thumb-categories" href="([^"]+)" title="([^"]+)">.*?'
-    patron  += '<img class="lazyload" data-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="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a class="thumb" href="([^"]+)" title="([^"]+)".*?'
-    patron += '<img class="lazyload" data-src="([^"]+)".*?'
-    patron += '<span>(.*?)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = title))
-    next_page = scrapertools.find_single_match(data, '<li class="direction"><a href="([^"]+)" data-ajax="pagination">')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page ) )
-    return itemlist
-
diff --git a/channels/porn/porntrex.json b/channels/porn/porntrex.json
deleted file mode 100644
index 1976283d..00000000
--- a/channels/porn/porntrex.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "id": "porntrex",
-  "name": "Porntrex",
-  "language": ["*"],
-  "active": true,
-  "adult": true,
-  "thumbnail": "http://i.imgur.com/n8SUCE9.png?1",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-    {
-      "id": "menu_info",
-      "type": "bool",
-      "label": "Mostrar menú antes de reproducir con imágenes",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/porntrex.py b/channels/porn/porntrex.py
deleted file mode 100644
index 70dbca6f..00000000
--- a/channels/porn/porntrex.py
+++ /dev/null
@@ -1,327 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import config, logger
-
-host = "https://www.porntrex.com"
-perpage = 20
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    config.set_setting("url_error", False, "porntrex")
-    itemlist.append(item.clone(action="lista", title="Nuevos Vídeos", url=host + "/latest-updates/"))
-    itemlist.append(item.clone(action="lista", title="Mejor Valorados", url=host + "/top-rated/"))
-    itemlist.append(item.clone(action="lista", title="Más Vistos", url=host + "/most-popular/"))
-    itemlist.append(item.clone(action="categorias", title="Categorías", url=host + "/categories/"))
-    itemlist.append(item.clone(action="categorias", title="Modelos",
-                               url=host + "/models/?mode=async&function=get_block&block_id=list_models_models" \
-                                          "_list&sort_by=total_videos"))
-    itemlist.append(item.clone(action="categorias", title="Canal", url=host + "/channels/"))
-    itemlist.append(item.clone(action="playlists", title="Listas", url=host + "/playlists/"))
-    itemlist.append(item.clone(action="tags", title="Tags", url=host + "/tags/"))
-    itemlist.append(item.clone(title="Buscar...", action="search"))
-    itemlist.append(item.clone(action="configuracion", title="Configurar canal...", text_color="gold", folder=False))
-
-    return itemlist
-
-
-def configuracion(item):
-    from platformcode import platformtools
-    ret = platformtools.show_channel_settings()
-    platformtools.itemlist_refresh()
-    return ret
-
-
-def search(item, texto):
-    logger.info()
-    item.url = "%s/search/%s/" % (host, texto.replace("+", "-"))
-    item.extra = texto
-    try:
-        return lista(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    # Descarga la pagina 
-    data = get_data(item.url)
-    action = "play"
-    if config.get_setting("menu_info", "porntrex"):
-        action = "menu_info"
-    # Quita las entradas, que no son private <div class="video-preview-screen video-item thumb-item private "
-    patron  = '<div class="video-preview-screen video-item thumb-item  ".*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += 'alt="([^"]+)".*?'
-    patron += '<span class="quality">(.*?)<.*?'
-    patron += '</i>([^<]+)<'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, quality, duration in matches:
-        if "go.php?" in scrapedurl:
-            scrapedurl = urllib.unquote(scrapedurl.split("/go.php?u=")[1].split("&")[0])
-            if not scrapedthumbnail.startswith("https"):
-                scrapedthumbnail = "https:%s" % scrapedthumbnail
-        else:
-            scrapedurl = urlparse.urljoin(host, scrapedurl)
-            if not scrapedthumbnail.startswith("https"):
-                scrapedthumbnail = "https:%s" % scrapedthumbnail
-        scrapedtitle = "%s - [COLOR red]%s[/COLOR] %s" % (duration, quality, scrapedtitle)
-        scrapedthumbnail += "|Referer=https://www.porntrex.com/"
-        itemlist.append(item.clone(action=action, title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, 
-                                   contentThumbnail=scrapedthumbnail, fanart=scrapedthumbnail))
-    # Extrae la marca de siguiente página
-    if item.extra:
-        next_page = scrapertools.find_single_match(data, '<li class="next">.*?from_videos\+from_albums:(\d+)')
-        if next_page:
-            if "from_videos=" in item.url:
-                next_page = re.sub(r'&from_videos=(\d+)', '&from_videos=%s' % next_page, item.url)
-            else:
-                next_page = "%s?mode=async&function=get_block&block_id=list_videos_videos" \
-                            "&q=%s&category_ids=&sort_by=post_date&from_videos=%s" % (item.url, item.extra, next_page)
-            itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
-    else:
-        next_page = scrapertools.find_single_match(data, '<li class="next">.*?href="([^"]*)"')
-        if next_page and not next_page.startswith("#"):
-            if "go.php?" in next_page:
-                next_page = urllib.unquote(next_page.split("/go.php?u=")[1].split("&")[0])
-            else:
-                next_page = urlparse.urljoin(host, next_page)
-            itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
-        else:
-            next_page = scrapertools.find_single_match(data, '<li class="next">.*?from4:(\d+)')
-            if next_page:
-                if "from4" in item.url:
-                    next_page = re.sub(r'&from4=(\d+)', '&from4=%s' % next_page, item.url)
-                else:
-                    next_page = "%s?mode=async&function=get_block&block_id=list_videos_common_videos_list_norm" \
-                                "&sort_by=post_date&from4=%s" % (
-                        item.url, next_page)
-                itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = get_data(item.url)
-
-    # Extrae las entradas
-    if "/channels/" in item.url:
-        patron = '<div class="video-item   ">.*?<a href="([^"]+)" title="([^"]+)".*?src="([^"]+)".*?<li>([^<]+)<'
-    else:
-        patron = '<a class="item" href="([^"]+)" title="([^"]+)".*?src="([^"]+)".*?<div class="videos">([^<]+)<'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle, scrapedthumbnail, videos in matches:
-        if "go.php?" in scrapedurl:
-            scrapedurl = urllib.unquote(scrapedurl.split("/go.php?u=")[1].split("&")[0])
-            scrapedthumbnail = urllib.unquote(scrapedthumbnail.split("/go.php?u=")[1].split("&")[0])
-            scrapedthumbnail += "|Referer=https://www.porntrex.com/"
-        else:
-            scrapedurl = urlparse.urljoin(host, scrapedurl)
-            if not scrapedthumbnail.startswith("https"):
-                scrapedthumbnail = "https:%s" % scrapedthumbnail
-                scrapedthumbnail += "|Referer=https://www.porntrex.com/"
-                scrapedthumbnail = scrapedthumbnail.replace(" " , "%20")
-        if videos:
-            scrapedtitle = "%s  (%s)" % (scrapedtitle, videos)
-        itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail))
-
-    # Extrae la marca de siguiente página
-    next_page = scrapertools.find_single_match(data, '<li class="next">.*?from:(\d+)')
-    if next_page:
-        if "from=" in item.url:
-            next_page = re.sub(r'&from=(\d+)', '&from=%s' % next_page, item.url)
-        else:
-            next_page = "%s&from=%s" % (item.url, next_page)
-        itemlist.append(item.clone(action="categorias", title=">> Página Siguiente", url=next_page))
-
-    return itemlist
-
-
-def playlists(item):
-    logger.info()
-    itemlist = []
-    # Descarga la pagina    
-    data = get_data(item.url)
-    # Extrae las entradas
-    patron = '<div class="item.*?'
-    patron += 'href="([^"]+)" title="([^"]+)".*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<div class="totalplaylist">([^<]+)<'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle, scrapedthumbnail, videos in matches:
-        if "go.php?" in scrapedurl:
-            scrapedurl = urllib.unquote(scrapedurl.split("/go.php?u=")[1].split("&")[0])
-            scrapedthumbnail = urlparse.urljoin(host, scrapedthumbnail)
-        else:
-            scrapedurl = urlparse.urljoin(host, scrapedurl)
-            if not scrapedthumbnail.startswith("https"):
-                scrapedthumbnail = "https:%s" % scrapedthumbnail
-                scrapedthumbnail += "|Referer=https://www.porntrex.com/"
-                scrapedthumbnail = scrapedthumbnail.replace(" " , "%20")
-        if videos:
-            scrapedtitle = "%s  [COLOR red](%s)[/COLOR]" % (scrapedtitle, videos)
-        itemlist.append(item.clone(action="videos", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail))
-    #Extrae la marca de siguiente página
-    next_page = scrapertools.find_single_match(data, '<li class="next">.*?href="([^"]+)"')
-    if next_page:
-        if "go.php?" in next_page:
-            next_page = urllib.unquote(next_page.split("/go.php?u=")[1].split("&")[0])
-        else:
-            next_page = urlparse.urljoin(host, next_page)
-        itemlist.append(item.clone(action="playlists", title=">> Página Siguiente", url=next_page))
-
-    return itemlist
-
-
-def videos(item):
-    logger.info()
-    if not item.indexp:
-        item.indexp = 1
-    itemlist = []
-    # Descarga la pagina 
-    data = get_data(item.url)
-    action = "play"
-    if config.get_setting("menu_info", "porntrex"):
-        action = "menu_info"
-    # Extrae las entradas
-    # Quita las entradas, que no son private  <div class="video-item private ">
-    patron = '<div class="video-item  ".*?'
-    patron += 'href="([^"]+)".*?'
-    patron += 'title="([^"]+)".*?'
-    patron += 'src="([^"]+)"(.*?)<div class="durations">.*?'
-    patron += '</i>([^<]+)</div>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    count = 0
-    for scrapedurl, scrapedtitle, scrapedthumbnail, quality, duration in matches:
-        count += 1
-        if count < item.indexp:
-            continue
-        if "go.php?" in scrapedurl:
-            scrapedurl = urllib.unquote(scrapedurl.split("/go.php?u=")[1].split("&")[0])
-            scrapedthumbnail = urlparse.urljoin(host, scrapedthumbnail)
-        else:
-            scrapedurl = urlparse.urljoin(host, scrapedurl)
-            if not scrapedthumbnail.startswith("https"):
-                scrapedthumbnail = "https:%s" % scrapedthumbnail
-                scrapedthumbnail += "|Referer=https://www.porntrex.com/"
-                scrapedthumbnail = scrapedthumbnail.replace(" " , "%20")
-        if 'k4"' in quality:
-            quality = "4K"
-            scrapedtitle = "%s - [COLOR yellow]%s[/COLOR] %s" % (duration, quality, scrapedtitle)
-        else:
-            quality = scrapertools.find_single_match(quality, '<span class="quality">(.*?)<.*?')
-            scrapedtitle = "%s - [COLOR red]%s[/COLOR] %s" % (duration, quality, scrapedtitle)
-        if len(itemlist) >= perpage:
-            break;
-        itemlist.append(item.clone(action=action, title=scrapedtitle, url=scrapedurl, contentThumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail, thumbnail=scrapedthumbnail))
-    #Extrae la marca de siguiente página
-    if item.channel and len(itemlist) >= perpage:
-        itemlist.append( item.clone(title = "Página siguiente >>>", indexp = count + 1) )
-    return itemlist
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = get_data(item.url)
-    patron = '(?:video_url|video_alt_url[0-9]*):\s*\'([^\']+)\'.*?'
-    patron += '(?:video_url_text|video_alt_url[0-9]*_text):\s*\'([^\']+)\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    scrapertools.printMatches(matches)
-    for url, quality in matches:
-        quality = quality.replace(" HD" , "").replace(" 4k", "")
-        itemlist.append(['.mp4 %s [directo]' % quality, url])
-    if item.extra == "play_menu":
-        return itemlist, data
-    return itemlist
-
-
-def menu_info(item):
-    logger.info()
-    itemlist = []
-    video_urls, data = play(item.clone(extra="play_menu"))
-    itemlist.append(item.clone(action="play", title="Ver -- %s" % item.title, video_urls=video_urls))
-    matches = scrapertools.find_multiple_matches(data, '<img class="thumb lazy-load" src="([^"]+)"')
-    for i, img in enumerate(matches):
-        if i == 0:
-            continue
-        img = "https:" + img + "|Referer=https://www.porntrex.com/"
-        title = "Imagen %s" % (str(i))
-        itemlist.append(item.clone(action="", title=title, thumbnail=img, fanart=img))
-    return itemlist
-
-
-def tags(item):
-    logger.info()
-    itemlist = []
-    data = get_data(item.url)
-
-    if item.title == "Tags":
-        letras = []
-        matches = scrapertools.find_multiple_matches(data, '<strong class="title".*?>\s*(.*?)</strong>')
-        for title in matches:
-            title = title.strip()
-            if title not in letras:
-                letras.append(title)
-                itemlist.append(Item(channel=item.channel, action="tags", url=item.url, title=title, extra=title))
-    else:
-        if not item.length:
-            item.length = 0
-
-        bloque = scrapertools.find_single_match(data,
-                                                '>%s</strong>(.*?)(?:(?!%s)(?!#)[A-Z#]{1}</strong>|<div class="footer-margin">)' % (
-                                                    item.extra, item.extra))
-        matches = scrapertools.find_multiple_matches(bloque, '<a href="([^"]+)">\s*(.*?)</a>')
-        for url, title in matches[item.length:item.length + 100]:
-            if "go.php?" in url:
-                url = urllib.unquote(url.split("/go.php?u=")[1].split("&")[0])
-            itemlist.append(Item(channel=item.channel, action="lista", url=url, title=title))
-
-        if len(itemlist) >= 100:
-            itemlist.append(Item(channel=item.channel, action="tags", url=item.url, title=">> Página siguiente",
-                                 length=item.length + 100, extra=item.extra))
-
-    return itemlist
-
-
-def get_data(url_orig):
-    try:
-        if config.get_setting("url_error", "porntrex"):
-            raise Exception
-        response = httptools.downloadpage(url_orig)
-        if not response.data or "urlopen error [Errno 1]" in str(response.code):
-            raise Exception
-    except:
-        config.set_setting("url_error", True, "porntrex")
-        import random
-        server_random = ['nl', 'de', 'us']
-        server = server_random[random.randint(0, 2)]
-        url = "https://%s.hideproxy.me/includes/process.php?action=update" % server
-        post = "u=%s&proxy_formdata_server=%s&allowCookies=1&encodeURL=0&encodePage=0&stripObjects=0&stripJS=0&go=" \
-               % (urllib.quote(url_orig), server)
-        while True:
-            response = httptools.downloadpage(url, post, follow_redirects=False)
-            if response.headers.get("location"):
-                url = response.headers["location"]
-                post = ""
-            else:
-                break
-    return response.data
diff --git a/channels/porn/porntv.json b/channels/porn/porntv.json
deleted file mode 100755
index d65c8cb8..00000000
--- a/channels/porn/porntv.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "porntv",
-  "name": "porntv",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.porntv.com/images/dart/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/porntv.py b/channels/porn/porntv.py
deleted file mode 100755
index c2a9a31e..00000000
--- a/channels/porn/porntv.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.porntv.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/videos/straight/all-recent.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/videos/straight/all-view.html"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/videos/straight/all-rate.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="lista", url=host + "/videos/straight/all-popular.html"))
-    itemlist.append( Item(channel=item.channel, title="Mas largos" , action="lista", url=host + "/videos/straight/all-length.html"))
-    
-
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "")
-    item.url = host + "/videos/straight/%s-recent.html" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    data = scrapertools.find_single_match(data, '<h1>Popular Categories</h1>(.*?)<h1>Community</h1>')
-    patron = '<h2><a href="([^"]+)">([^<]+)</a>.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<span class="contentquantity">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle + " " + cantidad
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div class="item" style="width: 320px">.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '>(.*?)<div class="trailer".*?'
-    patron += 'title="([^"]+)".*?'
-    patron += 'clock"></use></svg>([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,quality,scrapedtitle,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        if "flag-hd" in quality:
-            title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = scrapedtitle))
-                              
-    next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" class="next"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data, 'sources: \[(.*?)\]')
-    patron = 'file: "([^"]+)",.*?label: "([^"]+)",'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for url,quality in matches:
-        itemlist.append(["%s %s [directo]" % (quality, url), url])
-    return itemlist
-
-
diff --git a/channels/porn/qwertty.json b/channels/porn/qwertty.json
deleted file mode 100644
index 0d618542..00000000
--- a/channels/porn/qwertty.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "qwertty",
-  "name": "qwertty",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://qwertty.net/wp-content/uploads/2019/07/favicon.ico",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/qwertty.py b/channels/porn/qwertty.py
deleted file mode 100644
index 7daedcbe..00000000
--- a/channels/porn/qwertty.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-from channels import pornhub, xvideos,youporn
-
-host = 'http://qwertty.net'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Recientes" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/?filter=most-viewed"))
-    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="lista", url=host + "/?filter=popular"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valoradas" , action="lista", url=host + "/?filter=random"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<li><a href="([^<]+)">(.*?)</a></li>'
-    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="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<article id="post-\d+".*?'
-    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<div class="post-thumbnail(.*?)<span class="views">.*?'
-    patron += '<span class="duration"><i class="fa fa-clock-o"></i>([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
-        scrapedplot = ""
-        thumbnail = scrapertools.find_single_match(scrapedthumbnail, 'poster="([^"]+)"')
-        if thumbnail == "":
-            thumbnail = scrapertools.find_single_match(scrapedthumbnail, "data-thumbs='(.*?jpg)")
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)">Next</a>')
-    if next_page=="":
-        next_page = scrapertools.find_single_match(data,'<li><a class="current">.*?<li><a href="([^"]+)" class="inactive">')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url1 = scrapertools.find_single_match(data,'<meta itemprop="embedURL" content="([^"]+)"')
-    if "spankwire" in url1: 
-        data = httptools.downloadpage(item.url).data
-        data = scrapertools.get_match(data,'Copy Embed Code(.*?)For Desktop')
-        patron  = '<div class="shareDownload_container__item__dropdown">.*?<a href="([^"]+)"'
-        matches = scrapertools.find_multiple_matches(data, patron)
-        for scrapedurl  in matches:
-            url = scrapedurl
-            if url=="#":
-                url = scrapertools.find_single_match(data,'playerData.cdnPath480         = \'([^\']+)\'')
-            itemlist.append(item.clone(action="play", title=url, contentTitle = url, url=url))
-    elif "xvideos1" in url1: 
-        item1 = item.clone(url=url1)
-        itemlist = xvideos.play(item1)
-        return itemlist
-    elif "pornhub" in url1 :
-        url = url1
-    elif "txx" in url1:# Falta conector
-        url = ""
-    elif "youporn" in url1: 
-        item1 = item.clone(url=url1)
-        itemlist = youporn.play(item1)
-        return itemlist
-    else:
-        data = httptools.downloadpage(url1).data
-        url  = scrapertools.find_single_match(data,'"quality":"\d+","videoUrl":"([^"]+)"')
-    url = url.replace("\/", "/")
-
-    itemlist.append(item.clone(action="play", title= "%s  " + url1, contentTitle = item.title, url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) 
-    return itemlist
-
diff --git a/channels/porn/redtube.json b/channels/porn/redtube.json
deleted file mode 100644
index 4d1f69f1..00000000
--- a/channels/porn/redtube.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "redtube",
-  "name": "redtube",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://thumbs-cdn.redtube.com/www-static/cdn_files/redtube/images/pc/logo/redtube_logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
diff --git a/channels/porn/redtube.py b/channels/porn/redtube.py
deleted file mode 100644
index 91c511a0..00000000
--- a/channels/porn/redtube.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-
-import re
-import urlparse
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-
-host = 'https://es.redtube.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/newest"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="peliculas", url=host + "/mostviewed"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="peliculas", url=host + "/top"))
-    itemlist.append( Item(channel=item.channel, title="Pornstars" , action="catalogo", url=host + "/pornstar"))
-    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="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)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle +  " [COLOR yellow]" + cantidad + "[/COLOR] "
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page_url = scrapertools.find_single_match(data,'<a id="wp_navNext" class="js_pop_page" href="([^"]+)">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    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 = '<div class="category_item_wrapper">.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += 'alt="([^"]+)".*?'
-    patron += '<span class="category_count">([^"]+) Videos'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        cantidad = cantidad.strip()
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    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 = '<img id="img_.*?data-path="([^"]+)".*?'
-    patron += '<span class="duration">(.*?)</a>.*?'
-    patron += '<a title="([^"]+)" href="([^"]+)">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,duration,scrapedtitle,scrapedurl in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        scrapedhd = scrapertools.find_single_match(duration, '<span class="hd-video-text">(.*?)</span>')
-        if scrapedhd == 'HD':
-            duration = scrapertools.find_single_match(duration, 'HD</span>(.*?)</span>')
-            title = "[COLOR yellow]" + duration + "[/COLOR] " + "[COLOR red]" + scrapedhd  + "[/COLOR]  " + scrapedtitle
-        else:
-            duration = duration.replace("<span class=\"vr-video\">VR</span>", "")
-            title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-        title = title.replace("    </span>", "").replace("    ", "")
-        scrapedthumbnail = scrapedthumbnail.replace("{index}.", "1.")
-        plot = ""
-        if not "/premium/" in url:
-            itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url,
-                                  fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=plot, contentTitle = title) )
-    next_page_url = scrapertools.find_single_match(data,'<a id="wp_navNext" class="js_pop_page" href="([^"]+)">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '"defaultQuality":true,"format":"",.*?"videoUrl"\:"([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl  in matches:
-        url =  scrapedurl.replace("\/", "/")
-    itemlist.append(item.clone(action="play", title=url, url=url))
-    return itemlist
-
diff --git a/channels/porn/serviporno.json b/channels/porn/serviporno.json
deleted file mode 100644
index 5b72fb31..00000000
--- a/channels/porn/serviporno.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "serviporno",
-  "name": "Serviporno",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "serviporno.png",
-  "banner": "serviporno.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/porn/serviporno.py b/channels/porn/serviporno.py
deleted file mode 100644
index 67096e09..00000000
--- a/channels/porn/serviporno.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-
-host = "https://www.serviporno.com"
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="videos", title="Útimos videos",
-                         url=host + "/ajax/homepage/?page=1", last= host))
-    itemlist.append(Item(channel=item.channel, action="videos", title="Más vistos", 
-                         url=host + "/ajax/most_viewed/?page=1", last= host + "/mas-vistos/"))
-    itemlist.append(Item(channel=item.channel, action="videos", title="Más votados",
-                         url=host + "/ajax/best_rated/?page=1", last= host + "/mas-votados/"))
-    itemlist.append(Item(channel=item.channel, action="categorias", title="Canal",
-                         url=host + "/ajax/list_producers/?page=1", last= host + "/sitios/"))
-    itemlist.append(Item(channel=item.channel, action="categorias", title="Categorias", url= host + "/categorias/"))
-    itemlist.append(Item(channel=item.channel, action="chicas", title="Chicas",
-                         url=host + "/ajax/list_pornstars/?page=1", last= host + "/pornstars/"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar", last=""))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + '/ajax/new_search/?q=%s&page=1' % texto
-    try:
-        return videos(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def get_last_page(url):
-    logger.info()
-    data = httptools.downloadpage(url).data
-    last_page= scrapertools.find_single_match(data,'data-ajax-last-page="(\d+)"')
-    if last_page:
-        last_page= int(last_page)
-    return last_page
-
-
-def videos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '(?s)<div class="wrap-box-escena">.*?'
-    patron += '<div class="box-escena">.*?'
-    patron += '<a\s*href="([^"]+)".*?'
-    patron += 'data-stats-video-name="([^"]+)".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += '<div class="duracion">([^"]+) min</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for url, title, thumbnail,duration in matches:
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + title
-        url = urlparse.urljoin(item.url, url)
-        itemlist.append(Item(channel=item.channel, action='play', title=title, url=url, thumbnail=thumbnail, fanart=thumbnail))
-    # Paginador   "Página Siguiente >>"
-    current_page = int(scrapertools.find_single_match(item.url, "/?page=(\d+)"))
-    if not item.last_page:
-        last_page = get_last_page(item.last)
-    else:
-        last_page = int(item.last_page)
-    if current_page < last_page:
-         next_page = "?page=" + str(current_page + 1)
-         next_page = urlparse.urljoin(item.url,next_page)
-         itemlist.append(Item(channel=item.channel, action="videos", title="Página Siguiente >>", text_color="blue",
-                              url=next_page, thumbnail="", last_page=last_page))
-    return itemlist
-
-
-def chicas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="box-chica">.*?'
-    patron += '<a href="([^"]+)" title="">.*?'
-    patron += '<img class="img" src=\'([^"]+)\' width="175" height="150" border=\'0\' alt="[^"]+" />.*?'
-    patron += '<h4><a href="[^"]+" title="">([^"]+)</a></h4>.*?'
-    patron += '<a class="total-videos" href="[^"]+" title="">([^<]+)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, thumbnail, title, videos in matches:
-        last = urlparse.urljoin(item.url, url)
-        url= last.replace("/pornstar", "/ajax/show_pornstar") + "?page=1"
-        title = title + " (" + videos + ")"
-        itemlist.append(Item(channel=item.channel, action='videos', title=title, url=url, last=last, thumbnail=thumbnail, fanart=thumbnail))
-    # Paginador   "Página Siguiente >>"
-    current_page = int(scrapertools.find_single_match(item.url, "/?page=(\d+)"))
-    if not item.last_page:
-        last_page = get_last_page(item.last)
-    else:
-        last_page = int(item.last_page)
-    if current_page < last_page:
-         next_page = "?page=" + str(current_page + 1)
-         next_page = urlparse.urljoin(item.url,next_page)
-         itemlist.append(Item(channel=item.channel, action="chicas", title="Página Siguiente >>", text_color="blue",
-                              url=next_page, thumbnail="", last_page=last_page))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="wrap-box-escena.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<h4.*?<a href="([^"]+)">([^<]+)<'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for thumbnail, url, title in matches:
-        last = urlparse.urljoin(item.url, url)
-        url= last.replace("/videos-porno", "/ajax/show_category").replace("/sitio","/ajax/show_producer") + "?page=1"
-        itemlist.append(Item(channel=item.channel, action='videos', title=title, url=url, last=last, thumbnail=thumbnail, plot=""))
-    # Paginador   "Página Siguiente >>"
-    current_page = scrapertools.find_single_match(item.url, "/?page=(\d+)")
-    if current_page:
-        current_page = int(current_page)
-    if not item.last_page:
-        last_page = get_last_page(item.last)
-    else:
-        last_page = int(item.last_page)
-    if current_page < last_page:
-         next_page = "?page=" + str(current_page + 1)
-         next_page = urlparse.urljoin(item.url,next_page)
-         itemlist.append(Item(channel=item.channel, action="categorias", title="Página Siguiente >>", text_color="blue",
-                              url=next_page, thumbnail="", last_page=last_page))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, "sendCdnInfo.'([^']+)")
-    itemlist.append(
-        Item(channel=item.channel, action="play", server="directo", title=item.title, url=url, thumbnail=item.thumbnail,
-             plot=item.plot, folder=False))
-    return itemlist
-
diff --git a/channels/porn/sexgalaxy.json b/channels/porn/sexgalaxy.json
deleted file mode 100644
index 36fadfbd..00000000
--- a/channels/porn/sexgalaxy.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "sexgalaxy",
-  "name": "sexgalaxy",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://sexgalaxy.net/wp-content/themes/redwaves-lite/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  
-  ]
-}
-
diff --git a/channels/porn/sexgalaxy.py b/channels/porn/sexgalaxy.py
deleted file mode 100644
index 506bd45a..00000000
--- a/channels/porn/sexgalaxy.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-
-host = 'http://sexgalaxy.net'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Peliculas", action="lista", url=host + "/full-movies/"))
-    itemlist.append(Item(channel=item.channel, title="Videos", action="lista", url=host + "/new-releases/"))
-    itemlist.append(Item(channel=item.channel, title="Canales", action="canales", url=host))
-    itemlist.append(Item(channel=item.channel, title="Categorias", action="categorias", url=host))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def canales(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(host).data
-    data = scrapertools.find_single_match(data, '>TopSites</a>(.*?)</ul>')
-    patron = '<li id=.*?<a href="(.*?)">(.*?)</a></li>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = str(scrapedtitle)
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                             thumbnail=scrapedthumbnail, plot=scrapedplot))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '>Popular Categories<(.*?)</p>')
-    patron = '<a href="(.*?)">(.*?)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = str(scrapedtitle)
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                             thumbnail=scrapedthumbnail, plot=scrapedplot))
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="post-img small-post-img">.*?<a href="(.*?)" title="(.*?)">.*?<img src="(.*?)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
-        scrapedplot = ""
-        calidad = scrapertools.find_single_match(scrapedtitle, '\(.*?/(\w+)\)')
-        if calidad:
-            scrapedtitle = "[COLOR red]" + calidad + "[/COLOR] " + scrapedtitle
-        itemlist.append(Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                             fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot))
-    next_page = scrapertools.find_single_match(data, '<a class="next page-numbers" href="([^"]+)"')
-    if next_page != "":
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
-
-
diff --git a/channels/porn/sexkino.json b/channels/porn/sexkino.json
deleted file mode 100644
index 12ffb7a7..00000000
--- a/channels/porn/sexkino.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "sexkino",
-  "name": "sexkino",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://sexkino.to/wp-content/uploads/2016/12/sexkino.to_.jpg",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/sexkino.py b/channels/porn/sexkino.py
deleted file mode 100644
index c530c2b2..00000000
--- a/channels/porn/sexkino.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-
-host = 'http://sexkino.to'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="New" , action="lista", url= host + "/movies/"))
-    itemlist.append( Item(channel=item.channel, title="Año" , action="anual", 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("pelisalacarta.gmobi mainlist")
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<li class="cat-item cat-item-.*?<a href="(.*?)" >(.*?)</a> <i>(.*?)</i>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,cantidad  in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = scrapedtitle + " ("+cantidad+")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-def anual(item):
-    logger.info()
-    itemlist = []
-    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 = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<div class="poster">.*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)">.*?'
-    patron += '<span class="quality">([^"]+)</span>.*?'
-    patron += '<a href="([^"]+)">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedthumbnail,scrapedtitle,calidad,scrapedurl in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + calidad + ")"
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'resppages.*?<a href="([^"]+)" ><span class="icon-chevron-right">')
-    if next_page != "":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Next page >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    
-    # <th>Watch online</th><th>Quality</th><th>Language</th><th>Added</th></tr></thead>
-    # <tbody>
-    # <tr id='link-3848'><td><img src='https://s2.googleusercontent.com/s2/favicons?domain=vidzella.me'> <a href='http://sexkino.to/links/69321-5/' target='_blank'>Watch online</a></td>
-    # <td><strong class='quality'>DVDRip</strong></td><td>German</td><td>2 years</td></tr>
-    # <tr id='link-3847'><td><img src='https://s2.googleusercontent.com/s2/favicons?domain=flashx.tv'> <a href='http://sexkino.to/links/69321-4/' target='_blank'>Watch online</a></td>
-    # <td><strong class='quality'>DVDRip</strong></td><td>German</td><td>2 years</td></tr>
-    # <tr id='link-3844'><td><img src='https://s2.googleusercontent.com/s2/favicons?domain=openload.co'> <a href='http://sexkino.to/links/69321-3/' target='_blank'>Watch online</a></td>
-    # <td><strong class='quality'>DVDRip</strong></td><td>German</td><td>2 years</td></tr>
-    # <tr id='link-3843'><td><img src='https://s2.googleusercontent.com/s2/favicons?domain=vidoza.net'> <a href='http://sexkino.to/links/69321-2/' target='_blank'>Watch online</a></td>
-    # <td><strong class='quality'>DVDRip</strong></td><td>German</td><td>2 years</td></tr>
-    # <tr id='link-3842'><td><img src='https://s2.googleusercontent.com/s2/favicons?domain=rapidvideo.ws'> <a href='http://sexkino.to/links/69321/' target='_blank'>Watch online</a></td>
-    # <td><strong class='quality'>DVDRip</strong></td><td>German</td><td>2 years</td></tr>
-    # </tbody></table></div></div></div></div>
-
-    
-    
-    patron  = '<tr id=(.*?)</tr>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for match in matches:
-        url = scrapertools.find_single_match(match,'href="([^"]+)" target')
-        title = scrapertools.find_single_match(match,'<td><img src=.*?> (.*?)</td>')
-        itemlist.append(item.clone(action="play", title=title, url=url))
-     
-     # <a id="link" href="https://vidzella.me/play#GS7D" class="btn" style="background-color:#1e73be">Continue</a>
-     
-    patron  = '<iframe class="metaframe rptss" src="([^"]+)".*?<li><a class="options" href="#option-\d+">\s+(.*?)\s+<'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        url = scrapedurl
-        title = scrapedtitle
-        itemlist.append(item.clone(action="play", title=title, url=url))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    itemlist = servertools.find_video_items(data=data)
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-    return itemlist
-
diff --git a/channels/porn/sexofilm.json b/channels/porn/sexofilm.json
deleted file mode 100644
index fc013872..00000000
--- a/channels/porn/sexofilm.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "sexofilm",
-  "name": "sexofilm",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://i0.wp.com/sexofilm.com/xbox/wp-content/uploads/2016/06/SexoFilm-Logo-230x54-LOGO-MOBILE.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/sexofilm.py b/channels/porn/sexofilm.py
deleted file mode 100644
index d71a7d3e..00000000
--- a/channels/porn/sexofilm.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://sexofilm.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/xtreme-adult-wing/adult-dvds/"))
-    itemlist.append( Item(channel=item.channel, title="Parody" , action="lista", url=host + "/xtreme-adult-wing/porn-parodies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/xtreme-adult-wing/porn-clips-movie-scene/"))
-    itemlist.append( Item(channel=item.channel, title="SexMUSIC" , action="lista", url=host + "/topics/sexo-music-videos/"))
-    itemlist.append( Item(channel=item.channel, title="Xshows" , action="lista", url=host + "/xshows/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    # itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url =host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    if item.title == "Canal" :
-        data = scrapertools.find_single_match(data,'>Best Porn Studios</a>(.*?)</ul>')
-    else:
-        data = scrapertools.find_single_match(data,'<div class="nav-wrap">(.*?)<ul class="sub-menu">')
-        itemlist.append( Item(channel=item.channel, action="lista", title="Big tit", url="https://sexofilm.com/?s=big+tits"))
-    patron  = '<a href="([^<]+)">([^<]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle  in matches:
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl) )
-    return itemlist
-
-
-def anual(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<li><a href="([^<]+)">([^<]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<article id="post-\d+".*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += '<h2 class="post-title.*?title="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        plot = ""
-        title = scrapedtitle.replace(" Porn DVD", "").replace("Permalink to ", "").replace(" Porn Movie", "")
-        itemlist.append(item.clone(action="play", title=title, url=scrapedurl, thumbnail=scrapedthumbnail,
-                                   fanart=scrapedthumbnail, plot=plot) )
-    next_page = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data,'<div class="entry-inner">.*?<source src="([^"]+)"')
-    if not url:
-        url = scrapertools.find_single_match(data,'<div class="entry-inner">.*?<source src=\'([^\']+)\'')
-    itemlist = servertools.find_video_items(item.clone(url = item.url))
-    if url:
-        itemlist.append(item.clone(action="play", title=url, url=url))
-    return itemlist
-
-
diff --git a/channels/porn/shameless.json b/channels/porn/shameless.json
deleted file mode 100755
index f8016a10..00000000
--- a/channels/porn/shameless.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "shameless",
-  "name": "Shameless",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.shameless.com/favicon/apple-touch-icon.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/porn/shameless.py b/channels/porn/shameless.py
deleted file mode 100755
index 2d7ca4ab..00000000
--- a/channels/porn/shameless.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.shameless.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/videos/1/"))
-    itemlist.append( Item(channel=item.channel, title="Mas popular" , action="lista", url=host + "/videos/popular/week/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/videos/rated/week/"))
-
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a href="(https://www.shameless.com/categories/[^"]+)".*?'
-    patron += '<span itemprop="name">(.*?)</span> <sup>(.*?)</sup>.*?'
-    patron += 'src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad,scrapedthumbnail in matches:
-        scrapedplot = ""
-        title = scrapedtitle + " " + cantidad
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div class="icnt.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'data-src="([^"]+)" alt="([^"]+)".*?'
-    patron += '<div class="bg"></div>([^<]+)</time>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail + "|Referer=https://www.shameless.com/"
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, 'class="active">.*?<a href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '(?:video_url|video_alt_url[0-9]*):\s*\'([^\']+)\'.*?'
-    patron += '(?:video_url_text|video_alt_url[0-9]*_text):\s*\'([^\']+)\''
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url, quality in matches:
-        headers = {'Referer': item.url}
-        url = httptools.downloadpage(url, headers=headers , follow_redirects=False, only_headers=True).headers.get("location", "")
-        itemlist.append(["%s %s [directo]" % (quality, url), url])
-    return itemlist
-
-
diff --git a/channels/porn/siska.json b/channels/porn/siska.json
deleted file mode 100644
index e4ebb2c4..00000000
--- a/channels/porn/siska.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "siska",
-  "name": "siska",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.siska.tv/images/siska.png?50",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/siska.py b/channels/porn/siska.py
deleted file mode 100644
index 2ef0d1a2..00000000
--- a/channels/porn/siska.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://www.siska.tv/'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "newVideo.php?language=en"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "MostViewed.php?views=month&language=en"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "Channel.php?language=en"))
-
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "index.php?category=1&language=en"))
-    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?q=%s&language=en&search=Search" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    data = scrapertools.find_single_match(data,'<div id="content">(.*?)<div class="maincat">')
-    patron = '<a href="(.*?)".*?'
-    patron += '<img src="(.*?)".*?alt="(.*?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle.replace("Watch Channel ", "")
-        url = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    if "catID=" in item.url:
-        patron = '<li><h3><a href="([^"]+)">.*?'
-        patron += '<img src="([^"]+)" class="imgt" alt="([^"]+)".*?'
-        patron += '<div class="time">(.*?)</div>'
-    else:
-        patron = '<li><h3><a href=\'([^\']+)\'>.*?'
-        patron += '<img src=\'([^\']+)\' class=\'imgt\' alt=\'(.*?)\'.*?'
-        patron += '<div class=\'time\'>(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
-        scrapedtime = scrapedtime.replace("Duration: ", "").replace(" : ", ":")
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                              contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<a href="([^"]+)"><span>Next')
-    if next_page == "":
-        next_page = scrapertools.find_single_match(data, '<a href=\'([^\']+)\' title=\'Next Page\'>')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
diff --git a/channels/porn/sleazemovies.json b/channels/porn/sleazemovies.json
deleted file mode 100644
index 1be75fce..00000000
--- a/channels/porn/sleazemovies.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "sleazemovies",
-  "name": "SleazeMovies",
-  "active": true,
-  "adult": true,
-  "language": [],
-  "thumbnail": "https://i.imgur.com/x0tzGxQ.jpg",
-  "banner": "https://i.imgur.com/d8LsUNf.png",
-  "fanart": "https://i.imgur.com/NRdQvFW.jpg",
-  "categories": [
-    "movie",
-    "vos"
-  ]
-}
diff --git a/channels/porn/sleazemovies.py b/channels/porn/sleazemovies.py
deleted file mode 100644
index 10b81e6f..00000000
--- a/channels/porn/sleazemovies.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- Channel SleazeMovies -*-
-# -*- Created for Alfa-addon -*-
-# -*- By Sculkurt -*-
-
-import re
-from channelselector import get_thumb
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import tmdb
-from core.item import Item
-from platformcode import config, logger
-
-host = 'http://www.eroti.ga/'
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = list()
-    itemlist.append(item.clone(title="Todas", action="list_all", url=host, thumbnail=get_thumb('all', auto=True)))
-    itemlist.append(item.clone(title="Generos", action="genero", url=host, thumbnail=get_thumb('genres', auto=True)))
-    itemlist.append(item.clone(title="Buscar", action="search", thumbnail=get_thumb('search', auto=True)))
-
-    return itemlist
-
-def genero(item):
-    logger.info()
-    itemlist = list()
-    data = httptools.downloadpage(host).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    patron = '<li class="cat-item.*?<a href="([^"]+)".*?>([^<]+)</a>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle in matches:
-        
-            itemlist.append(item.clone(action='list_all', title=scrapedtitle, url=scrapedurl))
-    return itemlist
-
-
-def list_all(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)  # Eliminamos tabuladores, dobles espacios saltos de linea, etc...
-
-    patron = '<div class="featured-thumb"><a href="([^"]+)"><img.*?src="([^?]+).*?data-image-title="([^\(]+).*?\(([^\)]+)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, img, scrapedtitle, year in matches:
-        itemlist.append(Item(channel = item.channel,
-                             title = scrapedtitle, 
-                             url = scrapedurl, 
-                             action = "findvideos",
-                             thumbnail = img,
-                             contentTitle = scrapedtitle,
-                             contentType = "movie",
-                             infoLabels = {'year': year}))
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb = True)
-
-    # Extrae la marca de siguiente página
-    next_page = scrapertools.find_single_match(data, '<a class="next page-numbers" href="([^"]+)">Next</a></div>')
-    if next_page != "":
-	    itemlist.append(Item(channel=item.channel, action="list_all", title=">> Página siguiente", url=next_page, folder=True))
-    return itemlist
-
-
-    
-def search(item, texto):
-    logger.info()
-    if texto != "":
-        texto = texto.replace(" ", "+")
-    item.url = host + "?s=" + texto
-    item.extra = "busqueda"
-    try:
-        return list_all(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def findvideos(item): 
-    logger.info() 
-
-    itemlist = [] 
-
-    data = httptools.downloadpage(item.url).data 
-    logger.debug('codigo = ' + data) 
-
-    itemlist.extend(servertools.find_video_items(data=data)) 
-
-    for video in itemlist: 
-
-        video.channel = item.channel
-        video.contentTitle = item.contentTitle
-		
-    if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
-        itemlist.append(Item(channel = item.channel, 
-                             title = '[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
-                             url = item.url,
-                             action = "add_pelicula_to_library",
-                             extra = "findvideos",
-                             contentTitle = item.contentTitle,
-                             thumbnail = item.thumbnail
-                             ))
-
-    return itemlist 
diff --git a/channels/porn/spankbang.json b/channels/porn/spankbang.json
deleted file mode 100644
index 40cdeee4..00000000
--- a/channels/porn/spankbang.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "spankbang",
-  "name": "spankbang",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://static.spankbang.com/static_desktop/Images/logo_desktop@2xv2.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
-
diff --git a/channels/porn/spankbang.py b/channels/porn/spankbang.py
deleted file mode 100644
index 538eabe8..00000000
--- a/channels/porn/spankbang.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://es.spankbang.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos", action="lista", url= host + "/new_videos/"))
-    itemlist.append( Item(channel=item.channel, title="Mas valorados", action="lista", url=host + "/trending_videos/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos", action="lista", url= host + "/most_popular/"))
-    itemlist.append( Item(channel=item.channel, title="Mas largos", action="lista", url= host + "/longest_videos/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/s/%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<a href="([^"]+)/?order=trending"><img src="([^"]+)"><span>([^"]+)</span></a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl =  urlparse.urljoin(item.url,scrapedurl)
-        scrapedthumbnail =  urlparse.urljoin(item.url,scrapedthumbnail)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle , url=scrapedurl , 
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="video-item" data-id="\d+">.*?'
-    patron += '<a href="([^"]+)" class="thumb ">.*?'
-    patron += 'data-src="([^"]+)" alt="([^"]+)".*?'
-    patron += '</span>(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        scrapedhd = scrapertools.find_single_match(scrapedtime, '<span class="i-hd">(.*?)</span>')
-        duration = scrapertools.find_single_match(scrapedtime, '<i class="fa fa-clock-o"></i>(.*?)</span>')
-        if scrapedhd != '':
-            title = "[COLOR yellow]" + duration + " min[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
-        else:
-            title = "[COLOR yellow]" + duration + " min[/COLOR] " + scrapedtitle
-        thumbnail = "http:" + scrapedthumbnail
-        plot = ""
-        year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, 
-                              fanart=thumbnail, plot=plot, contentTitle=title) )
-    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)">')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>" , text_color="blue",
-                              url=next_page ) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data, 'var stream_url_1080p  = \'([^\']+)\';')
-    if scrapedurl == "":
-        scrapedurl = scrapertools.find_single_match(data, 'var stream_url_720p  = \'([^\']+)\';')
-    if scrapedurl == "":
-        scrapedurl = scrapertools.find_single_match(data, 'var stream_url_480p  = \'([^\']+)\';')
-    scrapedurl = scrapedurl.replace("amp;", "")
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl, thumbnail=item.thumbnail,
-                         plot=item.plot, show=item.title, server="directo"))
-    return itemlist
-
diff --git a/channels/porn/spankwire.json b/channels/porn/spankwire.json
deleted file mode 100644
index bb80d7a9..00000000
--- a/channels/porn/spankwire.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "spankwire",
-  "name": "spankwire",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://cdn1-static-spankwire.spankcdn.net/apple-touch-icon-precomposed.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/spankwire.py b/channels/porn/spankwire.py
deleted file mode 100644
index bd0856c8..00000000
--- a/channels/porn/spankwire.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-
-from core import jsontools as json
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.spankwire.com'
-
-url_api = host + "/api/video/list.json?segment=Straight&limit=33&sortby="
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=url_api + "recent&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=url_api + "views&period=Month&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=url_api + "rating&period=Month&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=url_api + "duration&period=Month&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Pornstar" , action="catalogo", url=host + "/api/pornstars?limit=48&sort=popular&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/api/categories/list.json?segmentId=0&limit=100&sort=abc&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/api/video/search.json?segment=Straight&limit=33&query=%s&page=1" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    JSONData = json.load(data)
-    for Video in  JSONData["items"]:
-        title = Video["name"]
-        id = Video["id"]
-        cantidad = Video["videosNumber"]
-        thumbnail = Video["image"]
-        title =  "%s (%s)" % (title,cantidad)
-        thumbnail = thumbnail.replace("\/", "/").replace(".webp", ".jpg")
-        url = url_api + "recent&category=%s&page=1" % id
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=url,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot) )
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pages"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    JSONData = json.load(data)
-    for Video in  JSONData["items"]:
-        title = Video["name"]
-        id = Video["id"]
-        cantidad = Video["videos"]
-        thumbnail = Video["thumb"]
-        title =  "%s (%s)" % (title,cantidad)
-        thumbnail = thumbnail.replace("\/", "/").replace(".webp", ".jpg")
-        url = host + "/api/video/list.json?pornstarId=%s&limit=25&sortby=recent&page=1" % id
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=url,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot) )
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pages"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    JSONData = json.load(data)
-    for Video in  JSONData["items"]:
-        segundos = Video["duration"]
-        horas=int(segundos/3600)
-        segundos-=horas*3600
-        minutos=int(segundos/60)
-        segundos-=minutos*60
-        if segundos < 10:
-            segundos = "0%s" %segundos
-        if minutos < 10:
-            minutos = "0%s" %minutos
-        if horas == 00:
-            duration = "%s:%s" % (minutos,segundos)
-        else:
-            duration = "%s:%s:%s" % (horas,minutos,segundos)
-        title = Video["title"]
-        thumbnail = Video["flipBookPath"]
-        url = host + Video["url"]
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + title
-        thumbnail = thumbnail.replace("\/", "/").replace("{index}", "2")
-        url = url.replace("\/", "/")
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot))
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pages"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data,'<div class="shareDownload_container__item__dropdown">.*?<a href="([^"]+)"')
-    itemlist.append(item.clone(action="play", server = "directo", url=scrapedurl))
-    return itemlist
-
diff --git a/channels/porn/streamingporn.json b/channels/porn/streamingporn.json
deleted file mode 100644
index 0f7929a5..00000000
--- a/channels/porn/streamingporn.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "id": "streamingporn",
-  "name": "streamingporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://streamingporn.xyz/wp-content/uploads/2017/06/streamingporn.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
-
diff --git a/channels/porn/streamingporn.py b/channels/porn/streamingporn.py
deleted file mode 100644
index 383bedae..00000000
--- a/channels/porn/streamingporn.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://streamingporn.xyz'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/category/movies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/stream/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'PaySites(.*?)<li id="menu-item-28040"')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li id="menu-item-\d+".*?<a href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle , url=scrapedurl , 
-                        thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'<a href="#">Categories</a>(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li id="menu-item-\d+".*?<a href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle , url=scrapedurl , 
-                        thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<div class="entry-featuredImg">.*?<a href="([^"]+)">.*?<img src="([^"]+)" alt="([^"]+)">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle  in matches:
-        url = scrapedurl
-        title = scrapedtitle
-        if 'HD' in scrapedtitle :
-            calidad = scrapertools.find_single_match(scrapedtitle, '(\d+)p')
-            title = "[COLOR red]" + "HD" +"[/COLOR] "+ scrapedtitle
-            if calidad :
-                title = "[COLOR red]" + "HD" + calidad +" [/COLOR] "+ scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail, 
-                              fanart=scrapedthumbnail, plot=plot, contentTitle = contentTitle) )
-    next_page_url = scrapertools.find_single_match(data,'<div class="loadMoreInfinite"><a href="(.*?)" >Load More')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="lista" , title="Página Siguiente >>" , 
-                        text_color="blue", url=next_page_url) )
-    return itemlist
-
diff --git a/channels/porn/streamporno.json b/channels/porn/streamporno.json
deleted file mode 100644
index 437adbbe..00000000
--- a/channels/porn/streamporno.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "id": "streamporno",
-  "name": "streamporno",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://pornstreams.eu/wp-content/uploads/2015/12/faviiconeporn.png",
-  "banner": "",
-  "categories": [
-    "adult"
-
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/streamporno.py b/channels/porn/streamporno.py
deleted file mode 100644
index 0634b825..00000000
--- a/channels/porn/streamporno.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://streamporno.eu'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<li id="menu-item-.*?<a href="([^"]+)">([^"]+)</a>'
-    if item.title == "Categorias":
-        itemlist.append( Item(channel=item.channel, title="Big Tits" , action="lista", url=host + "/?s=big+tits"))
-        patron  = '<li class="cat-item.*?<a href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<article id=.*?<a href="([^"]+)" title="([^"]+)">.*?src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail  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, fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
diff --git a/channels/porn/submityouflicks.json b/channels/porn/submityouflicks.json
deleted file mode 100644
index 42bdf281..00000000
--- a/channels/porn/submityouflicks.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id": "submityouflicks",
-  "name": "Submit Your Flicks",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "banner": "submityouflicks.png",
-  "thumbnail": "submityouflicks.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
diff --git a/channels/porn/submityouflicks.py b/channels/porn/submityouflicks.py
deleted file mode 100644
index 4d726fb8..00000000
--- a/channels/porn/submityouflicks.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-
-host = 'http://www.submityourflicks.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    
-    itemlist.append(Item(channel=item.channel, action="videos", title="Útimos videos", url= host))
-    itemlist.append(Item(channel=item.channel, action="videos", title="Mas vistos", url= host + "/most-viewed/"))
-    itemlist.append(Item(channel=item.channel, action="videos", title="Mejor valorados", url= host + "/top-rated/"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar", url= host))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "-")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return videos(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def videos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="item-block item-normal col".*?'
-    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += '</span> ([^"]+)<'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        url = scrapedurl
-        thumbnail = scrapedthumbnail.replace(" ", "%20")
-        itemlist.append(Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                             fanart=thumbnail))
-    next_page = scrapertools.find_single_match(data, "<a href='([^']+)' class=\"next\">NEXT</a>")
-    if next_page != "":
-        url = urlparse.urljoin(item.url, next_page)
-        itemlist.append(Item(channel=item.channel, action="videos", title=">> Página siguiente", url=url))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    media_url = "https:" + scrapertools.find_single_match(data, 'source src="([^"]+)"')
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=media_url,
-                         thumbnail=item.thumbnail, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/sunporno.json b/channels/porn/sunporno.json
deleted file mode 100644
index dff98bb7..00000000
--- a/channels/porn/sunporno.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "sunporno",
-  "name": "sunporno",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://sunstatic.fuckandcdn.com/sun/sunstatic/v31/common/sunporno/img/logo_top.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/sunporno.py b/channels/porn/sunporno.py
deleted file mode 100644
index e9a0259f..00000000
--- a/channels/porn/sunporno.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.sunporno.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host +"/most-recent/"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/most-viewed/date-last-week/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/top-rated/date-last-week/"))
-    itemlist.append( Item(channel=item.channel, title="Mas largas" , action="lista", url=host + "/long-movies/date-last-month/"))
-    itemlist.append( Item(channel=item.channel, title="PornStars" , action="catalogo", url=host + "/pornstars/most-viewed/1/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/channels/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="thumb-container with-title moviec.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<a title="([^"]+)".*?'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = scrapedurl + "/most-recent/"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="starec">.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img class="thumb" src="([^"]+)"  alt="([^"]+)".*?'
-    patron += '<p class="videos">(\d+)</p>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li><a class="pag-next" href="(.*?)">Next &gt;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel , action="catalogo", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist    
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data,'class="thumbs-container">(.*?)<div class="clearfix">')
-    patron  = '<p class="btime">([^"]+)</p>.*?'
-    patron += '>(.*?)<img width=.*?'
-    patron += '="([^"]+)" class="thumb.*?'
-    patron += 'title="([^"]+)".*?'
-    patron += 'href="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for duracion,calidad,scrapedthumbnail,scrapedtitle,scrapedurl in matches:
-        url = scrapedurl
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        if ">HD<" in calidad:
-            title = "[COLOR yellow]" + duracion + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                              fanart=scrapedthumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data,'<li><a class="pag-next" href="(.*?)">Next &gt;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel , action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<video src="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl  in matches:
-        scrapedurl = scrapedurl.replace("https:", "http:")
-        scrapedurl += "|Referer=%s" % host
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
-                            thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/sxyprn.json b/channels/porn/sxyprn.json
deleted file mode 100755
index 55157b53..00000000
--- a/channels/porn/sxyprn.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "sxyprn",
-  "name": "sxyprn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.sxyprn.com/favicon.ico",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/sxyprn.py b/channels/porn/sxyprn.py
deleted file mode 100755
index 8f68519b..00000000
--- a/channels/porn/sxyprn.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,re
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.sxyprn.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/blog/all/0.html?fl=all&sm=latest"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/popular/top-viewed.html"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/popular/top-rated.html"))
-    itemlist.append( Item(channel=item.channel, title="Sitios" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "-")
-    item.url = host + "/%s.html" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    if "Sitios" in item.title:
-        patron = "<a href='([^']+)' target='_blank'><div class='top_sub_el top_sub_el_sc'>.*?"
-        patron += "<span class='top_sub_el_key_sc'>([^<]+)</span>"
-        patron += "<span class='top_sub_el_count'>(\d+)</span>"
-    else:
-        patron = "<a class='tdn' href='([^']+)'.*?"
-        patron += "<span class='htag_el_tag'>([^<]+)</span>"
-        patron += "<span class='htag_el_count'>(\d+) videos</span>"
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = "<img class=.*?"
-    patron += " src='([^']+)'.*?"
-    patron += "<span class='duration_small'.*?'>([^<]+)<.*?"
-    patron += "<span class='shd_small'.*?>([^<]+)<.*?"
-    patron += "post_time' href='([^']+)' title='([^']+)'"
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedtime,quality,scrapedurl,scrapedtitle in matches:
-        title = "[COLOR yellow]%s[/COLOR] [COLOR red]%s[/COLOR] %s" % (scrapedtime,quality,scrapedtitle)
-        thumbnail = "https:" + scrapedthumbnail
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
-                              # 
-    next_page = scrapertools.find_single_match(data, "<div class='ctrl_el ctrl_sel'>.*?<a href='([^']+)'")
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    url = scrapertools.find_single_match(data, 'data-vnfo=.*?":"([^"]+)"')
-    url = url.replace("\/", "/").replace("/cdn/", "/cdn7/")
-    url = urlparse.urljoin(item.url,url)
-    itemlist.append( Item(channel=item.channel, action="play", title = "%s " + url, url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/porn/tabooshare.json b/channels/porn/tabooshare.json
deleted file mode 100644
index 568b6953..00000000
--- a/channels/porn/tabooshare.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "tabooshare",
-  "name": "tabooshare",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://tabooshare.com/wp-content/uploads/2017/06/cropped-TSa-180x180.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/tabooshare.py b/channels/porn/tabooshare.py
deleted file mode 100644
index e2bdd1c7..00000000
--- a/channels/porn/tabooshare.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import re
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-from platformcode import config
-
-host = 'http://tabooshare.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Ultimos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data,'<h3>Categories</h3>(.*?)</ul>')
-    patron  = '<li class="cat-item cat-item-\d+"><a href="(.*?)" >(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedtitle = str(scrapedtitle)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    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)
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle.replace(" &#8211; Free Porn Download", "")
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<span class="current">.*?<a href="(.*?)"')
-    if next_page=="http://NaughtyPorn.net/":
-        next_page = scrapertools.find_single_match(data,'<span class="current">.*?<a href=\'(.*?)\'')
-    if next_page!="":
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    itemlist = servertools.find_video_items(data=data)
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-    return itemlist
-
diff --git a/channels/porn/thumbzilla.json b/channels/porn/thumbzilla.json
deleted file mode 100644
index fcce22f8..00000000
--- a/channels/porn/thumbzilla.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "id": "thumbzilla",
-  "name": "ThumbZilla",
-  "active": true,
-  "adult": true,
-  "language": "en",
-  "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/xthearebg.jpg",
-  "thumbnail": "https://ci.phncdn.com/www-static/thumbzilla/images/pc/logo.png?cache=2018110203",
-  "banner": "",
-   "categories": [
-   "adult"
- ],
- "settings": [
-    {
-      "id": "modo_grafico",
-      "type": "bool",
-      "label": "Buscar información extra",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "perfil",
-      "type": "list",
-      "label": "Perfil de color",
-      "default": 3,
-      "enabled": true,
-      "visible": true,
-      "lvalues": [
-        "Sin color",
-        "Perfil 3",
-        "Perfil 2",
-        "Perfil 1"
-      ]
-    }
-  ]
-}
diff --git a/channels/porn/thumbzilla.py b/channels/porn/thumbzilla.py
deleted file mode 100644
index aab21aee..00000000
--- a/channels/porn/thumbzilla.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import channeltools
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from channelselector import get_thumb
-
-__channel__ = "thumbzilla"
-
-host = 'https://www.thumbzilla.com'
-try:
-    __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
-    __perfil__ = int(config.get_setting('perfil', __channel__))
-except:
-    __modo_grafico__ = True
-    __perfil__ = 0
-
-# Fijar perfil de color
-perfil = [['0xFF6E2802', '0xFFFAA171', '0xFFE9D7940'],
-          ['0xFFA5F6AF', '0xFF5FDA6D', '0xFF11811E'],
-          ['0xFF58D3F7', '0xFF2E64FE', '0xFF0404B4']]
-
-if __perfil__ - 1 >= 0:
-    color1, color2, color3 = perfil[__perfil__ - 1]
-else:
-    color1 = color2 = color3 = ""
-
-headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
-           ['Referer', host]]
-
-parameters = channeltools.get_channel_parameters(__channel__)
-fanart_host = parameters['fanart']
-thumbnail_host = parameters['thumbnail']
-thumbnail = 'https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/%s.png'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=__channel__, action="videos", title="Más Calientes", url=host,
-                         viewmode="movie", thumbnail=get_thumb("adult.png")))
-
-    itemlist.append(Item(channel=__channel__, title="Nuevas", url=host + '/newest',
-                         action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("adult.png")))
-
-    itemlist.append(Item(channel=__channel__, title="Tendencias", url=host + '/tending',
-                         action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("adult.png")))
-
-    itemlist.append(Item(channel=__channel__, title="Mejores Videos", url=host + '/top',
-                         action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("adult.png")))
-
-    itemlist.append(Item(channel=__channel__, title="Populares", url=host + '/popular',
-                         action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("adult.png")))
-
-    itemlist.append(Item(channel=__channel__, title="Videos en HD", url=host + '/hd',
-                         action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("adult.png")))
-
-    itemlist.append(Item(channel=__channel__, title="Caseros", url=host + '/hd',
-                         action="videos", viewmode="movie_with_plot", viewcontent='homemade',
-                         thumbnail=get_thumb("adult.png")))
- 
-    itemlist.append(Item(channel=__channel__, title="PornStar", action="catalogo",
-                         url=host + '/pornstars/', viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("adult.png")))
- 
-    itemlist.append(Item(channel=__channel__, title="Categorías", action="categorias",
-                         url=host + '/categories/', viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("adult.png")))
-
-    itemlist.append(Item(channel=__channel__, title="Buscador", action="search", url=host,
-                         thumbnail=get_thumb("adult.png"), extra="buscar"))
-    return itemlist
-
-
-# REALMENTE PASA LA DIRECCION DE BUSQUEDA
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = urlparse.urljoin(item.url, "video/search?q={0}".format(texto))
-    # item.url = item.url % tecleado
-    item.extra = "buscar"
-    try:
-        return videos(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
-
-def videos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-    patron = '<a class="[^"]+" href="([^"]+)">'  # url
-    patron += '<img id="[^"]+".*?src="([^"]+)".*?'  # img
-    patron += '<span class="title">([^<]+)</span>.*?'  # title
-    patron += '<span class="duration"(.*?)</a>'  # time
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedtime in matches:
-        time = scrapertools.find_single_match(scrapedtime, '>([^<]+)</span>')
-        title = "[%s] %s" % (time, scrapedtitle)
-        if ">HD<" in scrapedtime:
-            title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        itemlist.append(Item(channel=item.channel, action='play', title=title, thumbnail=scrapedthumbnail,
-                             url=host + scrapedurl, contentTile=scrapedtitle, fanart=scrapedthumbnail))
-    paginacion = scrapertools.find_single_match(data, '<link rel="next" href="([^"]+)" />').replace('amp;', '')
-    if paginacion:
-        itemlist.append(Item(channel=item.channel, action="videos",
-                             thumbnail=thumbnail % 'rarrow',
-                             title="\xc2\xbb Siguiente \xc2\xbb", url=paginacion))
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<li class="pornstars">.*?<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        itemlist.append(Item(channel=item.channel, action="videos", url=url, title=scrapedtitle, fanart=scrapedthumbnail,
-                             thumbnail=scrapedthumbnail, viewmode="movie_with_plot"))
-    paginacion = scrapertools.find_single_match(data, '<link rel="next" href="([^"]+)" />').replace('amp;', '')
-    if paginacion:
-        itemlist.append(Item(channel=item.channel, action="catalogo",
-                             thumbnail=thumbnail % 'rarrow',
-                             title="\xc2\xbb Siguiente \xc2\xbb", url=paginacion))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    # logger.info(data)
-    patron = 'class="checkHomepage"><a href="([^"]+)".*?'  # url
-    patron += '<span class="count">([^<]+)</span>'  # title, vids
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, vids in matches:
-        scrapedtitle = scrapedurl.replace('/categories/', '').replace('-', ' ').title()
-        title = "%s (%s)" % (scrapedtitle, vids.title())
-        thumbnail = item.thumbnail
-        url = urlparse.urljoin(item.url, scrapedurl)
-        itemlist.append(Item(channel=item.channel, action="videos", fanart=thumbnail,
-                             title=title, url=url, thumbnail=thumbnail,
-                             viewmode="movie_with_plot", folder=True))
-    return itemlist
-
-
-def play(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, '"quality":"[^"]+","videoUrl":"([^"]+)"').replace('\\', '')
-    itemlist.append(item.clone(url=url, title=item.contentTile))
-    return itemlist
-
diff --git a/channels/porn/titsbox.json b/channels/porn/titsbox.json
deleted file mode 100755
index 1262153a..00000000
--- a/channels/porn/titsbox.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "titsbox",
-  "name": "titsbox",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://titsbox.com/android-chrome-192x192.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/titsbox.py b/channels/porn/titsbox.py
deleted file mode 100755
index d34d1f47..00000000
--- a/channels/porn/titsbox.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-
-from core import jsontools as json
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://titsbox.com'    #titbox vivud zmovs
-
-url_api = host + "/?ajax=1&type="
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=url_api + "most-recent&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=url_api + "top-rated&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=url_api + "long&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '<ul class="sidebar-nav">(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a class="category-item" href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        url = host + scrapedurl + "?ajax=1&type=most-recent&page=1"
-        scrapedplot = ""
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    JSONData = json.load(data)
-    for Video in JSONData["data"]:
-        duration = Video["duration"]
-        title = Video["videoTitle"]
-        title = "[COLOR yellow]%s[/COLOR] %s" % (duration,title)
-        src= Video["src"]
-        domain=""
-        thumbnail = src.get('domain', domain) + src.get('pathMedium', domain)+"1.jpg"
-        url= Video["urls_CDN"]
-        url= url.get('480', domain)
-        url = url.replace("/\n/", "/")
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot,))
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pagesLeft"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
-    return itemlist
-
-
-def findvideos(item):
-    return
-
diff --git a/channels/porn/tnaflix.json b/channels/porn/tnaflix.json
deleted file mode 100644
index 94f6956e..00000000
--- a/channels/porn/tnaflix.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "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/channels/porn/tnaflix.py b/channels/porn/tnaflix.py
deleted file mode 100644
index 0df37291..00000000
--- a/channels/porn/tnaflix.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-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/?d=all&period=all"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/popular/?d=all&period=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 = httptools.downloadpage(item.url).data
-    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.find_single_match(data,'</i> Hall Of Fame Pornstars</h1>(.*?)</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 = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a class=\'thumb no_ajax\' href=\'(.*?)\'.*?'
-    patron += 'data-original=\'(.*?)\' alt="([^"]+)"><div class=\'videoDuration\'>([^<]+)</div>(.*?)<div class=\'watchedInfo'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion,quality in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        if quality:
-            quality= scrapertools.find_single_match(quality, '>(\d+p)<')
-            title = "[COLOR yellow]" + duracion + "[/COLOR] " + "[COLOR red]" + quality +  "[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append(Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                             fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page_url = scrapertools.find_single_match(data,'<a class="llNav" href="([^"]+)">')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    return itemlist
-
-
-def ref(url):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(url).data
-    VID = scrapertools.find_single_match(data,'id="VID" type="hidden" value="([^"]+)"')
-    vkey = scrapertools.find_single_match(data,'id="vkey" type="hidden" value="([^"]+)"')
-    thumb = scrapertools.find_single_match(data,'id="thumb" type="hidden" value="([^"]+)"')
-    nkey= scrapertools.find_single_match(data,'id="nkey" type="hidden" value="([^"]+)"')
-    url = "https://cdn-fck.tnaflix.com/tnaflix/%s.fid?key=%s&VID=%s&nomp4=1&catID=0&rollover=1&startThumb=%s" % (vkey, nkey, VID, thumb)
-    url += "&embed=0&utm_source=0&multiview=0&premium=1&country=0user=0&vip=1&cd=0&ref=0&alpha"
-    return url
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    url= ref(item.url)
-    headers = {'Referer': item.url}
-    data = httptools.downloadpage(url, headers=headers).data
-    patron = '<res>(.*?)</res>.*?'
-    patron += '<videoLink><([^<]+)></videoLink>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for title, url in matches:
-        url= url.replace("![CDATA[", "http:").replace("]]", "")
-        itemlist.append(["%s %s [directo]" % (title, url), url])
-    itemlist.reverse()
-    return itemlist
-
-
diff --git a/channels/porn/tryboobs.json b/channels/porn/tryboobs.json
deleted file mode 100644
index 9fe3080f..00000000
--- a/channels/porn/tryboobs.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "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/channels/porn/tryboobs.py b/channels/porn/tryboobs.py
deleted file mode 100644
index 333751d3..00000000
--- a/channels/porn/tryboobs.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://www.tryboobs.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/most-popular/week/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor Valorado" , action="lista", url=host + "/top-rated/week/"))
-    itemlist.append( Item(channel=item.channel, title="Modelos" , action="categorias", url=host + "/models/model-viewed/1/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a href="([^"]+)" class="th-[^"]+">.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<span>(\d+)</span>.*?'
-    patron += '<span class="title">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,cantidad,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li><a class="pag-next" href="([^"]+)"><ins>Next</ins></a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = 'href="([^"]+)"\s*class="th-video.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span class="time">([^"]+)</span>.*?'
-    patron += '<span class="title">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,duracion,scrapedtitle  in matches:
-        url = scrapedurl
-        contentTitle = scrapedtitle
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<li><a class="pag-next" href="([^"]+)"><ins>Next</ins></a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<video src="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url  in matches:
-        url += "|Referer=%s" % host
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=url,
-                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/tubedupe.json b/channels/porn/tubedupe.json
deleted file mode 100644
index 37fa768b..00000000
--- a/channels/porn/tubedupe.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "tubedupe",
-  "name": "tubedupe",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://tubedupe.com/apple-touch-icon-180x180-precomposed.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
-
diff --git a/channels/porn/tubedupe.py b/channels/porn/tubedupe.py
deleted file mode 100644
index 0897c8bb..00000000
--- a/channels/porn/tubedupe.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://tubedupe.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/latest-updates/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=host + "/top-rated/"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/most-popular/"))
-    itemlist.append( Item(channel=item.channel, title="Modelos" , action="categorias", url=host + "/models/?sort_by=model_viewed"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/channels/?sort_by=cs_viewed"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/?sort_by=avg_videos_popularity"))
-    # itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="block-[^"]+">.*?'
-    patron += '<a href="([^"]+)".*?title="([^"]+)".*?'
-    patron += 'src="([^"]+)".*?'
-    if '/models/' in item.url:
-        patron += '<span class="strong">Videos</span>(.*?)</div>'
-    else:
-        patron += '<var class="duree">([^"]+) </var>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad  in matches:
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        cantidad = cantidad.strip()
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail,fanart=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data, '<li class="active">.*?<a href="([^"]+)" title="Page')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page ) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="block-video">.*?'
-    patron += '<a href="([^"]+)" class="[^"]+" title="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<var class="duree">(.*?)</var>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedtime in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail,plot=plot, contentTitle = title))
-    next_page = scrapertools.find_single_match(data, '<li class="active">.*?<a href="([^"]+)" title="Page')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page ) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    scrapedurl = scrapertools.find_single_match(data, 'video_alt_url3: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_alt_url2: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_alt_url: \'([^\']+)\'')
-    if scrapedurl == "" :
-        scrapedurl = scrapertools.find_single_match(data, 'video_url: \'([^\']+)\'')
-
-    itemlist.append(Item(channel=item.channel, action="play", title=scrapedurl, url=scrapedurl,
-                        thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
-
diff --git a/channels/porn/tubehentai.json b/channels/porn/tubehentai.json
deleted file mode 100644
index 57321cbf..00000000
--- a/channels/porn/tubehentai.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "tubehentai",
-    "name": "tubehentai",
-    "active": true,
-    "adult": true,
-    "language": ["*"],
-    "banner": "tubehentai.png",
-    "thumbnail": "tubehentai.png",
-    "categories": [
-        "adult"
-    ],
-    "settings": [
-    ]
-}
\ No newline at end of file
diff --git a/channels/porn/tubehentai.py b/channels/porn/tubehentai.py
deleted file mode 100644
index 6352c943..00000000
--- a/channels/porn/tubehentai.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-
-host = 'http://tubehentai.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Novedades", action="lista", url=host + "/most-recent/"))
-    itemlist.append(Item(channel=item.channel, title="Mas visto", action="lista", url=host + "/most-viewed/"))
-    itemlist.append(Item(channel=item.channel, title="Mejor valorado", action="lista", url=host + "/top-rated/"))
-
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "%20")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return lista(item)
-    # Se captura la excepciÛn, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<a href="((?:http|https)://tubehentai.com/video/[^"]+)" title="([^"]+)".*?'
-    patron += '<span class="icon -time">.*?<span class="item__stat-label">([^<]+)</span>.*?'
-    patron += '<img src="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,duration,scrapedthumbnail in matches:
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + scrapedtitle
-        itemlist.append(Item(channel=item.channel, action="play", title=title, url=scrapedurl, 
-                        fanart=scrapedthumbnail, thumbnail=scrapedthumbnail))
-    next_page = scrapertools.find_single_match(data,'<a rel=\'next\' title=\'Next\' href=\'([^\']+)\'')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url = scrapertools.find_single_match(data, '<source src="([^"]+\.mp4)"')
-    server = "Directo"
-    itemlist.append(Item(channel=item.channel, title="", url=url, server=server, folder=False))
-    return itemlist
-
diff --git a/channels/porn/videosXYZ.json b/channels/porn/videosXYZ.json
deleted file mode 100644
index b9726ca3..00000000
--- a/channels/porn/videosXYZ.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "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/channels/porn/videosXYZ.py b/channels/porn/videosXYZ.py
deleted file mode 100644
index 6f645dcf..00000000
--- a/channels/porn/videosXYZ.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://free-porn-videos.xyz'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/topics/adult-movie/"))
-    itemlist.append( Item(channel=item.channel, title="Parody" , action="lista", url=host + "/topics/free-porn-parodies/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/topics/porn-videos/"))
-    itemlist.append( Item(channel=item.channel, title="BigTits" , action="lista", url=host + "/?s=big+tit"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<article id="post-\d+".*?<a href="([^"]+)".*?data-src="([^"]+)".*?alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle.replace("Permalink to Watch ", "").replace("Porn Online", "").replace("Permalink to ", "")
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, contentTitle=scrapedtitle, plot=scrapedplot) )
-    next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">&raquo;</a>')
-    if next_page_url!="":
-        next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page_url) )
-    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.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-    return itemlist
-
diff --git a/channels/porn/vidz7.json b/channels/porn/vidz7.json
deleted file mode 100644
index ab0941f5..00000000
--- a/channels/porn/vidz7.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "id": "vidz7",
-  "name": "Vidz7",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "banner": "https://www.dropbox.com/s/182r0wby3ohnxkc/bannermenu.jpg?dl=1",
-  "thumbnail": "https://www.dropbox.com/s/7z31b4ixve2ge0l/thumbnail.png?dl=1",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": false,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/vidz7.py b/channels/porn/vidz7.py
deleted file mode 100644
index de2cb712..00000000
--- a/channels/porn/vidz7.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-
-host = 'http://www.vidz7.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="lista", title="Útimos videos", url=host))
-    itemlist.append(
-        Item(channel=item.channel, action="categorias", title="Canal", url=host + "/category/"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar", url="http://www.vidz7.com"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}", "", data)
-    patron = '<li><a href="([^"]+)">([^<]+)</a><span>(\d+) </'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for url, title, cantidad in matches:
-        title = title + " (" + cantidad + ")"
-        itemlist.append(Item(channel=item.channel, action="lista", title=title, url=url))
-
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    # Descarga la página
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}", "", data)
-    patron = "<a href='.*?.' class='thumb' style='background-image:url\(\"([^\"]+)\"\).*?"
-    patron += "<div class=\"hd\">(.*?)</div>.*?"
-    patron += "<div class=\"duration\">(.*?)</div>.*?"
-    patron += "<h6><a class='hp' href='([^']+)'>(.*?)</a></h6>"
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-    for scrapedthumbnail, scrapedhd, duration, scrapedurl, scrapedtitle in matches:
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        url = urlparse.urljoin(item.url, scrapedurl)
-        scrapedtitle = scrapedtitle.strip()
-        title = "[COLOR yellow]" + duration + "[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR]  "+scrapedtitle
-        # Añade al listado
-        itemlist.append(Item(channel=item.channel, action="play", title=title, thumbnail=thumbnail, fanart=thumbnail,
-                             contentTitle=title, url=url,
-                             viewmode="movie", folder=True))
-    paginacion = scrapertools.find_single_match(data,'<a class="active".*?.>\d+</a><a class="inactive" href ="([^"]+)">')
-    if paginacion:
-        itemlist.append(Item(channel=item.channel, action="lista", title=">> Página Siguiente", url=paginacion))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    # Descarga la página
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.unescape(data)
-    itemlist.extend(servertools.find_video_items(data=data))
-    for videoitem in itemlist:
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-        videoitem.action = "play"
-        videoitem.folder = False
-        videoitem.title = item.title
-    return itemlist
-
diff --git a/channels/porn/vintagetube.json b/channels/porn/vintagetube.json
deleted file mode 100644
index ddf36990..00000000
--- a/channels/porn/vintagetube.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "vintagetube",
-  "name": "vintagetube",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.vintagexxxsex.com/images/vintagexxxsex.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  
-  ]
-}
-
diff --git a/channels/porn/vintagetube.py b/channels/porn/vintagetube.py
deleted file mode 100644
index fafe7f37..00000000
--- a/channels/porn/vintagetube.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-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">.*?'
-    patron += '<a href="([^"]+)">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span class="prev-tit">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def peliculas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="prev">.*?'
-    patron += '<a href="([^"]+)">.*?'
-    patron += '<img src="([^"]+)">.*?'
-    patron += '<span class="prev-tit">([^"]+)</span>.*?'
-    patron += '<div class="prev-dur"><span>([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,scrapedtime in matches:
-        scrapedplot = ""
-        scrapedtitle = "[COLOR yellow]" + (scrapedtime) + "[/COLOR] " + str(scrapedtitle)
-        scrapedurl = scrapedurl.replace("/xxx.php?tube=", "")
-        scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<span class="page">.*?<a target="_self" href="([^"]+)"')
-
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="peliculas", title="Página Siguiente >>", text_color="blue", url=next_page) )
-                
-    return itemlist
-
-
-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="([^"]+)"')
-        data = httptools.downloadpage(scrapedurl).data
-    else:
-        data = httptools.downloadpage(scrapedurl).data
-        scrapedurl = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
-        data = httptools.downloadpage("https:" + scrapedurl).data
-    scrapedurl = scrapertools.find_single_match(data,'<source src="([^"]+)"')
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
-                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-    
diff --git a/channels/porn/vintagexxxsex.json b/channels/porn/vintagexxxsex.json
deleted file mode 100644
index 6c51cae5..00000000
--- a/channels/porn/vintagexxxsex.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "vintagexxxsex",
-  "name": "vintagexxxsex",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://www.vintagexxxsex.com/images/vintagexxxsex.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/vintagexxxsex.py b/channels/porn/vintagexxxsex.py
deleted file mode 100644
index b7afa813..00000000
--- a/channels/porn/vintagexxxsex.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://www.vintagexxxsex.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Top" , action="lista", url=host + "/all-top/1/"))
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host + "/all-new/1/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/all-longest/1/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="th">.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<span class="th_nm">([^"]+)</span>.*?'
-    patron += '<i class="fa fa-clock-o"></i>([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,time in matches:
-        contentTitle = scrapedtitle
-        title = "[COLOR yellow]" + time + " [/COLOR]" + scrapedtitle
-        scrapedurl = scrapedurl.replace("/up.php?xxx=", "")
-        scrapedurl = host + scrapedurl
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle=contentTitle))
-    next_page = scrapertools.find_single_match(data,'<li><span class="pg_nm">\d+</span></li>.*?href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-
-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, url=scrapedurl,
-                    thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/vivud.json b/channels/porn/vivud.json
deleted file mode 100755
index 7b70e238..00000000
--- a/channels/porn/vivud.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "vivud",
-  "name": "vivud",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://vivud.com/favicon-96x96.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/vivud.py b/channels/porn/vivud.py
deleted file mode 100755
index 02d6b015..00000000
--- a/channels/porn/vivud.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-
-from core import jsontools as json
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://vivud.com'    #titbox vivud zmovs
-
-url_api = host + "/?ajax=1&type="
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=url_api + "most-recent&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorados" , action="lista", url=url_api + "top-rated&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=url_api + "long&page=1"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '<ul class="sidebar-nav">(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<a class="category-item" href="([^"]+)">([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        url = host + scrapedurl + "?ajax=1&type=most-recent&page=1"
-        scrapedplot = ""
-        thumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=url,
-                              thumbnail=thumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    JSONData = json.load(data)
-    for Video in JSONData["data"]:
-        duration = Video["duration"]
-        title = Video["videoTitle"]
-        title = "[COLOR yellow]%s[/COLOR] %s" % (duration,title)
-        src= Video["src"]
-        domain=""
-        thumbnail = src.get('domain', domain) + src.get('pathMedium', domain)+"1.jpg"
-        url= Video["urls_CDN"]
-        url= url.get('480', domain)
-        url = url.replace("/\n/", "/")
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot,))
-    Actual = int(scrapertools.find_single_match(item.url, '&page=([0-9]+)'))
-    if JSONData["pagesLeft"] - 1 > Actual:
-        scrapedurl = item.url.replace("&page=" + str(Actual), "&page=" + str(Actual + 1))
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=scrapedurl))
-    return itemlist
-
-
-def findvideos(item):
-    return
-
diff --git a/channels/porn/vporn.json b/channels/porn/vporn.json
deleted file mode 100644
index d33ff5f9..00000000
--- a/channels/porn/vporn.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "vporn",
-  "name": "vporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://th-eu1.vporn.com/images/logo-dark-theme.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/vporn.py b/channels/porn/vporn.py
deleted file mode 100644
index 65727102..00000000
--- a/channels/porn/vporn.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- 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
-
-host = 'https://www.vporn.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host + "/newest/month/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas" , action="lista", url=host + "/views/month/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor Valoradas" , action="lista", url=host + "/rating/month/"))
-    itemlist.append( Item(channel=item.channel, title="Favoritas" , action="lista", url=host + "/favorites/month/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Votada" , action="lista", url=host + "/votes/month/"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest/month/"))
-    itemlist.append( Item(channel=item.channel, title="PornStar" , action="catalogo", url=host + "/pornstars/"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search?q=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def 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\'>.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)".*?'
-    patron += '<span> (\d+) Videos'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedurl = host + scrapedurl
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<a class="next" href="([^"]+)">')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="catalogo", title="Next page >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '"name":"([^"]+)".*?'
-    patron  += '"image":"([^"]+)".*?'
-    patron  += '"url":"([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedtitle,scrapedthumbnail,scrapedurl in matches:
-        scrapedplot = ""
-        scrapedthumbnail = "https://th-us2.vporn.com" + scrapedthumbnail
-        scrapedthumbnail= scrapedthumbnail.replace("\/", "/")
-        scrapedurl = host + scrapedurl
-        scrapedurl = scrapedurl.replace("\/", "/")
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="video">.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<span class="time">(.*?)</span>(.*?)</span>.*?'
-    patron += '<img src="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,time,calidad,scrapedthumbnail,scrapedtitle in matches:
-        scrapedtitle = scrapedtitle.replace("&comma; ", " & ").replace("&lpar;", "(").replace("&rpar;", ")") 
-        title = "[COLOR yellow]" + time + "  [/COLOR]" + scrapedtitle
-        if "hd-marker is-hd" in  calidad:
-            title = "[COLOR yellow]" + time + " [/COLOR]" + "[COLOR red]" + "HD" + "  [/COLOR]" + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=plot, contentTitle = title))
-    next_page = scrapertools.find_single_match(data,'<a class="next.*?title="Next Page" href="([^"]+)">')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Next page >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<source src="([^"]+)" type="video/mp4" label="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl,scrapedtitle  in matches:
-        itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl))
-    return itemlist
-
diff --git a/channels/porn/watchpornfree.json b/channels/porn/watchpornfree.json
deleted file mode 100644
index f5f9b0a9..00000000
--- a/channels/porn/watchpornfree.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "watchpornfree",
-  "name": "watchpornfree",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://watchpornfree.info/wp-content/uploads/2019/01/favicon.ico",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/watchpornfree.py b/channels/porn/watchpornfree.py
deleted file mode 100644
index 73d14f7f..00000000
--- a/channels/porn/watchpornfree.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-# https://playpornfree.org/    https://mangoporn.net/   https://watchfreexxx.net/   https://losporn.org/  https://xxxstreams.me/  https://speedporn.net/
-
-host = 'https://watchpornfree.info'
-
-def mainlist(item):
-    logger.info("")
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/clips-scenes"))
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Parodia" , action="lista", url=host + "/category/parodies"))
-    itemlist.append( Item(channel=item.channel, title="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 lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info("")
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    if item.title == "Canal":
-        data = scrapertools.find_single_match(data,'Scenes</a></li>(.*?)</ul>')
-    if item.title == "Año":
-        data = scrapertools.find_single_match(data,'Year</a>(.*?)</ul>')
-    if item.title == "Categorias":
-        data = scrapertools.find_single_match(data,'>Categories</div>(.*?)</ul>')
-    patron  = '<a href="([^"]+)".*?>([^"]+)</a></li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle  in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-def lista(item):
-    logger.info("")
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron  = '<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,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next &raquo;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
diff --git a/channels/porn/webpeliculasporno.json b/channels/porn/webpeliculasporno.json
deleted file mode 100644
index a048c974..00000000
--- a/channels/porn/webpeliculasporno.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "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/channels/porn/webpeliculasporno.py b/channels/porn/webpeliculasporno.py
deleted file mode 100644
index e49a51f6..00000000
--- a/channels/porn/webpeliculasporno.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-import re
-
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-from platformcode import config
-
-host = 'http://www.webpeliculasporno.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Ultimas", action="lista", url=host))
-    itemlist.append(
-        Item(channel=item.channel, title="Mas vistas", action="lista", url=host + "/?display=tube&filtre=views"))
-    itemlist.append(
-        Item(channel=item.channel, title="Mejor valoradas", action="lista", url=host + "/?display=tube&filtre=rate"))
-    itemlist.append(Item(channel=item.channel, title="Categorias", action="categorias", url=host))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<li class="cat-item [^>]+><a href="([^"]+)" >([^<]+)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                             thumbnail=scrapedthumbnail, plot=scrapedplot))
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<li class="border-radius-5 box-shadow">.*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<a href="([^"]+)" title="([^"]+)">'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedthumbnail, scrapedurl, scrapedtitle in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        title = scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
-                             fanart=thumbnail, plot=plot, contentTitle=contentTitle))
-    next_page = scrapertools.find_single_match(data, '<li><a class="next page-numbers" href="([^"]+)">Next')
-    if next_page != "":
-        next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
diff --git a/channels/porn/woodrocket.json b/channels/porn/woodrocket.json
deleted file mode 100644
index 02ea74a1..00000000
--- a/channels/porn/woodrocket.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "woodrocket",
-  "name": "woodrocket",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://woodrocket.com/img//logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/woodrocket.py b/channels/porn/woodrocket.py
deleted file mode 100644
index f24640e4..00000000
--- a/channels/porn/woodrocket.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://woodrocket.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Novedades" , action="lista", url=host + "/porn"))
-    itemlist.append( Item(channel=item.channel, title="Parodias" , action="lista", url=host + "/parodies"))
-    itemlist.append( Item(channel=item.channel, title="Shows" , action="categorias", url=host + "/series"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/categories"))
-    return itemlist
-
-
-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="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", 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,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)" rel="next">&raquo;</a></li>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    url  = scrapertools.find_single_match(data,'<iframe src="([^"]+)"')
-    itemlist.append(item.clone(action="play", title= "%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/porn/x18hentai.json b/channels/porn/x18hentai.json
deleted file mode 100644
index b23b8dd8..00000000
--- a/channels/porn/x18hentai.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "id": "x18hentai",
-  "name": "18HentaiOnline",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "banner": "https://s32.postimg.cc/lafs9vgxh/18hentaionline_banner.png",
-  "thumbnail": "https://s32.postimg.cc/fui7jdg9x/18hentaionline.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": false,
-      "enabled": false,
-      "visible": false
-    }
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/x18hentai.py b/channels/porn/x18hentai.py
deleted file mode 100644
index db4b37ec..00000000
--- a/channels/porn/x18hentai.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import logger
-from platformcode import config
-
-host = 'http://www.18hentaionline.net/'
-headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
-           ['Referer', host]]
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(Item(channel=item.channel, title="Todos", action="todas", url=host, thumbnail='', fanart=''))
-
-    itemlist.append(
-        Item(channel=item.channel, title="Sin Censura", action="todas", url=host + '/tag/sin-censura/', thumbnail='',
-             fanart=''))
-
-    itemlist.append(
-        Item(channel=item.channel, title="Estrenos", action="todas", url=host + '/category/estreno/', thumbnail='',
-             fanart=''))
-
-    itemlist.append(
-        Item(channel=item.channel, title="Categorias", action="categorias", url=host, thumbnail='', fanart=''))
-
-    return itemlist
-
-
-def todas(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url, headers=headers).data
-    patron = '<h3><a href="([^"]+)" title="([^"]+)">.*?<\/a><\/h3>.*?'
-    patron += '<.*?>.*?'
-    patron += '<a.*?img src="([^"]+)" alt'
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
-        url = scrapedurl
-        title = scrapedtitle.decode('utf-8')
-        thumbnail = scrapedthumbnail
-        fanart = ''
-        itemlist.append(
-            Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, fanart=fanart))
-
-    # Paginacion
-    title = ''
-    siguiente = scrapertools.find_single_match(data,
-                                               '<a rel="nofollow" class="next page-numbers" href="([^"]+)">Siguiente &raquo;<\/a><\/div>')
-    title = 'Pagina Siguiente >>> '
-    fanart = ''
-    itemlist.append(Item(channel=item.channel, action="todas", title=title, url=siguiente, fanart=fanart))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = item.url + texto
-
-    if texto != '':
-        return todas(item)
-    else:
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url, headers=headers).data
-    patron = "<a href='([^']+)' class='tag-link-.*? tag-link-position-.*?' title='.*?' style='font-size: 11px;'>([^<]+)<\/a>"
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        url = scrapedurl
-        title = scrapedtitle
-        itemlist.append(Item(channel=item.channel, action="todas", title=title, fulltitle=item.fulltitle, url=url))
-
-    return itemlist
-
-
-def episodios(item):
-    censura = {'Si': 'con censura', 'No': 'sin censura'}
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url, headers=headers).data
-    old_mode = scrapertools.find_single_match(data, '<th>Censura<\/th>')
-    if old_mode:
-        patron = '<td>(\d+)<\/td><td>(.*?)<\/td><td>(.*?)<\/td><td>(.*?)<\/td><td><a href="(.*?)".*?>Ver Capitulo<\/a><\/td>'
-
-        matches = re.compile(patron, re.DOTALL).findall(data)
-
-        for scrapedcap, scrapedaud, scrapedsub, scrapedcen, scrapedurl in matches:
-            url = scrapedurl
-            title = 'CAPITULO ' + scrapedcap + ' AUDIO: ' + scrapedaud + ' SUB:' + scrapedsub + ' ' + censura[scrapedcen]
-            thumbnail = ''
-            plot = ''
-            fanart = ''
-            itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=item.fulltitle, url=url,
-                                 thumbnail=item.thumbnail, plot=plot))
-    else:
-        patron = '<\/i>.*?(.\d+)<\/td><td style="text-align:center">MP4<\/td><td style="text-align:center">(.*?)<\/td>.*?'
-        patron +='<a class="dr-button" href="(.*?)" >'
-
-        matches = re.compile(patron, re.DOTALL).findall(data)
-
-        for scrapedcap, scrapedsub, scrapedurl in matches:
-            url = scrapedurl
-            if scrapedsub !='':
-                subs= scrapedsub
-            else:
-                sub = 'No'
-            title = 'CAPITULO %s SUB %s'%(scrapedcap, subs)
-            thumbnail = ''
-            plot = ''
-            fanart = ''
-            itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=item.fulltitle, url=url,
-                                 thumbnail=item.thumbnail, plot=plot))
-
-    return itemlist
-
-def findvideos(item):
-    logger.info()
-
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    gvideo = scrapertools.find_single_match(data,'<li rel="(http:\/\/www\.18hentaionline\.net\/ramus\/phar\.php\?vid=.*?)">')
-    headers = {'Host':'www.18hentaionline.net', 'Referer':item.url}
-    gvideo_data = httptools.downloadpage(gvideo, headers = headers).data
-    gvideo_url = scrapertools.find_single_match(gvideo_data, 'file: "(.*?)"')
-    server = 'directo'
-    new_item = (item.clone(url=gvideo_url, server=server))
-    itemlist.append(new_item)
-    itemlist.extend(servertools.find_video_items(data=data))
-    for videoitem in itemlist:
-        videoitem.channel = item.channel
-        videoitem.title = item.title+' (%s)'%videoitem.server
-        videoitem.action = 'play'
-    return itemlist
-
-
diff --git a/channels/porn/xhamster.json b/channels/porn/xhamster.json
deleted file mode 100644
index 54d9f88c..00000000
--- a/channels/porn/xhamster.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "id": "xhamster",
-  "name": "xhamster",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "banner": "xhamster.png",
-  "thumbnail": "xhamster.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/xhamster.py b/channels/porn/xhamster.py
deleted file mode 100644
index c9020a97..00000000
--- a/channels/porn/xhamster.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import sys
-import urlparse
-
-from platformcode import logger
-from core import scrapertools, httptools
-from core.item import Item
-
-HOST = "http://es.xhamster.com/"
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="videos", title="Útimos videos", url=HOST, viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="categorias", title="Categorías", url=HOST))
-    itemlist.append(Item(channel=item.channel, action="votados", title="Lo mejor"))
-    itemlist.append(Item(channel=item.channel, action="vistos", title="Los mas vistos"))
-    itemlist.append(Item(channel=item.channel, action="videos", title="Recomendados",
-                         url=urlparse.urljoin(HOST, "/videos/recommended")))
-    itemlist.append(
-        Item(channel=item.channel, action="search", title="Buscar", url=urlparse.urljoin(HOST, "/search?q=%s")))
-
-    return itemlist
-
-
-# REALMENTE PASA LA DIRECCION DE BUSQUEDA
-
-
-def search(item, texto):
-    logger.info()
-    tecleado = texto.replace(" ", "+")
-    item.url = item.url % tecleado
-    item.extra = "buscar"
-    try:
-        return videos(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-# SECCION ENCARGADA DE BUSCAR
-
-
-def videos(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    itemlist = []
-
-    data = scrapertools.find_single_match(data, '<article.+?>(.*?)</article>')
-
-    # Patron
-    patron = '(?s)<div class="thumb-list__item.*?href="([^"]+)".*?src="([^"]+)".*?alt="([^"]+)">.*?'
-    patron += '<div class="thumb-image-container__duration">(.+?)</div>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedthumbnail, scrapedtitle, duration in matches:
-        # logger.debug("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        contentTitle = scrapedtitle.strip() + " [" + duration + "]"
-        itemlist.append(
-            Item(channel=item.channel, action="play", title=contentTitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                 folder=True))
-
-    # Paginador
-    patron = '(?s)<div class="pager-container".*?<li class="next">.*?href="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    if len(matches) > 0:
-        itemlist.append(
-            Item(channel=item.channel, action="videos", title="Página Siguiente", url=matches[0], thumbnail="",
-                 folder=True, viewmode="movie"))
-
-    return itemlist
-
-
-# SECCION ENCARGADA DE VOLCAR EL LISTADO DE CATEGORIAS CON EL LINK CORRESPONDIENTE A CADA PAGINA
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-
-    data = scrapertools.find_single_match(data, '(?s)<div class="all-categories">(.*?)</aside>')
-
-    patron = '(?s)<li>.*?<a href="([^"]+)".*?>([^<]+).*?</a></li>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle in matches:
-        contentTitle = scrapedtitle.strip()
-        itemlist.append(Item(channel=item.channel, action="videos", title=contentTitle, url=scrapedurl))
-
-    return itemlist
-
-
-def votados(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append(Item(channel=item.channel, action="videos", title="Día", url=urlparse.urljoin(HOST, "/best/daily"),
-                         viewmode="movie"))
-    itemlist.append(
-        Item(channel=item.channel, action="videos", title="Semana", url=urlparse.urljoin(HOST, "/best/weekly"),
-             viewmode="movie"))
-    itemlist.append(
-        Item(channel=item.channel, action="videos", title="Mes", url=urlparse.urljoin(HOST, "/best/monthly"),
-             viewmode="movie"))
-    itemlist.append(
-        Item(channel=item.channel, action="videos", title="De siempre", url=urlparse.urljoin(HOST, "/best/"),
-             viewmode="movie"))
-    return itemlist
-
-
-def vistos(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append(
-        Item(channel=item.channel, action="videos", title="Día", url=urlparse.urljoin(HOST, "/most-viewed/daily"),
-             viewmode="movie"))
-    itemlist.append(
-        Item(channel=item.channel, action="videos", title="Semana", url=urlparse.urljoin(HOST, "/most-viewed/weekly"),
-             viewmode="movie"))
-    itemlist.append(
-        Item(channel=item.channel, action="videos", title="Mes", url=urlparse.urljoin(HOST, "/most-viewed/monthly"),
-             viewmode="movie"))
-    itemlist.append(
-        Item(channel=item.channel, action="videos", title="De siempre", url=urlparse.urljoin(HOST, "/most-viewed/"),
-             viewmode="movie"))
-
-    return itemlist
-
-
-# OBTIENE LOS ENLACES SEGUN LOS PATRONES DEL VIDEO Y LOS UNE CON EL SERVIDOR
-def play(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    logger.debug(data)
-
-    patron = '"([0-9]+p)":"([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for res, url in matches:
-        url = url.replace("\\", "")
-        logger.debug("url=" + url)
-        itemlist.append(["%s %s [directo]" % (res, scrapertools.get_filename_from_url(url)[-4:]), url])
-
-    return itemlist
diff --git a/channels/porn/xms.json b/channels/porn/xms.json
deleted file mode 100644
index 64e505cd..00000000
--- a/channels/porn/xms.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "id": "xms",
-  "name": "XMS",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/xthearebg.jpg",
-  "thumbnail": "https://i.postimg.cc/wB0NsMTX/xms.png",
-  "banner": "https://i.postimg.cc/c6yh5C3K/xmsbn.png",
-   "categories": [
-   "adult"
- ],
- "settings": [
-    {
-      "id": "modo_grafico",
-      "type": "bool",
-      "label": "Buscar información extra",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "perfil",
-      "type": "list",
-      "label": "Perfil de color",
-      "default": 3,
-      "enabled": true,
-      "visible": true,
-      "lvalues": [
-        "Sin color",
-        "Perfil 3",
-        "Perfil 2",
-        "Perfil 1"
-      ]
-    }
-  ]
-}
diff --git a/channels/porn/xms.py b/channels/porn/xms.py
deleted file mode 100644
index 7fa51198..00000000
--- a/channels/porn/xms.py
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-import base64
-
-from core import channeltools
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-
-__channel__ = "xms"
-
-host = 'https://xtheatre.org/'
-host1 = 'https://www.cam4.com/'
-try:
-    __modo_grafico__ = config.get_setting('modo_grafico', __channel__)
-    __perfil__ = int(config.get_setting('perfil', __channel__))
-except:
-    __modo_grafico__ = True
-    __perfil__ = 0
-
-# Fijar perfil de color
-perfil = [['0xFF6E2802', '0xFFFAA171', '0xFFE9D7940'],
-          ['0xFFA5F6AF', '0xFF5FDA6D', '0xFF11811E'],
-          ['0xFF58D3F7', '0xFF2E64FE', '0xFF0404B4']]
-
-if __perfil__ - 1 >= 0:
-    color1, color2, color3 = perfil[__perfil__ - 1]
-else:
-    color1 = color2 = color3 = ""
-
-headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
-           ['Referer', host]]
-
-parameters = channeltools.get_channel_parameters(__channel__)
-fanart_host = parameters['fanart']
-thumbnail_host = parameters['thumbnail']
-thumbnail = 'https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/%s.png'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append(Item(channel=__channel__, title="Últimas", url=host + '?filtre=date&cat=0',
-                         action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=thumbnail % '1'))
-
-    itemlist.append(Item(channel=__channel__, title="Más Vistas", url=host + '?display=extract&filtre=views',
-                         action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=thumbnail % '2'))
-
-    itemlist.append(Item(channel=__channel__, title="Mejor Valoradas", url=host + '?display=extract&filtre=rate',
-                         action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=thumbnail % '3'))
-
-    itemlist.append(Item(channel=__channel__, title="Categorías", action="categorias",
-                         url=host + 'categories/', viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=thumbnail % '4'))
-
-    itemlist.append(Item(channel=__channel__, title="WebCam", action="webcamenu",
-                         viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail='https://ae01.alicdn.com/kf/HTB1LDoiaHsrBKNjSZFpq6AXhFXa9/-.jpg'))
-
-    itemlist.append(Item(channel=__channel__, title="Buscador", action="search", url=host, thumbnail=thumbnail % '5'))
-
-    return itemlist
-
-
-def webcamenu(item):
-    logger.info()
-    itemlist = [item.clone(title="Trending Cams", action="webcam", text_blod=True, url=host1,
-                           viewcontent='movies', viewmode="movie_with_plot"),
-                item.clone(title="Females", action="webcam", text_blod=True,
-                           viewcontent='movies', url=host1 + 'female', viewmode="movie_with_plot"),
-                item.clone(title="Males", action="webcam", text_blod=True,
-                           viewcontent='movies', url=host1 + 'male', viewmode="movie_with_plot"),
-                item.clone(title="Couples", action="webcam", text_blod=True,
-                           viewcontent='movies', url=host1 + 'couple', viewmode="movie_with_plot"),
-                item.clone(title="Trans", action="webcam", text_blod=True, extra="Películas Por año",
-                           viewcontent='movies', url=host1 + 'transgender', viewmode="movie_with_plot")]
-    return itemlist
-
-
-def peliculas(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|#038;", "", data)
-    patron = 'src="([^"]+)" class="attachment-thumb_site.*?'  # img
-    patron += '<a href="([^"]+)" title="([^"]+)".*?'          # url, title
-    patron += '<div class="right"><p>([^<]+)</p>'             # plot
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedthumbnail, scrapedurl, scrapedtitle, plot in matches:
-        plot = scrapertools.decodeHtmlentities(plot)
-
-        itemlist.append(item.clone(channel=__channel__, action="play", title=scrapedtitle.capitalize(),
-                                   url=scrapedurl, thumbnail=scrapedthumbnail, infoLabels={"plot": plot},
-                                   fanart=scrapedthumbnail,viewmode="movie_with_plot",
-                                   folder=True, contentTitle=scrapedtitle))
-    # Extrae el paginador
-    paginacion = scrapertools.find_single_match(data, '<a href="([^"]+)">Next &rsaquo;</a></li><li>')
-    paginacion = urlparse.urljoin(item.url, paginacion)
-
-    if paginacion:
-        itemlist.append(Item(channel=__channel__, action="peliculas",
-                             thumbnail=thumbnail % 'rarrow',
-                             title="\xc2\xbb Siguiente \xc2\xbb", url=paginacion))
-
-    return itemlist
-
-
-def webcam(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|#038;", "", data)
-    patron = '<div class="profileBox">.*?<a href="/([^"]+)".*?'  # url
-    patron += 'data-hls-preview-url="([^"]+)">.*?'               # video_url
-    patron += 'data-username="([^"]+)".*?'                       # username
-    patron += 'title="([^"]+)".*?'                               # title
-    patron += 'data-profile="([^"]+)"'                        # img
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, video_url, username, scrapedtitle, scrapedthumbnail in matches:
-        scrapedtitle = scrapedtitle.replace(' Chat gratis con webcam.', '')
-
-        itemlist.append(item.clone(channel=__channel__, action="play", title=username,
-                                   url=video_url, thumbnail=scrapedthumbnail, fanart=scrapedthumbnail,
-                                   viewmode="movie_with_plot", folder=True, contentTitle=scrapedtitle))
-    # Extrae el paginador
-    paginacion = scrapertools.find_single_match(data, '<span id="pagerSpan">\d+</span> <a href="([^"]+)"')
-    paginacion = urlparse.urljoin(item.url, paginacion)
-
-    if paginacion:
-        itemlist.append(Item(channel=__channel__, action="webcam",
-                             thumbnail=thumbnail % 'rarrow',
-                             title="\xc2\xbb Siguiente \xc2\xbb", url=paginacion))
-
-    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 = 'data-lazy-src="([^"]+)".*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<span>([^<]+)</span></a>.*?'
-    patron += '<span class="nb_cat border-radius-5">([^<]+)</span>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedthumbnail, scrapedurl, scrapedtitle, vids in matches:
-        title = "%s (%s)" % (scrapedtitle, vids.title())
-        itemlist.append(item.clone(channel=__channel__, action="peliculas", fanart=scrapedthumbnail,
-                                   title=title, url=scrapedurl, thumbnail=scrapedthumbnail,
-                                   viewmode="movie_with_plot", folder=True))
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-
-    texto = texto.replace(" ", "+")
-    item.url = urlparse.urljoin(item.url, "?s={0}".format(texto))
-
-    try:
-        return sub_search(item)
-
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-
-
-def sub_search(item):
-    logger.info()
-
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = 'data-lazy-src="([^"]+)".*?'          # img
-    patron += 'title="([^"]+)" />.*?'              # title
-    patron += '</noscript><a href="([^"]+)".*?'    # url
-    patron += '<div class="right"><p>([^<]+)</p>'  # plot
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedthumbnail, scrapedtitle, scrapedurl, plot in matches:
-        itemlist.append(item.clone(title=scrapedtitle, url=scrapedurl, plot=plot, fanart=scrapedthumbnail,
-                                   action="play", thumbnail=scrapedthumbnail))
-
-    paginacion = scrapertools.find_single_match(
-        data, "<a href='([^']+)' class=\"inactive\">\d+</a>")
-
-    if paginacion:
-        itemlist.append(item.clone(channel=__channel__, action="sub_search",
-                                   title="\xc2\xbb Siguiente \xc2\xbb", url=paginacion))
-
-    return itemlist
-
-
-def play(item):
-    itemlist = []
-    if "playlist.m3u8" in item.url:
-        url = item.url
-    else:
-        data = httptools.downloadpage(item.url).data
-        data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-        patron = 'src="([^"]+)" allowfullscreen="true">'
-        matches = scrapertools.find_multiple_matches(data, patron)
-        for url in matches:
-            if "strdef" in url: 
-                url = decode_url(url)
-                if "strdef" in url:
-                    url = httptools.downloadpage(url).url
-    itemlist.append(item.clone(action="play", title= "%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
-
-def decode_url(txt):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(txt).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    rep = True
-    while rep == True:
-        b64_data = scrapertools.find_single_match(data, '\(dhYas638H\("([^"]+)"\)')
-        if b64_data:
-            b64_url = base64.b64decode(b64_data + "=")
-            b64_url = base64.b64decode(b64_url + "==")
-            data = b64_url
-        else:
-            rep = False
-    url = scrapertools.find_single_match(b64_url, '<iframe src="([^"]+)"')
-    logger.debug (url)
-    return url
\ No newline at end of file
diff --git a/channels/porn/xozilla.json b/channels/porn/xozilla.json
deleted file mode 100644
index aae90940..00000000
--- a/channels/porn/xozilla.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "xozilla",
-  "name": "xozilla",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://www.xozilla.com/images/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/xozilla.py b/channels/porn/xozilla.py
deleted file mode 100644
index 4b0b3d46..00000000
--- a/channels/porn/xozilla.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-import urlparse
-import urllib2
-import urllib
-import re
-import os
-import sys
-
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.xozilla.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Nuevas", action="lista", url=host + "/latest-updates/"))
-    itemlist.append(Item(channel=item.channel, title="Popular", action="lista", url=host + "/most-popular/"))
-    itemlist.append(Item(channel=item.channel, title="Mejor valorada", action="lista", url=host + "/top-rated/"))
-
-    itemlist.append(Item(channel=item.channel, title="PornStar", action="categorias", url=host + "/models/"))
-    itemlist.append(Item(channel=item.channel, title="Canal", action="categorias", url=host + "/channels/"))
-    itemlist.append(Item(channel=item.channel, title="Categorias", action="categorias", url=host + "/categories/"))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s/" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a class="item" href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<img class="thumb" src="([^"]+)".*?'
-    patron += '(.*?)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle, scrapedthumbnail, cantidad in matches:
-        scrapedplot = ""
-        cantidad = scrapertools.find_single_match(cantidad, '(\d+) videos</div>')
-        if cantidad:
-            scrapedtitle += " (" + cantidad + ")"
-        itemlist.append(Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                             thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot))
-    if "Categorias" in item.title:
-        itemlist.sort(key=lambda x: x.title)
-    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-    if next_page != "#videos":
-        next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page))
-    if next_page == "#videos":
-        next_page = scrapertools.find_single_match(data, 'from:(\d+)">Next</a>')
-        next_page = urlparse.urljoin(item.url, next_page) + "/"
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a href="([^"]+)" class="item.*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += 'alt="([^"]+)".*?'
-    patron += '<div class="duration">(.*?)</div>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, duracion in matches:
-        url = scrapedurl
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        year = ""
-        itemlist.append(Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                             fanart=thumbnail, plot=plot, contentTitle=contentTitle))
-    next_page = scrapertools.find_single_match(data, '<li class="next"><a href="([^"]+)"')
-    if next_page != "#videos":
-        next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    if next_page == "#videos":
-        next_page = scrapertools.find_single_match(data, 'from:(\d+)">Next</a>')
-        next_page = urlparse.urljoin(item.url, next_page) + "/"
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    media_url = scrapertools.find_single_match(data, 'video_alt_url: \'([^\']+)/\'')
-    if media_url == "":
-        media_url = scrapertools.find_single_match(data, 'video_url: \'([^\']+)/\'')
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=media_url,
-                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
diff --git a/channels/porn/xtapes.json b/channels/porn/xtapes.json
deleted file mode 100644
index 017437cb..00000000
--- a/channels/porn/xtapes.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "xtapes",
-  "name": "xtapes",
-  "active": false,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://hd.xtapes.to/wp-content/uploads/xtapes.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/xtapes.py b/channels/porn/xtapes.py
deleted file mode 100644
index 4bb3548b..00000000
--- a/channels/porn/xtapes.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://hd.xtapes.to'
-
-# Links NetuTV
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/hd-porn-movies/"))
-    itemlist.append( Item(channel=item.channel, title="Productora" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/?filtre=date&cat=0"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistos" , action="lista", url=host + "/?display=tube&filtre=views"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorado" , action="lista", url=host + "/?display=tube&filtre=rate"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/?display=tube&filtre=duree"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    if item.title=="Canal":
-        data = scrapertools.find_single_match(data,'<div class="footer-banner">(.*?)<div id="footer-copyright">')
-    if item.title=="Productora" :
-       data = scrapertools.find_single_match(data,'>Full Movies</a>(.*?)</ul>')
-    if item.title=="Categorias" :
-       data = scrapertools.find_single_match(data,'<a>Categories</a>(.*?)</ul>')
-    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="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<li class="border-radius-5 box-shadow">.*?'
-    patron += 'src="([^"]+)".*?<a href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<div class="time-infos".*?>([^"]+)<span class="time-img">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedurl,scrapedtitle,duracion  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos" , title=title , url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next video')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        next_page = next_page.replace("#038;cat=0#038;", "")
-        next_page = next_page.replace("#038;filtre=views#038;", "").replace("&#038;filtre=rate#038;", "&").replace("#038;filtre=duree#038;", "")
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
diff --git a/channels/porn/xvideos.json b/channels/porn/xvideos.json
deleted file mode 100755
index ddcc89d5..00000000
--- a/channels/porn/xvideos.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "xvideos",
-  "name": "xvideos",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "xvideos.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/xvideos.py b/channels/porn/xvideos.py
deleted file mode 100755
index 6c66b18c..00000000
--- a/channels/porn/xvideos.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.xvideos.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Lo mejor" , action="lista", url=host + "/best/"))
-    itemlist.append( Item(channel=item.channel, title="Pornstar" , action="catalogo", url=host + "/pornstars-index"))
-    itemlist.append( Item(channel=item.channel, title="WebCAM" , action="catalogo", url=host + "/webcam-models-index"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels-index/top"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/tags"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?k=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li><a href="([^"]+)"><b>([^<]+)</b><span class="navbadge default">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def catalogo(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<img src="([^"]+)".*?'
-    patron += '<p class="profile-name">.*?<a href="([^"]+)">([^<]+)</a>.*?'
-    patron += '<span class="with-sub">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedurl = urlparse.urljoin(host,scrapedurl) + "/videos/new/0"
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data, '<li><a href="([^"]+)" class="no-page next-page">Siguiente')
-    if next_page=="":
-        next_page = scrapertools.find_single_match(data, '<li><a class="active".*?<a href="([^"]+)"')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append( Item(channel=item.channel, action="catalogo", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<div id="video_\d+".*?'
-    patron += 'data-src="([^"]+)".*?'
-    patron += '</a>(.*?)<div class=.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)".*?'
-    patron += '<span class="duration">([^<]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,quality,scrapedurl,scrapedtitle,scrapedtime in matches:
-        title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + scrapedtitle
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = scrapedthumbnail.replace("THUMBNUM" , "10")
-        quality = scrapertools.find_single_match(quality, 'mark">([^<]+)</span>')
-        if quality:
-            title = "[COLOR yellow]" + scrapedtime + "[/COLOR] " + "[COLOR red]" + quality + "[/COLOR] " + scrapedtitle
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle = scrapedtitle))
-    next_page = scrapertools.find_single_match(data, '<li><a href="([^"]+)" class="no-page next-page">Siguiente')
-    if "profile" in item.url:
-        next_page = scrapertools.find_single_match(data, '<li><a class="active" href="">(\d+)</a></li><li><a href="#')
-    if next_page:
-        next_page = urlparse.urljoin(item.url,next_page).replace("&amp;", "&")
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    url = scrapertools.find_single_match(data, 'html5player.setVideoHLS\(\'([^\']+)\'\)')
-    itemlist.append(item.clone(action="play", title=url, url=url ))
-    return itemlist
-
diff --git a/channels/porn/xxxdan.json b/channels/porn/xxxdan.json
deleted file mode 100644
index 4636a2f1..00000000
--- a/channels/porn/xxxdan.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "id": "xxxdan",
-  "name": "xxxdan",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "http://s0.cdn3x.com/xxxdan/i/logo.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
-
diff --git a/channels/porn/xxxdan.py b/channels/porn/xxxdan.py
deleted file mode 100644
index c4d21fd0..00000000
--- a/channels/porn/xxxdan.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'http://xxxdan.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/newest"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="lista", url=host + "/popular30"))
-    itemlist.append( Item(channel=item.channel, title="Longitud" , action="lista", url=host + "/longest"))
-    itemlist.append( Item(channel=item.channel, title="HD" , action="lista", url=host + "/channel30/hd"))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/channels"))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search?query=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<a href="([^"]+)" rel="tag".*?'
-    patron += 'title="([^"]+)".*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<span class="score">(\d+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedurl = scrapedurl.replace("channel", "channel30")
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , fanart=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    
-    
-    patron = '<li><figure>\s*<a href="([^"]+)".*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<time datetime="\w+">([^"]+)</time>'
-    patron += '(.*?)</ul>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,duracion,calidad in matches:
-        url = scrapedurl
-        scrapedtitle = scrapertools.find_single_match(scrapedurl,'https://xxxdan.com/es/.*?/(.*?).html')
-        contentTitle = scrapedtitle
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        if '<li class="hd">' in calidad :
-            title = "[COLOR yellow]" + duracion + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)" rel="next">&rarr;</a>')
-    if next_page!="":
-        next_page = next_page.replace("http://xxxdan.com/","")
-        next_page = "/" + next_page
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    media_url = scrapertools.find_single_match(data, 'src:\'([^\']+)\'')
-    media_url = media_url.replace("https","http")
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=media_url,
-                        thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
-
diff --git a/channels/porn/xxxfreeinhd.json b/channels/porn/xxxfreeinhd.json
deleted file mode 100644
index ff580284..00000000
--- a/channels/porn/xxxfreeinhd.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "id": "xxxfreeinhd",
-  "name": "xxxfreeinhd",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://watchxxxfreeinhd.com/wp-content/uploads/logo2015-1.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-  ]
-}
-
diff --git a/channels/porn/xxxfreeinhd.py b/channels/porn/xxxfreeinhd.py
deleted file mode 100644
index ff12d4e1..00000000
--- a/channels/porn/xxxfreeinhd.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-import base64
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://watchxxxfreeinhd.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-
-    itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/?filtre=date&cat=0"))
-    itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/?display=tube&filtre=views"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada" , action="lista", url=host + "/?display=tube&filtre=rate"))
-
-    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?q=%s&language=en&search=Search" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<noscript>.*?src="([^"]+)".*?'
-    patron += '<a href="([^"]+)" title="([^"]+)".*?'
-    patron += '<span class="nb_cat border-radius-5">(\d+) videos</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        title = scrapedtitle + " (" + cantidad + ")"
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = '<li class="border-radius-5 box-shadow">.*?'
-    patron += '<img width="\d+" height="\d+" src="([^"]+)" class=.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)">.*?'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail + "|https://watchxxxfreeinhd.com/" 
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl,
-                              thumbnail=thumbnail, plot=plot, fanart=scrapedthumbnail ))
-    next_page = scrapertools.find_single_match(data, '<link rel="next" href="([^"]+)"')
-    if next_page:
-        next_page =  urlparse.urljoin(item.url,next_page)
-        if "?filtre=date&cat=0" in item.url: next_page += "?filtre=date&cat=0"
-        elif "?display=tube&filtre=views" in item.url: next_page += "?display=tube&filtre=views"
-        elif "?display=tube&filtre=rate" in item.url: next_page += "?display=tube&filtre=rate"
-        itemlist.append( Item(channel=item.channel, action="lista", title="Página Siguiente >>", text_color="blue", 
-                              url=next_page) )
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data,'<div class="video-embed">(.*?)<div class="views-infos">')
-    patron = 'data-lazy-src="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for title in matches:
-        if "strdef" in title: 
-            url = decode_url(title)
-            if "strdef" in url:
-                url = httptools.downloadpage(url).url
-        if "hqq" in title:
-            url = title
-        itemlist.append( Item(channel=item.channel, action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
-
-def decode_url(txt):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(txt).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    rep = True
-    while rep == True:
-        b64_data = scrapertools.find_single_match(data, '\(dhYas638H\("([^"]+)"\)')
-        if b64_data:
-            b64_url = base64.b64decode(b64_data + "=")
-            b64_url = base64.b64decode(b64_url + "==")
-            data = b64_url
-        else:
-            rep = False
-    url = scrapertools.find_single_match(b64_url, '<iframe src="([^"]+)"')
-    logger.debug (url)
-    return url
-
-
diff --git a/channels/porn/xxxparodyhd.json b/channels/porn/xxxparodyhd.json
deleted file mode 100644
index 54b05121..00000000
--- a/channels/porn/xxxparodyhd.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "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/channels/porn/xxxparodyhd.py b/channels/porn/xxxparodyhd.py
deleted file mode 100644
index df554687..00000000
--- a/channels/porn/xxxparodyhd.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'https://xxxparodyhd.net'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/genre/clips-scenes/"))
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host + "/movies/"))
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="lista", url=host + "/genre/new-release/"))
-    itemlist.append( Item(channel=item.channel, title="Parodias" , action="lista", url=host + "/genre/parodies/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    if item.title == "Canal" :
-        data = scrapertools.find_single_match(data,'>Studios</a>(.*?)</ul>')
-    else:
-        data = scrapertools.find_single_match(data,'>Categories</a>(.*?)</ul>')
-    patron  = '<a href="([^"]+)">([^<]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div data-movie-id="\d+" class="ml-item">.*?'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'oldtitle="([^"]+)".*?'
-    patron += '<img src="([^"]+)".*?rel="tag">(.*?)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedyear in matches:
-        scrapedplot = ""
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot, infoLabels={'year':scrapedyear}) )
-    next_page = scrapertools.find_single_match(data,'<li class=\'active\'>.*?href=\'([^\']+)\'>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
diff --git a/channels/porn/xxxstreams.json b/channels/porn/xxxstreams.json
deleted file mode 100644
index a92df9d3..00000000
--- a/channels/porn/xxxstreams.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "xxxstreams",
-  "name": "xxxstreams",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "xxxstreams.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/xxxstreams.py b/channels/porn/xxxstreams.py
deleted file mode 100644
index cff4d613..00000000
--- a/channels/porn/xxxstreams.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://xxxstreams.org' #es hhttp://freepornstreams.org
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url= host + "/category/full-porn-movie-stream/"))
-    itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/new-porn-streaming/"))
-    itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host))
-    itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    if item.title == "Categorias" :
-        data1 = scrapertools.find_single_match(data,'>Top Tags</a>(.*?)</ul>')
-        data1 += scrapertools.find_single_match(data,'>Ethnic</a>(.*?)</ul>')
-        data1 += scrapertools.find_single_match(data,'>Kinky</a>(.*?)</ul>')
-    if item.title == "Canal" :
-        data1 = scrapertools.find_single_match(data,'>Top sites</a>(.*?)</ul>')
-        data1 += scrapertools.find_single_match(data,'Downloads</h2>(.*?)</ul>')
-    patron  = '<a href="([^<]+)">([^<]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data1)
-    for scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail , plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="entry-content">.*?'
-    patron += '<img src="([^"]+)".*?'
-    patron += '<a href="([^<]+)".*?'
-    patron += '<span class="screen-reader-text">(.*?)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedthumbnail,scrapedurl,scrapedtitle in matches:
-        scrapedplot = ""
-        if '/HD' in scrapedtitle : title= "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle
-        elif 'SD' in scrapedtitle : title= "[COLOR red]" + "SD" + "[/COLOR] " + scrapedtitle
-        elif 'FullHD' in scrapedtitle : title= "[COLOR red]" + "FullHD" + "[/COLOR] " + scrapedtitle
-        elif '1080' in scrapedtitle : title= "[COLOR red]" + "1080p" + "[/COLOR] " + scrapedtitle
-        else: title = scrapedtitle
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=title, url=scrapedurl,
-                               fanart=scrapedthumbnail, thumbnail=scrapedthumbnail,plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<a class="next page-numbers" href="([^"]+)">Next &rarr;</a>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista" , title="Next page >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def findvideos(item):
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|amp;|\s{2}|&nbsp;", "", data)
-    patron = '<a href="([^"]+)" rel="nofollow"[^<]+>(?:Streaming|Download)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        if not "ubiqfile" in url:
-            itemlist.append(item.clone(action='play',title="%s", url=url))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
diff --git a/channels/porn/yespornplease.json b/channels/porn/yespornplease.json
deleted file mode 100644
index f9994183..00000000
--- a/channels/porn/yespornplease.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "id": "yespornplease",
-  "name": "YesPornPlease",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "yespornplease.png",
-  "banner": "yespornplease.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/channels/porn/yespornplease.py b/channels/porn/yespornplease.py
deleted file mode 100644
index ae7c2b40..00000000
--- a/channels/porn/yespornplease.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import httptools
-from core.item import Item
-from platformcode import logger
-from urlparse import urljoin
-from core import servertools
-
-
-HOST="http://yespornplease.com"
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(item.clone(action="links",      title="Novedades",  url=HOST))
-    itemlist.append(item.clone(action="categories", title="Categorías", url=urljoin(HOST, "categories")))
-    itemlist.append(item.clone(action="search",     title="Buscar",     url=urljoin(HOST, "search")))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info("texto = %s" %(texto))
-    item.url = urljoin(HOST, "search?q=" + texto)
-    try:
-        return links(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categories(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    result = []
-    categories = re.findall("href=[\"'](?P<url>/search[^\"']+).*?>(?P<name>[^<>]+)</div>.*?badge[^>]+>(?P<counter>\d+)", data, re.DOTALL | re.MULTILINE)
-    for url, name, counter in categories:
-        result.append(item.clone(action = "links", title = "%s (%s videos)" % (name, counter), url = urljoin(item.url, url)))
-    return result
-
-
-def get_page(url):
-    page = re.search("p=(\d+)", url)
-    if page:
-        return int(page.group(1))
-    return 1
-
-
-def get_page_url(url, page):
-    logger.debug("URL: %s to page %d" % (url, page))
-    resultURL = re.sub("([&\?]p=)(?:\d+)", "\g<1>%d" % page, url)
-    if resultURL == url:
-        resultURL += ("&" if "?" in url else "?") + "p=%d" % (page)
-    logger.debug("Result: %s" % (resultURL))
-    return resultURL
-
-
-def links(item):
-    logger.info()
-    data = httptools.downloadpage(item.url).data
-    reExpr = "<img\s+src=['\"](?P<img>[^'\"]+)[^>]+(?:title|alt)[^'\"]*['\"](?P<title>[^\"]+)[^>]+id[^'\"]*['\"](?P<id>[^'\"]+)[^>]*>(?:[^<]*<[^>]+>(?P<quality>[^<]+)<)?[^<]*<[^>]*duration[^>]*>(?P<duration>[^<]+)"
-    reResults = re.findall(reExpr, data, re.MULTILINE | re.DOTALL)
-    result = []
-    for img, title, vID, quality, duration in reResults:
-        formattedQuality = ""
-        if quality:
-            formattedQuality += " [%s]" % (quality)
-        titleFormatted = "%(title)s%(quality)s [%(duration)s]" % ({"title": title, "quality": formattedQuality, "duration": duration})
-        result.append(item.clone(action = "play", title = titleFormatted, url = urljoin(item.url, "/v/%s" % (vID)), thumbnail = urljoin(item.url, img), vID = vID))
-    # Has pagination
-    paginationOccurences = data.count('class="prevnext"')
-    if paginationOccurences:
-        page = get_page(item.url)
-        logger.info("Page " + str(page) + " Ocurrences: " + str(paginationOccurences))
-        if page > 1:
-            result.append(item.clone(action = "links", title = "<< Anterior", url = get_page_url(item.url, page - 1)))
-        if paginationOccurences > 1 or page == 1:
-            result.append(item.clone(action = "links", title = "Siguiente >>", url = get_page_url(item.url, page + 1)))
-    return result
-
-
-def play(item):
-    logger.info(item)
-    embededURL = urljoin(item.url, "/v/%s" % (item.vID))
-    itemlist = servertools.find_video_items(item.clone(url = embededURL))
-    return itemlist
diff --git a/channels/porn/youjizz.json b/channels/porn/youjizz.json
deleted file mode 100644
index cdc171b9..00000000
--- a/channels/porn/youjizz.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "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/channels/porn/youjizz.py b/channels/porn/youjizz.py
deleted file mode 100644
index 4112acbe..00000000
--- a/channels/porn/youjizz.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-import urlparse
-import urllib2
-import urllib
-import re
-import os
-import sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.youjizz.com'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Nuevas", action="lista", url=host + "/newest-clips/1.html"))
-    itemlist.append(Item(channel=item.channel, title="Popular", action="lista", url=host + "/most-popular/1.html"))
-    itemlist.append(
-        Item(channel=item.channel, title="Mejor valorada", action="lista", url=host + "/top-rated-week/1.html"))
-    itemlist.append(Item(channel=item.channel, title="Categorias", action="categorias", url=host))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host + "/search/%s-1.html" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, '>Trending Categories<(.*?)</ul>')
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    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="lista", title=scrapedtitle, url=scrapedurl,
-                             thumbnail=scrapedthumbnail, plot=scrapedplot))
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron = '<div class="video-item">.*?'
-    patron += 'class="frame image" href="([^"]+)".*?'
-    patron += 'data-original="([^"]+)" />.*?'
-    patron += '<div class="video-title">.*?'
-    patron += '>(.*?)</a>.*?'
-    patron += '<span class="time">(.*?)</span>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle, duracion in matches:
-        url = urlparse.urljoin(item.url, scrapedurl)
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        quality = ""
-        if '-720-' in scrapedthumbnail:
-            quality = "720"
-        if '-1080-' in scrapedthumbnail:
-            quality = "1080"
-        if quality:
-            title = "[COLOR yellow]" + duracion + "[/COLOR] " + "[COLOR red]" + quality + "p[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = "http:" + scrapedthumbnail
-        plot = ""
-        year = ""
-        itemlist.append(Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail,
-                             plot=plot, quality=quality, contentTitle=contentTitle))
-    next_page = scrapertools.find_single_match(data, '<li><a class="pagination-next" href="([^"]+)">Next &raquo;</a>')
-    if next_page != "":
-        next_page = urlparse.urljoin(item.url, next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.find_single_match(data, 'var encodings(.*?)var')
-    if '360' in data:
-        patron = '"360".*?"filename"\:"(.*?)"'
-    if '720' in data:
-        patron = '"720".*?"filename"\:"(.*?)"'
-    if '1080' in data:
-        patron = '"1080".*?"filename"\:"(.*?)"'
-    media_url = scrapertools.find_single_match(data, patron)
-    media_url = "https:" + media_url.replace("\\", "")
-    itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=media_url,
-                         thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
-    return itemlist
diff --git a/channels/porn/youporn.json b/channels/porn/youporn.json
deleted file mode 100644
index ed466088..00000000
--- a/channels/porn/youporn.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "id": "youporn",
-  "name": "youporn",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "thumbnail": "https://fs.ypncdn.com/cb/bundles/youpornwebfront/images/l_youporn_black.png",
-  "banner": "",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-
-  ]
-}
-
diff --git a/channels/porn/youporn.py b/channels/porn/youporn.py
deleted file mode 100644
index fd41cfb7..00000000
--- a/channels/porn/youporn.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from platformcode import config, logger
-from core import scrapertools
-from core.item import Item
-from core import servertools
-from core import httptools
-
-host = 'https://www.youporn.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas", action="lista", url=host + "/browse/time/"))
-    itemlist.append( Item(channel=item.channel, title="Mas Vistas", action="lista", url=host + "/browse/views/"))
-    itemlist.append( Item(channel=item.channel, title="Mejor valorada", action="lista", url=host + "/top_rated/"))
-    itemlist.append( Item(channel=item.channel, title="Canal", action="categorias", url=host + "/channels/most_popular/"))
-    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 lista(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)
-    data1 = scrapertools.find_single_match(data,'>Most Popular Pornstars<(.*?)<i class=\'icon-menu-right\'></i></a>')
-    patron = '<a href="([^"]+)".*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<span class="porn-star-name">([^"]+)</span>.*?'
-    patron += '<span class="video-count">([^"]+)</span>'
-    matches = re.compile(patron,re.DOTALL).findall(data1)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,cantidad in matches:
-        scrapedplot = ""
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<div class="currentPage".*?<a href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="catalogo", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    if item.title == "Canal":
-        data = scrapertools.find_single_match(data,'>All</div>(.*?)<i class=\'icon-menu-right\'></i></a>')
-    if item.title == "Categorias":
-        data = scrapertools.find_single_match(data,'<div class=\'row alphabetical\'.*?>(.*?)>Popular by Country</h2>')
-    patron = '<a href="([^"]+)".*?'
-    patron += '<img src=(.*?)>.*?'
-    patron += '>([^<]+) (?:Videos|videos)<'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,cantidad in matches:
-        scrapedplot = ""
-        thumbnail = scrapertools.find_single_match(scrapedthumbnail,'data-original="([^"]+)"') 
-        scrapedtitle = scrapertools.find_single_match(scrapedthumbnail,'alt="([^"]+)"')
-        if scrapedtitle == "" :
-            scrapedtitle = scrapertools.find_single_match(scrapedthumbnail,'alt=\'([^\']+)\'')
-        title = scrapedtitle + " (" + cantidad +")"
-        scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="lista", title=title, url=scrapedurl,
-                              fanart=thumbnail, thumbnail=thumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<div class="currentPage".*?<a href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="categorias", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a href="([^"]+)" class=\'video-box-image\'.*?'
-    patron += 'data-original="([^"]+)".*?'
-    patron += '<div class="video-box-title">([^"]+)</div>.*?'
-    patron += '<div class="video-duration">(.*?)</div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
-        url = urlparse.urljoin(item.url,scrapedurl)
-        title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = title
-        thumbnail = scrapedthumbnail
-        plot = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail,
-                              fanart=thumbnail, plot=plot, contentTitle = contentTitle))
-    next_page = scrapertools.find_single_match(data,'<link rel="next" href="([^"]+)"')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    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, url=scrapedurl))
-    return itemlist
-
-
diff --git a/channels/porn/yuuk.json b/channels/porn/yuuk.json
deleted file mode 100644
index 89900cea..00000000
--- a/channels/porn/yuuk.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "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/channels/porn/yuuk.py b/channels/porn/yuuk.py
deleted file mode 100644
index f6e08673..00000000
--- a/channels/porn/yuuk.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from core import httptools
-
-host = 'http://yuuk.net'
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Peliculas" , action="lista", url=host))
-    itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/list-genres/"))
-    itemlist.append( Item(channel=item.channel, title="Buscar" , action="search"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = host+ "/?s=%s" % texto
-    try:
-        return lista(item)
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def categorias(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    itemlist.append( Item(channel=item.channel, title="Censored" , action="lista", url=host + "/category/censored/"))
-    itemlist.append( Item(channel=item.channel, title="Uncensored" , action="lista", url=host + "/category/uncensored/"))
-    patron = '<li><a href="([^"]+)" title="[^"]+"><span>([^"]+)</span><span>([^"]+)</span></a></li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,cantidad in matches:
-        scrapedtitle = scrapedtitle + " (" + cantidad + ")"
-        scrapedplot = ""
-        scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="lista", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, plot=scrapedplot) )
-    return itemlist
-
-
-def lista(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="featured-wrap clearfix">.*?'
-    patron += '<a href="([^"]+)" title="([^"]+)".*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '>#([^"]+)</a>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for scrapedurl,scrapedtitle,scrapedthumbnail,calidad in matches:
-        scrapedplot = ""
-        calidad = calidad.replace(" Full HD JAV", "")
-        scrapedtitle = "[COLOR red]" + calidad + "[/COLOR] " + scrapedtitle
-        itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                              thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot) )
-    next_page = scrapertools.find_single_match(data,'<li class=\'current\'>.*?<a rel=\'nofollow\' href=\'([^\']+)\' class=\'inactive\'>')
-    if next_page!="":
-        next_page = urlparse.urljoin(item.url,next_page)
-        itemlist.append(item.clone(action="lista", title="Página Siguiente >>", text_color="blue", url=next_page) )
-
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    data = scrapertools.find_single_match(data,'Streaming Server<(.*?)Screenshot<')
-    patron = '(?:src|SRC)="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url in matches:
-        if "http://stream.yuuk.net/embed.php" in url:
-            data = httptools.downloadpage(url).data
-            url = scrapertools.find_single_match(data,'"file": "([^"]+)e=download"')
-        itemlist.append( Item(channel=item.channel, action="play", title = "%s", url=url ))
-    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
-    return itemlist
-
diff --git a/channels/pufimovies.json b/channels/pufimovies.json
index 5ded05f3..91680914 100644
--- a/channels/pufimovies.json
+++ b/channels/pufimovies.json
@@ -2,7 +2,6 @@
   "id": "pufimovies",
   "name": "PufiMovies",
   "active": true,
-  "adult": false,
   "language": ["ita", "sub-ita"],
   "thumbnail": "pufimovies.png",
   "banner": "pufimovies.png",
diff --git a/channels/raiplay.json b/channels/raiplay.json
index cf69a5b1..569776ca 100644
--- a/channels/raiplay.json
+++ b/channels/raiplay.json
@@ -2,7 +2,6 @@
     "id": "raiplay",
     "name": "Rai Play",
     "active": true,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "raiplay.png",
     "banner": "raiplay.png",
diff --git a/channels/seriehd.json b/channels/seriehd.json
index 54a7a5a5..eda29eb2 100644
--- a/channels/seriehd.json
+++ b/channels/seriehd.json
@@ -2,7 +2,6 @@
     "id": "seriehd",
     "name": "SerieHD",
     "active": true,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "seriehd.png",
     "banner": "seriehd.png",
diff --git a/channels/serietvonline.json b/channels/serietvonline.json
index 700fe885..bc583756 100644
--- a/channels/serietvonline.json
+++ b/channels/serietvonline.json
@@ -2,7 +2,6 @@
     "id": "serietvonline",
     "name": "SerieTvOnline",
     "active": true,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "serietvonline.png",
     "bannermenu": "serietvonline.png",
diff --git a/channels/serietvsubita.json b/channels/serietvsubita.json
index dcd8baec..0db82e02 100644
--- a/channels/serietvsubita.json
+++ b/channels/serietvsubita.json
@@ -2,7 +2,6 @@
     "id": "serietvsubita",
     "name": "Serie TV Sub ITA",
     "active": true,
-    "adult": false,
     "language": ["ita"],
     "thumbnail": "serietvsubita.png",
     "banner": "serietvsubita.png",
diff --git a/channels/serietvu.json b/channels/serietvu.json
index 929dcc5b..e9e1ec1e 100644
--- a/channels/serietvu.json
+++ b/channels/serietvu.json
@@ -2,7 +2,6 @@
     "id": "serietvu",
     "name": "SerieTVU",
     "active": true,
-    "adult": false,
     "language": ["ita", "sub-ita"],
     "thumbnail": "serietvu.png",
     "banner": "serietvu.png",
diff --git a/channels/streamingaltadefinizione.json b/channels/streamingaltadefinizione.json
index c028f749..9666b270 100644
--- a/channels/streamingaltadefinizione.json
+++ b/channels/streamingaltadefinizione.json
@@ -3,7 +3,6 @@
     "name": "Popcorn Stream",
     "language": ["ita"],
     "active": true,
-    "adult": false,
     "thumbnail": "popcornstream.png",
     "banner": "popcornstream.png",
     "categories": ["movie","tvshow","anime"],
diff --git a/channels/streamtime.json b/channels/streamtime.json
index d5e51934..11b43bab 100644
--- a/channels/streamtime.json
+++ b/channels/streamtime.json
@@ -3,7 +3,6 @@
 	"name": "StreamTime",
 	"language": ["ita"],
 	"active": false,
-	"adult": false,
 	"thumbnail": "streamtime.png",
 	"banner": "streamtime.png",
 	"categories": ["tvshow", "movie"],
diff --git a/channels/tantifilm.json b/channels/tantifilm.json
index e50875c3..e9e12f8d 100644
--- a/channels/tantifilm.json
+++ b/channels/tantifilm.json
@@ -3,7 +3,6 @@
 	"name": "Tantifilm",
 	"language": ["ita"],
 	"active": true,
-	"adult": false,
 	"thumbnail": "tantifilm.png",
 	"banner": "tantifilm.png",
     "categories": ["tvshow", "movie", "anime"],
diff --git a/channels/toonitalia.json b/channels/toonitalia.json
index 15f0a135..fad45e0f 100644
--- a/channels/toonitalia.json
+++ b/channels/toonitalia.json
@@ -2,8 +2,7 @@
   "id": "toonitalia", 
   "name": "ToonItalia",
   "language": ["ita", "sub-ita"],  
-  "active": true, 
-  "adult": false, 
+  "active": true,
   "thumbnail": "toonitalia.png", 
   "banner": "toonitalia.png", 
   "categories": ["tvshow", "movie", "vos", "anime"],
diff --git a/channels/tunein.json b/channels/tunein.json
index e72f724a..cb041bb3 100644
--- a/channels/tunein.json
+++ b/channels/tunein.json
@@ -2,7 +2,6 @@
   "id": "tunein",
   "name": "TuneIn",
   "active": true,
-  "adult": false,
   "language": ["*"],
   "thumbnail": "tunein.png",
   "banner": "tunein.png",
diff --git a/channels/vedohd.json b/channels/vedohd.json
index 4d87e941..51a47d4d 100644
--- a/channels/vedohd.json
+++ b/channels/vedohd.json
@@ -3,7 +3,6 @@
 	"name": "VedoHD",
 	"language": ["ita"],
 	"active": false,
-	"adult": false,
 	"thumbnail": "vedohd.png",
 	"banner": "vedohd.png",
 	"categories": ["movie"],
diff --git a/channels/vvvvid.json b/channels/vvvvid.json
index e1f33816..4f84b77a 100644
--- a/channels/vvvvid.json
+++ b/channels/vvvvid.json
@@ -2,7 +2,6 @@
     "id": "vvvvid",
     "name": "VVVVID",
     "active": true,
-    "adult": false,
     "language": ["ita","vos"],
     "thumbnail": "vvvvid.png",
     "banner": "vvvvid.png",
diff --git a/channelselector.py b/channelselector.py
index 312174fa..455ed2c4 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -102,9 +102,6 @@ def getchanneltypes(view="thumb_"):
     # Lista de categorias
     channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "direct", "live", "torrent",  "music"]
 
-    if config.get_setting("adult_mode") != 0:
-        channel_types.append("adult")
-
     # channel_language = config.get_setting("channel_language", default="all")
     channel_language = auto_filter()
     logger.info("channel_language=%s" % channel_language)
@@ -145,11 +142,7 @@ def filterchannels(category, view="thumb_"):
         category = "all"
         appenddisabledchannels = True
 
-    # Lee la lista de canales
-    if category != 'adult':
-        channel_path = os.path.join(config.get_runtime_path(), 'channels', '*.json')
-    else:
-        channel_path = os.path.join(config.get_runtime_path(), 'channels', 'porn', '*.json')
+    channel_path = os.path.join(config.get_runtime_path(), 'channels', '*.json')
     logger.info("channel_path = %s" % channel_path)
 
     channel_files = glob.glob(channel_path)
@@ -202,10 +195,6 @@ def filterchannels(category, view="thumb_"):
                 if not appenddisabledchannels:
                     continue
 
-            # Se salta el canal para adultos si el modo adultos está desactivado
-            if channel_parameters["adult"] and config.get_setting("adult_mode") == 0:
-                continue
-
             # Se salta el canal si está en un idioma filtrado
             # Se muestran todos los canales si se elige "all" en el filtrado de idioma
             # Se muestran sólo los idiomas filtrados, cast o lat
@@ -319,9 +308,9 @@ def set_channel_info(parameters):
         #     lang = 'ita'
 
         if lang in lang_dict:
-            if language != '' and language != '*' and not parameters['adult']:
+            if language != '' and language != '*':
                 language = '%s, %s' % (language, lang_dict[lang])
-            elif not parameters['adult']:
+            else:
                 language = lang_dict[lang]
         if lang == '*':
             break
diff --git a/core/channeltools.py b/core/channeltools.py
index 62bbdde9..1ab338ef 100644
--- a/core/channeltools.py
+++ b/core/channeltools.py
@@ -14,13 +14,6 @@ default_file = dict()
 
 remote_path = 'https://raw.githubusercontent.com/kodiondemand/media/master/'
 
-
-def is_adult(channel_name):
-    logger.info("channel_name=" + channel_name)
-    channel_parameters = get_channel_parameters(channel_name)
-    return channel_parameters["adult"]
-
-
 def is_enabled(channel_name):
     logger.info("channel_name=" + channel_name)
     return get_channel_parameters(channel_name)["active"] and get_channel_setting("enabled", channel=channel_name,
@@ -41,14 +34,8 @@ def get_channel_parameters(channel_name):
                 channel_parameters["channel"] = channel_parameters.pop("id")
 
                 # si no existe el key se declaran valor por defecto para que no de fallos en las funciones que lo llaman
-                channel_parameters["adult"] = channel_parameters.get("adult", False)
-                logger.info(channel_parameters["adult"])
-                if channel_parameters["adult"]:
-                    channel_parameters["update_url"] = channel_parameters.get("update_url", DEFAULT_UPDATE_URL + 'porn/')
-                else:
-                    channel_parameters["update_url"] = channel_parameters.get("update_url", DEFAULT_UPDATE_URL)
+                channel_parameters["update_url"] = channel_parameters.get("update_url", DEFAULT_UPDATE_URL)
                 channel_parameters["language"] = channel_parameters.get("language", ["all"])
-                ##                channel_parameters["adult"] = channel_parameters.get("adult", False)
                 channel_parameters["active"] = channel_parameters.get("active", False)
                 channel_parameters["include_in_global_search"] = channel_parameters.get("include_in_global_search",
                                                                                         False)
@@ -92,7 +79,6 @@ def get_channel_parameters(channel_name):
             logger.error(channel_name + ".json error \n%s" % ex)
             channel_parameters = dict()
             channel_parameters["channel"] = ""
-            channel_parameters["adult"] = False
             channel_parameters['active'] = False
             channel_parameters["language"] = ""
             channel_parameters["update_url"] = DEFAULT_UPDATE_URL
@@ -108,14 +94,12 @@ def get_channel_json(channel_name):
     try:
         channel_path = filetools.join(config.get_runtime_path(), "channels", channel_name + ".json")
         if not filetools.isfile(channel_path):
-            channel_path = filetools.join(config.get_runtime_path(), 'channels', "porn", channel_name + ".json")
+            channel_path = filetools.join(config.get_runtime_path(), "specials", channel_name + ".json")
             if not filetools.isfile(channel_path):
-                channel_path = filetools.join(config.get_runtime_path(), "specials", channel_name + ".json")
+                channel_path = filetools.join(config.get_runtime_path(), "servers", channel_name + ".json")
                 if not filetools.isfile(channel_path):
-                    channel_path = filetools.join(config.get_runtime_path(), "servers", channel_name + ".json")
-                    if not filetools.isfile(channel_path):
-                        channel_path = filetools.join(config.get_runtime_path(), "servers", "debriders",
-                                                      channel_name + ".json")
+                    channel_path = filetools.join(config.get_runtime_path(), "servers", "debriders",
+                                                  channel_name + ".json")
 
         if filetools.isfile(channel_path):
             # logger.info("channel_data=" + channel_path)
@@ -182,10 +166,9 @@ def get_default_settings(channel_name):
         default_file = jsontools.load(filetools.read(default_path))
 
     channel_path = filetools.join(config.get_runtime_path(), 'channels', channel_name + '.json')
-    adult_path = filetools.join(config.get_runtime_path(), 'channels', 'porn', channel_name + '.json')
 
     # from core.support import dbg; dbg()
-    if filetools.exists(channel_path) or filetools.exists(adult_path):
+    if filetools.exists(channel_path):
         default_controls = default_file['settings']
         default_controls_renumber = default_file['renumber']
         channel_json = get_channel_json(channel_name)
diff --git a/platformcode/config.py b/platformcode/config.py
index f8df53a7..cf34f97a 100644
--- a/platformcode/config.py
+++ b/platformcode/config.py
@@ -193,40 +193,6 @@ def open_settings():
     __settings__.openSettings()
     settings_post = get_all_settings_addon()
 
-    # cb_validate_config (util para validar cambios realizados en el cuadro de dialogo)
-    if settings_post.get('adult_aux_intro_password', None):
-        # Hemos accedido a la seccion de Canales para adultos
-        from platformcode import platformtools
-        if 'adult_password' not in settings_pre:
-            adult_password = set_setting('adult_password', '0000')
-        else:
-            adult_password = settings_pre['adult_password']
-
-        if settings_post['adult_aux_intro_password'] == adult_password:
-            # La contraseña de acceso es correcta
-
-            # Cambio de contraseña
-            if settings_post['adult_aux_new_password1']:
-                if settings_post['adult_aux_new_password1'] == settings_post['adult_aux_new_password2']:
-                    set_setting('adult_password', settings_post['adult_aux_new_password1'])
-                else:
-                    platformtools.dialog_ok(get_localized_string(60305),
-                                            get_localized_string(60306),
-                                            get_localized_string(60307))
-
-        else:
-            platformtools.dialog_ok(get_localized_string(60305), get_localized_string(60309),
-                                    get_localized_string(60310))
-
-            # Deshacer cambios
-            set_setting("adult_mode", settings_pre.get("adult_mode", 0))
-            set_setting("adult_request_password", settings_pre.get("adult_request_password", True))
-
-        # Borramos settings auxiliares
-        set_setting('adult_aux_intro_password', '')
-        set_setting('adult_aux_new_password1', '')
-        set_setting('adult_aux_new_password2', '')
-
     from specials import videolibrary
     from platformcode import xbmc_videolibrary
     if settings_pre.get('downloadpath', None) != settings_post.get('downloadpath', None):
@@ -310,15 +276,11 @@ def get_setting(name, channel="", server="", default=None):
             return False
         else:
             # special case return as str
-            if name in ["adult_password", "adult_aux_intro_password", "adult_aux_new_password1",
-                        "adult_aux_new_password2"]:
-                return value
-            else:
-                try:
-                    value = int(value)
-                except ValueError:
-                    pass
-                return value
+            try:
+                value = int(value)
+            except ValueError:
+                pass
+            return value
 
 
 def set_setting(name, value, channel="", server=""):
@@ -397,9 +359,9 @@ def get_localized_category(categ):
     categories = {'movie': get_localized_string(30122), 'tvshow': get_localized_string(30123),
                   'anime': get_localized_string(30124), 'documentary': get_localized_string(30125),
                   'vos': get_localized_string(30136), 'sub-ita': get_localized_string(70566),
-                  'adult': get_localized_string(30126), 'direct': get_localized_string(30137),
-                  'torrent': get_localized_string(70015), 'live': get_localized_string(30138),
-                  'music': get_localized_string(30139) }
+                  'direct': get_localized_string(30137), 'torrent': get_localized_string(70015),
+                  'live': get_localized_string(30138), 'music': get_localized_string(30139)
+    }
     return categories[categ] if categ in categories else categ
 
 
diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index d80b3950..7344079b 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -163,17 +163,6 @@ def run(item=None):
                                             config.get_localized_string(70740) % short)
         # Action in certain channel specified in "action" and "channel" parameters
         else:
-            # Entry point for a channel is the "mainlist" action, so here we check parental control
-            if item.action == "mainlist":
-                from core import channeltools
-                #updater.checkforupdates() beta version checking for update, still disabled
-
-                # Parental control
-                # If it is an adult channel, and user has configured pin, asks for it
-                if channeltools.is_adult(item.channel) and config.get_setting("adult_request_password"):
-                    tecleado = platformtools.dialog_input("", config.get_localized_string(60334), True)
-                    if tecleado is None or tecleado != config.get_setting("adult_password"):
-                        return
             # # Actualiza el canal individual
             # if (item.action == "mainlist" and item.channel != "channelselector" and
             #             config.get_setting("check_for_channel_updates") == True):
@@ -183,16 +172,10 @@ def run(item=None):
             # Checks if channel exists
             if os.path.isfile(os.path.join(config.get_runtime_path(), 'channels', item.channel + ".py")):
                 CHANNELS = 'channels'
-            elif os.path.isfile(os.path.join(config.get_runtime_path(), 'channels', 'porn', item.channel + ".py")):
-                CHANNELS = 'channels.porn'
             else:
                 CHANNELS = 'specials'
 
-            if CHANNELS != 'channels.porn':
-                channel_file = os.path.join(config.get_runtime_path(), CHANNELS, item.channel + ".py")
-            else:
-                channel_file = os.path.join(config.get_runtime_path(), 'channels', 'porn',
-                                                         item.channel + ".py")
+            channel_file = os.path.join(config.get_runtime_path(), CHANNELS, item.channel + ".py")
 
             logger.info("channel_file= " + channel_file + ' - ' + CHANNELS + ' - ' + item.channel)
 
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index e75aa764..4b1779f9 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -28,7 +28,7 @@ msgid "Check for updates"
 msgstr ""
 
 msgctxt "#30002"
-msgid "Enable adult mode"
+msgid ""
 msgstr ""
 
 msgctxt "#30003"
@@ -280,7 +280,7 @@ msgid "Documentaries"
 msgstr ""
 
 msgctxt "#30126"
-msgid "Adult"
+msgid ""
 msgstr ""
 
 msgctxt "#30130"
@@ -1401,7 +1401,7 @@ msgid "The unzipped %s file already exists, or you want to overwrite it.?"
 msgstr ""
 
 msgctxt "#60305"
-msgid "Adult channels"
+msgid ""
 msgstr ""
 
 msgctxt "#60306"
@@ -1413,7 +1413,7 @@ msgid "Use 'Preferences' to change your password"
 msgstr ""
 
 msgctxt "#60308"
-msgid "Adult channels"
+msgid ""
 msgstr ""
 
 msgctxt "#60309"
@@ -1517,7 +1517,7 @@ msgid "Configuration"
 msgstr ""
 
 msgctxt "#60334"
-msgid "Password for adult channels"
+msgid ""
 msgstr ""
 
 msgctxt "#60335"
@@ -3257,7 +3257,7 @@ msgid "Only until Kodi restarts"
 msgstr ""
 
 msgctxt "#70115"
-msgid "Request password to open adult channels"
+msgid ""
 msgstr ""
 
 msgctxt "#70116"
diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po
index 90e15aed..4e335baf 100644
--- a/resources/language/Italian/strings.po
+++ b/resources/language/Italian/strings.po
@@ -28,8 +28,8 @@ msgid "Check for updates"
 msgstr "Verifica aggiornamenti"
 
 msgctxt "#30002"
-msgid "Enable adult mode"
-msgstr "Abilita modalità adulti"
+msgid ""
+msgstr ""
 
 msgctxt "#30003"
 msgid "Enable debug logging"
@@ -280,8 +280,8 @@ msgid "Documentaries"
 msgstr "Documentari"
 
 msgctxt "#30126"
-msgid "Adult"
-msgstr "Adulti"
+msgid ""
+msgstr ""
 
 msgctxt "#30130"
 msgid "News"
@@ -1400,8 +1400,8 @@ msgid "The unzipped %s file already exists, or you want to overwrite it.?"
 msgstr "il file %s da decomprimere esiste già, vuoi sovrascriverlo?"
 
 msgctxt "#60305"
-msgid "Adult channels"
-msgstr "Canali per adulti"
+msgid ""
+msgstr ""
 
 msgctxt "#60306"
 msgid "The fields 'New password' and 'Confirm new password' do not match"
@@ -1412,8 +1412,8 @@ msgid "Use 'Preferences' to change your password"
 msgstr "Entra in 'Preferenze' per cambiare la password"
 
 msgctxt "#60308"
-msgid "Adult channels"
-msgstr "Canali para adulti"
+msgid ""
+msgstr ""
 
 msgctxt "#60309"
 msgid "The password is not correct."
@@ -1516,8 +1516,8 @@ msgid "Configuration"
 msgstr "Configurazione"
 
 msgctxt "#60334"
-msgid "Password for adult channels"
-msgstr "Password per i canali per adulti"
+msgid ""
+msgstr ""
 
 msgctxt "#60335"
 msgid "Watch in..."
@@ -3256,8 +3256,8 @@ msgid "Only until Kodi restarts"
 msgstr "Fino al riavvio di Kodi"
 
 msgctxt "#70115"
-msgid "Request password to open adult channels"
-msgstr "Richiedi password per aprire canali per adulti"
+msgid ""
+msgstr ""
 
 msgctxt "#70116"
 msgid "New password"
diff --git a/resources/settings.xml b/resources/settings.xml
index 3ef50d2c..84ed75be 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -162,14 +162,4 @@
         <setting id="custom_theme" type="folder" label="70565" default="" visible="eq(-1,true)"/>
         <setting id="video_thumbnail_type" type="select" label="70131" lvalues="70132|70133" default="1"/>
     </category>
-
-    <!-- Adult -->
-    <category label="60305">
-        <setting id="adult_aux_intro_password" type="text" label="70113" option="hidden"  default=""/>
-        <setting id="adult_mode" type="select" lvalues="60602|60616|70114" label="30002" enable="!eq(-1,)" default="0"/>
-        <setting id="adult_request_password" type="bool" label="70115"  enable="!eq(-1,0)+!eq(-2,)" default="true"/>
-        <setting id="adult_aux_new_password1" type="text" label="70116" option="hidden" enable="!eq(-3,)" default=""/>
-        <setting id="adult_aux_new_password2" type="text" label="70117" option="hidden" enable="!eq(-1,)" default=""/>
-    </category>
-
 </settings>
diff --git a/service.py b/service.py
index 3ce0199c..e9495a2c 100644
--- a/service.py
+++ b/service.py
@@ -325,30 +325,6 @@ def monitor_update():
                 xbmc.executescript(__file__)
                 exit(0)
 
-# def get_channel_json():
-#     import urllib, os, xbmc
-#     addon = config.get_addon_core()
-#     ROOT_DIR = config.get_runtime_path()
-#     LOCAL_FILE = os.path.join(ROOT_DIR, "channels.json")
-#
-#     if os.path.exists(LOCAL_FILE):
-#         os.remove(LOCAL_FILE)
-#     urllib.urlretrieve("https://raw.githubusercontent.com/kodiondemand/addon/master/channels.json", LOCAL_FILE)
-#
-#     if addon.getSetting("use_custom_url") != "true":
-#         channels_path = os.path.join(ROOT_DIR, "channels", '*.json')
-#         channel_files = sorted(glob.glob(channels_path), key=lambda x: os.path.basename(x))
-#         for channel_file in channel_files:
-#             if channel_file:
-#                 try: import json
-#                 except: import simplejson as json
-#                 with open(LOCAL_FILE) as f:
-#                     data = json.load(f)
-#                     try:
-#                         if data[channel_file]:
-#                             config.set_setting(name=data[channel_file], value="value", channel=channel_file)
-#                     except: pass #channel not in json
-
 # always bypass al websites that use cloudflare at startup, so there's no need to wait 5 seconds when opened
 def callCloudflare():
     from core import httptools, support
@@ -405,12 +381,6 @@ if __name__ == "__main__":
     from specials.downloads import stop_all
     stop_all()
 
-    # modo adulto:
-    # sistema actual 0: Nunca, 1:Siempre, 2:Solo hasta que se reinicie Kodi
-    # si es == 2 lo desactivamos.
-    if config.get_setting("adult_mode") == 2:
-        config.set_setting("adult_mode", 0)
-
     update_wait = [0, 10000, 20000, 30000, 60000]
     wait = update_wait[int(config.get_setting("update_wait", "videolibrary"))]
     if wait > 0:
@@ -425,9 +395,6 @@ if __name__ == "__main__":
             xbmc.executescript(__file__)
             exit(0)
 
-    if xbmc.getCondVisibility('System.HasAddon(repository.kod)'):
-        filetools.rmdirtree(xbmc.translatePath('special://home/addons/repository.kod'))
-
     # Copia Custom code a las carpetas de Alfa desde la zona de Userdata
     from platformcode import custom_code
     custom_code.init()
diff --git a/specials/community.json b/specials/community.json
index c72593c1..2302af6f 100644
--- a/specials/community.json
+++ b/specials/community.json
@@ -2,7 +2,6 @@
   "id": "community",
   "name": "Community",
   "active": true,
-  "adult": false,
   "language": ["*"],
   "thumbnail": "",
   "banner": "",
diff --git a/specials/downloads.json b/specials/downloads.json
index 966eab98..1044ac8a 100644
--- a/specials/downloads.json
+++ b/specials/downloads.json
@@ -2,7 +2,6 @@
   "id": "downloads",
   "name": "Descargas",
   "active": false,
-  "adult": false,
   "language": ["*"],
   "categories": [
     "movie"
diff --git a/specials/filmontv.json b/specials/filmontv.json
index fcf35bf5..39fb9c6b 100644
--- a/specials/filmontv.json
+++ b/specials/filmontv.json
@@ -3,7 +3,6 @@
     "name": "Film in tv",
     "language": ["ita"],
     "active": false,
-    "adult": false,
     "thumbnail": null,
     "banner": null,
     "categories": [],
diff --git a/specials/help.json b/specials/help.json
index 5a49476b..8e51ddd1 100644
--- a/specials/help.json
+++ b/specials/help.json
@@ -2,6 +2,5 @@
   "id": "help",
   "name": "Ayuda",
   "active": false,
-  "adult": false,
   "language": ["*"]
 }
\ No newline at end of file
diff --git a/specials/news.json b/specials/news.json
index 63fb0be7..5c5e7f87 100644
--- a/specials/news.json
+++ b/specials/news.json
@@ -2,7 +2,6 @@
   "id": "news",
   "name": "Novedades",
   "active": false,
-  "adult": false,
   "language": ["*"],
   "categories": [
     "movie"
diff --git a/specials/news.py b/specials/news.py
index f5a06b72..3d9a4ad1 100644
--- a/specials/news.py
+++ b/specials/news.py
@@ -155,10 +155,6 @@ def get_channels_list():
         if not channel_parameters["active"]:
             continue
 
-        # No incluir si es un canal para adultos, y el modo adulto está desactivado
-        if channel_parameters["adult"] and config.get_setting("adult_mode") == 0:
-            continue
-
         # No incluir si el canal es en un idioma filtrado
         if channel_language != "all" and channel_language not in str(channel_parameters["language"]) \
                 and "*" not in channel_parameters["language"]:
@@ -630,10 +626,6 @@ def setting_channel(item):
         if not channel_parameters["active"]:
             continue
 
-        # No incluir si es un canal para adultos, y el modo adulto está desactivado
-        if channel_parameters["adult"] and config.get_setting("adult_mode") == 0:
-            continue
-
         # No incluir si el canal es en un idioma filtrado
         if channel_language != "all" and channel_language not in str(channel_parameters["language"]) \
                 and "*" not in channel_parameters["language"]:
diff --git a/specials/search.json b/specials/search.json
index 0db387a0..947ebb08 100644
--- a/specials/search.json
+++ b/specials/search.json
@@ -2,7 +2,6 @@
   "id": "search",
   "name": "search",
   "active": false,
-  "adult": false,
   "thumbnail": "",
   "banner": "",
   "categories": [],
diff --git a/specials/search.py b/specials/search.py
index ed741354..f9c9277b 100644
--- a/specials/search.py
+++ b/specials/search.py
@@ -419,8 +419,6 @@ def setting_channel_new(item):
     presel_values = ['skip', 'actual', 'all', 'none']
 
     categs = ['movie', 'tvshow', 'documentary', 'anime', 'vos', 'direct', 'torrent']
-    if config.get_setting('adult_mode') > 0:
-        categs.append('adult')
     for c in categs:
         preselecciones.append(config.get_localized_string(70577) + config.get_localized_category(c))
         presel_values.append(c)
diff --git a/specials/tvmoviedb.json b/specials/tvmoviedb.json
index 7a97a93c..250e4adc 100644
--- a/specials/tvmoviedb.json
+++ b/specials/tvmoviedb.json
@@ -2,7 +2,6 @@
   "id": "tvmoviedb",
   "name": "TvMovieDB",
   "active": false,
-  "adult": false,
   "language": ["*"],
   "thumbnail": "http://i.imgur.com/HA7fvgD.png",
   "categories": [
diff --git a/specials/url.json b/specials/url.json
index 16b4a1b4..693984be 100644
--- a/specials/url.json
+++ b/specials/url.json
@@ -2,7 +2,6 @@
   "id": "url",
   "name": "URL",
   "active": false,
-  "adult": false,
   "thumbnail": "url.png",
   "banner": "url.png"
 }
\ No newline at end of file
diff --git a/specials/videolibrary.json b/specials/videolibrary.json
index 89e04bc2..26654e2d 100644
--- a/specials/videolibrary.json
+++ b/specials/videolibrary.json
@@ -2,7 +2,6 @@
   "id": "videolibrary",
   "name": "Videoteca",
   "active": false,
-  "adult": false,
   "language": ["*"],
   "settings": [
     {