diff --git a/mediaserver/IMPORTANTE LEEME en esta version.txt b/mediaserver/IMPORTANTE LEEME en esta version.txt
index f62ce233..5a9a151e 100644
--- a/mediaserver/IMPORTANTE LEEME en esta version.txt	
+++ b/mediaserver/IMPORTANTE LEEME en esta version.txt	
@@ -1,2 +1,2 @@
-Debe ejecutar primero el archivo "script.py".
+Debe ejecutar primero el archivo "script.py", si no lo hizo antes.
 Una vez realizado el proceso podrá ejecutar como siempre "alfa.py" para iniciar el addon.
\ No newline at end of file
diff --git a/mediaserver/platformcode/controllers/html.py b/mediaserver/platformcode/controllers/html.py
index 0cc5f00b..573171a1 100644
--- a/mediaserver/platformcode/controllers/html.py
+++ b/mediaserver/platformcode/controllers/html.py
@@ -12,11 +12,17 @@ import channelselector
 from controller import Controller
 from controller import Platformtools
 from platformcode import config
-from core import versiontools
 from core.item import Item
 from core.tmdb import Tmdb
 from platformcode import launcher, logger
+from core import filetools
 
+# <addon id="plugin.video.alfa" name="Alfa" version="2.3.0" provider-name="Alfa Addon">
+data = filetools.read(filetools.join(config.get_runtime_path(), "addon.xml"))
+aux = re.findall('<addon id="plugin.video.alfa" name="Alfa" version="([^"]+)"', data, re.MULTILINE | re.DOTALL)
+version = "???"
+if len(aux) > 0:
+    version = aux[0]
 
 class html(Controller):
     pattern = re.compile("##")
@@ -29,8 +35,8 @@ class html(Controller):
         if self.handler:
             self.client_ip = handler.client.getpeername()[0]
             self.send_message({"action": "connect",
-                               "data": {"version": "Alfa %s" % versiontools.get_current_plugin_version_tag(),
-                                        "date": versiontools.get_current_plugin_date()}})
+                               "data": {"version": "Alfa %s" % version,
+                                        "date": "--/--/----"}})
             t = threading.Thread(target=launcher.start, name=ID)
             t.setDaemon(True)
             t.start()
diff --git a/mediaserver/platformcode/launcher.py b/mediaserver/platformcode/launcher.py
index 81549e38..9a5f551c 100644
--- a/mediaserver/platformcode/launcher.py
+++ b/mediaserver/platformcode/launcher.py
@@ -87,33 +87,16 @@ def run(item):
         if item.action == "mainlist":
             itemlist = channelselector.getmainlist("banner_")
 
-            # if config.get_setting("check_for_plugin_updates"):
-            #     logger.info("channelselector.mainlist Verificar actualizaciones activado")
-            #
-            #     from core import updater
-            #     try:
-            #         version = updater.checkforupdates()
-            #
-            #         if version:
-            #             platformtools.dialog_ok("Versión " + version + " disponible",
-            #                                     "Ya puedes descargar la nueva versión del plugin\ndesde el listado principal")
-            #             itemlist.insert(0, Item(title="Actualizar Alfa a la versión " + version, version=version,
-            #                                     channel="updater", action="update",
-            #                                     thumbnail=os.path.join(config.get_runtime_path(), "resources", "images",
-            #                                                            "banner", "thumb_update.png")))
-            #     except:
-            #         platformtools.dialog_ok("No se puede conectar", "No ha sido posible comprobar",
-            #                                 "si hay actualizaciones")
-            #         logger.info("Fallo al verificar la actualización")
-            #
-            # else:
-            #     logger.info("Verificar actualizaciones desactivado")
-
         if item.action == "getchanneltypes":
             itemlist = channelselector.getchanneltypes("banner_")
         if item.action == "filterchannels":
             itemlist = channelselector.filterchannels(item.channel_type, "banner_")
 
+    elif item.action == "script":
+        from core import tmdb
+        if tmdb.drop_bd():
+            platformtools.dialog_notification("Alfa", "caché eliminada", time=2000, sound=False)
+
     # Todas las demas las intenta ejecturaren el siguiente orden:
     # 1. En el canal
     # 2. En el launcher
diff --git a/mediaserver/resources/settings.xml b/mediaserver/resources/settings.xml
index 0eb273ce..5fe48645 100644
--- a/mediaserver/resources/settings.xml
+++ b/mediaserver/resources/settings.xml
@@ -22,14 +22,9 @@
         <setting id="adult_aux_new_password1" type="text" label="Nueva contraseña:" option="hidden" enable="!eq(-3,)" default=""/>
         <setting id="adult_aux_new_password2" type="text" label="Confirmar nueva contraseña:" option="hidden" enable="!eq(-1,)" default=""/>
 
-        <!--<setting type="sep"/>-->
-        <!--<setting label="Actualizaciones" type="lsep"/>-->
-        <!--<setting id="plugin_updates_available" type="number" label="Number of updates available" default="0" visible="false"/>-->
-        <!--<setting id="check_for_plugin_updates" type="bool" label="30001" default="true"/>-->
-        <!--<setting id="check_for_channel_updates" type="bool" label="30004" default="true"/>-->
     </category>
 
-    <!-- Path downloads and subtitles -->
+    <!-- Path downloads -->
     <category label="30501">
         <setting type="sep"/>
         <setting id="downloadpath" type="text" label="30017" default=""/>
@@ -41,4 +36,19 @@
         <setting id="folder_tvshows" type="text" label="Nombre de carpeta para 'Series'" default="SERIES"/>
         <setting id="folder_movies" type="text" label="Nombre de carpeta para 'Peliculas'" default="CINE"/>
     </category>
+
+
+    <category label="Otros">
+        <setting label="Info de películas/series en menú contextual" type="lsep"/>
+        <setting id="infoplus" type="bool" label="Mostrar opción Infoplus:" default="true"/>
+
+        <setting type="sep"/>
+        <setting label="TheMovieDB (obtiene datos de las películas o series)" type="lsep"/>
+        <setting id="tmdb_threads" type="labelenum" values="5|10|15|20|25|30" label="Búsquedas simultáneas (puede causar inestabilidad)" default="20"/>
+        <setting id="tmdb_plus_info" type="bool" label="Buscar información extendida (datos de actores) Aumenta el tiempo de búsqueda" default="false"/>
+        <setting id="tmdb_cache" type="bool" label="Usar caché (mejora las búsquedas recurrentes)" default="true"/>
+        <setting id="tmdb_cache_expire" type="enum" lvalues="cada 1 día|cada 7 días|cada 15 días|cada 30 días|No" label="¿Renovar caché?" enable="eq(-1,true)" default="4"/>
+        <!--<setting id="tmdb_clean_db_cache" type="action" label="Pulse para 'Borrar caché' guardada" action="RunPlugin(plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAic2NyaXB0Ig0KfQ==)" />-->
+   </category>
+
 </settings>
diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml
index 5587a7e9..3beaa847 100755
--- a/plugin.video.alfa/addon.xml
+++ b/plugin.video.alfa/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.alfa" name="Alfa" version="2.3.0" provider-name="Alfa Addon">
+<addon id="plugin.video.alfa" name="Alfa" version="2.3.1" provider-name="Alfa Addon">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.libtorrent" optional="true"/>
@@ -19,15 +19,10 @@
     </assets>
       <news>[B]Estos son los cambios para esta versión:[/B]
       [COLOR green][B]Canales agregados y arreglos[/B][/COLOR]
-      » cartoonlatino       »          serieslan
-      » pelisplus               »           pedropolis
-      » flashx                    »           cinetux
-      » animeflv_ru          »           streamixcloud
-      » estrenosgo           »           animemovil
-      » allpeliculas            »           pelismundo
+      » ohlatino       »          animemovil
+      » pelisplus      »          flashx
       ¤ arreglos internos
-      [COLOR green]Gracias a [COLOR yellow]Danielr460[/COLOR] por su colaboración en esta versión[/COLOR]
-      </news>
+     </news>
     <description lang="es">Navega con Kodi por páginas web para ver sus videos de manera fácil.</description>
     <summary lang="en">Browse web pages using Kodi</summary>
     <description lang="en">Browse web pages using Kodi, you can easily watch their video content.</description>
diff --git a/plugin.video.alfa/channels/allcalidad.json b/plugin.video.alfa/channels/allcalidad.json
index 18c7397d..5c35e0cf 100755
--- a/plugin.video.alfa/channels/allcalidad.json
+++ b/plugin.video.alfa/channels/allcalidad.json
@@ -6,13 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s22.postimg.org/irnlwuizh/allcalidad1.png",
   "banner": "https://s22.postimg.org/9y1athlep/allcalidad2.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "14/07/2017",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "movie",
     "direct"
diff --git a/plugin.video.alfa/channels/allpeliculas.json b/plugin.video.alfa/channels/allpeliculas.json
index b9d5ca74..2574c95b 100755
--- a/plugin.video.alfa/channels/allpeliculas.json
+++ b/plugin.video.alfa/channels/allpeliculas.json
@@ -4,29 +4,6 @@
   "language": ["lat"],
   "active": true,
   "adult": false,
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/06/2017",
-      "description": "Url mal escritas"
-    },
-    {
-      "date": "10/06/2017",
-      "description": "Reparado búsqueda de videos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "16/02/2017",
-      "description": "Añadidas nuevas opciones y servidores"
-    },
-    {
-      "date": "19/03/2016",
-      "description": "Añadido soporte para la videoteca y reparada busqueda global."
-    }
-  ],
   "thumbnail": "http://i.imgur.com/aWCDWtn.png",
   "banner": "allpeliculas.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/alltorrent.json b/plugin.video.alfa/channels/alltorrent.json
index 4739bd8b..e279dbd3 100755
--- a/plugin.video.alfa/channels/alltorrent.json
+++ b/plugin.video.alfa/channels/alltorrent.json
@@ -5,13 +5,6 @@
   "adult": false,
   "language": ["cast"],
   "thumbnail": "http://imgur.com/sLaXHvp.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "26/04/2017",
-      "description": "Release"
-    }
-  ],
   "categories": [
     "torrent",
     "movie"
diff --git a/plugin.video.alfa/channels/animeflv.json b/plugin.video.alfa/channels/animeflv.json
index 6bf5a4d7..e6851bab 100755
--- a/plugin.video.alfa/channels/animeflv.json
+++ b/plugin.video.alfa/channels/animeflv.json
@@ -6,25 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "animeflv.png",
   "banner": "animeflv.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "18/05/2017",
-      "description": "fix ultimos animes, episodios"
-    },
-    {
-      "date": "06/04/2017",
-      "description": "fix ultimos episodios"
-    },
-    {
-      "date": "01/03/2017",
-      "description": "fix nueva web"
-    },
-    {
-      "date": "09/07/2016",
-      "description": "Arreglo viewmode"
-    }
-  ],
   "categories": [
     "anime"
   ],
diff --git a/plugin.video.alfa/channels/animeflv_me.json b/plugin.video.alfa/channels/animeflv_me.json
index b5ab4807..65784f01 100755
--- a/plugin.video.alfa/channels/animeflv_me.json
+++ b/plugin.video.alfa/channels/animeflv_me.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "http://i.imgur.com/x9AdvBx.png",
   "banner": "http://i.imgur.com/dTZwCPq.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "05/01/2017",
-      "description": "Actualizada url de la opción Novedades. Arreglado un error que impedia que se mostrara un solo resultado al realizar busquedas. Limpieza de código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "nuevo canal"
-    }
-  ],
   "categories": [
     "anime"
   ],
diff --git a/plugin.video.alfa/channels/animeflv_ru.json b/plugin.video.alfa/channels/animeflv_ru.json
index a7831726..9a9d9a27 100755
--- a/plugin.video.alfa/channels/animeflv_ru.json
+++ b/plugin.video.alfa/channels/animeflv_ru.json
@@ -6,22 +6,9 @@
   "language": ["cast", "lat"],
   "thumbnail": "http://i.imgur.com/5nRR9qq.png",
   "banner": "animeflv_ru.png",
-  "version": 1,
   "compatible": {
     "python": "2.7.9"
   },
-  "changes": {
-    "change": [
-      {
-        "date": "06/04/2017",
-        "description": "fix"
-      },
-      {
-        "date": "01/03/2017",
-        "description": "fix nueva web"
-      }
-    ]
-  },
   "categories": [
     "anime"
   ],
diff --git a/plugin.video.alfa/channels/animeid.json b/plugin.video.alfa/channels/animeid.json
index 220d8ec8..b75bb3ba 100755
--- a/plugin.video.alfa/channels/animeid.json
+++ b/plugin.video.alfa/channels/animeid.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "animeid.png",
   "banner": "animeid.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "17/05/2017",
-      "description": "Fix novedades y replace en findvideos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "04/01/16",
-      "description": "Arreglado problema en findvideos"
-    }
-  ],
   "categories": [
     "anime"
   ],
diff --git a/plugin.video.alfa/channels/animemovil.json b/plugin.video.alfa/channels/animemovil.json
index 5c6a6300..41ac4634 100644
--- a/plugin.video.alfa/channels/animemovil.json
+++ b/plugin.video.alfa/channels/animemovil.json
@@ -3,16 +3,9 @@
   "name": "Animemovil",
   "active": true,
   "adult": false,
-  "language": ["*"],
+  "language": ["cat", "lat"],
   "thumbnail": "https://s1.postimg.org/92ji7stii7/animemovil1.png",
   "banner": "",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/10/2017",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "anime"
   ],
diff --git a/plugin.video.alfa/channels/animemovil.py b/plugin.video.alfa/channels/animemovil.py
index ac9e621f..a33e40a8 100644
--- a/plugin.video.alfa/channels/animemovil.py
+++ b/plugin.video.alfa/channels/animemovil.py
@@ -138,7 +138,7 @@ def listado(item):
 
         itemlist.append(item.clone(action=action, title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3,
                                    contentTitle=title, contentSerieName=show, infoLabels=infoLabels,
-                                   context=renumbertools.context, contentType=tipo))
+                                   context=renumbertools.context(item), contentType=tipo))
             
     
     try:
@@ -205,7 +205,7 @@ def completo(item):
         infoLabels = {'filtro': {"original_language": "ja"}.items()}
         itemlist.append(Item(channel=item.channel, action=action, title=scrapedtitle, url=url, thumbnail=thumb,
                              text_color=color3, contentTitle=title, contentSerieName=show, extra="completo",
-                             context=renumbertools.context, contentType=tipo, infoLabels=infoLabels))
+                             context=renumbertools.context(item), contentType=tipo, infoLabels=infoLabels))
 
     return itemlist
 
@@ -227,7 +227,7 @@ def episodios(item):
     for url, title in matches:
         url = host + url
         epi = scrapertools.find_single_match(title, '(?i)%s.*? (\d+) (?:Sub|Audio|Español)' % item.contentSerieName)
-        new_item = item.clone(action="findvideos", url=url, title=title, extra="", context=renumbertools.context)
+        new_item = item.clone(action="findvideos", url=url, title=title, extra="")
         if epi:
             season, episode = renumbertools.numbered_for_tratk(
                 item.channel, show, 1, int(epi))
@@ -301,7 +301,7 @@ def emision(item):
             infoLabels = {'filtro': {"original_language": "ja"}.items()}
             itemlist.append(item.clone(action="episodios", title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3,
                                        contentTitle=title, contentSerieName=title, extra="recientes",
-                                       context=renumbertools.context, infoLabels=infoLabels))
+                                       context=renumbertools.context(item), infoLabels=infoLabels))
 
     return itemlist
 
diff --git a/plugin.video.alfa/channels/animeshd.json b/plugin.video.alfa/channels/animeshd.json
index 4de05b19..80c79856 100755
--- a/plugin.video.alfa/channels/animeshd.json
+++ b/plugin.video.alfa/channels/animeshd.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://s21.postimg.org/b43i3ljav/animeshd.png",
   "banner": "https://s4.postimg.org/lulxulmql/animeshd-banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "03/06/2017",
-      "description": "limpieza de codigo"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "19/05/2017",
-      "description": "First release"
-    }
-  ],
   "categories": [
     "anime"
   ]
diff --git a/plugin.video.alfa/channels/animeyt.json b/plugin.video.alfa/channels/animeyt.json
index d5672f1a..5747693d 100644
--- a/plugin.video.alfa/channels/animeyt.json
+++ b/plugin.video.alfa/channels/animeyt.json
@@ -5,13 +5,6 @@
   "adult": false,
   "language": "es",
   "thumbnail": "http://i.imgur.com/dHpupFk.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "17/05/2017",
-      "description": "Fix novedades y replace en findvideos"
-    }
-  ],
   "categories": [
     "anime"
   ],
diff --git a/plugin.video.alfa/channels/anitoonstv.json b/plugin.video.alfa/channels/anitoonstv.json
index cb7cb7e0..c2c56fa9 100755
--- a/plugin.video.alfa/channels/anitoonstv.json
+++ b/plugin.video.alfa/channels/anitoonstv.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "http://i.imgur.com/9Zu5NBc.png",
   "banner": "http://i.imgur.com/JQSXCaB.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "13/06/2017",
-      "description": "Arreglado problema en nombre de servidores"
-    },
-    {
-      "date": "02/06/2017",
-      "description": "Primera Versión"
-    }
-  ],
   "categories": [
     "tvshow",
     "anime"
diff --git a/plugin.video.alfa/channels/areadocumental.json b/plugin.video.alfa/channels/areadocumental.json
index 84941551..f3693852 100755
--- a/plugin.video.alfa/channels/areadocumental.json
+++ b/plugin.video.alfa/channels/areadocumental.json
@@ -4,21 +4,6 @@
   "language": ["cast", "lat"],
   "adult": false,
   "active": true,
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "16/02/2017",
-      "description": "Canal reparado ya que no funcionaban los enlaces"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "banner": "areadocumental.png",
   "thumbnail": "areadocumental.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/asialiveaction.json b/plugin.video.alfa/channels/asialiveaction.json
index ca1692ff..051d2359 100644
--- a/plugin.video.alfa/channels/asialiveaction.json
+++ b/plugin.video.alfa/channels/asialiveaction.json
@@ -1,20 +1,13 @@
 {
   "id": "asialiveaction",
-  "name": "Asialiveaction.",
+  "name": "Asialiveaction",
   "active": true,
   "adult": false,
   "language": ["cast", "lat"],
   "thumbnail": "asialiveaction.png",
   "banner": "https://imgur.com/B1IOAu4.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "08/10/2017",
-      "description": "Primera versión del canal"
-    }
-  ],
   "categories": [
     "movie",
-    "serie"
+    "tvshow"
   ]
 }
diff --git a/plugin.video.alfa/channels/bajui2.json b/plugin.video.alfa/channels/bajui2.json
index 9a2e8fde..2af4b680 100755
--- a/plugin.video.alfa/channels/bajui2.json
+++ b/plugin.video.alfa/channels/bajui2.json
@@ -7,21 +7,6 @@
   "thumbnail": "bajui.png",
   "banner": "bajui.png",
   "fanart": "bajui.png",
-  "version": 2,
-  "changes": [
-    {
-      "date": "07/08/2017",
-      "description": "Fix URL HOST changed to Bajui2"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/beeg.json b/plugin.video.alfa/channels/beeg.json
index 3bd04c00..85c878fe 100755
--- a/plugin.video.alfa/channels/beeg.json
+++ b/plugin.video.alfa/channels/beeg.json
@@ -6,21 +6,6 @@
   "language": ["*"],
   "thumbnail": "beeg.png",
   "banner": "beeg.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "03/06/2017",
-      "description": "reliminado encoding y soporte multiples calidades"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/bityouth.json b/plugin.video.alfa/channels/bityouth.json
index 68495232..143ef328 100755
--- a/plugin.video.alfa/channels/bityouth.json
+++ b/plugin.video.alfa/channels/bityouth.json
@@ -6,17 +6,6 @@
   "language": ["cast"],
   "thumbnail": "http://s6.postimg.org/6ash180up/bityoulogo.png",
   "banner": "bityouth.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/borrachodetorrent.json b/plugin.video.alfa/channels/borrachodetorrent.json
index af57aff1..dc55a7a5 100755
--- a/plugin.video.alfa/channels/borrachodetorrent.json
+++ b/plugin.video.alfa/channels/borrachodetorrent.json
@@ -5,17 +5,6 @@
   "adult": false,
   "language": ["cast"],
   "thumbnail": "http://imgur.com/BePrYmy.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "26/04/2017",
-      "description": "Release"
-    },
-    {
-      "date": "28/06/2017",
-      "description": "Correciones código y mejoras"
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/bricocine.json b/plugin.video.alfa/channels/bricocine.json
index f458203a..f12e800e 100755
--- a/plugin.video.alfa/channels/bricocine.json
+++ b/plugin.video.alfa/channels/bricocine.json
@@ -6,17 +6,6 @@
   "language": ["cast"],
   "thumbnail": "http://s6.postimg.org/9u8m1ep8x/bricocine.jpg",
   "banner": "bricocine.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/canalpelis.json b/plugin.video.alfa/channels/canalpelis.json
index 7a38759a..4714badb 100644
--- a/plugin.video.alfa/channels/canalpelis.json
+++ b/plugin.video.alfa/channels/canalpelis.json
@@ -7,13 +7,6 @@
   "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/canalpelisbg.jpg",
   "thumbnail": "http://www.canalpelis.com/wp-content/uploads/2016/11/logo_web.gif",
   "banner": "",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/08/17",
-      "description": "Nuevo Canal"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/canalporno.json b/plugin.video.alfa/channels/canalporno.json
index 80e1077b..87240f96 100755
--- a/plugin.video.alfa/channels/canalporno.json
+++ b/plugin.video.alfa/channels/canalporno.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "http://i.imgur.com/gAbPcvT.png?1",
   "banner": "canalporno.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "09/01/2017",
-      "description": "Primera version."
-    }
-  ],
   "categories": [
     "adult"
   ]
diff --git a/plugin.video.alfa/channels/cartoonlatino.json b/plugin.video.alfa/channels/cartoonlatino.json
index e58fef6d..0e3f4ad1 100755
--- a/plugin.video.alfa/channels/cartoonlatino.json
+++ b/plugin.video.alfa/channels/cartoonlatino.json
@@ -6,13 +6,6 @@
   "language": ["lat"],
   "thumbnail": "http://i.imgur.com/wk6fRDZ.png",
   "banner": "http://i.imgur.com/115c59F.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "07/06/2017",
-      "description": "Primera version del canal"
-    }
-  ],
   "categories": [
     "tvshow"
   ]
diff --git a/plugin.video.alfa/channels/ciberdocumentales.json b/plugin.video.alfa/channels/ciberdocumentales.json
index 8925f5db..68e61871 100755
--- a/plugin.video.alfa/channels/ciberdocumentales.json
+++ b/plugin.video.alfa/channels/ciberdocumentales.json
@@ -6,13 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://s9.postimg.org/secdb5s8v/ciberdocumentales.png",
   "banner": "https://s1.postimg.org/sa486z0of/ciberdocumentales_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "18/06/2016",
-      "descripcion": "First release"
-    }
-  ],
   "categories": [
     "documentary"
   ],
diff --git a/plugin.video.alfa/channels/cineasiaenlinea.json b/plugin.video.alfa/channels/cineasiaenlinea.json
index b42bf5d5..68ea28e2 100755
--- a/plugin.video.alfa/channels/cineasiaenlinea.json
+++ b/plugin.video.alfa/channels/cineasiaenlinea.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "http://i.imgur.com/5KOU8uy.png?3",
   "banner": "cineasiaenlinea.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "07/02/17",
-      "description": "Fix bug in newest"
-    },
-    {
-      "date": "09/01/2017",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "movie",
     "vos"
diff --git a/plugin.video.alfa/channels/cinecalidad.json b/plugin.video.alfa/channels/cinecalidad.json
index e35f5c57..3db32aac 100755
--- a/plugin.video.alfa/channels/cinecalidad.json
+++ b/plugin.video.alfa/channels/cinecalidad.json
@@ -6,29 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://s31.postimg.org/puxmvsi7v/cinecalidad.png",
   "banner": "https://s32.postimg.org/kihkdpx1x/banner_cinecalidad.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "01/08/2017",
-      "description": "Cambio de estructura"
-    },
-    {
-      "date": "24/06/2017",
-      "description": "Cambios para autoplay"
-    },
-    {
-      "date": "06/06/2017",
-      "description": "Compatibilidad con AutoPlay"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "18/06/2016",
-      "description": "First release."
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/cinefox.json b/plugin.video.alfa/channels/cinefox.json
index acbb8914..3563b5cc 100755
--- a/plugin.video.alfa/channels/cinefox.json
+++ b/plugin.video.alfa/channels/cinefox.json
@@ -4,27 +4,8 @@
   "active": true,
   "adult": false,
   "language": ["cast", "lat"],
-  "version": 1,
   "thumbnail": "cinefox.png",
   "banner": "cinefox.png",
-  "changes": [
-    {
-      "date": "01/08/2017",
-      "description": "Agregado servidor gvideo"
-    },
-    {
-      "date": "05/04/2017",
-      "description": "Cambio en los servidores"
-    },
-    {
-      "date": "21/03/2017",
-      "description": "Adaptado a httptools y corregido episodios para videoteca"
-    },
-    {
-      "date": "18/07/2016",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/cinefoxtv.json b/plugin.video.alfa/channels/cinefoxtv.json
index 8c127c57..dfa107be 100755
--- a/plugin.video.alfa/channels/cinefoxtv.json
+++ b/plugin.video.alfa/channels/cinefoxtv.json
@@ -6,21 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s28.postimg.org/lytn2q1tp/cinefoxtv.png",
   "banner": "cinefoxtv.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "22/05/2017",
-      "description": "fix por cambio en la estructura"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "09/02/2017",
-      "description": "First release."
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/cinehindi.json b/plugin.video.alfa/channels/cinehindi.json
index 27959fe3..202786d2 100755
--- a/plugin.video.alfa/channels/cinehindi.json
+++ b/plugin.video.alfa/channels/cinehindi.json
@@ -6,13 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "cinehindi.png",
   "banner": "http://i.imgur.com/cau9TVe.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "25/05/2017",
-      "description": "Primera versión completa del canal"
-    }
-  ],
   "categories": [
     "movie"
   ]
diff --git a/plugin.video.alfa/channels/cinetemagay.json b/plugin.video.alfa/channels/cinetemagay.json
index 52651bfb..00ed4f48 100755
--- a/plugin.video.alfa/channels/cinetemagay.json
+++ b/plugin.video.alfa/channels/cinetemagay.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "cinetemagay.png",
   "banner": "cinetemagay.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "05/08/2016",
-      "description": "Eliminado de sección películas"
-    }
-  ],
   "categories": [
     "adult"
   ]
diff --git a/plugin.video.alfa/channels/cinetux.json b/plugin.video.alfa/channels/cinetux.json
index 6a7d3983..bf4d08eb 100755
--- a/plugin.video.alfa/channels/cinetux.json
+++ b/plugin.video.alfa/channels/cinetux.json
@@ -7,25 +7,6 @@
   "thumbnail": "cinetux.png",
   "banner": "cinetux.png",
   "fanart": "cinetux.jpg",
-  "version": 1,
-  "changes": [
-    {
-      "date": "31/07/2017",
-      "description": "Actualizado por cambio de estructura de la página"
-    },
-    {
-      "date": "12/05/2017",
-      "description": "Arreglada paginación y enlaces directos"
-    },
-    {
-      "date": "16/02/2017",
-      "description": "Adaptado a httptools y añadidos enlaces directos"
-    },
-    {
-      "date": "08/07/2016",
-      "description": "Correciones y adaptaciones a la nueva version"
-    }
-  ],
   "categories": [
     "direct",
     "movie"
diff --git a/plugin.video.alfa/channels/clasicofilm.json b/plugin.video.alfa/channels/clasicofilm.json
index d1104cb0..9c97ad0b 100755
--- a/plugin.video.alfa/channels/clasicofilm.json
+++ b/plugin.video.alfa/channels/clasicofilm.json
@@ -6,25 +6,6 @@
   "language": ["cast"],
   "thumbnail": "http://i.imgur.com/F7sevVu.jpg?1",
   "banner": "clasicofilm.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "28/05/2017",
-      "description": "Corregido findvideos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "07/02/17",
-      "description": "Fix bug in newest"
-    },
-    {
-      "date": "09/01/2017",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/crunchyroll.json b/plugin.video.alfa/channels/crunchyroll.json
index 95156d2c..f4341d45 100755
--- a/plugin.video.alfa/channels/crunchyroll.json
+++ b/plugin.video.alfa/channels/crunchyroll.json
@@ -4,13 +4,6 @@
   "language": ["cast", "lat"],
   "active": true,
   "adult": false,
-  "version": 1,
-  "changes": [
-    {
-      "date": "16/05/2017",
-      "description": "Primera versión"
-    }
-  ],
   "thumbnail": "http://i.imgur.com/O49fDS1.png",
   "categories": [
     "anime",
diff --git a/plugin.video.alfa/channels/cuelgame.json b/plugin.video.alfa/channels/cuelgame.json
index fe1e6a9a..8e964bbf 100755
--- a/plugin.video.alfa/channels/cuelgame.json
+++ b/plugin.video.alfa/channels/cuelgame.json
@@ -4,21 +4,6 @@
   "active": true,
   "adult": false,
   "language": ["cast"],
-  "version": 1,
-  "changes": [
-    {
-      "date": "10/12/2016",
-      "description": "Reparado fanart y thumbs y correción código.Adaptado a Infoplus"
-    },
-    {
-      "date": "04/04/2017",
-      "description": "Migración a Httptools"
-    },
-    {
-      "date": "28/06/2017",
-      "description": "Correciones código.Algunas mejoras"
-    }
-  ],
   "thumbnail": "cuelgame.png",
   "banner": "cuelgame.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/cumlouder.json b/plugin.video.alfa/channels/cumlouder.json
index d937eb45..952a0f13 100755
--- a/plugin.video.alfa/channels/cumlouder.json
+++ b/plugin.video.alfa/channels/cumlouder.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "cumlouder.png",
   "banner": "cumlouder.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "04/05/17",
-      "description": "Corregido, usa proxy en caso de error con https"
-    },
-    {
-      "date": "13/01/17",
-      "description": "First version"
-    }
-  ],
   "categories": [
     "adult"
   ]
diff --git a/plugin.video.alfa/channels/datoporn.json b/plugin.video.alfa/channels/datoporn.json
index e346f95f..20f01286 100755
--- a/plugin.video.alfa/channels/datoporn.json
+++ b/plugin.video.alfa/channels/datoporn.json
@@ -4,17 +4,6 @@
   "language": ["*"],
   "active": true,
   "adult": true,
-  "changes": [
-    {
-      "date": "28/05/2017",
-      "description": "Reparado por cambios en la página"
-    },
-    {
-      "date": "21/02/2017",
-      "description": "Primera versión"
-    }
-  ],
-  "version": 1,
   "thumbnail": "http://i.imgur.com/tBSWudd.png?1",
   "banner": "datoporn.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/descargacineclasico.json b/plugin.video.alfa/channels/descargacineclasico.json
index 5b5f9b5b..580cab8a 100755
--- a/plugin.video.alfa/channels/descargacineclasico.json
+++ b/plugin.video.alfa/channels/descargacineclasico.json
@@ -4,17 +4,6 @@
   "language": ["cast"],
   "active": true,
   "adult": false,
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "banner": "descargacineclasico2.png",
   "thumbnail": "descargacineclasico2.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/descargasmix.json b/plugin.video.alfa/channels/descargasmix.json
index ba8fc20d..c20c42a9 100644
--- a/plugin.video.alfa/channels/descargasmix.json
+++ b/plugin.video.alfa/channels/descargasmix.json
@@ -3,30 +3,7 @@
   "name": "DescargasMIX",
   "language": ["cast", "lat"],
   "active": true,
-  "version": 1,
   "adult": false,
-  "changes": [
-    {
-      "date": "06/05/17",
-      "description": "Cambio de dominio"
-    },
-    {
-      "date": "17/04/17",
-      "description": "Mejorado en la deteccion del dominio para futuros cambios"
-    },
-    {
-      "date": "09/04/17",
-      "description": "Arreglado por cambios en la página"
-    },
-    {
-      "date": "27/01/17",
-      "description": "Sección online en películas modificada"
-    },
-    {
-      "date": "08/07/16",
-      "description": "Adaptado el canal a las nuevas funciones"
-    }
-  ],
   "thumbnail": "descargasmix.png",
   "banner": "descargasmix.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/discoverymx.json b/plugin.video.alfa/channels/discoverymx.json
index 6de0bf1e..4752ba1e 100755
--- a/plugin.video.alfa/channels/discoverymx.json
+++ b/plugin.video.alfa/channels/discoverymx.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "discoverymx.png",
   "banner": "discoverymx.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "documentary"
   ]
diff --git a/plugin.video.alfa/channels/divxatope.json b/plugin.video.alfa/channels/divxatope.json
index fb58b863..9c2603b5 100755
--- a/plugin.video.alfa/channels/divxatope.json
+++ b/plugin.video.alfa/channels/divxatope.json
@@ -6,29 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "divxatope.png",
   "banner": "divxatope.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "17/04/17",
-      "description": "Reparados torrents, añadidas nuevas secciones"
-    },
-    {
-      "date": "13/01/17",
-      "description": "Reparados torrents y paginacion. Añadida seccion Peliculas 4K ultraHD"
-    },
-    {
-      "date": "31/12/16",
-      "description": "Adaptado, por cambios en la web"
-    },
-    {
-      "date": "01/07/16",
-      "description": "Eliminado código innecesario."
-    },
-    {
-      "date": "29/04/16",
-      "description": "Adaptar a Buscador global y Novedades Peliculas y Series"
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/divxtotal.json b/plugin.video.alfa/channels/divxtotal.json
index f9826b37..208a9a23 100755
--- a/plugin.video.alfa/channels/divxtotal.json
+++ b/plugin.video.alfa/channels/divxtotal.json
@@ -5,17 +5,6 @@
   "adult": false,
   "language": ["cast"],
   "thumbnail": "http://imgur.com/Madj03A.jpg",
-  "version": 1,
-  "changes": [
-    {
-      "date": "26/04/2017",
-      "description": "Release"
-    },
-    {
-      "date": "28/06/2017",
-      "description": "Correciones código por cambios web"
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/documaniatv.json b/plugin.video.alfa/channels/documaniatv.json
index 01b5e0bb..0ebbeb99 100755
--- a/plugin.video.alfa/channels/documaniatv.json
+++ b/plugin.video.alfa/channels/documaniatv.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "http://i.imgur.com/qMR9sg9.png",
   "banner": "documaniatv.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "11/07/2016",
-      "description": "Reparadas cuentas de usuario."
-    }
-  ],
   "categories": [
     "documentary"
   ],
diff --git a/plugin.video.alfa/channels/documentalesonline.json b/plugin.video.alfa/channels/documentalesonline.json
index edcab55f..6e3e09ec 100755
--- a/plugin.video.alfa/channels/documentalesonline.json
+++ b/plugin.video.alfa/channels/documentalesonline.json
@@ -5,17 +5,6 @@
   "adult": false,
   "language": ["cast", "lat"],
   "thumbnail": "http://i.imgur.com/fsrnC4m.jpg",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/04/2017",
-      "description": "fix novedades"
-    },
-    {
-      "date": "09/03/2017",
-      "description": "nueva web"
-    }
-  ],
   "categories": [
     "documentary"
   ],
diff --git a/plugin.video.alfa/channels/doramastv.json b/plugin.video.alfa/channels/doramastv.json
index 5ab1403f..5e8a1ba5 100755
--- a/plugin.video.alfa/channels/doramastv.json
+++ b/plugin.video.alfa/channels/doramastv.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "doramastv.png",
   "banner": "doramastv.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "tvshow"
   ],
diff --git a/plugin.video.alfa/channels/downloads.json b/plugin.video.alfa/channels/downloads.json
index f38f25a1..c39d5bd0 100755
--- a/plugin.video.alfa/channels/downloads.json
+++ b/plugin.video.alfa/channels/downloads.json
@@ -4,21 +4,6 @@
   "active": false,
   "adult": false,
   "language": ["*"],
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "12/03/17",
-      "description": "Añadidas mas opciones de configuracion y corregidos fallos"
-    },
-    {
-      "date": "12/01/17",
-      "description": "release"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/ecarteleratrailers.json b/plugin.video.alfa/channels/ecarteleratrailers.json
index 7def6f7c..3af1fbb1 100755
--- a/plugin.video.alfa/channels/ecarteleratrailers.json
+++ b/plugin.video.alfa/channels/ecarteleratrailers.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "ecarteleratrailers.png",
   "banner": "ecarteleratrailers.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie"
   ]
diff --git a/plugin.video.alfa/channels/elitetorrent.json b/plugin.video.alfa/channels/elitetorrent.json
index 12372cf1..b81aff68 100644
--- a/plugin.video.alfa/channels/elitetorrent.json
+++ b/plugin.video.alfa/channels/elitetorrent.json
@@ -6,21 +6,6 @@
   "language": ["cast"],
   "thumbnail": "elitetorrent.png",
   "banner": "elitetorrent.png",
-  "version": 2,
-  "changes": [
-    {
-      "date": "2/08/2017",
-      "description": "arreglada url canal"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/elsenordelanillo.json b/plugin.video.alfa/channels/elsenordelanillo.json
index 692d99b1..011afa01 100755
--- a/plugin.video.alfa/channels/elsenordelanillo.json
+++ b/plugin.video.alfa/channels/elsenordelanillo.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "elsenordelanillo.png",
   "banner": "elsenordelanillo.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie"
   ]
diff --git a/plugin.video.alfa/channels/eporner.json b/plugin.video.alfa/channels/eporner.json
index f364548a..874b3ddb 100755
--- a/plugin.video.alfa/channels/eporner.json
+++ b/plugin.video.alfa/channels/eporner.json
@@ -6,21 +6,6 @@
   "language": ["*"],
   "thumbnail": "eporner.png",
   "banner": "eporner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "03/06/2017",
-      "description": "reparada seccion categorias"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "28/12/16",
-      "description": "First version"
-    }
-  ],
   "categories": [
     "adult"
   ]
diff --git a/plugin.video.alfa/channels/erotik.json b/plugin.video.alfa/channels/erotik.json
index 89cdafce..19fa7a4a 100755
--- a/plugin.video.alfa/channels/erotik.json
+++ b/plugin.video.alfa/channels/erotik.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "http://www.youfreeporntube.com/uploads/custom-logo.png",
   "banner": "http://www.youfreeporntube.com/uploads/custom-logo.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "26/12/2016",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/estadepelis.json b/plugin.video.alfa/channels/estadepelis.json
index 68c3f909..0a9c7ec0 100755
--- a/plugin.video.alfa/channels/estadepelis.json
+++ b/plugin.video.alfa/channels/estadepelis.json
@@ -6,29 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s24.postimg.org/nsgit7fhh/estadepelis.png",
   "banner": "https://s28.postimg.org/ud0l032ul/estadepelis_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/06/2017",
-      "description": "Cambios para autoplay"
-    },
-    {
-      "date": "22/06/2017",
-      "description": "ajustes para AutoPlay"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "07/02/2017",
-      "description": "Release"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/estrenosgo.json b/plugin.video.alfa/channels/estrenosgo.json
index 45bf0de6..de9ace77 100755
--- a/plugin.video.alfa/channels/estrenosgo.json
+++ b/plugin.video.alfa/channels/estrenosgo.json
@@ -7,21 +7,6 @@
   "fanart": "https://github.com/master-1970/resources/raw/master/images/fanart/estrenosgo.png",
   "thumbnail": "https://github.com/master-1970/resources/raw/master/images/squares/estrenosgo.png",
   "banner": "estrenosgo.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/05/16",
-      "description": "Compatibilidad con python anteriores a la 2.7"
-    },
-    {
-      "date": "03/05/16",
-      "description": "Modificado por cambios en la web"
-    },
-    {
-      "date": "29/04/16",
-      "description": "Version inicial"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/filesmonster_catalogue.json b/plugin.video.alfa/channels/filesmonster_catalogue.json
index 9d5422c9..1dd36aa8 100755
--- a/plugin.video.alfa/channels/filesmonster_catalogue.json
+++ b/plugin.video.alfa/channels/filesmonster_catalogue.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "filesmonster_catalogue.png",
   "banner": "filesmonster_catalogue.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "05/08/2016",
-      "description": "Eliminado de sección películas"
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/freecambay.json b/plugin.video.alfa/channels/freecambay.json
index 5f43e5ab..b27ede33 100755
--- a/plugin.video.alfa/channels/freecambay.json
+++ b/plugin.video.alfa/channels/freecambay.json
@@ -4,13 +4,6 @@
   "language": ["*"],
   "active": true,
   "adult": true,
-  "version": 1,
-  "changes": [
-    {
-      "date": "29/04/2017",
-      "description": "Primera versión"
-    }
-  ],
   "thumbnail": "http://i.imgur.com/wuzhOCt.png?1",
   "categories": [
     "adult"
diff --git a/plugin.video.alfa/channels/gmobi.json b/plugin.video.alfa/channels/gmobi.json
index cc8951c4..3c144db9 100644
--- a/plugin.video.alfa/channels/gmobi.json
+++ b/plugin.video.alfa/channels/gmobi.json
@@ -4,15 +4,8 @@
   "active": true,
   "adult": false,
   "language": ["cast", "lat"],
-  "version": 1,
   "thumbnail": "http://gnula.mobi/wp-content/uploads/2016/08/Untitled-6.png",
   "banner": "",
-  "changes": [
-    {
-      "date": "25/08/2017",
-      "description": "Nuevo canal"
-    }
-  ],
   "categories": [
     "movie",
     "adult"
diff --git a/plugin.video.alfa/channels/gnula.json b/plugin.video.alfa/channels/gnula.json
index 36decac6..5c0c5564 100755
--- a/plugin.video.alfa/channels/gnula.json
+++ b/plugin.video.alfa/channels/gnula.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "gnula.png",
   "banner": "gnula.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie"
   ]
diff --git a/plugin.video.alfa/channels/guaridavalencianista.json b/plugin.video.alfa/channels/guaridavalencianista.json
index fb8d26ed..e712f441 100755
--- a/plugin.video.alfa/channels/guaridavalencianista.json
+++ b/plugin.video.alfa/channels/guaridavalencianista.json
@@ -6,17 +6,6 @@
   "language": ["cast"],
   "thumbnail": "guaridavalencianista.png",
   "banner": "guaridavalencianista.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "documentary"
   ]
diff --git a/plugin.video.alfa/channels/hdfull.json b/plugin.video.alfa/channels/hdfull.json
index 9c33d55e..1ab9fe97 100755
--- a/plugin.video.alfa/channels/hdfull.json
+++ b/plugin.video.alfa/channels/hdfull.json
@@ -6,29 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "hdfull.png",
   "banner": "hdfull.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "30/05/2017",
-      "description": "Arreglada la extracción de enlaces por cambios en la web"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "21/03/2017",
-      "description": "Pequeño fix para corregir algunas urls de los vídeos que se extraían mal"
-    },
-    {
-      "date": "02/02/2017",
-      "description": "Arreglada la extracción de enlaces por cambios en la web"
-    },
-    {
-      "date": "05/01/2017",
-      "description": "Corregido debido a cloudflare"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow"
diff --git a/plugin.video.alfa/channels/hentaienespanol.json b/plugin.video.alfa/channels/hentaienespanol.json
index ac517505..29425376 100755
--- a/plugin.video.alfa/channels/hentaienespanol.json
+++ b/plugin.video.alfa/channels/hentaienespanol.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "https://s11.postimg.org/cmuwcvvpf/hentaienespanol.png",
   "banner": "https://s3.postimg.org/j3qkfut8z/hentaienespanol_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/12/2016",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/hentaiid.json b/plugin.video.alfa/channels/hentaiid.json
index 7299938a..d20499d4 100755
--- a/plugin.video.alfa/channels/hentaiid.json
+++ b/plugin.video.alfa/channels/hentaiid.json
@@ -6,9 +6,6 @@
   "language": ["*"],
   "thumbnail": "https://dl.dropboxusercontent.com/u/30248079/hentai_id.png",
   "banner": "https://dl.dropboxusercontent.com/u/30248079/hentai_id2.png",
-  "version": 1,
-  "date": "09/03/2017",
-  "changes": "Fix web",
   "categories": [
     "adult"
   ]
diff --git a/plugin.video.alfa/channels/idocumentales.json b/plugin.video.alfa/channels/idocumentales.json
index 3f66b565..74ddf6ef 100755
--- a/plugin.video.alfa/channels/idocumentales.json
+++ b/plugin.video.alfa/channels/idocumentales.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://s27.postimg.org/pjq3y552b/idocumentales.png",
   "banner": "https://s16.postimg.org/6d8bh1z1x/idocumentales_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "18/06/2016",
-      "description": "First release"
-    }
-  ],
   "categories": [
     "documentary"
   ],
diff --git a/plugin.video.alfa/channels/inkapelis.json b/plugin.video.alfa/channels/inkapelis.json
index 50234617..3b672d31 100755
--- a/plugin.video.alfa/channels/inkapelis.json
+++ b/plugin.video.alfa/channels/inkapelis.json
@@ -4,21 +4,6 @@
   "active": true,
   "adult": false,
   "language": ["cast", "lat"],
-  "changes": [
-    {
-      "date": "12/03/2017",
-      "description": "Reparados enlaces directos"
-    },
-    {
-      "date": "27/02/2017",
-      "description": "Añadidos enlaces directos y adaptado al uso de httptools"
-    },
-    {
-      "date": "16/01/2016",
-      "description": "Corregido por cambios en el enmascaramiento de enlaces"
-    }
-  ],
-  "version": 1,
   "thumbnail": "http://i.imgur.com/I7MxHZI.png",
   "banner": "inkapelis.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/javtasty.json b/plugin.video.alfa/channels/javtasty.json
index 03abfa4e..a31ab9d5 100755
--- a/plugin.video.alfa/channels/javtasty.json
+++ b/plugin.video.alfa/channels/javtasty.json
@@ -4,13 +4,6 @@
   "language": ["*"],
   "active": true,
   "adult": true,
-  "version": 1,
-  "changes": [
-    {
-      "date": "29/04/2017",
-      "description": "Primera versión"
-    }
-  ],
   "thumbnail": "http://i.imgur.com/OTYwbAa.png?1",
   "categories": [
     "adult"
diff --git a/plugin.video.alfa/channels/javus.json b/plugin.video.alfa/channels/javus.json
index 16f2c5d4..c94829b2 100755
--- a/plugin.video.alfa/channels/javus.json
+++ b/plugin.video.alfa/channels/javus.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "https://s15.postimg.org/pzd3h4vy3/javus.png",
   "banner": "https://s21.postimg.org/5pqzedp2f/javus_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/12/2016",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/jkanime.json b/plugin.video.alfa/channels/jkanime.json
index d1c3a62b..42e95900 100755
--- a/plugin.video.alfa/channels/jkanime.json
+++ b/plugin.video.alfa/channels/jkanime.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "jkanime.png",
   "banner": "jkanime.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "anime"
   ],
diff --git a/plugin.video.alfa/channels/lacajita.json b/plugin.video.alfa/channels/lacajita.json
index 46302dfc..380ab715 100755
--- a/plugin.video.alfa/channels/lacajita.json
+++ b/plugin.video.alfa/channels/lacajita.json
@@ -4,13 +4,6 @@
   "language": ["cast", "lat"],
   "active": true,
   "adult": false,
-  "version": 1,
-  "changes": [
-    {
-      "date": "16/05/2017",
-      "description": "Primera version"
-    }
-  ],
   "thumbnail": "http://i.imgur.com/LVdupxc.png",
   "categories": [
     "movie",
diff --git a/plugin.video.alfa/channels/locopelis.json b/plugin.video.alfa/channels/locopelis.json
index baa1a4f0..40f68936 100755
--- a/plugin.video.alfa/channels/locopelis.json
+++ b/plugin.video.alfa/channels/locopelis.json
@@ -6,29 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://s31.postimg.org/5worjw2nv/locopelis.png",
   "banner": "https://s31.postimg.org/ng87bb9jv/locopelis_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/06/2017",
-      "description": "Cambios para autoplay"
-    },
-    {
-      "date": "06/06/2017",
-      "description": "Compatibilidad con autoplay"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "06/12/2016",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/maxipelis.json b/plugin.video.alfa/channels/maxipelis.json
index 3231c6d0..f39bd6f4 100644
--- a/plugin.video.alfa/channels/maxipelis.json
+++ b/plugin.video.alfa/channels/maxipelis.json
@@ -4,15 +4,8 @@
   "active": true,
   "adult": false,
   "language": ["cast", "lat"],
-  "version": 1,
   "thumbnail": "http://www.maxipelis.net/wp-content/uploads/2016/12/applogo.png",
   "banner": "",
-  "changes": [
-    {
-      "date": "25/08/2017",
-      "description": "Nuevo canal"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/mejortorrent.json b/plugin.video.alfa/channels/mejortorrent.json
index 402c9fcb..e492c42c 100755
--- a/plugin.video.alfa/channels/mejortorrent.json
+++ b/plugin.video.alfa/channels/mejortorrent.json
@@ -6,17 +6,6 @@
   "language": ["cast"],
   "thumbnail": "mejortorrent.png",
   "banner": "mejortorrent.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "17/04/2017",
-      "description": "Arreglado error que impedía el uso del canal"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/metaserie.json b/plugin.video.alfa/channels/metaserie.json
index 041622aa..acf2f552 100755
--- a/plugin.video.alfa/channels/metaserie.json
+++ b/plugin.video.alfa/channels/metaserie.json
@@ -6,29 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s32.postimg.org/7g50yo39h/metaserie.png",
   "banner": "https://s31.postimg.org/u6yddil8r/metaserie_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/06/2017",
-      "description": "Cambios para autoplay"
-    },
-    {
-      "date": "06/06/2017",
-      "description": "Compatibilidad con AutoPlay"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "04/01/2017",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "tvshow"
   ],
diff --git a/plugin.video.alfa/channels/miltorrents.json b/plugin.video.alfa/channels/miltorrents.json
index 18e75419..08ac652c 100755
--- a/plugin.video.alfa/channels/miltorrents.json
+++ b/plugin.video.alfa/channels/miltorrents.json
@@ -4,21 +4,6 @@
   "active": true,
   "adult": false,
   "language": ["cast"],
-  "version": 1,
-  "changes": [
-    {
-      "date": "06/12/2016",
-      "description": "Release"
-    },
-    {
-      "date": "04/04/2017",
-      "description": "Migración a Httptools y algunos arreglos"
-    },
-    {
-      "date": "28/06/2017",
-      "description": "Correciones código y algunas mejoras"
-    }
-  ],
   "thumbnail": "http://imgur.com/KZoska0.png",
   "banner": "miltorrents.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/miradetodo.json b/plugin.video.alfa/channels/miradetodo.json
index 28043b89..16a9821b 100755
--- a/plugin.video.alfa/channels/miradetodo.json
+++ b/plugin.video.alfa/channels/miradetodo.json
@@ -6,17 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s17.postimg.org/e8kp12mcv/miradetodo.png",
   "banner": "https://s7.postimg.org/it21t0dej/miradetodo-banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "05/05/2017",
-      "description": "First release"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/mundoflv.json b/plugin.video.alfa/channels/mundoflv.json
index 905b361a..a3f580a5 100755
--- a/plugin.video.alfa/channels/mundoflv.json
+++ b/plugin.video.alfa/channels/mundoflv.json
@@ -6,33 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s32.postimg.org/h1ewz9hhx/mundoflv.png",
   "banner": "mundoflv.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/06/2017",
-      "description": "Cambios para autoplay"
-    },
-    {
-      "date": "06/06/2017",
-      "description": "Compatibilidad con AutoPlay"
-    },
-    {
-      "date": "03/06/2017",
-      "description": "Reparado por mala subida"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "28/01/2017",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "tvshow"
   ],
diff --git a/plugin.video.alfa/channels/newpct.json b/plugin.video.alfa/channels/newpct.json
index e4669030..9a3b8e8d 100755
--- a/plugin.video.alfa/channels/newpct.json
+++ b/plugin.video.alfa/channels/newpct.json
@@ -6,17 +6,6 @@
   "language": ["cast"],
   "thumbnail": "newpct.png",
   "banner": "newpct.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/newpct1.json b/plugin.video.alfa/channels/newpct1.json
index ef0d543a..2f20898b 100755
--- a/plugin.video.alfa/channels/newpct1.json
+++ b/plugin.video.alfa/channels/newpct1.json
@@ -6,25 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "newpct1.png",
   "banner": "newpct1.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "12/05/17",
-      "description": "Modificado listado para evitar errores con infoplus"
-    },
-    {
-      "date": "17/04/17",
-      "description": "Arreglada seccion series"
-    },
-    {
-      "date": "29/12/16",
-      "description": "Adaptado, por cambios en la web, seccion Series"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/news.json b/plugin.video.alfa/channels/news.json
index b0a247d9..1e59c761 100755
--- a/plugin.video.alfa/channels/news.json
+++ b/plugin.video.alfa/channels/news.json
@@ -4,25 +4,6 @@
   "active": false,
   "adult": false,
   "language": ["*"],
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "07/02/17",
-      "description": "Añadir cuadro de progreso"
-    },
-    {
-      "date": "01/07/16",
-      "description": "Eliminado código innecesario."
-    },
-    {
-      "date": "29/04/16",
-      "description": "Posibilidad de incluir otros canales, mediante configuracion"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/nuvid.json b/plugin.video.alfa/channels/nuvid.json
index ef267da0..b8ed25ae 100755
--- a/plugin.video.alfa/channels/nuvid.json
+++ b/plugin.video.alfa/channels/nuvid.json
@@ -4,17 +4,6 @@
   "language": ["*"],
   "active": true,
   "adult": true,
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "16/02/2017",
-      "description": "Primera versión"
-    }
-  ],
   "thumbnail": "http://i.imgur.com/rSbuStX.png",
   "banner": "nuvid.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/ohpelis.json b/plugin.video.alfa/channels/ohlatino.json
similarity index 82%
rename from plugin.video.alfa/channels/ohpelis.json
rename to plugin.video.alfa/channels/ohlatino.json
index 26b945ca..7d50a531 100644
--- a/plugin.video.alfa/channels/ohpelis.json
+++ b/plugin.video.alfa/channels/ohlatino.json
@@ -1,12 +1,11 @@
 {
-  "id": "ohpelis",
-  "name": "OH-PELIS",
+  "id": "ohlatino",
+  "name": "OH!Latino",
   "active": true,
   "adult": false,
   "language": ["lat"],
-  "thumbnail": "https://s28.postimg.org/6v7ig831p/oh-pelis.png",
+  "thumbnail": "http://cinemiltonero.com/wp-content/uploads/2017/08/logo-Latino0.png",
   "banner": "https://s27.postimg.org/bz0fh8jpf/oh-pelis-banner.png",
-  "version": 1,
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/ohlatino.py b/plugin.video.alfa/channels/ohlatino.py
new file mode 100644
index 00000000..0e2c41a1
--- /dev/null
+++ b/plugin.video.alfa/channels/ohlatino.py
@@ -0,0 +1,206 @@
+# -*- coding: utf-8 -*-
+# -*- Channel OH!Latino -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the Alfa Develop Group -*-
+
+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.ohpeliculas.com'
+
+def mainlist(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(host).data
+    patron = '<li class="cat-item cat-item-\d+"><a href="(.*?)" >(.*?)<\/a> <i>(\d+)<\/i>'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    mcantidad = 0
+    for scrapedurl, scrapedtitle, cantidad in matches:
+        mcantidad += int(cantidad)
+
+    itemlist.append(
+        item.clone(title="Peliculas",
+                   action='movies_menu'
+                   ))
+
+    itemlist.append(
+        item.clone(title="Buscar",
+                   action="search",
+                   url=host+'?s=',
+                   ))
+
+    return itemlist
+
+
+def movies_menu(item):
+    logger.info()
+
+    itemlist = []
+
+    itemlist.append(
+        item.clone(title="Todas",
+                   action="list_all",
+                   url=host
+                   ))
+
+    itemlist.append(
+        item.clone(title="Generos",
+                   action="section",
+                   url=host, extra='genres'))
+
+    itemlist.append(
+        item.clone(title="Por año",
+                   action="section",
+                   url=host, extra='byyear'
+                   ))
+
+    return itemlist
+
+
+def get_source(url):
+    logger.info()
+    data = httptools.downloadpage(url).data
+    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+    return data
+
+def list_all(item):
+    logger.info()
+
+    itemlist = []
+    data = get_source(item.url)
+    patron = '<div id=mt-.*? class=item>.*?<a href=(.*?)><div class=image>.*?'
+    patron +='<img src=(.*?) alt=.*?span class=tt>(.*?)<.*?ttx>(.*?)'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedplot in matches:
+        url = scrapedurl
+        action = 'findvideos'
+        thumbnail = scrapedthumbnail
+        contentTitle = scrapedtitle
+        plot = scrapedplot
+        title = contentTitle
+
+        filtro_thumb = scrapedthumbnail.replace("https://image.tmdb.org/t/p/w185", "")
+        filtro_list = {"poster_path": filtro_thumb}
+        filtro_list = filtro_list.items()
+
+        itemlist.append(Item(channel=item.channel,
+                             action=action,
+                             title=title,
+                             url=url,
+                             plot=plot,
+                             thumbnail=thumbnail,
+                             contentTitle=contentTitle,
+                             infoLabels={'filtro': filtro_list}
+                             ))
+    #tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    # Paginacion
+
+    if itemlist != []:
+        actual_page_url = item.url
+        next_page = scrapertools.find_single_match(data,
+                                                   'alignleft><a href=(.*?) ><\/a><\/div><div class=nav-next alignright>')
+        if next_page != '':
+            itemlist.append(Item(channel=item.channel,
+                                 action="list_all",
+                                 title='Siguiente >>>',
+                                 url=next_page,
+                                 thumbnail='https://s16.postimg.org/9okdu7hhx/siguiente.png'
+                                 ))
+    return itemlist
+
+
+def section(item):
+    logger.info()
+
+    itemlist = []
+    duplicated =[]
+    data = httptools.downloadpage(item.url).data
+    if item.extra == 'genres':
+        patron = '<li class="cat-item cat-item-.*?><a href="(.*?)" >(.*?)<\/a>'
+    elif item.extra == 'byyear':
+        patron = '<a href="([^"]+)">(\d{4})<\/a><\/li>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+        title = scrapedtitle
+        url = scrapedurl
+        if url not in duplicated:
+            itemlist.append(Item(channel=item.channel,
+                                 action='list_all',
+                                 title=title,
+                                 url=url
+                                 ))
+            duplicated.append(url)
+    return itemlist
+
+
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ", "+")
+    item.url = item.url + texto
+    if texto != '':
+        return list_all(item)
+
+
+def findvideos(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    itemlist.extend(servertools.find_video_items(data=data))
+    for videoitem in itemlist:
+        videoitem.channel = item.channel
+        videoitem.contentTitle = item.fulltitle
+        videoitem.infoLabels = item.infoLabels
+        if videoitem.server != 'youtube':
+            videoitem.title = item.title + ' (%s)' % videoitem.server
+        else:
+            videoitem.title = 'Trailer en %s' % videoitem.server
+        videoitem.action = 'play'
+        videoitem.server = ""
+
+    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",
+                 ))
+    tmdb.set_infoLabels(itemlist, True)
+    itemlist = servertools.get_servers_itemlist(itemlist)
+    return itemlist
+
+
+def newest(categoria):
+    logger.info()
+    item = Item()
+    try:
+        if categoria == 'peliculas':
+            item.url = host + '/release/2017/'
+
+        elif categoria == 'infantiles':
+            item.url = host + '/genero/infantil/'
+
+        itemlist = list_all(item)
+        if itemlist[-1].title == '>> Página siguiente':
+            itemlist.pop()
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+    return itemlist
+
+def play(item):
+    logger.info()
+    item.thumbnail = item.contentThumbnail
+    return [item]
diff --git a/plugin.video.alfa/channels/ohpelis.py b/plugin.video.alfa/channels/ohpelis.py
deleted file mode 100644
index 24c3a9dc..00000000
--- a/plugin.video.alfa/channels/ohpelis.py
+++ /dev/null
@@ -1,323 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- Channel OH-PELIS -*-
-# -*- Created for Alfa-addon -*-
-# -*- By the Alfa Develop Group -*-
-
-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.ohpelis.com'
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(host).data
-    patron = '<li class="cat-item cat-item-\d+"><a href="(.*?)" >(.*?)<\/a> <i>(\d+)<\/i>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    mcantidad = 0
-    for scrapedurl, scrapedtitle, cantidad in matches:
-        mcantidad += int(cantidad)
-
-    itemlist.append(
-        item.clone(title="Peliculas (%s)" %mcantidad,
-                   action='movies_menu'
-                   ))
-
-    itemlist.append(
-        item.clone(title="Series",
-                   action='series_menu'
-                   ))
-
-    itemlist.append(
-        item.clone(title="Buscar",
-                   action="search",
-                   url='http://www.ohpelis.com/?s=',
-                   ))
-
-    return itemlist
-
-
-def series_menu(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(
-        item.clone(title="Series",
-                   action="list_all",
-                   url=host + '/series/',
-                   extra='serie'
-                   ))
-
-    return itemlist
-
-
-def movies_menu(item):
-    logger.info()
-
-    itemlist = []
-
-    itemlist.append(
-        item.clone(title="Todas",
-                   action="list_all",
-                   url=host + '/peliculas/'
-                   ))
-
-    itemlist.append(
-        item.clone(title="Generos",
-                   action="section",
-                   url=host, extra='genres'))
-
-    itemlist.append(
-        item.clone(title="Por año",
-                   action="section",
-                   url=host, extra='byyear'
-                   ))
-
-    return itemlist
-
-
-def list_all(item):
-    logger.info()
-
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-
-    patron = '<div class="poster"><a href="(.*?)"><img src="(.*?)" alt="(.*?)"><\/a>.*?<span>(\d{4})<\/span>.*?'
-    patron += '<div class="texto">(.*?)<div'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, scrapedplot in matches:
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        url = scrapedurl
-        year = scrapedyear
-        new_item = (item.clone(title=title,
-                               url=url,
-                               thumbnail=thumbnail,
-                               fulltitle=title,
-                               contentTitle=title,
-                               infoLabels={'year': year}
-                               ))
-        if item.extra == 'serie':
-            new_item.action = 'seasons'
-            new_item.contentSerieName = title
-        else:
-            new_item.action = 'findvideos'
-            new_item.contentTitle = title
-
-        itemlist.append(new_item)
-
-    tmdb.set_infoLabels(itemlist, True)
-    # Paginacion
-    next_page = scrapertools.find_single_match(data, '<link rel="next" href="(.*?) />')
-    if next_page:
-        itemlist.append(Item(channel=item.channel,
-                             action="list_all",
-                             title=">> Página siguiente",
-                             url=next_page,
-                             thumbnail=get_thumb("next.png")))
-    return itemlist
-
-
-def section(item):
-    logger.info()
-
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-
-    if item.extra == 'genres':
-        patron = '<li class="cat-item cat-item-\d+"><a href="(.*?)" >(.*?)<\/a> <i>\d+<\/i>'
-    elif item.extra == 'byyear':
-        patron = '<li><a href="(http:\/\/www\.ohpelis\.com\/release.*?)">(.*?)<\/a><\/li>'
-    elif item.extra == 'alpha':
-        patron = '<li><a href="(http:\/\/www\.ohpelis\.com\/.*?)" >(.*?)<\/a><\/li>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedtitle in matches:
-        title = scrapedtitle
-        url = scrapedurl
-        itemlist.append(Item(channel=item.channel,
-                             action='list_all',
-                             title=title,
-                             url=url
-                             ))
-
-    return itemlist
-
-
-def search_list(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '><div class="result-item">.*?<a href="(.*?)"><img src="(.*?)" alt="(.*?)" \/><span class="(.*?)".*?'
-    patron += '<span class="year">(.*?)<\/span>.*?<p>(.*?)<\/p>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedtype, scrapedyear, scrapedplot in matches:
-        title = scrapedtitle
-        thumbnail = scrapedthumbnail
-        url = scrapedurl
-        year = scrapedyear
-        new_item = item.clone(action='',
-                              title=title,
-                              url=url,
-                              thumbnail=thumbnail,
-                              infoLabels={'year': year})
-        if scrapedtype == 'movies':
-            new_item.action = 'findvideos'
-            new_item.contentTitle = title
-        else:
-            new_item.action = 'seasons'
-            new_item.contentSerieName = title
-
-        itemlist.append(new_item)
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = item.url + texto
-    if texto != '':
-        return search_list(item)
-
-
-def seasons(item):
-    logger.info()
-    itemlist = []
-
-    data = httptools.downloadpage(item.url).data
-    patron = '<span class="se-t(?: "| se-o")>(.*?)<\/span><span class="title">(.*?) <i>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    infoLabels = item.infoLabels
-    for scrapedseason, scrapedtitle in matches:
-        title = scrapedtitle
-        contentSeasonNumber = scrapedseason
-        infoLabels['season'] = scrapedseason
-        itemlist.append(item.clone(title=title,
-                                   contentSeasonNumber=contentSeasonNumber,
-                                   action='episodesxseason',
-                                   infoLabels=infoLabels))
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-    if config.get_videolibrary_support() and len(itemlist) > 0:
-        itemlist.append(item.clone(title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]',
-                                   url=item.url,
-                                   action="add_serie_to_library",
-                                   extra='episodes',
-                                   contentSerieName=item.contentSerieName,
-                                   ))
-    return itemlist
-
-
-def episodes(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="numerando">(\d+) - (\d+)<\/div><div class="episodiotitle"><a href="(.*?)">(.*?)<\/a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    infoLabels = item.infoLabels
-    num_ep = 1
-    for scrapedseason, scrapedepisode, scrapedurl, scrapedtitle in matches:
-        season = scrapedseason
-        contentEpisodeNumber = num_ep
-        url = scrapedurl
-        title = '%sx%s - %s' % (season, num_ep, scrapedtitle)
-        itemlist.append(item.clone(title=title,
-                                   url=url,
-                                   contentEpisodeNumber=contentEpisodeNumber,
-                                   action='findvideos',
-                                   infoLabels=infoLabels
-                                   ))
-        num_ep += 1
-    return itemlist
-
-
-def episodesxseason(item):
-    logger.info()
-    itemlist = []
-    season = item.contentSeasonNumber
-    data = httptools.downloadpage(item.url).data
-    patron = '<div class="numerando">%s - (\d+)<\/div><div class="episodiotitle"><a href="(.*?)">(.*?)<\/a>' % season
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    infoLabels = item.infoLabels
-    num_ep = 1
-    for scrapedepisode, scrapedurl, scrapedtitle in matches:
-        title = '%sx%s - %s' % (season, num_ep, scrapedtitle)
-        url = scrapedurl
-        infoLabels['episode'] = num_ep
-        itemlist.append(item.clone(title=title,
-                                   url=url,
-                                   contentEpisodeNumber=num_ep,
-                                   action='findvideos',
-                                   infoLabels=infoLabels))
-        num_ep += 1
-
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(item.url).data
-    itemlist.extend(servertools.find_video_items(data=data))
-    for videoitem in itemlist:
-        videoitem.channel = item.channel
-        videoitem.contentTitle = item.fulltitle
-        videoitem.infoLabels = item.infoLabels
-        if videoitem.server != 'youtube':
-            videoitem.title = item.title + ' (%s)' % videoitem.server
-        else:
-            videoitem.title = 'Trailer en %s' % videoitem.server
-        videoitem.action = 'play'
-        videoitem.server = ""
-
-    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",
-                 ))
-    tmdb.set_infoLabels(itemlist, True)
-    itemlist = servertools.get_servers_itemlist(itemlist)
-    return itemlist
-
-
-def newest(categoria):
-    logger.info()
-    item = Item()
-    try:
-        if categoria == 'peliculas':
-            item.url = host + '/release/2017/'
-
-        elif categoria == 'infantiles':
-            item.url = host + '/genero/infantil/'
-
-        itemlist = list_all(item)
-        if itemlist[-1].title == '>> Página siguiente':
-            itemlist.pop()
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-    return itemlist
-
-def play(item):
-    logger.info()
-    item.thumbnail = item.contentThumbnail
-    return [item]
diff --git a/plugin.video.alfa/channels/pasateatorrent.json b/plugin.video.alfa/channels/pasateatorrent.json
index ebd133b2..5b0b90b9 100755
--- a/plugin.video.alfa/channels/pasateatorrent.json
+++ b/plugin.video.alfa/channels/pasateatorrent.json
@@ -7,13 +7,6 @@
   "thumbnail": "http://imgur.com/iLeISt0.png",
   "banner": "pasateatorrent.png",
   "fanart": "http://imgur.com/uexmGEg.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "25/08/2017",
-      "description": "Revamp"
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/pedropolis.json b/plugin.video.alfa/channels/pedropolis.json
index 6852cc86..9aa91e44 100644
--- a/plugin.video.alfa/channels/pedropolis.json
+++ b/plugin.video.alfa/channels/pedropolis.json
@@ -7,13 +7,6 @@
   "fanart": "https://scontent-lht6-1.xx.fbcdn.net/v/t31.0-8/21056316_670362456502498_8317422545691005578_o.png?oh=1f13a23a931d82e944a7ec743a19f583&oe=5A599F4D",
   "thumbnail": "https://scontent-lht6-1.xx.fbcdn.net/v/t1.0-9/20292600_467501756957771_6794721577753226614_n.jpg?oh=bba1479eccf0adceeb8c0d3450cc2531&oe=5A4EE0F5",
   "banner": "",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/08/17",
-      "description": "Nuevo Canal"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/peliculasaudiolatino.json b/plugin.video.alfa/channels/peliculasaudiolatino.json
index b5884510..52d788ce 100755
--- a/plugin.video.alfa/channels/peliculasaudiolatino.json
+++ b/plugin.video.alfa/channels/peliculasaudiolatino.json
@@ -6,21 +6,6 @@
   "language": ["lat"],
   "thumbnail": "peliculasaudiolatino.png",
   "banner": "peliculasaudiolatino.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "01/06/2017",
-      "description": "Reparado patron en play() para algunos servers"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/peliculasdk.json b/plugin.video.alfa/channels/peliculasdk.json
index bbbeb098..a5dbd252 100755
--- a/plugin.video.alfa/channels/peliculasdk.json
+++ b/plugin.video.alfa/channels/peliculasdk.json
@@ -6,21 +6,6 @@
   "language": ["cast"],
   "thumbnail": "http://s29.postimg.org/wzw749oon/pldklog.jpg",
   "banner": "peliculasdk.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "06/12/2016",
-      "description": "Corrección código. Adaptación Infoplus"
-    },
-    {
-      "date": "26/04/2017",
-      "description": "Adaptación videoteca"
-    },
-    {
-      "date": "28/06/2017",
-      "description": "Corrección código y algunas mejoras"
-    }
-  ],
   "categories": [
     "torrent",
     "movie"
diff --git a/plugin.video.alfa/channels/peliculaseroticas.json b/plugin.video.alfa/channels/peliculaseroticas.json
index 1b9c4b0c..564ede28 100755
--- a/plugin.video.alfa/channels/peliculaseroticas.json
+++ b/plugin.video.alfa/channels/peliculaseroticas.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "peliculaseroticas.png",
   "banner": "peliculaseroticas.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "05/08/2016",
-      "description": "Eliminado de sección peliculas."
-    }
-  ],
   "categories": [
     "adult"
   ]
diff --git a/plugin.video.alfa/channels/peliculasgratis.json b/plugin.video.alfa/channels/peliculasgratis.json
index a28dc482..149fb4fa 100755
--- a/plugin.video.alfa/channels/peliculasgratis.json
+++ b/plugin.video.alfa/channels/peliculasgratis.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "http://imgur.com/ThH8Zmk.png",
   "banner": "peliculasgratis.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "13/01/2017",
-      "description": "Release"
-    },
-    {
-      "date": "04/04/2017",
-      "description": "Reparación cambios web"
-    }
-  ],
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/peliculashindu.json b/plugin.video.alfa/channels/peliculashindu.json
index 1448d5de..9d4a41a5 100755
--- a/plugin.video.alfa/channels/peliculashindu.json
+++ b/plugin.video.alfa/channels/peliculashindu.json
@@ -6,13 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "peliculashindu.png",
   "banner": "peliculashindu.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "25/05/2017",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "movie"
   ]
diff --git a/plugin.video.alfa/channels/peliculasmx.json b/plugin.video.alfa/channels/peliculasmx.json
index 206a132d..29e1167b 100755
--- a/plugin.video.alfa/channels/peliculasmx.json
+++ b/plugin.video.alfa/channels/peliculasmx.json
@@ -6,17 +6,6 @@
   "language": ["lat"],
   "thumbnail": "peliculasmx.png",
   "banner": "peliculasmx.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/11/2016",
-      "description": "Adaptado por cambios en la web."
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/peliculasnu.json b/plugin.video.alfa/channels/peliculasnu.json
index 3a72a2c4..99cecf7c 100755
--- a/plugin.video.alfa/channels/peliculasnu.json
+++ b/plugin.video.alfa/channels/peliculasnu.json
@@ -4,25 +4,6 @@
   "language": ["cast", "lat"],
   "active": true,
   "adult": false,
-  "version": 1,
-  "changes": [
-    {
-      "date": "12/05/2017",
-      "description": "Corregidos enlaces directos"
-    },
-    {
-      "date": "07/04/2017",
-      "description": "Subtitulos en videos directos"
-    },
-    {
-      "date": "12/03/2017",
-      "description": "Añadida info de idiomas"
-    },
-    {
-      "date": "16/02/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "thumbnail": "http://i.imgur.com/2iupwXE.png",
   "banner": "peliculasnu.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/peliculasrey.json b/plugin.video.alfa/channels/peliculasrey.json
index 59c1e46d..6ef49029 100755
--- a/plugin.video.alfa/channels/peliculasrey.json
+++ b/plugin.video.alfa/channels/peliculasrey.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "peliculasrey.png",
   "banner": "peliculasrey.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "direct",
     "movie"
diff --git a/plugin.video.alfa/channels/pelisadicto.json b/plugin.video.alfa/channels/pelisadicto.json
index 3b42723d..0d277199 100755
--- a/plugin.video.alfa/channels/pelisadicto.json
+++ b/plugin.video.alfa/channels/pelisadicto.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "pelisadicto.png",
   "banner": "pelisadicto.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/peliscity.json b/plugin.video.alfa/channels/peliscity.json
index e9c744a3..f5cbe7f0 100755
--- a/plugin.video.alfa/channels/peliscity.json
+++ b/plugin.video.alfa/channels/peliscity.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "peliscity.png",
   "banner": "peliscity.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie",
     "direct",
diff --git a/plugin.video.alfa/channels/peliscon.json b/plugin.video.alfa/channels/peliscon.json
index 527c1253..eaf6f068 100755
--- a/plugin.video.alfa/channels/peliscon.json
+++ b/plugin.video.alfa/channels/peliscon.json
@@ -5,13 +5,6 @@
   "adult": false,
   "language": ["cast"],
   "thumbnail": "http://imgur.com/yTQRPUJ.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "28/06/2017",
-      "description": "Release"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow"
diff --git a/plugin.video.alfa/channels/pelisencasa.json b/plugin.video.alfa/channels/pelisencasa.json
index 7f8b77cd..3be4f532 100755
--- a/plugin.video.alfa/channels/pelisencasa.json
+++ b/plugin.video.alfa/channels/pelisencasa.json
@@ -1,33 +1,30 @@
 {
-    "id": "pelisencasa",
-    "name": "PelisEnCasa",
-    "active": true,
-    "adult": false,
-    "language": ["lat"],
-    "thumbnail": "https://s14.postimg.org/iqiq0bxn5/pelisencasa.png",
-    "banner": "https://s18.postimg.org/j775ehbg9/pelisencasa_banner.png",
-    "version": 1,
-    "date": "17/03/2017",
-    "changes": "First release",
-    "categories": [
-        "movie"
-      ],
-    "settings": [
-      {
-        "id": "include_in_newest_peliculas",
-        "type": "bool",
-        "label": "Incluir en Novedades - Peliculas",
-        "default": true,
-        "enabled": true,
-        "visible": true
-      },
-      {
-        "id": "include_in_newest_infantiles",
-        "type": "bool",
-        "label": "Incluir en Novedades - Infantiles",
-        "default": true,
-        "enabled": true,
-        "visible": true
-      }
-    ]
+  "id": "pelisencasa",
+  "name": "PelisEnCasa",
+  "active": true,
+  "adult": false,
+  "language": ["lat"],
+  "thumbnail": "https://s14.postimg.org/iqiq0bxn5/pelisencasa.png",
+  "banner": "https://s18.postimg.org/j775ehbg9/pelisencasa_banner.png",
+  "categories": [
+      "movie"
+    ],
+  "settings": [
+    {
+      "id": "include_in_newest_peliculas",
+      "type": "bool",
+      "label": "Incluir en Novedades - Peliculas",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_infantiles",
+      "type": "bool",
+      "label": "Incluir en Novedades - Infantiles",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    }
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/pelisfox.json b/plugin.video.alfa/channels/pelisfox.json
index ba226d07..30715811 100755
--- a/plugin.video.alfa/channels/pelisfox.json
+++ b/plugin.video.alfa/channels/pelisfox.json
@@ -6,21 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s14.postimg.org/c43etc1lt/pelisfox.png",
   "banner": "https://s30.postimg.org/p6twg905d/pelisfox-banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "16/06/2017",
-      "description": "Fix pagina siguiente"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "05/05/2017",
-      "description": "First release"
-    }
-  ],
   "categories": [
     "direct",
     "movie"
diff --git a/plugin.video.alfa/channels/pelisgratis.json b/plugin.video.alfa/channels/pelisgratis.json
index 5bb39d64..1274aae3 100755
--- a/plugin.video.alfa/channels/pelisgratis.json
+++ b/plugin.video.alfa/channels/pelisgratis.json
@@ -6,13 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://s30.postimg.org/kilh4lr4x/pelisgratis.png",
   "banner": "https://s15.postimg.org/nztottswb/pelisgratis-banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "26/05/2017",
-      "description": "First release"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/pelisipad.json b/plugin.video.alfa/channels/pelisipad.json
index fa6f8eb4..aafcd28e 100755
--- a/plugin.video.alfa/channels/pelisipad.json
+++ b/plugin.video.alfa/channels/pelisipad.json
@@ -4,13 +4,6 @@
   "language": ["cast"],
   "active": true,
   "adult": false,
-  "version": 1,
-  "changes": [
-    {
-      "date": "21/03/17",
-      "description": "Primera versión"
-    }
-  ],
   "thumbnail": "http://i.imgur.com/FzLmGKK.png",
   "categories": [
     "movie",
diff --git a/plugin.video.alfa/channels/pelismagnet.json b/plugin.video.alfa/channels/pelismagnet.json
index 01a65eee..49076e01 100755
--- a/plugin.video.alfa/channels/pelismagnet.json
+++ b/plugin.video.alfa/channels/pelismagnet.json
@@ -6,23 +6,6 @@
   "language": ["cast"],
   "thumbnail": "pelismagnet.png",
   "banner": "pelismagnet.png",
-  "changes": {
-    "change": [
-      {
-        "date": "15/03/2017",
-        "description": "limpieza código"
-      },
-      {
-        "date": "21/02/2017",
-        "description": "Reparado a causa del cambio a https y añadida opcion para buscar info en tmdb"
-      },
-      {
-        "date": "01/07/2016",
-        "description": "Eliminado código innecesario."
-      }
-    ]
-  },
-  "version": 1,
   "categories": [
     "torrent",
     "movie",
diff --git a/plugin.video.alfa/channels/pelismundo.json b/plugin.video.alfa/channels/pelismundo.json
index d570c0f6..b3b5ae0a 100644
--- a/plugin.video.alfa/channels/pelismundo.json
+++ b/plugin.video.alfa/channels/pelismundo.json
@@ -6,13 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s26.postimg.org/72c9mr3ux/pelismundo1.png",
   "banner": "",
-  "version": 1,
-  "changes": [
-    {
-      "date": "12/10/2017",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/pelispedia.json b/plugin.video.alfa/channels/pelispedia.json
index 17bfdead..322248f4 100755
--- a/plugin.video.alfa/channels/pelispedia.json
+++ b/plugin.video.alfa/channels/pelispedia.json
@@ -7,37 +7,6 @@
   "fanart": "http://i.imgur.com/9QbyJrf.jpg",
   "thumbnail": "pelispedia.png",
   "banner": "pelispedia.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "07/06/17",
-      "description": "Reconoce servidor raptu"
-    },
-    {
-      "date": "21/04/17",
-      "description": "Corregido método play, fix ordenación de episodios"
-    },
-    {
-      "date": "06/04/17",
-      "description": "Se permite configurar sin color, varias correcciones"
-    },
-    {
-      "date": "01/02/17",
-      "description": "Corregido método play"
-    },
-    {
-      "date": "19/07/16",
-      "description": "Corregido el método play"
-    },
-    {
-      "date": "01/07/16",
-      "description": "Eliminado código innecesario."
-    },
-    {
-      "date": "06/06/16",
-      "description": "Añadida info extra de tmdb. Añadido el canal en la busqueda de novedades"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/pelispekes.json b/plugin.video.alfa/channels/pelispekes.json
index 060ceb9c..86c62fdc 100755
--- a/plugin.video.alfa/channels/pelispekes.json
+++ b/plugin.video.alfa/channels/pelispekes.json
@@ -6,17 +6,6 @@
   "language": ["lat"],
   "thumbnail": "pelispekes.png",
   "banner": "pelispekes.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie"
   ]
diff --git a/plugin.video.alfa/channels/pelisplanet.json b/plugin.video.alfa/channels/pelisplanet.json
index 9c5f62a3..cbc3db76 100644
--- a/plugin.video.alfa/channels/pelisplanet.json
+++ b/plugin.video.alfa/channels/pelisplanet.json
@@ -7,13 +7,6 @@
   "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/pelisplanetbg.png",
   "thumbnail": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/pelisplanet.png",
   "banner": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/pelisplanetbaner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "07/06/17",
-      "description": "Canal Nuevo"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/pelisplus.json b/plugin.video.alfa/channels/pelisplus.json
index 08d52f01..55ee7ecc 100644
--- a/plugin.video.alfa/channels/pelisplus.json
+++ b/plugin.video.alfa/channels/pelisplus.json
@@ -6,37 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s13.postimg.org/z5dbzfasn/pelisplus.png",
   "banner": "https://s16.postimg.org/p9xz2vlo5/pelisplus_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/06/2017",
-      "description": "Cambios para autoplay"
-    },
-    {
-      "date": "06/06/2017",
-      "description": "compatibilidad con AutoPlay"
-    },
-    {
-      "date": "03/06/2017",
-      "description": "Reparado por falla del canal"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "02/05/2017",
-      "description": "fix findvideos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "06/12/2016",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/pelisplus.py b/plugin.video.alfa/channels/pelisplus.py
index a041b397..7776f587 100644
--- a/plugin.video.alfa/channels/pelisplus.py
+++ b/plugin.video.alfa/channels/pelisplus.py
@@ -423,6 +423,21 @@ def generos(item):
                  ))
     return itemlist
 
+def get_vip(url):
+    logger.info()
+    itemlist =[]
+    url= url.replace('reproductor','vip')
+    data = httptools.downloadpage(url).data
+    patron = '<a href="(.*?)"> '
+    video_urls = scrapertools.find_multiple_matches(data,'<a href="(.*?)">')
+    for item in video_urls:
+        id, tipo, lang= scrapertools.find_single_match(item,'plus\/(\d+)\/.*?=(\d+).*?=(.*)')
+        new_url = 'https://www.elreyxhd.com/pelisplus.php?id=%s&tipo=%s&idioma=%s' % (id, tipo, lang)
+        data=httptools.downloadpage(new_url, follow_redirects=False).headers
+        itemlist.extend(servertools.find_video_items(data=str(data)))
+
+    return itemlist
+
 
 def findvideos(item):
     logger.info()
@@ -430,44 +445,13 @@ def findvideos(item):
     duplicados = []
     data = httptools.downloadpage(item.url).data
     video_page = scrapertools.find_single_match(data, "<iframe width='100%' height='500' src='(.*?)' frameborder='0'")
+
+    itemlist.extend(get_vip(video_page))
+
     data = httptools.downloadpage(video_page).data
     patron = '<li data-id=".*?">\s+<a href="(.*?)" >'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for scrapedurl in matches:
-
-        if 'tipo' in scrapedurl:
-            server = 'gvideo'
-            gvideo_data = httptools.downloadpage(scrapedurl).data
-            video_url = scrapertools.find_single_match(gvideo_data,'<div id="player">.*?border: none" src="\/\/(.*?)" ')
-            video_url= 'http://%s'%video_url
-            gvideo_url = httptools.downloadpage(video_url).data
-            videourl = servertools.findvideosbyserver(gvideo_url, server)
-
-            logger.debug('videourl: %s'%videourl)
-            language = 'latino'
-            quality = 'default'
-            url = videourl[0][1]
-            title = '%s (%s)'%(item.contentTitle, server)
-            thumbnail = item.thumbnail
-            fanart = item.fanart
-            if video_url not in duplicados:
-                itemlist.append(item.clone(action="play",
-                                           title=title,
-                                           url=url,
-                                           thumbnail=thumbnail,
-                                           fanart=fanart,
-                                           show=title,
-                                           extra='gvideo',
-                                           language=language,
-                                           quality=quality,
-                                           server=server
-                                           ))
-                duplicados.append(video_url)
-
-
-
-
     itemlist.extend(servertools.find_video_items(data=data))
 
     for videoitem in itemlist:
diff --git a/plugin.video.alfa/channels/pelisxporno.json b/plugin.video.alfa/channels/pelisxporno.json
index 6d485009..f6e32b09 100755
--- a/plugin.video.alfa/channels/pelisxporno.json
+++ b/plugin.video.alfa/channels/pelisxporno.json
@@ -6,21 +6,6 @@
   "language": ["*"],
   "thumbnail": "http://i.imgur.com/ywMHwat.png",
   "banner": "pelisxporno.png",
-  "changes": [
-    {
-      "date": "28/05/2017",
-      "description": "Corregido por cambios en toda la web"
-    },
-    {
-      "date": "21/02/2017",
-      "description": "Canal modernizado con los últimos cambios y mejorado"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
-  "version": 1,
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/pepecine.json b/plugin.video.alfa/channels/pepecine.json
index 1e8d37e9..aa3d4301 100755
--- a/plugin.video.alfa/channels/pepecine.json
+++ b/plugin.video.alfa/channels/pepecine.json
@@ -7,33 +7,6 @@
   "fanart": "https://d12.usercdn.com/i/02278/u875vjx9c0xs.png",
   "thumbnail": "pepecine.png",
   "banner": "pepecine.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "26/06/17",
-      "description": "Desactivacion temporal del canal por cambios en web"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "31/01/17",
-      "description": "Solucionado bug al añadir contenido a la videoteca"
-    },
-    {
-      "date": "26/01/17",
-      "description": "Fix por cambios en la web"
-    },
-    {
-      "date": "01/07/16",
-      "description": "Eliminado código innecesario."
-    },
-    {
-      "date": "26/05/16",
-      "description": "Corregir bug al añadir serie a la videoteca desde el listado de episodios"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow"
diff --git a/plugin.video.alfa/channels/playmax.json b/plugin.video.alfa/channels/playmax.json
index e2fe734f..2684e879 100755
--- a/plugin.video.alfa/channels/playmax.json
+++ b/plugin.video.alfa/channels/playmax.json
@@ -4,25 +4,6 @@
   "language": ["cast", "lat"],
   "active": true,
   "adult": false,
-  "version": 1,
-  "changes": [
-    {
-      "date": "17/04/2017",
-      "description": "Corregidos indices de series y peliculas"
-    },
-    {
-      "date": "28/03/2017",
-      "description": "Añadidas opciones listas y corregidos capitulos de series"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "09/01/2017",
-      "description": "Canal renovado desde cero."
-    }
-  ],
   "thumbnail": "playmax.png",
   "banner": "playmax.png",
   "categories": [
diff --git a/plugin.video.alfa/channels/playpornx.json b/plugin.video.alfa/channels/playpornx.json
index 2e1d4f4c..595c9b75 100644
--- a/plugin.video.alfa/channels/playpornx.json
+++ b/plugin.video.alfa/channels/playpornx.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "https://s3.postimg.org/3rkfrnypv/playpornx.png",
   "banner": "https://s3.postimg.org/it5qa1gyb/playpornx-banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "07/12/2016",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/plusdede.json b/plugin.video.alfa/channels/plusdede.json
index 6d9912ba..4fefaf5f 100755
--- a/plugin.video.alfa/channels/plusdede.json
+++ b/plugin.video.alfa/channels/plusdede.json
@@ -6,13 +6,6 @@
   "language": ["cast"],
   "thumbnail": "plusdede.png",
   "banner": "plusdede.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "12/07/2017",
-      "description": "First release"
-    }
-  ],
   "categories": [
     "movie",
     "tvshow"
diff --git a/plugin.video.alfa/channels/pordede.json b/plugin.video.alfa/channels/pordede.json
deleted file mode 100755
index ad1e3a24..00000000
--- a/plugin.video.alfa/channels/pordede.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "id": "pordede",
-  "name": "Pordede",
-  "active": false,
-  "adult": false,
-  "language": ["cast"],
-  "thumbnail": "pordede.png",
-  "banne": "pordede.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "14/05/2017",
-      "description": "Eliminada la necesidad de captcha para el login"
-    },
-    {
-      "date": "09/05/2017",
-      "description": "Corregida sección siguientes capitulos"
-    },
-    {
-      "date": "29/03/2017",
-      "description": "Modificado para loguearse a través de captcha, solo funciona en Kodi"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
-  "categories": [
-    "movie",
-    "tvshow"
-  ],
-  "settings": [
-    {
-      "id": "pordedeuser",
-      "type": "text",
-      "label": "@30014",
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "pordedepassword",
-      "type": "text",
-      "hidden": true,
-      "label": "@30015",
-      "enabled": "!eq(-1,'')",
-      "visible": true
-    },
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": false,
-      "enabled": "!eq(-1,'') + !eq(-2,'')",
-      "visible": true
-    },
-    {
-      "id": "pordedesortlinks",
-      "type": "list",
-      "label": "Ordenar enlaces",
-      "default": 0,
-      "enabled": true,
-      "visible": "!eq(-2,'') + !eq(-3,'')",
-      "lvalues": [
-        "No",
-        "Por Valoración",
-        "Por Idioma",
-        "Por Calidad",
-        "Por Idioma y Calidad",
-        "Por Idioma y Valoración",
-        "Por Idioma, Calidad y Valoración"
-      ]
-    },
-    {
-      "id": "pordedeshowlinks",
-      "type": "list",
-      "label": "Mostrar enlaces",
-      "default": 0,
-      "enabled": true,
-      "visible": "!eq(-3,'') + !eq(-4,'')",
-      "lvalues": [
-        "Todos",
-        "Ver online",
-        "Descargar"
-      ]
-    },
-    {
-      "id": "pordedenumberlinks",
-      "type": "list",
-      "label": "Limitar número de enlaces",
-      "default": 0,
-      "enabled": true,
-      "visible": "!eq(-4,'') + !eq(-5,'')",
-      "lvalues": [
-        "No",
-        "5",
-        "10",
-        "15",
-        "20",
-        "25",
-        "30"
-      ]
-    }
-  ]
-}
diff --git a/plugin.video.alfa/channels/pordede.py b/plugin.video.alfa/channels/pordede.py
deleted file mode 100755
index e3127354..00000000
--- a/plugin.video.alfa/channels/pordede.py
+++ /dev/null
@@ -1,834 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import re
-import sys
-import urlparse
-
-from core import httptools
-from core import jsontools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-from platformcode import platformtools
-
-
-def login():
-    url_origen = "http://www.pordede.com"
-    data = httptools.downloadpage(url_origen).data
-    if config.get_setting("pordedeuser", "pordede") in data:
-        return True
-
-    url = "http://www.pordede.com/api/login/auth?response_type=code&client_id=appclient&redirect_uri=http%3A%2F%2Fwww.pordede.com%2Fapi%2Flogin%2Freturn&state=none"
-    post = "username=%s&password=%s&authorized=autorizar" % (
-        config.get_setting("pordedeuser", "pordede"), config.get_setting("pordedepassword", "pordede"))
-    data = httptools.downloadpage(url, post).data
-    if '"ok":true' in data:
-        return True
-    else:
-        return False
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-
-    if config.get_setting("pordedeuser", "pordede") == "":
-        itemlist.append(
-            Item(channel=item.channel, title="Habilita tu cuenta en la configuración...", action="settingCanal",
-                 url=""))
-    else:
-        result = login()
-        if not result:
-            itemlist.append(Item(channel=item.channel, action="mainlist", title="Login fallido. Volver a intentar..."))
-            return itemlist
-        itemlist.append(Item(channel=item.channel, action="menuseries", title="Series", url=""))
-        itemlist.append(Item(channel=item.channel, action="menupeliculas", title="Películas y documentales", url=""))
-        itemlist.append(Item(channel=item.channel, action="listas_sigues", title="Listas que sigues",
-                             url="http://www.pordede.com/lists/following"))
-        itemlist.append(Item(channel=item.channel, action="tus_listas", title="Tus listas",
-                             url="http://www.pordede.com/lists/yours"))
-        itemlist.append(
-            Item(channel=item.channel, action="listas_sigues", title="Top listas", url="http://www.pordede.com/lists"))
-        itemlist.append(Item(channel=item.channel, action="settingCanal", title="Configuración...", url=""))
-    return itemlist
-
-
-def settingCanal(item):
-    return platformtools.show_channel_settings()
-
-
-def menuseries(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="peliculas", title="Novedades",
-                         url="http://www.pordede.com/series/loadmedia/offset/0/showlist/hot"))
-    itemlist.append(
-        Item(channel=item.channel, action="generos", title="Por géneros", url="http://www.pordede.com/series"))
-    itemlist.append(Item(channel=item.channel, action="peliculas", title="Siguiendo",
-                         url="http://www.pordede.com/series/following"))
-    itemlist.append(Item(channel=item.channel, action="siguientes", title="Siguientes Capítulos",
-                         url="http://www.pordede.com/main/index", viewmode="movie"))
-    itemlist.append(
-        Item(channel=item.channel, action="peliculas", title="Favoritas", url="http://www.pordede.com/series/favorite"))
-    itemlist.append(
-        Item(channel=item.channel, action="peliculas", title="Pendientes", url="http://www.pordede.com/series/pending"))
-    itemlist.append(
-        Item(channel=item.channel, action="peliculas", title="Terminadas", url="http://www.pordede.com/series/seen"))
-    itemlist.append(Item(channel=item.channel, action="peliculas", title="Recomendadas",
-                         url="http://www.pordede.com/series/recommended"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar...", url="http://www.pordede.com/series"))
-
-    return itemlist
-
-
-def menupeliculas(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="peliculas", title="Novedades",
-                         url="http://www.pordede.com/pelis/loadmedia/offset/0/showlist/hot"))
-    itemlist.append(
-        Item(channel=item.channel, action="generos", title="Por géneros", url="http://www.pordede.com/pelis"))
-    itemlist.append(
-        Item(channel=item.channel, action="peliculas", title="Favoritas", url="http://www.pordede.com/pelis/favorite"))
-    itemlist.append(
-        Item(channel=item.channel, action="peliculas", title="Pendientes", url="http://www.pordede.com/pelis/pending"))
-    itemlist.append(
-        Item(channel=item.channel, action="peliculas", title="Vistas", url="http://www.pordede.com/pelis/seen"))
-    itemlist.append(Item(channel=item.channel, action="peliculas", title="Recomendadas",
-                         url="http://www.pordede.com/pelis/recommended"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar...", url="http://www.pordede.com/pelis"))
-
-    return itemlist
-
-
-def generos(item):
-    logger.info()
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-    logger.debug("data=" + data)
-
-    # Extrae las entradas (carpetas)
-    data = scrapertools.find_single_match(data, '<div class="section genre">(.*?)</div>')
-    patron = '<a class="mediaFilterLink" data-value="([^"]+)" href="([^"]+)">([^<]+)<span class="num">\((\d+)\)</span></a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for textid, scrapedurl, scrapedtitle, cuantos in matches:
-        title = scrapedtitle.strip() + " (" + cuantos + ")"
-        thumbnail = ""
-        plot = ""
-        # http://www.pordede.com/pelis/loadmedia/offset/30/genre/science%20fiction/showlist/all?popup=1
-        if "/pelis" in item.url:
-            url = "http://www.pordede.com/pelis/loadmedia/offset/0/genre/" + textid.replace(" ",
-                                                                                            "%20") + "/showlist/all"
-        else:
-            url = "http://www.pordede.com/series/loadmedia/offset/0/genre/" + textid.replace(" ",
-                                                                                             "%20") + "/showlist/all"
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-        itemlist.append(
-            Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                 fulltitle=title))
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-
-    if item.url == "":
-        item.url = "http://www.pordede.com/pelis"
-
-    texto = texto.replace(" ", "-")
-
-    # Mete el referer en item.extra
-    item.extra = item.url
-    item.url = item.url + "/loadmedia/offset/0/query/" + texto + "/years/1950/on/undefined/showlist/all"
-    try:
-        return buscar(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 buscar(item):
-    logger.info()
-
-    # Descarga la pagina
-    headers = {"X-Requested-With": "XMLHttpRequest"}
-    data = httptools.downloadpage(item.url, headers=headers).data
-    logger.debug("data=" + data)
-
-    # Extrae las entradas (carpetas)
-    json_object = jsontools.load(data)
-    logger.debug("html=" + json_object["html"])
-    data = json_object["html"]
-
-    return parse_mixed_results(item, data)
-
-
-def parse_mixed_results(item, data):
-    patron = '<a class="defaultLink extended" href="([^"]+)"[^<]+'
-    patron += '<div class="coverMini     shadow tiptip" title="([^"]+)"[^<]+'
-    patron += '<img class="centeredPic.*?src="([^"]+)"'
-    patron += '[^<]+<img[^<]+<div class="extra-info">'
-    patron += '<span class="year">([^<]+)</span>'
-    patron += '<span class="value"><i class="icon-star"></i>([^<]+)</span>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedyear, scrapedvalue in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        if scrapedyear != '':
-            title += " (" + scrapedyear + ")"
-        fulltitle = title
-        if scrapedvalue != '':
-            title += " (" + scrapedvalue + ")"
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        fanart = thumbnail.replace("mediathumb", "mediabigcover")
-        plot = ""
-        # http://www.pordede.com/peli/the-lego-movie
-        # http://www.pordede.com/links/view/slug/the-lego-movie/what/peli?popup=1
-
-        if "/peli/" in scrapedurl or "/docu/" in scrapedurl:
-
-            # sectionStr = "peli" if "/peli/" in scrapedurl else "docu"
-            if "/peli/" in scrapedurl:
-                sectionStr = "peli"
-            else:
-                sectionStr = "docu"
-
-            referer = urlparse.urljoin(item.url, scrapedurl)
-            url = referer.replace("/{0}/".format(sectionStr), "/links/view/slug/") + "/what/{0}".format(sectionStr)
-            logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-            itemlist.append(Item(channel=item.channel, action="findvideos", title=title, extra=referer, url=url,
-                                 thumbnail=thumbnail, plot=plot, fulltitle=fulltitle, fanart=fanart,
-                                 contentTitle=scrapedtitle, contentType="movie", context=["buscar_trailer"]))
-        else:
-            referer = item.url
-            url = urlparse.urljoin(item.url, scrapedurl)
-            itemlist.append(
-                Item(channel=item.channel, action="episodios", title=title, extra=referer, url=url, thumbnail=thumbnail,
-                     plot=plot, fulltitle=fulltitle, show=title, fanart=fanart,
-                     contentTitle=scrapedtitle, contentType="tvshow", context=["buscar_trailer"]))
-
-    next_page = scrapertools.find_single_match(data, '<div class="loadingBar" data-url="([^"]+)"')
-    if next_page != "":
-        url = urlparse.urljoin("http://www.pordede.com", next_page)
-        itemlist.append(
-            Item(channel=item.channel, action="lista", title=">> Página siguiente", extra=item.extra, url=url))
-
-    try:
-        import xbmcplugin
-        xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_UNSORTED)
-        xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_VIDEO_TITLE)
-    except:
-        pass
-
-    return itemlist
-
-
-def siguientes(item):
-    logger.info()
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-    logger.debug("data=" + data)
-
-    # Extrae las entradas (carpetas)
-    bloque = scrapertools.find_single_match(data, '<h2>Siguiendo</h2>(.*?)<div class="box">')
-    patron = '<div class="coverMini     shadow tiptip" title="([^"]+)">[^<]+'
-    patron += '<img class="centeredPic centeredPicFalse"  onerror="[^"]+"  src="([^"]+)"[^<]+'
-    patron += '<img src="/images/loading-mini.gif" class="loader"/>[^<]+'
-    patron += '<div class="extra-info"><span class="year">[^<]+'
-    patron += '</span><span class="value"><i class="icon-star"></i>[^<]+'
-    patron += '</span></div>[^<]+'
-    patron += '</div>[^<]+'
-    patron += '</a>[^<]+'
-    patron += '<a class="userepiinfo defaultLink" href="([^"]+)">(\d+)x(\d+)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    # for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-    for scrapedtitle, scrapedthumbnail, scrapedurl, scrapedsession, scrapedepisode in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        session = scrapertools.htmlclean(scrapedsession)
-        episode = scrapertools.htmlclean(scrapedepisode)
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        fanart = thumbnail.replace("mediathumb", "mediabigcover")
-        plot = ""
-        title = session + "x" + episode + " - " + title
-        # http://www.pordede.com/peli/the-lego-movie
-        # http://www.pordede.com/links/view/slug/the-lego-movie/what/peli?popup=1
-
-        referer = urlparse.urljoin(item.url, scrapedurl)
-        url = referer
-        # itemlist.append( Item(channel=item.channel, action="episodios" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, show=title))
-        itemlist.append(
-            Item(channel=item.channel, action="episodio", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                 fulltitle=title, show=title, fanart=fanart, extra=session + "|" + episode))
-
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-
-    return itemlist
-
-
-def episodio(item):
-    logger.info()
-    itemlist = []
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-    logger.debug("data=" + data)
-
-    session = str(int(item.extra.split("|")[0]))
-    episode = str(int(item.extra.split("|")[1]))
-    patrontemporada = '<div class="checkSeason"[^>]+>Temporada ' + session + '<div class="right" onclick="controller.checkSeason(.*?)\s+</div></div>'
-    matchestemporadas = re.compile(patrontemporada, re.DOTALL).findall(data)
-
-    for bloque_episodios in matchestemporadas:
-        logger.debug("bloque_episodios=" + bloque_episodios)
-
-        # Extrae los episodios
-        patron = '<span class="title defaultPopup" href="([^"]+)"><span class="number">' + episode + ' </span>([^<]+)</span>(\s*</div>\s*<span[^>]*><span[^>]*>[^<]*</span><span[^>]*>[^<]*</span></span><div[^>]*><button[^>]*><span[^>]*>[^<]*</span><span[^>]*>[^<]*</span></button><div class="action([^"]*)" data-action="seen">)?'
-        matches = re.compile(patron, re.DOTALL).findall(bloque_episodios)
-
-        for scrapedurl, scrapedtitle, info, visto in matches:
-            # visto_string = "[visto] " if visto.strip()=="active" else ""
-            if visto.strip() == "active":
-                visto_string = "[visto] "
-            else:
-                visto_string = ""
-            numero = episode
-            title = visto_string + session + "x" + numero + " " + scrapertools.htmlclean(scrapedtitle)
-            thumbnail = ""
-            plot = ""
-            # http://www.pordede.com/peli/the-lego-movie
-            # http://www.pordede.com/links/view/slug/the-lego-movie/what/peli?popup=1
-            # http://www.pordede.com/links/viewepisode/id/475011?popup=1
-            epid = scrapertools.find_single_match(scrapedurl, "id/(\d+)")
-            url = "http://www.pordede.com/links/viewepisode/id/" + epid
-            itemlist.append(
-                Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                     fulltitle=title, fanart=item.fanart, show=item.show))
-            logger.debug("Abrimos title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-
-    itemlist2 = []
-    for capitulo in itemlist:
-        itemlist2 = findvideos(capitulo)
-    return itemlist2
-
-
-def peliculas(item):
-    logger.info()
-
-    # Descarga la pagina
-    headers = {"X-Requested-With": "XMLHttpRequest"}
-    data = httptools.downloadpage(item.url, headers=headers).data
-    logger.debug("data=" + data)
-
-    # Extrae las entradas (carpetas)
-    json_object = jsontools.load(data)
-    logger.debug("html=" + json_object["html"])
-    data = json_object["html"]
-
-    return parse_mixed_results(item, data)
-
-
-def episodios(item):
-    logger.info()
-    itemlist = []
-
-    # Descarga la pagina
-    idserie = ''
-    data = httptools.downloadpage(item.url).data
-    logger.debug("data=" + data)
-
-    patrontemporada = '<div class="checkSeason"[^>]+>([^<]+)<div class="right" onclick="controller.checkSeason(.*?)\s+</div></div>'
-    matchestemporadas = re.compile(patrontemporada, re.DOTALL).findall(data)
-
-    idserie = scrapertools.find_single_match(data,
-                                             '<div id="layout4" class="itemProfile modelContainer" data-model="serie" data-id="(\d+)"')
-
-    for nombre_temporada, bloque_episodios in matchestemporadas:
-        logger.debug("nombre_temporada=" + nombre_temporada)
-        logger.debug("bloque_episodios=" + bloque_episodios)
-
-        # Extrae los episodios
-        patron = '<span class="title defaultPopup" href="([^"]+)"><span class="number">([^<]+)</span>([^<]+)</span>(\s*</div>\s*<span[^>]*><span[^>]*>[^<]*</span><span[^>]*>[^<]*</span></span><div[^>]*><button[^>]*><span[^>]*>[^<]*</span><span[^>]*>[^<]*</span></button><div class="action([^"]*)" data-action="seen">)?'
-        matches = re.compile(patron, re.DOTALL).findall(bloque_episodios)
-
-        for scrapedurl, numero, scrapedtitle, info, visto in matches:
-            # visto_string = "[visto] " if visto.strip()=="active" else ""
-            if visto.strip() == "active":
-                visto_string = "[visto] "
-            else:
-                visto_string = ""
-
-            title = visto_string + nombre_temporada.replace("Temporada ", "").replace("Extras",
-                                                                                      "Extras 0") + "x" + numero + " " + scrapertools.htmlclean(
-                scrapedtitle)
-            thumbnail = item.thumbnail
-            fanart = item.fanart
-            plot = ""
-            # http://www.pordede.com/peli/the-lego-movie
-            # http://www.pordede.com/links/view/slug/the-lego-movie/what/peli?popup=1
-            # http://www.pordede.com/links/viewepisode/id/475011?popup=1
-            epid = scrapertools.find_single_match(scrapedurl, "id/(\d+)")
-            url = "http://www.pordede.com/links/viewepisode/id/" + epid
-            itemlist.append(
-                Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                     fulltitle=title, fanart=fanart, show=item.show))
-
-            logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-
-    if config.get_videolibrary_support():
-        # con año y valoracion la serie no se puede actualizar correctamente, si ademas cambia la valoracion, creara otra carpeta
-        # Sin año y sin valoración:
-        show = re.sub(r"\s\(\d+\)\s\(\d+\.\d+\)", "", item.show)
-        # Sin año:
-        # show = re.sub(r"\s\(\d+\)", "", item.show)
-        # Sin valoración:
-        # show = re.sub(r"\s\(\d+\.\d+\)", "", item.show)
-        itemlist.append(Item(channel='pordede', title="Añadir esta serie a la videoteca", url=item.url,
-                             action="add_serie_to_library", extra="episodios###", show=show))
-        itemlist.append(Item(channel='pordede', title="Descargar todos los episodios de la serie", url=item.url,
-                             action="download_all_episodes", extra="episodios", show=show))
-        itemlist.append(Item(channel='pordede', title="Marcar como Pendiente", tipo="serie", idtemp=idserie, valor="1",
-                             action="pordede_check", show=show))
-        itemlist.append(Item(channel='pordede', title="Marcar como Siguiendo", tipo="serie", idtemp=idserie, valor="2",
-                             action="pordede_check", show=show))
-        itemlist.append(Item(channel='pordede', title="Marcar como Finalizada", tipo="serie", idtemp=idserie, valor="3",
-                             action="pordede_check", show=show))
-        itemlist.append(Item(channel='pordede', title="Marcar como Favorita", tipo="serie", idtemp=idserie, valor="4",
-                             action="pordede_check", show=show))
-        itemlist.append(Item(channel='pordede', title="Quitar marca", tipo="serie", idtemp=idserie, valor="0",
-                             action="pordede_check", show=show))
-
-    return itemlist
-
-
-def parse_listas(item, patron):
-    logger.info()
-
-    # Descarga la pagina
-    headers = {"X-Requested-With": "XMLHttpRequest"}
-    data = httptools.downloadpage(item.url, headers=headers).data
-    logger.debug("data=" + data)
-
-    # Extrae las entradas (carpetas)
-    json_object = jsontools.load(data)
-    logger.debug("html=" + json_object["html"])
-    data = json_object["html"]
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedurl, scrapedtitle, scrapeduser, scrapedfichas in matches:
-        title = scrapertools.htmlclean(scrapedtitle + ' (' + scrapedfichas + ' fichas, por ' + scrapeduser + ')')
-        url = urlparse.urljoin(item.url, scrapedurl) + "/offset/0/loadmedia"
-        thumbnail = ""
-        itemlist.append(Item(channel=item.channel, action="lista", title=title, url=url))
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-
-    nextpage = scrapertools.find_single_match(data, 'data-url="(/lists/loadlists/offset/[^"]+)"')
-    if nextpage != '':
-        url = urlparse.urljoin(item.url, nextpage)
-        itemlist.append(
-            Item(channel=item.channel, action="listas_sigues", title=">> Página siguiente", extra=item.extra, url=url))
-
-    try:
-        import xbmcplugin
-        xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_UNSORTED)
-        xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_VIDEO_TITLE)
-    except:
-        pass
-
-    return itemlist
-
-
-def listas_sigues(item):
-    logger.info()
-
-    patron = '<div class="clearfix modelContainer" data-model="lista"[^<]+'
-    patron += '<span class="title"><span class="name"><a class="defaultLink" href="([^"]+)">([^<]+)</a>'
-    patron += '</span>[^<]+<a[^>]+>([^<]+)</a></span>\s+<div[^<]+<div[^<]+</div>\s+<div class="info">\s+<p>([0-9]+)'
-
-    return parse_listas(item, patron)
-
-
-def tus_listas(item):
-    logger.info()
-
-    patron = '<div class="clearfix modelContainer" data-model="lista"[^<]+'
-    patron += '<div class="right"[^<]+'
-    patron += '<button[^<]+</button[^<]+'
-    patron += '<button[^<]+</button[^<]+'
-    patron += '</div[^<]+'
-    patron += '<span class="title"><span class="name"><a class="defaultLink" href="([^"]+)">([^<]+)</a>'
-    patron += '</span>[^<]+<a[^>]+>([^<]+)</a></span>\s+<div[^<]+<div[^<]+</div>\s+<div class="info">\s+<p>([0-9]+)'
-
-    return parse_listas(item, patron)
-
-
-def lista(item):
-    logger.info()
-
-    # Descarga la pagina
-    headers = {"X-Requested-With": "XMLHttpRequest"}
-    data = httptools.downloadpage(item.url, headers=headers).data
-    logger.debug("data=" + data)
-
-    # Extrae las entradas (carpetas)
-    json_object = jsontools.load(data)
-    logger.debug("html=" + json_object["html"])
-    data = json_object["html"]
-
-    return parse_mixed_results(item, data)
-
-
-def findvideos(item, verTodos=False):
-    logger.info()
-    # logger.debug(item.tostring('\n'))
-
-    # Descarga la pagina
-    data = httptools.downloadpage(item.url).data
-    logger.info(data)
-    # logger.debug("data="+data)
-
-    # Extrae las entradas (carpetas)
-    # json_object = jsontools.load_json(data)
-    # logger.debug("html="+json_object["html"])
-    # data = json_object["html"]
-
-    sesion = scrapertools.find_single_match(data, 'SESS = "([^"]+)";')
-    logger.debug("sesion=" + sesion)
-
-    patron = '<a target="_blank" class="a aporteLink(.*?)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    idpeli = scrapertools.find_single_match(data,
-                                            '<div class="buttons"><button class="defaultPopup onlyLogin" href="/links/create/ref_id/(\d+)/ref_model/4">Añadir enlace')
-
-    if (config.get_platform().startswith("xbmc") or config.get_platform().startswith(
-            "kodi")) and "/what/peli" in item.url:
-        itemlist.append(Item(channel=item.channel, action="infosinopsis", title="INFO / SINOPSIS", url=item.url,
-                             thumbnail=item.thumbnail, fanart=item.fanart, folder=False))
-
-    itemsort = []
-    sortlinks = config.get_setting("pordedesortlinks",
-                                   item.channel)  # 0:no, 1:valoracion, 2:idioma, 3:calidad, 4:idioma+calidad, 5:idioma+valoracion, 6:idioma+calidad+valoracion
-    showlinks = config.get_setting("pordedeshowlinks", item.channel)  # 0:todos, 1:ver online, 2:descargar
-
-    # sortlinks = int(sortlinks) if sortlinks != '' and sortlinks !="No" else 0
-    # showlinks = int(showlinks) if showlinks != '' and showlinks !="No" else 0
-
-    if sortlinks != '' and sortlinks != "No":
-        sortlinks = int(sortlinks)
-    else:
-        sortlinks = 0
-
-    if showlinks != '' and showlinks != "No":
-        showlinks = int(showlinks)
-    else:
-        showlinks = 0
-
-    for match in matches:
-        logger.debug("match=" + match)
-
-        jdown = scrapertools.find_single_match(match, '<div class="jdownloader">[^<]+</div>')
-        if (showlinks == 1 and jdown != '') or (
-                        showlinks == 2 and jdown == ''):  # Descartar enlaces veronline/descargar
-            continue
-
-        idiomas = re.compile('<div class="flag([^"]+)">([^<]+)</div>', re.DOTALL).findall(match)
-        idioma_0 = (
-            idiomas[0][0].replace("&nbsp;", "").strip() + " " + idiomas[0][1].replace("&nbsp;", "").strip()).strip()
-        if len(idiomas) > 1:
-            idioma_1 = (
-                idiomas[1][0].replace("&nbsp;", "").strip() + " " + idiomas[1][1].replace("&nbsp;", "").strip()).strip()
-            idioma = idioma_0 + ", " + idioma_1
-        else:
-            idioma_1 = ''
-            idioma = idioma_0
-
-        calidad_video = scrapertools.find_single_match(match,
-                                                       '<div class="linkInfo quality"><i class="icon-facetime-video"></i>([^<]+)</div>')
-        logger.debug("calidad_video=" + calidad_video)
-        calidad_audio = scrapertools.find_single_match(match,
-                                                       '<div class="linkInfo qualityaudio"><i class="icon-headphones"></i>([^<]+)</div>')
-        logger.debug("calidad_audio=" + calidad_audio)
-
-        thumb_servidor = scrapertools.find_single_match(match, '<div class="hostimage"[^<]+<img\s*src="([^"]+)">')
-        logger.debug("thumb_servidor=" + thumb_servidor)
-        nombre_servidor = scrapertools.find_single_match(thumb_servidor, "popup_([^\.]+)\.png")
-        logger.debug("nombre_servidor=" + nombre_servidor)
-
-        # title = ("Download " if jdown != '' else "Ver en ")+nombre_servidor+" ("+idioma+") (Calidad "+calidad_video.strip()+", audio "+calidad_audio.strip()+")"
-        if jdown != '':
-            title = "Download " + nombre_servidor + " (" + idioma + ") (Calidad " + calidad_video.strip() + ", audio " + calidad_audio.strip() + ")"
-        else:
-            title = "Ver en " + nombre_servidor + " (" + idioma + ") (Calidad " + calidad_video.strip() + ", audio " + calidad_audio.strip() + ")"
-
-        cuenta = []
-        valoracion = 0
-        for idx, val in enumerate(['1', '2', 'report']):
-            nn = scrapertools.find_single_match(match,
-                                                '<span\s+data-num="([^"]+)"\s+class="defaultPopup"\s+href="/likes/popup/value/' + val + '/')
-            if nn != '0' and nn != '':
-                cuenta.append(nn + ' ' + ['ok', 'ko', 'rep'][idx])
-                # valoracion += int(nn) if val == '1' else -int(nn)
-                if val == '1':
-                    valoracion += int(nn)
-                else:
-                    valoracion += -int(nn)
-
-        if len(cuenta) > 0:
-            title += ' (' + ', '.join(cuenta) + ')'
-
-        url = urlparse.urljoin(item.url, scrapertools.find_single_match(match, 'href="([^"]+)"'))
-        thumbnail = thumb_servidor
-        plot = ""
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-        if sortlinks > 0:
-            # orden1 para dejar los "downloads" detras de los "ver" al ordenar
-            # orden2 segun configuración
-            if sortlinks == 1:
-                orden = valoracion
-            elif sortlinks == 2:
-                orden = valora_idioma(idioma_0, idioma_1)
-            elif sortlinks == 3:
-                orden = valora_calidad(calidad_video, calidad_audio)
-            elif sortlinks == 4:
-                orden = (valora_idioma(idioma_0, idioma_1) * 100) + valora_calidad(calidad_video, calidad_audio)
-            elif sortlinks == 5:
-                orden = (valora_idioma(idioma_0, idioma_1) * 1000) + valoracion
-            elif sortlinks == 6:
-                orden = (valora_idioma(idioma_0, idioma_1) * 100000) + (
-                    valora_calidad(calidad_video, calidad_audio) * 1000) + valoracion
-            itemsort.append(
-                {'action': "play", 'title': title, 'url': url, 'thumbnail': thumbnail, 'fanart': item.fanart,
-                 'plot': plot, 'extra': sesion + "|" + item.url, 'fulltitle': item.fulltitle, 'orden1': (jdown == ''),
-                 'orden2': orden})
-        else:
-            itemlist.append(
-                Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, fanart=item.fanart,
-                     plot=plot, extra=sesion + "|" + item.url, fulltitle=item.fulltitle))
-
-    if sortlinks > 0:
-        numberlinks = config.get_setting("pordedenumberlinks", item.channel)  # 0:todos, > 0:n*5 (5,10,15,20,...)
-        # numberlinks = int(numberlinks) if numberlinks != '' and numberlinks !="No" else 0
-        if numberlinks != '' and numberlinks != "No":
-            numberlinks = int(numberlinks)
-        else:
-            numberlinks = 0
-
-        if numberlinks == 0:
-            verTodos = True
-        itemsort = sorted(itemsort, key=lambda k: (k['orden1'], k['orden2']), reverse=True)
-        for i, subitem in enumerate(itemsort):
-            if verTodos == False and i >= numberlinks:
-                itemlist.append(
-                    Item(channel=item.channel, action='findallvideos', title='Ver todos los enlaces', url=item.url,
-                         extra=item.extra))
-                break
-            itemlist.append(
-                Item(channel=item.channel, action=subitem['action'], title=subitem['title'], url=subitem['url'],
-                     thumbnail=subitem['thumbnail'], fanart=subitem['fanart'], plot=subitem['plot'],
-                     extra=subitem['extra'], fulltitle=subitem['fulltitle']))
-
-    if "/what/peli" in item.url or "/what/docu" in item.url:
-        itemlist.append(
-            Item(channel=item.channel, action="pordede_check", tipo="peli", title="Marcar como Pendiente", valor="1",
-                 idtemp=idpeli))
-        itemlist.append(
-            Item(channel=item.channel, action="pordede_check", tipo="peli", title="Marcar como Vista", valor="3",
-                 idtemp=idpeli))
-        itemlist.append(
-            Item(channel=item.channel, action="pordede_check", tipo="peli", title="Marcar como Favorita", valor="4",
-                 idtemp=idpeli))
-        itemlist.append(Item(channel=item.channel, action="pordede_check", tipo="peli", title="Quitar Marca", valor="0",
-                             idtemp=idpeli))
-
-    return itemlist
-
-
-def findallvideos(item):
-    return findvideos(item, True)
-
-
-def play(item):
-    logger.info("url=" + item.url)
-
-    # Marcar como visto
-    checkseen(item.extra.split("|")[1])
-
-    # Hace la llamada
-    headers = {'Referer': item.extra.split("|")[1]}
-
-    data = httptools.downloadpage(item.url, post="_s=" + item.extra.split("|")[0], headers=headers).data
-    url = scrapertools.find_single_match(data, '<p class="nicetry links">\s+<a href="([^"]+)" target="_blank"')
-    url = urlparse.urljoin(item.url, url)
-
-    headers = {'Referer': item.url}
-    media_url = httptools.downloadpage(url, headers=headers, follow_redirects=False).headers.get("location")
-    logger.info("media_url=" + media_url)
-
-    itemlist = servertools.find_video_items(data=media_url)
-
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-
-    return itemlist
-
-
-def checkseen(item):
-    logger.info(item)
-
-    if "/viewepisode/" in item:
-        episode = item.split("/")[-1]
-        httptools.downloadpage("http://www.pordede.com/ajax/action",
-                               post="model=episode&id=" + episode + "&action=seen&value=1")
-
-    if "/what/peli" in item:
-        data = httptools.downloadpage(item).data
-        # GET MOVIE ID
-        movieid = scrapertools.find_single_match(data, 'href="/links/create/ref_id/([0-9]+)/ref_model/')
-        httptools.downloadpage("http://www.pordede.com/ajax/mediaaction",
-                               post="model=peli&id=" + movieid + "&action=status&value=3")
-
-    return True
-
-
-def infosinopsis(item):
-    logger.info()
-
-    url_aux = item.url.replace("/links/view/slug/", "/peli/").replace("/what/peli", "")
-    # Descarga la pagina
-
-    data = httptools.downloadpage(url_aux).data
-    logger.debug("data=" + data)
-
-    scrapedtitle = scrapertools.find_single_match(data, '<h1>([^<]+)</h1>')
-    scrapedvalue = scrapertools.find_single_match(data, '<span class="puntuationValue" data-value="([^"]+)"')
-    scrapedyear = scrapertools.find_single_match(data, '<h2 class="info">[^<]+</h2>\s*<p class="info">([^<]+)</p>')
-    scrapedduration = scrapertools.find_single_match(data, '<h2 class="info">[^<]+</h2>\s*<p class="info">([^<]+)</p>',
-                                                     1)
-    scrapedplot = scrapertools.find_single_match(data, '<div class="info text"[^>]+>([^<]+)</div>')
-    # scrapedthumbnail = scrapertools.find_single_match(data,'<meta property="og:image" content="([^"]+)"')
-    # thumbnail = scrapedthumbnail.replace("http://www.pordede.comhttp://", "http://").replace("mediacover", "mediathumb")
-    scrapedgenres = re.compile('href="/pelis/index/genre/[^"]+">([^<]+)</a>', re.DOTALL).findall(data)
-    scrapedcasting = re.compile('href="/star/[^"]+">([^<]+)</a><br/><span>([^<]+)</span>', re.DOTALL).findall(data)
-
-    title = scrapertools.htmlclean(scrapedtitle)
-    plot = "Año: [B]" + scrapedyear + "[/B]"
-    plot += " , Duración: [B]" + scrapedduration + "[/B]"
-    plot += " , Puntuación usuarios: [B]" + scrapedvalue + "[/B]"
-    plot += "\nGéneros: " + ", ".join(scrapedgenres)
-    plot += "\n\nSinopsis:\n" + scrapertools.htmlclean(scrapedplot)
-    plot += "\n\nCasting:\n"
-    for actor, papel in scrapedcasting:
-        plot += actor + " (" + papel + "). "
-
-    tbd = TextBox("DialogTextViewer.xml", os.getcwd(), "Default")
-    tbd.ask(title, plot)
-    del tbd
-    return
-
-
-try:
-    import xbmcgui
-
-
-    class TextBox(xbmcgui.WindowXML):
-        """ Create a skinned textbox window """
-
-        def __init__(self, *args, **kwargs):
-            pass
-
-        def onInit(self):
-            try:
-                self.getControl(5).setText(self.text)
-                self.getControl(1).setLabel(self.title)
-            except:
-                pass
-
-        def onClick(self, controlId):
-            pass
-
-        def onFocus(self, controlId):
-            pass
-
-        def onAction(self, action):
-            if action == 7:
-                self.close()
-
-        def ask(self, title, text):
-            self.title = title
-            self.text = text
-            self.doModal()
-except:
-    pass
-
-
-# Valoraciones de enlaces, los valores más altos se mostrarán primero :
-
-def valora_calidad(video, audio):
-    prefs_video = ['hdmicro', 'hd1080', 'hd720', 'hdrip', 'dvdrip', 'rip', 'tc-screener', 'ts-screener']
-    prefs_audio = ['dts', '5.1', 'rip', 'line', 'screener']
-
-    video = ''.join(video.split()).lower()
-    # pts = (9 - prefs_video.index(video) if video in prefs_video else 1) * 10
-    if video in prefs_video:
-        pts = (9 - prefs_video.index(video)) * 10
-    else:
-        pts = (9 - 1) * 10
-
-    audio = ''.join(audio.split()).lower()
-    # pts += 9 - prefs_audio.index(audio) if audio in prefs_audio else 1
-    if audio in prefs_audio:
-        pts = (9 - prefs_audio.index(audio)) * 10
-    else:
-        pts = (9 - 1) * 10
-
-    return pts
-
-
-def valora_idioma(idioma_0, idioma_1):
-    prefs = ['spanish', 'spanish LAT', 'catalan', 'english', 'french']
-
-    # pts = (9 - prefs.index(idioma_0) if idioma_0 in prefs else 1) * 10
-    if idioma_0 in prefs:
-        pts = (9 - prefs.index(idioma_0)) * 10
-    else:
-        pts = (9 - 1) * 10
-
-    if idioma_1 != '':  # si hay subtítulos
-        idioma_1 = idioma_1.replace(' SUB', '')
-
-        # pts += 8 - prefs.index(idioma_1) if idioma_1 in prefs else 1
-        if idioma_1 in prefs:
-            pts += 8 - prefs.index(idioma_1)
-        else:
-            pts += 8 - 1
-
-    else:
-        pts += 9  # sin subtítulos por delante
-    return pts
-
-
-def pordede_check(item):
-    httptools.downloadpage("http://www.pordede.com/ajax/mediaaction",
-                           post="model=" + item.tipo + "&id=" + item.idtemp + "&action=status&value=" + item.valor)
diff --git a/plugin.video.alfa/channels/pornhub.json b/plugin.video.alfa/channels/pornhub.json
index f22c6134..e1e47c34 100755
--- a/plugin.video.alfa/channels/pornhub.json
+++ b/plugin.video.alfa/channels/pornhub.json
@@ -7,17 +7,6 @@
   "fanart": "http://i.imgur.com/PwFvoss.jpg",
   "thumbnail": "http://s22.postimg.org/5lzcocfqp/pornhub_logo.jpg",
   "banner": "pornhub.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "29/04/2017",
-      "description": "Reparados enlaces a los vídeos"
-    },
-    {
-      "date": "14/09/2016",
-      "description": "Cambios en la web"
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/porntrex.json b/plugin.video.alfa/channels/porntrex.json
index 849a4ac9..395b5f5f 100755
--- a/plugin.video.alfa/channels/porntrex.json
+++ b/plugin.video.alfa/channels/porntrex.json
@@ -4,13 +4,6 @@
   "language": ["*"],
   "active": true,
   "adult": true,
-  "version": 1,
-  "changes": [
-    {
-      "date": "29/04/2017",
-      "description": "Primera versión"
-    }
-  ],
   "thumbnail": "http://i.imgur.com/n8SUCE9.png?1",
   "categories": [
     "adult"
diff --git a/plugin.video.alfa/channels/puyasubs.json b/plugin.video.alfa/channels/puyasubs.json
index 95b2e7a9..818b7dd1 100755
--- a/plugin.video.alfa/channels/puyasubs.json
+++ b/plugin.video.alfa/channels/puyasubs.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "http://i.imgur.com/aad4psi.png",
   "banner": "http://i.imgur.com/trFDT39.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "28/05/2017",
-      "description": "Cambio de dominio"
-    },
-    {
-      "date": "09/05/2017",
-      "description": "Corregida seccion lista de torrents y regex de listados"
-    },
-    {
-      "date": "10/11/2016",
-      "description": "Primera versión"
-    }
-  ],
   "categories": [
     "anime"
   ],
diff --git a/plugin.video.alfa/channels/qserie.json b/plugin.video.alfa/channels/qserie.json
index ebdaccbd..aa3d01c3 100755
--- a/plugin.video.alfa/channels/qserie.json
+++ b/plugin.video.alfa/channels/qserie.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://s31.postimg.org/dousrbu9n/qserie.png",
   "banner": "https://s32.postimg.org/nk1quq1wl/qserie_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "04/01/2017",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "tvshow"
   ]
diff --git a/plugin.video.alfa/channels/quierodibujosanimados.json b/plugin.video.alfa/channels/quierodibujosanimados.json
index 538f5351..2950f82c 100755
--- a/plugin.video.alfa/channels/quierodibujosanimados.json
+++ b/plugin.video.alfa/channels/quierodibujosanimados.json
@@ -7,17 +7,6 @@
   "thumbnail": "quierodibujosanimados.png",
   "banner": "quierodibujosanimados.png",
   "fanart": "quierodibujosanimados.jpg",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "tvshow"
   ]
diff --git a/plugin.video.alfa/channels/repelis.json b/plugin.video.alfa/channels/repelis.json
index 34e8b50b..5e95dd76 100755
--- a/plugin.video.alfa/channels/repelis.json
+++ b/plugin.video.alfa/channels/repelis.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "repelis.png",
   "banner": "repelis.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "18/05/2017",
-      "description": "Cambiado patrón en búsqueda de videos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie",
     "documentary",
diff --git a/plugin.video.alfa/channels/search.json b/plugin.video.alfa/channels/search.json
index 6cb3a753..00fae81a 100755
--- a/plugin.video.alfa/channels/search.json
+++ b/plugin.video.alfa/channels/search.json
@@ -4,33 +4,6 @@
   "active": false,
   "adult": false,
   "language": ["*"],
-  "version": 1,
-  "changes": [
-    {
-      "date": "25/05/17",
-      "description": "añadido control parental"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "17/02/17",
-      "description": "Cambios de detalles visuales"
-    },
-    {
-      "date": "06/12/16",
-      "description": "Añadir al menu: 'Recordar última búsqueda'"
-    },
-    {
-      "date": "01/07/16",
-      "description": "Eliminado código innecesario."
-    },
-    {
-      "date": "???",
-      "description": "Multihilos y seleccion de canales"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/search.py b/plugin.video.alfa/channels/search.py
index 73a0190a..213eacf3 100644
--- a/plugin.video.alfa/channels/search.py
+++ b/plugin.video.alfa/channels/search.py
@@ -114,7 +114,7 @@ def setting_channel(item):
         custom_button_label = "Todos"
 
     return platformtools.show_channel_settings(list_controls=list_controls,
-                                               caption="Canales incluidos en la búsqueda global",
+                                               caption="Canales incluidos en la búsqueda",
                                                callback="save_settings", item=item,
                                                custom_button={'visible': True,
                                                               'function': "cb_custom_button",
@@ -277,6 +277,13 @@ def channel_search(search_results, channel_parameters, tecleado):
 def do_search(item, categories=None):
     logger.info("blaa categorias %s" % categories)
 
+    if item.contextual==True:
+        categories = ["Películas"]
+        setting_item = Item(channel=item.channel, title="Elegir canales incluidos en la búsqueda", folder=False,
+                            thumbnail=get_thumb("search.png"))
+        setting_channel(setting_item)
+
+
     if categories is None:
         categories = []
 
@@ -417,6 +424,8 @@ def do_search(item, categories=None):
             title = channel
 
             # resultados agrupados por canales
+            if item.contextual == True:
+                result_mode = 1
             if result_mode == 0:
                 if len(search_results[channel]) > 1:
                     title += " [%s]" % element["item"].title.strip()
@@ -432,7 +441,7 @@ def do_search(item, categories=None):
             else:
                 title = " [ Resultados del canal %s ] " % channel
                 itemlist.append(Item(title=title, channel="search", action="",
-                                     folder=False, text_bold=True))
+                                     folder=False, text_bold=True, from_channel=channel))
                 for i in element["itemlist"]:
                     if i.action:
                         title = "    " + i.title
@@ -445,6 +454,24 @@ def do_search(item, categories=None):
 
     progreso.close()
 
+    #Para opcion Buscar en otros canales
+    if item.contextual == True:
+        return exact_results(itemlist, tecleado)
+    else:
+        return itemlist
+
+
+def exact_results(results, wanted):
+    logger.info()
+    itemlist =[]
+
+    for item in results:
+        if item.action=='':
+            channel=item.from_channel
+        if item.action != '' and item.contentTitle==wanted:
+            item.title = '%s [%s]' % (item.title, channel)
+            itemlist.append(item)
+
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/seodiv.json b/plugin.video.alfa/channels/seodiv.json
index 71bd7772..0499f142 100755
--- a/plugin.video.alfa/channels/seodiv.json
+++ b/plugin.video.alfa/channels/seodiv.json
@@ -6,25 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s32.postimg.org/gh8lhbkb9/seodiv.png",
   "banner": "https://s31.postimg.org/klwjzp7t7/seodiv_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/06/2017",
-      "description": "Cambios para autoplay"
-    },
-    {
-      "date": "06/06/2017",
-      "description": "compatibilidad con AutoPlay"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "09/05/2017",
-      "description": "Fix temporadas"
-    }
-  ],
   "categories": [
     "tvshows"
   ],
diff --git a/plugin.video.alfa/channels/seriecanal.json b/plugin.video.alfa/channels/seriecanal.json
index 88db8c97..b3166f5f 100755
--- a/plugin.video.alfa/channels/seriecanal.json
+++ b/plugin.video.alfa/channels/seriecanal.json
@@ -6,17 +6,6 @@
   "language": ["cast"],
   "thumbnail": "http://i.imgur.com/EwMK8Yd.png",
   "banner": "seriecanal.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "08/07/2016",
-      "description": "Corregido el canal, es necesario registrarse, adaptado a la nueva version."
-    }
-  ],
   "categories": [
     "tvshow",
     "vos"
diff --git a/plugin.video.alfa/channels/seriesadicto.json b/plugin.video.alfa/channels/seriesadicto.json
index 4633e4dc..7abc9e4b 100755
--- a/plugin.video.alfa/channels/seriesadicto.json
+++ b/plugin.video.alfa/channels/seriesadicto.json
@@ -6,17 +6,6 @@
   "language": ["cast"],
   "thumbnail": "seriesadicto.png",
   "banner": "seriesadicto.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "tvshow",
     "anime"
diff --git a/plugin.video.alfa/channels/seriesblanco.json b/plugin.video.alfa/channels/seriesblanco.json
index d9eb21b6..b8a2d43c 100755
--- a/plugin.video.alfa/channels/seriesblanco.json
+++ b/plugin.video.alfa/channels/seriesblanco.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "seriesblanco.png",
   "banner": "seriesblanco.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "11/05/2017",
-      "description": "Fix merge"
-    },
-    {
-      "date": "06/04/2017",
-      "description": "Mejoras en filtertools, fix calidades"
-    },
-    {
-      "date": "01/04/2017",
-      "description": "Cambiado canal."
-    }
-  ],
   "categories": [
     "tvshow",
     "vos"
diff --git a/plugin.video.alfa/channels/seriesdanko.json b/plugin.video.alfa/channels/seriesdanko.json
index 076d2ce7..4e70b493 100755
--- a/plugin.video.alfa/channels/seriesdanko.json
+++ b/plugin.video.alfa/channels/seriesdanko.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "seriesdanko.png",
   "banner": "seriesdanko.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "06/04/2017",
-      "description": "Mejoras en filtertools"
-    },
-    {
-      "date": "27/01/2017",
-      "description": "Fix añadir serie desde la búsqueda.."
-    }
-  ],
   "categories": [
     "tvshow",
     "vos"
diff --git a/plugin.video.alfa/channels/serieslan.json b/plugin.video.alfa/channels/serieslan.json
index 7927fbb8..a80ae54b 100755
--- a/plugin.video.alfa/channels/serieslan.json
+++ b/plugin.video.alfa/channels/serieslan.json
@@ -6,13 +6,6 @@
   "language": ["lat"],
   "thumbnail": "http://i.imgur.com/s6CBxlw.png",
   "banner": "http://i.imgur.com/c1YTgNT.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "09/06/2017",
-      "description": "Primera version de series en Latino"
-    }
-  ],
   "categories": [
     "tvshow"
   ]
diff --git a/plugin.video.alfa/channels/serieslatino.json b/plugin.video.alfa/channels/serieslatino.json
index e3718988..a9a97c04 100755
--- a/plugin.video.alfa/channels/serieslatino.json
+++ b/plugin.video.alfa/channels/serieslatino.json
@@ -6,29 +6,6 @@
   "language": ["lat"],
   "thumbnail": "https://s17.postimg.org/rpmc90y9r/serieslatino.png",
   "banner": "https://s8.postimg.org/ka707waat/serieslatino_banner.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "24/06/2017",
-      "description": "Cambios para autoplay"
-    },
-    {
-      "date": "22/06/2017",
-      "description": "ajustes para AutoPlay"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "04/01/2017",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "tvshow"
   ],
diff --git a/plugin.video.alfa/channels/seriesmeme.json b/plugin.video.alfa/channels/seriesmeme.json
index 07786a0c..006f5d6c 100755
--- a/plugin.video.alfa/channels/seriesmeme.json
+++ b/plugin.video.alfa/channels/seriesmeme.json
@@ -6,13 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "seriesmeme.png",
   "banner": "seriesmeme.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "18/05/2017",
-      "description": "Mejora estética agregado modulo tmdb"
-    }
-  ],
   "categories": [
     "tvshow"
   ]
diff --git a/plugin.video.alfa/channels/seriespapaya.json b/plugin.video.alfa/channels/seriespapaya.json
index fe12bc7a..9bf0fe56 100755
--- a/plugin.video.alfa/channels/seriespapaya.json
+++ b/plugin.video.alfa/channels/seriespapaya.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "http://i.imgur.com/P1D92cf.png",
   "banner": "http://i.imgur.com/OHHvi5z.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "06/04/2017",
-      "description": "Mejoras en filtertools"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "02/10/2016",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "tvshow",
     "anime"
diff --git a/plugin.video.alfa/channels/seriesyonkis.json b/plugin.video.alfa/channels/seriesyonkis.json
index 9a37397d..1c9c1bb9 100755
--- a/plugin.video.alfa/channels/seriesyonkis.json
+++ b/plugin.video.alfa/channels/seriesyonkis.json
@@ -7,17 +7,6 @@
   "thumbnail": "seriesyonkis.png",
   "banner": "seriesyonkis.png",
   "fanart": "seriesyonkis.jpg",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "11/07/2016",
-      "description": "Reparada búsqueda y soluciona error en findvideos"
-    }
-  ],
   "categories": [
     "tvshow",
     "anime",
diff --git a/plugin.video.alfa/channels/serviporno.json b/plugin.video.alfa/channels/serviporno.json
index 19cccf00..a992a90a 100755
--- a/plugin.video.alfa/channels/serviporno.json
+++ b/plugin.video.alfa/channels/serviporno.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "thumbnail": "serviporno.png",
   "banner": "serviporno.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "05/08/2016",
-      "description": "Eliminado de sección películas."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/setting.py b/plugin.video.alfa/channels/setting.py
index a2627c06..24a563ca 100644
--- a/plugin.video.alfa/channels/setting.py
+++ b/plugin.video.alfa/channels/setting.py
@@ -3,8 +3,6 @@
 # Configuracion
 # ------------------------------------------------------------
 
-import os
-
 from channelselector import get_thumb
 from core import filetools
 from core import servertools
@@ -15,7 +13,6 @@ from platformcode import platformtools
 CHANNELNAME = "setting"
 
 
-# todo revisar elementos de update
 def mainlist(item):
     logger.info()
 
@@ -23,19 +20,6 @@ def mainlist(item):
     itemlist.append(Item(channel=CHANNELNAME, title="Preferencias", action="settings", folder=False,
                          thumbnail=get_thumb("setting_0.png")))
 
-    # if config.get_setting("plugin_updates_available") == 0:
-    #     nuevas = ""
-    # elif config.get_setting("plugin_updates_available") == 1:
-    #     nuevas = " (1 nueva)"
-    # else:
-    #     nuevas = " (%s nuevas)" % config.get_setting("plugin_updates_available")
-    #
-    # thumb_configuracion = "setting_%s.png" % config.get_setting("plugin_updates_available")
-    #
-    # itemlist.append(Item(channel=CHANNELNAME, title="Descargar e instalar otras versiones" + nuevas,
-    #                      action="get_all_versions", folder=True,
-    #                      thumbnail=get_thumb(thumb_configuracion)))
-
     itemlist.append(Item(channel=CHANNELNAME, title="", action="", folder=False, thumbnail=get_thumb("setting_0.png")))
 
     itemlist.append(Item(channel=CHANNELNAME, title="Ajustes especiales", action="", folder=False,
@@ -59,8 +43,6 @@ def mainlist(item):
         itemlist.append(Item(channel=CHANNELNAME, title="   Ajustes de cliente Torrent", action="setting_torrent",
                              folder=True, thumbnail=get_thumb("channels_torrent.png")))
 
-    # itemlist.append(Item(channel=CHANNELNAME, title="   Añadir o Actualizar canal/conector desde una URL",
-    #                      action="menu_addchannels"))
     itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False, thumbnail=get_thumb("setting_0.png")))
     itemlist.append(Item(channel=CHANNELNAME, title="Otras herramientas", action="submenu_tools", folder=True,
                          thumbnail=get_thumb("setting_0.png")))
@@ -263,7 +245,7 @@ def servers_favorites(item):
     for x in range(1, 6):
         control = {'id': x,
                    'type': "list",
-                   'label': "    Servidor #%s" % (x),
+                   'label': "    Servidor #%s" % x,
                    'lvalues': server_names,
                    'default': 0,
                    'enabled': "eq(-%s,True)" % x,
@@ -301,261 +283,13 @@ def cb_servers_favorites(server_names, dict_values):
     progreso.close()
 
 
-def get_all_versions(item):
-    logger.info()
-
-    itemlist = []
-
-    # Lee la versión local
-    from core import versiontools
-
-    # Descarga la lista de versiones
-    from core import api
-    api_response = api.plugins_get_all_packages()
-
-    if api_response["error"]:
-        platformtools.dialog_ok("Error", "Se ha producido un error al descargar la lista de versiones")
-        return
-
-    for entry in api_response["body"]:
-
-        if entry["package"] == "plugin":
-            title = "alfa " + entry["tag"] + " (Publicada " + entry["date"] + ")"
-            local_version_number = versiontools.get_current_plugin_version()
-        elif entry["package"] == "channels":
-            title = "Canales (Publicada " + entry["date"] + ")"
-            local_version_number = versiontools.get_current_channels_version()
-        elif entry["package"] == "servers":
-            title = "Servidores (Publicada " + entry["date"] + ")"
-            local_version_number = versiontools.get_current_servers_version()
-        else:
-            title = entry["package"] + " (Publicada " + entry["date"] + ")"
-            local_version_number = None
-
-        title_color = ""
-
-        if local_version_number is None:
-            title = title
-
-        elif entry["version"] == local_version_number:
-            title += " ACTUAL"
-
-        elif entry["version"] > local_version_number:
-            title_color = "yellow"
-
-        else:
-            title_color = "0xFF666666"
-
-        itemlist.append(Item(channel=CHANNELNAME, title=title, url=entry["url"], filename=entry["filename"],
-                             package=entry["package"], version=str(entry["version"]), text_color=title_color,
-                             action="download_and_install_package", folder=False))
-
-    return itemlist
-
-
-def download_and_install_package(item):
-    logger.info()
-
-    from core import updater
-    from core import versiontools
-
-    if item.package == "plugin":
-        if int(item.version) < versiontools.get_current_plugin_version():
-            if not platformtools.dialog_yesno("Instalando versión anterior",
-                                              "¿Seguro que quieres instalar una versión anterior?"):
-                return
-        elif int(item.version) == versiontools.get_current_plugin_version():
-            if not platformtools.dialog_yesno("Reinstalando versión actual",
-                                              "¿Seguro que quieres reinstalar la misma versión que ya tienes?"):
-                return
-        elif int(item.version) > versiontools.get_current_plugin_version():
-            if not platformtools.dialog_yesno("Instalando nueva versión",
-                                              "¿Seguro que quieres instalar esta nueva versión?"):
-                return
-    else:
-        if not platformtools.dialog_yesno("Instalando paquete", "¿Seguro que quieres instalar este paquete?"):
-            return
-
-    local_file_name = os.path.join(config.get_data_path(), item.filename)
-    updater.download_and_install(item.url, local_file_name)
-
-    if config.is_xbmc():
-        import xbmc
-        xbmc.executebuiltin("Container.Refresh")
-
-
 def settings(item):
     config.open_settings()
 
 
-def menu_addchannels(item):
-    logger.info()
-    itemlist = list()
-    itemlist.append(Item(channel=CHANNELNAME, title="# Copia de seguridad automática en caso de sobrescritura",
-                         action="", text_color="green"))
-    itemlist.append(Item(channel=CHANNELNAME, title="Añadir o actualizar canal", action="addchannel", folder=False))
-    itemlist.append(Item(channel=CHANNELNAME, title="Añadir o actualizar conector", action="addchannel", folder=False))
-    itemlist.append(Item(channel=CHANNELNAME, title="Mostrar ruta de carpeta para copias de seguridad",
-                         action="backups", folder=False))
-    itemlist.append(Item(channel=CHANNELNAME, title="Eliminar copias de seguridad guardadas", action="backups",
-                         folder=False))
-
-    return itemlist
-
-
-def addchannel(item):
-    import os
-    import time
-    logger.info()
-
-    tecleado = platformtools.dialog_input("", "Introduzca la URL")
-    if not tecleado:
-        return
-    logger.info("url=%s" % tecleado)
-
-    local_folder = config.get_runtime_path()
-    if "canal" in item.title:
-        local_folder = filetools.join(local_folder, 'channels')
-        folder_to_extract = "channels"
-        info_accion = "canal"
-    else:
-        local_folder = filetools.join(local_folder, 'servers')
-        folder_to_extract = "servers"
-        info_accion = "conector"
-
-    # Detecta si es un enlace a un .py o .xml (pensado sobre todo para enlaces de github)
-    try:
-        extension = tecleado.rsplit(".", 1)[1]
-    except:
-        extension = ""
-
-    files = []
-    zip = False
-    if extension == "py" or extension == "xml":
-        filename = tecleado.rsplit("/", 1)[1]
-        localfilename = filetools.join(local_folder, filename)
-        files.append([tecleado, localfilename, filename])
-    else:
-        import re
-        from core import scrapertools
-        # Comprueba si la url apunta a una carpeta completa (channels o servers) de github
-        if re.search(r'https://github.com/[^\s]+/' + folder_to_extract, tecleado):
-            try:
-                data = scrapertools.downloadpage(tecleado)
-                matches = scrapertools.find_multiple_matches(data,
-                                                             '<td class="content">.*?href="([^"]+)".*?title="([^"]+)"')
-                for url, filename in matches:
-                    url = "https://raw.githubusercontent.com" + url.replace("/blob/", "/")
-                    localfilename = filetools.join(local_folder, filename)
-                    files.append([url, localfilename, filename])
-            except:
-                import traceback
-                logger.error("Detalle del error: %s" % traceback.format_exc())
-                platformtools.dialog_ok("Error", "La url no es correcta o no está disponible")
-                return
-        else:
-            filename = 'new%s.zip' % info_accion
-            localfilename = filetools.join(config.get_data_path(), filename)
-            files.append([tecleado, localfilename, filename])
-            zip = True
-
-    logger.info("localfilename=%s" % localfilename)
-    logger.info("descarga fichero...")
-
-    try:
-        if len(files) > 1:
-            lista_opciones = ["No", "Sí", "Sí (Sobrescribir todos)"]
-            overwrite_all = False
-        from core import downloadtools
-        for url, localfilename, filename in files:
-            result = downloadtools.downloadfile(url, localfilename, continuar=False, resumir=False)
-            if result == -3:
-                if len(files) == 1:
-                    dyesno = platformtools.dialog_yesno("El archivo ya existe", "Ya existe el %s %s. "
-                                                                                "¿Desea sobrescribirlo?" %
-                                                        (info_accion, filename))
-                else:
-                    if not overwrite_all:
-                        dyesno = platformtools.dialog_select("El archivo %s ya existe, ¿desea sobrescribirlo?"
-                                                             % filename, lista_opciones)
-                    else:
-                        dyesno = 1
-                # Diálogo cancelado
-                if dyesno == -1:
-                    return
-                # Caso de carpeta github, opción sobrescribir todos
-                elif dyesno == 2:
-                    overwrite_all = True
-                elif dyesno:
-                    hora_folder = "Copia seguridad [%s]" % time.strftime("%d-%m_%H-%M", time.localtime())
-                    backup = filetools.join(config.get_data_path(), 'backups', hora_folder, folder_to_extract)
-                    if not filetools.exists(backup):
-                        os.makedirs(backup)
-                    import shutil
-                    shutil.copy2(localfilename, filetools.join(backup, filename))
-                    downloadtools.downloadfile(url, localfilename, continuar=True, resumir=False)
-                else:
-                    if len(files) == 1:
-                        return
-                    else:
-                        continue
-    except:
-        import traceback
-        logger.error("Detalle del error: %s" % traceback.format_exc())
-        return
-
-    if zip:
-        try:
-            # Lo descomprime
-            logger.info("descomprime fichero...")
-            from core import ziptools
-            unzipper = ziptools.ziptools()
-            logger.info("destpathname=%s" % local_folder)
-            unzipper.extract(localfilename, local_folder, folder_to_extract, True, True)
-        except:
-            import traceback
-            logger.error("Detalle del error: %s" % traceback.format_exc())
-            # Borra el zip descargado
-            filetools.remove(localfilename)
-            platformtools.dialog_ok("Error", "Se ha producido un error extrayendo el archivo")
-            return
-
-        # Borra el zip descargado
-        logger.info("borra fichero...")
-        filetools.remove(localfilename)
-        logger.info("...fichero borrado")
-
-    platformtools.dialog_ok("Éxito", "Actualización/Instalación realizada correctamente")
-
-
-def backups(item):
-    logger.info()
-
-    ruta = filetools.join(config.get_data_path(), 'backups')
-    ruta_split = ""
-    if "ruta" in item.title:
-        heading = "Ruta de copias de seguridad"
-        if not filetools.exists(ruta):
-            folders = "Carpeta no creada"
-        else:
-            folders = str(len(filetools.listdir(ruta))) + " copia/s de seguridad guardadas"
-        if len(ruta) > 55:
-            ruta_split = ruta[55:]
-            ruta = ruta[:55]
-        platformtools.dialog_ok(heading, ruta, ruta_split, folders)
-    else:
-        if not filetools.exists(ruta):
-            platformtools.dialog_ok("La carpeta no existe", "No hay copias de seguridad guardadas")
-        else:
-            dyesno = platformtools.dialog_yesno("Las copias de seguridad se eliminarán", "¿Está seguro?")
-            if dyesno:
-                import shutil
-                shutil.rmtree(ruta, ignore_errors=True)
-
-
 def submenu_tools(item):
     logger.info()
-    itemlist = []
+    itemlist = list()
 
     itemlist.append(Item(channel=CHANNELNAME, title="Herramientas de canales", action="", folder=False,
                          thumbnail=get_thumb("channels.png")))
@@ -699,7 +433,7 @@ def conf_tools(item):
                         # logger.info(channel.channel + " No tiene archivo _data.json")
                         channeljson_exists = False
 
-                    if channeljson_exists == True:
+                    if channeljson_exists:
                         try:
                             datajson_size = filetools.getsize(file_settings)
                         except:
@@ -709,7 +443,7 @@ def conf_tools(item):
                         datajson_size = None
 
                     # Si el _data.json esta vacio o no existe...
-                    if (len(dict_settings) and datajson_size) == 0 or channeljson_exists == False:
+                    if (len(dict_settings) and datajson_size) == 0 or not channeljson_exists:
                         # Obtenemos controles del archivo ../channels/channel.json
                         needsfix = True
                         try:
@@ -723,7 +457,7 @@ def conf_tools(item):
                             # default_settings = {}
 
                         # Si _data.json necesita ser reparado o no existe...
-                        if needsfix == True or channeljson_exists == False:
+                        if needsfix or not channeljson_exists:
                             if default_settings is not None:
                                 # Creamos el channel_data.json
                                 default_settings.update(dict_settings)
@@ -748,8 +482,8 @@ def conf_tools(item):
 
                     # Si se ha establecido el estado del canal se añade a la lista
                     if needsfix is not None:
-                        if needsfix == True:
-                            if channeljson_exists == False:
+                        if needsfix:
+                            if not channeljson_exists:
                                 list_status = " - Ajustes creados"
                                 list_colour = "red"
                             else:
diff --git a/plugin.video.alfa/channels/sipeliculas.json b/plugin.video.alfa/channels/sipeliculas.json
index d7f7a1f2..d0549042 100755
--- a/plugin.video.alfa/channels/sipeliculas.json
+++ b/plugin.video.alfa/channels/sipeliculas.json
@@ -6,17 +6,6 @@
   "language": "[lat]",
   "banner": "https://s24.postimg.org/5wcznkxhv/sipeliculas.png",
   "thumbnail": "https://s23.postimg.org/adrl2k5mz/sipeliculas.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "16/01/17",
-      "description": "First version"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/submityouflicks.json b/plugin.video.alfa/channels/submityouflicks.json
index bf6daf4f..096efb75 100755
--- a/plugin.video.alfa/channels/submityouflicks.json
+++ b/plugin.video.alfa/channels/submityouflicks.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "banner": "submityouflicks.png",
   "thumbnail": "submityouflicks.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "05/08/2016",
-      "description": "Eliminado de sección películas."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/teledocumentales.json b/plugin.video.alfa/channels/teledocumentales.json
index 2c390f3e..0e3c12ea 100755
--- a/plugin.video.alfa/channels/teledocumentales.json
+++ b/plugin.video.alfa/channels/teledocumentales.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "banner": "teledocumentales.png",
   "thumbnail": "teledocumentales.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "documentary"
   ]
diff --git a/plugin.video.alfa/channels/thumbzilla.json b/plugin.video.alfa/channels/thumbzilla.json
index 0ce89ef0..5f5595f9 100644
--- a/plugin.video.alfa/channels/thumbzilla.json
+++ b/plugin.video.alfa/channels/thumbzilla.json
@@ -7,13 +7,6 @@
   "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/xthearebg.jpg",
   "thumbnail": "https://image.spreadshirtmedia.com/image-server/v1/designs/1002274824,width=178,height=178/thumbzilla-womens-white-tee-big-logo.png",
   "banner": "",
-  "version": 1,
-  "changes": [
-    {
-      "date": "07/06/17",
-      "description": "Canal Nuevo"
-    }
-  ],
    "categories": [
    "adult"
  ],
diff --git a/plugin.video.alfa/channels/torrentlocura.json b/plugin.video.alfa/channels/torrentlocura.json
index 11ea8fd8..a14b4d6a 100755
--- a/plugin.video.alfa/channels/torrentlocura.json
+++ b/plugin.video.alfa/channels/torrentlocura.json
@@ -7,13 +7,6 @@
     "banner": "torrentlocura.png",
     "thumbnail": "http://imgur.com/EWmLS3d.png",
     "fanart": "http://imgur.com/V7QZLAL.jpg",
-    "version": 1,
-    "changes": [
-        {
-            "date": "25/08/2017",
-            "description": "revamp"
-        }
-    ],
     "categories": [
         "torrent",
         "movie",
diff --git a/plugin.video.alfa/channels/tubehentai.json b/plugin.video.alfa/channels/tubehentai.json
index 49bd6fc2..85d11ee7 100755
--- a/plugin.video.alfa/channels/tubehentai.json
+++ b/plugin.video.alfa/channels/tubehentai.json
@@ -6,17 +6,6 @@
     "language": ["*"],
     "banner": "tubehentai.png",
     "thumbnail": "tubehentai.png",
-    "version": 1,
-    "changes": [
-        {
-            "date": "15/03/2017",
-            "description": "limpieza código"
-        },
-        {
-            "date": "05/08/2016",
-            "description": "Eliminado de sección películas."
-        }
-    ],
     "categories": [
         "adult"
     ],
diff --git a/plugin.video.alfa/channels/tupornotv.json b/plugin.video.alfa/channels/tupornotv.json
index 4502963d..d4fe5877 100755
--- a/plugin.video.alfa/channels/tupornotv.json
+++ b/plugin.video.alfa/channels/tupornotv.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "banner": "tupornotv.png",
   "thumbnail": "tupornotv.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "05/08/2016",
-      "description": "Eliminado de sección películas."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/tvmoviedb.json b/plugin.video.alfa/channels/tvmoviedb.json
index dfff7b67..6a09e799 100755
--- a/plugin.video.alfa/channels/tvmoviedb.json
+++ b/plugin.video.alfa/channels/tvmoviedb.json
@@ -5,21 +5,6 @@
   "adult": false,
   "language": ["*"],
   "thumbnail": "http://i.imgur.com/HA7fvgD.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "12/05/2017",
-      "description": "Corregida sección myanimelist y cambios menores"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "04/01/2017",
-      "description": "Primera version."
-    }
-  ],
   "categories": [
     "movie",
     "tvshow",
diff --git a/plugin.video.alfa/channels/ultrapeliculashd.json b/plugin.video.alfa/channels/ultrapeliculashd.json
index e9970d58..75467727 100755
--- a/plugin.video.alfa/channels/ultrapeliculashd.json
+++ b/plugin.video.alfa/channels/ultrapeliculashd.json
@@ -6,17 +6,6 @@
     "adult": false,
     "banner": "https://s9.postimg.org/5yxsq205r/ultrapeliculashd_banner.png",
     "thumbnail": "https://s13.postimg.org/d042quw9j/ultrapeliculashd.png",
-    "version": 1,
-    "changes": [
-        {
-            "date": "25/05/2017",
-            "description": "cambios esteticos"
-        },
-        {
-            "date": "09/05/2017",
-            "description": "Fix por cambio de estructra de la pagina"
-        }
-    ],
     "categories": [
         "movie"
     ],
diff --git a/plugin.video.alfa/channels/unsoloclic.json b/plugin.video.alfa/channels/unsoloclic.json
index 2494c67a..54877b68 100755
--- a/plugin.video.alfa/channels/unsoloclic.json
+++ b/plugin.video.alfa/channels/unsoloclic.json
@@ -6,17 +6,6 @@
     "language": ["cast", "lat"],
     "banner": "unsoloclic.png",
     "thumbnail": "unsoloclic.png",
-    "version": 1,
-    "changes": [
-        {
-            "date": "15/03/2017",
-            "description": "limpieza código"
-        },
-        {
-            "date": "01/07/2016",
-            "description": "Eliminado código innecesario."
-        }
-    ],
     "categories": [
         "movie",
         "tvshow"
diff --git a/plugin.video.alfa/channels/url.json b/plugin.video.alfa/channels/url.json
index 51209dc6..9c22b22b 100755
--- a/plugin.video.alfa/channels/url.json
+++ b/plugin.video.alfa/channels/url.json
@@ -4,16 +4,5 @@
   "active": false,
   "adult": false,
   "thumbnail": "url.png",
-  "banner": "url.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ]
+  "banner": "url.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/vepelis.json b/plugin.video.alfa/channels/vepelis.json
index e1c5517e..80fe71da 100755
--- a/plugin.video.alfa/channels/vepelis.json
+++ b/plugin.video.alfa/channels/vepelis.json
@@ -6,17 +6,6 @@
   "language": ["cast", "lat"],
   "banner": "vepelis.png",
   "thumbnail": "vepelis.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/vernovelasonline.json b/plugin.video.alfa/channels/vernovelasonline.json
index f861a05c..f2cf60e2 100644
--- a/plugin.video.alfa/channels/vernovelasonline.json
+++ b/plugin.video.alfa/channels/vernovelasonline.json
@@ -6,13 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "https://s16.postimg.org/g4lzydrmd/vernovelasonline1.png",
   "banner": "https://s16.postimg.org/w44nhxno5/vernovelasonline2.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "28/06/2017",
-      "description": "Primera version"
-    }
-  ],
   "categories": [
     "tvshow"
   ],
diff --git a/plugin.video.alfa/channels/verpeliculasnuevas.json b/plugin.video.alfa/channels/verpeliculasnuevas.json
index b2d502c7..428bd60f 100755
--- a/plugin.video.alfa/channels/verpeliculasnuevas.json
+++ b/plugin.video.alfa/channels/verpeliculasnuevas.json
@@ -6,29 +6,6 @@
   "language": ["cast", "lat"],
   "banner": "https://s23.postimg.org/4uyyz6w4b/verpeliculasnuevas_banner.png",
   "thumbnail": "https://s27.postimg.org/atgs5erab/verpeliculasnuevas.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "23/06/2017",
-      "description": "añadidos servidores favoritos en find_videos"
-    },
-    {
-      "date": "06/06/2017",
-      "description": "compatibilidad con AutoPlay"
-    },
-    {
-      "date": "25/05/2017",
-      "description": "cambios esteticos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "06/01/2017",
-      "description": "Release."
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channels/verpelis.json b/plugin.video.alfa/channels/verpelis.json
index d12fd5d7..83033a2f 100644
--- a/plugin.video.alfa/channels/verpelis.json
+++ b/plugin.video.alfa/channels/verpelis.json
@@ -5,17 +5,6 @@
     "adult": false,
     "language": ["cast", "lat"],
     "thumbnail": "http://imgur.com/lmYQgOu.png",
-    "version": 1,
-    "changes": [
-        {
-            "date": "26/04/2016",
-            "description": "Release"
-        },
-        {
-            "date": "28/06/2017",
-            "description": "Corrección código y algunas mejoras"
-        }
-    ],
     "categories": [
         "torrent",
         "movie",
diff --git a/plugin.video.alfa/channels/vertelenovelas.json b/plugin.video.alfa/channels/vertelenovelas.json
index 3f10d17b..c8dd2f2b 100755
--- a/plugin.video.alfa/channels/vertelenovelas.json
+++ b/plugin.video.alfa/channels/vertelenovelas.json
@@ -6,9 +6,6 @@
   "language": ["cast", "lat"],
   "thumbnail": "vertelenovelas.png",
   "banner": "vertelenovelas.png",
-  "version": 1,
-  "date": "15/02/2017",
-  "changes": "Fix findvideos.",
   "categories": [
     "tvshow"
   ],
diff --git a/plugin.video.alfa/channels/videolibrary.json b/plugin.video.alfa/channels/videolibrary.json
index 0d0f11ae..b2c541da 100755
--- a/plugin.video.alfa/channels/videolibrary.json
+++ b/plugin.video.alfa/channels/videolibrary.json
@@ -4,21 +4,6 @@
   "active": false,
   "adult": false,
   "language": ["*"],
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/16",
-      "description": "Eliminado código innecesario."
-    },
-    {
-      "date": "30/04/2016",
-      "description": "Version inicial"
-    }
-  ],
   "settings": [
     {
       "id": "update",
diff --git a/plugin.video.alfa/channels/vidz7.json b/plugin.video.alfa/channels/vidz7.json
index 00585931..eca0a7a4 100755
--- a/plugin.video.alfa/channels/vidz7.json
+++ b/plugin.video.alfa/channels/vidz7.json
@@ -6,17 +6,6 @@
   "language": ["*"],
   "banner": "https://www.dropbox.com/s/182r0wby3ohnxkc/bannermenu.jpg?dl=1",
   "thumbnail": "https://www.dropbox.com/s/7z31b4ixve2ge0l/thumbnail.png?dl=1",
-  "version": 1,
-  "changes": [
-    {
-      "date": "29/04/2017",
-      "description": "Pequeña correción en la paginación"
-    },
-    {
-      "date": "03/01/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/vseries.json b/plugin.video.alfa/channels/vseries.json
deleted file mode 100755
index 3de8186b..00000000
--- a/plugin.video.alfa/channels/vseries.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "id": "vseries",
-  "name": "V Serie",
-  "active": false,
-  "adult": false,
-  "language": ["cast", "lat"],
-  "banner": "vseries.png",
-  "thumbnail": "vseries.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/2016",
-      "description": "Eliminado código innecesario."
-    }
-  ],
-  "categories": [
-    "movie",
-    "tvshow"
-  ],
-  "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/plugin.video.alfa/channels/vseries.py b/plugin.video.alfa/channels/vseries.py
deleted file mode 100755
index 306700a6..00000000
--- a/plugin.video.alfa/channels/vseries.py
+++ /dev/null
@@ -1,320 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import jsontools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-
-DEFAULT_HEADERS = []
-DEFAULT_HEADERS.append(
-    ["User-Agent", "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; es-ES; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12"])
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, action="menuseries", title="Series", url=""))
-    itemlist.append(Item(channel=item.channel, action="peliculas", title="Películas", url="http://vserie.com/peliculas",
-                         viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar...", url="http://vserie.com/search"))
-
-    return itemlist
-
-
-def menuseries(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(
-        Item(channel=item.channel, action="novedades", title="Últimos episodios", url="http://vserie.com/series",
-             viewmode="movie"))
-    itemlist.append(
-        Item(channel=item.channel, action="series", title="Todas", url="http://vserie.com/series", viewmode="movie"))
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-
-    try:
-        if config.get_setting("zampaseriesaccount") == True:
-            login()
-
-        if item.url == "":
-            item.url = "http://vserie.com/search"
-
-        texto = texto.replace(" ", "+")
-
-        # Mete el referer en item.extra
-        post = "s=" + texto
-        data = scrapertools.cache_page(item.url, post=post)
-        data = scrapertools.find_single_match(data, '<div id="resultados">(.*?)<div id="cargando">')
-        '''
-        <div id="resultados">
-        <h1>Resultados de la Busqueda para skyfall (1)</h1>
-        <div id="lista">              <ul>                <li title="007 Skyfall" id="id-1"><a href="http://vserie.com/pelicula/2-007-skyfall"><img src="http://vserie.com/images/p_p2_s.png" alt=""></a></li>              </ul>            </div>
-        <div id="cargando"><i class="icon-spinner icon-spin"></i>Cargando más resultados</div>
-        </div>
-        '''
-        patron = '<li title="([^"]+)"[^<]+<a href="([^"]+)"><img src="([^"]+)"'
-        matches = re.compile(patron, re.DOTALL).findall(data)
-        itemlist = []
-        for scrapedtitle, scrapedurl, scrapedthumbnail in matches:
-            if "/pelicula/" in scrapedurl:
-                title = scrapedtitle
-                url = scrapedurl
-                thumbnail = scrapedthumbnail
-                plot = ""
-                itemlist.append(
-                    Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail,
-                         plot=plot, show=title))
-            else:
-                title = scrapedtitle
-                url = scrapedurl
-                thumbnail = scrapedthumbnail
-                plot = ""
-                itemlist.append(
-                    Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                         show=title))
-
-        return itemlist
-
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def novedades(item):
-    logger.info()
-
-    if config.get_setting("zampaseriesaccount") == True:
-        login()
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    data = scrapertools.find_single_match(data, 'ltimas Series Actualizadas</h2[^<]+<div id="listado">(.*?)</ul>')
-    logger.info("data=" + data)
-
-    # Extrae las entradas (carpetas)  
-    patron = '<li><a href="([^"]+)"><img src="([^"]+)[^<]+<h3>([^<]+)</h3></a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        url = urlparse.urljoin(item.url, scrapedurl)
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        plot = ""
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-        itemlist.append(
-            Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                 show=title))
-
-    return itemlist
-
-
-def series(item, data=""):
-    logger.info()
-
-    if config.get_setting("zampaseriesaccount") == True:
-        login()
-
-    # Descarga la pagina
-    if data == "":
-        if item.extra == "":
-            data = scrapertools.cache_page(item.url)
-        else:
-            data = scrapertools.cache_page(item.url, post=item.extra)
-            logger.info("data=" + data)
-
-            json_object = jsontools.load(data)
-            # {"resultado":{"40":"<li id=\"id-40\" title=\"The 100\"><a href=\"http:\/\/vserie.com\/serie\/175-the-100\"><img src=\"http:\/\/vserie.com\/images\/s_s175_s.png\" alt=\"The 100\"><\/a><\/li>","41":"<li id=\"id-41\" title=\"Teen Wolf\"><a href=\"http:\/\/vserie.com\/serie\/25-teen-wolf\"><img src=\"http:\/\/vserie.com\/images\/s_s25_s.png\" alt=\"Teen Wolf\"><\/a><\/li>","42":"<li id=\"id-42\" title=\"Surviving Jack\"><a href=\"http:\/\/vserie.com\/serie\/178-surviving-jack\"><img src=\"http:\/\/vserie.com\/images\/s_s178_s.png\" alt=\"Surviving Jack\"><\/a><\/li>","43":"<li id=\"id-43\" title=\"Supernatural\"><a href=\"http:\/\/vserie.com\/serie\/68-supernatural\"><img src=\"http:\/\/vserie.com\/images\/s_s68_s.png\" alt=\"Supernatural\"><\/a><\/li>","44":"<li id=\"id-44\" title=\"Suits\"><a href=\"http:\/\/vserie.com\/serie\/131-suits\"><img src=\"http:\/\/vserie.com\/images\/s_s131_s.png\" alt=\"Suits\"><\/a><\/li>","45":"<li id=\"id-45\" title=\"Star-Crossed\"><a href=\"http:\/\/vserie.com\/serie\/154-star-crossed\"><img src=\"http:\/\/vserie.com\/images\/s_s154_s.png\" alt=\"Star-Crossed\"><\/a><\/li>","46":"<li id=\"id-46\" title=\"Sons of Anarchy\"><a href=\"http:\/\/vserie.com\/serie\/46-sons-of-anarchy\"><img src=\"http:\/\/vserie.com\/images\/s_s46_s.png\" alt=\"Sons of Anarchy\"><\/a><\/li>","47":"<li id=\"id-47\" title=\"Sleepy Hollow\"><a href=\"http:\/\/vserie.com\/serie\/52-sleepy-hollow\"><img src=\"http:\/\/vserie.com\/images\/s_s52_s.png\" alt=\"Sleepy Hollow\"><\/a><\/li>","48":"<li id=\"id-48\" title=\"Skins\"><a href=\"http:\/\/vserie.com\/serie\/36-skins\"><img src=\"http:\/\/vserie.com\/images\/s_s36_s.png\" alt=\"Skins\"><\/a><\/li>","49":"<li id=\"id-49\" title=\"Sirens\"><a href=\"http:\/\/vserie.com\/serie\/172-sirens\"><img src=\"http:\/\/vserie.com\/images\/s_s172_s.png\" alt=\"Sirens\"><\/a><\/li>","50":"<li id=\"id-50\" title=\"Sin identidad\"><a href=\"http:\/\/vserie.com\/serie\/199-sin-identidad\"><img src=\"http:\/\/vserie.com\/images\/s_s199_s.png\" alt=\"Sin identidad\"><\/a><\/li>","51":"<li id=\"id-51\" title=\"Silicon Valley\"><a href=\"http:\/\/vserie.com\/serie\/179-silicon-valley\"><img src=\"http:\/\/vserie.com\/images\/s_s179_s.png\" alt=\"Silicon Valley\"><\/a><\/li>","52":"<li id=\"id-52\" title=\"Siberia\"><a href=\"http:\/\/vserie.com\/serie\/39-siberia\"><img src=\"http:\/\/vserie.com\/images\/s_s39_s.png\" alt=\"Siberia\"><\/a><\/li>","53":"<li id=\"id-53\" title=\"Sherlock\"><a href=\"http:\/\/vserie.com\/serie\/103-sherlock\"><img src=\"http:\/\/vserie.com\/images\/s_s103_s.png\" alt=\"Sherlock\"><\/a><\/li>","54":"<li id=\"id-54\" title=\"Shameless\"><a href=\"http:\/\/vserie.com\/serie\/142-shameless\"><img src=\"http:\/\/vserie.com\/images\/s_s142_s.png\" alt=\"Shameless\"><\/a><\/li>","55":"<li id=\"id-55\" title=\"Salem\"><a href=\"http:\/\/vserie.com\/serie\/186-salem\"><img src=\"http:\/\/vserie.com\/images\/s_s186_s.png\" alt=\"Salem\"><\/a><\/li>","56":"<li id=\"id-56\" title=\"Rosemary&#039;s Baby (La semilla del diablo)\"><a href=\"http:\/\/vserie.com\/serie\/198-rosemary-039-s-baby-la-semilla-del-diablo\"><img src=\"http:\/\/vserie.com\/images\/s_s198_s.png\" alt=\"Rosemary&#039;s Baby (La semilla del diablo)\"><\/a><\/li>","57":"<li id=\"id-57\" title=\"Ripper Street\"><a href=\"http:\/\/vserie.com\/serie\/100-ripper-street\"><img src=\"http:\/\/vserie.com\/images\/s_s100_s.png\" alt=\"Ripper Street\"><\/a><\/li>","58":"<li id=\"id-58\" title=\"Revolution\"><a href=\"http:\/\/vserie.com\/serie\/62-revolution\"><img src=\"http:\/\/vserie.com\/images\/s_s62_s.png\" alt=\"Revolution\"><\/a><\/li>","59":"<li id=\"id-59\" title=\"Revenge\"><a href=\"http:\/\/vserie.com\/serie\/67-revenge\"><img src=\"http:\/\/vserie.com\/images\/s_s67_s.png\" alt=\"Revenge\"><\/a><\/li>","60":"<li id=\"id-60\" title=\"Resurrection\"><a href=\"http:\/\/vserie.com\/serie\/167-resurrection\"><img src=\"http:\/\/vserie.com\/images\/s_s167_s.png\" alt=\"Resurrection\"><\/a><\/li>","61":"<li id=\"id-61\" title=\"Remedy\"><a href=\"http:\/\/vserie.com\/serie\/161-remedy\"><img src=\"http:\/\/vserie.com\/images\/s_s161_s.png\" alt=\"Remedy\"><\/a><\/li>","62":"<li id=\"id-62\" title=\"Reign\"><a href=\"http:\/\/vserie.com\/serie\/92-reign\"><img src=\"http:\/\/vserie.com\/images\/s_s92_s.png\" alt=\"Reign\"><\/a><\/li>","63":"<li id=\"id-63\" title=\"Ray Donovan\"><a href=\"http:\/\/vserie.com\/serie\/44-ray-donovan\"><img src=\"http:\/\/vserie.com\/images\/s_s44_s.png\" alt=\"Ray Donovan\"><\/a><\/li>","64":"<li id=\"id-64\" title=\"Ravenswood\"><a href=\"http:\/\/vserie.com\/serie\/93-ravenswood\"><img src=\"http:\/\/vserie.com\/images\/s_s93_s.png\" alt=\"Ravenswood\"><\/a><\/li>","65":"<li id=\"id-65\" title=\"Psych\"><a href=\"http:\/\/vserie.com\/serie\/203-psych\"><img src=\"http:\/\/vserie.com\/images\/s_s203_s.png\" alt=\"Psych\"><\/a><\/li>","66":"<li id=\"id-66\" title=\"Pretty Little Liars (Peque&ntilde;as mentirosas)\"><a href=\"http:\/\/vserie.com\/serie\/38-pretty-little-liars-peque-ntilde-as-mentirosas\"><img src=\"http:\/\/vserie.com\/images\/s_s38_s.png\" alt=\"Pretty Little Liars (Peque&ntilde;as mentirosas)\"><\/a><\/li>","67":"<li id=\"id-67\" title=\"Power\"><a href=\"http:\/\/vserie.com\/serie\/205-power\"><img src=\"http:\/\/vserie.com\/images\/s_s205_s.png\" alt=\"Power\"><\/a><\/li>","68":"<li id=\"id-68\" title=\"Person of Interest\"><a href=\"http:\/\/vserie.com\/serie\/59-person-of-interest\"><img src=\"http:\/\/vserie.com\/images\/s_s59_s.png\" alt=\"Person of Interest\"><\/a><\/li>","69":"<li id=\"id-69\" title=\"Perdidos (Lost)\"><a href=\"http:\/\/vserie.com\/serie\/112-perdidos-lost\"><img src=\"http:\/\/vserie.com\/images\/s_s112_s.png\" alt=\"Perdidos (Lost)\"><\/a><\/li>","70":"<li id=\"id-70\" title=\"Perception\"><a href=\"http:\/\/vserie.com\/serie\/164-perception\"><img src=\"http:\/\/vserie.com\/images\/s_s164_s.png\" alt=\"Perception\"><\/a><\/li>","71":"<li id=\"id-71\" title=\"Penny Dreadful\"><a href=\"http:\/\/vserie.com\/serie\/195-penny-dreadful\"><img src=\"http:\/\/vserie.com\/images\/s_s195_s.png\" alt=\"Penny Dreadful\"><\/a><\/li>","72":"<li id=\"id-72\" title=\"Peaky Blinders\"><a href=\"http:\/\/vserie.com\/serie\/97-peaky-blinders\"><img src=\"http:\/\/vserie.com\/images\/s_s97_s.png\" alt=\"Peaky Blinders\"><\/a><\/li>","73":"<li id=\"id-73\" title=\"Orphan Black\"><a href=\"http:\/\/vserie.com\/serie\/158-orphan-black\"><img src=\"http:\/\/vserie.com\/images\/s_s158_s.png\" alt=\"Orphan Black\"><\/a><\/li>","74":"<li id=\"id-74\" title=\"Orange Is the New Black\"><a href=\"http:\/\/vserie.com\/serie\/13-orange-is-the-new-black\"><img src=\"http:\/\/vserie.com\/images\/s_s13_s.png\" alt=\"Orange Is the New Black\"><\/a><\/li>"}
-            rows = json_object["resultado"]
-
-            data = ""
-            for row in rows:
-                data = data + rows[row]
-
-            logger.info("data=" + repr(data))
-
-    # Extrae las entradas (carpetas)  
-    patron = 'title="([^"]+)"[^<]+<a href="(http.//vserie.com/serie/[^"]+)"><img src="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedtitle, scrapedurl, scrapedthumbnail in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        url = urlparse.urljoin(item.url, scrapedurl)
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        plot = ""
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-        itemlist.append(
-            Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                 show=title))
-
-    if not "/paginador/" in item.url:
-        itemlist.append(Item(channel=item.channel, action="series", title=">> Página siguiente",
-                             url="http://vserie.com/api/paginador/", extra="tipo=series&last=39", viewmode="movie"))
-    else:
-        actual = scrapertools.find_single_match(item.extra, "last\=(\d+)")
-        siguiente = str(int(actual) + 35)
-        itemlist.append(Item(channel=item.channel, action="series", title=">> Página siguiente",
-                             url="http://vserie.com/api/paginador/", extra="tipo=series&last=" + siguiente,
-                             viewmode="movie"))
-
-    return itemlist
-
-
-def peliculas(item, data=""):
-    logger.info()
-
-    if config.get_setting("zampaseriesaccount") == True:
-        login()
-
-    # Descarga la pagina
-    if data == "":
-        if item.extra == "":
-            data = scrapertools.cache_page(item.url)
-        else:
-            data = scrapertools.cache_page(item.url, post=item.extra)
-            # logger.info("data="+data)
-
-            json_object = jsontools.load(data)
-            # {"resultado":{"40":"<li id=\"id-40\" title=\"The 100\"><a href=\"http:\/\/vserie.com\/serie\/175-the-100\"><img src=\"http:\/\/vserie.com\/images\/s_s175_s.png\" alt=\"The 100\"><\/a><\/li>","41":"<li id=\"id-41\" title=\"Teen Wolf\"><a href=\"http:\/\/vserie.com\/serie\/25-teen-wolf\"><img src=\"http:\/\/vserie.com\/images\/s_s25_s.png\" alt=\"Teen Wolf\"><\/a><\/li>","42":"<li id=\"id-42\" title=\"Surviving Jack\"><a href=\"http:\/\/vserie.com\/serie\/178-surviving-jack\"><img src=\"http:\/\/vserie.com\/images\/s_s178_s.png\" alt=\"Surviving Jack\"><\/a><\/li>","43":"<li id=\"id-43\" title=\"Supernatural\"><a href=\"http:\/\/vserie.com\/serie\/68-supernatural\"><img src=\"http:\/\/vserie.com\/images\/s_s68_s.png\" alt=\"Supernatural\"><\/a><\/li>","44":"<li id=\"id-44\" title=\"Suits\"><a href=\"http:\/\/vserie.com\/serie\/131-suits\"><img src=\"http:\/\/vserie.com\/images\/s_s131_s.png\" alt=\"Suits\"><\/a><\/li>","45":"<li id=\"id-45\" title=\"Star-Crossed\"><a href=\"http:\/\/vserie.com\/serie\/154-star-crossed\"><img src=\"http:\/\/vserie.com\/images\/s_s154_s.png\" alt=\"Star-Crossed\"><\/a><\/li>","46":"<li id=\"id-46\" title=\"Sons of Anarchy\"><a href=\"http:\/\/vserie.com\/serie\/46-sons-of-anarchy\"><img src=\"http:\/\/vserie.com\/images\/s_s46_s.png\" alt=\"Sons of Anarchy\"><\/a><\/li>","47":"<li id=\"id-47\" title=\"Sleepy Hollow\"><a href=\"http:\/\/vserie.com\/serie\/52-sleepy-hollow\"><img src=\"http:\/\/vserie.com\/images\/s_s52_s.png\" alt=\"Sleepy Hollow\"><\/a><\/li>","48":"<li id=\"id-48\" title=\"Skins\"><a href=\"http:\/\/vserie.com\/serie\/36-skins\"><img src=\"http:\/\/vserie.com\/images\/s_s36_s.png\" alt=\"Skins\"><\/a><\/li>","49":"<li id=\"id-49\" title=\"Sirens\"><a href=\"http:\/\/vserie.com\/serie\/172-sirens\"><img src=\"http:\/\/vserie.com\/images\/s_s172_s.png\" alt=\"Sirens\"><\/a><\/li>","50":"<li id=\"id-50\" title=\"Sin identidad\"><a href=\"http:\/\/vserie.com\/serie\/199-sin-identidad\"><img src=\"http:\/\/vserie.com\/images\/s_s199_s.png\" alt=\"Sin identidad\"><\/a><\/li>","51":"<li id=\"id-51\" title=\"Silicon Valley\"><a href=\"http:\/\/vserie.com\/serie\/179-silicon-valley\"><img src=\"http:\/\/vserie.com\/images\/s_s179_s.png\" alt=\"Silicon Valley\"><\/a><\/li>","52":"<li id=\"id-52\" title=\"Siberia\"><a href=\"http:\/\/vserie.com\/serie\/39-siberia\"><img src=\"http:\/\/vserie.com\/images\/s_s39_s.png\" alt=\"Siberia\"><\/a><\/li>","53":"<li id=\"id-53\" title=\"Sherlock\"><a href=\"http:\/\/vserie.com\/serie\/103-sherlock\"><img src=\"http:\/\/vserie.com\/images\/s_s103_s.png\" alt=\"Sherlock\"><\/a><\/li>","54":"<li id=\"id-54\" title=\"Shameless\"><a href=\"http:\/\/vserie.com\/serie\/142-shameless\"><img src=\"http:\/\/vserie.com\/images\/s_s142_s.png\" alt=\"Shameless\"><\/a><\/li>","55":"<li id=\"id-55\" title=\"Salem\"><a href=\"http:\/\/vserie.com\/serie\/186-salem\"><img src=\"http:\/\/vserie.com\/images\/s_s186_s.png\" alt=\"Salem\"><\/a><\/li>","56":"<li id=\"id-56\" title=\"Rosemary&#039;s Baby (La semilla del diablo)\"><a href=\"http:\/\/vserie.com\/serie\/198-rosemary-039-s-baby-la-semilla-del-diablo\"><img src=\"http:\/\/vserie.com\/images\/s_s198_s.png\" alt=\"Rosemary&#039;s Baby (La semilla del diablo)\"><\/a><\/li>","57":"<li id=\"id-57\" title=\"Ripper Street\"><a href=\"http:\/\/vserie.com\/serie\/100-ripper-street\"><img src=\"http:\/\/vserie.com\/images\/s_s100_s.png\" alt=\"Ripper Street\"><\/a><\/li>","58":"<li id=\"id-58\" title=\"Revolution\"><a href=\"http:\/\/vserie.com\/serie\/62-revolution\"><img src=\"http:\/\/vserie.com\/images\/s_s62_s.png\" alt=\"Revolution\"><\/a><\/li>","59":"<li id=\"id-59\" title=\"Revenge\"><a href=\"http:\/\/vserie.com\/serie\/67-revenge\"><img src=\"http:\/\/vserie.com\/images\/s_s67_s.png\" alt=\"Revenge\"><\/a><\/li>","60":"<li id=\"id-60\" title=\"Resurrection\"><a href=\"http:\/\/vserie.com\/serie\/167-resurrection\"><img src=\"http:\/\/vserie.com\/images\/s_s167_s.png\" alt=\"Resurrection\"><\/a><\/li>","61":"<li id=\"id-61\" title=\"Remedy\"><a href=\"http:\/\/vserie.com\/serie\/161-remedy\"><img src=\"http:\/\/vserie.com\/images\/s_s161_s.png\" alt=\"Remedy\"><\/a><\/li>","62":"<li id=\"id-62\" title=\"Reign\"><a href=\"http:\/\/vserie.com\/serie\/92-reign\"><img src=\"http:\/\/vserie.com\/images\/s_s92_s.png\" alt=\"Reign\"><\/a><\/li>","63":"<li id=\"id-63\" title=\"Ray Donovan\"><a href=\"http:\/\/vserie.com\/serie\/44-ray-donovan\"><img src=\"http:\/\/vserie.com\/images\/s_s44_s.png\" alt=\"Ray Donovan\"><\/a><\/li>","64":"<li id=\"id-64\" title=\"Ravenswood\"><a href=\"http:\/\/vserie.com\/serie\/93-ravenswood\"><img src=\"http:\/\/vserie.com\/images\/s_s93_s.png\" alt=\"Ravenswood\"><\/a><\/li>","65":"<li id=\"id-65\" title=\"Psych\"><a href=\"http:\/\/vserie.com\/serie\/203-psych\"><img src=\"http:\/\/vserie.com\/images\/s_s203_s.png\" alt=\"Psych\"><\/a><\/li>","66":"<li id=\"id-66\" title=\"Pretty Little Liars (Peque&ntilde;as mentirosas)\"><a href=\"http:\/\/vserie.com\/serie\/38-pretty-little-liars-peque-ntilde-as-mentirosas\"><img src=\"http:\/\/vserie.com\/images\/s_s38_s.png\" alt=\"Pretty Little Liars (Peque&ntilde;as mentirosas)\"><\/a><\/li>","67":"<li id=\"id-67\" title=\"Power\"><a href=\"http:\/\/vserie.com\/serie\/205-power\"><img src=\"http:\/\/vserie.com\/images\/s_s205_s.png\" alt=\"Power\"><\/a><\/li>","68":"<li id=\"id-68\" title=\"Person of Interest\"><a href=\"http:\/\/vserie.com\/serie\/59-person-of-interest\"><img src=\"http:\/\/vserie.com\/images\/s_s59_s.png\" alt=\"Person of Interest\"><\/a><\/li>","69":"<li id=\"id-69\" title=\"Perdidos (Lost)\"><a href=\"http:\/\/vserie.com\/serie\/112-perdidos-lost\"><img src=\"http:\/\/vserie.com\/images\/s_s112_s.png\" alt=\"Perdidos (Lost)\"><\/a><\/li>","70":"<li id=\"id-70\" title=\"Perception\"><a href=\"http:\/\/vserie.com\/serie\/164-perception\"><img src=\"http:\/\/vserie.com\/images\/s_s164_s.png\" alt=\"Perception\"><\/a><\/li>","71":"<li id=\"id-71\" title=\"Penny Dreadful\"><a href=\"http:\/\/vserie.com\/serie\/195-penny-dreadful\"><img src=\"http:\/\/vserie.com\/images\/s_s195_s.png\" alt=\"Penny Dreadful\"><\/a><\/li>","72":"<li id=\"id-72\" title=\"Peaky Blinders\"><a href=\"http:\/\/vserie.com\/serie\/97-peaky-blinders\"><img src=\"http:\/\/vserie.com\/images\/s_s97_s.png\" alt=\"Peaky Blinders\"><\/a><\/li>","73":"<li id=\"id-73\" title=\"Orphan Black\"><a href=\"http:\/\/vserie.com\/serie\/158-orphan-black\"><img src=\"http:\/\/vserie.com\/images\/s_s158_s.png\" alt=\"Orphan Black\"><\/a><\/li>","74":"<li id=\"id-74\" title=\"Orange Is the New Black\"><a href=\"http:\/\/vserie.com\/serie\/13-orange-is-the-new-black\"><img src=\"http:\/\/vserie.com\/images\/s_s13_s.png\" alt=\"Orange Is the New Black\"><\/a><\/li>"}
-            rows = json_object["resultado"]
-
-            data = ""
-            for row in rows:
-                # logger.info("rows[row]="+rows[row])
-                data = data + rows[row]
-
-            logger.info("data=" + repr(data))
-
-    # Extrae las entradas (carpetas)  
-    patron = 'title="([^"]+)"[^<]+<a href="(http.//vserie.com/pelicula/[^"]+)"><img src="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedtitle, scrapedurl, scrapedthumbnail in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        url = urlparse.urljoin(item.url, scrapedurl)
-        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-        plot = ""
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-        itemlist.append(
-            Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                 show=title))
-
-    if not "/paginador/" in item.url:
-        itemlist.append(Item(channel=item.channel, action="peliculas", title=">> Página siguiente",
-                             url="http://vserie.com/api/paginador/", extra="tipo=peliculas&last=40", viewmode="movie"))
-    else:
-        actual = scrapertools.find_single_match(item.extra, "last\=(\d+)")
-        siguiente = str(int(actual) + 35)
-        itemlist.append(Item(channel=item.channel, action="peliculas", title=">> Página siguiente",
-                             url="http://vserie.com/api/paginador/", extra="tipo=peliculas&last=" + siguiente,
-                             viewmode="movie"))
-
-    return itemlist
-
-
-def episodios(item):
-    logger.info()
-
-    if config.get_setting("zampaseriesaccount") == True:
-        login()
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    data = scrapertools.find_single_match(data, '<div id="listado">(.*?)</ul>');
-    logger.info("data=" + data)
-
-    # Extrae las entradas (carpetas)  
-    patron = '<a href="([^"]+)">([^<]+)</a>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for scrapedurl, scrapedtitle in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        url = urlparse.urljoin(item.url, scrapedurl)
-        thumbnail = ""
-        plot = ""
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-        itemlist.append(
-            Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail, plot=plot,
-                 show=item.show))
-
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-
-    if config.get_setting("zampaseriesaccount") == True:
-        login()
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    # logger.info("data="+data)
-
-    # Extrae las entradas (carpetas)  
-    patron = '<tr[^<]+'
-    patron += '<td>([^<]*)</td[^<]+'
-    patron += '<td>([^<]*)</td[^<]+'
-    patron += '<td>([^<]*)</td[^<]+'
-    patron += '<td>([^<]*)</td[^<]+'
-    patron += '<td>[^<]*</td[^<]+'
-    patron += '<td>[^<]*</td[^<]+'
-    patron += '<td class="descarga"><a href="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    itemlist = []
-
-    for nombre_servidor, idioma, subs, calidad, scrapedurl in matches:
-        if subs.strip() == "":
-            subtitulos = ""
-        else:
-            subtitulos = scrapertools.htmlclean(" sub " + subs)
-        title = "Ver en " + nombre_servidor + " (" + scrapertools.htmlclean(
-            idioma) + subtitulos + ") (Calidad " + calidad.strip() + ")"
-        url = urlparse.urljoin(item.url, scrapedurl)
-        thumbnail = ""
-        plot = ""
-        logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-        itemlist.append(Item(channel=item.channel, action="play", title=title, url=url, extra=item.url, folder=False))
-
-    return itemlist
-
-
-def play(item):
-    logger.info("url=" + item.url)
-
-    if config.get_setting("zampaseriesaccount") == True:
-        login()
-
-    headers = DEFAULT_HEADERS[:]
-    headers.append(["Referer", item.extra])
-
-    '''
-    21:32:07 T:4560547840  NOTICE: 'GET /serie/104-1x01-sincronizado/temporada-1/capitulo-1/17088" rel="nofollow" target="_blank" class="btn btn-success HTTP/1.1\r\nAccept-Encoding: identity\r\nReferer: http://vserie.com/serie/104-1x01-sincronizado/temporada-1/capitulo-1\r\nHost: vserie.com\r\nCookie: PHPSESSID=fed3f2fbe02705b186646e0a5b4692b8\r\nConnection: close\r\nUser-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; es-ES; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12\r\n\r\n'
-    '''
-    media_url = scrapertools.downloadpage(item.url, header_to_get="location", follow_redirects=False, headers=headers)
-    logger.info("media_url=" + media_url)
-
-    itemlist = servertools.find_video_items(data=media_url)
-
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = item.channel
-
-    return itemlist
diff --git a/plugin.video.alfa/channels/wopelis.json b/plugin.video.alfa/channels/wopelis.json
index dfe6ffbb..04110e74 100755
--- a/plugin.video.alfa/channels/wopelis.json
+++ b/plugin.video.alfa/channels/wopelis.json
@@ -7,21 +7,10 @@
   "banner": "https://github.com/master-1970/resources/raw/master/images/bannermenu/wopelis.png",
   "fanart": "https://github.com/master-1970/resources/raw/master/images/fanart/wopelis.png",
   "thumbnail": "https://github.com/master-1970/resources/raw/master/images/squares/wopelis.png",
-  "version": 1,
   "categories": [
     "movie",
     "tvshow"
   ],
-  "changes": [
-    {
-      "date": "23/05/17",
-      "description": "Reparado findvideos, añadidos enlaces descargas"
-    },
-    {
-      "date": "27/03/16",
-      "description": "Version inicial"
-    }
-  ],
   "settings": [
     {
       "id": "include_in_global_search",
diff --git a/plugin.video.alfa/channels/x18hentai.json b/plugin.video.alfa/channels/x18hentai.json
index 59e75360..e1459434 100755
--- a/plugin.video.alfa/channels/x18hentai.json
+++ b/plugin.video.alfa/channels/x18hentai.json
@@ -6,20 +6,9 @@
   "language": ["*"],
   "banner": "https://s32.postimg.org/lafs9vgxh/18hentaionline_banner.png",
   "thumbnail": "https://s32.postimg.org/fui7jdg9x/18hentaionline.png",
-  "version": 1,
   "categories": [
     "adult"
   ],
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "04/01/2017",
-      "description": "Release."
-    }
-  ],
   "settings": [
     {
       "id": "include_in_global_search",
diff --git a/plugin.video.alfa/channels/xdvideos.json b/plugin.video.alfa/channels/xdvideos.json
index 50b5ce23..2aa4ab6c 100755
--- a/plugin.video.alfa/channels/xdvideos.json
+++ b/plugin.video.alfa/channels/xdvideos.json
@@ -5,13 +5,6 @@
   "adult": false,
   "language": ["lat"],
   "thumbnail": "http://i.imgur.com/vKcZxXS.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "18/05/2017",
-      "description": "Primera Version"
-    }
-  ],
   "categories": [
     "tvshow"
   ]
diff --git a/plugin.video.alfa/channels/xhamster.json b/plugin.video.alfa/channels/xhamster.json
index e2b31355..b287a2ae 100755
--- a/plugin.video.alfa/channels/xhamster.json
+++ b/plugin.video.alfa/channels/xhamster.json
@@ -6,21 +6,6 @@
   "language": ["*"],
   "banner": "xhamster.png",
   "thumbnail": "xhamster.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "03/06/2017",
-      "description": "añadido soporte multiples calidades"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "05/08/2016",
-      "description": "Eliminado de sección películas."
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/xtheatre.json b/plugin.video.alfa/channels/xtheatre.json
index b3cbe0d3..9e2184fa 100644
--- a/plugin.video.alfa/channels/xtheatre.json
+++ b/plugin.video.alfa/channels/xtheatre.json
@@ -7,13 +7,6 @@
   "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/xthearebg.jpg",
   "thumbnail": "https://xtheatre.net/wp-content/uploads/xtlogo.jpg",
   "banner": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/xthearebm.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "07/06/17",
-      "description": "Canal Nuevo"
-    }
-  ],
    "categories": [
    "adult"
  ],
diff --git a/plugin.video.alfa/channels/yaske.json b/plugin.video.alfa/channels/yaske.json
index e46ecee0..a28e4e4f 100644
--- a/plugin.video.alfa/channels/yaske.json
+++ b/plugin.video.alfa/channels/yaske.json
@@ -7,41 +7,6 @@
   "banner": "yaske.png",
   "fanart": "https://github.com/master-1970/resources/raw/master/images/fanart/yaske.png",
   "thumbnail": "yaske.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "27/06/17",
-      "description": "Desactivar por falta de contenidos"
-    },
-    {
-      "date": "04/06/17",
-      "description": "Desactivar por falta de contenidos"
-    },
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/02/17",
-      "description": "Añadir imagenes, sinopsis, etc..."
-    },
-    {
-      "date": "18/01/17",
-      "description": "Uso de httptools"
-    },
-    {
-      "date": "12/12/16",
-      "description": "Cambios en la web"
-    },
-    {
-      "date": "01/07/16",
-      "description": "Eliminado código innecesario."
-    },
-    {
-      "date": "29/04/16",
-      "description": "Adaptar a Novedades Peliculas e Infantiles"
-    }
-  ],
   "categories": [
     "direct",
     "movie"
diff --git a/plugin.video.alfa/channels/yespornplease.json b/plugin.video.alfa/channels/yespornplease.json
index 674d0d1c..f9994183 100644
--- a/plugin.video.alfa/channels/yespornplease.json
+++ b/plugin.video.alfa/channels/yespornplease.json
@@ -6,13 +6,6 @@
   "language": ["*"],
   "thumbnail": "yespornplease.png",
   "banner": "yespornplease.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "27/08/2017",
-      "description": "Canal creado"
-    }
-  ],
   "categories": [
     "adult"
   ],
diff --git a/plugin.video.alfa/channels/zentorrents.json b/plugin.video.alfa/channels/zentorrents.json
index 163d220d..823703f8 100755
--- a/plugin.video.alfa/channels/zentorrents.json
+++ b/plugin.video.alfa/channels/zentorrents.json
@@ -6,25 +6,6 @@
     "language": ["cast"],
     "banner": "zentorrents.png",
     "thumbnail": "http://s6.postimg.org/9zv90yjip/zentorrentlogo.jpg",
-    "version": 1,
-    "changes": [
-        {
-            "date": "07/12/2016",
-            "description": "Correciones código. Adaptación a Infoplus"
-        },
-        {
-            "date": "03/04/2017",
-            "description": "Migración a Httptools"
-        },
-        {
-            "date": "30/04/2017",
-            "description": "Correción cambios web"
-        },
-        {
-            "date": "28/06/2017",
-            "description": "Corrección código y algunas mejoras"
-        }
-    ],
     "categories": [
         "torrent",
         "movie",
diff --git a/plugin.video.alfa/channels/zpeliculas.json b/plugin.video.alfa/channels/zpeliculas.json
index 8478ece5..10ad062f 100755
--- a/plugin.video.alfa/channels/zpeliculas.json
+++ b/plugin.video.alfa/channels/zpeliculas.json
@@ -6,21 +6,6 @@
   "language": ["cast", "lat"],
   "banner": "zpeliculas.png",
   "thumbnail": "zpeliculas.png",
-  "version": 1,
-  "changes": [
-    {
-      "date": "15/03/2017",
-      "description": "limpieza código"
-    },
-    {
-      "date": "01/07/16",
-      "description": "Eliminado código innecesario."
-    },
-    {
-      "date": "29/04/16",
-      "description": "Adaptar a Buscador global y Novedades Peliculas e Infantiles"
-    }
-  ],
   "categories": [
     "movie"
   ],
diff --git a/plugin.video.alfa/channelselector.py b/plugin.video.alfa/channelselector.py
index b39534aa..513af942 100644
--- a/plugin.video.alfa/channelselector.py
+++ b/plugin.video.alfa/channelselector.py
@@ -177,8 +177,7 @@ def filterchannels(category, view="thumb_"):
             channelslist.append(Item(title=channel_parameters["title"], channel=channel_parameters["channel"],
                                      action="mainlist", thumbnail=channel_parameters["thumbnail"],
                                      fanart=channel_parameters["fanart"], category=channel_parameters["title"],
-                                     language=channel_parameters["language"], viewmode="list",
-                                     version=channel_parameters["version"], context=context))
+                                     language=channel_parameters["language"], viewmode="list", context=context))
 
         except:
             logger.error("Se ha producido un error al leer los datos del canal '%s'" % channel)
diff --git a/plugin.video.alfa/core/api.py b/plugin.video.alfa/core/api.py
deleted file mode 100755
index cf56d15c..00000000
--- a/plugin.video.alfa/core/api.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-# Client for api.xxxxxxxxxxxxx
-# ------------------------------------------------------------
-
-import urllib
-
-import jsontools
-import scrapertools
-from platformcode import config, logger
-
-MAIN_URL = ""
-API_KEY = "nzgJy84P9w54H2w"
-DEFAULT_HEADERS = [["User-Agent", config.PLUGIN_NAME + " " + config.get_platform()]]
-
-
-# ---------------------------------------------------------------------------------------------------------
-#  Common function for API calls
-# ---------------------------------------------------------------------------------------------------------
-
-# Make a remote call using post, ensuring api key is here
-def remote_call(url, parameters={}, require_session=True):
-    logger.info("url=" + url + ", parameters=" + repr(parameters))
-
-    if not url.startswith("http"):
-        url = MAIN_URL + "/" + url
-
-    if not "api_key" in parameters:
-        parameters["api_key"] = API_KEY
-
-    # Add session token if not here
-    # if not "s" in parameters and require_session:
-    #    parameters["s"] = get_session_token()
-
-    headers = DEFAULT_HEADERS
-    post = urllib.urlencode(parameters)
-
-    response_body = scrapertools.downloadpage(url, post, headers)
-
-    return jsontools.load(response_body)
-
-
-# ---------------------------------------------------------------------------------------------------------
-#  Plugin service calls
-# ---------------------------------------------------------------------------------------------------------
-
-def plugins_get_all_packages():
-    logger.info()
-
-    parameters = {"plugin": config.PLUGIN_NAME, "platform": config.get_platform()}
-    return remote_call("plugins/get_all_packages.php", parameters)
-
-
-def plugins_get_latest_packages():
-    logger.info()
-
-    parameters = {"plugin": config.PLUGIN_NAME, "platform": config.get_platform()}
-    return remote_call("plugins/get_latest_packages.php", parameters)
diff --git a/plugin.video.alfa/core/channeltools.py b/plugin.video.alfa/core/channeltools.py
index 967ce790..b37dcd39 100755
--- a/plugin.video.alfa/core/channeltools.py
+++ b/plugin.video.alfa/core/channeltools.py
@@ -100,17 +100,7 @@ def get_channel_parameters(channel_name):
                         if sys.version_info < tuple(map(int, (python_condition.split(".")))):
                             python_compatible = False
 
-                    # compatible addon_version
-                    addon_version_compatible = True
-                    if 'addon_version' in channel_parameters["compatible"]:
-                        import versiontools
-                        addon_version_condition = channel_parameters["compatible"]['addon_version']
-                        addon_version = int(addon_version_condition.replace(".", "").ljust(len(str(
-                            versiontools.get_current_plugin_version())), '0'))
-                        if versiontools.get_current_plugin_version() < addon_version:
-                            addon_version_compatible = False
-
-                    channel_parameters["compatible"] = python_compatible and addon_version_compatible
+                    channel_parameters["compatible"] = python_compatible
                 else:
                     channel_parameters["compatible"] = True
 
@@ -284,41 +274,3 @@ def set_channel_setting(name, value, channel):
         return None
 
     return value
-
-
-def get_channel_module(channel_name, package="channels"):
-    # Sustituye al que hay en servertools.py ...
-    # ...pero añade la posibilidad de incluir un paquete diferente de "channels"
-    if "." not in channel_name:
-        channel_module = __import__('%s.%s' % (package, channel_name), None, None, ['%s.%s' % (package, channel_name)])
-    else:
-        channel_module = __import__(channel_name, None, None, [channel_name])
-    return channel_module
-
-
-def get_channel_remote_url(channel_name):
-    channel_parameters = get_channel_parameters(channel_name)
-    remote_channel_url = channel_parameters["update_url"] + channel_name + ".py"
-    remote_version_url = channel_parameters["update_url"] + channel_name + ".json"
-
-    logger.info("remote_channel_url=" + remote_channel_url)
-    logger.info("remote_version_url=" + remote_version_url)
-
-    return remote_channel_url, remote_version_url
-
-
-def get_channel_local_path(channel_name):
-    if channel_name != "channelselector":
-        local_channel_path = os.path.join(config.get_runtime_path(), 'channels', channel_name + ".py")
-        local_version_path = os.path.join(config.get_runtime_path(), 'channels', channel_name + ".json")
-        local_compiled_path = os.path.join(config.get_runtime_path(), 'channels', channel_name + ".pyo")
-    else:
-        local_channel_path = os.path.join(config.get_runtime_path(), channel_name + ".py")
-        local_version_path = os.path.join(config.get_runtime_path(), channel_name + ".json")
-        local_compiled_path = os.path.join(config.get_runtime_path(), channel_name + ".pyo")
-
-    logger.info("local_channel_path=" + local_channel_path)
-    logger.info("local_version_path=" + local_version_path)
-    logger.info("local_compiled_path=" + local_compiled_path)
-
-    return local_channel_path, local_version_path, local_compiled_path
diff --git a/plugin.video.alfa/core/scrapertools.py b/plugin.video.alfa/core/scrapertools.py
index 86b97cb5..d82c0638 100755
--- a/plugin.video.alfa/core/scrapertools.py
+++ b/plugin.video.alfa/core/scrapertools.py
@@ -29,19 +29,19 @@ def downloadpage(url, post=None, headers=None, follow_redirects=True, timeout=No
         return response.data
 
 
-def downloadpageWithResult(url, post=None, headers=None, follow_redirects=True, timeout=None, header_to_get=None):
-    response = httptools.downloadpage(url, post=post, headers=headers, follow_redirects=follow_redirects,
-                                      timeout=timeout)
-
-    if header_to_get:
-        return response.headers.get(header_to_get)
-    else:
-        return response.data, response.code
+# def downloadpageWithResult(url, post=None, headers=None, follow_redirects=True, timeout=None, header_to_get=None):
+#     response = httptools.downloadpage(url, post=post, headers=headers, follow_redirects=follow_redirects,
+#                                       timeout=timeout)
+#
+#     if header_to_get:
+#         return response.headers.get(header_to_get)
+#     else:
+#         return response.data, response.code
 
 
-def downloadpageWithoutCookies(url):
-    response = httptools.downloadpage(url, cookies=False)
-    return response.data
+# def downloadpageWithoutCookies(url):
+#     response = httptools.downloadpage(url, cookies=False)
+#     return response.data
 
 
 def downloadpageGzip(url):
@@ -60,9 +60,9 @@ def get_header_from_response(url, header_to_get="", post=None, headers=None):
     return response.headers.get(header_to_get)
 
 
-def get_headers_from_response(url, post=None, headers=None):
-    response = httptools.downloadpage(url, post=post, headers=headers, only_headers=True)
-    return response.headers.items()
+# def get_headers_from_response(url, post=None, headers=None):
+#     response = httptools.downloadpage(url, post=post, headers=headers, only_headers=True)
+#     return response.headers.items()
 
 
 def read_body_and_headers(url, post=None, headers=None, follow_redirects=False, timeout=None):
@@ -71,10 +71,10 @@ def read_body_and_headers(url, post=None, headers=None, follow_redirects=False,
     return response.data, response.headers
 
 
-def anti_cloudflare(url, host="", headers=None, post=None, location=False):
-    # anti_cloudfare ya integrado en httptools por defecto
-    response = httptools.downloadpage(url, post=post, headers=headers)
-    return response.data
+# def anti_cloudflare(url, host="", headers=None, post=None, location=False):
+#     # anti_cloudfare ya integrado en httptools por defecto
+#     response = httptools.downloadpage(url, post=post, headers=headers)
+#     return response.data
 
 
 def printMatches(matches):
@@ -385,24 +385,24 @@ def remove_show_from_title(title, show):
     return title
 
 
-def getRandom(str):
-    return get_md5(str)
+# def getRandom(str):
+#     return get_md5(str)
 
 
-def unseo(cadena):
-    if cadena.upper().startswith("VER GRATIS LA PELICULA "):
-        cadena = cadena[23:]
-    elif cadena.upper().startswith("VER GRATIS PELICULA "):
-        cadena = cadena[20:]
-    elif cadena.upper().startswith("VER ONLINE LA PELICULA "):
-        cadena = cadena[23:]
-    elif cadena.upper().startswith("VER GRATIS "):
-        cadena = cadena[11:]
-    elif cadena.upper().startswith("VER ONLINE "):
-        cadena = cadena[11:]
-    elif cadena.upper().startswith("DESCARGA DIRECTA "):
-        cadena = cadena[17:]
-    return cadena
+# def unseo(cadena):
+#     if cadena.upper().startswith("VER GRATIS LA PELICULA "):
+#         cadena = cadena[23:]
+#     elif cadena.upper().startswith("VER GRATIS PELICULA "):
+#         cadena = cadena[20:]
+#     elif cadena.upper().startswith("VER ONLINE LA PELICULA "):
+#         cadena = cadena[23:]
+#     elif cadena.upper().startswith("VER GRATIS "):
+#         cadena = cadena[11:]
+#     elif cadena.upper().startswith("VER ONLINE "):
+#         cadena = cadena[11:]
+#     elif cadena.upper().startswith("DESCARGA DIRECTA "):
+#         cadena = cadena[17:]
+#     return cadena
 
 
 # scrapertools.get_filename_from_url(media_url)[-4:]
@@ -424,19 +424,19 @@ def get_filename_from_url(url):
     return filename
 
 
-def get_domain_from_url(url):
-    import urlparse
-    parsed_url = urlparse.urlparse(url)
-    try:
-        filename = parsed_url.netloc
-    except:
-        # Si falla es porque la implementación de parsed_url no reconoce los atributos como "path"
-        if len(parsed_url) >= 4:
-            filename = parsed_url[1]
-        else:
-            filename = ""
-
-    return filename
+# def get_domain_from_url(url):
+#     import urlparse
+#     parsed_url = urlparse.urlparse(url)
+#     try:
+#         filename = parsed_url.netloc
+#     except:
+#         # Si falla es porque la implementación de parsed_url no reconoce los atributos como "path"
+#         if len(parsed_url) >= 4:
+#             filename = parsed_url[1]
+#         else:
+#             filename = ""
+#
+#     return filename
 
 
 def get_season_and_episode(title):
@@ -475,25 +475,25 @@ def get_season_and_episode(title):
     return filename
 
 
-def get_sha1(cadena):
-    try:
-        import hashlib
-        devuelve = hashlib.sha1(cadena).hexdigest()
-    except:
-        import sha
-        import binascii
-        devuelve = binascii.hexlify(sha.new(cadena).digest())
-
-    return devuelve
+# def get_sha1(cadena):
+#     try:
+#         import hashlib
+#         devuelve = hashlib.sha1(cadena).hexdigest()
+#     except:
+#         import sha
+#         import binascii
+#         devuelve = binascii.hexlify(sha.new(cadena).digest())
+#
+#     return devuelve
 
 
-def get_md5(cadena):
-    try:
-        import hashlib
-        devuelve = hashlib.md5(cadena).hexdigest()
-    except:
-        import md5
-        import binascii
-        devuelve = binascii.hexlify(md5.new(cadena).digest())
-
-    return devuelve
+# def get_md5(cadena):
+#     try:
+#         import hashlib
+#         devuelve = hashlib.md5(cadena).hexdigest()
+#     except:
+#         import md5
+#         import binascii
+#         devuelve = binascii.hexlify(md5.new(cadena).digest())
+#
+#     return devuelve
diff --git a/plugin.video.alfa/core/tmdb.py b/plugin.video.alfa/core/tmdb.py
index a20e18ca..5453dcea 100755
--- a/plugin.video.alfa/core/tmdb.py
+++ b/plugin.video.alfa/core/tmdb.py
@@ -1251,7 +1251,6 @@ class Tmdb(object):
             buscando = "id_Tmdb: " + str(self.result["id"]) + " temporada: " + str(numtemporada) + "\nURL: " + url
             logger.info("[Tmdb.py] Buscando " + buscando)
             try:
-                # self.temporada[numtemporada] = jsontools.load(scrapertools.downloadpageWithoutCookies(url))
                 self.temporada[numtemporada] = self.get_json(url)
 
             except:
diff --git a/plugin.video.alfa/core/update_servers.py b/plugin.video.alfa/core/update_servers.py
deleted file mode 100755
index f47f9b40..00000000
--- a/plugin.video.alfa/core/update_servers.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------------------------------
-# update_servers.py
-# --------------------------------------------------------------------------------
-
-import os
-import urlparse
-
-from core import scrapertools
-from core import servertools
-from platformcode import config
-
-remote_url = ""
-local_folder = os.path.join(config.get_runtime_path(), "servers")
-
-
-### Procedures
-def update_servers():
-    update_servers_files(
-        read_remote_servers_list(
-            dict(read_local_servers_list())
-        )
-    )
-
-
-def update_servers_files(update_servers_list):
-    # ----------------------------
-    from platformcode import platformtools
-    progress = platformtools.dialog_progress_bg("Update servers list")
-    # ----------------------------
-
-    for index, server in enumerate(update_servers_list):
-        # ----------------------------
-        percentage = index * 100 / len(update_servers_list)
-        # ----------------------------
-
-        data = scrapertools.cache_page(remote_url + server[0] + ".py")
-
-        f = open(os.path.join(local_folder, server[0] + ".py"), 'w')
-        f.write(data)
-        f.close()
-
-        # ----------------------------
-        progress.update(percentage, ' Update server: "' + server[0] + '"', 'MD5: "' + server[1] + '"')
-        # ----------------------------
-
-    # ----------------------------
-    progress.close()
-    # ----------------------------
-
-
-### Functions
-## init
-def read_remote_servers_list(local_servers):
-    data = scrapertools.cache_page(remote_url + "servertools.py")
-
-    f = open(os.path.join(local_folder, "servertools.py"), 'w')
-    f.write(data)
-    f.close()
-
-    all_servers = sorted(
-        servertools.FREE_SERVERS + \
-        servertools.PREMIUM_SERVERS + \
-        servertools.FILENIUM_SERVERS + \
-        servertools.REALDEBRID_SERVERS + \
-        servertools.ALLDEBRID_SERVERS
-    )
-
-    servers = []
-    for server_id in all_servers:
-        if server_id not in servers:
-            servers.append(server_id)
-
-    # ----------------------------
-    from platformcode import platformtools
-    progress = platformtools.dialog_progress_bg("Remote servers list")
-    # ----------------------------
-
-    remote_servers = []
-    update_servers_list = []
-    for index, server in enumerate(servers):
-        # ----------------------------
-        percentage = index * 100 / len(servers)
-        # ----------------------------
-        server_file = urlparse.urljoin(remote_url, server + ".py")
-
-        data = scrapertools.cache_page(server_file)
-        if data != "Not Found":
-            md5_remote_server = md5_remote(data)
-            remote_servers.append([server, md5_remote_server])
-
-            md5_local_server = local_servers.get(server)
-            if md5_local_server:
-                if md5_local_server != md5_remote_server:
-                    update_servers_list.append([server, md5_remote_server, md5_local_server, "Update"])
-            else:
-                update_servers_list.append([server, md5_remote_server, "New", "Update"])
-
-            # ----------------------------
-            progress.update(percentage, ' Remote server: "' + server + '"', 'MD5: "' + md5_remote_server + '"')
-            # ----------------------------
-
-    # ----------------------------
-    progress.close()
-    # ----------------------------
-
-    return update_servers_list
-
-
-def read_local_servers_list():
-    all_servers = sorted(
-        servertools.FREE_SERVERS + \
-        servertools.PREMIUM_SERVERS + \
-        servertools.FILENIUM_SERVERS + \
-        servertools.REALDEBRID_SERVERS + \
-        servertools.ALLDEBRID_SERVERS
-    )
-
-    servers = []
-    for server_id in all_servers:
-        if server_id not in servers:
-            servers.append(server_id)
-
-    # ----------------------------
-    from platformcode import platformtools
-    progress = platformtools.dialog_progress_bg("Local servers list")
-    # ----------------------------
-
-    local_servers = []
-    for index, server in enumerate(servers):
-        # ----------------------------
-        percentage = index * 100 / len(servers)
-        # ----------------------------
-        server_file = os.path.join(config.get_runtime_path(), "servers", server + ".py")
-        if os.path.exists(server_file):
-            md5_local_server = md5_local(server_file)
-            local_servers.append([server, md5_local_server])
-            # ----------------------------
-            progress.update(percentage, ' Local server: "' + server + '"', 'MD5: "' + md5_local_server + '"')
-            # ----------------------------
-
-    # ----------------------------
-    progress.close()
-    # ----------------------------
-
-    return local_servers
-
-
-def md5_local(file_server):
-    import hashlib
-    hash = hashlib.md5()
-    with open(file_server) as f:
-        for chunk in iter(lambda: f.read(4096), ""):
-            hash.update(chunk)
-
-    return hash.hexdigest()
-
-
-def md5_remote(data_server):
-    import hashlib
-    hash = hashlib.md5()
-    hash.update(data_server)
-
-    return hash.hexdigest()
-
-
-### Run
-update_servers()
-# from threading import Thread
-# Thread( target=update_servers ).start()
diff --git a/plugin.video.alfa/core/updater.py b/plugin.video.alfa/core/updater.py
deleted file mode 100755
index 329100e2..00000000
--- a/plugin.video.alfa/core/updater.py
+++ /dev/null
@@ -1,208 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------------------------------
-# Updater process
-# --------------------------------------------------------------------------------
-
-import os
-import time
-
-import scrapertools
-import versiontools
-from platformcode import config, logger
-
-
-# Método antiguo, muestra un popup con la versión
-def checkforupdates():
-    logger.info()
-
-    # Valores por defecto
-    numero_version_publicada = 0
-    tag_version_publicada = ""
-
-    # Lee la versión remota
-    from core import api
-    latest_packages = api.plugins_get_latest_packages()
-    for latest_package in latest_packages["body"]:
-        if latest_package["package"] == "plugin":
-            numero_version_publicada = latest_package["version"]
-            tag_version_publicada = latest_package["tag"]
-            break
-
-    logger.info("version remota=" + str(numero_version_publicada))
-
-    # Lee la versión local
-    numero_version_local = versiontools.get_current_plugin_version()
-    logger.info("version local=" + str(numero_version_local))
-
-    hayqueactualizar = numero_version_publicada > numero_version_local
-    logger.info("-> hayqueactualizar=" + repr(hayqueactualizar))
-
-    # Si hay actualización disponible, devuelve la Nueva versión para que cada plataforma se encargue de mostrar los avisos
-    if hayqueactualizar:
-        return tag_version_publicada
-    else:
-        return None
-
-
-# Método nuevo, devuelve el nº de actualizaciones disponibles además de indicar si hay nueva versión del plugin
-def get_available_updates():
-    logger.info()
-
-    # Cuantas actualizaciones hay?
-    number_of_updates = 0
-    new_published_version_tag = ""
-
-    # Lee la versión remota
-    from core import api
-    latest_packages = api.plugins_get_latest_packages()
-
-    for latest_package in latest_packages["body"]:
-
-        if latest_package["package"] == "plugin":
-            if latest_package["version"] > versiontools.get_current_plugin_version():
-                number_of_updates = number_of_updates + 1
-                new_published_version_tag = latest_package["tag"]
-
-        elif latest_package["package"] == "channels":
-            if latest_package["version"] > versiontools.get_current_channels_version():
-                number_of_updates = number_of_updates + 1
-
-        elif latest_package["package"] == "servers":
-            if latest_package["version"] > versiontools.get_current_servers_version():
-                number_of_updates = number_of_updates + 1
-
-    return new_published_version_tag, number_of_updates
-
-
-def update(item):
-    logger.info()
-
-    # Valores por defecto
-    published_version_url = ""
-    published_version_filename = ""
-
-    # Lee la versión remota
-    from core import api
-    latest_packages = api.plugins_get_latest_packages()
-    for latest_package in latest_packages["body"]:
-        if latest_package["package"] == "plugin":
-            published_version_url = latest_package["url"]
-            published_version_filename = latest_package["filename"]
-            published_version_number = latest_package["version"]
-            break
-
-    # La URL viene del API, y lo descarga en "userdata"
-    remotefilename = published_version_url
-    localfilename = os.path.join(config.get_data_path(), published_version_filename)
-
-    download_and_install(remotefilename, localfilename)
-
-
-def download_and_install(remote_file_name, local_file_name):
-    logger.info("from " + remote_file_name + " to " + local_file_name)
-
-    if os.path.exists(local_file_name):
-        os.remove(local_file_name)
-
-    # Descarga el fichero
-    inicio = time.clock()
-    from core import downloadtools
-    downloadtools.downloadfile(remote_file_name, local_file_name, continuar=False)
-    fin = time.clock()
-    logger.info("Descargado en %d segundos " % (fin - inicio + 1))
-
-    logger.info("descomprime fichero...")
-    import ziptools
-    unzipper = ziptools.ziptools()
-
-    # Lo descomprime en "addons" (un nivel por encima del plugin)
-    installation_target = os.path.join(config.get_runtime_path(), "..")
-    logger.info("installation_target=%s" % installation_target)
-
-    unzipper.extract(local_file_name, installation_target)
-
-    # Borra el zip descargado
-    logger.info("borra fichero...")
-    os.remove(local_file_name)
-    logger.info("...fichero borrado")
-
-
-def update_channel(channel_name):
-    logger.info(channel_name)
-
-    import channeltools
-    remote_channel_url, remote_version_url = channeltools.get_channel_remote_url(channel_name)
-    local_channel_path, local_version_path, local_compiled_path = channeltools.get_channel_local_path(channel_name)
-
-    # Version remota
-    try:
-        data = scrapertools.cachePage(remote_version_url)
-        logger.info("remote_data=" + data)
-        remote_version = int(scrapertools.find_single_match(data, '<version>([^<]+)</version>'))
-        addon_condition = int(scrapertools.find_single_match(data, "<addon_version>([^<]*)</addon_version>")
-                              .replace(".", "").ljust(len(str(versiontools.get_current_plugin_version())), '0'))
-    except:
-        remote_version = 0
-        addon_condition = 0
-
-    logger.info("remote_version=%d" % remote_version)
-
-    # Version local
-    if os.path.exists(local_version_path):
-        infile = open(local_version_path)
-        from core import jsontools
-        data = jsontools.load(infile.read())
-        infile.close()
-
-        local_version = data.get('version', 0)
-    else:
-        local_version = 0
-
-    logger.info("local_version=%d" % local_version)
-
-    # Comprueba si ha cambiado
-    updated = (remote_version > local_version) and (versiontools.get_current_plugin_version() >= addon_condition)
-
-    if updated:
-        logger.info("downloading...")
-        download_channel(channel_name)
-
-    return updated
-
-
-def download_channel(channel_name):
-    logger.info(channel_name)
-
-    import channeltools
-    remote_channel_url, remote_version_url = channeltools.get_channel_remote_url(channel_name)
-    local_channel_path, local_version_path, local_compiled_path = channeltools.get_channel_local_path(channel_name)
-
-    # Descarga el canal
-    try:
-        updated_channel_data = scrapertools.cachePage(remote_channel_url)
-        outfile = open(local_channel_path, "wb")
-        outfile.write(updated_channel_data)
-        outfile.flush()
-        outfile.close()
-        logger.info("Grabado a " + local_channel_path)
-    except:
-        import traceback
-        logger.error(traceback.format_exc())
-
-    # Descarga la version (puede no estar)
-    try:
-        updated_version_data = scrapertools.cachePage(remote_version_url)
-        outfile = open(local_version_path, "w")
-        outfile.write(updated_version_data)
-        outfile.flush()
-        outfile.close()
-        logger.info("Grabado a " + local_version_path)
-    except:
-        import traceback
-        logger.error(traceback.format_exc())
-
-    if os.path.exists(local_compiled_path):
-        os.remove(local_compiled_path)
-
-    from platformcode import platformtools
-    platformtools.dialog_notification(channel_name + " actualizado", "Se ha descargado una nueva versión")
diff --git a/plugin.video.alfa/core/versiontools.py b/plugin.video.alfa/core/versiontools.py
deleted file mode 100755
index 0846b841..00000000
--- a/plugin.video.alfa/core/versiontools.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------------------------------
-# Version Tools
-# --------------------------------------------------------------------------------
-
-import os
-
-import scrapertools
-from platformcode import config
-
-
-def get_current_plugin_version():
-    return 4300
-
-
-def get_current_plugin_version_tag():
-    return "1.7.0"
-
-
-def get_current_plugin_date():
-    return "22/08/2017"
-
-
-def get_current_channels_version():
-    f = open(os.path.join(config.get_runtime_path(), "channels", "version.xml"))
-    data = f.read()
-    f.close()
-
-    return int(scrapertools.find_single_match(data, "<version>([^<]+)</version>"))
-
-
-def get_current_servers_version():
-    f = open(os.path.join(config.get_runtime_path(), "servers", "version.xml"))
-    data = f.read()
-    f.close()
-
-    return int(scrapertools.find_single_match(data, "<version>([^<]+)</version>"))
diff --git a/plugin.video.alfa/platformcode/platformtools.py b/plugin.video.alfa/platformcode/platformtools.py
index 74aec795..de27386d 100644
--- a/plugin.video.alfa/platformcode/platformtools.py
+++ b/plugin.video.alfa/platformcode/platformtools.py
@@ -394,6 +394,21 @@ def set_context_commands(item, parent_item):
                                                               from_channel=item.channel,
                                                               from_action=item.action).tourl())))
 
+        #Buscar en otros canales
+        if item.contentType in ['movie','tvshow']and item.channel != 'search':
+            # Buscar en otros canales
+            if item.contentSerieName!='':
+                item.extra=item.contentSerieName
+            else:
+                item.extra = item.contentTitle
+            context_commands.append(("[COLOR yellow]Buscar en otros canales[/COLOR]",
+                                     "XBMC.Container.Update (%s?%s)" % (sys.argv[0],
+                                                                        item.clone(channel='search',
+                                                                                   action="do_search",
+                                                                                   from_channel=item.channel,
+                                                                                   contextual=True).tourl())))
+
+
         if item.channel != "videolibrary":
             # Añadir Serie a la videoteca
             if item.action in ["episodios", "get_episodios"] and item.contentSerieName:
diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml
index 920d8500..5c59fe58 100755
--- a/plugin.video.alfa/resources/settings.xml
+++ b/plugin.video.alfa/resources/settings.xml
@@ -21,7 +21,7 @@
         <setting id="adult_aux_new_password2" type="text" label="Confirmar nueva contraseña:" option="hidden" enable="!eq(-1,)" default=""/>
     </category>
 
-    <!-- Path downloads and subtitles -->
+    <!-- Path downloads -->
     <category label="30501">
         <setting id="path_selection" type="enum" values="Escribir ruta|Examinar ruta" default="0" label="Tipo de ruta"/>
         <setting id="downloadpath" type="text" label="30017" default="" visible="eq(-1,0)"/>
diff --git a/plugin.video.alfa/servers/adnstream.json b/plugin.video.alfa/servers/adnstream.json
index 61479fef..7a227b97 100755
--- a/plugin.video.alfa/servers/adnstream.json
+++ b/plugin.video.alfa/servers/adnstream.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/allmyvideos.json b/plugin.video.alfa/servers/allmyvideos.json
index 563c7115..0b4cf909 100755
--- a/plugin.video.alfa/servers/allmyvideos.json
+++ b/plugin.video.alfa/servers/allmyvideos.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "04/06/2016",
-      "description": "Reparado, utiliza proxy en caso que salte el geobloqueo"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [
       "http://allmyvideos.net/embed-theme.html",
@@ -75,6 +69,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_allmyvideos.png",
-  "version": 1
+  "thumbnail": "server_allmyvideos.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/auroravid.json b/plugin.video.alfa/servers/auroravid.json
index 86bf6e68..73c1928a 100755
--- a/plugin.video.alfa/servers/auroravid.json
+++ b/plugin.video.alfa/servers/auroravid.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "21/03/2017",
-      "description": "Conector corregido"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/backin.json b/plugin.video.alfa/servers/backin.json
index fc41a3d7..671f4f77 100755
--- a/plugin.video.alfa/servers/backin.json
+++ b/plugin.video.alfa/servers/backin.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/bigfile.json b/plugin.video.alfa/servers/bigfile.json
index 2df1f671..74f2c2bf 100755
--- a/plugin.video.alfa/servers/bigfile.json
+++ b/plugin.video.alfa/servers/bigfile.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -46,6 +40,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/bitp.json b/plugin.video.alfa/servers/bitp.json
index dd570cf3..c0ef601f 100644
--- a/plugin.video.alfa/servers/bitp.json
+++ b/plugin.video.alfa/servers/bitp.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "18/09/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s26.postimg.org/maiur9tmx/bitp1.png",
-  "version": 1
+  "thumbnail": "https://s26.postimg.org/maiur9tmx/bitp1.png"
 }
diff --git a/plugin.video.alfa/servers/bitshare.json b/plugin.video.alfa/servers/bitshare.json
index 349a1d96..4d4586d1 100755
--- a/plugin.video.alfa/servers/bitshare.json
+++ b/plugin.video.alfa/servers/bitshare.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -55,6 +49,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/bitvidsx.json b/plugin.video.alfa/servers/bitvidsx.json
index 88b0a71c..85f25230 100755
--- a/plugin.video.alfa/servers/bitvidsx.json
+++ b/plugin.video.alfa/servers/bitvidsx.json
@@ -1,15 +1,5 @@
 {
     "active": true, 
-    "changes": [
-        {
-            "date": "21/03/2017",
-            "description": "Conector corregido"
-        }, 
-        {
-            "date": "25/03/2016",
-            "description": "Versión incial"
-        }
-    ], 
     "find_videos": {
         "ignore_urls": [],
         "patterns": [
@@ -51,6 +41,5 @@
             "type": "list", 
             "visible": false
         }
-    ], 
-    "version": 1
+    ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/clicknupload.json b/plugin.video.alfa/servers/clicknupload.json
index 50061d4e..d2c4ecf1 100755
--- a/plugin.video.alfa/servers/clicknupload.json
+++ b/plugin.video.alfa/servers/clicknupload.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -46,6 +40,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/cloudsany.json b/plugin.video.alfa/servers/cloudsany.json
index bd1f4f68..8dc58482 100644
--- a/plugin.video.alfa/servers/cloudsany.json
+++ b/plugin.video.alfa/servers/cloudsany.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "09/10/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s1.postimg.org/6wixo35myn/cloudsany1.png",
-  "version": 1
+  "thumbnail": "https://s1.postimg.org/6wixo35myn/cloudsany1.png"
 }
diff --git a/plugin.video.alfa/servers/cloudy.json b/plugin.video.alfa/servers/cloudy.json
index cd539545..7be82e43 100755
--- a/plugin.video.alfa/servers/cloudy.json
+++ b/plugin.video.alfa/servers/cloudy.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "05/03/2017",
-      "description": "Corregido por cambios en el servidor"
-    },
-    {
-      "date": "03/04/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s1.postimg.org/9e6doboo2n/cloudy1.png",
-  "version": 1
+  "thumbnail": "https://s1.postimg.org/9e6doboo2n/cloudy1.png"
 }
diff --git a/plugin.video.alfa/servers/cnubis.json b/plugin.video.alfa/servers/cnubis.json
index af3df231..62fe1901 100755
--- a/plugin.video.alfa/servers/cnubis.json
+++ b/plugin.video.alfa/servers/cnubis.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/crunchyroll.json b/plugin.video.alfa/servers/crunchyroll.json
index 7e483768..f3b0961e 100755
--- a/plugin.video.alfa/servers/crunchyroll.json
+++ b/plugin.video.alfa/servers/crunchyroll.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "12/05/2017",
-      "description": "Se añade libreria jscrypto para que funcione en cualquier sistema y deteccion enlaces rtmpe"
-    },
-    {
-      "date": "11/01/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -90,6 +80,5 @@
       "visible": true
     }
   ],
-  "thumbnail": "http://i.imgur.com/SglkLAb.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/SglkLAb.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/cumlouder.json b/plugin.video.alfa/servers/cumlouder.json
index 65bd2bb9..0ff53cc2 100755
--- a/plugin.video.alfa/servers/cumlouder.json
+++ b/plugin.video.alfa/servers/cumlouder.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/dailymotion.json b/plugin.video.alfa/servers/dailymotion.json
index d81805c7..d94a44fe 100755
--- a/plugin.video.alfa/servers/dailymotion.json
+++ b/plugin.video.alfa/servers/dailymotion.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "07/04/2017",
-      "description": "Corregido para adaptarlo al uso de httptools ya que fallaba"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -51,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/datoporn.json b/plugin.video.alfa/servers/datoporn.json
index 34e8cdb9..b72b3f96 100755
--- a/plugin.video.alfa/servers/datoporn.json
+++ b/plugin.video.alfa/servers/datoporn.json
@@ -1,19 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "13/05/2017",
-      "description": "Corregido orden y calidades"
-    },
-    {
-      "date": "21/02/2017",
-      "description": "Corregido y añadida opcion m3u8"
-    },
-    {
-      "date": "28/07/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -52,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/tBSWudd.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/tBSWudd.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/debriders/alldebrid.json b/plugin.video.alfa/servers/debriders/alldebrid.json
index e8dd6ff6..b5d53179 100755
--- a/plugin.video.alfa/servers/debriders/alldebrid.json
+++ b/plugin.video.alfa/servers/debriders/alldebrid.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "free": false,
   "id": "alldebrid",
   "name": "All-Debrid",
@@ -33,6 +27,5 @@
       "type": "text",
       "visible": true
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/debriders/realdebrid.json b/plugin.video.alfa/servers/debriders/realdebrid.json
index 47ab4100..19f69479 100755
--- a/plugin.video.alfa/servers/debriders/realdebrid.json
+++ b/plugin.video.alfa/servers/debriders/realdebrid.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "14/06/2016",
-      "description": "Corregido al haberse desactivado la api que se usaba"
-    }
-  ],
   "free": false,
   "id": "realdebrid",
   "name": "Real-Debrid",
@@ -18,6 +12,5 @@
       "type": "bool",
       "visible": true
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/depositfiles.json b/plugin.video.alfa/servers/depositfiles.json
deleted file mode 100755
index b4ef628f..00000000
--- a/plugin.video.alfa/servers/depositfiles.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "active": false,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(depositfiles.com/files/[a-z0-9]+)",
-        "url": "http://\\1"
-      }
-    ]
-  },
-  "free": false,
-  "id": "depositfiles",
-  "name": "depositfiles",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "Incluir en lista negra",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "Incluir en lista de favoritos",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "version": 1
-}
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/depositfiles.py b/plugin.video.alfa/servers/depositfiles.py
deleted file mode 100755
index 99eedb0d..00000000
--- a/plugin.video.alfa/servers/depositfiles.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import scrapertools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    # Existe: http://depositfiles.com/files/vmhjug6t7
-    # No existe: 
-    data = scrapertools.cache_page(page_url)
-    patron = 'Nombre del Archivo: <b title="([^"]+)">([^<]+)</b>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-
-    if len(matches) > 0:
-        return True, ""
-    else:
-        patron = '<div class="no_download_msg">([^<]+)<'
-        matches = re.compile(patron, re.DOTALL).findall(data)
-        if len(matches) > 0:
-            return False, "El archivo ya no está disponible<br/>en depositfiles o ha sido borrado"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    return video_urls
diff --git a/plugin.video.alfa/servers/directo.json b/plugin.video.alfa/servers/directo.json
index dd5d6343..99e6e220 100755
--- a/plugin.video.alfa/servers/directo.json
+++ b/plugin.video.alfa/servers/directo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -67,6 +61,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/divxstage.json b/plugin.video.alfa/servers/divxstage.json
index 2b70bdc8..0b417fb4 100755
--- a/plugin.video.alfa/servers/divxstage.json
+++ b/plugin.video.alfa/servers/divxstage.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "21/03/2017",
-      "description": "Conector corregido"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_divxstage.png",
-  "version": 1
+  "thumbnail": "server_divxstage.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/documentary.json b/plugin.video.alfa/servers/documentary.json
index c5328e20..3a6056ab 100755
--- a/plugin.video.alfa/servers/documentary.json
+++ b/plugin.video.alfa/servers/documentary.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/downace.json b/plugin.video.alfa/servers/downace.json
index 43b392cc..39a22a06 100644
--- a/plugin.video.alfa/servers/downace.json
+++ b/plugin.video.alfa/servers/downace.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "12/07/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s12.postimg.org/4n9fmdy7x/logo-downace.png",
-  "version": 1
+  "thumbnail": "https://s12.postimg.org/4n9fmdy7x/logo-downace.png"
 }
diff --git a/plugin.video.alfa/servers/eroshare.json b/plugin.video.alfa/servers/eroshare.json
index b92e9e18..56038b54 100755
--- a/plugin.video.alfa/servers/eroshare.json
+++ b/plugin.video.alfa/servers/eroshare.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "27/02/2017",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s31.postimg.org/cewftt397/eroshare.png",
-  "version": 1
+  "thumbnail": "https://s31.postimg.org/cewftt397/eroshare.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/facebook.json b/plugin.video.alfa/servers/facebook.json
index 824c0bb1..ad1c5b43 100755
--- a/plugin.video.alfa/servers/facebook.json
+++ b/plugin.video.alfa/servers/facebook.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/fakingstv.json b/plugin.video.alfa/servers/fakingstv.json
index 6f9b5448..f668b2fc 100755
--- a/plugin.video.alfa/servers/fakingstv.json
+++ b/plugin.video.alfa/servers/fakingstv.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/fastplay.json b/plugin.video.alfa/servers/fastplay.json
index c664bdeb..7369a7e4 100755
--- a/plugin.video.alfa/servers/fastplay.json
+++ b/plugin.video.alfa/servers/fastplay.json
@@ -1,27 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "14/06/2017",
-      "description": "Patrón reparado"
-    },
-    {
-      "date": "07/06/2017",
-      "description": "Reparado detección de subtitulos"
-    },
-    {
-      "date": "05/06/2017",
-      "description": "Enlaces a videos encriptados"
-    },
-    {
-      "date": "29/05/2017",
-      "description": "Detección de subtítulos y reparado detección de resolución de videos"
-    },
-    {
-      "date": "16/02/2017",
-      "description": "Primera versión"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -60,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/vHDcd6Y.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/vHDcd6Y.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/filebox.json b/plugin.video.alfa/servers/filebox.json
deleted file mode 100755
index 08efd913..00000000
--- a/plugin.video.alfa/servers/filebox.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "active": false,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "filebox.com/(?:embed-)?([0-9a-zA-Z]+)",
-        "url": "http://www.filebox.com/\\1"
-      }
-    ]
-  },
-  "free": false,
-  "id": "filebox",
-  "name": "filebox",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "Incluir en lista negra",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "Incluir en lista de favoritos",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "version": 1
-}
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/filebox.py b/plugin.video.alfa/servers/filebox.py
deleted file mode 100755
index d95548a3..00000000
--- a/plugin.video.alfa/servers/filebox.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import scrapertools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = scrapertools.cache_page(url=page_url)
-    if "<b>File Not Found</b>" in data:
-        return False, "El archivo no existe<br/>en filebox o ha sido borrado."
-    else:
-        return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    '''
-    <input type="hidden" name="op" value="download2">
-    <input type="hidden" name="id" value="235812b1j9w1">
-    <input type="hidden" name="rand" value="na73zeeooqyfkndsv4uxzzpbajwi6mhbmixtogi">
-    <input type="hidden" name="referer" value="http://www.seriesyonkis.com/s/ngo/2/5/1/8/773">
-    '''
-    logger.info("URL")
-    data = scrapertools.cache_page(page_url)
-    import time
-    time.sleep(5)
-
-    codigo = scrapertools.get_match(data, '<input type="hidden" name="id" value="([^"]+)">[^<]+')
-    rand = scrapertools.get_match(data, '<input type="hidden" name="rand" value="([^"]+)">')
-
-    # op=download2&id=xuquejiv6xdf&rand=r6dq7hn7so2ygpnxv2zg2i3cu3sbdsunf57gtni&referer=&method_free=&method_premium=&down_direct=1
-    post = "op=download2&id=" + codigo + "&rand=" + rand + "&referer=&method_free=&method_premium=&down_direct=1"
-
-    data = scrapertools.cache_page(page_url, post=post, headers=[
-        ['User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14'],
-        ['Referer', page_url]])
-    logger.info("data=" + data)
-    media_url = scrapertools.get_match(data, "this.play\('([^']+)'")
-    video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [filebox]", media_url])
-
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-
-    return video_urls
diff --git a/plugin.video.alfa/servers/filefactory.json b/plugin.video.alfa/servers/filefactory.json
index a21b9949..0d81c54d 100755
--- a/plugin.video.alfa/servers/filefactory.json
+++ b/plugin.video.alfa/servers/filefactory.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_filefactory.png",
-  "version": 1
+  "thumbnail": "server_filefactory.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/fileflyer.json b/plugin.video.alfa/servers/fileflyer.json
index 80e61c1d..7f3a6f18 100755
--- a/plugin.video.alfa/servers/fileflyer.json
+++ b/plugin.video.alfa/servers/fileflyer.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/filescdn.json b/plugin.video.alfa/servers/filescdn.json
index 9200784d..45ff5547 100755
--- a/plugin.video.alfa/servers/filescdn.json
+++ b/plugin.video.alfa/servers/filescdn.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "13/06/2017",
-      "description": "Actualizado patrón del get_video()"
-    },
-    {
-      "date": "15/02/2017",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s31.postimg.org/ijne6piij/filescdn.png",
-  "version": 1
+  "thumbnail": "https://s31.postimg.org/ijne6piij/filescdn.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/filesmonster.json b/plugin.video.alfa/servers/filesmonster.json
index c147566e..92c52197 100755
--- a/plugin.video.alfa/servers/filesmonster.json
+++ b/plugin.video.alfa/servers/filesmonster.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Version incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -71,6 +65,5 @@
       "type": "text",
       "visible": true
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/filez.json b/plugin.video.alfa/servers/filez.json
index b01faeef..925f1afe 100755
--- a/plugin.video.alfa/servers/filez.json
+++ b/plugin.video.alfa/servers/filez.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "12/04/2017",
-      "description": "Corregido por cambios"
-    },
-    {
-      "date": "27/02/2017",
-      "description": "Primera versión"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/HasfjUH.png",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/HasfjUH.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/flashx.json b/plugin.video.alfa/servers/flashx.json
index ce0c3633..b3ae6c12 100644
--- a/plugin.video.alfa/servers/flashx.json
+++ b/plugin.video.alfa/servers/flashx.json
@@ -1,19 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "01/08/2017",
-      "description": "Actualizado get_video_url"
-    },
-    {
-      "date": "21/03/2017",
-      "description": "Mejorado el test de video y uso de httptools"
-    },
-    {
-      "date": "04/06/2016",
-      "description": "Reparado por cambio en la url embebida"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -52,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_flashx.png",
-  "version": 1
+  "thumbnail": "server_flashx.png"
 }
diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py
index e962aa9a..7326085a 100644
--- a/plugin.video.alfa/servers/flashx.py
+++ b/plugin.video.alfa/servers/flashx.py
@@ -33,11 +33,11 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
                'Cookie': ''}
     data = httptools.downloadpage(page_url, headers=headers, replace_headers=True).data
     data = data.replace("\n","")
-    cgi_counter = scrapertools.find_single_match(data, '(?s)SRC="(https://www.flashx.tv/counter.cgi\?fx=[^"]+)')
+    cgi_counter = scrapertools.find_single_match(data, '(?is)src=.(https://www.flashx.tv/counter.cgi.*?fx=[0-9a-zA-Z=]+)')
     cgi_counter = cgi_counter.replace("%0A","").replace("%22","")
     playnow = scrapertools.find_single_match(data, 'https://www.flashx.tv/dl[^"]+')
     # Para obtener el f y el fxfx
-    js_fxfx = scrapertools.find_single_match(data, 'src="(https://www.flashx.tv/js/code.js.*?cache=[0-9]+)')
+    js_fxfx = scrapertools.find_single_match(data, '(?is)src=.(https://www.flashx.tv/js/code.js.*?=[0-9]+)')
     data_fxfx = httptools.downloadpage(js_fxfx).data
     mfxfx = scrapertools.find_single_match(data_fxfx, 'get.*?({.*?})').replace("'","").replace(" ","")
     matches = scrapertools.find_multiple_matches(mfxfx, '(\w+):(\w+)')
diff --git a/plugin.video.alfa/servers/fourshared.json b/plugin.video.alfa/servers/fourshared.json
index e5aa9ad6..c28126ef 100755
--- a/plugin.video.alfa/servers/fourshared.json
+++ b/plugin.video.alfa/servers/fourshared.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [
       "http://www.4shared.com/flash/player.swf"
@@ -57,6 +51,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/freakshare.json b/plugin.video.alfa/servers/freakshare.json
index d29256ad..46eebd5e 100755
--- a/plugin.video.alfa/servers/freakshare.json
+++ b/plugin.video.alfa/servers/freakshare.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/gamovideo.json b/plugin.video.alfa/servers/gamovideo.json
index 13292bef..44144414 100755
--- a/plugin.video.alfa/servers/gamovideo.json
+++ b/plugin.video.alfa/servers/gamovideo.json
@@ -1,59 +1,42 @@
 {
-    "active": true, 
-    "changes": [
-        {
-            "date": "09/05/17",
-            "description": "Arreglado con el cambio de user agent"
-        }, 
-        {
-            "date": "24/04/17",
-            "description": "Detectado mensaje:video se está procesando"
-        }, 
-        {
-            "date": "23/03/17",
-            "description": "Arreglado con el cambio de user agent"
-        }, 
-        {
-            "date": "07/11/16",
-            "description": "Modificado orden de los videos"
-        }
-    ], 
-    "find_videos": {
-        "ignore_urls": [],
-        "patterns": [{
-            "pattern": "gamovideo.com/(?:embed-|)([a-z0-9]+)",
-            "url": "http://gamovideo.com/embed-\\1.html"
-        }]
-    }, 
-    "free": true, 
-    "id": "gamovideo", 
-    "name": "gamovideo", 
-    "settings": [
-        {
-            "default": false, 
-            "enabled": true, 
-            "id": "black_list", 
-            "label": "Incluir en lista negra", 
-            "type": "bool", 
-            "visible": true
-        }, 
-        {
-            "default": 0,
-            "enabled": true, 
-            "id": "favorites_servers_list", 
-            "label": "Incluir en lista de favoritos", 
-            "lvalues": [
-                "No", 
-                "1", 
-                "2", 
-                "3", 
-                "4", 
-                "5"
-            ], 
-            "type": "list", 
-            "visible": false
-        }
-    ], 
-    "thumbnail": "server_gamovideo.png",
-    "version": 1
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "gamovideo.com/(?:embed-|)([a-z0-9]+)",
+        "url": "http://gamovideo.com/embed-\\1.html"
+      }
+    ]
+  },
+  "free": true,
+  "id": "gamovideo",
+  "name": "gamovideo",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "Incluir en lista negra",
+      "type": "bool",
+      "visible": true
+    },
+    {
+      "default": 0,
+      "enabled": true,
+      "id": "favorites_servers_list",
+      "label": "Incluir en lista de favoritos",
+      "lvalues": [
+        "No",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "type": "list",
+      "visible": false
+    }
+  ],
+  "thumbnail": "server_gamovideo.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/gigasize.json b/plugin.video.alfa/servers/gigasize.json
index 5aa80736..1f2c3e8f 100755
--- a/plugin.video.alfa/servers/gigasize.json
+++ b/plugin.video.alfa/servers/gigasize.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -51,6 +45,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/googlevideo.json b/plugin.video.alfa/servers/googlevideo.json
index 74a789bb..55a010be 100755
--- a/plugin.video.alfa/servers/googlevideo.json
+++ b/plugin.video.alfa/servers/googlevideo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/gvideo.json b/plugin.video.alfa/servers/gvideo.json
index 24bf7661..4ca0b752 100644
--- a/plugin.video.alfa/servers/gvideo.json
+++ b/plugin.video.alfa/servers/gvideo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "18/07/2017",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -52,6 +46,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s11.postimg.org/giobzkprz/logo-google1.png",
-  "version": 1
+  "thumbnail": "https://s11.postimg.org/giobzkprz/logo-google1.png"
 }
diff --git a/plugin.video.alfa/servers/hugefiles.json b/plugin.video.alfa/servers/hugefiles.json
index f057e959..1a76509a 100755
--- a/plugin.video.alfa/servers/hugefiles.json
+++ b/plugin.video.alfa/servers/hugefiles.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_hugefiles.png",
-  "version": 1
+  "thumbnail": "server_hugefiles.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/idowatch.json b/plugin.video.alfa/servers/idowatch.json
index 4bec4297..b64ca14d 100755
--- a/plugin.video.alfa/servers/idowatch.json
+++ b/plugin.video.alfa/servers/idowatch.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_idowatch.png",
-  "version": 1
+  "thumbnail": "server_idowatch.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/kingvid.json b/plugin.video.alfa/servers/kingvid.json
index a2869c42..22057bd2 100755
--- a/plugin.video.alfa/servers/kingvid.json
+++ b/plugin.video.alfa/servers/kingvid.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "28/04/2017",
-      "description": "Version inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/oq0tPhY.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/oq0tPhY.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/letwatch.json b/plugin.video.alfa/servers/letwatch.json
index 97566c84..f8111609 100755
--- a/plugin.video.alfa/servers/letwatch.json
+++ b/plugin.video.alfa/servers/letwatch.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "04/06/2016",
-      "description": "Reparado porque a veces devuelve enlace directo al video y no ofuscado"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/mailru.json b/plugin.video.alfa/servers/mailru.json
index e29ef6d4..5646031e 100755
--- a/plugin.video.alfa/servers/mailru.json
+++ b/plugin.video.alfa/servers/mailru.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "05/03/2017",
-      "description": "Reparado por cambios y corregidas expresiones regulares"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -52,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s26.postimg.org/6ebn509jd/mailru1.png",
-  "version": 1
+  "thumbnail": "https://s26.postimg.org/6ebn509jd/mailru1.png"
 }
diff --git a/plugin.video.alfa/servers/mediafire.json b/plugin.video.alfa/servers/mediafire.json
index ecc8bca9..fbc87878 100755
--- a/plugin.video.alfa/servers/mediafire.json
+++ b/plugin.video.alfa/servers/mediafire.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/mega.json b/plugin.video.alfa/servers/mega.json
index 00646b73..7d69d2b2 100755
--- a/plugin.video.alfa/servers/mega.json
+++ b/plugin.video.alfa/servers/mega.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -59,6 +53,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_mega.png",
-  "version": 1
+  "thumbnail": "server_mega.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/movshare.json b/plugin.video.alfa/servers/movshare.json
index c80500b8..2b8a9c19 100755
--- a/plugin.video.alfa/servers/movshare.json
+++ b/plugin.video.alfa/servers/movshare.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_movshare.png",
-  "version": 1
+  "thumbnail": "server_movshare.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/mp4upload.json b/plugin.video.alfa/servers/mp4upload.json
index a69a26e2..79b26695 100755
--- a/plugin.video.alfa/servers/mp4upload.json
+++ b/plugin.video.alfa/servers/mp4upload.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [
       "http://www.mp4upload.com/embed/embed"
@@ -45,6 +39,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/netutv.json b/plugin.video.alfa/servers/netutv.json
index 6557ac2e..d989225d 100755
--- a/plugin.video.alfa/servers/netutv.json
+++ b/plugin.video.alfa/servers/netutv.json
@@ -1,23 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "28/05/2017",
-      "description": "Reparado por cambio de dominio"
-    },
-    {
-      "date": "06/04/2017",
-      "description": "Añadido deteccion de subtítulos en español e inglés"
-    },
-    {
-      "date": "29/01/2017",
-      "description": "Reparado por cambios, se elimina la detección de enlaces de yaske que ya no se usa"
-    },
-    {
-      "date": "31/08/2015",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -71,6 +53,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_netutv.png",
-  "version": 1
+  "thumbnail": "server_netutv.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/nosvideo.json b/plugin.video.alfa/servers/nosvideo.json
index 0c18638d..605f0027 100755
--- a/plugin.video.alfa/servers/nosvideo.json
+++ b/plugin.video.alfa/servers/nosvideo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/nowdownload.json b/plugin.video.alfa/servers/nowdownload.json
index 99d483d6..8b7f0d89 100755
--- a/plugin.video.alfa/servers/nowdownload.json
+++ b/plugin.video.alfa/servers/nowdownload.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_nowdownload.png",
-  "version": 1
+  "thumbnail": "server_nowdownload.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/nowvideo.json b/plugin.video.alfa/servers/nowvideo.json
index c960f98a..389d0067 100755
--- a/plugin.video.alfa/servers/nowvideo.json
+++ b/plugin.video.alfa/servers/nowvideo.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "03/03/2017",
-      "description": "Corregido por cambios en el servidor y limpieza de código"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -77,6 +67,5 @@
       "visible": true
     }
   ],
-  "thumbnail": "server_nowvideo.png",
-  "version": 1
+  "thumbnail": "server_nowvideo.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/oboom.json b/plugin.video.alfa/servers/oboom.json
index 656eb58d..8ce1945e 100755
--- a/plugin.video.alfa/servers/oboom.json
+++ b/plugin.video.alfa/servers/oboom.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -46,6 +40,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/okru.json b/plugin.video.alfa/servers/okru.json
index 12e4973e..b1908ce1 100755
--- a/plugin.video.alfa/servers/okru.json
+++ b/plugin.video.alfa/servers/okru.json
@@ -1,23 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "22/06/2017",
-      "description": "Actualizado mensaje de archivo borrado"
-    },
-    {
-      "date": "09/05/2017",
-      "description": "Corregido, ha cambiado la web desde la que extraer los enlaces"
-    },
-    {
-      "date": "28/01/2017",
-      "description": "Mejorada detección de enlaces caídos, adaptado a los últimos cambios"
-    },
-    {
-      "date": "07/09/2015",
-      "description": "Version inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -61,6 +43,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_okru.png",
-  "version": 1
+  "thumbnail": "server_okru.png"
 }
diff --git a/plugin.video.alfa/servers/onefichier.json b/plugin.video.alfa/servers/onefichier.json
index 0ca11862..5e71cb9c 100755
--- a/plugin.video.alfa/servers/onefichier.json
+++ b/plugin.video.alfa/servers/onefichier.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -78,6 +72,5 @@
       "visible": true
     }
   ],
-  "thumbnail": "server_onefichier.png",
-  "version": 1
+  "thumbnail": "server_onefichier.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/openload.json b/plugin.video.alfa/servers/openload.json
index 0fb0d7ef..4616df8a 100755
--- a/plugin.video.alfa/servers/openload.json
+++ b/plugin.video.alfa/servers/openload.json
@@ -1,19 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "12/05/2017",
-      "description": "Corregido por cambios en el servidor"
-    },
-    {
-      "date": "07/02/2017",
-      "description": "Corregido por cambios en el servidor y adaptado al uso de httptools"
-    },
-    {
-      "date": "11/01/2017",
-      "description": "Reparado por cambios en el servidor"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -55,6 +41,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_openload.png",
-  "version": 1
+  "thumbnail": "server_openload.png"
 }
diff --git a/plugin.video.alfa/servers/pcloud.json b/plugin.video.alfa/servers/pcloud.json
index 1a57a23d..88fd42e4 100755
--- a/plugin.video.alfa/servers/pcloud.json
+++ b/plugin.video.alfa/servers/pcloud.json
@@ -1,20 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "07/05/2016",
-      "description": "Versión incial"
-    }
-  ],
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(my.pcloud.com/publink/show\\?code=[A-z0-9]+)",
-        "url": "https://\\1"
-      }
-    ]
-  },
   "free": true,
   "id": "pcloud",
   "name": "pcloud",
@@ -43,6 +28,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/pelismundo.json b/plugin.video.alfa/servers/pelismundo.json
index 1d9e3395..69d196f7 100644
--- a/plugin.video.alfa/servers/pelismundo.json
+++ b/plugin.video.alfa/servers/pelismundo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "18/09/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s26.postimg.org/72c9mr3ux/pelismundo1.png",
-  "version": 1
+  "thumbnail": "https://s26.postimg.org/72c9mr3ux/pelismundo1.png"
 }
diff --git a/plugin.video.alfa/servers/playwatch.json b/plugin.video.alfa/servers/playwatch.json
index f7e273ce..20a6bc40 100755
--- a/plugin.video.alfa/servers/playwatch.json
+++ b/plugin.video.alfa/servers/playwatch.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "21/03/2017",
-      "description": "Primera version"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/c7LwCTc.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/c7LwCTc.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/playwire.json b/plugin.video.alfa/servers/playwire.json
index 2531c569..9b4d915c 100755
--- a/plugin.video.alfa/servers/playwire.json
+++ b/plugin.video.alfa/servers/playwire.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "07/05/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/powvideo.json b/plugin.video.alfa/servers/powvideo.json
index db1cb159..b3a8b127 100755
--- a/plugin.video.alfa/servers/powvideo.json
+++ b/plugin.video.alfa/servers/powvideo.json
@@ -1,31 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "14/06/2017",
-      "description": "Reparado por robalo"
-    },
-    {
-      "date": "09/06/2017",
-      "description": "Reparado por robalo"
-    },
-    {
-      "date": "31/05/2017",
-      "description": "Corregido tras cambios en la ofuscación de los enlaces"
-    },
-    {
-      "date": "09/03/2017",
-      "description": "Muestra mensaje para archivo borrado por terminos de uso"
-    },
-    {
-      "date": "25/01/2017",
-      "description": "Mejorado el conector gracias al método jhexdecode de robalo, reparado y adaptado al uso de httptools"
-    },
-    {
-      "date": "07/11/2016",
-      "description": "Mejorado el código"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -64,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_powvideo.png",
-  "version": 1
+  "thumbnail": "server_powvideo.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/rapidgator.json b/plugin.video.alfa/servers/rapidgator.json
index 5b2e5a89..baddc1fa 100755
--- a/plugin.video.alfa/servers/rapidgator.json
+++ b/plugin.video.alfa/servers/rapidgator.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_rapidgator.png",
-  "version": 1
+  "thumbnail": "server_rapidgator.png"
 }
diff --git a/plugin.video.alfa/servers/rapidvideo.json b/plugin.video.alfa/servers/rapidvideo.json
index a462660e..0d07ea50 100755
--- a/plugin.video.alfa/servers/rapidvideo.json
+++ b/plugin.video.alfa/servers/rapidvideo.json
@@ -1,19 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "09/05/2017",
-      "description": "Ampliado regex para detección de enlaces"
-    },
-    {
-      "date": "29/04/2017",
-      "description": "Corregido, usa proxy en caso de error con https"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -52,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s26.postimg.org/y5arjad1l/rapidvideo1.png",
-  "version": 1
+  "thumbnail": "https://s26.postimg.org/y5arjad1l/rapidvideo1.png"
 }
diff --git a/plugin.video.alfa/servers/rutube.json b/plugin.video.alfa/servers/rutube.json
index bc3d8438..17554bcb 100755
--- a/plugin.video.alfa/servers/rutube.json
+++ b/plugin.video.alfa/servers/rutube.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_rutube.png",
-  "version": 1
+  "thumbnail": "server_rutube.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/sendvid.json b/plugin.video.alfa/servers/sendvid.json
index c24c0493..5f2713fa 100755
--- a/plugin.video.alfa/servers/sendvid.json
+++ b/plugin.video.alfa/servers/sendvid.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/speedvideo.json b/plugin.video.alfa/servers/speedvideo.json
index a4657e00..d9bffbb3 100755
--- a/plugin.video.alfa/servers/speedvideo.json
+++ b/plugin.video.alfa/servers/speedvideo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/stagevu.json b/plugin.video.alfa/servers/stagevu.json
index 1dbc8a47..8040f2c2 100755
--- a/plugin.video.alfa/servers/stagevu.json
+++ b/plugin.video.alfa/servers/stagevu.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -51,6 +45,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/stormo.json b/plugin.video.alfa/servers/stormo.json
index 62c9a356..e139a61c 100755
--- a/plugin.video.alfa/servers/stormo.json
+++ b/plugin.video.alfa/servers/stormo.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "28/01/2017",
-      "description": "Arreglado por cambios en la web"
-    },
-    {
-      "date": "09/07/2016",
-      "description": "Version inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/mTYCw5E.png",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/mTYCw5E.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/streamango.json b/plugin.video.alfa/servers/streamango.json
index 420b1055..ef6a2dc0 100755
--- a/plugin.video.alfa/servers/streamango.json
+++ b/plugin.video.alfa/servers/streamango.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "22/04/2017",
-      "description": "Nuevo conector"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/o8XR8fL.png",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/o8XR8fL.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/streamcherry.json b/plugin.video.alfa/servers/streamcherry.json
index 6f31d165..a2783201 100644
--- a/plugin.video.alfa/servers/streamcherry.json
+++ b/plugin.video.alfa/servers/streamcherry.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "28/06/2017",
-      "description": "Nuevo conector"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/l45Tk0G.png",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/l45Tk0G.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/streamcloud.json b/plugin.video.alfa/servers/streamcloud.json
index bd3291a2..e19e4da0 100755
--- a/plugin.video.alfa/servers/streamcloud.json
+++ b/plugin.video.alfa/servers/streamcloud.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "09/03/2017",
-      "description": "No detectaba\"archivo no encontrado\""
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Version inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [
       "http://streamcloud.eu/stylesheets",
@@ -62,6 +52,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_streamcloud.png",
-  "version": 1
+  "thumbnail": "server_streamcloud.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/streame.json b/plugin.video.alfa/servers/streame.json
index fc9ba3e3..851bbbaa 100755
--- a/plugin.video.alfa/servers/streame.json
+++ b/plugin.video.alfa/servers/streame.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/streaminto.json b/plugin.video.alfa/servers/streaminto.json
index c9e60e71..e9857ac2 100755
--- a/plugin.video.alfa/servers/streaminto.json
+++ b/plugin.video.alfa/servers/streaminto.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "22/06/2017",
-      "description": "Actualizado a httptools"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [
       "http://streamin.to/embed-theme.html",
@@ -64,6 +54,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_streaminto.png",
-  "version": 1
+  "thumbnail": "server_streaminto.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/streamixcloud.json b/plugin.video.alfa/servers/streamixcloud.json
index b28f7120..2b67a81e 100755
--- a/plugin.video.alfa/servers/streamixcloud.json
+++ b/plugin.video.alfa/servers/streamixcloud.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "16/05/2017",
-      "description": "Primera versión"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/NuD85Py.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/NuD85Py.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/streamplay.json b/plugin.video.alfa/servers/streamplay.json
index f04ab61a..50b71f3d 100755
--- a/plugin.video.alfa/servers/streamplay.json
+++ b/plugin.video.alfa/servers/streamplay.json
@@ -1,35 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "14/06/2017",
-      "description": "Reparado por robalo"
-    },
-    {
-      "date": "09/06/2017",
-      "description": "Reparado por robalo"
-    },
-    {
-      "date": "31/05/2017",
-      "description": "Corregido tras cambios en la ofuscación de los enlaces"
-    },
-    {
-      "date": "28/04/2017",
-      "description": "Cambio en la url embebida"
-    },
-    {
-      "date": "28/03/2017",
-      "description": "Reparado debido a que se necesita el referer para cargar la pagina y los videos"
-    },
-    {
-      "date": "25/01/2017",
-      "description": "Mejorado el conector gracias al método jhexdecode de robalo, reparado y adaptado al uso de httptools"
-    },
-    {
-      "date": "11/01/2016",
-      "description": "Reparado por cambios"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -68,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s1.postimg.org/912d5vxmv3/streamplay1.png",
-  "version": 1
+  "thumbnail": "https://s1.postimg.org/912d5vxmv3/streamplay1.png"
 }
diff --git a/plugin.video.alfa/servers/thevideome.json b/plugin.video.alfa/servers/thevideome.json
index b353ed66..666799bb 100755
--- a/plugin.video.alfa/servers/thevideome.json
+++ b/plugin.video.alfa/servers/thevideome.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "27/02/2017",
-      "description": "Reparado conector"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Primera versión"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s26.postimg.org/fzmu2c761/thevideo.me1.png",
-  "version": 1
+  "thumbnail": "https://s26.postimg.org/fzmu2c761/thevideo.me1.png"
 }
diff --git a/plugin.video.alfa/servers/thevideos.json b/plugin.video.alfa/servers/thevideos.json
index bd41fe23..bbb93320 100755
--- a/plugin.video.alfa/servers/thevideos.json
+++ b/plugin.video.alfa/servers/thevideos.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/torrent.json b/plugin.video.alfa/servers/torrent.json
index 5be2fb23..b498fd68 100644
--- a/plugin.video.alfa/servers/torrent.json
+++ b/plugin.video.alfa/servers/torrent.json
@@ -32,12 +32,6 @@
       "url": "plugin://plugin.video.torrentin/?uri=%s&image="
     }
   ],
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -83,6 +77,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/tunepk.json b/plugin.video.alfa/servers/tunepk.json
index 6f50ae4c..4c08bec0 100755
--- a/plugin.video.alfa/servers/tunepk.json
+++ b/plugin.video.alfa/servers/tunepk.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/turbobit.json b/plugin.video.alfa/servers/turbobit.json
index 817fcda7..89a37aba 100755
--- a/plugin.video.alfa/servers/turbobit.json
+++ b/plugin.video.alfa/servers/turbobit.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_turbobit.png",
-  "version": 1
+  "thumbnail": "server_turbobit.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/turbovideos.json b/plugin.video.alfa/servers/turbovideos.json
index a76754d3..ec36ef6d 100755
--- a/plugin.video.alfa/servers/turbovideos.json
+++ b/plugin.video.alfa/servers/turbovideos.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/tusfiles.json b/plugin.video.alfa/servers/tusfiles.json
index 517a5020..749732b0 100755
--- a/plugin.video.alfa/servers/tusfiles.json
+++ b/plugin.video.alfa/servers/tusfiles.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "16/03/2017",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/tutv.json b/plugin.video.alfa/servers/tutv.json
index e977b6cf..6d3b260a 100755
--- a/plugin.video.alfa/servers/tutv.json
+++ b/plugin.video.alfa/servers/tutv.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/uploadedto.json b/plugin.video.alfa/servers/uploadedto.json
index fa8cc12f..773c2770 100755
--- a/plugin.video.alfa/servers/uploadedto.json
+++ b/plugin.video.alfa/servers/uploadedto.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [
       "http://uploaded.net/file/ref"
@@ -86,6 +80,5 @@
       "visible": true
     }
   ],
-  "thumbnail": "server_uploadedto.png",
-  "version": 1
+  "thumbnail": "server_uploadedto.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/uptobox.json b/plugin.video.alfa/servers/uptobox.json
index be396299..34781cb8 100755
--- a/plugin.video.alfa/servers/uptobox.json
+++ b/plugin.video.alfa/servers/uptobox.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -52,6 +46,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_uptobox.png",
-  "version": 1
+  "thumbnail": "server_uptobox.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/userscloud.json b/plugin.video.alfa/servers/userscloud.json
index 857fd1aa..6a4280a4 100755
--- a/plugin.video.alfa/servers/userscloud.json
+++ b/plugin.video.alfa/servers/userscloud.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "21/03/2017",
-      "description": "Primera version"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/u4W2DgA.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/u4W2DgA.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/veehd.json b/plugin.video.alfa/servers/veehd.json
deleted file mode 100755
index d012c1bc..00000000
--- a/plugin.video.alfa/servers/veehd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "active": false,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(veehd.com/video/\\d+\\#)",
-        "url": "http://\\1"
-      }
-    ]
-  },
-  "free": false,
-  "id": "veehd",
-  "name": "veehd",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "Incluir en lista negra",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "Incluir en lista de favoritos",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "version": 1
-}
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/veehd.py b/plugin.video.alfa/servers/veehd.py
deleted file mode 100755
index 7bb78175..00000000
--- a/plugin.video.alfa/servers/veehd.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import urlparse
-
-from core import scrapertools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-
-    headers = []
-    headers.append(['User-Agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20100101 Firefox/17.0'])
-    setcookie = scrapertools.get_header_from_response(page_url, header_to_get="set-cookie")
-    logger.info("setcookie=" + setcookie)
-    try:
-        cookie = scrapertools.get_match(setcookie, "(PHPSESSID.*?)\;")
-    except:
-        cookie = ""
-
-    if cookie != "":
-        headers.append(['Cookie', cookie + "; pp=1356263122; ppt=1"])
-
-    data = scrapertools.cache_page(page_url, headers=headers)
-    # logger.info("data="+data)
-
-    url = scrapertools.get_match(data, '\$\("\#playeriframe"\).attr\(\{src \: "([^"]+)"')
-    url = urlparse.urljoin(page_url, url)
-    logger.info("url=" + url)
-
-    headers.append(['Referer', page_url[:-1]])
-    data = scrapertools.cache_page(url, headers=headers)
-    logger.info("data=" + data)
-
-    # # <param name="src" value="http://v35.veehd.com/dl/f118c68806e2a98ca38a70b44b89d52b/1356264992/6000.4623246.avi&b=390">
-    # media_url = scrapertools.get_match(data, '<param name="src"value="([^"]+)"')
-
-    video_urls = []
-
-    # if len(matches) > 0:
-    #     video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [veehd]", media_url])
-
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-
-    return video_urls
diff --git a/plugin.video.alfa/servers/veoh.json b/plugin.video.alfa/servers/veoh.json
index f7b7e04a..70b5dd7b 100755
--- a/plugin.video.alfa/servers/veoh.json
+++ b/plugin.video.alfa/servers/veoh.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidabc.json b/plugin.video.alfa/servers/vidabc.json
index 90abffe2..c2a8e2a3 100755
--- a/plugin.video.alfa/servers/vidabc.json
+++ b/plugin.video.alfa/servers/vidabc.json
@@ -1,23 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "22/06/17",
-      "description": "Detectado archivo borrado"
-    },
-    {
-      "date": "05/06/17",
-      "description": "Detectado que el archivo se está procesando"
-    },
-    {
-      "date": "10/05/17",
-      "description": "Reparado por robalo, yo solo lo subí al github"
-    },
-    {
-      "date": "24/12/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -55,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/videowood.json b/plugin.video.alfa/servers/videowood.json
index a89e5f03..0bd5bb09 100755
--- a/plugin.video.alfa/servers/videowood.json
+++ b/plugin.video.alfa/servers/videowood.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidgg.json b/plugin.video.alfa/servers/vidgg.json
index 05aaea6a..eab438c2 100755
--- a/plugin.video.alfa/servers/vidgg.json
+++ b/plugin.video.alfa/servers/vidgg.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "28/01/2017",
-      "description": "Arreglado por cambios en la web"
-    },
-    {
-      "date": "25/02/2016",
-      "description": "Version inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -47,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidgot.json b/plugin.video.alfa/servers/vidgot.json
index cdb643b3..4321ea51 100755
--- a/plugin.video.alfa/servers/vidgot.json
+++ b/plugin.video.alfa/servers/vidgot.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "21/03/2017",
-      "description": "Primera version"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/tAI34bF.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/tAI34bF.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidlox.json b/plugin.video.alfa/servers/vidlox.json
index f3d1e845..6fd27520 100644
--- a/plugin.video.alfa/servers/vidlox.json
+++ b/plugin.video.alfa/servers/vidlox.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "03/08/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s1.postimg.org/wathgtvin/logo-vidlox1.png",
-  "version": 1
+  "thumbnail": "https://s1.postimg.org/wathgtvin/logo-vidlox1.png"
 }
diff --git a/plugin.video.alfa/servers/vidoza.json b/plugin.video.alfa/servers/vidoza.json
index 60a99d29..19e42f98 100755
--- a/plugin.video.alfa/servers/vidoza.json
+++ b/plugin.video.alfa/servers/vidoza.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "28/05/2017",
-      "description": "Nuevo conector"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/YefcBBY.png",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/YefcBBY.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidspot.json b/plugin.video.alfa/servers/vidspot.json
index 6e49bb6b..df67a563 100755
--- a/plugin.video.alfa/servers/vidspot.json
+++ b/plugin.video.alfa/servers/vidspot.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "04/06/2016",
-      "description": "Reparado, utiliza proxy en caso que salte el geobloqueo"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [
       "http://vidspot.net/embed-theme.html",
@@ -75,6 +69,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_vidspot.png",
-  "version": 1
+  "thumbnail": "server_vidspot.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidtodo.json b/plugin.video.alfa/servers/vidtodo.json
index 01ab698d..5accb58b 100755
--- a/plugin.video.alfa/servers/vidtodo.json
+++ b/plugin.video.alfa/servers/vidtodo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "24/12/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidtome.json b/plugin.video.alfa/servers/vidtome.json
index e08c33a6..bf3eb839 100755
--- a/plugin.video.alfa/servers/vidtome.json
+++ b/plugin.video.alfa/servers/vidtome.json
@@ -1,19 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "26/06/2017",
-      "description": "Patrón actualizado"
-    },
-    {
-      "date": "21/03/2017",
-      "description": "Conector corregido"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -51,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidup.json b/plugin.video.alfa/servers/vidup.json
index 275a0e27..aae98f24 100755
--- a/plugin.video.alfa/servers/vidup.json
+++ b/plugin.video.alfa/servers/vidup.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "21/03/2017",
-      "description": "Primera version"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/sZvy8IC.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/sZvy8IC.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vidzi.json b/plugin.video.alfa/servers/vidzi.json
index 9ca4cc80..81d7be88 100755
--- a/plugin.video.alfa/servers/vidzi.json
+++ b/plugin.video.alfa/servers/vidzi.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "22/04/2017",
-      "description": "Corregido por cambios"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -52,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s1.postimg.org/597or3a31b/vidzi1.png",
-  "version": 1
+  "thumbnail": "https://s1.postimg.org/597or3a31b/vidzi1.png"
 }
diff --git a/plugin.video.alfa/servers/vimeo.json b/plugin.video.alfa/servers/vimeo.json
index 9d1e1fa1..dcacabc4 100755
--- a/plugin.video.alfa/servers/vimeo.json
+++ b/plugin.video.alfa/servers/vimeo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "https://s26.postimg.org/vo685y2bt/vimeo1.png",
-  "version": 1
+  "thumbnail": "https://s26.postimg.org/vo685y2bt/vimeo1.png"
 }
diff --git a/plugin.video.alfa/servers/vimpleru.json b/plugin.video.alfa/servers/vimpleru.json
index 137d518d..b196c7de 100755
--- a/plugin.video.alfa/servers/vimpleru.json
+++ b/plugin.video.alfa/servers/vimpleru.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "05/03/2017",
-      "description": "Reparado por cambios"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -53,6 +43,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_vimpleru.png",
-  "version": 1
+  "thumbnail": "server_vimpleru.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vk.json b/plugin.video.alfa/servers/vk.json
index b77c9620..7c6560f1 100755
--- a/plugin.video.alfa/servers/vk.json
+++ b/plugin.video.alfa/servers/vk.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "11/01/2017",
-      "description": "Reparado por cambios"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -48,6 +42,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_vk.png",
-  "version": 1
+  "thumbnail": "server_vk.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/vshare.json b/plugin.video.alfa/servers/vshare.json
index 5e6f2c48..04faa1bb 100644
--- a/plugin.video.alfa/servers/vshare.json
+++ b/plugin.video.alfa/servers/vshare.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "27/08/2017",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "patterns": [
       {
@@ -45,6 +39,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_vshare.png",
-  "version": 1
+  "thumbnail": "server_vshare.png"
 }
diff --git a/plugin.video.alfa/servers/watchers.json b/plugin.video.alfa/servers/watchers.json
index 23044007..259de9ec 100755
--- a/plugin.video.alfa/servers/watchers.json
+++ b/plugin.video.alfa/servers/watchers.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "09/01/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/WApzSMn.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/WApzSMn.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/watchvideo.json b/plugin.video.alfa/servers/watchvideo.json
index ba49d255..4ade5b32 100755
--- a/plugin.video.alfa/servers/watchvideo.json
+++ b/plugin.video.alfa/servers/watchvideo.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "21/03/2017",
-      "description": "Primera version"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/vDev2I6.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/vDev2I6.png?1"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/wholecloud.json b/plugin.video.alfa/servers/wholecloud.json
index 96b6e430..693176ae 100755
--- a/plugin.video.alfa/servers/wholecloud.json
+++ b/plugin.video.alfa/servers/wholecloud.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "27/02/2017",
-      "description": "Primera versión"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/yIAQurm.png",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/yIAQurm.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/xvideos.json b/plugin.video.alfa/servers/xvideos.json
index 8fd5a975..dd1c309b 100755
--- a/plugin.video.alfa/servers/xvideos.json
+++ b/plugin.video.alfa/servers/xvideos.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -43,6 +37,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/yourupload.json b/plugin.video.alfa/servers/yourupload.json
index 7e660487..31c4511b 100755
--- a/plugin.video.alfa/servers/yourupload.json
+++ b/plugin.video.alfa/servers/yourupload.json
@@ -1,19 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "05/03/2017",
-      "description": "Reparado por cambios"
-    },
-    {
-      "date": "09/02/2017",
-      "description": "Reparado y adaptado al uso de httptools"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [
       "http://www.yourupload.com/embed/embed"
@@ -58,6 +44,5 @@
       "visible": false
     }
   ],
-  "thumbnail" : "https://s1.postimg.org/4wje61el4f/yourupload1.png",
-  "version": 1
+  "thumbnail" : "https://s1.postimg.org/4wje61el4f/yourupload1.png"
 }
diff --git a/plugin.video.alfa/servers/youtube.json b/plugin.video.alfa/servers/youtube.json
index f2518ec8..4c12dd1c 100755
--- a/plugin.video.alfa/servers/youtube.json
+++ b/plugin.video.alfa/servers/youtube.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "03/02/2017",
-      "description": "Adaptado para el uso de mpd (calidades 1080p y superiores) en Kodi 17. Reestructurado parte del código"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -60,6 +50,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "server_youtube.png",
-  "version": 1
+  "thumbnail": "server_youtube.png"
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/youwatch.json b/plugin.video.alfa/servers/youwatch.json
index 5e6428c4..9bdd8ef4 100755
--- a/plugin.video.alfa/servers/youwatch.json
+++ b/plugin.video.alfa/servers/youwatch.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "28/03/2017",
-      "description": "Corregido conector"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión incial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -50,6 +40,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/zippyshare.json b/plugin.video.alfa/servers/zippyshare.json
index 3ec8f8f8..387b997a 100755
--- a/plugin.video.alfa/servers/zippyshare.json
+++ b/plugin.video.alfa/servers/zippyshare.json
@@ -1,15 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "03/03/2017",
-      "description": "Corregido por cambios en el servidor y añadido como free"
-    },
-    {
-      "date": "25/03/2016",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -51,6 +41,5 @@
       "type": "list",
       "visible": false
     }
-  ],
-  "version": 1
+  ]
 }
\ No newline at end of file
diff --git a/plugin.video.alfa/servers/zstream.json b/plugin.video.alfa/servers/zstream.json
index 756d60a3..83f692d6 100755
--- a/plugin.video.alfa/servers/zstream.json
+++ b/plugin.video.alfa/servers/zstream.json
@@ -1,11 +1,5 @@
 {
   "active": true,
-  "changes": [
-    {
-      "date": "09/01/2017",
-      "description": "Versión inicial"
-    }
-  ],
   "find_videos": {
     "ignore_urls": [],
     "patterns": [
@@ -44,6 +38,5 @@
       "visible": false
     }
   ],
-  "thumbnail": "http://i.imgur.com/UJMfMZJ.png?1",
-  "version": 1
+  "thumbnail": "http://i.imgur.com/UJMfMZJ.png?1"
 }
\ No newline at end of file