diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.1337x/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.1337x/settings.xml
index c838c19ac4b0d7d82aa6c41dd87056100fda9915..e4e09a24bb4f4124c9b5f19178756f0848e472c0 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.1337x/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.1337x/settings.xml
@@ -1,12 +1,11 @@
 <settings>
     <setting id="animeFolder" value="/storage/downloads/p2p/anime/" />
-    <setting id="duplicated" value="true" />
-    <setting id="firstOpen" value="NO" />
+    <setting id="duplicated" value="false" />
     <setting id="infoLabels" value="true" />
     <setting id="movieFolder" value="/storage/downloads/p2p/movies/" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="showFolder" value="/storage/downloads/p2p/tvshows/" />
     <setting id="timeNotification" value="1.500000" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.adryanlist/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.adryanlist/settings.xml
index fe80d29c5cd4c67cde6ed5cd75d1f5ebe68bdf19..7653f4c53efcb93be99c6f5da3d700fc319242d4 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.adryanlist/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.adryanlist/settings.xml
@@ -1,3 +1,19 @@
 <settings>
-    <setting id="Updatecommonresolvers" value="true" />
+    <setting id="1080pquality" value="false" />
+    <setting id="add_playlist" value="false" />
+    <setting id="ask_playlist_items" value="false" />
+    <setting id="browse_community" value="false" />
+    <setting id="browse_xml_database" value="false" />
+    <setting id="choose_source" value="0" />
+    <setting id="debug" value="false" />
+    <setting id="donotshowbychannels" value="false" />
+    <setting id="genesisorpulsar" value="0" />
+    <setting id="logo-folderPath" value="" />
+    <setting id="new_file_source" value="" />
+    <setting id="new_url_source" value="" />
+    <setting id="parentalblocked" value="false" />
+    <setting id="parentalblockedpin" value="" />
+    <setting id="save_location" value="/storage/downloads/livestreams/" />
+    <setting id="searchotherplugins" value="false" />
+    <setting id="use_thumb" value="false" />
 </settings>
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.elitetorrent/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.elitetorrent/settings.xml
index a74d6ec90642ea611a79d0cfdb3f3747e5ea8701..874f668a205a81733fb5eb9d8637779df287a094 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.elitetorrent/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.elitetorrent/settings.xml
@@ -1,15 +1,14 @@
 <settings>
     <setting id="duplicated" value="true" />
-    <setting id="firstOpen" value="NO" />
     <setting id="infoLabels" value="true" />
     <setting id="movieFolder" value="/storage/downloads/p2p/movies/" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="showFolder" value="/storage/downloads/p2p/tvshows/" />
     <setting id="timeNotification" value="1.500000" />
     <setting id="urlAddress" value="http://www.elitetorrent.net" />
-    <setting id="viewMode" value="0" />
+    <setting id="viewMode" value="516" />
     <setting id="viewUrl" value="true" />
 </settings>
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.estrenotorrent/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.estrenotorrent/settings.xml
index 763e18879be60cac7db48c14cc0f5ac9aa5b03ea..22f3da17d28894f43eec92d32b42f9be866eca9f 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.estrenotorrent/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.estrenotorrent/settings.xml
@@ -1,6 +1,5 @@
 <settings>
     <setting id="duplicated" value="true" />
-    <setting id="firstOpen" value="NO" />
     <setting id="infoLabels" value="true" />
     <setting id="movieFolder" value="/storage/downloads/p2p/movies/" />
     <setting id="overwrite" value="true" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.eztv/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.eztv/settings.xml
index bc501198e6dd14b199a30183aa44c34505815316..38fd78574bd70a913f331df5bd2b12c8d66ec0fb 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.eztv/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.eztv/settings.xml
@@ -4,7 +4,7 @@
     <setting id="infoLabels" value="true" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="false" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="showFolder" value="/storage/downloads/p2p/tvshows/" />
     <setting id="timeNotification" value="1.500000" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.genesis/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.genesis/settings.xml
index 6e4e57d2216952b7b99ebb12188af4059fa071b5..ad84c10f1983bcb1e7312b0212ad6934efab7c23 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.genesis/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.genesis/settings.xml
@@ -7,13 +7,13 @@
     <setting id="animeultima_tv" value="true" />
     <setting id="appearance" value="GOne" />
     <setting id="autoconvert_utf8" value="true" />
-    <setting id="autoplay" value="true" />
-    <setting id="autoplay_library" value="true" />
+    <setting id="autoplay" value="false" />
+    <setting id="autoplay_library" value="false" />
     <setting id="beinmovie" value="true" />
-    <setting id="calendar_widget" value="1" />
-    <setting id="check_episode_link" value="false" />
+    <setting id="calendar_widget" value="0" />
+    <setting id="check_episode_link" value="true" />
     <setting id="check_library" value="true" />
-    <setting id="check_movie_link" value="false" />
+    <setting id="check_movie_link" value="true" />
     <setting id="directdl_tv" value="true" />
     <setting id="dizibox_tv" value="true" />
     <setting id="dizigoldv2_tv" value="true" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.horriblesubsviewer/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.horriblesubsviewer/settings.xml
index 073e494f6632fc301c1f16e02f641d74cf735c2d..17ca1445ce4602990d9eb258018cb5a7387b2294 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.horriblesubsviewer/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.horriblesubsviewer/settings.xml
@@ -1,11 +1,10 @@
 <settings>
     <setting id="animeFolder" value="/storage/downloads/p2p/anime/" />
     <setting id="duplicated" value="true" />
-    <setting id="firstOpen" value="NO" />
     <setting id="infoLabels" value="true" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="timeNotification" value="1.500000" />
     <setting id="tvKeyAllowed" value="" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.kickass/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.kickass/settings.xml
index 9fead5a4f2d0595f20e894c1132b3626d3664b95..844ddc7b79a20ea6d0c55ef5f2d22d839619849c 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.kickass/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.kickass/settings.xml
@@ -1,12 +1,12 @@
 <settings>
-    <setting id="animeFolder" value="/storage/downloads/p2p/anime/" />
     <setting id="duplicated" value="false" />
+    <setting id="animeFolder" value="/storage/downloads/p2p/anime/" />
     <setting id="firstOpen" value="NO" />
     <setting id="infoLabels" value="true" />
     <setting id="movieFolder" value="/storage/downloads/p2p/movies/" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="false" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="showFolder" value="/storage/downloads/p2p/tvshows/" />
     <setting id="timeNotification" value="1.500000" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.magnetdl/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.magnetdl/settings.xml
index 2d3cccc2a81dbceae896d60fa1af029ae36d6279..c4ad084d0c3233cf52d48b7a0f90478fc89f1c14 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.magnetdl/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.magnetdl/settings.xml
@@ -1,12 +1,11 @@
 <settings>
     <setting id="animeFolder" value="/storage/downloads/p2p/anime/" />
     <setting id="duplicated" value="true" />
-    <setting id="firstOpen" value="NO" />
     <setting id="infoLabels" value="true" />
     <setting id="movieFolder" value="/storage/downloads/p2p/movies/" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="showFolder" value="/storage/downloads/p2p/tvshows/" />
     <setting id="timeNotification" value="1.500000" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.newpct1/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.newpct1/settings.xml
index 9482db9f7c19f1b3f1026a34cb29d94a1eece3e6..5465dc1bc808a50057a66f660d6604360f6ead02 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.newpct1/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.newpct1/settings.xml
@@ -1,11 +1,10 @@
 <settings>
     <setting id="duplicated" value="true" />
-    <setting id="firstOpen" value="NO" />
     <setting id="infoLabels" value="true" />
     <setting id="movieFolder" value="/storage/downloads/p2p/movies/" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="showFolder" value="/storage/downloads/p2p/tvshows/" />
     <setting id="timeNotification" value="1.500000" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pelisalacarta/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pelisalacarta/settings.xml
index 30449b434437dc7b2ed01766b4a544ce2de8f42d..7504d81d23e493cc58921e69246bd33bbe5cb8c0 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pelisalacarta/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pelisalacarta/settings.xml
@@ -1,17 +1,23 @@
 <settings>
+    <setting id="adult_mode" value="true" />
+    <setting id="adult_pin" value="" />
     <setting id="alldebridpassword" value="" />
     <setting id="alldebridpremium" value="false" />
     <setting id="alldebriduser" value="" />
+    <setting id="blacklist" value="" />
     <setting id="bookmarkpath" value="/storage/.cache/pelisalacarta/bookmarks" />
-    <setting id="cache.dir" value="" />
-    <setting id="debug" value="true" />
+    <setting id="channel_language" value="all" />
+    <setting id="debug" value="false" />
     <setting id="default_action" value="2" />
     <setting id="downloadlistpath" value="/storage/downloads/pelisalacarta/list" />
     <setting id="downloadpath" value="/storage/downloads/pelisalacarta" />
-    <setting id="enableadultmode" value="true" />
     <setting id="fileniumpassword" value="" />
     <setting id="fileniumpremium" value="false" />
     <setting id="fileniumuser" value="" />
+    <setting id="filesmonsterpassword" value="" />
+    <setting id="filesmonsterpremium" value="false" />
+    <setting id="filesmonsteruser" value="" />
+    <setting id="filter_servers" value="false" />
     <setting id="forceview" value="false" />
     <setting id="hdfullaccount" value="false" />
     <setting id="hdfullpassword" value="" />
@@ -19,9 +25,7 @@
     <setting id="hidepremium" value="true" />
     <setting id="jdownloader" value="http://127.0.0.1:10025" />
     <setting id="jdownloader_enabled" value="false" />
-    <setting id="languagefilter" value="0" />
     <setting id="librarypath" value="" />
-    <setting id="limite_busquedas" value="1" />
     <setting id="megaforoaccount" value="false" />
     <setting id="megaforopassword" value="" />
     <setting id="megaforouser" value="" />
@@ -34,7 +38,6 @@
     <setting id="mocosoftxaccount" value="false" />
     <setting id="mocosoftxpassword" value="" />
     <setting id="mocosoftxuser" value="" />
-    <setting id="modo_cache" value="0" />
     <setting id="nowvideopassword" value="" />
     <setting id="nowvideopremium" value="false" />
     <setting id="nowvideouser" value="" />
@@ -68,23 +71,16 @@
     <setting id="personalchannelurl5" value="http://pelisalacarta.mimediacenter.info/personalchannel/samplefeed.rss" />
     <setting id="player_mode" value="1" />
     <setting id="player_type" value="2" />
-    <setting id="playmaxaccount" value="false" />
-    <setting id="playmaxpassword" value="" />
-    <setting id="playmaxuser" value="" />
     <setting id="pordedeaccount" value="false" />
     <setting id="pordedenumberlinks" value="0" />
     <setting id="pordedepassword" value="" />
     <setting id="pordedeshowlinks" value="0" />
     <setting id="pordedesortlinks" value="5" />
     <setting id="pordedeuser" value="" />
-    <setting id="presets_buscados" value="high" />
     <setting id="pyload" value="http://127.0.0.1:8000" />
     <setting id="pyload_enabled" value="false" />
     <setting id="pyload_password" value="" />
     <setting id="pyload_user" value="" />
-    <setting id="quebajamosaccount" value="false" />
-    <setting id="quebajamospassword" value="" />
-    <setting id="quebajamosuser" value="" />
     <setting id="realdebridpassword" value="" />
     <setting id="realdebridpremium" value="false" />
     <setting id="realdebriduser" value="" />
@@ -95,10 +91,6 @@
     <setting id="seriesmuaccount" value="false" />
     <setting id="seriesmupassword" value="" />
     <setting id="seriesmuuser" value="" />
-    <setting id="stormtvaccount" value="false" />
-    <setting id="stormtvpassword" value="" />
-    <setting id="stormtvuser" value="" />
-    <setting id="subtitle_name" value="" />
     <setting id="thumbnail_type" value="1" />
     <setting id="torrentestrenosaccount" value="false" />
     <setting id="torrentestrenospassword" value="" />
@@ -109,4 +101,5 @@
     <setting id="uploadedtopassword" value="" />
     <setting id="uploadedtopremium" value="false" />
     <setting id="uploadedtouser" value="" />
+    <setting id="whitelist" value="" />
 </settings>
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/io.steeve.pulsar.ga b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/io.steeve.pulsar.ga
deleted file mode 100644
index c0e4928d1622bf3ec0b1e4f8b57c80170707ed7d..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/io.steeve.pulsar.ga and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/settings.xml
deleted file mode 100644
index 579c338488c904c55696a52da6160ee14d9a4368..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/settings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<settings>
-    <setting id="custom_provider_timeout" value="45" />
-    <setting id="custom_provider_timeout_enabled" value="true" />
-    <setting id="download_path" value="/storage/recordings/" />
-    <setting id="keep_files" value="false" />
-    <setting id="listen_port_max" value="7000" />
-    <setting id="listen_port_min" value="6889" />
-    <setting id="max_download_rate" value="" />
-    <setting id="max_upload_rate" value="" />
-    <setting id="socks_enabled" value="false" />
-    <setting id="socks_host" value="" />
-    <setting id="socks_login" value="" />
-    <setting id="socks_password" value="" />
-    <setting id="socks_port" value="1080" />
-</settings>
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.quasar/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.quasar/settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1e28798d4f152dabc7257c622cc643b3d9cfd9b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.quasar/settings.xml
@@ -0,0 +1,25 @@
+<settings>
+    <setting id="background_handling" value="true" />
+    <setting id="buffer_size" value="20" />
+    <setting id="choose_stream_auto" value="false" />
+    <setting id="connections_limit" value="" />
+    <setting id="custom_provider_timeout" value="4" />
+    <setting id="custom_provider_timeout_enabled" value="false" />
+    <setting id="download_path" value="/storage/downloads/pulsar/" />
+    <setting id="enable_overlay_status" value="true" />
+    <setting id="enable_pagination" value="true" />
+    <setting id="keep_files" value="false" />
+    <setting id="library_path" value="/storage/movies/" />
+    <setting id="limit_after_buffering" value="false" />
+    <setting id="listen_port_max" value="7000" />
+    <setting id="listen_port_min" value="6889" />
+    <setting id="max_download_rate" value="" />
+    <setting id="max_upload_rate" value="" />
+    <setting id="pre_release_updates" value="true" />
+    <setting id="session_save" value="15" />
+    <setting id="socks_enabled" value="false" />
+    <setting id="socks_host" value="" />
+    <setting id="socks_login" value="" />
+    <setting id="socks_password" value="" />
+    <setting id="socks_port" value="1080" />
+</settings>
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartsdance-electronic-songs b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartsdance-electronic-songs
deleted file mode 100644
index 0a5017f357e1b2eb330c11dcba213b493de94a48..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartsdance-electronic-songs
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?><rss version="2.0" xml:base="http://www.billboard.com/charts/dance-electronic-songs" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:c="http://s.opencalais.com/1/pred/" xmlns:sys="http://s.opencalais.com/1/type/sys/" xmlns:lid="http://s.opencalais.com/1/type/lid/" xmlns:cat="http://s.opencalais.com/1/type/cat/" xmlns:resolved="http://s.opencalais.com/1/type/er/" xmlns:cgeo="http://s.opencalais.com/1/type/er/Geo/" xmlns:eventfact="http://s.opencalais.com/1/type/em/r/" xmlns:entity="http://s.opencalais.com/1/type/em/e/" xmlns:cld="http://s.opencalais.com/1/linkeddata/pred/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:og="http://ogp.me/ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:sioc="http://rdfs.org/sioc/ns#" xmlns:sioct="http://rdfs.org/sioc/types#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-  <channel>
-    <title>Billboard - Hot Dance/Electronic Songs Chart</title>
-    <link>http://www.billboard.com</link>
-    <description>This week's most popular dance/electronic songs, based on radio airplay audience impressions as measured by Nielsen Music, sales data as compiled by Nielsen Music, club play, and streaming activity data from online music sources tracked by Nielsen Music.</description>
-    <language>en</language>
-    <item>
-  <title>1: Lean On</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Major Lazer &amp; DJ Snake Featuring M0</artist>
-  <chart_item_title>Lean On</chart_item_title>
-  <rank_this_week>1</rank_this_week>
-  <rank_last_week>1</rank_last_week>
-  <description>Lean On by Major Lazer &amp; DJ Snake Featuring M0 ranks #1</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>2: Where Are U Now</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Skrillex &amp; Diplo With Justin Bieber</artist>
-  <chart_item_title>Where Are U Now</chart_item_title>
-  <rank_this_week>2</rank_this_week>
-  <rank_last_week>2</rank_last_week>
-  <description>Where Are U Now by Skrillex &amp; Diplo With Justin Bieber ranks #2</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>3: How Deep Is Your Love</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Calvin Harris &amp; Disciples</artist>
-  <chart_item_title>How Deep Is Your Love</chart_item_title>
-  <rank_this_week>3</rank_this_week>
-  <rank_last_week>3</rank_last_week>
-  <description>How Deep Is Your Love by Calvin Harris &amp; Disciples ranks #3</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>4: Hey Mama</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>David Guetta Featuring Nicki Minaj, Bebe Rexha &amp; Afrojack</artist>
-  <chart_item_title>Hey Mama</chart_item_title>
-  <rank_this_week>4</rank_this_week>
-  <rank_last_week>4</rank_last_week>
-  <description>Hey Mama by David Guetta Featuring Nicki Minaj, Bebe Rexha &amp; Afrojack ranks #4</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>5: You Know You Like It</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>DJ Snake &amp; AlunaGeorge</artist>
-  <chart_item_title>You Know You Like It</chart_item_title>
-  <rank_this_week>5</rank_this_week>
-  <rank_last_week>5</rank_last_week>
-  <description>You Know You Like It by DJ Snake &amp; AlunaGeorge ranks #5</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>6: Powerful</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Major Lazer Featuring Ellie Goulding &amp; Tarrus Riley</artist>
-  <chart_item_title>Powerful</chart_item_title>
-  <rank_this_week>6</rank_this_week>
-  <rank_last_week>10</rank_last_week>
-  <description>Powerful by Major Lazer Featuring Ellie Goulding &amp; Tarrus Riley ranks #6</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>7: Hold My Hand</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Jess Glynne</artist>
-  <chart_item_title>Hold My Hand</chart_item_title>
-  <rank_this_week>7</rank_this_week>
-  <rank_last_week>6</rank_last_week>
-  <description>Hold My Hand by Jess Glynne ranks #7</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>8: Omen</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Disclosure Featuring Sam Smith</artist>
-  <chart_item_title>Omen</chart_item_title>
-  <rank_this_week>8</rank_this_week>
-  <rank_last_week>7</rank_last_week>
-  <description>Omen by Disclosure Featuring Sam Smith ranks #8</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>9: Firestone</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Kygo Featuring Conrad</artist>
-  <chart_item_title>Firestone</chart_item_title>
-  <rank_this_week>9</rank_this_week>
-  <rank_last_week>8</rank_last_week>
-  <description>Firestone by Kygo Featuring Conrad ranks #9</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>10: Beautiful Now</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Zedd Featuring Jon Bellion</artist>
-  <chart_item_title>Beautiful Now</chart_item_title>
-  <rank_this_week>10</rank_this_week>
-  <rank_last_week>9</rank_last_week>
-  <description>Beautiful Now by Zedd Featuring Jon Bellion ranks #10</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>11: Roses</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>The Chainsmokers Featuring ROZES</artist>
-  <chart_item_title>Roses</chart_item_title>
-  <rank_this_week>11</rank_this_week>
-  <rank_last_week>11</rank_last_week>
-  <description>Roses by The Chainsmokers Featuring ROZES ranks #11</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>12: Sugar</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Robin Schulz Featuring Francesco Yates</artist>
-  <chart_item_title>Sugar</chart_item_title>
-  <rank_this_week>12</rank_this_week>
-  <rank_last_week>12</rank_last_week>
-  <description>Sugar by Robin Schulz Featuring Francesco Yates ranks #12</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>13: Something Better</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Audien Featuring Lady Antebellum</artist>
-  <chart_item_title>Something Better</chart_item_title>
-  <rank_this_week>13</rank_this_week>
-  <rank_last_week>17</rank_last_week>
-  <description>Something Better by Audien Featuring Lady Antebellum ranks #13</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>14: Ain&#039;t Nobody (Loves Me Better)</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Felix Jaehn Featuring Jasmine Thompson</artist>
-  <chart_item_title>Ain&#039;t Nobody (Loves Me Better)</chart_item_title>
-  <rank_this_week>14</rank_this_week>
-  <rank_last_week>14</rank_last_week>
-  <description>Ain&#039;t Nobody (Loves Me Better) by Felix Jaehn Featuring Jasmine Thompson ranks #14</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>15: Waiting For Love</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Avicii</artist>
-  <chart_item_title>Waiting For Love</chart_item_title>
-  <rank_this_week>15</rank_this_week>
-  <rank_last_week>15</rank_last_week>
-  <description>Waiting For Love by Avicii ranks #15</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>16: Easy Love</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Sigala</artist>
-  <chart_item_title>Easy Love</chart_item_title>
-  <rank_this_week>16</rank_this_week>
-  <rank_last_week>18</rank_last_week>
-  <description>Easy Love by Sigala ranks #16</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>17: SummerThing!</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Afrojack Featuring Mike Taylor</artist>
-  <chart_item_title>SummerThing!</chart_item_title>
-  <rank_this_week>17</rank_this_week>
-  <rank_last_week>13</rank_last_week>
-  <description>SummerThing! by Afrojack Featuring Mike Taylor ranks #17</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>18: Here For You</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Kygo Featuring Ella Henderson</artist>
-  <chart_item_title>Here For You</chart_item_title>
-  <rank_this_week>18</rank_this_week>
-  <rank_last_week>16</rank_last_week>
-  <description>Here For You by Kygo Featuring Ella Henderson ranks #18</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>19: For A Better Day</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Avicii</artist>
-  <chart_item_title>For A Better Day</chart_item_title>
-  <rank_this_week>19</rank_this_week>
-  <rank_last_week>20</rank_last_week>
-  <description>For A Better Day by Avicii ranks #19</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>20: Show Me Love</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Sam Feldt Featuring Kimberly Anne</artist>
-  <chart_item_title>Show Me Love</chart_item_title>
-  <rank_this_week>20</rank_this_week>
-  <rank_last_week>21</rank_last_week>
-  <description>Show Me Love by Sam Feldt Featuring Kimberly Anne ranks #20</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>21: Coming Over</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Dillon Francis &amp; Kygo Featuring James Hersey</artist>
-  <chart_item_title>Coming Over</chart_item_title>
-  <rank_this_week>21</rank_this_week>
-  <rank_last_week>19</rank_last_week>
-  <description>Coming Over by Dillon Francis &amp; Kygo Featuring James Hersey ranks #21</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>22: Peanut Butter Jelly</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Galantis</artist>
-  <chart_item_title>Peanut Butter Jelly</chart_item_title>
-  <rank_this_week>22</rank_this_week>
-  <rank_last_week>23</rank_last_week>
-  <description>Peanut Butter Jelly by Galantis ranks #22</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>23: B**** I&#039;m Madonna</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Madonna Featuring Nicki Minaj</artist>
-  <chart_item_title>B**** I&#039;m Madonna</chart_item_title>
-  <rank_this_week>23</rank_this_week>
-  <rank_last_week>24</rank_last_week>
-  <description>B**** I&#039;m Madonna by Madonna Featuring Nicki Minaj ranks #23</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>24: Automatic</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>ZHU x AlunaGeorge</artist>
-  <chart_item_title>Automatic</chart_item_title>
-  <rank_this_week>24</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Automatic by ZHU x AlunaGeorge ranks #24</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-<item>
-  <title>25: Dessert</title>
-  <link>http://www.billboard.com/charts/dance-electronic-songs</link>
-  <artist>Dawin</artist>
-  <chart_item_title>Dessert</chart_item_title>
-  <rank_this_week>25</rank_this_week>
-  <rank_last_week>27</rank_last_week>
-  <description>Dessert by Dawin ranks #25</description>
-  <category>Hot Dance/Electronic Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/dance-electronic-songs</guid>
- </item>
-  </channel>
-</rss>
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartshot-100 b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartshot-100
deleted file mode 100644
index 1ec9e4f448c9d4f724d3139fa8fce995fca7dd82..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartshot-100
+++ /dev/null
@@ -1,1208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?><rss version="2.0" xml:base="http://www.billboard.com/charts/hot-100" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:c="http://s.opencalais.com/1/pred/" xmlns:sys="http://s.opencalais.com/1/type/sys/" xmlns:lid="http://s.opencalais.com/1/type/lid/" xmlns:cat="http://s.opencalais.com/1/type/cat/" xmlns:resolved="http://s.opencalais.com/1/type/er/" xmlns:cgeo="http://s.opencalais.com/1/type/er/Geo/" xmlns:eventfact="http://s.opencalais.com/1/type/em/r/" xmlns:entity="http://s.opencalais.com/1/type/em/e/" xmlns:cld="http://s.opencalais.com/1/linkeddata/pred/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:og="http://ogp.me/ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:sioc="http://rdfs.org/sioc/ns#" xmlns:sioct="http://rdfs.org/sioc/types#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-  <channel>
-    <title>Billboard - The Hot 100 Chart</title>
-    <link>http://www.billboard.com</link>
-    <description>This week's most popular songs across all genres, ranked by radio airplay audience impressions as measured by Nielsen Music, sales data as compiled by Nielsen Music and streaming activity data provided by online music sources.</description>
-    <language>en</language>
-    <item>
-  <title>1: The Hills</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>The Weeknd</artist>
-  <chart_item_title>The Hills</chart_item_title>
-  <rank_this_week>1</rank_this_week>
-  <rank_last_week>1</rank_last_week>
-  <description>The Hills by The Weeknd ranks #1</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>2: What Do You Mean?</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Justin Bieber</artist>
-  <chart_item_title>What Do You Mean?</chart_item_title>
-  <rank_this_week>2</rank_this_week>
-  <rank_last_week>2</rank_last_week>
-  <description>What Do You Mean? by Justin Bieber ranks #2</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>3: Can&#039;t Feel My Face</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>The Weeknd</artist>
-  <chart_item_title>Can&#039;t Feel My Face</chart_item_title>
-  <rank_this_week>3</rank_this_week>
-  <rank_last_week>3</rank_last_week>
-  <description>Can&#039;t Feel My Face by The Weeknd ranks #3</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>4: Hotline Bling</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake</artist>
-  <chart_item_title>Hotline Bling</chart_item_title>
-  <rank_this_week>4</rank_this_week>
-  <rank_last_week>9</rank_last_week>
-  <description>Hotline Bling by Drake ranks #4</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>5: Watch Me</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Silento</artist>
-  <chart_item_title>Watch Me</chart_item_title>
-  <rank_this_week>5</rank_this_week>
-  <rank_last_week>4</rank_last_week>
-  <description>Watch Me by Silento ranks #5</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>6: 679</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Fetty Wap Featuring Remy Boyz</artist>
-  <chart_item_title>679</chart_item_title>
-  <rank_this_week>6</rank_this_week>
-  <rank_last_week>7</rank_last_week>
-  <description>679 by Fetty Wap Featuring Remy Boyz ranks #6</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>7: Locked Away</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>R. City Featuring Adam Levine</artist>
-  <chart_item_title>Locked Away</chart_item_title>
-  <rank_this_week>7</rank_this_week>
-  <rank_last_week>6</rank_last_week>
-  <description>Locked Away by R. City Featuring Adam Levine ranks #7</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>8: Good For You</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Selena Gomez Featuring A$AP Rocky</artist>
-  <chart_item_title>Good For You</chart_item_title>
-  <rank_this_week>8</rank_this_week>
-  <rank_last_week>5</rank_last_week>
-  <description>Good For You by Selena Gomez Featuring A$AP Rocky ranks #8</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>9: Cheerleader</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>OMI</artist>
-  <chart_item_title>Cheerleader</chart_item_title>
-  <rank_this_week>9</rank_this_week>
-  <rank_last_week>8</rank_last_week>
-  <description>Cheerleader by OMI ranks #9</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>10: Wildest Dreams</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Taylor Swift</artist>
-  <chart_item_title>Wildest Dreams</chart_item_title>
-  <rank_this_week>10</rank_this_week>
-  <rank_last_week>13</rank_last_week>
-  <description>Wildest Dreams by Taylor Swift ranks #10</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>11: Stitches</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Shawn Mendes</artist>
-  <chart_item_title>Stitches</chart_item_title>
-  <rank_this_week>11</rank_this_week>
-  <rank_last_week>12</rank_last_week>
-  <description>Stitches by Shawn Mendes ranks #11</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>12: Lean On</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Major Lazer &amp; DJ Snake Featuring M0</artist>
-  <chart_item_title>Lean On</chart_item_title>
-  <rank_this_week>12</rank_this_week>
-  <rank_last_week>10</rank_last_week>
-  <description>Lean On by Major Lazer &amp; DJ Snake Featuring M0 ranks #12</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>13: Photograph</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Ed Sheeran</artist>
-  <chart_item_title>Photograph</chart_item_title>
-  <rank_this_week>13</rank_this_week>
-  <rank_last_week>11</rank_last_week>
-  <description>Photograph by Ed Sheeran ranks #13</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>14: Uptown Funk!</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Mark Ronson Featuring Bruno Mars</artist>
-  <chart_item_title>Uptown Funk!</chart_item_title>
-  <rank_this_week>14</rank_this_week>
-  <rank_last_week>27</rank_last_week>
-  <description>Uptown Funk! by Mark Ronson Featuring Bruno Mars ranks #14</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>15: My Way</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Fetty Wap Featuring Monty</artist>
-  <chart_item_title>My Way</chart_item_title>
-  <rank_this_week>15</rank_this_week>
-  <rank_last_week>15</rank_last_week>
-  <description>My Way by Fetty Wap Featuring Monty ranks #15</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>16: Downtown</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Macklemore &amp; Ryan Lewis Featuring Eric Nally, Melle Mel, Kool Moe Dee &amp; Grandmaster Caz</artist>
-  <chart_item_title>Downtown</chart_item_title>
-  <rank_this_week>16</rank_this_week>
-  <rank_last_week>16</rank_last_week>
-  <description>Downtown by Macklemore &amp; Ryan Lewis Featuring Eric Nally, Melle Mel, Kool Moe Dee &amp; Grandmaster Caz ranks #16</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>17: Cool For The Summer</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Demi Lovato</artist>
-  <chart_item_title>Cool For The Summer</chart_item_title>
-  <rank_this_week>17</rank_this_week>
-  <rank_last_week>14</rank_last_week>
-  <description>Cool For The Summer by Demi Lovato ranks #17</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>18: Trap Queen</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Fetty Wap</artist>
-  <chart_item_title>Trap Queen</chart_item_title>
-  <rank_this_week>18</rank_this_week>
-  <rank_last_week>17</rank_last_week>
-  <description>Trap Queen by Fetty Wap ranks #18</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>19: Fight Song</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Rachel Platten</artist>
-  <chart_item_title>Fight Song</chart_item_title>
-  <rank_this_week>19</rank_this_week>
-  <rank_last_week>18</rank_last_week>
-  <description>Fight Song by Rachel Platten ranks #19</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>20: Hit The Quan</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>iHeartMemphis</artist>
-  <chart_item_title>Hit The Quan</chart_item_title>
-  <rank_this_week>20</rank_this_week>
-  <rank_last_week>21</rank_last_week>
-  <description>Hit The Quan by iHeartMemphis ranks #20</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>21: Marvin Gaye</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Charlie Puth Featuring Meghan Trainor</artist>
-  <chart_item_title>Marvin Gaye</chart_item_title>
-  <rank_this_week>21</rank_this_week>
-  <rank_last_week>22</rank_last_week>
-  <description>Marvin Gaye by Charlie Puth Featuring Meghan Trainor ranks #21</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>22: On My Mind</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Ellie Goulding</artist>
-  <chart_item_title>On My Mind</chart_item_title>
-  <rank_this_week>22</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>On My Mind by Ellie Goulding ranks #22</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>23: See You Again</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Wiz Khalifa Featuring Charlie Puth</artist>
-  <chart_item_title>See You Again</chart_item_title>
-  <rank_this_week>23</rank_this_week>
-  <rank_last_week>23</rank_last_week>
-  <description>See You Again by Wiz Khalifa Featuring Charlie Puth ranks #23</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>24: Where Are U Now</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Skrillex &amp; Diplo With Justin Bieber</artist>
-  <chart_item_title>Where Are U Now</chart_item_title>
-  <rank_this_week>24</rank_this_week>
-  <rank_last_week>19</rank_last_week>
-  <description>Where Are U Now by Skrillex &amp; Diplo With Justin Bieber ranks #24</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>25: Drag Me Down</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>One Direction</artist>
-  <chart_item_title>Drag Me Down</chart_item_title>
-  <rank_this_week>25</rank_this_week>
-  <rank_last_week>24</rank_last_week>
-  <description>Drag Me Down by One Direction ranks #25</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>26: Shut Up And Dance</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>WALK THE MOON</artist>
-  <chart_item_title>Shut Up And Dance</chart_item_title>
-  <rank_this_week>26</rank_this_week>
-  <rank_last_week>20</rank_last_week>
-  <description>Shut Up And Dance by WALK THE MOON ranks #26</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>27: Renegades</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>X Ambassadors</artist>
-  <chart_item_title>Renegades</chart_item_title>
-  <rank_this_week>27</rank_this_week>
-  <rank_last_week>28</rank_last_week>
-  <description>Renegades by X Ambassadors ranks #27</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>28: All Eyes On You</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Meek Mill Featuring Chris Brown &amp; Nicki Minaj</artist>
-  <chart_item_title>All Eyes On You</chart_item_title>
-  <rank_this_week>28</rank_this_week>
-  <rank_last_week>26</rank_last_week>
-  <description>All Eyes On You by Meek Mill Featuring Chris Brown &amp; Nicki Minaj ranks #28</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>29: Uma Thurman</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Fall Out Boy</artist>
-  <chart_item_title>Uma Thurman</chart_item_title>
-  <rank_this_week>29</rank_this_week>
-  <rank_last_week>25</rank_last_week>
-  <description>Uma Thurman by Fall Out Boy ranks #29</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>30: Ex&#039;s &amp; Oh&#039;s</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Elle King</artist>
-  <chart_item_title>Ex&#039;s &amp; Oh&#039;s</chart_item_title>
-  <rank_this_week>30</rank_this_week>
-  <rank_last_week>34</rank_last_week>
-  <description>Ex&#039;s &amp; Oh&#039;s by Elle King ranks #30</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>31: Love Myself</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Hailee Steinfeld</artist>
-  <chart_item_title>Love Myself</chart_item_title>
-  <rank_this_week>31</rank_this_week>
-  <rank_last_week>30</rank_last_week>
-  <description>Love Myself by Hailee Steinfeld ranks #31</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>32: Flex (Ooh Ooh Ooh)</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Rich Homie Quan</artist>
-  <chart_item_title>Flex (Ooh Ooh Ooh)</chart_item_title>
-  <rank_this_week>32</rank_this_week>
-  <rank_last_week>31</rank_last_week>
-  <description>Flex (Ooh Ooh Ooh) by Rich Homie Quan ranks #32</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>33: Where Ya At</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Future Featuring Drake</artist>
-  <chart_item_title>Where Ya At</chart_item_title>
-  <rank_this_week>33</rank_this_week>
-  <rank_last_week>47</rank_last_week>
-  <description>Where Ya At by Future Featuring Drake ranks #33</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>34: Back To Back</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake</artist>
-  <chart_item_title>Back To Back</chart_item_title>
-  <rank_this_week>34</rank_this_week>
-  <rank_last_week>33</rank_last_week>
-  <description>Back To Back by Drake ranks #34</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>35: Want To Want Me</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Jason Derulo</artist>
-  <chart_item_title>Want To Want Me</chart_item_title>
-  <rank_this_week>35</rank_this_week>
-  <rank_last_week>32</rank_last_week>
-  <description>Want To Want Me by Jason Derulo ranks #35</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>36: Strip It Down</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Luke Bryan</artist>
-  <chart_item_title>Strip It Down</chart_item_title>
-  <rank_this_week>36</rank_this_week>
-  <rank_last_week>40</rank_last_week>
-  <description>Strip It Down by Luke Bryan ranks #36</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>37: Bad Blood</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Taylor Swift Featuring Kendrick Lamar</artist>
-  <chart_item_title>Bad Blood</chart_item_title>
-  <rank_this_week>37</rank_this_week>
-  <rank_last_week>29</rank_last_week>
-  <description>Bad Blood by Taylor Swift Featuring Kendrick Lamar ranks #37</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>38: Thinking Out Loud</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Ed Sheeran</artist>
-  <chart_item_title>Thinking Out Loud</chart_item_title>
-  <rank_this_week>38</rank_this_week>
-  <rank_last_week>37</rank_last_week>
-  <description>Thinking Out Loud by Ed Sheeran ranks #38</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>39: How Deep Is Your Love</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Calvin Harris &amp; Disciples</artist>
-  <chart_item_title>How Deep Is Your Love</chart_item_title>
-  <rank_this_week>39</rank_this_week>
-  <rank_last_week>46</rank_last_week>
-  <description>How Deep Is Your Love by Calvin Harris &amp; Disciples ranks #39</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>40: John Cougar, John Deere, John 3:16</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Keith Urban</artist>
-  <chart_item_title>John Cougar, John Deere, John 3:16</chart_item_title>
-  <rank_this_week>40</rank_this_week>
-  <rank_last_week>41</rank_last_week>
-  <description>John Cougar, John Deere, John 3:16 by Keith Urban ranks #40</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>41: Like I&#039;m Gonna Lose You</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Meghan Trainor Featuring John Legend</artist>
-  <chart_item_title>Like I&#039;m Gonna Lose You</chart_item_title>
-  <rank_this_week>41</rank_this_week>
-  <rank_last_week>45</rank_last_week>
-  <description>Like I&#039;m Gonna Lose You by Meghan Trainor Featuring John Legend ranks #41</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>42: Earned It (Fifty Shades Of Grey)</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>The Weeknd</artist>
-  <chart_item_title>Earned It (Fifty Shades Of Grey)</chart_item_title>
-  <rank_this_week>42</rank_this_week>
-  <rank_last_week>36</rank_last_week>
-  <description>Earned It (Fifty Shades Of Grey) by The Weeknd ranks #42</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>43: Worth It</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Fifth Harmony Featuring Kid Ink</artist>
-  <chart_item_title>Worth It</chart_item_title>
-  <rank_this_week>43</rank_this_week>
-  <rank_last_week>35</rank_last_week>
-  <description>Worth It by Fifth Harmony Featuring Kid Ink ranks #43</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>44: Again</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Fetty Wap</artist>
-  <chart_item_title>Again</chart_item_title>
-  <rank_this_week>44</rank_this_week>
-  <rank_last_week>50</rank_last_week>
-  <description>Again by Fetty Wap ranks #44</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>45: Sugar</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Maroon 5</artist>
-  <chart_item_title>Sugar</chart_item_title>
-  <rank_this_week>45</rank_this_week>
-  <rank_last_week>49</rank_last_week>
-  <description>Sugar by Maroon 5 ranks #45</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>46: Classic Man</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Jidenna Featuring Roman GianArthur</artist>
-  <chart_item_title>Classic Man</chart_item_title>
-  <rank_this_week>46</rank_this_week>
-  <rank_last_week>39</rank_last_week>
-  <description>Classic Man by Jidenna Featuring Roman GianArthur ranks #46</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>47: Here</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Alessia Cara</artist>
-  <chart_item_title>Here</chart_item_title>
-  <rank_this_week>47</rank_this_week>
-  <rank_last_week>55</rank_last_week>
-  <description>Here by Alessia Cara ranks #47</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>48: Honey, I&#039;m Good.</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Andy Grammer</artist>
-  <chart_item_title>Honey, I&#039;m Good.</chart_item_title>
-  <rank_this_week>48</rank_this_week>
-  <rank_last_week>38</rank_last_week>
-  <description>Honey, I&#039;m Good. by Andy Grammer ranks #48</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>49: Same Old Love</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Selena Gomez</artist>
-  <chart_item_title>Same Old Love</chart_item_title>
-  <rank_this_week>49</rank_this_week>
-  <rank_last_week>43</rank_last_week>
-  <description>Same Old Love by Selena Gomez ranks #49</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>50: Planes</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Jeremih Featuring J. Cole</artist>
-  <chart_item_title>Planes</chart_item_title>
-  <rank_this_week>50</rank_this_week>
-  <rank_last_week>51</rank_last_week>
-  <description>Planes by Jeremih Featuring J. Cole ranks #50</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>51: House Party</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Sam Hunt</artist>
-  <chart_item_title>House Party</chart_item_title>
-  <rank_this_week>51</rank_this_week>
-  <rank_last_week>44</rank_last_week>
-  <description>House Party by Sam Hunt ranks #51</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>52: Jumpman</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>Jumpman</chart_item_title>
-  <rank_this_week>52</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Jumpman by Drake &amp; Future ranks #52</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>53: Lose My Mind</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Brett Eldredge</artist>
-  <chart_item_title>Lose My Mind</chart_item_title>
-  <rank_this_week>53</rank_this_week>
-  <rank_last_week>52</rank_last_week>
-  <description>Lose My Mind by Brett Eldredge ranks #53</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>54: Infinity</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>One Direction</artist>
-  <chart_item_title>Infinity</chart_item_title>
-  <rank_this_week>54</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Infinity by One Direction ranks #54</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>55: Save It For A Rainy Day</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Kenny Chesney</artist>
-  <chart_item_title>Save It For A Rainy Day</chart_item_title>
-  <rank_this_week>55</rank_this_week>
-  <rank_last_week>54</rank_last_week>
-  <description>Save It For A Rainy Day by Kenny Chesney ranks #55</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>56: Levels</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Nick Jonas</artist>
-  <chart_item_title>Levels</chart_item_title>
-  <rank_this_week>56</rank_this_week>
-  <rank_last_week>56</rank_last_week>
-  <description>Levels by Nick Jonas ranks #56</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>57: Buy Me A Boat</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Chris Janson</artist>
-  <chart_item_title>Buy Me A Boat</chart_item_title>
-  <rank_this_week>57</rank_this_week>
-  <rank_last_week>42</rank_last_week>
-  <description>Buy Me A Boat by Chris Janson ranks #57</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>58: El Perdon (Forgiveness)</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Nicky Jam &amp; Enrique Iglesias</artist>
-  <chart_item_title>El Perdon (Forgiveness)</chart_item_title>
-  <rank_this_week>58</rank_this_week>
-  <rank_last_week>57</rank_last_week>
-  <description>El Perdon (Forgiveness) by Nicky Jam &amp; Enrique Iglesias ranks #58</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>59: Right Hand</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake</artist>
-  <chart_item_title>Right Hand</chart_item_title>
-  <rank_this_week>59</rank_this_week>
-  <rank_last_week>66</rank_last_week>
-  <description>Right Hand by Drake ranks #59</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>60: Comfortable</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>K Camp</artist>
-  <chart_item_title>Comfortable</chart_item_title>
-  <rank_this_week>60</rank_this_week>
-  <rank_last_week>58</rank_last_week>
-  <description>Comfortable by K Camp ranks #60</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>61: RGF Island</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Fetty Wap</artist>
-  <chart_item_title>RGF Island</chart_item_title>
-  <rank_this_week>61</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>RGF Island by Fetty Wap ranks #61</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>62: Crash And Burn</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Thomas Rhett</artist>
-  <chart_item_title>Crash And Burn</chart_item_title>
-  <rank_this_week>62</rank_this_week>
-  <rank_last_week>53</rank_last_week>
-  <description>Crash And Burn by Thomas Rhett ranks #62</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>63: Smoke Break</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Carrie Underwood</artist>
-  <chart_item_title>Smoke Break</chart_item_title>
-  <rank_this_week>63</rank_this_week>
-  <rank_last_week>65</rank_last_week>
-  <description>Smoke Break by Carrie Underwood ranks #63</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>64: Break Up With Him</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Old Dominion</artist>
-  <chart_item_title>Break Up With Him</chart_item_title>
-  <rank_this_week>64</rank_this_week>
-  <rank_last_week>62</rank_last_week>
-  <description>Break Up With Him by Old Dominion ranks #64</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>65: Antidote</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Travi$ Scott</artist>
-  <chart_item_title>Antidote</chart_item_title>
-  <rank_this_week>65</rank_this_week>
-  <rank_last_week>73</rank_last_week>
-  <description>Antidote by Travi$ Scott ranks #65</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>66: Burning House</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Cam</artist>
-  <chart_item_title>Burning House</chart_item_title>
-  <rank_this_week>66</rank_this_week>
-  <rank_last_week>60</rank_last_week>
-  <description>Burning House by Cam ranks #66</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>67: Anything Goes</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Florida Georgia Line</artist>
-  <chart_item_title>Anything Goes</chart_item_title>
-  <rank_this_week>67</rank_this_week>
-  <rank_last_week>63</rank_last_week>
-  <description>Anything Goes by Florida Georgia Line ranks #67</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>68: This Could Be Us</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Rae Sremmurd</artist>
-  <chart_item_title>This Could Be Us</chart_item_title>
-  <rank_this_week>68</rank_this_week>
-  <rank_last_week>59</rank_last_week>
-  <description>This Could Be Us by Rae Sremmurd ranks #68</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>69: I&#039;m Comin&#039; Over</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Chris Young</artist>
-  <chart_item_title>I&#039;m Comin&#039; Over</chart_item_title>
-  <rank_this_week>69</rank_this_week>
-  <rank_last_week>69</rank_last_week>
-  <description>I&#039;m Comin&#039; Over by Chris Young ranks #69</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>70: Diamonds Dancing</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>Diamonds Dancing</chart_item_title>
-  <rank_this_week>70</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Diamonds Dancing by Drake &amp; Future ranks #70</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>71: $ave Dat Money</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Lil Dicky Featuring Fetty Wap &amp; Rich Homie Quan</artist>
-  <chart_item_title>$ave Dat Money</chart_item_title>
-  <rank_this_week>71</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>$ave Dat Money by Lil Dicky Featuring Fetty Wap &amp; Rich Homie Quan ranks #71</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>72: Fly</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Maddie &amp; Tae</artist>
-  <chart_item_title>Fly</chart_item_title>
-  <rank_this_week>72</rank_this_week>
-  <rank_last_week>61</rank_last_week>
-  <description>Fly by Maddie &amp; Tae ranks #72</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>73: White Iverson</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Post Malone</artist>
-  <chart_item_title>White Iverson</chart_item_title>
-  <rank_this_week>73</rank_this_week>
-  <rank_last_week>71</rank_last_week>
-  <description>White Iverson by Post Malone ranks #73</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>74: No Role Modelz</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>J. Cole</artist>
-  <chart_item_title>No Role Modelz</chart_item_title>
-  <rank_this_week>74</rank_this_week>
-  <rank_last_week>70</rank_last_week>
-  <description>No Role Modelz by J. Cole ranks #74</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>75: Big Rings</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>Big Rings</chart_item_title>
-  <rank_this_week>75</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Big Rings by Drake &amp; Future ranks #75</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>76: Ghost Town</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Adam Lambert</artist>
-  <chart_item_title>Ghost Town</chart_item_title>
-  <rank_this_week>76</rank_this_week>
-  <rank_last_week>67</rank_last_week>
-  <description>Ghost Town by Adam Lambert ranks #76</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>77: Liquor</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Chris Brown</artist>
-  <chart_item_title>Liquor</chart_item_title>
-  <rank_this_week>77</rank_this_week>
-  <rank_last_week>78</rank_last_week>
-  <description>Liquor by Chris Brown ranks #77</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>78: Black Magic</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Little Mix</artist>
-  <chart_item_title>Black Magic</chart_item_title>
-  <rank_this_week>78</rank_this_week>
-  <rank_last_week>68</rank_last_week>
-  <description>Black Magic by Little Mix ranks #78</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>79: Let Me See Ya Girl</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Cole Swindell</artist>
-  <chart_item_title>Let Me See Ya Girl</chart_item_title>
-  <rank_this_week>79</rank_this_week>
-  <rank_last_week>74</rank_last_week>
-  <description>Let Me See Ya Girl by Cole Swindell ranks #79</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>80: Nothin&#039; Like You</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Dan + Shay</artist>
-  <chart_item_title>Nothin&#039; Like You</chart_item_title>
-  <rank_this_week>80</rank_this_week>
-  <rank_last_week>75</rank_last_week>
-  <description>Nothin&#039; Like You by Dan + Shay ranks #80</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>81: Digital Dash</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>Digital Dash</chart_item_title>
-  <rank_this_week>81</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Digital Dash by Drake &amp; Future ranks #81</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>82: Gonna Wanna Tonight</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Chase Rice</artist>
-  <chart_item_title>Gonna Wanna Tonight</chart_item_title>
-  <rank_this_week>82</rank_this_week>
-  <rank_last_week>76</rank_last_week>
-  <description>Gonna Wanna Tonight by Chase Rice ranks #82</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>83: Kick The Dust Up</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Luke Bryan</artist>
-  <chart_item_title>Kick The Dust Up</chart_item_title>
-  <rank_this_week>83</rank_this_week>
-  <rank_last_week>72</rank_last_week>
-  <description>Kick The Dust Up by Luke Bryan ranks #83</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>84: Confident</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Demi Lovato</artist>
-  <chart_item_title>Confident</chart_item_title>
-  <rank_this_week>84</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Confident by Demi Lovato ranks #84</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>85: Live From The Gutter</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>Live From The Gutter</chart_item_title>
-  <rank_this_week>85</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Live From The Gutter by Drake &amp; Future ranks #85</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>86: Scholarships</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>Scholarships</chart_item_title>
-  <rank_this_week>86</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Scholarships by Drake &amp; Future ranks #86</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>87: Gonna</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Blake Shelton</artist>
-  <chart_item_title>Gonna</chart_item_title>
-  <rank_this_week>87</rank_this_week>
-  <rank_last_week>86</rank_last_week>
-  <description>Gonna by Blake Shelton ranks #87</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>88: 30 for 30 Freestyle</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake</artist>
-  <chart_item_title>30 for 30 Freestyle</chart_item_title>
-  <rank_this_week>88</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>30 for 30 Freestyle by Drake ranks #88</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>89: I&#039;m The Plug</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>I&#039;m The Plug</chart_item_title>
-  <rank_this_week>89</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>I&#039;m The Plug by Drake &amp; Future ranks #89</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>90: Runnin&#039; (Lose It All)</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Naughty Boy Featuring Beyonce &amp; Arrow Benjamin</artist>
-  <chart_item_title>Runnin&#039; (Lose It All)</chart_item_title>
-  <rank_this_week>90</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Runnin&#039; (Lose It All) by Naughty Boy Featuring Beyonce &amp; Arrow Benjamin ranks #90</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>91: Nothing But Trouble (Instagram Models)</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Lil Wayne &amp; Charlie Puth</artist>
-  <chart_item_title>Nothing But Trouble (Instagram Models)</chart_item_title>
-  <rank_this_week>91</rank_this_week>
-  <rank_last_week>87</rank_last_week>
-  <description>Nothing But Trouble (Instagram Models) by Lil Wayne &amp; Charlie Puth ranks #91</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>92: Die A Happy Man</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Thomas Rhett</artist>
-  <chart_item_title>Die A Happy Man</chart_item_title>
-  <rank_this_week>92</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Die A Happy Man by Thomas Rhett ranks #92</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>93: Come Get Her</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Rae Sremmurd</artist>
-  <chart_item_title>Come Get Her</chart_item_title>
-  <rank_this_week>93</rank_this_week>
-  <rank_last_week>100</rank_last_week>
-  <description>Come Get Her by Rae Sremmurd ranks #93</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>94: Ginza</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>J Balvin</artist>
-  <chart_item_title>Ginza</chart_item_title>
-  <rank_this_week>94</rank_this_week>
-  <rank_last_week>94</rank_last_week>
-  <description>Ginza by J Balvin ranks #94</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>95: Powerful</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Major Lazer Featuring Ellie Goulding &amp; Tarrus Riley</artist>
-  <chart_item_title>Powerful</chart_item_title>
-  <rank_this_week>95</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Powerful by Major Lazer Featuring Ellie Goulding &amp; Tarrus Riley ranks #95</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>96: Blase</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Ty Dolla $ign Featuring Future &amp; Rae Sremmurd</artist>
-  <chart_item_title>Blase</chart_item_title>
-  <rank_this_week>96</rank_this_week>
-  <rank_last_week>85</rank_last_week>
-  <description>Blase by Ty Dolla $ign Featuring Future &amp; Rae Sremmurd ranks #96</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>97: I Don&#039;t Like It, I Love It</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Flo Rida Featuring Robin Thicke &amp; Verdine White</artist>
-  <chart_item_title>I Don&#039;t Like It, I Love It</chart_item_title>
-  <rank_this_week>97</rank_this_week>
-  <rank_last_week>64</rank_last_week>
-  <description>I Don&#039;t Like It, I Love It by Flo Rida Featuring Robin Thicke &amp; Verdine White ranks #97</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>98: Alright</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Kendrick Lamar</artist>
-  <chart_item_title>Alright</chart_item_title>
-  <rank_this_week>98</rank_this_week>
-  <rank_last_week>81</rank_last_week>
-  <description>Alright by Kendrick Lamar ranks #98</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>99: Hold Each Other</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>A Great Big World Featuring FUTURISTIC</artist>
-  <chart_item_title>Hold Each Other</chart_item_title>
-  <rank_this_week>99</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Hold Each Other by A Great Big World Featuring FUTURISTIC ranks #99</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-<item>
-  <title>100: R.I.C.O.</title>
-  <link>http://www.billboard.com/charts/hot-100</link>
-  <artist>Meek Mill Featuring Drake</artist>
-  <chart_item_title>R.I.C.O.</chart_item_title>
-  <rank_this_week>100</rank_this_week>
-  <rank_last_week>84</rank_last_week>
-  <description>R.I.C.O. by Meek Mill Featuring Drake ranks #100</description>
-  <category>The Hot 100</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/hot-100</guid>
- </item>
-  </channel>
-</rss>
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartsr-b-hip-hop-songs b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartsr-b-hip-hop-songs
deleted file mode 100644
index cd080c5d76bfaac00de322ebff05685ea9301200..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.spotitube/cache/httpwww.billboard.comrsschartsr-b-hip-hop-songs
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?><rss version="2.0" xml:base="http://www.billboard.com/charts/r-b-hip-hop-songs" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:c="http://s.opencalais.com/1/pred/" xmlns:sys="http://s.opencalais.com/1/type/sys/" xmlns:lid="http://s.opencalais.com/1/type/lid/" xmlns:cat="http://s.opencalais.com/1/type/cat/" xmlns:resolved="http://s.opencalais.com/1/type/er/" xmlns:cgeo="http://s.opencalais.com/1/type/er/Geo/" xmlns:eventfact="http://s.opencalais.com/1/type/em/r/" xmlns:entity="http://s.opencalais.com/1/type/em/e/" xmlns:cld="http://s.opencalais.com/1/linkeddata/pred/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:og="http://ogp.me/ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:sioc="http://rdfs.org/sioc/ns#" xmlns:sioct="http://rdfs.org/sioc/types#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-  <channel>
-    <title>Billboard - Hot R&amp;amp;B/Hip-Hop Songs Chart</title>
-    <link>http://www.billboard.com</link>
-    <description>This week's most popular R&amp;B/Hip-Hop songs, based on radio airplay audience impressions as measured by Nielsen Music, sales data as compiled by Nielsen Music and streaming activity data from online music sources tracked by Nielsen Music. Songs are defined as current if they are newly-released titles, or songs receiving widespread airplay and/or sales activity for the first time.</description>
-    <language>en</language>
-    <item>
-  <title>1: The Hills</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>The Weeknd</artist>
-  <chart_item_title>The Hills</chart_item_title>
-  <rank_this_week>1</rank_this_week>
-  <rank_last_week>1</rank_last_week>
-  <description>The Hills by The Weeknd ranks #1</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>2: Can&#039;t Feel My Face</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>The Weeknd</artist>
-  <chart_item_title>Can&#039;t Feel My Face</chart_item_title>
-  <rank_this_week>2</rank_this_week>
-  <rank_last_week>2</rank_last_week>
-  <description>Can&#039;t Feel My Face by The Weeknd ranks #2</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>3: Hotline Bling</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Drake</artist>
-  <chart_item_title>Hotline Bling</chart_item_title>
-  <rank_this_week>3</rank_this_week>
-  <rank_last_week>5</rank_last_week>
-  <description>Hotline Bling by Drake ranks #3</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>4: Watch Me</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Silento</artist>
-  <chart_item_title>Watch Me</chart_item_title>
-  <rank_this_week>4</rank_this_week>
-  <rank_last_week>3</rank_last_week>
-  <description>Watch Me by Silento ranks #4</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>5: 679</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Fetty Wap Featuring Remy Boyz</artist>
-  <chart_item_title>679</chart_item_title>
-  <rank_this_week>5</rank_this_week>
-  <rank_last_week>4</rank_last_week>
-  <description>679 by Fetty Wap Featuring Remy Boyz ranks #5</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>6: My Way</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Fetty Wap Featuring Monty</artist>
-  <chart_item_title>My Way</chart_item_title>
-  <rank_this_week>6</rank_this_week>
-  <rank_last_week>6</rank_last_week>
-  <description>My Way by Fetty Wap Featuring Monty ranks #6</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>7: Downtown</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Macklemore &amp; Ryan Lewis Featuring Eric Nally, Melle Mel, Kool Moe Dee &amp; Grandmaster Caz</artist>
-  <chart_item_title>Downtown</chart_item_title>
-  <rank_this_week>7</rank_this_week>
-  <rank_last_week>7</rank_last_week>
-  <description>Downtown by Macklemore &amp; Ryan Lewis Featuring Eric Nally, Melle Mel, Kool Moe Dee &amp; Grandmaster Caz ranks #7</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>8: Trap Queen</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Fetty Wap</artist>
-  <chart_item_title>Trap Queen</chart_item_title>
-  <rank_this_week>8</rank_this_week>
-  <rank_last_week>8</rank_last_week>
-  <description>Trap Queen by Fetty Wap ranks #8</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>9: Hit The Quan</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>iHeartMemphis</artist>
-  <chart_item_title>Hit The Quan</chart_item_title>
-  <rank_this_week>9</rank_this_week>
-  <rank_last_week>9</rank_last_week>
-  <description>Hit The Quan by iHeartMemphis ranks #9</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>10: See You Again</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Wiz Khalifa Featuring Charlie Puth</artist>
-  <chart_item_title>See You Again</chart_item_title>
-  <rank_this_week>10</rank_this_week>
-  <rank_last_week>10</rank_last_week>
-  <description>See You Again by Wiz Khalifa Featuring Charlie Puth ranks #10</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>11: All Eyes On You</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Meek Mill Featuring Chris Brown &amp; Nicki Minaj</artist>
-  <chart_item_title>All Eyes On You</chart_item_title>
-  <rank_this_week>11</rank_this_week>
-  <rank_last_week>11</rank_last_week>
-  <description>All Eyes On You by Meek Mill Featuring Chris Brown &amp; Nicki Minaj ranks #11</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>12: Flex (Ooh Ooh Ooh)</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Rich Homie Quan</artist>
-  <chart_item_title>Flex (Ooh Ooh Ooh)</chart_item_title>
-  <rank_this_week>12</rank_this_week>
-  <rank_last_week>12</rank_last_week>
-  <description>Flex (Ooh Ooh Ooh) by Rich Homie Quan ranks #12</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>13: Where Ya At</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Future Featuring Drake</artist>
-  <chart_item_title>Where Ya At</chart_item_title>
-  <rank_this_week>13</rank_this_week>
-  <rank_last_week>15</rank_last_week>
-  <description>Where Ya At by Future Featuring Drake ranks #13</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>14: Back To Back</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Drake</artist>
-  <chart_item_title>Back To Back</chart_item_title>
-  <rank_this_week>14</rank_this_week>
-  <rank_last_week>13</rank_last_week>
-  <description>Back To Back by Drake ranks #14</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>15: Again</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Fetty Wap</artist>
-  <chart_item_title>Again</chart_item_title>
-  <rank_this_week>15</rank_this_week>
-  <rank_last_week>16</rank_last_week>
-  <description>Again by Fetty Wap ranks #15</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>16: Classic Man</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Jidenna Featuring Roman GianArthur</artist>
-  <chart_item_title>Classic Man</chart_item_title>
-  <rank_this_week>16</rank_this_week>
-  <rank_last_week>14</rank_last_week>
-  <description>Classic Man by Jidenna Featuring Roman GianArthur ranks #16</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>17: Planes</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Jeremih Featuring J. Cole</artist>
-  <chart_item_title>Planes</chart_item_title>
-  <rank_this_week>17</rank_this_week>
-  <rank_last_week>18</rank_last_week>
-  <description>Planes by Jeremih Featuring J. Cole ranks #17</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>18: Jumpman</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>Jumpman</chart_item_title>
-  <rank_this_week>18</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Jumpman by Drake &amp; Future ranks #18</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>19: Right Hand</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Drake</artist>
-  <chart_item_title>Right Hand</chart_item_title>
-  <rank_this_week>19</rank_this_week>
-  <rank_last_week>21</rank_last_week>
-  <description>Right Hand by Drake ranks #19</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>20: Comfortable</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>K Camp</artist>
-  <chart_item_title>Comfortable</chart_item_title>
-  <rank_this_week>20</rank_this_week>
-  <rank_last_week>19</rank_last_week>
-  <description>Comfortable by K Camp ranks #20</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>21: RGF Island</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Fetty Wap</artist>
-  <chart_item_title>RGF Island</chart_item_title>
-  <rank_this_week>21</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>RGF Island by Fetty Wap ranks #21</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>22: Antidote</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Travi$ Scott</artist>
-  <chart_item_title>Antidote</chart_item_title>
-  <rank_this_week>22</rank_this_week>
-  <rank_last_week>24</rank_last_week>
-  <description>Antidote by Travi$ Scott ranks #22</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>23: This Could Be Us</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Rae Sremmurd</artist>
-  <chart_item_title>This Could Be Us</chart_item_title>
-  <rank_this_week>23</rank_this_week>
-  <rank_last_week>20</rank_last_week>
-  <description>This Could Be Us by Rae Sremmurd ranks #23</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>24: Diamonds Dancing</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Drake &amp; Future</artist>
-  <chart_item_title>Diamonds Dancing</chart_item_title>
-  <rank_this_week>24</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>Diamonds Dancing by Drake &amp; Future ranks #24</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-<item>
-  <title>25: $ave Dat Money</title>
-  <link>http://www.billboard.com/charts/r-b-hip-hop-songs</link>
-  <artist>Lil Dicky Featuring Fetty Wap &amp; Rich Homie Quan</artist>
-  <chart_item_title>$ave Dat Money</chart_item_title>
-  <rank_this_week>25</rank_this_week>
-  <rank_last_week>0</rank_last_week>
-  <description>$ave Dat Money by Lil Dicky Featuring Fetty Wap &amp; Rich Homie Quan ranks #25</description>
-  <category>Hot R&amp;B/Hip-Hop Songs</category>
-  <pubDate>Sat, 10 Oct 2015 00:00:00 -0400</pubDate>
-  <guid isPermaLink="true">http://www.billboard.com/charts/r-b-hip-hop-songs</guid>
- </item>
-  </channel>
-</rss>
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.torrentrssviewer/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.torrentrssviewer/settings.xml
index 2ab01cad6d88cc38da449b04ccd0dca5f29718c8..1c3d822da7eaba0c685c8c014d6a60441b26ffc9 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.torrentrssviewer/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.torrentrssviewer/settings.xml
@@ -16,7 +16,7 @@
     <setting id="movieQua8" value="Block File" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="showFolder" value="/storage/downloads/p2p/tvshows/" />
     <setting id="timeNotification" value="1.500000" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.torrentz/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.torrentz/settings.xml
index 7e4f093a8bb6a15cc5121561b778a7550e95ae9c..319c2f2cc9d4c518aab1afd2a10f7fb53ccff64d 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.torrentz/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.torrentz/settings.xml
@@ -1,12 +1,11 @@
 <settings>
     <setting id="animeFolder" value="/storage/downloads/p2p/anime/" />
     <setting id="duplicated" value="true" />
-    <setting id="firstOpen" value="NO" />
     <setting id="infoLabels" value="true" />
     <setting id="movieFolder" value="/storage/downloads/p2p/movies/" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="showFolder" value="/storage/downloads/p2p/tvshows/" />
     <setting id="timeNotification" value="1.500000" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.videoteca.series/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.videoteca.series/settings.xml
index ffb3f3f732c4d1ba194acbb1d69b3bca478131e9..b036a78a760f1d5dc0dbdd012dc877973a778d7d 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.videoteca.series/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.videoteca.series/settings.xml
@@ -1,6 +1,5 @@
 <settings>
     <setting id="duplicated" value="true" />
-    <setting id="firstOpen" value="NO" />
     <setting id="infoLabels" value="true" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.yts/settings.xml b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.yts/settings.xml
index 5a39bff2b9568328a363d127d390a87756caa11b..c3e1cc9ad43ee9860d15a2c72e3e9b77a1dcd095 100644
--- a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.yts/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addon_data/plugin.video.yts/settings.xml
@@ -5,7 +5,7 @@
     <setting id="movieFolder" value="/storage/downloads/p2p/movies/" />
     <setting id="overwrite" value="true" />
     <setting id="persistent" value="true" />
-    <setting id="plugin" value="Pulsar" />
+    <setting id="plugin" value="Quasar" />
     <setting id="service" value="false" />
     <setting id="timeNotification" value="1.500000" />
     <setting id="urlAddress" value="https://yts.ag" />
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/addon.xml b/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/addon.xml
index 277fc24fe563020e5b4a978755b0faba7d079996..236fca39bb9d6876b8073d48864e17f4a7261458 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.album.universal"
        name="Universal Album Scraper"
-       version="2.5.1"
+       version="2.6.0"
        provider-name="Olympia, Team Kodi">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/albumuniversal.xml b/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/albumuniversal.xml
index c70f78be6fe0d602d3c44dc15ba1d10ac8b841f4..64e752aa3464d692ff9631133ddb6723b5818f65 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/albumuniversal.xml
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/albumuniversal.xml
@@ -122,6 +122,9 @@
 			<RegExp input="$INFO[albumthemessource]" output="&lt;url function=&quot;GetAMGAlbumThemes&quot; cache=&quot;mb-$$4-rg.xml&quot;&gt;http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels&lt;/url&gt;" dest="5+">
 				<expression>allmusic.com</expression>
 			</RegExp>
+			<RegExp input="$INFO[albumthemessource]" output="&lt;chain function=&quot;GetTADBAlbumThemeByMBID&quot;&gt;$$4&lt;/chain&gt;" dest="5+">
+				<expression>TheAudioDb.com</expression>
+			</RegExp>
 			<RegExp conditional="fanarttvalbumthumbs" input="$$4" output="&lt;chain function=&quot;GetFanartTvAlbumThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
 				<expression noclean="1">(.+)</expression>
 			</RegExp>
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/changelog.txt b/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/changelog.txt
index 1ee8e5a51c1e93868ad48a8abdafbadc333faae6..990eb44a666a3ccfd7963acc9c5f8c3b427d1180 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.6.0[/B]
+Added: Theme support from theaudiodb.com
+
 [B]2.5.1[/B]
 Update author name
 
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/resources/settings.xml
index 83c97d00b01a23d51f7d19c7b2597eb8ae54cb3b..740312789d72069b690e122ac3cdf3349e7feb3c 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.album.universal/resources/settings.xml
@@ -8,7 +8,7 @@
       <setting label="30004" type="labelenum" values="MusicBrainz|allmusic.com|TheAudioDb.com|None" id="albumratingsource" default="MusicBrainz"/>
       <setting label="30005" type="labelenum" values="TheAudioDb.com|allmusic.com|None" id="albumstylessource" default="TheAudioDb.com"/>
       <setting label="30006" type="labelenum" values="TheAudioDb.com|allmusic.com|None" id="albummoodssource" default="TheAudioDb.com"/>
-      <setting label="30007" type="labelenum" values="allmusic.com|None" id="albumthemessource" default="allmusic.com"/>
+      <setting label="30007" type="labelenum" values="TheAudioDb.com|allmusic.com|None" id="albumthemessource" default="TheAudioDb.com"/>
   </category>
 
   <category label="30009">
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/addon.xml b/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/addon.xml
index 080f53f67f48cfca0323153e13e95eba3d02b66c..e9ff3699b2ce942f8303c9010548813a9958ff7a 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.albums.theaudiodb.com"
        name="TheAudioDb Album Scraper"
-       version="1.1.1"
+       version="1.2.0"
        provider-name="Olympia, Team Kodi">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/changelog.txt b/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/changelog.txt
index 562e5fcbbd6668c05459d8778a9772d1ac4ebaab..6ae25d36202e767418eda862a9d2c5901b153c45 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.2.0[/B]
+Added Theme Support
+
 [B]1.1.0[/B]
 Update author name
 
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/tadb.xml b/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/tadb.xml
index 2d990d45cd94d99518244537318736a9ece9f8fb..e32178e0033ad095f74f5843a03b97db963b3ec1 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/tadb.xml
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.albums.theaudiodb.com/tadb.xml
@@ -50,6 +50,9 @@
 			<RegExp input="$$3" output="&lt;chain function=&quot;GetTADBAlbumMoodsByID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
 				<expression noclean="1">(.+)</expression>
 			</RegExp>
+			<RegExp input="$$3" output="&lt;chain function=&quot;GetTADBAlbumThemeByID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression noclean="1">(.+)</expression>
+			</RegExp>
 			<RegExp input="$$3" output="&lt;chain function=&quot;GetTADBAlbumTracksByID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
 				<expression noclean="1">(.+)</expression>
 			</RegExp>
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.common.theaudiodb.com/addon.xml b/packages/mediacenter/kodi/config/base-addons/metadata.common.theaudiodb.com/addon.xml
index a14f29d5f39249364d2ba55309a2d582199ddb58..2bd428d20802d83a7593a752a7863594f4cb7375 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.common.theaudiodb.com/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.common.theaudiodb.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.theaudiodb.com"
        name="TheAudioDb Scraper Library"
-       version="1.8.2"
+       version="1.9.0"
        provider-name="Team Kodi">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.common.theaudiodb.com/tadb.xml b/packages/mediacenter/kodi/config/base-addons/metadata.common.theaudiodb.com/tadb.xml
index eb65cfd3d85be01a7a8ef98f7699d920c1545919..ceeddd653fecd95b635ada62de311700d85267fe 100644
--- a/packages/mediacenter/kodi/config/base-addons/metadata.common.theaudiodb.com/tadb.xml
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.common.theaudiodb.com/tadb.xml
@@ -78,9 +78,6 @@
 				<expression fixchars="1">strBiography$INFO[tadbartistlanguage]&quot;:&quot;(.*?)&quot;,&quot;</expression>
 			</RegExp>
 			<RegExp input="$$11" output="$$12" dest="2">
-				<RegExp input="$INFO[biogfbsource]" output="&lt;chain function=&quot;GetLastFMFallbackBiographyByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
-					<expression>last.fm</expression>
-				</RegExp>
 				<RegExp input="$INFO[biogfbsource]" output="&lt;chain function=&quot;GetAMGFallbackBiographyByAMGID&quot;&gt;$$9&lt;/chain&gt;" dest="12">
 					<expression>allmusic.com</expression>
 				</RegExp>
@@ -244,9 +241,6 @@
 				<expression fixchars="1">strGenre&quot;:&quot;([^&quot;]*)</expression>
 			</RegExp>
 			<RegExp input="$$11" output="$$12" dest="2">
-				<RegExp input="$INFO[genresfbsource]" output="&lt;chain function=&quot;GetLastFMFallbackArtistGenresByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
-					<expression>last.fm</expression>
-				</RegExp>
 				<RegExp input="$INFO[genresfbsource]" output="&lt;chain function=&quot;GetAMGFallbackArtistGenresByAMGID&quot;&gt;$$9&lt;/chain&gt;" dest="12">
 					<expression>allmusic.com</expression>
 				</RegExp>
@@ -301,9 +295,6 @@
 				<expression fixchars="1">strMood&quot;:&quot;([^&quot;]*)</expression>
 			</RegExp>
 			<RegExp input="$$11" output="$$12" dest="2">
-				<RegExp input="$INFO[moodsfbsource]" output="&lt;chain function=&quot;GetLastFMFallbackArtistMoodsByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
-					<expression>last.fm</expression>
-				</RegExp>
 				<RegExp input="$INFO[moodsfbsource]" output="&lt;chain function=&quot;GetAMGFallbackArtistMoodsByAMGID&quot;&gt;$$9&lt;/chain&gt;" dest="12">
 					<expression>allmusic.com</expression>
 				</RegExp>
@@ -358,9 +349,6 @@
 				<expression fixchars="1">strStyle&quot;:&quot;([^&quot;]*)</expression>
 			</RegExp>
 			<RegExp input="$$11" output="$$12" dest="2">
-				<RegExp input="$INFO[stylesfbsource]" output="&lt;chain function=&quot;GetLastFMFallbackArtistStylesByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
-					<expression>last.fm</expression>
-				</RegExp>
 				<RegExp input="$INFO[stylesfbsource]" output="&lt;chain function=&quot;GetAMGFallbackArtistStylesByAMGID&quot;&gt;$$9&lt;/chain&gt;" dest="12">
 					<expression>allmusic.com</expression>
 				</RegExp>
@@ -535,6 +523,25 @@
 		</RegExp>
 	</ParseTADBAlbumStyles>
 
+	<GetTADBAlbumThemeByID dest="5">
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseTADBAlbumTheme&quot; cache=&quot;tadb-\1-album.json&quot;&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album.php?m=\1&lt;/url&gt;&lt;/details&gt;" dest="5">
+			<expression noclean="1"/>
+		</RegExp>
+	</GetTADBAlbumThemeByID>
+	<GetTADBAlbumThemeByMBID dest="5">
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseTADBAlbumTheme&quot; cache=&quot;tadb-\1-album.json&quot;&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album-mb.php?i=\1&lt;/url&gt;&lt;/details&gt;" dest="5">
+			<expression noclean="1"/>
+		</RegExp>
+	</GetTADBAlbumThemeByMBID>
+	<ParseTADBAlbumTheme dest="5">
+		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+			<RegExp input="$$1" output="&lt;theme&gt;\1&lt;/theme&gt;" dest="2">
+				<expression noclean="1">strTheme&quot;:&quot;([^&quot;]*)</expression>
+			</RegExp>
+			<expression noclean="1" />
+		</RegExp>
+	</ParseTADBAlbumTheme>
+
 	<GetTADBAlbumTracksByID dest="5">
 		<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseTADBAlbumTracks&quot;&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/track.php?m=\1&lt;/details&gt;" dest="5">
 			<expression noclean="1"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/addon.xml b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b5e002bd61d428be844870c03af89ddc7e54cd4a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/addon.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.musicvideos.theaudiodb.com"
+       name="TheAudioDb.com for Music Videos"
+       version="1.2.9"
+       provider-name="Team Kodi">
+  <requires>
+    <import addon="xbmc.metadata" version="2.1.0"/>
+    <import addon="metadata.common.fanart.tv" version="3.1.0"/>
+    <import addon="metadata.common.theaudiodb.com" version="1.7.3"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper.musicvideos"
+             language="en"
+             library="tadb.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <summary lang="af">theaudiodb.com Musiek Video Skraper</summary>
+    <summary lang="be">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="bg">Сваля инф. за музикални клипове от theaudiodb.com</summary>
+    <summary lang="ca">Arreplegador de vídeos musicals de theaudiodb.com</summary>
+    <summary lang="cs">Zdroj dat o hudebních videích theaudiodb.com</summary>
+    <summary lang="cy">Crafwr Fideo Cerddoriaeth theaudiodb.com</summary>
+    <summary lang="da">theaudiodb.com Musikvideo-scraper</summary>
+    <summary lang="de">theaudiodb.com Musikvideo Scraper</summary>
+    <summary lang="el">Scraper Μουσικών Βίντεο του theaudiodb.com</summary>
+    <summary lang="en">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="en_NZ">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="en_US">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="es">Buscador de videoclips de theaudiodb.com</summary>
+    <summary lang="es_AR">Scraper de Videos de Música de theaudiodb.com</summary>
+    <summary lang="et">theaudiodb.com muusikavideo kraabits</summary>
+    <summary lang="fi">theaudiodb.com musiikkivideotietojen lataaja</summary>
+    <summary lang="fr">theaudiodb.com Scraper Clip Vidéo</summary>
+    <summary lang="fr_CA">Extracteur de vidéos musicales pour theaudiodb.com</summary>
+    <summary lang="gl">Scraper de vídeo e música de theaudiodb.com</summary>
+    <summary lang="he">theaudiodb.com סקרייפר וידאו קליפ</summary>
+    <summary lang="hr">theaudiodb.com sakupljač za glazbene spotove</summary>
+    <summary lang="hu">theaudiodb.com videóklip leolvasó</summary>
+    <summary lang="id">Pengais Video Musik theaudiodb.com</summary>
+    <summary lang="is">theaudiodb.com Skafa fyrir Tónlistarmyndbönd</summary>
+    <summary lang="it">Lo scraper di video musicali theaudiodb.com</summary>
+    <summary lang="ja">theaudiodb.com 音楽ビデオスクレーパー</summary>
+    <summary lang="ko">theaudiodb.com 뮤직 비디오 정보수집기</summary>
+    <summary lang="lt">theaudiodb.com muzikinių vaizdo klipų skreperis</summary>
+    <summary lang="mk">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="ms">Pengikis Video Muzik theaudiodb.com</summary>
+    <summary lang="my">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="nl">theaudiodb.com Muziekvideo-scraper</summary>
+    <summary lang="no">theaudiodb.com Skraper for musikkvideo</summary>
+    <summary lang="pl">Scraper teledysków theaudiodb.com</summary>
+    <summary lang="pt">Colector de música theaudiodb.com</summary>
+    <summary lang="pt_BR">Scraper de concertos theaudiodb.com</summary>
+    <summary lang="ro">Informaţii videoclipuri de la theaudiodb.com </summary>
+    <summary lang="ru">Скрапер музыки и видео theaudiodb.com</summary>
+    <summary lang="se">Skrapa för theaudiodb.com musik</summary>
+    <summary lang="sk">Zdroj získavania dát o hudobných videách zo stránky theaudiodb.com</summary>
+    <summary lang="sl">Ponudnik informacij o videospotih theaudiodb.com</summary>
+    <summary lang="sv">theaudiodb.com musikvideoskrapa</summary>
+    <summary lang="ta_IN">theaudiodb.com இசை நிகழ்படம் சுரண்டி</summary>
+    <summary lang="th">ตัวดึงข้อมูลวิดีโอเพลง theaudiodb.com</summary>
+    <summary lang="uk">Здирач музичного відео з theaudiodb.com</summary>
+    <summary lang="vi">Trình lấy dữ liệu video nhạc từ theaudiodb.com</summary>
+    <summary lang="zh">theaudiodb.com 音乐电视刮削器</summary>
+    <summary lang="zh_TW">theaudiodb.com音樂影片搜括器</summary>
+    <description lang="af">Laai Musiek Video informasie af</description>
+    <description lang="am">የሙዚቃ ቪዲዮ መረጃ ማውረጃ</description>
+    <description lang="be">Download Music Video information</description>
+    <description lang="bg">Сваля информация за музикални клипове</description>
+    <description lang="ca">Baixa informació de videos musicals</description>
+    <description lang="cs">Zdroj dat stahující informace o hudebních videích z TheAudioDB.com. Kvůli složitým problémům s vyhledáváním požaduje nástroj pro vyhledávání název složky složky/souboru pojmenován jako 'umělec - název stopy', pokud tomu tak není, nenalezne žádné výsledky.</description>
+    <description lang="cy">Mae'r crafwr yn llwytho i lawr gwybodaeth am Gerddoriaeth Fideo o TheAudioDB.com. Oherwydd amryw o anawsterau chwilio mae'r crafwr yn disgwyl i'r ffolder/enw ffeil fod wedi ei fformatio fel 'artist - enw track' neu ni fydd yn dychwelyd canlyniadau.</description>
+    <description lang="da">Hent Musikvideo-information</description>
+    <description lang="de">Dieser Scraper lädt Musikvideoinformationen von TheAudioDB.com herunter. Aufgrund diverser Suchschwierigkeiten erwartet der Scraper derzeit, dass Ordner/Dateinamen als 'Künstler - Songname' formatiert werden, andernfalls wird er keine Ergebnisse zurückliefern.</description>
+    <description lang="el">Λήψη πληροφοριών Μουσικών Βίντεο</description>
+    <description lang="en">This scraper is downloading Music Video information from TheAudioDB.com. Due to various search difficulties the scraper currently expects the folder/filename to be formatted as 'artist - trackname' otherwise it will not return results.</description>
+    <description lang="en_NZ">This scraper is downloading Music Video information from TheAudioDB.com. Due to various search difficulties the scraper currently expects the folder/filename to be formatted as 'artist - trackname' otherwise it will not return results.</description>
+    <description lang="en_US">This scraper is downloading Music Video information from TheAudioDB.com. Due to various search difficulties the scraper currently expects the folder/filename to be formatted as 'artist - trackname' otherwise it will not return results.</description>
+    <description lang="es">Descarga información del videoclip</description>
+    <description lang="es_AR">Descarga información del Video Clip</description>
+    <description lang="es_MX">Descarga Información de Vídeos de Músca</description>
+    <description lang="et">Hankija laeb alla muusikavideo infot portaalist TheAudioDB.com. Mitmete otsinguohtude tõttu tuvastab hankija kausta/faili nime vormingus 'esitaja - loo nimi', muidu hankija ei suuda otsimist läbi viia.</description>
+    <description lang="fi">Lataa musiikkivideoiden tiedot</description>
+    <description lang="fr">Télécharger les informations des clips vidéos</description>
+    <description lang="fr_CA">Cet extracteur télécharge les informations sur les vidéos musicales depuis TheAudioDB.com. À cause de difficultés de recherche diverses, l'extracteur s'attend présentement à ce que le dossier/nom du fichier soit formaté comme « artiste - nom de la piste ». Aucun résultat ne sera retourné si ce n'est pas le cas.</description>
+    <description lang="gl">Este scraper descarga a información dende TheAudioDB.com. Debido a algúns problemas o scraper agarda que o cartafol/nome do ficheiro teña o formato 'artista - nome da pista' ou non retornará resultados.</description>
+    <description lang="he">הורד מידע וידאו קליפ</description>
+    <description lang="hr">Ovaj sakupljač preuzima informacije o glazbenim spotovima s TheAudioDB.com. Uslijed mnogih problema s pretragom sakupljač očekuje da mape i datoteke budu u formatu 'izvođač - naziv pjesme' ili neće dati rezultata.</description>
+    <description lang="hu">Videóklip információk letöltése a theaudiodb.com webhelyről</description>
+    <description lang="id">Pengais sedang mengunduh informasi musik video dari TheAudioDB.com. Dikarenakan berbagai kesulitan pencarian, Pengais mengharapkan folder/nama-berkas dalam format 'artis-judullagu' Apabila tidak, hasil tidak dapat muncul.</description>
+    <description lang="is">Þessi skafa halar niður upplýsingum Tónlistarmyndbanda frá TheAudioDB.com. Vegna ýmissa vandamála með leit þá gerir þessi skafa ráð fyrir að möppu/skráarnafn sé á forminu 'Listamaður - laganafn' annars skilar hún engum niðurstöðum.</description>
+    <description lang="it">Scarica informazioni Video Musicale</description>
+    <description lang="ja">このスクレイパーはTheAudioDB.comから音楽ビデオ情報をダウンロードしています。様々な検索の困難のため、スクレイパーは現在「アーティスト - 曲名」とフォーマットされているフォルダ/ファイルネームを期待しています。そうでなければ、結果を返しません。</description>
+    <description lang="ko">이 정보수집기믄 TheAudioDB.com에서 뮤직 비디오 정보를 가져옵니다. 여러가지 검색상의 어려움 때문에 폴더/파일이름이 '아티스트-트랙이름'으로 지정되어야 합니다. 그렇지 않으면 결과를 가져올 수 없습니다.</description>
+    <description lang="lt">Šis skreperis atsiunčia muzikinių vaizdo klipų informaciją iš TheAudioDB.com. Dėl įvairių paieškos sunkumų, aplanko/failo pavadinimo formatas turi būti 'atlikėjas - takelio pavadinimas'. Priešingu atvejus nebus rasta jokių rezultatų.</description>
+    <description lang="mk">Превземи информации за музичко видео</description>
+    <description lang="ms">Pengikis ini memuat turun maklumat Video Muzik dari TheAudioDB.com. Oleh kerana kesukaran menggelintar, pengikis biasanya jangkakan folder/namafail diformat sebagai 'artis - namatrek' jika tidak ia tidak akan kembalikan keputusan.</description>
+    <description lang="nl">Deze scraper download muziekvideo-informatie van TheAudioDB.com. Vanwege diverse zoek moeilijkheden verwacht de scraper nu dat de map/bestandsnaam is genaamd als 'artiest - Titel' anders zal het geen resultaten tonen.</description>
+    <description lang="no">Last ned musikkvideoinformasjon</description>
+    <description lang="pl">Scraper teledysków pobiera informacje z bazy TheAudioDB.com. Ze względu na różne trudności wyszukiwania, scraper obecnie wymaga aby folder/plik był sformatowany: "artysta - nazwa ścieżki" inaczej nie zadziała poprawnie.</description>
+    <description lang="pt">Descarregar informação de filmes de theaudiodb.com</description>
+    <description lang="pt_BR">Download de informação de Concertos</description>
+    <description lang="ro">Acest plugin descarcă informaţii despre videoclipuri de la TheAudioDB.com. Datorita dificultatilor de cautare, pluginul asteapta ca perechea director/nume fisier sa fie formatate ca 'artist - nume piesa' altfel nu va returna nici un rezultat.</description>
+    <description lang="ru">Загружать сведения о видеоклипах</description>
+    <description lang="se">Ladda ner musikvideoinformation från theaudiodb.com</description>
+    <description lang="sk">Tento zdroj dát získava informácie o hudobných videách zo stránky TheAudioDB.com. Z dôvodu rôznych problémov pri hľadaní, zdroj dát aktuálne očakáva, aby bol názov priečinka/súboru formátovaný ako 'interpret - názov_skladby', v opačnom prípade nevráti žiadne výsledky.</description>
+    <description lang="sl">Prenesite informacije o videospotih z TheAudioDB.com. Zaradi težavnosti iskanja morajo biti mape/datoteke v formatu 'izvajalec - pesem', drugače informacije ne bodo najdene.</description>
+    <description lang="sv">Ladda ner musikvideoinformation</description>
+    <description lang="ta_IN">இந்த வலை சுரண்டி TheAudioDB.com இல் இருந்து இசை வீடியோ தகவல்களை பதிவிறக்கம் செய்கிறது. பல்வேறு தேடல் சிரமங்கள் காரணமாக தற்போது இந்த வலை சுரண்டியானது கோப்புறை / கோப்பு பெயரை 'கலைஞர் - தடங்கள் பெயர்' எனவாக வடிவமைக்க வேண்டும் என்று எதிர்பார்க்கிறது இல்லையெனில் முடிவுகளை தராது. கலைஞர் அல்லது தடங்கள் பெயரில் '-' அடையாளம் இருந்தால் அதை கூட கண்டுபிடிக்க முடியாது.</description>
+    <description lang="th">ดาวน์โหลดข้อมูลวิดีโอเพลง</description>
+    <description lang="vi">Trình lấy dữ liệu đang tải thông tin video nhạc từ nguồn TheAudioDB.com. Do nhiều khó khăn tìm kiếm khác nhau, trình lấy dữ liệu này hiện chỉ hỗ trợ định dạng thư mục/tên tệp tin theo mẫu 'nghệ sỹ - tên track' nếu không sẽ không trả lại kết quả.</description>
+    <description lang="zh">从 theaudiodb.com 下载音乐电视资料。为简化搜索，刮削器限定文件夹/文件名格式为“歌手 - 歌名”，否则将不会返回结果。</description>
+    <description lang="zh_TW">此搜括器是從 TheAudioDB.com下載取得音樂影片資訊。因為各種不同搜尋變數，此搜括器目前須將資料夾／檔案名稱 重新命名為 "演出者－歌曲資訊"否則將無法正常取得專輯資料。帶有'-"符號的演出者或歌曲資訊也有極高可能無法找到。</description>
+    <license>GPL v2.0</license>
+    <forum>http://forum.xbmc.org/showthread.php?tid=136105</forum>
+    <website></website>
+    <email></email>
+    <source></source>
+    <broken>Broken due to website overload. Please use other scraper.</broken>
+  </extension>
+</addon>
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/changelog.txt b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/changelog.txt
new file mode 100644
index 0000000000000000000000000000000000000000..188f650a317737c5acc214b764fcc7e888a94765
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/changelog.txt
@@ -0,0 +1,28 @@
+[B]1.2.9[/B]
+- Update author name
+
+[B]1.2.8[/B]
+- Broken due to website overload. Please use other scraper. 
+
+[B]1.2.7[/B]
+- Fixed: Allow for apostrophes in artist/title
+
+[B]1.2.1[/B]
+- Fixed: Allow for dashes in artist/title (v12.2+ required)
+
+[B]1.2.0[/B]
+- Added: NfoURL function
+- Added: Album thumbs from theaudiodb.com
+
+[B]1.1.1[/B]
+- Fixed Workaround: Scraper won't return 'Unable to Connect to Remote Server' in case of year is available from the folder/file name
+
+[B]1.1.0[/B]
+- Workaround: Scraper won't return 'Unable to Connect to Remote Server' in case of unexpected folder/file naming conventions
+- Added: Music Video Director
+- Added: Music Video Studio
+- Changed: Scrape Music Video screenshot instead of album thumb if available
+- Changed: Trust search result ordering from TheAudioDb.com
+- Changed: Scrape Album genre instead of track genre for now
+- Added: Scrape Album Year
+- Added: Scraper description (stating current limitations)
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/icon.png b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c102293a419c51ac5d7e3511bbc1644799c63a84
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/icon.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Afrikaans/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Afrikaans/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..402f11ef5fdf7d35e35df345059fe9e78a397d6c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Afrikaans/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/xbmc-addons/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Gryp album duimnaelsketse vanaf fanart.tv"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Belarusian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Belarusian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..15d5a25458a82f671a9fd607372987056c2927cc
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Belarusian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/xbmc-addons/language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Grab album thumbs from fanart.tv"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Bulgarian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Bulgarian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..3964dafd125919a200954184a0b10aea9dedfa58
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Bulgarian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/xbmc-addons/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Сваляй миниатюри за албумите от fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Сваляй миниатюри за албумите от theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Burmese/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Burmese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..094d6183b0a13c037d5be5bf16c14aac5d8dc2ee
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Burmese/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/xbmc-addons/language/my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "fanart.tv မှ album thumbs များရာယူမည်"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..485dd2d541078866f845f8e09f223514551f6f08
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/xbmc-addons/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Obté les miniatures de l'àlbum de fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Obté les miniatures de l'àlbum de theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..e6f3fc320486a7830c0bfc360a65946056919a5f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.po	
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Chinese (Simple) (http://www.transifex.com/projects/p/xbmc-addons/language/zh/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "从 fanart.tv 获取专辑图片"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "从 theaudiodb.com 获取专辑图片"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Traditional)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Traditional)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..f652655bf2d63e1304e7111a51bc8fc50b9172b7
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Traditional)/strings.po	
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Chinese (Traditional) (http://www.transifex.com/projects/p/xbmc-addons/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "從fanart.tv取得專輯縮圖"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "從 theaudiodb.com取得專輯縮圖"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Croatian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Croatian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..f0d0d601a5c493a03876dda5a2dc09a15d521b72
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Croatian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/xbmc-addons/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Nabavi minijature albuma s fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Nabavi minijature albuma s theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..e60f02ac75a7380b5012647b7c49626bf3740ed6
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/xbmc-addons/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Získat náhledy alb z fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Získat náhledy alb z theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Danish/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Danish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..5d06b18c204cd92d284484590da070f04a2a579b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Danish/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/xbmc-addons/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Hent Miniaturebilleder af Albummer fra fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Hent miniaturebilleder til albummer fra theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..6df1de23ab47e0f8f62eb184beb56618c30f264b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/xbmc-addons/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Pak albumminiaturen van fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Haal Albumminiaturen van theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English (New Zealand)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English (New Zealand)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..d4a790234b3ac787dd404574524902f3f1268756
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English (New Zealand)/strings.po	
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/xbmc-addons/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Grab album thumbs from fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Grab album thumbs from theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English (US)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English (US)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..5984b1d3107bb1c8e4c056d50e1b95b8755cddc6
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English (US)/strings.po	
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (US) (http://www.transifex.com/projects/p/xbmc-addons/language/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Grab album thumbs from fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Grab album thumbs from theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ae1305998630a7b25119d06ffdb7a1d945e95d70
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr ""
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Estonian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Estonian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..1faf990e55d068b402e8baa0fd8d7fbbe10644ab
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Estonian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/xbmc-addons/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Hangi albumi pisipildid fanart.tv-st"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Hangi albumi pisipildid theaudiodb.com-st"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Finnish/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Finnish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..7646e262b693992fcd1029d61936df5f21d6b3d3
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Finnish/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/xbmc-addons/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Hae albumin pienoiskuvat fanart.tv:stä"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/French (Canada)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/French (Canada)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..a4542b4273d22724ba5e06eb0f89acfe3f13fcec
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/French (Canada)/strings.po	
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: French (Canada) (http://www.transifex.com/projects/p/xbmc-addons/language/fr_CA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CA\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Récupérer les imagettes d'albums de fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Récupérer les imagettes d'albums de theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..af899c2187a58b0221a56cff636d1844c8b096f5
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: French (http://www.transifex.com/projects/p/xbmc-addons/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Récupérer les vignettes d'albums depuis fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Récupère les vignettes des albums depuis theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..8cf6aca414a5e4f38021d2690a03db8ca485df32
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/xbmc-addons/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Obter as miniaturas do álbum dende fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Obter as miniaturas do álbum dende theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/German/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/German/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..3a989f206b65c0b719ae3ea2e619642a5aa3bf83
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/German/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: German (http://www.transifex.com/projects/p/xbmc-addons/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Album-Vorschaubilder von fanart.tv laden"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Album-Vorschaubilder von theaudiodb.com laden"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..3cb0bb171dd2c253a5db74d9870f35623507b0fb
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/xbmc-addons/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Μικρογραφίες άλμπουμ από fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Μικρογραφίες Άλμπουμ από το theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Hebrew/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Hebrew/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..780cc76d0b2f9bce552c7b07805338a07aa026d3
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Hebrew/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/xbmc-addons/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "השג תמונות אלבום מ- fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "השג תמונת אלבום מ-theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..c6cd7b55adbfb510cd8d91cbbcb47c9aab4bc619
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/xbmc-addons/language/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Album miniképek letőltésea fanart.tv-ről"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Album miniképek a theaudiodb.com-ról"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Icelandic/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Icelandic/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..f0a30f883b38ad77e1413aab65bf14a2b1c7ab10
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Icelandic/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/xbmc-addons/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Ná í smámyndir hljómplatna frá fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Ná í smámyndir hljómplatna frá theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Indonesian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Indonesian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..57be33fdd9a3814b8d4b7b74911872ecd3f50eec
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Indonesian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/xbmc-addons/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Ambil thumb album dari fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Ambil thumb album dari theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..fe3cb1f9424ebf45965423e058ef21a692b9f6e6
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/xbmc-addons/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Scarica le copertine album da fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Prendi miniature album da theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Japanese/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Japanese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..89426de248b81c0d09f133f8d4add601c9ec6ba6
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Japanese/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/xbmc-addons/language/ja/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "fanart.tv からアルバムサムネイルを取得"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "theaudiodb.com からアルバムサムネイルを取得"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..2ded43df9d2f4d011bbd7d635532f65d0bb15845
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/xbmc-addons/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "fanart.tv 에서 앨범 커버 가져오기"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "theaudiodb.com 에서 앨범 커버 가져오기"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Lithuanian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Lithuanian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..3677efcafe0c482cf47436bca61e19aad8672988
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Lithuanian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/xbmc-addons/language/lt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Paimti albumų miniatiūras iš fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Paimti albumų miniatiūras iš theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Macedonian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Macedonian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..290e080f502636ed27ea6c102de690156ffcf0d6
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Macedonian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/xbmc-addons/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Симни сликички за албум од fanart.tv"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Malay/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Malay/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ab2fb2c130bcb7b3579e0e80b4b84ad7ebb1cc30
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Malay/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Malay (http://www.transifex.com/projects/p/xbmc-addons/language/ms/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Dapatkan Lakaran Kenit Album dari fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Dapatkan Lakaran Kenit Album dari theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Norwegian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Norwegian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..eef3a7320cb1822ff1065ad931fae945259b1a7e
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Norwegian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Norwegian (http://www.transifex.com/projects/p/xbmc-addons/language/no/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: no\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Hent album bilder fra fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Hent Album Thumbs fra theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..76f342e4d189e62c2b715236bece3541d8c0ad54
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/xbmc-addons/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Pobieraj miniatur albumu z fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Pobieraj miniatur albumu theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..7e27a3e6c88d3d14f2ac8de6275e498fbcb7b852
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.po	
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xbmc-addons/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Obter miniaturas de álbuns de fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Pegar miniaturas de álbum de theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..1ab97e3d65f78fd469e1aaf0ff937f7aa9de49e3
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/xbmc-addons/language/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Obter miniaturas de álbum em fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Obter miniaturas de álbum em theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..415670bca7706d9e264ca41af405e8cf8930c7bb
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/xbmc-addons/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Obţine imagini albume de la fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Obţine imagini albume de la theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Russian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Russian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..0cd949773014b74cd2762c8d290f5012b078be20
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Russian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/xbmc-addons/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Загружать эскизы альбомов с fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Загружать эскизы альбомов с fanart.tv"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovak/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovak/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..289e283632605e113e47be873c2fe5f84e734de0
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovak/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/xbmc-addons/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Získať náhľady albumov zo stránky fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Získať náhľady albumov zo stránky theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovenian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovenian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ee014f922cfe7a23b58ab50bac837ed8d2323e44
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovenian/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/xbmc-addons/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Prenesi sličice albumov s fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Prenesi sličice albumov z theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..9d23da7ed60b68be5ec55b5e52cb4903a4a20503
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.po	
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/xbmc-addons/language/es_AR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Obtener miniaturas de álbum de fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Descargar miniaturas de álbum de theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Mexico)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Mexico)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..6c6eed4ea452e86f9b951174ba071cfe837f946a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Mexico)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/xbmc-addons/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Obtener miniaturas de álbumes desde fanart.tv"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..1a88bf2ef40feaab4fd6b93e6bd6d4a014e80730
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/xbmc-addons/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Obtener miniatura de álbum de fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Descargar miniaturas de álbum desde theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Swedish/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Swedish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ddfe09b4c3127394d70c699d6edfe022347c47f8
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Swedish/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/xbmc-addons/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Hämta albumminiatyrer från fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Hämta albumminiatyrer från theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Tamil (India)/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Tamil (India)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..c8476613c5899d492aada20f3fab02822cce31be
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Tamil (India)/strings.po	
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/xbmc-addons/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "ஆல்பம் குருபடங்களை fanart.tv இருந்து கைப்பற்று"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "ஆல்பம் குருபடங்களை theaudiodb.com இருந்து கைப்பற்று"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Thai/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Thai/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..59c781493b53bf3d1dfe0cd2c294b214b64cc1a6
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Thai/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/xbmc-addons/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "ดึงข้อมูลภาพปกอัลบั้มจาก fanart.tv"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Turkish/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Turkish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..79726674a70cbd8a1301f0097d7ab20beb41bebb
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Turkish/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/xbmc-addons/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Albüm kapaklarını fanart.tv'den al"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Ukrainian/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Ukrainian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..f2931e5461776f30b3210aa50466372e11841845
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Ukrainian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xbmc-addons/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Отримати малюнки альбому з fanart.tv"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..4cb97352c07757cd03011ebf2596ebf49a5eb778
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/xbmc-addons/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Lấy hình đại diện album từ nguồn fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Lấy hình đại diện album từ nguồn theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Welsh/strings.po b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Welsh/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..66fbfb2290d2bcd8060365f76782ce07024a0d0a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/language/Welsh/strings.po
@@ -0,0 +1,25 @@
+# Kodi Media Center language file
+# Addon Name: TheAudioDb.com for Music Videos
+# Addon id: metadata.musicvideos.theaudiodb.com
+# Addon Provider: XBMC Foundation
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/xbmc-addons/language/cy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+
+msgctxt "#30000"
+msgid "Grab album thumbs from fanart.tv"
+msgstr "Estyn lluniau bach album o fanart.tv"
+
+msgctxt "#30001"
+msgid "Grab album thumbs from theaudiodb.com"
+msgstr "Estynnwch luniau bach albwm o theaudiodb.com"
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa23fe04ab4f185fb7045dd6f5481300c6834b45
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+      <setting label="30001" type="bool" id="tadbalbumthumbs" default="true"/>
+      <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="false"/>
+</settings>
diff --git a/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/tadb.xml b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/tadb.xml
new file mode 100644
index 0000000000000000000000000000000000000000..709e32f04079f5c4417e777cca7441f579cc2397
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/metadata.musicvideos.theaudiodb.com/tadb.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scraper framework="1.1" date="2013-04-03">
+	<NfoUrl dest="3">
+		<RegExp input="$$1" output="&lt;url&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/track.php?h=\1&lt;/url&gt;" dest="3">
+			<expression>http://www.theaudiodb.com/track/(.+)</expression>
+		</RegExp>
+	</NfoUrl>
+	<CreateSearchUrl dest="3">
+		<RegExp input="$$5" output="\1" dest="3">
+			<RegExp input="$$1" output="\1\\&apos;\2" dest="1">
+				<expression repeat="yes">((?:[^%]*(?:%20))*[^%]*)(?:%27)((?:[^%]*(?:%20))*[^%]*)</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;url&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/searchtrack.php?s=\1&amp;amp;t=\2&lt;/url&gt;" dest="6">
+				<expression trim="1,2">(.+)%20(?:%20|-)%20(.+)</expression>
+			</RegExp>
+			<RegExp input="$$6" output="\1" dest="5">
+				<expression noclean="1" />
+			</RegExp>
+			<RegExp input="$$6" output="&lt;url&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/searchtrack.php?s=$$1&amp;amp;t=&lt;/url&gt;" dest="5">
+				<expression>^$</expression>
+			</RegExp>
+			<expression noclean="1" />
+		</RegExp>
+	</CreateSearchUrl>
+	<GetSearchResults dest="3">
+		<RegExp input="$$5" output="&lt;results sorted=&quot;yes&quot;&gt;\1&lt;/results&gt;" dest="3">
+			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\5 - \3 [\4]&lt;/title&gt;&lt;url cache=&quot;tadb-\1.json&quot;&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/track.php?h=\1&lt;/url&gt;&lt;/entity&gt;" dest="5">
+				<expression repeat="yes" clear="yes" fixchars="1" noclean="1">idTrack&quot;:&quot;([^&quot;]*)&quot;,&quot;idAlbum&quot;:&quot;([^&quot;]*).*?&quot;strTrack&quot;:&quot;([^&quot;]*)&quot;,&quot;strAlbum&quot;:&quot;([^&quot;]*)&quot;,&quot;strArtist&quot;:&quot;([^&quot;]*)</expression>
+			</RegExp>
+			<expression noclean="1" />
+		</RegExp>
+	</GetSearchResults>
+	<GetDetails dest="3">
+		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
+			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
+				<expression fixchars="1" noclean="1">strTrack&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strArtist&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;album&gt;\1&lt;/album&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strAlbum&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strDescriptionEN&quot;:&quot;(.*?)&quot;,&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;director&gt;\1&lt;/director&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strMusicVidDirector&quot;:&quot;(.*?)&quot;,&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strMusicVidCompany&quot;:&quot;(.*?)&quot;,&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="5+">
+				<expression repeat="yes">strMusicVidScreen1\d?&quot;:&quot;([^&quot;]*)</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;chain function=&quot;GetTADBAlbumGenresByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strMusicBrainzAlbumID&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;chain function=&quot;GetTADBAlbumDateByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strMusicBrainzAlbumID&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp conditional="tadbalbumthumbs" input="$$1" output="&lt;chain function=&quot;GetTADBAlbumThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strMusicBrainzAlbumID&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp conditional="fanarttvalbumthumbs" input="$$1" output="&lt;chain function=&quot;GetFanartTvAlbumThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strMusicBrainzAlbumID&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<expression noclean="1"/>
+		</RegExp>
+	</GetDetails>
+</scraper>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/addon.xml
index 2220d73f7f466675f7a7189d486811286e997a07..279d88e2272873c88bf7720826809c8c78339ffc 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.audio.di.fm"
        name="Digitally Imported"
-       version="3.1.0"
+       version="3.1.1"
        provider-name="qualisoft.dk - Tim C. Steinmetz">
 	<requires>
 		<import addon="xbmc.python" version="2.1.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/changelog.txt
index af8cb1b16ffc263adb80b4dcecfaaa7a09fbefbd..15ab4292322614eb34cef47873ae3175999c60b7 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/changelog.txt
@@ -2,6 +2,12 @@
 * Fixed/improved feature
 - Removed feature
 
+30. January 2016 v3.1.1
++ Added option that enables/disables the use of Premium account credentials
++ Added hebrew translation - thank you to smoky-jr
+* Fixed free streams - thank you to Christian Gerbrandt (derchrisuk)
+
+
 
 25. March 2015 v3.1.0
 + Got a baby daughter - Ella :D
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/config.ini b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/config.ini
index 60b32fb8b198788fa522f41264287f27e90144da..c7eb3671af767a78297092f056097b5fd58594cd 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/config.ini
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/config.ini
@@ -1,8 +1,9 @@
 # DI.fm Kodi config
 [plugin]
 id                  = plugin.audio.di.fm
-date                = 25. March 2015
+date                = 31. January 2016
 checkinkey          = a57ab7ceada3fefeaa70a7136ab05f9af5ebac82
+agent               = Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 
 [cache]
 cachePremiumConfig  = cachePremiumConfig.json
@@ -23,4 +24,4 @@ premium320k	= http://listen.di.fm/premium_high/
 favorites40k	= http://listen.di.fm/premium_low/favorites.pls
 favorites64k	= http://listen.di.fm/premium_medium/favorites.pls
 favorites128k   = http://listen.di.fm/premium/favorites.pls
-favorites320k   = http://listen.di.fm/premium_high/favorites.pls
\ No newline at end of file
+favorites320k   = http://listen.di.fm/premium_high/favorites.pls
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/default.py b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/default.py
index b175741a39fbbc48c3df0c959336f17b453ece2e..009b5de396a7318145e6ff706bfd8f9455f1a6d7 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/default.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/default.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ########################################
-#  Digitally Imported XBMC plugin
+#  Digitally Imported Kodi plugin
 #  by Tim C. 'Bitcrusher' Steinmetz
 #  http://qualisoft.dk
 #  Github: https://github.com/Bitcrusher/Digitally-Imported-XBMC-plugin
@@ -144,7 +144,7 @@ class musicAddonXbmc:
             html = ""
 
             # if username is set, try to login and go for premium channels
-            if ADDON.getSetting('username') != "":
+            if ADDON.getSetting('username') != "" and ADDON.getSetting('usepremium') == "true":
                 loginData = urllib.urlencode({'member_session[username]': ADDON.getSetting('username'),
                                               'member_session[password]': ADDON.getSetting('password')})
 
@@ -193,10 +193,14 @@ class musicAddonXbmc:
 
             # go for free/public channels
             else:
-                html = self.curler.request(pluginConfig.get('urls', 'frontpage'), 'get')
+                loginData = urllib.urlencode({'member_session[username]': ADDON.getSetting('username'),
+                                              'member_session[password]': ADDON.getSetting('password')})
+
+                # post login info and get frontpage html
+                html = self.curler.request(pluginConfig.get('urls', 'login'), 'post', loginData)
 
                 # if we could not reach di.fm at all
-                if not html:
+                if not bool(html):
                     xbmc.log(u'di.fm could not be reached', xbmc.LOGWARNING)
                     xbmcgui.Dialog().ok(ADDON.getLocalizedString(30100),
                                         ADDON.getLocalizedString(30101),
@@ -209,6 +213,12 @@ class musicAddonXbmc:
                 channels = json.loads(self.curler.request(pluginConfig.get('streams', 'public'), 'get'))
                 channelMeta = self.getChannelMetadata(html)
 
+                premiumConfig = self.getPremiumConfig()
+
+                # add listenkey to playlist urls
+                for channel in channels:
+                    channel['playlist'] = '%s' % (channel['playlist'])
+
             for channel in channels:
                 self.workQueue.put(channel)
 
@@ -269,7 +279,7 @@ class musicAddonXbmc:
 
         # Will get JSON with all channel metadata
         re_channelMeta = re.compile(r"di.app.start\(({.+(?!\}\)))\)", re.M | re.I)
-        
+
         channelMeta = re_channelMeta.findall(html)[0]
 
         # removes those pesky \u2019 and what not
@@ -290,6 +300,8 @@ class musicAddonXbmc:
     def addChannel(self, channel, channelMeta, channelCount):
         # set to true if new channelart is downloaded
         isNew = 0
+        agent = pluginConfig.get('plugin', 'agent')
+        referer = pluginConfig.get('urls', 'frontpage')
 
         # if channel asset does not exist, download it
         if not os.path.exists(self.addonProfilePath + str(channel['key']) + '.png'):
@@ -301,7 +313,7 @@ class musicAddonXbmc:
         if ADDON.getSetting('randomstream') == "true":
             playlist = self.curler.request(channel['playlist'] + self.listenKey, 'get')
             playlistStreams = self.re_playlistStreams.findall(playlist)
-            streamUrl = playlistStreams[randrange(len(playlistStreams))][0]
+            streamUrl = playlistStreams[randrange(len(playlistStreams))][0] + '|User-Agent=' + agent + '&Referer=' + referer
         else:
             streamUrl = channel['playlist'] + self.listenKey
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/httpcomm.py b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/httpcomm.py
index 94e99dd1ae4ef6d07f364416a5fccbda1d32c6f6..b5a4245703956dbebadd2a240ad52aa6a71b499b 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/httpcomm.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/httpcomm.py
@@ -31,6 +31,7 @@ class HTTPComm:
             ('Keep-Alive', '115'),
             ('Connection', 'keep-alive'),
             ('Cache-Control', 'max-age=0'),
+            ('Referer', 'http://www.di.fm/')
         ]
 
         try:
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/language/English/strings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/language/English/strings.xml
index fcb34ee7c7074234b7d96daa89b0606d0a22d715..8317aa087ef115bf9a42772d54623fa60d350e7d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/language/English/strings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/language/English/strings.xml
@@ -8,11 +8,12 @@
 	<string id="30030">Use first stream for each channel (starts playing faster)</string>
 	<string id="30012">Stream cache expiration in days (0 = never)</string>
 	<string id="30010">Force cache refresh (use when changing settings)</string>
-    <string id="30031">Download random stream from each channel (faster after caching)</string>
+  <string id="30031">Download random stream from each channel (faster after caching)</string>
 
 	<string id="30001">Stream source</string>
 
-	<string id="30002">Premium</string>
+  <string id="30183">Login</string>
+	<string id="30002">Use premium streams</string>
 	<string id="30003">E-mail/username</string>
 	<string id="30004">Password</string>
 	<string id="30005">Use 'My favorites' playlist</string>
@@ -24,7 +25,7 @@
 	<string id="30009">Homepage</string>
 
 	<string id="30015">Get HQ 320k streams with DI Premium at http://www.di.fm</string>
-	<string id="30016">Version:  3.1.0</string>
+	<string id="30016">Version:  3.1.1</string>
 	<string id="30017">Author:  Tim C. 'Bitcrusher' Steinmetz</string>
 	<string id="30018">Homepage:  http://qualisoft.dk</string>
 	<string id="30019">E-mail:  timcst@gmail.com</string>
@@ -43,7 +44,7 @@
 	<string id="30100">Connection error</string>
 	<string id="30101">Could not connect to di.fm</string>
 	<string id="30102">Check your internet connection</string>
-    <string id="30103">and the website in your browser</string>
+  <string id="30103">and the website in your browser</string>
 
 	<string id="30110">No streams found</string>
 	<string id="30111">Maybe your DI Premium membership expired?</string>
@@ -68,18 +69,18 @@
 	<string id="30152"> piece(s) of channelart missing</string>
 	<string id="30153">You should refresh your cache</string>
 	<string id="30154">Disable using 'My Favorites' to get new channelart</string>
-	
+
 	<string id="30160">Problem downloading channelart</string>
 	<string id="30161">There was a problem downloading channelart for: </string>
 	<string id="30162">From URL: </string>
 
-    <string id="30170">Login failed</string>
-    <string id="30171">Invalid Username or Password</string>
-    <string id="30172">Has your account perhaps expired?</string>
+  <string id="30170">Login failed</string>
+  <string id="30171">Invalid Username or Password</string>
+  <string id="30172">Has your account perhaps expired?</string>
 
-    <string id="30180">No favorites found</string>
-    <string id="30181">Login to di.fm in your browser and go to 'Manage favorites'</string>
-    <string id="30182">or uncheck 'Use my favorites' from this plugins settings</string>
+  <string id="30180">No favorites found</string>
+  <string id="30181">Login to di.fm in your browser and go to 'Manage favorites'</string>
+  <string id="30182">or uncheck 'Use my favorites' from this plugins settings</string>
 
 
 </strings>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/language/Hebrew/strings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/language/Hebrew/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdf7b10d775eb5f0877072447f9f8eb5e6b38573
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/language/Hebrew/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+	<!-- The strings 30000 to 30999 is reserved for plug-in parameters -->
+	<!--GENERAL STRINGS -->
+
+	<string id="30014">כללי</string>
+	<string id="30011">מיין לפי A-Z (משפיע גם על 'מעודפים שלי')</string>
+	<string id="30030">השתמש בזרם ראשון לכל ערוץ (מתחיל לנגן מהר יותר)</string>
+	<string id="30012">תפוגת מטמון זרם בימים (0 = אף פעם)</string>
+	<string id="30010">אלץ רענון מטמון (שימוש בעת שינוי הגדרות)</string>
+    <string id="30031">הורד זרם אקראי מכל ערוץ (מהיר יותר לאחר מטמון)</string>
+
+	<string id="30001">מקור זרם</string>
+
+	<string id="30002">פרימיום</string>
+	<string id="30003">דוא"ל/שם משתמש</string>
+	<string id="30004">סיסמה</string>
+	<string id="30005">השתמש ברשימת ההשמעה 'המועדפים שלי'</string>
+	<string id="30013">קצב סיביות של הזרם</string>
+
+	<string id="30006">אודות</string>
+	<string id="30007">גרסה</string>
+	<string id="30008">יוצר</string>
+	<string id="30009">דף הבית</string>
+
+	<string id="30015">קבל זרמים של HQ 320k עם DI פרימיום ב-http://www.di.fm</string>
+	<string id="30016">גרסה:  3.1.0</string>
+	<string id="30017">יוצר:  Tim C. 'Bitcrusher' Steinmetz</string>
+	<string id="30018">דף הבית:  http://qualisoft.dk</string>
+	<string id="30019">דוא"ל:  timcst@gmail.com</string>
+
+	<string id="30020">סטטיסטיקה</string>
+	<string id="30021">אפשר שליחה של סטטיסטיקה</string>
+	<string id="30022">חשבתי שיהיה מעניין לראות כמה פעיל</string>
+	<string id="30023">התקנות נמצאות שם בחוץ. התוכנית היא להכין קצת</string>
+	<string id="30024">סטטיסטיקה חזותית והצגתה ב-http://stats.qualisoft.dk</string>
+	<string id="30025">זה רק ינסה לשלוח סטטיסטיקה כל 24 שעות.</string>
+	<string id="30026">מה נשלח:</string>
+	<string id="30027">סוג חשבון (ציבורי/פרימיום), גרסת תוסף, ארץ.</string>
+	<string id="30028">אני יודע שזה קצת טריק זול, זה כברירת מחדל ;)</string>
+	<string id="30029">-Tim</string>
+
+	<string id="30100">שגיאת חיבור</string>
+	<string id="30101">לא ניתן להתחבר ל-di.fm</string>
+	<string id="30102">בדוק את חיבור האינטרנט שלך</string>
+    <string id="30103">ואתר האינטרנט בדפדפן שלך</string>
+
+	<string id="30110">לא מצאו זרמים</string>
+	<string id="30111">אולי חברותך ל-DI פרימיום שלך פג?</string>
+	<string id="30112">או התוסף שבור (פריסת HTML השתנתה)</string>
+
+	<string id="30120">זמן המוקצב לחיבור</string>
+	<string id="30121">לא היתה אפשרות לקבל את רשימת ההשמעה מכתובת url זו:</string>
+
+	<string id="30130">נמצאו ערוצים חדשים</string>
+	<string id="30131">נמצא </string>
+	<string id="30132"> פיסה(ות) חדשים של ערוצים</string>
+	<string id="30133">כלומר יכולים להיות שיש ערוצים חדשים.</string>
+	<string id="30134">ערוצים חדשים מודגשים בכחול</string>
+
+	<string id="30140">קבצי מטמון חסרים</string>
+	<string id="30141">לפחות אחד מקבצי המטמון חסר</string>
+	<string id="30142">אנא גש להגדרות התוסף</string>
+	<string id="30143">ובחר "אלץ רענון זיכרון המטמון"</string>
+
+	<string id="30150">תמונת ערוץ חסרה</string>
+	<string id="30151">יש </string>
+	<string id="30152"> פיסה(ות) ערוצים חסרים</string>
+	<string id="30153">אתה צריך לרענן את זיכרון המטמון שלך</string>
+	<string id="30154">הפוך ללא זמין באמצעות 'המועדפים שלי' כדי לקבל ערוצים חדשים</string>
+	
+	<string id="30160">בעיה בהורדת תמונת ערוץ</string>
+	<string id="30161">הייתה בעיה בהורדה תמונת ערוץ ל: </string>
+	<string id="30162">מ-URL: </string>
+
+    <string id="30170">ההתחברות נכשלה</string>
+    <string id="30171">שם משתמש או סיסמה לא חוקיים</string>
+    <string id="30172">אולי החשבון שלך פג?</string>
+
+    <string id="30180">לא נמצאו מועדפים</string>
+    <string id="30181">התחבר ל-di.fm בדפדפן שלך וגש אל "ניהול מועדפים'</string>
+    <string id="30182">או בטל 'השתמש המועדפים שלי' מתוך הגדרות התוסף</string>
+
+
+</strings>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/settings.xml
index d2a77111c72d2dece588f31695cdf1a799a563fa..1ef52818bc40bcd8c8bfa63f0ebf88a6d7a0c035 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.audio.di.fm/resources/settings.xml
@@ -8,15 +8,16 @@
 		<setting id="getpremium" type="lsep" label="30015" />
 	</category>
 
-	<category label="30002">
-		<setting id="username" type="text" label="30003" />
-		<setting id="password" type="text" option="hidden" label="30004" />
-		<setting id="bitrate" type="enum" label="30013" values="40|64|128|320" default="4" />
-		<setting id="usefavorites" type="bool" label="30005" default="false" />
+	<category label="30183">
+		<setting id="usepremium" type="bool" label="30002" default="false" />
+		<setting id="username" type="text" label="30003" enable="eq(-1,true)" />
+		<setting id="password" type="text" option="hidden" label="30004" enable="eq(-2,true)" />
+		<setting id="bitrate" type="enum" label="30013" values="40|64|128|320" default="3" enable="eq(-3,true)" />
+		<setting id="usefavorites" type="bool" label="30005" default="false" enable="eq(-4,true)" />
 		<setting id="forceupdate" type="bool" label="30010" default="false" />
 		<setting id="getpremium" type="lsep" label="30015" />
 	</category>
-
+	
    	<category label="30006">
 		<setting id="getpremium" type="lsep" label="30015" />
 		<setting type="lsep" label="30017" />
@@ -24,4 +25,5 @@
 		<setting type="lsep" label="30019" />
 		<setting type="lsep" label="30016" />
 	</category>
+	
 </settings>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/addon.xml
index 6ac104ba9218fdea447bc05287d5946d437cb552..18e526756d4e10d7a2a0f8393a49ff64f97adc94 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.1337x" name="[COLOR FFF14E13]1337x[/COLOR] viewer" version="1.2.3"
+<addon id="plugin.video.1337x" name="[COLOR FFF14E13]1337x[/COLOR] viewer" version="1.2.5"
        provider-name="mancuniancol">
     <requires>
         <import addon="xbmc.python" version="2.12.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/changelog.txt
index e286ba32237505e74bcc6b49cce078aac34e2aac..6c93da1d36c64aae6e840402329c3f5803597215 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/changelog.txt
@@ -1,3 +1,5 @@
+Version 1.2.5 Adding Quasar support
+Version 1.2.4 beautifulsoup fix
 Version 1.2.3 fixing dialog error
 Version 1.2.2 Extended info support
 Version 1.2.1 Search block
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/main.py
index c4e70fc9229715e76fbdeb2670ccde9ee9368cbd..988b38a2c1af20814df9e57566cd81e1b02a2ec0 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/main.py
@@ -156,10 +156,7 @@ def nextPage(url="", page="1", showSeasons='True'):
     # Read
     settings.log(urlSearch)
     response = browser.get(urlSearch)
-    #soup = bs4.BeautifulSoup(response.text)
-    data = response.text
-    from re import findall
-    magnets = findall(r'magnet:\?[^\'"\s<>\[\]]+', data)
+    soup = bs4.BeautifulSoup(response.text, 'html.parser')
 
     # Storage information
     source = plugin.get_storage('source')
@@ -214,7 +211,9 @@ def play(url):
     magnet = url
     # Set-up the plugin
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
@@ -352,7 +351,7 @@ def createMenu(titles=[], urlSources=[], typeVideo=""):
         page[info.infoTitle["folder"]] = (info, level1)
 
 
-def menu0():  # create the menu for first level
+def menu0(showSeasons='True'):  # create the menu for first level
     information = plugin.get_storage('page')
     source = plugin.get_storage('source')
 
@@ -364,7 +363,7 @@ def menu0():  # create the menu for first level
         try:
             settings.log(info.fileName)
             items.append({'label': info.infoTitle["folder"],
-                          'path': plugin.url_for('readHTML', url=info.fileName, showSeasons='False'),
+                          'path': plugin.url_for('readHTML', url=info.fileName, showSeasons=showSeasons),
                           'thumbnail': info.infoLabels.get('cover_url', settings.icon),
                           'properties': {'fanart_image': info.fanart},
                           'info': info.infoLabels,
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/main.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/main.pyo
index e186cbc5e89cadf3e54d616202e9bfddcee01b30..d73fa22ff5cb3eeff68f96ac158add106786c9ee 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/main.pyo and b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/main.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/resources/settings.xml
index 2720ab76aa010ad1f2e192e3dfd6b9ee44ee4a1e..1e80d43d280abaff1efc13c142302d79cb9d353f 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.1337x/resources/settings.xml
@@ -5,8 +5,8 @@
         <setting label="32051" type="folder" id="movieFolder" source="videos" option="writeable" default=""/>
         <setting label="32052" type="folder" id="showFolder" source="videos" option="writeable" default=""/>
         <setting label="32053" type="folder" id="animeFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32045" type="bool" id="viewUrl" default="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/addon.xml
index abce8bec08c75a35df5daefdfa4e860aaabaeced..30b0f4ad52830aa3ec5383f93e83660f97130679 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.ccloudtv"
        name="cCloud TV"
-       version="1.3.8"
+       version="1.4.2"
        provider-name="podgod">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
@@ -21,13 +21,14 @@
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary>All the best from cCloud TV</summary>
-    <description>
-	[COLOR yellow]http://ccloudtv.org[/COLOR] cCloud Popcorntime for LIVE TV, an open source project. Just click, play and stream because IPTV just got simple and easy :)
+    <description>cCloud is an open source cloud based social IPTV service. It is built by the community for the community, where streaming is just a click away. Just click, play and stream yup it's that simple. Just go to http://ccloudtv.org  and enjoy:) Please report any channels that are down here http://www.tiny.cc/reportchs 
     </description>
 	<license>http://www.gnu.org/licenses/</license>
     <forum>http://ccloudtv.org/forum</forum>
     <website>http://ccloudtv.org</website>
+    <website>http://facebook.com/ccloudapp</website>
+    <website>http://twitter.com/ccloudapp</website>
     <email></email>
     <platform>all</platform>
   </extension>
-</addon>
+</addon>
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/changelog.txt
index 4812415513e1b5ab3113b018958e41d33413aa4a..e92dc61a5f12de5da99018c78ae34bb5bd35492e 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/changelog.txt
@@ -1,3 +1,11 @@
+[b]1.4.2[/b]
+- server change
+[b]1.4.1[/b]
+- Small bug fix to repair Top 10 channels. Thanks to Coder Alpha
+[b]1.4.0[/b]
+- Fixed a bug that allowed adult channels to appear in the search, despite being disabled in settings
+[b]1.3.9[/b]
+- small code changes/fixes
 [b]1.3.8[/b]
 - Small maintenance update to clean up some code and repair categories that were changed on the website
 [b]1.3.7[/b]
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/default.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/default.py
index 7b263774a8b4ae5ab79592875550ed31008018ae..f9ddaf3b56540a902f394da8c65b8f4b7920e3f2 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/default.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.ccloudtv/default.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-Copyright (C) 2015
+Copyright (C) 2015 PodGod
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 """
 
-import urllib, urllib2, sys, re, os, unicodedata
+import urllib, urllib2, sys, re, os, unicodedata, cookielib
 import xbmc, xbmcgui, xbmcplugin, xbmcaddon, base64
 
 plugin_handle = int(sys.argv[1])
@@ -35,6 +35,8 @@ xml_regex = '<title>(.*?)</title>\s*<link>(.*?)</link>\s*<thumbnail>(.*?)</thumb
 m3u_thumb_regex = 'tvg-logo=[\'"](.*?)[\'"]'
 group_title_regex = 'group-title=[\'"](.*?)[\'"]'
 m3u_regex = '#(.+?),(.+)\s*(.+)\s*'
+adult_regex = '#(.+?)group-title="Adult",(.+)\s*(.+)\s*'
+adult_regex2 = '#(.+?)group-title="Public-Adult",(.+)\s*(.+)\s*'
 ondemand_regex = '[ON\'](.*?)[\'nd]'
 yt = 'http://www.youtube.com'
 m3u = 'WVVoU01HTkViM1pNTTBKb1l6TlNiRmx0YkhWTWJVNTJZbE01ZVZsWVkzVmpSMmgzVURKck9WUlViRWxTYXpWNVZGUmpQUT09'.decode('base64')
@@ -76,6 +78,7 @@ def main():
 	if (len(List) < 1 ):		
 		mysettings.openSettings()
 		xbmc.executebuiltin("Container.Refresh")
+	#addDir('[COLOR yellow][B]cCloud TV Guide[/B][/COLOR]', 'guide', 97, '%s/guide.png'% iconpath, fanart)
 	addDir('[COLOR royalblue][B]Top 10[/B][/COLOR]', 'top10', 51, '%s/top10.png'% iconpath, fanart)
 	addDir('[COLOR royalblue][B]Sports[/B][/COLOR]', 'sports', 52, '%s/sports.png'% iconpath, fanart)
 	addDir('[COLOR royalblue][B]News[/B][/COLOR]', 'news', 53, '%s/news.png'% iconpath, fanart)
@@ -102,7 +105,7 @@ def search():
 		keyb = xbmc.Keyboard('', 'Enter Channel Name')
 		keyb.doModal()
 		if (keyb.isConfirmed()):
-			searchText = urllib.quote_plus(keyb.getText()).replace('+', ' ')
+			searchText = urllib.quote_plus(keyb.getText(), safe="%/:=&?~#+!$,;'@()*[]").replace('+', ' ')
 		if len(List) > 0:		
 			content = make_request(List)
 			match = re.compile(m3u_regex).findall(content)
@@ -287,13 +290,20 @@ def radio():
 	
 def adult(): 	
 	try:
-		searchText = '(Adult)'
+		searchText = ('(Adult)') or ('(Public-Adult)')
 		if len(List) > 0:		
 			content = make_request(List)
-			match = re.compile(m3u_regex).findall(content)
+			match = re.compile(adult_regex).findall(content)
 			for thumb, name, url in match:
 				if re.search(searchText, removeAccents(name.replace('Đ', 'D')), re.IGNORECASE):
-					m3u_playlist(name, url, thumb)	
+					adult_playlist(name, url, thumb)	
+		if len(List) > 0:		
+			content = make_request(List)
+			match = re.compile(adult_regex2).findall(content)
+			for thumb, name, url in match:
+				if re.search(searchText, removeAccents(name.replace('Đ', 'D')), re.IGNORECASE):
+					adult_playlist(name, url, thumb)	
+
 	except:
 		pass
 	
@@ -646,14 +656,42 @@ def international():
 	
 		
 def text_online():		
-	content = make_request(text)
-	match = re.compile(m3u_regex).findall(content)
-	for thumb, name, url in match:
-		try:
-			m3u_playlist(name, url, thumb)
-		except:
-			pass
-
+	text = '[COLOR royalblue][B]***Latest Announcements***[/B][/COLOR]'
+	newstext = 'http://pastebin.com/raw.php?i=7K3zDiZ2'
+	req = urllib2.Request(newstext)
+	req.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3')
+	response = urllib2.urlopen(req)
+	link=response.read()
+	response.close()
+	match=re.compile("<START>(.+?)<END>",re.DOTALL).findall(link)
+	for status in match:
+	    try:
+			    status = status.decode('ascii', 'ignore')
+	    except:
+			    status = status.decode('utf-8','ignore')
+	    status = status.replace('&amp;','')
+	    text = status
+	showText('[COLOR royalblue][B]***Latest Announcements***[/B][/COLOR]', text)
+
+def showText(heading, text):
+    id = 10147
+    xbmc.executebuiltin('ActivateWindow(%d)' % id)
+    xbmc.sleep(100)
+    win = xbmcgui.Window(id)
+    retry = 50
+    while (retry > 0):
+	try:
+	    xbmc.sleep(10)
+	    retry -= 1
+	    win.getControl(1).setLabel(heading)
+	    win.getControl(5).setText(text)
+	    return
+	except:
+	    pass
+
+def guide():
+	xbmc.executebuiltin("RunAddon(script.renegadestv)")
+	sys.exit()
 	
 def m3u_online():		
 	content = make_request(List)
@@ -664,6 +702,7 @@ def m3u_online():
 		except:
 			pass
 		
+
 def m3u_playlist(name, url, thumb):	
 	name = re.sub('\s+', ' ', name).strip()			
 	url = url.replace('"', ' ').replace('&amp;', '&').strip()
@@ -673,6 +712,32 @@ def m3u_playlist(name, url, thumb):
 			addDir(name, url, '', thumb, thumb)			
 		else:	
 			addDir(name, url, '', icon, fanart)
+	else:
+		if ('(Adult)' in name) or ('(Public-Adult)' in name):
+			name = 'ADULTS ONLY'.url = 'http://ignoreme.com'
+		if 'youtube.com/watch?v=' in url:
+			url = 'plugin://plugin.video.youtube/play/?video_id=%s' % (url.split('=')[-1])
+		elif 'dailymotion.com/video/' in url:
+			url = url.split('/')[-1].split('_')[0]
+			url = 'plugin://plugin.video.dailymotion_com/?mode=playVideo&url=%s' % url	
+		else:			
+			url = url
+		if 'tvg-logo' in thumb:				
+			thumb = re.compile(m3u_thumb_regex).findall(str(thumb))[0].replace(' ', '%20')
+			addLink(name, url, 1, thumb, thumb)			
+		else:				
+			addLink(name, url, 1, icon, fanart)	
+			
+			
+def adult_playlist(name, url, thumb):	
+	name = re.sub('\s+', ' ', name).strip()			
+	url = url.replace('"', ' ').replace('&amp;', '&').strip()
+	if ('youtube.com/user/' in url) or ('youtube.com/channel/' in url) or ('youtube/user/' in url) or ('youtube/channel/' in url):
+		if 'tvg-logo' in thumb:
+			thumb = re.compile(m3u_thumb_regex).findall(str(thumb))[0].replace(' ', '%20')			
+			addDir(name, url, '', thumb, thumb)		
+		else:	
+			addDir(name, url, '', icon, fanart)
 	else:
 		if 'youtube.com/watch?v=' in url:
 			url = 'plugin://plugin.video.youtube/play/?video_id=%s' % (url.split('=')[-1])
@@ -710,7 +775,8 @@ def get_params():
 				param[splitparams[0]] = splitparams[1]
 	return param
 
-List = 'YUhSMGNEb3ZMM1JwYm5rdVkyTXZTMjlrYVE9PQ=='.decode('base64') .decode('base64')
+List = 'YUhSMGNEb3ZMMnR2WkdrdVkyTnNaQzVwYnc9PQ=='.decode('base64') .decode('base64')
+#List = 'YUhSMGNEb3ZMM1JwYm5rdVkyTXZTMjlrYVE9PQ=='.decode('base64') .decode('base64')
 def addDir(name, url, mode, iconimage, fanart):
 	u = sys.argv[0] + "?url=" + urllib.quote_plus(url) + "&mode=" + str(mode) + "&name=" + urllib.quote_plus(name) + "&iconimage=" + urllib.quote_plus(iconimage)
 	ok = True
@@ -818,6 +884,9 @@ elif mode == 63:
 elif mode == 64:
 	international()
 	
+elif mode == 97:
+	guide()
+	
 elif mode == 98:
 	adult()
 	
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/addon.xml
index b936d76840177d427ae67e80902c01538d0f2f4b..a243052efa7e7900d591eeb40481050b634c8bba 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.elitetorrent" name="[COLOR FF336699]EliteTorrent[/COLOR] viewer" version="1.2.4"
+<addon id="plugin.video.elitetorrent" name="[COLOR FF336699]EliteTorrent[/COLOR] viewer" version="1.2.5"
        provider-name="mancuniancol">
     <requires>
         <import addon="xbmc.python" version="2.12.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/changelog.txt
index 47af99a55bba2e381da52319794d60da75b9efa7..4a248b661e7ad7a6a58848415e6bba26b4edda38 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/changelog.txt
@@ -1,3 +1,4 @@
+Version 1.2.5 Adding Quasar support
 Version 1.2.4 refreshing view
 Version 1.2.3 fixing dialog error
 Version 1.2.2 Extended info support
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/main.py
index cd1f827e84f7e40821d595845ec6e295e0fa0f24..8c8bfe9bb0f1483ba074c31e9d6b80811489c43d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/main.py
@@ -161,7 +161,9 @@ def play(url):
     magnet = url
     # Set-up the plugin
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/main.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/main.pyo
index 3c00cecea5007acb383d30e8851cc7059732b1cb..cc92c34f07a620376e1104bd71ba4d90c4582812 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/main.pyo and b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/main.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/ayuda.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/ayuda.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aa044b196d53bb8ccd894168fd908761c27e1e1
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/ayuda.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/busqueda-manual.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/busqueda-manual.png
new file mode 100644
index 0000000000000000000000000000000000000000..88f3e6f884fdf1188e9fe06b3bee14b351747af2
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/busqueda-manual.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/search1.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/search1.png
new file mode 100644
index 0000000000000000000000000000000000000000..20a8aa0fc3d487f9d6b2e046b1395908dd89ae15
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/images/search1.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/settings.xml
index bd3ddb83894f3ba08e5d778de8217b79dcad724f..7692111229ecc31ede6a8c19b70fb92444977bb4 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.elitetorrent/resources/settings.xml
@@ -4,8 +4,8 @@
         <setting label="32093" type="text" id="urlAddress" default="http://www.elitetorrent.net"/>
         <setting label="32051" type="folder" id="movieFolder" source="videos" option="writeable" default=""/>
         <setting label="32052" type="folder" id="showFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32045" type="bool" id="viewUrl" default="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/addon.xml
index 2125d14285f39881feaf54f9ddd7a2b6b0df41ad..a2a09acd90f6629596996347a0753af4e863cb14 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.eztv" name="[COLOR FF0F559D]EZTV[/COLOR] Viewer" version="1.0.1" provider-name="mancuniancol">
+<addon id="plugin.video.eztv" name="[COLOR FF0F559D]EZTV[/COLOR] Viewer" version="1.0.2" provider-name="mancuniancol">
 	<requires>
 		<import addon="xbmc.python" version="2.12.0"/>
 		<import addon="script.module.mctools" optional="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/changelog.txt
index 2469dd71361cfc7a20abfd6a6728171f6aeed985..d36a548ae49b4fb48a653c66ff171605b7e1257d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/changelog.txt
@@ -1,3 +1,4 @@
+Version 1.0.2 Adding Quasar support
 Version 1.0.1 fixing dialog error
 Version 1.0.0 Extended info support
 Version 0.1.2 Fix Service
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/main.py
index 4df6f61ee9016ad941ac154d8a370c71330abd6f..580615b74e7a5beeccb07529e0bb0a64756b9c59 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/main.py
@@ -157,7 +157,9 @@ def play(url):
     # Set-up the plugin
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
     settings.log(uri_string)
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/main.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/main.pyo
index e4023910a6aff981ed9cfc7d50ca5a3def6000dd..c4e9cf67700c5f5437a8901d84a08acee22ff29e 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/main.pyo and b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/main.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/resources/images/ayuda.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/resources/images/ayuda.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aa044b196d53bb8ccd894168fd908761c27e1e1
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/resources/images/ayuda.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/resources/settings.xml
index e74dbbc6f8449ddaeadf67248bc3e432f417cabc..abef1dba2ef03c4d99af8f4d84f2a1584db67d7e 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.eztv/resources/settings.xml
@@ -4,8 +4,8 @@
         <setting label="URL address (http://example.com):" type="text" id="urlAddress"
                  default="https://eztv.ag"/>
         <setting label="32052" type="folder" id="showFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32071" type="bool" id="infoLabels" default="true"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/addon.xml
index a4be8f1e9d42fdae79b6481b1f5718860fa047f3..20b85b8a4f1e750d6f395471744676fcbaf1023b 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/addon.xml
@@ -1,23 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.horriblesubsviewer" name="[COLOR FF533772]HorribleSubs[/COLOR] Viewer" version="1.1.6" provider-name="mancuniancol">
-	<requires>
-		<import addon="xbmc.python" version="2.12.0"/>
-		<import addon="script.module.mctools" optional="false"/>
-	</requires>
+<addon id="plugin.video.horriblesubsviewer" name="[COLOR FF533772]HorribleSubs[/COLOR] Viewer" version="1.1.7"
+       provider-name="mancuniancol">
+    <requires>
+        <import addon="xbmc.python" version="2.12.0"/>
+        <import addon="script.module.mctools" optional="false"/>
+    </requires>
     <extension point="xbmc.python.pluginsource" library="main.py">
         <provides>video</provides>
-	</extension>
-	<extension point="xbmc.service" library="service.py" start="login">
-	</extension>
-	<extension point="xbmc.addon.metadata">
-		<summary lang="en">the best site to find anime</summary>
-		<summary lang="es">el mejor sitio para encontrar anime</summary>
-		<description lang="en">This Add-on allows to view horribleSubs links be play for Pulsar, XBMCtorrent, KmediaTorrent, Torrenter V2 or YATP with additional local library integration option</description>
-		<description lang="es">Este Add-on permite ver los enlaces de horribleSubs para ser reproducidas por medio de Pulsar, XBMCtorrent, KmediaTorrent, Torrenter V2 o YATP con opción adicional de integración a la librería local</description>
-		<language></language>
-		<platform>all</platform>
-		<forum></forum>
-		<disclaimer lang="en">It is just for educational purpose[CR]Check if it is illegal in your country to use.</disclaimer>
-		<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
-	</extension>
+    </extension>
+    <extension point="xbmc.service" library="service.py" start="login">
+    </extension>
+    <extension point="xbmc.addon.metadata">
+        <summary lang="en">the best site to find anime</summary>
+        <summary lang="es">el mejor sitio para encontrar anime</summary>
+        <description lang="en">This Add-on allows to view horribleSubs links be play for Pulsar, XBMCtorrent,
+            KmediaTorrent, Torrenter V2 or YATP with additional local library integration option
+        </description>
+        <description lang="es">Este Add-on permite ver los enlaces de horribleSubs para ser reproducidas por medio de
+            Pulsar, XBMCtorrent, KmediaTorrent, Torrenter V2 o YATP con opción adicional de integración a la librería
+            local
+        </description>
+        <language></language>
+        <platform>all</platform>
+        <forum></forum>
+        <disclaimer lang="en">It is just for educational purpose[CR]Check if it is illegal in your country to use.
+        </disclaimer>
+        <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+    </extension>
 </addon>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/changelog.txt
index 633666235b4b13560d7b5522e16fee5570a5d250..52bd179dd941fcee4d24c0854e1237204c19ab1d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/changelog.txt
@@ -1,3 +1,4 @@
+Version 1.1.7 Adding Quasar support
 Version 1.1.6 refreshing view
 Version 1.1.5 fixing dialog error
 Version 1.1.4 fixing new released anime
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/main.py
index 79c397fe84edcce08247a5e6d749a21354b6d44b..49eafb635e0dd8e004ec6aa86b73d41d6bd05a22 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/main.py
@@ -102,7 +102,9 @@ def readUrl(url):
 def play(magnet):
     # Set-up the plugin
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/main.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/main.pyo
index 27a56fda18cc3992f67ada00712f09b59381f9bf..b289c52991b7634540a8a291544fc4ba7a7f7911 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/main.pyo and b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/main.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/resources/settings.xml
index 509d340d300f8de543c8bb417a96443fc10d1163..7a6260c184d8693a159164427f8ceb23a4b909b5 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.horriblesubsviewer/resources/settings.xml
@@ -4,8 +4,8 @@
         <setting label="URL address (http://example.com):" type="text" id="urlAddress"
                  default="http://horriblesubs.info"/>
         <setting label="32053" type="folder" id="animeFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="Pulsar"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32071" type="bool" id="infoLabels" default="true"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/README.md b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/README.md
index 8b1512fe669d047a09c470ce8bebb472db8decf7..2cfda9cac2d7141c5955526b88144bd1591f51cd 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/README.md
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/README.md
@@ -1,13 +1,13 @@
-Introduction
-===================
-This is addon is a viewer for KickAss site and it allows to play its torrents directly with the help of Pulsar, KmediaTorrent, XBMCTorrent, Torrenter V2 and YATP.
-
-It also integrates the feed in the local library allowing to use all the tools from local library as trailer, cinema experience, etc.
-
-It is possible to write the list manually or create them from internet.
-
-Requeriments
-===================
-This addon needs to have installed the module:
-script.module.mctools
+Introduction
+===================
+This is addon is a viewer for KickAss site and it allows to play its torrents directly with the help of Pulsar, KmediaTorrent, XBMCTorrent, Torrenter V2 and YATP.
+
+It also integrates the feed in the local library allowing to use all the tools from local library as trailer, cinema experience, etc.
+
+It is possible to write the list manually or create them from internet.
+
+Requeriments
+===================
+This addon needs to have installed the module:
+script.module.mctools
 https://github.com/mancuniancol/script.module.mctools/releases
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/Thumbs.db b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..6ad5cff469a3bb3702f67b5ed5195b49fa0be06d
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/Thumbs.db differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/addon.xml
index 80cf197404466114f579de1c871957de07646c76..eafe55d665b1773369dae181de12681e9fe8a693 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/addon.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.kickass" name="[COLOR FFFEDF64]KickAss[/COLOR] viewer" version="1.2.6"
-       provider-name="mancuniancol">
-    <requires>
-        <import addon="xbmc.python" version="2.12.0"/>
-        <import addon="script.module.mctools" optional="false"/>
-    </requires>
-    <extension point="xbmc.python.pluginsource" library="main.py">
-        <provides>video</provides>
-    </extension>
-    <extension point="xbmc.service" library="service.py" start="login">
-    </extension>
-    <extension point="xbmc.addon.metadata">
-        <summary lang="en">Movies and Tv Shows</summary>
-        <summary lang="es">Películas y series`</summary>
-        <description lang="en">This Add-on is a viewer for KickAss</description>
-        <description lang="es">Este es un Add-on es un visor para KickAss</description>
-        <language></language>
-        <platform>all</platform>
-        <forum></forum>
-        <disclaimer lang="en">It is just for educational purpose[CR]Check if it is illegal in your country to use.
-        </disclaimer>
-        <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
-    </extension>
-</addon>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="plugin.video.kickass" name="[COLOR FFFEDF64]KickAss[/COLOR] viewer" version="1.2.7"
+       provider-name="mancuniancol">
+    <requires>
+        <import addon="xbmc.python" version="2.12.0"/>
+        <import addon="script.module.mctools" optional="false"/>
+    </requires>
+    <extension point="xbmc.python.pluginsource" library="main.py">
+        <provides>video</provides>
+    </extension>
+    <extension point="xbmc.service" library="service.py" start="login">
+    </extension>
+    <extension point="xbmc.addon.metadata">
+        <summary lang="en">Movies and Tv Shows</summary>
+        <summary lang="es">Películas y series`</summary>
+        <description lang="en">This Add-on is a viewer for KickAss</description>
+        <description lang="es">Este es un Add-on es un visor para KickAss</description>
+        <language></language>
+        <platform>all</platform>
+        <forum></forum>
+        <disclaimer lang="en">It is just for educational purpose[CR]Check if it is illegal in your country to use.
+        </disclaimer>
+        <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+    </extension>
+</addon>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/changelog.txt
index 1f4ac1338e84b8fd58507ece25ac132521824867..93d62946b2ff7255a24b77340ded4e5f2f3917b6 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/changelog.txt
@@ -1,7 +1,8 @@
-Version 1.2.6 refreshing view
-Version 1.2.5 fixing dialog error
-Version 1.2.4 Extended info support
-Version 1.2.3 Regression magnet
-Version 1.2.2 fix import
-Version 1.2.1 Search block
+Version 1.2.7 Adding Quasar support
+Version 1.2.6 refreshing view
+Version 1.2.5 fixing dialog error
+Version 1.2.4 Extended info support
+Version 1.2.3 Regression magnet
+Version 1.2.2 fix import
+Version 1.2.1 Search block
 Version 1.0.0 First version
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/main.py
index 43b1286f96654c68cfba36f1558f7d50a0818ad5..a44878567dca0d7a4d184810c4560bca7d6e5adc 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/main.py
@@ -1,435 +1,437 @@
-# coding: utf-8
-# Main Addon
-__author__ = 'mancuniancol'
-
-from xbmcswift2 import Plugin
-from tools2 import *
-
-##INITIALISATION
-storage = Storage(settings.storageName, type="dict", eval=True)
-plugin = Plugin()
-
-
-###############################
-###  MENU    ##################
-###############################
-@plugin.route('/')
-def index():
-    textViewer(settings.string(32000), once=True)
-    items = [
-        {'label': settings.string(32194),
-         'path': plugin.url_for('searchMenu'),
-         'thumbnail': dirImages("search.png"),
-         'properties': {'fanart_image': settings.fanart}
-         }]
-    listTypes = ['Movies',
-                 'TV',
-                 'Anime',
-                 ]
-    listUrl = ['/movies',
-               '/tv',
-               '/anime',
-               ]
-    listIcons = [dirImages("movies.png"),
-                 dirImages("tvShows.png"),
-                 dirImages("animes.png"),
-                 ]
-    listAction = ['readHTML',
-                  'readHTML',
-                  'readHTML',
-                  ]
-    for type, url, icon, action in zip(listTypes, listUrl, listIcons, listAction):
-        items.append({'label': type,
-                      'path': plugin.url_for(action, url=url, showSeasons='True'),
-                      'thumbnail': icon,
-                      'properties': {'fanart_image': settings.fanart},
-                      })
-    items.append({'label': "[B]Help[/B]",
-                  'path': plugin.url_for('help'),
-                  'thumbnail': dirImages("help.png"),
-                  'properties': {'fanart_image': settings.fanart}
-                  })
-    return items
-
-
-# Search Menu
-@plugin.route("/searchMenu/")
-def searchMenu():
-    items = [
-        {'label': settings.string(32195),
-         'path': plugin.url_for('search'),
-         'thumbnail': dirImages("search.png"),
-         'properties': {'fanart_image': settings.fanart}
-         }]
-    items.extend(read())
-    return items
-
-
-# Search
-@plugin.route('/search/')
-def search():
-    query = settings.dialog.input(settings.string(32190))
-    url = "/usearch/%s" % query.replace(" ", "%20")
-    response = settings.dialog.yesno(settings.name, settings.string(32193))
-    if response:
-        name = ''
-        while name is '':
-            name = settings.dialog.input(plugin.get_string(32192)).title()
-        storage.database[name] = (url, False)  # url, isSubscribed
-        storage.save()
-    return readHTML(url, showSeasons='False')
-
-
-####################################################
-@plugin.route('/readHTML/<url>/<showSeasons>', name="readHTML")
-def readHTML(url="", showSeasons='True'):
-    # First Page
-    information = plugin.get_storage('information')
-    information.clear()
-    return nextPage(url=url, showSeasons=showSeasons)
-
-
-@plugin.route('/nextPage/<url>/<page>/<showSeasons>', name="nextPage")
-def nextPage(url="", page="1", showSeasons='True'):
-    urlSearch = settings.value["urlAddress"] + url + '/'
-    if 'series' not in url:
-        urlSearch += page + '/'
-
-    # Read
-    settings.log(urlSearch)
-    response = browser.get(urlSearch, verify=False)
-    soup = bs4.BeautifulSoup(response.text)
-
-    # Storage information
-    source = plugin.get_storage('source')
-    source['url'] = url
-    source['page'] = int(page)
-
-    # Titles and Urls
-    titles = []
-    urlSources = []
-    links = soup.select("div.none")
-    for span in links:
-        magnet = literal_eval(span["data-sc-params"])
-        titles.append(unquoteName(magnet["name"]))
-        urlSources.append(unquoteName(magnet["magnet"]))
-
-    # Create Menu
-    createMenu(titles, urlSources)
-    items = menu1(showSeasons=showSeasons)
-
-    # Next page
-    items.append({'label': "[B]" + settings.string(32191) + "[/B]",
-                  'path': plugin.url_for('nextPage', url=url, page=int(page) + 1, showSeasons=showSeasons),
-                  'thumbnail': dirImages("next11.png"),
-                  'info': {'episode': 9999},
-                  'properties': {'fanart_image': settings.fanart}
-                  })
-
-    if __name__ == '__main__':
-        return plugin.finish(items=items, view_mode=settings.value['viewMode'],
-                             sort_methods=[24, 'title'])
-    else:
-        return items
-
-
-###################################################
-############## COMMON NOT TO CHANGE ###############
-###################################################
-@plugin.route('/play/<url>')
-def play(url):
-    # magnet = getPlayableLink(url)
-    magnet = url
-    # Set-up the plugin
-    uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
-    if settings.value["plugin"] == 'Pulsar':
-        link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
-    elif settings.value["plugin"] == 'KmediaTorrent':
-        link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
-    elif settings.value["plugin"] == "Torrenter":
-        link = 'plugin://plugin.video.torrenter/?action=playSTRM&url=' + uri_string + \
-               '&not_download_only=True'
-    elif settings.value["plugin"] == "YATP":
-        link = 'plugin://plugin.video.yatp/?action=play&torrent=' + uri_string
-    else:
-        link = 'plugin://plugin.video.xbmctorrent/play/%s' % uri_string
-    # play media
-    settings.debug("PlayMedia(%s)" % link)
-    xbmc.executebuiltin("PlayMedia(%s)" % link)
-    xbmc.executebuiltin('Dialog.Close(all, true)')
-
-
-@plugin.route('/help/')
-def help():
-    textViewer(plugin.get_string(32000), once=False)
-
-
-@plugin.route('/unsubscribe/<key>')
-def unsubscribe(key=""):
-    storage.database[key] = (storage.database[key][0], False)
-    storage.save()
-
-
-@plugin.route('/subscribe/<key>/<url>')
-def subscribe(key="", url=""):
-    storage.add(key, (url, True), safe=False)
-    storage.save()
-    importAll(url)
-
-
-@plugin.route('/importOne/<title>')
-def importOne(title=""):
-    information = plugin.get_storage('information')
-    info = information[title][0]
-    integration(titles=[title], magnets=[info.fileName], id=[info.id], typeVideo=[info.typeVideo], silence=True)
-
-
-@plugin.route('/importAll/<url>')
-def importAll(url=""):
-    items = readHTML(url, showSeasons="False")  # only to create information
-    information = plugin.get_storage('information')
-    titles = []
-    fileNames = []
-    typeVideos = []
-    ids = []
-    for title in information:
-        temp, level1 = information[title]
-        for season in level1:
-            level2 = level1[season]
-            for episode in level2:
-                temp, level3 = level2[episode]
-                for info in level3:
-                    ids.append(info.id)
-                    titles.append(info.infoTitle["title"])
-                    fileNames.append(info.fileName)
-                    typeVideos.append(info.typeVideo)
-    integration(titles=titles, magnets=fileNames, id=ids, typeVideo=typeVideos, silence=True)
-
-
-@plugin.route('/rebuilt/<url>')
-def rebuilt(url):
-    overwrite = settings.value["overwrite"]  # save the user's value
-    settings.value["overwrite"] = "true"  # force to overwrite
-    importAll(url)
-    settings.value["overwrite"] = overwrite  # return the user's value
-    settings.log(url + " was rebuilt")
-
-
-@plugin.route('/remove/<key>')
-def remove(key=""):
-    if settings.dialog.yesno(settings.cleanName, plugin.get_string(32006) % key):
-        storage.remove(key, safe=False)
-        storage.save()
-        'XBMC.Container.Update(%s)' % plugin.url_for('/search/')
-
-
-@plugin.route('/modify/<key>')
-def modify(key):
-    selection = settings.dialog.input(plugin.get_string(32007), storage.database[key][0])
-    newKey = ''
-    while newKey is '':
-        newKey = settings.dialog.input(plugin.get_string(32008), key).title()
-    storage.database[newKey] = (selection, storage.database[key][1])
-    if newKey != key: storage.remove(key, safe=False)
-    storage.save()
-    'XBMC.Container.Update(%s)' % plugin.url_for('/search/')
-
-
-def read():
-    # list storage search
-    items = []
-    for key in sorted(storage.database):  # sort the dictionnary
-        (url, isIntegrated) = storage.database[key]
-        settings.debug(url)
-        settings.debug(isIntegrated)
-        if isIntegrated:
-            importInfo = (plugin.get_string(32001),
-                          'XBMC.Container.Update(%s)' % plugin.url_for('unsubscribe', key=key))
-        else:
-            importInfo = (plugin.get_string(32002),
-                          'XBMC.Container.Update(%s)' % plugin.url_for('subscribe', key=key, url=url))
-        items.append({'label': "- " + key,
-                      'path': plugin.url_for('readHTML', url=url, showSeasons='True'),
-                      'thumbnail': dirImages(key[0] + '.png'),
-                      'properties': {'fanart_image': settings.fanart},
-                      'context_menu': [importInfo,
-                                       (plugin.get_string(32187),
-                                        'XBMC.Container.Update(%s)' % plugin.url_for('remove', key=key)),
-                                       (plugin.get_string(32188),
-                                        'XBMC.Container.Update(%s)' % plugin.url_for('modify', key=key)),
-                                       (plugin.get_string(32045),
-                                        'XBMC.Container.Update(%s)' % plugin.url_for('rebuilt', url=url))
-                                       ]
-                      })
-    return items
-
-
-# Create the storage from titles and urls
-def createMenu(titles=[], urlSources=[], typeVideo=""):
-    information = plugin.get_storage('information')
-    page = plugin.get_storage('page')
-    page.clear()
-    for title, urlSource in zip(titles, urlSources):
-        # it gets all the information from the title and url
-        info = UnTaggle(title, urlSource, typeVideo=typeVideo)  # Untaggle
-        temp, level1 = information.get(info.infoTitle["folder"], ("", {}))  # infoLabels, dictionnary seasons
-        level2 = level1.get(str(info.season), {})  # dictionnary episodes
-        temp, level3 = level2.get(str(info.episode), ("", []))  # list info for that episode
-        level3.append(info)  # add new info video
-        level2[str(info.episode)] = (info, level3)
-        level1[str(info.season)] = level2
-        information[info.infoTitle["folder"]] = (info, level1)
-        page[info.infoTitle["folder"]] = (info, level1)
-
-
-@plugin.route('/menu1')
-def menu1(showSeasons='True'):  # create the menu for first level
-    information = plugin.get_storage('page')
-    source = plugin.get_storage('source')
-
-    items = []
-    typeVideo = "MOVIE"
-    if len(information.keys()) == 1:
-        items = menu2(information.keys()[0], showSeasons=showSeasons)
-    else:
-        for title in information.keys():
-            info, level1 = information.get(title, ("", {}))  # infoLabels, dictionnary seasons
-            typeVideo = info.typeVideo
-            if typeVideo == 'MOVIE':
-                extraInfo = ("Extended Info",
-                             'XBMC.RunScript(script.extendedinfo,info=extendedinfo,imdb_id=%s)' % info.imdb_id)
-            else:
-                extraInfo = ("Extended Info",
-                             'XBMC.RunScript(script.extendedinfo,info=extendedtvinfo,imdb_id=%s)' % info.imdb_id)
-            try:
-                items.append({'label': info.infoTitle["folder"],
-                              'path': plugin.url_for('menu2', title=info.infoTitle["folder"]),
-                              'thumbnail': info.infoLabels.get('cover_url', settings.icon),
-                              'properties': {'fanart_image': info.fanart},
-                              'info': info.infoLabels,
-                              'context_menu': [extraInfo],
-                              })
-            except:
-                pass
-        # main
-        if __name__ == '__main__':
-            plugin.set_content("movies" if typeVideo == "MOVIE" else "tvshows")
-    return items
-
-
-@plugin.route('/menu2/<title>')
-def menu2(title="", showSeasons='True'):  # create the menu for second level
-    information = plugin.get_storage('information')
-    items = []
-    typeVideo = "MOVIE"
-    info, level1 = information.get(title, ("", {}))  # infoLabels, dictionnary seasons
-    if len(level1) == 1:
-        items = menu3(title, level1.keys()[0])
-    else:
-        for season in level1.keys():
-            if showSeasons == 'True':
-                typeVideo = info.typeVideo
-                if typeVideo == 'MOVIE':
-                    extraInfo = ("Extended Info",
-                                 'XBMC.RunScript(script.extendedinfo,info=extendedinfo,imdb_id=%s)' % info.imdb_id)
-                else:
-                    extraInfo = ("Extended Info",
-                                 'XBMC.RunScript(script.extendedinfo,info=seasoninfo,tvshow=%s, season=%s)' % (
-                                     info.infoTitle['cleanTitle'], season))
-                try:
-                    items.append({'label': "Season %s" % season,
-                                  'path': plugin.url_for('menu3', title=title, season=season),
-                                  'thumbnail': info.infoLabels.get('cover_url', settings.icon),
-                                  'properties': {'fanart_image': info.fanart},
-                                  'info': info.infoLabels,
-                                  'context_menu': [extraInfo],
-                                  })
-                except:
-                    pass
-            else:
-                items.extend(menu3(title=title, season=season))
-        # main
-        if __name__ == '__main__':
-            plugin.set_content("movies" if typeVideo == "MOVIE" else "tvshows")
-    return items
-
-
-@plugin.route('/menu3/<title>/<season>')
-def menu3(title="", season=""):  # create the menu for third level
-    information = plugin.get_storage('information')
-    items = []
-    typeVideo = "MOVIE"
-    temp, level1 = information.get(title, ("", {}))  # infoLabels, dictionnary seasons
-    level2 = level1[season]
-    if len(level2) == 1:
-        items = menu4(title, season, level2.keys()[0])
-    else:
-        for episode in level2.keys():
-            info, level3 = level2[episode]  # dictionnary episodes
-            typeVideo = info.typeVideo
-            if typeVideo == 'MOVIE':
-                extraInfo = ("Extended Info",
-                             'XBMC.RunScript(script.extendedinfo,info=extendedinfo,imdb_id=%s)' % info.imdb_id)
-            else:
-                extraInfo = ("Extended Info",
-                             'XBMC.RunScript(script.extendedinfo,info=extendedepisodeinfo,tvshow=%s, season=%s, episode=%s)' % (
-                                 info.infoTitle['cleanTitle'], season, episode))
-            try:
-                items.append({'label': info.infoTitle["title"] + info.titleEpisode,
-                              'path': plugin.url_for('menu4', title=title, season=season, episode=episode),
-                              'thumbnail': info.cover,
-                              'properties': {'fanart_image': info.fanart},
-                              'info': info.info,
-                              'context_menu': [extraInfo],
-                              })
-            except:
-                pass
-        # main
-        if __name__ == '__main__':
-            plugin.set_content("movies" if typeVideo == "MOVIE" else "episodes")
-    return items
-
-
-@plugin.route('/menu4/<title>/<season>/<episode>')
-def menu4(title="", season="", episode=""):  # create the menu for last level
-    information = plugin.get_storage('information')
-    items = []
-    typeVideo = "MOVIE"
-    temp, level1 = information.get(title, ("", {}))  # infoLabels, dictionnary seasons
-    level2 = level1[season]
-    temp, level3 = level2[episode]
-    for info in level3:
-        typeVideo = info.typeVideo
-        if typeVideo == 'MOVIE':
-            extraInfo = ("Extended Info",
-                         'XBMC.RunScript(script.extendedinfo,info=extendedinfo,imdb_id=%s)' % info.imdb_id)
-        else:
-            extraInfo = ("Extended Info",
-                         'XBMC.RunScript(script.extendedinfo,info=extendedepisodeinfo,tvshow=%s, season=%s, episode=%s)' % (
-                             info.infoTitle['cleanTitle'], season, episode))
-        try:
-            items.append({'label': info.label,
-                          'path': plugin.url_for('play', url=info.fileName),
-                          'thumbnail': info.cover,
-                          'properties': {'fanart_image': info.fanart},
-                          'info': info.info,
-                          'stream_info': info.infoStream,
-                          'context_menu': [
-                              (plugin.get_string(32009),
-                               'XBMC.RunPlugin(%s)' % plugin.url_for('importOne', title=title)),
-                              extraInfo
-                          ]
-                          })
-        except:
-            pass
-        # main
-        if __name__ == '__main__':
-            plugin.set_content("movies" if typeVideo == "MOVIE" else "episodes")
-    return items
-
-
-if __name__ == '__main__':
-    try:
-        plugin.run()
-    except:
-        pass
+# coding: utf-8
+# Main Addon
+__author__ = 'mancuniancol'
+
+from xbmcswift2 import Plugin
+from tools2 import *
+
+##INITIALISATION
+storage = Storage(settings.storageName, type="dict", eval=True)
+plugin = Plugin()
+
+
+###############################
+###  MENU    ##################
+###############################
+@plugin.route('/')
+def index():
+    textViewer(settings.string(32000), once=True)
+    items = [
+        {'label': settings.string(32194),
+         'path': plugin.url_for('searchMenu'),
+         'thumbnail': dirImages("search.png"),
+         'properties': {'fanart_image': settings.fanart}
+         }]
+    listTypes = ['Movies',
+                 'TV',
+                 'Anime',
+                 ]
+    listUrl = ['/movies',
+               '/tv',
+               '/anime',
+               ]
+    listIcons = [dirImages("movies.png"),
+                 dirImages("tvShows.png"),
+                 dirImages("animes.png"),
+                 ]
+    listAction = ['readHTML',
+                  'readHTML',
+                  'readHTML',
+                  ]
+    for type, url, icon, action in zip(listTypes, listUrl, listIcons, listAction):
+        items.append({'label': type,
+                      'path': plugin.url_for(action, url=url, showSeasons='True'),
+                      'thumbnail': icon,
+                      'properties': {'fanart_image': settings.fanart},
+                      })
+    items.append({'label': "[B]Help[/B]",
+                  'path': plugin.url_for('help'),
+                  'thumbnail': dirImages("help.png"),
+                  'properties': {'fanart_image': settings.fanart}
+                  })
+    return items
+
+
+# Search Menu
+@plugin.route("/searchMenu/")
+def searchMenu():
+    items = [
+        {'label': settings.string(32195),
+         'path': plugin.url_for('search'),
+         'thumbnail': dirImages("search.png"),
+         'properties': {'fanart_image': settings.fanart}
+         }]
+    items.extend(read())
+    return items
+
+
+# Search
+@plugin.route('/search/')
+def search():
+    query = settings.dialog.input(settings.string(32190))
+    url = "/usearch/%s" % query.replace(" ", "%20")
+    response = settings.dialog.yesno(settings.name, settings.string(32193))
+    if response:
+        name = ''
+        while name is '':
+            name = settings.dialog.input(plugin.get_string(32192)).title()
+        storage.database[name] = (url, False)  # url, isSubscribed
+        storage.save()
+    return readHTML(url, showSeasons='False')
+
+
+####################################################
+@plugin.route('/readHTML/<url>/<showSeasons>', name="readHTML")
+def readHTML(url="", showSeasons='True'):
+    # First Page
+    information = plugin.get_storage('information')
+    information.clear()
+    return nextPage(url=url, showSeasons=showSeasons)
+
+
+@plugin.route('/nextPage/<url>/<page>/<showSeasons>', name="nextPage")
+def nextPage(url="", page="1", showSeasons='True'):
+    urlSearch = settings.value["urlAddress"] + url + '/'
+    if 'series' not in url:
+        urlSearch += page + '/'
+
+    # Read
+    settings.log(urlSearch)
+    response = browser.get(urlSearch, verify=False)
+    soup = bs4.BeautifulSoup(response.text)
+
+    # Storage information
+    source = plugin.get_storage('source')
+    source['url'] = url
+    source['page'] = int(page)
+
+    # Titles and Urls
+    titles = []
+    urlSources = []
+    links = soup.select("div.none")
+    for span in links:
+        magnet = literal_eval(span["data-sc-params"])
+        titles.append(unquoteName(magnet["name"]))
+        urlSources.append(unquoteName(magnet["magnet"]))
+
+    # Create Menu
+    createMenu(titles, urlSources)
+    items = menu1(showSeasons=showSeasons)
+
+    # Next page
+    items.append({'label': "[B]" + settings.string(32191) + "[/B]",
+                  'path': plugin.url_for('nextPage', url=url, page=int(page) + 1, showSeasons=showSeasons),
+                  'thumbnail': dirImages("next11.png"),
+                  'info': {'episode': 9999},
+                  'properties': {'fanart_image': settings.fanart}
+                  })
+
+    if __name__ == '__main__':
+        return plugin.finish(items=items, view_mode=settings.value['viewMode'],
+                             sort_methods=[24, 'title'])
+    else:
+        return items
+
+
+###################################################
+############## COMMON NOT TO CHANGE ###############
+###################################################
+@plugin.route('/play/<url>')
+def play(url):
+    # magnet = getPlayableLink(url)
+    magnet = url
+    # Set-up the plugin
+    uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
+        link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'KmediaTorrent':
+        link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
+    elif settings.value["plugin"] == "Torrenter":
+        link = 'plugin://plugin.video.torrenter/?action=playSTRM&url=' + uri_string + \
+               '&not_download_only=True'
+    elif settings.value["plugin"] == "YATP":
+        link = 'plugin://plugin.video.yatp/?action=play&torrent=' + uri_string
+    else:
+        link = 'plugin://plugin.video.xbmctorrent/play/%s' % uri_string
+    # play media
+    settings.debug("PlayMedia(%s)" % link)
+    xbmc.executebuiltin("PlayMedia(%s)" % link)
+    xbmc.executebuiltin('Dialog.Close(all, true)')
+
+
+@plugin.route('/help/')
+def help():
+    textViewer(plugin.get_string(32000), once=False)
+
+
+@plugin.route('/unsubscribe/<key>')
+def unsubscribe(key=""):
+    storage.database[key] = (storage.database[key][0], False)
+    storage.save()
+
+
+@plugin.route('/subscribe/<key>/<url>')
+def subscribe(key="", url=""):
+    storage.add(key, (url, True), safe=False)
+    storage.save()
+    importAll(url)
+
+
+@plugin.route('/importOne/<title>')
+def importOne(title=""):
+    information = plugin.get_storage('information')
+    info = information[title][0]
+    integration(titles=[title], magnets=[info.fileName], id=[info.id], typeVideo=[info.typeVideo], silence=True)
+
+
+@plugin.route('/importAll/<url>')
+def importAll(url=""):
+    items = readHTML(url, showSeasons="False")  # only to create information
+    information = plugin.get_storage('information')
+    titles = []
+    fileNames = []
+    typeVideos = []
+    ids = []
+    for title in information:
+        temp, level1 = information[title]
+        for season in level1:
+            level2 = level1[season]
+            for episode in level2:
+                temp, level3 = level2[episode]
+                for info in level3:
+                    ids.append(info.id)
+                    titles.append(info.infoTitle["title"])
+                    fileNames.append(info.fileName)
+                    typeVideos.append(info.typeVideo)
+    integration(titles=titles, magnets=fileNames, id=ids, typeVideo=typeVideos, silence=True)
+
+
+@plugin.route('/rebuilt/<url>')
+def rebuilt(url):
+    overwrite = settings.value["overwrite"]  # save the user's value
+    settings.value["overwrite"] = "true"  # force to overwrite
+    importAll(url)
+    settings.value["overwrite"] = overwrite  # return the user's value
+    settings.log(url + " was rebuilt")
+
+
+@plugin.route('/remove/<key>')
+def remove(key=""):
+    if settings.dialog.yesno(settings.cleanName, plugin.get_string(32006) % key):
+        storage.remove(key, safe=False)
+        storage.save()
+        'XBMC.Container.Update(%s)' % plugin.url_for('/search/')
+
+
+@plugin.route('/modify/<key>')
+def modify(key):
+    selection = settings.dialog.input(plugin.get_string(32007), storage.database[key][0])
+    newKey = ''
+    while newKey is '':
+        newKey = settings.dialog.input(plugin.get_string(32008), key).title()
+    storage.database[newKey] = (selection, storage.database[key][1])
+    if newKey != key: storage.remove(key, safe=False)
+    storage.save()
+    'XBMC.Container.Update(%s)' % plugin.url_for('/search/')
+
+
+def read():
+    # list storage search
+    items = []
+    for key in sorted(storage.database):  # sort the dictionnary
+        (url, isIntegrated) = storage.database[key]
+        settings.debug(url)
+        settings.debug(isIntegrated)
+        if isIntegrated:
+            importInfo = (plugin.get_string(32001),
+                          'XBMC.Container.Update(%s)' % plugin.url_for('unsubscribe', key=key))
+        else:
+            importInfo = (plugin.get_string(32002),
+                          'XBMC.Container.Update(%s)' % plugin.url_for('subscribe', key=key, url=url))
+        items.append({'label': "- " + key,
+                      'path': plugin.url_for('readHTML', url=url, showSeasons='True'),
+                      'thumbnail': dirImages(key[0] + '.png'),
+                      'properties': {'fanart_image': settings.fanart},
+                      'context_menu': [importInfo,
+                                       (plugin.get_string(32187),
+                                        'XBMC.Container.Update(%s)' % plugin.url_for('remove', key=key)),
+                                       (plugin.get_string(32188),
+                                        'XBMC.Container.Update(%s)' % plugin.url_for('modify', key=key)),
+                                       (plugin.get_string(32045),
+                                        'XBMC.Container.Update(%s)' % plugin.url_for('rebuilt', url=url))
+                                       ]
+                      })
+    return items
+
+
+# Create the storage from titles and urls
+def createMenu(titles=[], urlSources=[], typeVideo=""):
+    information = plugin.get_storage('information')
+    page = plugin.get_storage('page')
+    page.clear()
+    for title, urlSource in zip(titles, urlSources):
+        # it gets all the information from the title and url
+        info = UnTaggle(title, urlSource, typeVideo=typeVideo)  # Untaggle
+        temp, level1 = information.get(info.infoTitle["folder"], ("", {}))  # infoLabels, dictionnary seasons
+        level2 = level1.get(str(info.season), {})  # dictionnary episodes
+        temp, level3 = level2.get(str(info.episode), ("", []))  # list info for that episode
+        level3.append(info)  # add new info video
+        level2[str(info.episode)] = (info, level3)
+        level1[str(info.season)] = level2
+        information[info.infoTitle["folder"]] = (info, level1)
+        page[info.infoTitle["folder"]] = (info, level1)
+
+
+@plugin.route('/menu1')
+def menu1(showSeasons='True'):  # create the menu for first level
+    information = plugin.get_storage('page')
+    source = plugin.get_storage('source')
+
+    items = []
+    typeVideo = "MOVIE"
+    if len(information.keys()) == 1:
+        items = menu2(information.keys()[0], showSeasons=showSeasons)
+    else:
+        for title in information.keys():
+            info, level1 = information.get(title, ("", {}))  # infoLabels, dictionnary seasons
+            typeVideo = info.typeVideo
+            if typeVideo == 'MOVIE':
+                extraInfo = ("Extended Info",
+                             'XBMC.RunScript(script.extendedinfo,info=extendedinfo,imdb_id=%s)' % info.imdb_id)
+            else:
+                extraInfo = ("Extended Info",
+                             'XBMC.RunScript(script.extendedinfo,info=extendedtvinfo,imdb_id=%s)' % info.imdb_id)
+            try:
+                items.append({'label': info.infoTitle["folder"],
+                              'path': plugin.url_for('menu2', title=info.infoTitle["folder"]),
+                              'thumbnail': info.infoLabels.get('cover_url', settings.icon),
+                              'properties': {'fanart_image': info.fanart},
+                              'info': info.infoLabels,
+                              'context_menu': [extraInfo],
+                              })
+            except:
+                pass
+        # main
+        if __name__ == '__main__':
+            plugin.set_content("movies" if typeVideo == "MOVIE" else "tvshows")
+    return items
+
+
+@plugin.route('/menu2/<title>')
+def menu2(title="", showSeasons='True'):  # create the menu for second level
+    information = plugin.get_storage('information')
+    items = []
+    typeVideo = "MOVIE"
+    info, level1 = information.get(title, ("", {}))  # infoLabels, dictionnary seasons
+    if len(level1) == 1:
+        items = menu3(title, level1.keys()[0])
+    else:
+        for season in level1.keys():
+            if showSeasons == 'True':
+                typeVideo = info.typeVideo
+                if typeVideo == 'MOVIE':
+                    extraInfo = ("Extended Info",
+                                 'XBMC.RunScript(script.extendedinfo,info=extendedinfo,imdb_id=%s)' % info.imdb_id)
+                else:
+                    extraInfo = ("Extended Info",
+                                 'XBMC.RunScript(script.extendedinfo,info=seasoninfo,tvshow=%s, season=%s)' % (
+                                     info.infoTitle['cleanTitle'], season))
+                try:
+                    items.append({'label': "Season %s" % season,
+                                  'path': plugin.url_for('menu3', title=title, season=season),
+                                  'thumbnail': info.infoLabels.get('cover_url', settings.icon),
+                                  'properties': {'fanart_image': info.fanart},
+                                  'info': info.infoLabels,
+                                  'context_menu': [extraInfo],
+                                  })
+                except:
+                    pass
+            else:
+                items.extend(menu3(title=title, season=season))
+        # main
+        if __name__ == '__main__':
+            plugin.set_content("movies" if typeVideo == "MOVIE" else "tvshows")
+    return items
+
+
+@plugin.route('/menu3/<title>/<season>')
+def menu3(title="", season=""):  # create the menu for third level
+    information = plugin.get_storage('information')
+    items = []
+    typeVideo = "MOVIE"
+    temp, level1 = information.get(title, ("", {}))  # infoLabels, dictionnary seasons
+    level2 = level1[season]
+    if len(level2) == 1:
+        items = menu4(title, season, level2.keys()[0])
+    else:
+        for episode in level2.keys():
+            info, level3 = level2[episode]  # dictionnary episodes
+            typeVideo = info.typeVideo
+            if typeVideo == 'MOVIE':
+                extraInfo = ("Extended Info",
+                             'XBMC.RunScript(script.extendedinfo,info=extendedinfo,imdb_id=%s)' % info.imdb_id)
+            else:
+                extraInfo = ("Extended Info",
+                             'XBMC.RunScript(script.extendedinfo,info=extendedepisodeinfo,tvshow=%s, season=%s, episode=%s)' % (
+                                 info.infoTitle['cleanTitle'], season, episode))
+            try:
+                items.append({'label': info.infoTitle["title"] + info.titleEpisode,
+                              'path': plugin.url_for('menu4', title=title, season=season, episode=episode),
+                              'thumbnail': info.cover,
+                              'properties': {'fanart_image': info.fanart},
+                              'info': info.info,
+                              'context_menu': [extraInfo],
+                              })
+            except:
+                pass
+        # main
+        if __name__ == '__main__':
+            plugin.set_content("movies" if typeVideo == "MOVIE" else "episodes")
+    return items
+
+
+@plugin.route('/menu4/<title>/<season>/<episode>')
+def menu4(title="", season="", episode=""):  # create the menu for last level
+    information = plugin.get_storage('information')
+    items = []
+    typeVideo = "MOVIE"
+    temp, level1 = information.get(title, ("", {}))  # infoLabels, dictionnary seasons
+    level2 = level1[season]
+    temp, level3 = level2[episode]
+    for info in level3:
+        typeVideo = info.typeVideo
+        if typeVideo == 'MOVIE':
+            extraInfo = ("Extended Info",
+                         'XBMC.RunScript(script.extendedinfo,info=extendedinfo,imdb_id=%s)' % info.imdb_id)
+        else:
+            extraInfo = ("Extended Info",
+                         'XBMC.RunScript(script.extendedinfo,info=extendedepisodeinfo,tvshow=%s, season=%s, episode=%s)' % (
+                             info.infoTitle['cleanTitle'], season, episode))
+        try:
+            items.append({'label': info.label,
+                          'path': plugin.url_for('play', url=info.fileName),
+                          'thumbnail': info.cover,
+                          'properties': {'fanart_image': info.fanart},
+                          'info': info.info,
+                          'stream_info': info.infoStream,
+                          'context_menu': [
+                              (plugin.get_string(32009),
+                               'XBMC.RunPlugin(%s)' % plugin.url_for('importOne', title=title)),
+                              extraInfo
+                          ]
+                          })
+        except:
+            pass
+        # main
+        if __name__ == '__main__':
+            plugin.set_content("movies" if typeVideo == "MOVIE" else "episodes")
+    return items
+
+
+if __name__ == '__main__':
+    try:
+        plugin.run()
+    except:
+        pass
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/main.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/main.pyo
index 698d1170f8a78528c52814995c580ed2c6eb1eb7..cf59a82ecaa8232fd32d240b32aa7314546f8deb 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/main.pyo and b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/main.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/language/Swedish/strings.mo b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/language/Swedish/strings.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d794a78eb6a17d70376949eae31b2f7ce67f97d3
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/language/Swedish/strings.mo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/language/Swedish/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/language/Swedish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..e5993f78e26b139dd8ff8427ac1f170ea06b93bb
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/language/Swedish/strings.po
@@ -0,0 +1,616 @@
+# Kodi Media Center language file
+# Addon Name: RSS Torrents Integration, trakt
+# Addon id: plugin.video.rsstorrentintegration
+# Addon Provider: mancuniancol
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-05 05:53-0400\n"
+"PO-Revision-Date: 2016-01-10 07:02-0500\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: addon.py:21
+msgctxt "#32000"
+msgid ""
+"Warning!\n"
+"This addon uses torrent addon player that it could be illegal in your country.\n"
+"\n"
+"Be sure to consult the local laws before use those torrent addon players.\n"
+"\n"
+"It is highly recommended that you use a VPN provider,\n"
+"in order to avoid potential legal repercussions in the future.\n"
+"\n"
+"For any assistance, please, visit http://tutvguia.com/forums/"
+msgstr "Varning! Denna addon använder torrent addon spelare som det kan vara olagligt i ditt land. Var noga med att samråda med lokala lagar före användning dessa torrent addon spelare. Det rekommenderas starkt att du använder en VPN-leverantör, för att undvika eventuella rättsliga konsekvenser i framtiden. För någon hjälp, snälla, besök http://tutvguia.com/forums/"
+
+#: addon.py:21
+msgctxt "#32001"
+msgid "Disable Automatic Library Integration"
+msgstr "Inaktivera automatisk Bibliotek Integration"
+
+#: addon.py:24
+msgctxt "#32002"
+msgid "Enable Automatic Library Integration"
+msgstr "Aktivera automatisk Library Integration"
+
+#: addon.py:29
+msgctxt "#32003"
+msgid "Remove RSS URL"
+msgstr "Ta bort RSS-URL"
+
+#: addon.py:30
+msgctxt "#32004"
+msgid "Modify RSS URL"
+msgstr "Ändra RSS URL"
+
+#: addon.py:75 script.py:15
+msgctxt "#32005"
+msgid "Add a New [COLOR ffff9900]RSS[/COLOR]"
+msgstr "Lägga till en ny [COLOR ffff9900] RSS [/ COLOR]"
+
+#: addon.py:86 script.py:44
+msgctxt "#32006"
+msgid "Do you want Remove %s?"
+msgstr "Vill du ta bort%s?"
+
+#: addon.py:93 addon.py:100 script.py:25 script.py:37
+msgctxt "#32007"
+msgid "URL RSS:"
+msgstr "URL-RSS:"
+
+#: addon.py:103 script.py:28
+msgctxt "#32008"
+msgid "Name to this RSS:"
+msgstr "Namn på det här Rss:"
+
+#: addon.py:176
+msgctxt "#32009"
+msgid "Import to the local library"
+msgstr "Import till det lokala biblioteket"
+
+#: script.py:15 script.py:99
+msgctxt "#32010"
+msgid "Choose an Option:"
+msgstr "Välj ett alternativ"
+
+#: script.py:16
+msgctxt "#32011"
+msgid "Modify Saved [COLOR ffff9900]RSS[/COLOR]"
+msgstr "Ändra sparade [COLOR ffff9900] RSS [/ COLOR]"
+
+#: script.py:17
+msgctxt "#32012"
+msgid "Remove a [COLOR ffff9900]RSS[/COLOR]"
+msgstr "Ta en [COLOR ffff9900] RSS [/ COLOR]"
+
+#: script.py:18
+msgctxt "#32013"
+msgid "View Saved [COLOR ffff9900]RSS[/COLOR] list"
+msgstr "Se sparade [COLOR ffff9900] RSS [/ COLOR] listan"
+
+#: script.py:19
+msgctxt "#32014"
+msgid "Read [COLOR ffff9900]RSS[/COLOR] list and create .strm Files in"
+msgstr "Läs [COLOR ffff9900] RSS [/ COLOR] listan och skapa .strm filer"
+
+# ################################################################
+#: script.py:20
+msgctxt "#32015"
+msgid "Erase Folders"
+msgstr "Rensa mappar"
+
+#: script.py:21
+msgctxt "#32016"
+msgid "-SETTINGS"
+msgstr "-INSTÄLLNINGAR"
+
+#: script.py:22
+msgctxt "#32017"
+msgid "-HELP"
+msgstr "-HJÄLP"
+
+#: script.py:23
+msgctxt "#32018"
+msgid "Exit"
+msgstr "Lämna"
+
+#: script.py:34 script.py:42
+msgctxt "#32019"
+msgid "CANCEL"
+msgstr "AVBRYT"
+
+#: script.py:42
+msgctxt "#32020"
+msgid "Choose RSS to Remove"
+msgstr "Välj RSS för att ta bort"
+
+#: script.py:63 service.py:27
+msgctxt "#32021"
+msgid ""
+"Checking Online\n"
+"%s..."
+msgstr "Kontrollerar Online%s ..."
+
+#: addon.py:126 script.py:99
+msgctxt "#32022"
+msgid "Movies"
+msgstr "Filmer"
+
+#: script.py:99
+msgctxt "#32023"
+msgid "TV Shows"
+msgstr "TV serier"
+
+#: script.py:113
+msgctxt "#32024"
+msgid "Animes"
+msgstr "Animes"
+
+#: script.py:114
+msgctxt "#32025"
+msgid ""
+"Please, check this address to find the user's operation:\n"
+"[B]http://goo.gl/8nYU6R[/B]"
+msgstr "Vänligen kontrollera denna adress för att hitta användarens drift: [B] http://goo.gl/8nYU6R [/ B]"
+
+# ################################################################
+#: service.py:65
+msgctxt "#32026"
+msgid "Persistent Update Service starting..."
+msgstr "Regelbundna Uppdaterings Service startar ..."
+
+#: service.py:71
+msgctxt "#32027"
+msgid "Update List at %s"
+msgstr "Uppdatera lista på%s"
+
+#: service.py:72
+msgctxt "#32028"
+msgid "Next Update in %s"
+msgstr "Vill du ta bort%s?"
+
+# ################################################################
+#: tools.py:140 tools.py:141
+msgctxt "#32029"
+msgid "All .strm files removed!"
+msgstr "Alla .strm filer avlägsnas!"
+
+#: tools.py:145
+msgctxt "#32030"
+msgid "Erasing Database..."
+msgstr "Rensar Databas ..."
+
+#: tools.py:732
+msgctxt "#32031"
+msgid "MOVIES"
+msgstr "FILMER"
+
+#: tools.py:732
+msgctxt "#32032"
+msgid "EPISODES"
+msgstr "AVSNITT"
+
+#: tools.py:736
+msgctxt "#32033"
+msgid ""
+"%s: %s items\n"
+"Do you want to integrate this list?"
+msgstr "%s:%s Vill du integrera denna lista?"
+
+#: tools.py:741
+msgctxt "#32034"
+msgid ""
+"Checking for %s\n"
+"%s"
+msgstr "Kontroll av%s%s"
+
+#: tools.py:795
+msgctxt "#32035"
+msgid "Code %s=%s"
+msgstr "Kod%s =%s"
+
+#: tools.py:806
+msgctxt "#32036"
+msgid "Creating %s/%s.strm..."
+msgstr "Skapa%s /%s.strm ..."
+
+#: tools.py:806
+msgctxt "#32037"
+msgid ""
+"%s %s found - Still working...\n"
+"%s"
+msgstr "%s%s hittades - Arbetar Fortfarande ...%s"
+
+#: tools.py:809
+msgctxt "#32038"
+msgid "%s added"
+msgstr "%s tillagd"
+
+#: tools.py:847
+msgctxt "#32039"
+msgid "%s/%s.strm added"
+msgstr "%s /%s.strm tillagd"
+
+#: tools.py:857
+msgctxt "#32040"
+msgid "%s %s added. %s"
+msgstr "%s%s tillagd. %s"
+
+#: tools.py:864
+msgctxt "#32041"
+msgid "No new %s. %s"
+msgstr "Inga nyheter. %s"
+
+#: tools.py:866
+msgctxt "#32042"
+msgid ""
+"No new %s\n"
+"%s"
+msgstr "Inga nya%s%s"
+
+#: tools.py:732
+msgctxt "#32043"
+msgid "EPISODES ANIMES"
+msgstr "AVSNITT ANIMES"
+
+#: tools.py:741
+msgctxt "#32044"
+msgid "Checking Online"
+msgstr "Kontrollerar Online"
+
+#: tools.py:741
+msgctxt "#32045"
+msgid "Manual library Integration"
+msgstr "Aktivera automatisk Library Integration"
+
+# ################################################################
+#: settings.xml:3
+msgctxt "#32050"
+msgid "General"
+msgstr "Allmänt"
+
+#: settings.xml:4
+msgctxt "#32051"
+msgid "Movie Folder:"
+msgstr "Film Mapp:"
+
+#: settings.xml:5
+msgctxt "#32052"
+msgid "Show Folder:"
+msgstr "TV Serier Mapp:"
+
+#: settings.xml:6
+msgctxt "#32053"
+msgid "Anime Folder:"
+msgstr "Anime Mapp:"
+
+#: settings.xml:7
+msgctxt "#32054"
+msgid "Add-on to use:"
+msgstr "Tilläg för att använda:"
+
+#: settings.xml:9
+msgctxt "#32055"
+msgid "Overwrite Existent .strm Files:"
+msgstr "Alla .strm filer Skrivs över!"
+
+#: settings.xml:10
+msgctxt "#32056"
+msgid "Accept All Duplicated Files:"
+msgstr "Acceptera alla duplicerade filer:"
+
+#: settings.xml:11
+msgctxt "#32057"
+msgid "Notification Message"
+msgstr "Notifierings Meddelande"
+
+#: settings.xml:12
+msgctxt "#32058"
+msgid "Time (seconds):"
+msgstr "Tid (sekunder):"
+
+#: settings.xml:15
+msgctxt "#32059"
+msgid "Automatic Integration"
+msgstr "Aktivera automatisk Library Integration"
+
+#: settings.xml:16
+msgctxt "#32060"
+msgid "Run the Automatic Integration Service (check in every login):"
+msgstr "Kör den automatiska Integration service (checka in varje inloggning):"
+
+#: settings.xml:18
+msgctxt "#32061"
+msgid "Persistent Update @ 8h:"
+msgstr "Regelbundna uppdateringar @ 8T:"
+
+#: settings.xml:20
+msgctxt "#32062"
+msgid "Movies Filters"
+msgstr "Film Filter"
+
+#: settings.xml:21 settings.xml:43
+msgctxt "#32063"
+msgid "Advance Setup (for 'AND' use space, for 'OR' use comma)"
+msgstr "Advance Setup (för \"AND\" Använd mellanslag, \"OR\" användning kommatecken)"
+
+#: settings.xml:22 settings.xml:44
+msgctxt "#32064"
+msgid "Accept File with:"
+msgstr "Acceptera Filen med:"
+
+#: settings.xml:23 settings.xml:45
+msgctxt "#32065"
+msgid "Block File with:"
+msgstr "Blockera Filen med:"
+
+#: settings.xml:24 settings.xml:46
+msgctxt "#32066"
+msgid "Easy Setup Keywords after the query"
+msgstr "Enkel installation Nyckelord efter frågan"
+
+#: settings.xml:25 settings.xml:27 settings.xml:29 settings.xml:31
+#: settings.xml:33 settings.xml:35 settings.xml:37 settings.xml:39
+#: settings.xml:47 settings.xml:49 settings.xml:51 settings.xml:53
+msgctxt "#32067"
+msgid "Accept File|Block File|Filter Off"
+msgstr "Acceptera Arkiv | Blockera Arkiv | Filter Off"
+
+#: settings.xml:26 settings.xml:28 settings.xml:30 settings.xml:32
+#: settings.xml:48 settings.xml:50 settings.xml:52 settings.xml:54
+msgctxt "#32068"
+msgid "Filter Off"
+msgstr "Inaktivera filter"
+
+#: settings.xml:34 settings.xml:36 settings.xml:38 settings.xml:40
+msgctxt "#32069"
+msgid "Block File"
+msgstr "Blockera Fil"
+
+#: settings.xml:42
+msgctxt "#32070"
+msgid "TV Filters"
+msgstr "TV Filter"
+
+#: settings.xml:42
+msgctxt "#32071"
+msgid "Enable MetaInformation (Poster, Fanart, Plot, ...)"
+msgstr "Aktivera metainformation (Poster, Fanart, Plot, ...)"
+
+#: settings.xml:42
+msgctxt "#32072"
+msgid "Default View Mode"
+msgstr "Standardvy"
+
+#: settings.xml:4
+msgctxt "#32080"
+msgid "Action:"
+msgstr "Åtgärd"
+
+#: settings.xml:4
+msgctxt "#32081"
+msgid "Clear Database:"
+msgstr "Rensa Databas:"
+
+#: settings.xml:4
+msgctxt "#32082"
+msgid "Remove All .strm Files:"
+msgstr "Ta bort alla .strm filer:"
+
+#: settings.xml:4
+msgctxt "#32083"
+msgid "Type of Library:"
+msgstr "Typ av biblioteket:"
+
+#: settings.xml:4
+msgctxt "#32084"
+msgid "Include Specials Episodes (Season 0):"
+msgstr "Inkludera Special episoder (Säsong 0):"
+
+#: settings.xml:4
+msgctxt "#32085"
+msgid "Detailed log"
+msgstr "Detaljerad logg"
+
+#: setting.xml:21 settings.xml:4
+msgctxt "#32086"
+msgid "Start Delay (in seconds)"
+msgstr "Starta fördröjning (i sekunder)"
+
+#: setting.xml
+msgctxt "#32090"
+msgid "Login"
+msgstr "Logga in"
+
+#: setting.xml
+msgctxt "#32091"
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: setting.xml
+msgctxt "#32092"
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: setting.xml
+msgctxt "#32093"
+msgid "URL address (ex:http://www.example.com):"
+msgstr "URL-adress (ex: http: //www.example.com):"
+
+# ################################################################
+#: TRAKT main.py:6
+msgctxt "#32100"
+msgid "Choose a category"
+msgstr "Välj en kategori:"
+
+#: TRAKT
+msgctxt "#32101"
+msgid "List"
+msgstr "Lista"
+
+#: TRAKT
+msgctxt "#32105"
+msgid "Movies Popular"
+msgstr "Populära Filmer"
+
+#: TRAKT
+msgctxt "#32106"
+msgid "Movies Trending"
+msgstr "Trendiga Filmer"
+
+#: TRAKT
+msgctxt "#32107"
+msgid "TV Popular"
+msgstr "Populära TV serier"
+
+#: TRAKT
+msgctxt "#32108"
+msgid "TV Trending"
+msgstr "Trendinga TV serier"
+
+#: TRAKT
+msgctxt "#32110"
+msgid "Watchlist"
+msgstr "Bevakningslistor"
+
+# ################################################################
+#: IMDB main.py:6
+msgctxt "#32150"
+msgid "Genre"
+msgstr "Genrer"
+
+#: IMDB main.py:6
+msgctxt "#32151"
+msgid "Language"
+msgstr "Språk"
+
+#: IMDB main.py:6
+msgctxt "#32152"
+msgid "Popular and Oscar Winner"
+msgstr "Populärt och Oscar vinnare"
+
+#: IMDB main.py:6
+msgctxt "#32153"
+msgid "TOP 250"
+msgstr "TOP 250"
+
+#: IMDB main.py:6
+msgctxt "#32154"
+msgid "Keywords"
+msgstr "Nyckelord"
+
+# ################################################################
+#: Favourites main.py:6
+msgctxt "#32158"
+msgid "'No Favourites Found"
+msgstr "'Inga favoriter Funna"
+
+# ##########################
+#: YTS settings.xml
+msgctxt "#32160"
+msgid "Quality:"
+msgstr "Kvalitet:"
+
+#: YTS settings.xml
+msgctxt "#32161"
+msgid "Minimum Rating 0:OFF"
+msgstr "Minsta Rating 0: OFF"
+
+#: YTS settings.xml
+msgctxt "#32162"
+msgid "Sorting by:"
+msgstr "Sortera efter:"
+
+#: YTS settings.xml
+msgctxt "#32163"
+msgid "Number Pages to download:"
+msgstr "Antal sidor att ladda ner:"
+
+#: YTS settings.xml
+msgctxt "#32170"
+msgid "Manual Search"
+msgstr "Manuell Sökning"
+
+#: YTS settings.xml
+msgctxt "#32171"
+msgid "PreFixed List"
+msgstr "FörFixat Lista"
+
+#: YTS settings.xml
+msgctxt "#32172"
+msgid "Name Movie:"
+msgstr "Namn Filmer:"
+
+#: YTS settings.xml
+msgctxt "#32173"
+msgid "Which Movie:"
+msgstr "Vilken film:"
+
+msgctxt "#32180"
+msgid "Add an new Anime..."
+msgstr "Lägg till en ny Anime ..."
+
+msgctxt "#32181"
+msgid "Remove this Anime"
+msgstr "Ta bort denna Anime"
+
+msgctxt "#32182"
+msgid "Add an new TV Show..."
+msgstr "Lägg till en ny TV Show ..."
+
+msgctxt "#32183"
+msgid "Remove this TV Show"
+msgstr "Ta bort den här TV Serien"
+
+msgctxt "#32184"
+msgid "Add an new Movie..."
+msgstr "Lägg till en ny film ..."
+
+msgctxt "#32185"
+msgid "Remove this Movie"
+msgstr "Ta bort den här filmen"
+
+msgctxt "#32186"
+msgid "Add an new item..."
+msgstr "Lägg till en ny punkt ..."
+
+msgctxt "#32187"
+msgid "Remove this item"
+msgstr "Ta bort den här produkten"
+
+msgctxt "#32188"
+msgid "Modify this item"
+msgstr "Ändra detta objekt"
+
+msgctxt "#32190"
+msgid "Search for:"
+msgstr "Sök efter:"
+
+msgctxt "#32191"
+msgid "Next Page.."
+msgstr "Nästa sida.."
+
+msgctxt "#32192"
+msgid "Name of this search"
+msgstr "Namn på den här sökningen"
+
+msgctxt "#32193"
+msgid "Do you want to keep this query?"
+msgstr "Vill du behålla den här frågan?"
+
+msgctxt "#32194"
+msgid "[B]Search...[/B]"
+msgstr "[B] Sök ... [/ B]"
+
+msgctxt "#32195"
+msgid "New Search..."
+msgstr "Ny sökning ..."
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/settings.xml
index 920fd0dfbd2b3cd857223b1d42747e5dc6999586..ab31f7ff80146f2a6c6e158e605fd44c496ed448 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/resources/settings.xml
@@ -5,8 +5,8 @@
         <setting label="32051" type="folder" id="movieFolder" source="videos" option="writeable" default=""/>
         <setting label="32052" type="folder" id="showFolder" source="videos" option="writeable" default=""/>
         <setting label="32053" type="folder" id="animeFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32045" type="bool" id="viewUrl" default="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/service.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/service.py
index 1c9d37347caccabf76a6c128c36dcf3ecc1bf3dd..a4a1b62d51a8df8c029b9e020b2fe4a1fc0acec4 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/service.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/service.py
@@ -1,39 +1,39 @@
-# coding: utf-8
-# Service Module
-__author__ = 'mancuniancol'
-from time import asctime
-from time import gmtime
-from time import localtime
-from time import strftime
-from time import time
-
-from main import importAll
-from tools2 import *
-
-
-def update_service():
-    if settings.value['service'] == 'true':
-        # Begin Service
-        storage = Storage(settings.storageName, type="dict", eval=True)
-        for key, (url, isIntegrated) in storage.database.items():
-            if isIntegrated:
-                goodSpider()  # to be a smart spider
-                importAll(url)
-
-
-if settings.value['service'] == 'true':
-    every = 28800  # seconds
-    previous_time = time()
-    settings.log("Persistent Update Service starting...")
-    update_service()
-    while (not xbmc.abortRequested) and settings.value["persistent"] == 'true':
-        if time() >= previous_time + every:  # verification
-            previous_time = time()
-            update_service()
-            settings.log('Update List at %s' % asctime(localtime(previous_time)))
-            settings.log('Next Update in %s' % strftime("%H:%M:%S", gmtime(every)))
-            update_service()
-        sleep(1)
-
-del settings
-del browser
+# coding: utf-8
+# Service Module
+__author__ = 'mancuniancol'
+from time import asctime
+from time import gmtime
+from time import localtime
+from time import strftime
+from time import time
+
+from main import importAll
+from tools2 import *
+
+
+def update_service():
+    if settings.value['service'] == 'true':
+        # Begin Service
+        storage = Storage(settings.storageName, type="dict", eval=True)
+        for key, (url, isIntegrated) in storage.database.items():
+            if isIntegrated:
+                goodSpider()  # to be a smart spider
+                importAll(url)
+
+
+if settings.value['service'] == 'true':
+    every = 28800  # seconds
+    previous_time = time()
+    settings.log("Persistent Update Service starting...")
+    update_service()
+    while (not xbmc.abortRequested) and settings.value["persistent"] == 'true':
+        if time() >= previous_time + every:  # verification
+            previous_time = time()
+            update_service()
+            settings.log('Update List at %s' % asctime(localtime(previous_time)))
+            settings.log('Next Update in %s' % strftime("%H:%M:%S", gmtime(every)))
+            update_service()
+        sleep(1)
+
+del settings
+del browser
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/test.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/test.py
index aaa0ab88bf052a8c115efd73e5a778bc012ab717..ef3e4826ee795001e5aeaf438c0d803e4f946da8 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/test.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/test.py
@@ -1,1311 +1,1311 @@
-# coding: utf-8
-__author__ = 'Ruben'
-data = '''
-
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" dir="auto">
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="Come and download frozen absolutely for free. Fast downloads." />
-    <meta name="robots" content="noindex" rel="usearch" />
-    <title>Download frozen Torrents - Kickass Torrents</title>
-    <link rel="stylesheet" type="text/css" href="//kastatic.com/all-261c451.css" charset="utf-8" />
-    <link rel="shortcut icon" href="//kastatic.com/images/favicon.ico" />
-
-
-    <link rel="apple-touch-icon" href="//kastatic.com/images/apple-touch-icon.png" />
-
-    <!--[if IE 7]>
-    <link href="//kastatic.com/css/ie7-261c451.css" rel="stylesheet" type="text/css"/>
-    <![endif]-->
-
-    <!--[if IE 8]>
-    <link href="//kastatic.com/css/ie8.css" rel="stylesheet" type="text/css"/>
-    <![endif]-->
-
-    <!--[if lt IE 9]>
-    <script src="//kastatic.com/js/html5.min-261c451.js" type="text/javascript"></script>
-    <![endif]-->
-
-    <!--[if gte IE 9]>
-    <link href="//kastatic.com/css/ie9-261c451.css" rel="stylesheet" type="text/css"/>
-    <![endif]-->
-    <script type="text/javascript">
-        + function (S, p, a, r, e, C, l, i, c, k) {
-            S[r] = S[r] || [];
-            S[e] || (S[e] = function () {
-                S[r].push(Array.prototype.slice.call(arguments))
-            });
-            i = p.createElement(a);
-            c = p.getElementsByTagName(a)[0];
-            i.src = C;
-            i.async = true;
-            c.parentNode.insertBefore(i, c)
-        }
-        (window, document, 'script', '_scq', 'sc', '//a.kickass.to/sc-261c451.js');
-
-        sc('setHost', 'a.kickass.to');
-        sc('setAccount', '_b894d6cb1e370fb9ad89f8d6d99eeb33');
-        var kat = {
-            release_id: '261c451',
-            detect_lang: 0,
-            spare_click: 1,
-            mobile: false
-        };
-    </script>
-    <script src="//kastatic.com/js/all-261c451.js" type="text/javascript"></script>
-    <link rel="alternate" type="application/rss+xml" title="Subscribe to RSS feed" href="http://kat.cr/usearch/frozen/?rss=1" />
-    <meta name="verify-v1" content="YccN/iP28SifHNEFY6u92i0ou3tAegQAIk2OyOJLp1s=" />
-    <meta name="y_key" content="f0b40c3f5fee758f" />
-    <meta name="google-site-verification" content="C1rNEC4fJIvFoyyccMV2PbuqX3P-SFtlD2MNZ9D2uy0" />
-    <link rel="search" type="application/opensearchdescription+xml" title="KickassTorrents Torrent Search" href="/opensearch.xml" />
-    <meta property="fb:app_id" content="123694587642603" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-    <script type="text/javascript">
-        var _scq = _scq || [];
-    </script>
-</head>
-
-<body>
-    <div id="wrapper">
-        <div id="wrapperInner">
-            <span data-sc-slot="_60318cd4e8d28f6fb76fe34e9bd9c498"></span>
-            <span data-sc-slot="_39ecb76dd457e5ac33776fdf11500d56"></span>
-            <div id="logindiv"></div>
-            <header>
-                <nav id="menu">
-                    <a href="/" id="logo"></a>
-                    <i id="showHideSearch" class="ka ka-zoom"></i>
-                    <div id="torrentSearch">
-                        <form action="/usearch/" method="get" id="searchform" accept-charset="utf-8" onsubmit="return doSearch(this.q.value);">
-                            <input id="contentSearch" class="input-big" type="text" name="q" value="frozen" autocomplete="off" placeholder="Search query" />
-                            <div id="searchTool"><a title="Advanced search" href="/advanced/?q=frozen" class="ajaxLink"><i class="ka ka-settings"></i></a>
-                                <button title="search" type="submit" value="" onfocus="this.blur();" onclick="this.blur();"><i class="ka ka-search"></i></button>
-                            </div>
-                        </form>
-                    </div>
-                    <span data-sc-slot="_277923e5f9d753c5b0630c28e641790c"></span>
-                    <ul id="navigation">
-
-                        <li>
-                            <a href="/browse/"> <i class="ka ka-torrent"></i><span class="menuItem">browse</span></a>
-                            <ul class="dropdown dp-middle dropdown-msg upper">
-
-                                <li class="topMsg"><a href="/new/"><i class="ka ka16 ka-torrent"></i>latest</a></li>
-                                <li class="topMsg"><a href="/movies/"><i class="ka ka16 ka-movie lower"></i>Movies</a></li>
-                                <li class="topMsg"><a href="/tv/"><i class="ka ka16 ka-movie lower"></i>TV</a></li>
-                                <li class="topMsg"><a href="/music/"><i class="ka ka16 ka-music-note lower"></i>Music</a></li>
-                                <li class="topMsg"><a href="/games/"><i class="ka ka16 ka-settings lower"></i>Games</a></li>
-                                <li class="topMsg"><a href="/books/"><i class="ka ka16 ka-bookmark"></i>Books</a></li>
-                                <li class="topMsg"><a href="/applications/"><i class="ka ka16 ka-settings lower"></i>Apps</a></li>
-                                <li class="topMsg"><a href="/anime/"><i class="ka ka16 ka-movie lower"></i>Anime</a></li>
-                                <li class="topMsg"><a href="/other/"><i class="ka ka16 ka-torrent"></i>Other</a></li>
-                                <li class="topMsg"><a href="/xxx/"><i class="ka ka16 ka-delete"></i>XXX</a></li>
-                            </ul>
-                        </li>
-                        </li>
-                        <li>
-                            <a data-nop href="/community/"> <i class="ka ka-community"></i><span class="menuItem">community</span></a>
-                            <li><a data-nop href="/blog/"><i class="ka ka-rss lower"></i><span class="menuItem">Blog</span></a></li>
-                            <li><a data-nop href="/faq/"><i class="ka ka-faq lower"></i><span class="menuItem">FAQ</span></a></li>
-                        </li>
-
-                        <li> <a data-nop href="/auth/login/" class="ajaxLink"><i class="ka ka-user"></i><span class="menuItem">Register / Sign In</span></a></li>
-                    </ul>
-                </nav>
-            </header>
-
-            <div class="pusher"></div>
-            <div class="mainpart">
-
-
-                <table width="100%" cellspacing="0" cellpadding="0" class="doublecelltable" id="mainSearchTable">
-                    <tr>
-                        <td width="100%">
-                            <div class="spareBlock hzSpare">
-                                <div class="legend">Advertising (<a href="/auth/login/register/" class="ajaxLink removeAdv" title="Login or register to remove advertising">remove</a>)</div>
-                                <span data-sc-slot="_b77c3599a877a4e9d6097b83ec9f23bb" data-sc-params="{ 'searchQuery': 'frozen' }"></span>
-                            </div>
-
-                            <div class="tabs">
-                                <ul class="tabNavigation">
-                                    <li><a class="selectedTab" href="/search/frozen/"><span>Sponsored Links</span></a></li>
-                                </ul>
-                                <hr class="tabsSeparator" />
-                            </div>
-                            <span data-sc-slot="_c039297fb3d18cf107e21460970475f0"></span>
-                            <br />
-                            <br />
-
-                            <h1><a itemprop="url" class="plain" href="/frozen-i2294629/">Frozen</a></h1>
-                            <div class="torrentMediaInfo">
-                                <a class="movieCover" href="/frozen-i2294629/"><img src="//yuq.me/movies/22/946/2294629.jpg" /></a>
-                                <div class="dataList">
-                                    <ul class="block overauto botmarg0">
-                                        <li><strong>IMDb link:</strong> <a class="plain" href="http://www.imdb.com/title/tt2294629/">2294629</a></li>
-                                        <li><strong>IMDb rating:</strong> 7.6 (372,962 votes) </li>
-                                        <li><strong>RottenTomatoes:</strong> <span class="rottentomatoes positive" title="fresh!"></span>89% <span class="rottenaudience positive" title="audience like it!"></span>86% </li>
-                                        <li><strong>Watch on <a data-nop target="_blank" href="https://www.solarmovie.ph">Solarmovie</a>:</strong> <a data-nop target="_blank" href="https://www.solarmovie.ph/watch-frozen-2013.html">Frozen</a></li>
-                                        <li><strong>Genres:</strong> <a class="plain" href="/movies/genre/animation/"><span>Animation</span></a>, <a class="plain" href="/movies/genre/adventure/"><span>Adventure</span></a>, <a class="plain" href="/movies/genre/family/"><span>Family</span></a>, <a class="plain" href="/movies/genre/comedy/"><span>Comedy</span></a>, <a class="plain" href="/movies/genre/fantasy/"><span>Fantasy</span></a>, <a class="plain" href="/movies/genre/musical/"><span>Musical</span></a> </li>
-                                    </ul>
-                                    <ul>
-                                        <li><a href="/bookmarks/add/movie/2294629/" class="ajaxLink kaButton smallButton normalText"><i class="ka ka-bookmark"></i> add <strong>Frozen</strong> to bookmarks</a></li>
-                                        <li><strong>Release date:</strong> 27 November 2013</li>
-                                        <li><strong>Writers:</strong> Jennifer Lee (screenplay), Hans Christian Andersen (inspired by the story &quot;The Snow Queen&quot; by), Chris Buck (story), Jennifer Lee (story), Shane Morris (story), Dean Wellins (additional story)</li>
-
-                                    </ul>
-                                    <div class="floatleft width100perc botmarg10px"><strong>Cast:</strong> <span><a href="/movies/actor/kristen-bell-a0068338/">Kristen Bell</a></span>, <span><a href="/movies/actor/idina-menzel-a0579953/">Idina Menzel</a></span>, <span><a href="/movies/actor/josh-gad-a1265802/">Josh Gad</a></span>, <span><a href="/movies/actor/jonathan-groff-a2676147/">Jonathan Groff</a></span> and others </div>
-                                    <div class="floatleft width100perc botmarg10px">
-                                        <strong>Summary:</strong>
-                                        <div id="summary">
-                                            <p class="accentbox botmarg10px">
-                                                When a princess with the power to turn things into ice curses her home in infinite winter, her sister, Anna teams up with a mountain man, his playful reindeer, and a snowman to change the weather condition.
-                                                <br />
-                                            </p>
-                                            <strong><small>Written by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_9"><a class="plain" href="/user/Thhaque/">Thhaque</a></span><span title="Reputation" class="repValue positive">397.95K</span></span></small></strong>
-
-
-
-
-                                        </div>
-
-                                    </div>
-                                    <span data-sc-slot="_16b9d77edbc49edc5a7a757cde4dfe28" data-sc-params="{ 'movie_name': 'Frozen' }"></span>
-                                    <div class="pages marg0 floatleft"> <strong class="botpad5px block">Available in versions:</strong> <a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#1080p">1080p</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#720p">720p</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#BDRip">BDRip</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#HDRiP">HDRiP</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#DVD">DVD</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#DVDRip">DVDRip</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#VCD">VCD</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#Screener">Screener</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#TeleSync">TeleSync</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#Cam">Cam</a> </div>
-                                </div>
-                                <!-- div class="dataList" -->
-                            </div>
-
-
-
-                            <div class="tabs">
-                                <ul class="tabNavigation">
-                                    <li>
-                                        <a class="darkButton selectedTab" href="/usearch/frozen/"><span>All</span></a>
-                                    </li>
-                                    <li>
-                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:movies/"><span>Movies <i class="menuValue">928</i></span></a>
-                                    </li>
-                                    <li>
-                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:tv/"><span>TV <i class="menuValue">193</i></span></a>
-                                    </li>
-                                    <li>
-                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:anime/"><span>Anime <i class="menuValue">162</i></span></a>
-                                    </li>
-                                    <li>
-                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:music/"><span>Music <i class="menuValue">205</i></span></a>
-                                    </li>
-                                    <li>
-                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:books/"><span>Books <i class="menuValue">83</i></span></a>
-                                    </li>
-                                    <li>
-                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:games/"><span>Games <i class="menuValue">179</i></span></a>
-                                    </li>
-                                    <li>
-                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:applications/"><span>Apps <i class="menuValue">55</i></span></a>
-                                    </li>
-                                    <li>
-                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:xxx/"><span>XXX <i class="menuValue">43</i></span></a>
-                                    </li>
-                                </ul>
-                                <hr class="tabsSeparator" />
-                            </div>
-
-                            <div>
-                                <h2>									frozen							<span>  results 1-25 from 1905</span>  <a data-nop class="ka ka16 ka-rss normalText rsssign ka-red" target="_blank" href="http://kat.cr/usearch/frozen/?rss=1" title="rss"></a></h2>
-
-
-                                <table cellpadding="0" cellspacing="0" class="data" style="width: 100%">
-                                    <tr class="firstr">
-                                        <th class="width100perc nopad">torrent name</th>
-                                        <th class="center"><a href="/usearch/frozen/?field=size&sorder=desc" rel="nofollow">size</a></th>
-                                        <th class="center"><span class="files"><a href="/usearch/frozen/?field=files_count&sorder=desc" rel="nofollow">files</a></span></th>
-                                        <th class="center"><span><a href="/usearch/frozen/?field=time_add&sorder=desc" rel="nofollow">age</a></span></th>
-                                        <th class="center"><span class="seed"><a href="/usearch/frozen/?field=seeders&sorder=desc" rel="nofollow">seed</a></span></th>
-                                        <th class="lasttd nobr center"><a href="/usearch/frozen/?field=leechers&sorder=desc" rel="nofollow">leech</a></th>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen8817152">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8817152,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-720p-brrip-x264-yify-t8817152.html#comment">834 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-720p-brrip-x264-yify-t8817152.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20720p%20BrRip%20x264%20-%20YIFY', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A25B4CD46E389E96F80EE42E418CD89D3A65ECD66%26dn%3Dfrozen%2B2013%2B720p%2Bbrrip%2Bx264%2Byify%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:25B4CD46E389E96F80EE42E418CD89D3A65ECD66&dn=frozen+2013+720p+brrip+x264+yify&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/25B4CD46E389E96F80EE42E418CD89D3A65ECD66.torrent?title=[kat.cr]frozen.2013.720p.brrip.x264.yify" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-720p-brrip-x264-yify-t8817152.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-720p-brrip-x264-yify-t8817152.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-720p-brrip-x264-yify-t8817152.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) 720p BrRip x264 - YIFY</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/YIFY/">YIFY</a> in <span id="cat_8817152"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">805.48 <span>MB</span></td>
-                                        <td class="center">2</td>
-                                        <td class="center" title="27 Feb 2014, 06:30">1&nbsp;year</td>
-                                        <td class="green center">722</td>
-                                        <td class="red lasttd center">57</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen11022236">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="11022236,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html#comment">120 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%20BDRip%20XviD%20AC3-EVO', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AA2CBB29651C2BA34B38D1A2BDE1043A1E921591A%26dn%3Dfrozen%2Bfever%2B2015%2Bbdrip%2Bxvid%2Bac3%2Bevo%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:A2CBB29651C2BA34B38D1A2BDE1043A1E921591A&dn=frozen+fever+2015+bdrip+xvid+ac3+evo&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/A2CBB29651C2BA34B38D1A2BDE1043A1E921591A.torrent?title=[kat.cr]frozen.fever.2015.bdrip.xvid.ac3.evo" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html" class="torType filmType"></a>
-                                                <a href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 BDRip XviD AC3-EVO</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/Silmarillion/">Silmarillion</a> in <span id="cat_11022236"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">391.15 <span>MB</span></td>
-                                        <td class="center">4</td>
-                                        <td class="center" title="31 Jul 2015, 07:30">4&nbsp;months</td>
-                                        <td class="green center">409</td>
-                                        <td class="red lasttd center">88</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen11022962">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="11022962,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html#comment">30 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%20720p%20Bluray%20X264%20DTS-EVO', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A864D8EF095B4A8D7F9D90BD8846D6E51576D81BD%26dn%3Dfrozen%2Bfever%2B2015%2B720p%2Bbluray%2Bx264%2Bdts%2Bevo%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:864D8EF095B4A8D7F9D90BD8846D6E51576D81BD&dn=frozen+fever+2015+720p+bluray+x264+dts+evo&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/864D8EF095B4A8D7F9D90BD8846D6E51576D81BD.torrent?title=[kat.cr]frozen.fever.2015.720p.bluray.x264.dts.evo" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html" class="torType filmType"></a>
-                                                <a href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 720p Bluray X264 DTS-EVO</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/SS132203/">SS132203</a> in <span id="cat_11022962"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">792.66 <span>MB</span></td>
-                                        <td class="center">3</td>
-                                        <td class="center" title="31 Jul 2015, 10:57">4&nbsp;months</td>
-                                        <td class="green center">184</td>
-                                        <td class="red lasttd center">25</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen8821806">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8821806,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html#comment">1 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20MULTi%201080p%20BluRay%20x264-ROUGH', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AB53C3AA969C13DBC58FE9394EA3A553C08839238%26dn%3Dfrozen%2B2013%2Bmulti%2B1080p%2Bbluray%2Bx264%2Brough%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:B53C3AA969C13DBC58FE9394EA3A553C08839238&dn=frozen+2013+multi+1080p+bluray+x264+rough&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/B53C3AA969C13DBC58FE9394EA3A553C08839238.torrent?title=[kat.cr]frozen.2013.multi.1080p.bluray.x264.rough" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 MULTi 1080p BluRay x264-ROUGH</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/Alex_Kid/">Alex_Kid</a> in <span id="cat_8821806"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">6.56 <span>GB</span></td>
-                                        <td class="center">1</td>
-                                        <td class="center" title="28 Feb 2014, 12:00">1&nbsp;year</td>
-                                        <td class="green center">154</td>
-                                        <td class="red lasttd center">20</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen8819093">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8819093,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html#comment">16 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20FRENCH%20720p%20BluRay%20x264-ROUGH', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AFDBE9CABF1604205AF1556A2E4D3A336079EE0B1%26dn%3Dfrozen%2B2013%2Bfrench%2B720p%2Bbluray%2Bx264%2Brough%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:FDBE9CABF1604205AF1556A2E4D3A336079EE0B1&dn=frozen+2013+french+720p+bluray+x264+rough&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/FDBE9CABF1604205AF1556A2E4D3A336079EE0B1.torrent?title=[kat.cr]frozen.2013.french.720p.bluray.x264.rough" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 FRENCH 720p BluRay x264-ROUGH</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/Alex_Kid/">Alex_Kid</a> in <span id="cat_8819093"><strong><a href="/movies/">Movies</a> > <a href="/dubbed-movies/">Dubbed Movies</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">3.28 <span>GB</span></td>
-                                        <td class="center">2</td>
-                                        <td class="center" title="27 Feb 2014, 18:00">1&nbsp;year</td>
-                                        <td class="green center">157</td>
-                                        <td class="red lasttd center">8</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen9319243">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="9319243,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html#comment">9 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%3A%20Uma%20Aventura%20Congelante%20%282013%29%201080p%20Dublado%20pt-BR', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A5B51FC9689D51E0B80402BA5285F2107909B4275%26dn%3Dfrozen%2Buma%2Baventura%2Bcongelante%2B2013%2B1080p%2Bdublado%2Bpt%2Bbr%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:5B51FC9689D51E0B80402BA5285F2107909B4275&dn=frozen+uma+aventura+congelante+2013+1080p+dublado+pt+br&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/5B51FC9689D51E0B80402BA5285F2107909B4275.torrent?title=[kat.cr]frozen.uma.aventura.congelante.2013.1080p.dublado.pt.br" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html" class="torType filmType"></a>
-                                                <a href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html" class="cellMainLink"><strong class="red">Frozen</strong>: Uma Aventura Congelante (2013) 1080p Dublado pt-BR</a>
-
-                                                    <span class="font11px lightgrey block">
-                in <span id="cat_9319243"><strong><a href="/movies/">Movies</a> > <a href="/dubbed-movies/">Dubbed Movies</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">1.71 <span>GB</span></td>
-                                        <td class="center">4</td>
-                                        <td class="center" title="11 Jul 2014, 15:54">1&nbsp;year</td>
-                                        <td class="green center">157</td>
-                                        <td class="red lasttd center">6</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen10248473">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a class="icon16" href="/frozen-2013-bdrip-xvid-eng-ita-ac3-subs-il-regno-di-ghiaccio-t10248473.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20BDRip%20XviD%20ENG-ITA%20Ac3%20subs%20-%20Il%20Regno%20Di%20Ghiaccio', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AE2167529F2A86ABD6F8F32C98B82450D88E38326%26dn%3Dfrozen%2B2013%2Bbdrip%2Bxvid%2Beng%2Bita%2Bac3%2Bsubs%2Bil%2Bregno%2Bdi%2Bghiaccio%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:E2167529F2A86ABD6F8F32C98B82450D88E38326&dn=frozen+2013+bdrip+xvid+eng+ita+ac3+subs+il+regno+di+ghiaccio&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/E2167529F2A86ABD6F8F32C98B82450D88E38326.torrent?title=[kat.cr]frozen.2013.bdrip.xvid.eng.ita.ac3.subs.il.regno.di.ghiaccio" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-bdrip-xvid-eng-ita-ac3-subs-il-regno-di-ghiaccio-t10248473.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-bdrip-xvid-eng-ita-ac3-subs-il-regno-di-ghiaccio-t10248473.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-bdrip-xvid-eng-ita-ac3-subs-il-regno-di-ghiaccio-t10248473.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) BDRip XviD ENG-ITA Ac3 subs - Il Regno Di Ghiaccio</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/ShivaShanti/">ShivaShanti</a> in <span id="cat_10248473"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">1.75 <span>GB</span></td>
-                                        <td class="center">3</td>
-                                        <td class="center" title="20 Feb 2015, 12:14">9&nbsp;months</td>
-                                        <td class="green center">145</td>
-                                        <td class="red lasttd center">30</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen8893033">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8893033,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html#comment">19 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Il%20Regno%20Di%20Ghiaccio%202013%20iTALiAN%20AC3%20DUAL%201080p%20BrRiP%20x264-TrTd_TeaM', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AA794083F24D2E20C9E9C935B32CC880F1E2A064E%26dn%3Dfrozen%2Bil%2Bregno%2Bdi%2Bghiaccio%2B2013%2Bitalian%2Bac3%2Bdual%2B1080p%2Bbrrip%2Bx264%2Btrtd%2Bteam%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:A794083F24D2E20C9E9C935B32CC880F1E2A064E&dn=frozen+il+regno+di+ghiaccio+2013+italian+ac3+dual+1080p+brrip+x264+trtd+team&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/A794083F24D2E20C9E9C935B32CC880F1E2A064E.torrent?title=[kat.cr]frozen.il.regno.di.ghiaccio.2013.italian.ac3.dual.1080p.brrip.x264.trtd.team" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html" class="torType filmType"></a>
-                                                <a href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html" class="cellMainLink"><strong class="red">Frozen</strong> Il Regno Di Ghiaccio 2013 iTALiAN AC3 DUAL 1080p BrRiP x264-TrTd_TeaM</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/ignazio71/">ignazio71</a> in <span id="cat_8893033"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">2.48 <span>GB</span></td>
-                                        <td class="center">5</td>
-                                        <td class="center" title="18 Mar 2014, 17:32">1&nbsp;year</td>
-                                        <td class="green center">121</td>
-                                        <td class="red lasttd center">24</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen11084298">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="11084298,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html#comment">1 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%20BluRay%20720p%20DTS%20x264-ETRG', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A0B85DC86F425AB492D8B091227036B684F516A26%26dn%3Dfrozen%2Bfever%2B2015%2Bbluray%2B720p%2Bdts%2Bx264%2Betrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:0B85DC86F425AB492D8B091227036B684F516A26&dn=frozen+fever+2015+bluray+720p+dts+x264+etrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/0B85DC86F425AB492D8B091227036B684F516A26.torrent?title=[kat.cr]frozen.fever.2015.bluray.720p.dts.x264.etrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html" class="torType filmType"></a>
-                                                <a href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 BluRay 720p DTS x264-ETRG</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/MgB/">MgB</a> in <span id="cat_11084298"><strong><a href="/movies/">Movies</a> > <a href="/highres-movies/">Highres Movies</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">354.29 <span>MB</span></td>
-                                        <td class="center">11</td>
-                                        <td class="center" title="12 Aug 2015, 12:09">3&nbsp;months</td>
-                                        <td class="green center">52</td>
-                                        <td class="red lasttd center">120</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen11031930">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="11031930,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html#comment">5 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%201080p%20Bluray%20X264%20DTS%20en%205%201%20NL%20Subs-EVO', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AEA114BD7462649DF42888D77FD2B8BA43FFC7B09%26dn%3Dfrozen%2Bfever%2B2015%2B1080p%2Bbluray%2Bx264%2Bdts%2Ben%2B5%2B1%2Bnl%2Bsubs%2Bevo%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:EA114BD7462649DF42888D77FD2B8BA43FFC7B09&dn=frozen+fever+2015+1080p+bluray+x264+dts+en+5+1+nl+subs+evo&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/EA114BD7462649DF42888D77FD2B8BA43FFC7B09.torrent?title=[kat.cr]frozen.fever.2015.1080p.bluray.x264.dts.en.5.1.nl.subs.evo" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html" class="torType filmType"></a>
-                                                <a href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 1080p Bluray X264 DTS en 5 1 NL Subs-EVO</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/PitBuLL/">PitBuLL</a> in <span id="cat_11031930"><strong><a href="/movies/">Movies</a> > <a href="/highres-movies/">Highres Movies</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">1.17 <span>GB</span></td>
-                                        <td class="center">1</td>
-                                        <td class="center" title="02 Aug 2015, 09:04">4&nbsp;months</td>
-                                        <td class="green center">84</td>
-                                        <td class="red lasttd center">13</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen8881471">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8881471,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-3d-brrip-x264-yify-t8881471.html#comment">145 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-3d-brrip-x264-yify-t8881471.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%203D%20BrRip%20x264%20-%20YIFY', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A06C0D76D3B5AB230FCF2584FB381D529C6FABD2F%26dn%3Dfrozen%2B2013%2B3d%2Bbrrip%2Bx264%2Byify%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:06C0D76D3B5AB230FCF2584FB381D529C6FABD2F&dn=frozen+2013+3d+brrip+x264+yify&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/06C0D76D3B5AB230FCF2584FB381D529C6FABD2F.torrent?title=[kat.cr]frozen.2013.3d.brrip.x264.yify" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-3d-brrip-x264-yify-t8881471.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-3d-brrip-x264-yify-t8881471.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-3d-brrip-x264-yify-t8881471.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) 3D BrRip x264 - YIFY</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/YIFY/">YIFY</a> in <span id="cat_8881471"><strong><a href="/movies/">Movies</a> > <a href="/3d-movies/">3D Movies</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">1.63 <span>GB</span></td>
-                                        <td class="center">2</td>
-                                        <td class="center" title="15 Mar 2014, 13:20">1&nbsp;year</td>
-                                        <td class="green center">72</td>
-                                        <td class="red lasttd center">7</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen11026819">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="11026819,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html#comment">17 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%20720p%20BluRay%20x264%20AAC-ETRG', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A43A9F98724BD8C77596E81EB3028B44AA8F5FDDB%26dn%3Dfrozen%2Bfever%2B2015%2B720p%2Bbluray%2Bx264%2Baac%2Betrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:43A9F98724BD8C77596E81EB3028B44AA8F5FDDB&dn=frozen+fever+2015+720p+bluray+x264+aac+etrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/43A9F98724BD8C77596E81EB3028B44AA8F5FDDB.torrent?title=[kat.cr]frozen.fever.2015.720p.bluray.x264.aac.etrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html" class="torType filmType"></a>
-                                                <a href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 720p BluRay x264 AAC-ETRG</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/megaradon/">megaradon</a> in <span id="cat_11026819"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">62.41 <span>MB</span></td>
-                                        <td class="center">2</td>
-                                        <td class="center" title="01 Aug 2015, 06:08">4&nbsp;months</td>
-                                        <td class="green center">65</td>
-                                        <td class="red lasttd center">3</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen8516976">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8516976,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html#comment">127 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20720p%20DVDSCR%20XViD%20AC3-HuMPDaY', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A8631A6C1FEE556246A798946A638D2661C634946%26dn%3Dfrozen%2B2013%2B720p%2Bdvdscr%2Bxvid%2Bac3%2Bhumpday%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:8631A6C1FEE556246A798946A638D2661C634946&dn=frozen+2013+720p+dvdscr+xvid+ac3+humpday&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/8631A6C1FEE556246A798946A638D2661C634946.torrent?title=[kat.cr]frozen.2013.720p.dvdscr.xvid.ac3.humpday" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 720p DVDSCR XViD AC3-HuMPDaY</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/ChrisDen/">ChrisDen</a> in <span id="cat_8516976"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">2.36 <span>GB</span></td>
-                                        <td class="center">1</td>
-                                        <td class="center" title="07 Jan 2014, 21:00">1&nbsp;year</td>
-                                        <td class="green center">59</td>
-                                        <td class="red lasttd center">4</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen8903675">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8903675,0" class="icommentjs kaButton smallButton rightButton" href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html#comment">8 <i class="ka ka-comment"></i></a> <a class="icon16" href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Disney%27s%20Frozen%20%282013%29%20Eng%20NL%20Audio%20Eng%20NL%20Sub%20BR2DVD-NLU002', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A17EA7E292B54A62069594D061D58C8D83CA9B83E%26dn%3Ddisney%2Bs%2Bfrozen%2B2013%2Beng%2Bnl%2Baudio%2Beng%2Bnl%2Bsub%2Bbr2dvd%2Bnlu002%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:17EA7E292B54A62069594D061D58C8D83CA9B83E&dn=disney+s+frozen+2013+eng+nl+audio+eng+nl+sub+br2dvd+nlu002&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/17EA7E292B54A62069594D061D58C8D83CA9B83E.torrent?title=[kat.cr]disney.s.frozen.2013.eng.nl.audio.eng.nl.sub.br2dvd.nlu002" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html" class="torType filmType"></a>
-                                                <a href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html" class="cellMainLink">Disney's <strong class="red">Frozen</strong> (2013) Eng NL Audio Eng NL Sub BR2DVD-NLU002</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <a class="plain" href="/user/NLUPPER002/">NLUPPER002</a> in <span id="cat_8903675"><strong><a href="/movies/">Movies</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">4.36 <span>GB</span></td>
-                                        <td class="center">16</td>
-                                        <td class="center" title="21 Mar 2014, 12:44">1&nbsp;year</td>
-                                        <td class="green center">47</td>
-                                        <td class="red lasttd center">5</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen11026844">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="11026844,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html#comment">15 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%201080p%20BluRay%20x264%20AAC-ETRG', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A47A506E8885C128E2706B72D07AD9C8674330AE9%26dn%3Dfrozen%2Bfever%2B2015%2B1080p%2Bbluray%2Bx264%2Baac%2Betrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:47A506E8885C128E2706B72D07AD9C8674330AE9&dn=frozen+fever+2015+1080p+bluray+x264+aac+etrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/47A506E8885C128E2706B72D07AD9C8674330AE9.torrent?title=[kat.cr]frozen.fever.2015.1080p.bluray.x264.aac.etrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html" class="torType filmType"></a>
-                                                <a href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 1080p BluRay x264 AAC-ETRG</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/megaradon/">megaradon</a> in <span id="cat_11026844"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">119.29 <span>MB</span></td>
-                                        <td class="center">2</td>
-                                        <td class="center" title="01 Aug 2015, 06:20">4&nbsp;months</td>
-                                        <td class="green center">47</td>
-                                        <td class="red lasttd center">3</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen10726648">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="10726648,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html#comment">2 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20720p%20BRRip%20900MB%20-%20MkvCage', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A9D51B42EB769D409F26269BA01CE58E0DD14A7BC%26dn%3Dfrozen%2B2013%2B720p%2Bbrrip%2B900mb%2Bmkvcage%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:9D51B42EB769D409F26269BA01CE58E0DD14A7BC&dn=frozen+2013+720p+brrip+900mb+mkvcage&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/9D51B42EB769D409F26269BA01CE58E0DD14A7BC.torrent?title=[kat.cr]frozen.2013.720p.brrip.900mb.mkvcage" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) 720p BRRip 900MB - MkvCage</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/MkvCage/">MkvCage</a> in <span id="cat_10726648"><strong><a href="/movies/">Movies</a> > <a href="/highres-movies/">Highres Movies</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">899.49 <span>MB</span></td>
-                                        <td class="center">1</td>
-                                        <td class="center" title="31 May 2015, 19:59">6&nbsp;months</td>
-                                        <td class="green center">42</td>
-                                        <td class="red lasttd center">9</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen8792999">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8792999,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html#comment">35 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20-%20An%20Original%20Walt%20Disney%20Records%20Soundtrack', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AE46A9E7708AD062DBE509249F4824C8138097495%26dn%3Dfrozen%2Ban%2Boriginal%2Bwalt%2Bdisney%2Brecords%2Bsoundtrack%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:E46A9E7708AD062DBE509249F4824C8138097495&dn=frozen+an+original+walt+disney+records+soundtrack&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/E46A9E7708AD062DBE509249F4824C8138097495.torrent?title=[kat.cr]frozen.an.original.walt.disney.records.soundtrack" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html" class="torType musicType"></a>
-                                                <a href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType musicType">
-                                                    <a href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html" class="cellMainLink"><strong class="red">Frozen</strong> - An Original Walt Disney Records Soundtrack</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/catparrot/">catparrot</a> in <span id="cat_8792999"><strong><a href="/music/">Music</a> > <a href="/soundtrack/">Soundtrack</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">602.7 <span>MB</span></td>
-                                        <td class="center">61</td>
-                                        <td class="center" title="20 Feb 2014, 14:33">1&nbsp;year</td>
-                                        <td class="green center">32</td>
-                                        <td class="red lasttd center">19</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen8813192">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8813192,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html#comment">20 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20English%20Movies%20DVDRip%20XViD%20Multi%20Subs%20with%20Sample%20~%20%E2%98%BBrDX%E2%98%BB', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A2608B0232D5AD9E70447F724AE9111CEDC8E3405%26dn%3Dfrozen%2B2013%2Benglish%2Bmovies%2Bdvdrip%2Bxvid%2Bmulti%2Bsubs%2Bwith%2Bsample%2Brdx%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:2608B0232D5AD9E70447F724AE9111CEDC8E3405&dn=frozen+2013+english+movies+dvdrip+xvid+multi+subs+with+sample+rdx&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/2608B0232D5AD9E70447F724AE9111CEDC8E3405.torrent?title=[kat.cr]frozen.2013.english.movies.dvdrip.xvid.multi.subs.with.sample.rdx" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 English Movies DVDRip XViD Multi Subs with Sample ~ ☻rDX☻</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/teamrdx/">teamrdx</a> in <span id="cat_8813192"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">704.82 <span>MB</span></td>
-                                        <td class="center">5</td>
-                                        <td class="center" title="26 Feb 2014, 04:34">1&nbsp;year</td>
-                                        <td class="green center">38</td>
-                                        <td class="red lasttd center">5</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen8351831">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8351831,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html#comment">662 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20TS%20x264%20AC3-MiLLENiUM', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AF165B9F028B092B2F44E128EB570DB994B0FB6AA%26dn%3Dfrozen%2B2013%2Bts%2Bx264%2Bac3%2Bmillenium%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:F165B9F028B092B2F44E128EB570DB994B0FB6AA&dn=frozen+2013+ts+x264+ac3+millenium&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/F165B9F028B092B2F44E128EB570DB994B0FB6AA.torrent?title=[kat.cr]frozen.2013.ts.x264.ac3.millenium" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 TS x264 AC3-MiLLENiUM</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <a class="plain" href="/user/Acesn8s/">Acesn8s</a> in <span id="cat_8351831"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">873.14 <span>MB</span></td>
-                                        <td class="center">5</td>
-                                        <td class="center" title="12 Dec 2013, 04:14">1&nbsp;year</td>
-                                        <td class="green center">33</td>
-                                        <td class="red lasttd center">9</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen8517377">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8517377,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html#comment">188 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%5B2013%5D%20DVDScr%20XviD-SaM%5BETRG%5D', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A6B03287DA83A543190D1ECFA947632351F5F0B33%26dn%3Dfrozen%2B2013%2Bdvdscr%2Bxvid%2Bsam%2Betrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:6B03287DA83A543190D1ECFA947632351F5F0B33&dn=frozen+2013+dvdscr+xvid+sam+etrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/6B03287DA83A543190D1ECFA947632351F5F0B33.torrent?title=[kat.cr]frozen.2013.dvdscr.xvid.sam.etrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html" class="cellMainLink"><strong class="red">Frozen</strong> [2013] DVDScr XviD-SaM[ETRG]</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/SaM/">SaM</a> in <span id="cat_8517377"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">708.3 <span>MB</span></td>
-                                        <td class="center">5</td>
-                                        <td class="center" title="07 Jan 2014, 23:28">1&nbsp;year</td>
-                                        <td class="green center">32</td>
-                                        <td class="red lasttd center">11</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen10734807">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="10734807,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html#comment">3 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20El%20reino%20del%20hielo%20SPANISH%20ESPA%C3%91OL%20HDRip%20ELITETORRENT', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A12AA6990023EE2D3B0C8A5243C75D66C7E99EAC6%26dn%3Dfrozen%2Bel%2Breino%2Bdel%2Bhielo%2Bspanish%2Bespa%25C3%2591ol%2Bhdrip%2Belitetorrent%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:12AA6990023EE2D3B0C8A5243C75D66C7E99EAC6&dn=frozen+el+reino+del+hielo+spanish+espa%C3%91ol+hdrip+elitetorrent&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/12AA6990023EE2D3B0C8A5243C75D66C7E99EAC6.torrent?title=[kat.cr]frozen.el.reino.del.hielo.spanish.espa%C3%91ol.hdrip.elitetorrent" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html" class="torType filmType"></a>
-                                                <a href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html" class="cellMainLink"><strong class="red">Frozen</strong> El reino del hielo SPANISH ESPAÑOL HDRip ELITETORRENT</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/hkcrew/">hkcrew</a> in <span id="cat_10734807"><strong><a href="/movies/">Movies</a> > <a href="/dubbed-movies/">Dubbed Movies</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">1.92 <span>GB</span></td>
-                                        <td class="center">1</td>
-                                        <td class="center" title="02 Jun 2015, 04:40">6&nbsp;months</td>
-                                        <td class="green center">34</td>
-                                        <td class="red lasttd center">4</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen9020905">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="9020905,0" class="icommentjs kaButton smallButton rightButton" href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html#comment">2 <i class="ka ka-comment"></i></a> <a class="icon16" href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Idina%20Menzel%20%E2%80%93%20Let%20It%20Go%20%28From%20Frozen%29%20%5BArmin%20van%20Buuren%20Remix%5D', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A32D7BFD939DC455DCFD64C76ECF89E375788235C%26dn%3Didina%2Bmenzel%2Blet%2Bit%2Bgo%2Bfrom%2Bfrozen%2Barmin%2Bvan%2Bbuuren%2Bremix%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:32D7BFD939DC455DCFD64C76ECF89E375788235C&dn=idina+menzel+let+it+go+from+frozen+armin+van+buuren+remix&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/32D7BFD939DC455DCFD64C76ECF89E375788235C.torrent?title=[kat.cr]idina.menzel.let.it.go.from.frozen.armin.van.buuren.remix" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html" class="torType musicType"></a>
-                                                <a href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType musicType">
-                                                    <a href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html" class="cellMainLink">Idina Menzel – Let It Go (From <strong class="red">Frozen</strong>) [Armin van Buuren Remix]</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/pamabego/">pamabego</a> in <span id="cat_9020905"><strong><a href="/music/">Music</a> > <a href="/mp3/">Mp3</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">14.51 <span>MB</span></td>
-                                        <td class="center">1</td>
-                                        <td class="center" title="21 Apr 2014, 16:31">1&nbsp;year</td>
-                                        <td class="green center">23</td>
-                                        <td class="red lasttd center">22</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen10064281">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="10064281,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html#comment">3 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20BDRip%201080p%20ENG-ITA%20x265%20BluRay%20-%20Il%20Regno%20Di%20Ghiaccio', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AAEE029C8D3D0A76D8384376E6C126C2EFE885BBC%26dn%3Dfrozen%2B2013%2Bbdrip%2B1080p%2Beng%2Bita%2Bx265%2Bbluray%2Bil%2Bregno%2Bdi%2Bghiaccio%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:AEE029C8D3D0A76D8384376E6C126C2EFE885BBC&dn=frozen+2013+bdrip+1080p+eng+ita+x265+bluray+il+regno+di+ghiaccio&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/AEE029C8D3D0A76D8384376E6C126C2EFE885BBC.torrent?title=[kat.cr]frozen.2013.bdrip.1080p.eng.ita.x265.bluray.il.regno.di.ghiaccio" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) BDRip 1080p ENG-ITA x265 BluRay - Il Regno Di Ghiaccio</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/ShivaShanti/">ShivaShanti</a> in <span id="cat_10064281"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">4.08 <span>GB</span></td>
-                                        <td class="center">1</td>
-                                        <td class="center" title="11 Jan 2015, 11:41">10&nbsp;months</td>
-                                        <td class="green center">31</td>
-                                        <td class="red lasttd center">4</td>
-                                    </tr>
-                                    <tr class="even" id="torrent_frozen8525060">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8525060,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html#comment">20 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20DVDScr%20NL%20subs%20DutchReleaseTeam', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A43D1B1B91D8BC4911EF62440E1E813265BC2AEE2%26dn%3Dfrozen%2B2013%2Bdvdscr%2Bnl%2Bsubs%2Bdutchreleaseteam%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:43D1B1B91D8BC4911EF62440E1E813265BC2AEE2&dn=frozen+2013+dvdscr+nl+subs+dutchreleaseteam&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/43D1B1B91D8BC4911EF62440E1E813265BC2AEE2.torrent?title=[kat.cr]frozen.2013.dvdscr.nl.subs.dutchreleaseteam" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html" class="torType filmType"></a>
-                                                <a href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType filmType">
-                                                    <a href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) DVDScr NL subs DutchReleaseTeam</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <a class="plain" href="/user/Koedje/">Koedje</a> in <span id="cat_8525060"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">887.4 <span>MB</span></td>
-                                        <td class="center">9</td>
-                                        <td class="center" title="08 Jan 2014, 22:10">1&nbsp;year</td>
-                                        <td class="green center">27</td>
-                                        <td class="red lasttd center">5</td>
-                                    </tr>
-                                    <tr class="odd" id="torrent_frozen8320897">
-                                        <td>
-                                            <div class="iaconbox center floatright">
-                                                <a rel="8320897,0" class="icommentjs kaButton smallButton rightButton" href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html#comment">22 <i class="ka ka-comment"></i></a> <a class="icon16" href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'VA%20-%20Frozen%20%5BSoundtrack%5D%20-%202013%20%28MP3%29%20-%20C4%20%7BGTRG%7D', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AA6892632EA49265007B47747B5833568B66F07FB%26dn%3Dva%2Bfrozen%2Bsoundtrack%2B2013%2Bmp3%2Bc4%2Bgtrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
-                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:A6892632EA49265007B47747B5833568B66F07FB&dn=va+frozen+soundtrack+2013+mp3+c4+gtrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
-                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/A6892632EA49265007B47747B5833568B66F07FB.torrent?title=[kat.cr]va.frozen.soundtrack.2013.mp3.c4.gtrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
-                                            </div>
-                                            <div class="torrentname">
-                                                <a href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html" class="torType musicType"></a>
-                                                <a href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html" class="normalgrey font12px plain bold"></a>
-                                                <div class="markeredBlock torType musicType">
-                                                    <a href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html" class="cellMainLink">VA - <strong class="red">Frozen</strong> [Soundtrack] - 2013 (MP3) - C4 {GTRG}</a>
-
-                                                    <span class="font11px lightgrey block">
-                                Posted by <a class="plain" href="/user/Kashi2052/">Kashi2052</a> in <span id="cat_8320897"><strong><a href="/music/">Music</a> > <a href="/soundtrack/">Soundtrack</a></strong></span> </span>
-                                                </div>
-                                        </td>
-                                        <td class="nobr center">115.61 <span>MB</span></td>
-                                        <td class="center">39</td>
-                                        <td class="center" title="07 Dec 2013, 09:18">1&nbsp;year</td>
-                                        <td class="green center">27</td>
-                                        <td class="red lasttd center">4</td>
-                                    </tr>
-                                </table>
-                                <div class="pages botmarg5px floatright" baseurl="/usearch/frozen/">
-                                    <a class="turnoverButton siteButton bigButton kaTurnoverButton pagespecify_js" title="Go to a specific page"><i class="ka ka-zoom"></i></a><a class="turnoverButton siteButton bigButton active">1</a><a rel="nofollow" href="/usearch/frozen/2/" class="turnoverButton siteButton bigButton">2</a><a rel="nofollow" href="/usearch/frozen/3/" class="turnoverButton siteButton bigButton">3</a><a rel="nofollow" href="/usearch/frozen/4/" class="turnoverButton siteButton bigButton">4</a><a rel="nofollow" href="/usearch/frozen/5/" class="turnoverButton siteButton bigButton">5</a>
-                                    <a class="turnoverButton siteButton blank nohov"></a><a rel="nofollow" href="/usearch/frozen/77/" class="turnoverButton siteButton bigButton">77</a>
-                                    <script type="text/javascript">
-                                        $(function () {
-                                            if ($('.pages .nohov').length == 0)
-                                                $('.pages .kaTurnoverButton').hide();
-                                        });
-                                        $('.pagespecify_js').unbind('click').on('click', function () {
-                                            var pageNum = prompt('Enter page number');
-                                            if (!isNaN(pageNum) && parseInt(pageNum) > 0) {
-                                                var url = $(this).parent().attr('baseurl');
-                                                var last = $(this).parent().find('a[href]').last();
-                                                var paramStyle = /\/\?page=/.test(last.attr('href')) ? 2 : (/\/\?.*\&page=/.test(last.attr('href')) ? 1 : 0);
-                                                var url_to = paramStyle == 0 || paramStyle == 2 ? (url.substring(0, url.lastIndexOf('/')) + '/' + (paramStyle == 2 ? '?page=' + pageNum + url.substring(url.lastIndexOf('/') + 1).replace(/^\?([^\=]+=)/, '&$1') : pageNum + url.substring(url.lastIndexOf('/')))) : url + '&page=' + pageNum;
-                                                console.log(url_to);
-                                                if (last.is('.ajaxLink')) { // if last button is .ajaxLink then it implies it's being fancyboxed, or at least the destination page(s) should be fancyboxed.
-                                                    $('<a href="' + url_to + '"' + (last.is('[rel="nofollow"]') ? ' rel="nofollow"' : '') + '></a>').fancybox().click();
-                                                } else {
-                                                    location.href = url_to;
-                                                }
-                                            }
-                                        });
-                                    </script>
-                                </div>
-                                </div>
-                                <div class="lightgrey">
-                                    Search for "frozen" on <a href="http://torrentz.eu/search?f=frozen">Torrentz.eu</a>
-                                </div>
-                        </td>
-                        <td class="sidebarCell">
-
-                            <div id="sidebar">
-
-
-                                <span data-sc-slot="_119b0a17fab5493361a252d04bf527db"></span>
-
-
-                                <div class="spareBlock">
-                                    <div class="legend">Advertising (<a href="/auth/login/register/" class="ajaxLink removeAdv" title="Login or register to remove advertising">remove</a>)</div>
-                                    <span data-sc-slot="_7063408f1c01d50e0dc2d833186ce962" data-sc-params="{ 'searchQuery': 'frozen' }"></span>
-                                </div>
-
-
-                                <div class="sliderbox">
-                                    <h3><a href="/community/">Latest Forum Threads</a><i id="hideLatestThreads" class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
-                                    <ul id="latestForum" rel="latestForum" class="showBlockJS">
-                                        <li>
-                                            <a href="/community/show/please-request-ebooks-and-audio-books-here-v12/?unread=17162197">
-                                                <i class="ka ka16 ka-community latest-icon"></i>
-                                                <p class="latest-title">
-                                                    Please request ebooks and audio books here. V12
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by <span class="badgeInline"><span class="online" title="online"></span> <span class="aclColor_1"><a class="plain" href="/user/bcsaturdai/">bcsaturdai</a></span></span>
-                                            <time class="timeago" datetime="2015-12-01T15:16:17+00:00">01 Dec 2015, 15:16</time>
-                                            </span>
-                                        </li>
-                                        <li>
-                                            <a href="/community/show/ask-experienced-encoder-here/?unread=17162196">
-                                                <i class="ka ka16 ka-community latest-icon"></i>
-                                                <p class="latest-title">
-                                                    Ask an Experienced Encoder Here
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by <span class="badgeInline"><span class="online" title="online"></span> <span class="aclColor_1"><a class="plain" href="/user/Arggonawght/">Arggonawght</a></span></span>
-                                            <time class="timeago" datetime="2015-12-01T15:15:57+00:00">01 Dec 2015, 15:15</time>
-                                            </span>
-                                        </li>
-                                        <li>
-                                            <a href="/community/show/rap-discography-s-320-kbps-quality/?unread=17162187">
-                                                <i class="ka ka16 ka-community latest-icon"></i>
-                                                <p class="latest-title">
-                                                    RAP Discography`s in 320 kbps quality
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_eliteuploader"><a class="plain" href="/user/dragan09/">dragan09</a></span></span>
-                                            <time class="timeago" datetime="2015-12-01T15:13:51+00:00">01 Dec 2015, 15:13</time>
-                                            </span>
-                                        </li>
-                                        <li>
-                                            <a href="/community/show/adopt-uploader-program-v12-all-users-help-thread-115043/?unread=17162181">
-                                                <i class="ka ka16 ka-community latest-icon"></i>
-                                                <p class="latest-title">
-                                                    **Adopt an uploader Program v12-- For all Users to Help**
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_1"><a class="plain" href="/user/Uterkof/">Uterkof</a></span></span>
-                                            <time class="timeago" datetime="2015-12-01T15:12:20+00:00">01 Dec 2015, 15:12</time>
-                                            </span>
-                                        </li>
-                                        <li>
-                                            <a href="/community/show/walking-dead-discussion-thread-v2-thread-103224/?unread=17162180">
-                                                <i class="ka ka16 ka-community latest-icon"></i>
-                                                <p class="latest-title">
-                                                    THE WALKING DEAD Discussion Thread V2
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_1"><a class="plain" href="/user/Leroy_Brown/">Leroy_Brown</a></span></span>
-                                            <time class="timeago" datetime="2015-12-01T15:12:18+00:00">01 Dec 2015, 15:12</time>
-                                            </span>
-                                        </li>
-                                        <li>
-                                            <a href="/community/show/flac-and-other-lossless-only-thread/?unread=17162174">
-                                                <i class="ka ka16 ka-community latest-icon"></i>
-                                                <p class="latest-title">
-                                                    FLAC and Other Lossless Only Thread.
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_verified"><a class="plain" href="/user/andyt1000/">andyt1000</a></span></span>
-                                            <time class="timeago" datetime="2015-12-01T15:11:14+00:00">01 Dec 2015, 15:11</time>
-                                            </span>
-                                        </li>
-                                    </ul>
-                                </div>
-                                <!-- div class="sliderbox" -->
-
-                                <div class="sliderbox">
-                                    <h3><a href="/blog/">Latest News</a><i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
-                                    <ul id="latestNews" rel="latestNews" class="showBlockJS">
-                                        <li>
-                                            <a href="/blog/post/new-site-rules/">
-                                                <i class="ka ka16 ka-rss latest-icon"></i>
-                                                <p class="latest-title">
-                                                    New site Rules
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by KickassTorrents <time class="timeago" datetime="2015-10-15T14:18:43+00:00">15 Oct 2015, 14:18</time></span>
-                                        </li>
-                                        <li>
-                                            <a href="/blog/post/look-mama-i-m-popular/">
-                                                <i class="ka ka16 ka-rss latest-icon"></i>
-                                                <p class="latest-title">
-                                                    Look, mama, I&#039;m popular!
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by KickassTorrents <time class="timeago" datetime="2015-10-05T17:42:40+00:00">05 Oct 2015, 17:42</time></span>
-                                        </li>
-                                        <li>
-                                            <a href="/blog/post/summer-updates-september-1/">
-                                                <i class="ka ka16 ka-rss latest-icon"></i>
-                                                <p class="latest-title">
-                                                    Summer updates [September, 1]
-                                                </p>
-                                            </a>
-                                            <span class="explanation">by KickassTorrents <time class="timeago" datetime="2015-09-01T16:13:36+00:00">01 Sep 2015, 16:13</time></span>
-                                        </li>
-                                    </ul>
-                                </div>
-                                <!-- div class="sliderbox" -->
-                                <div class="sliderbox">
-                                    <h3>Blogroll<i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
-                                    <ul id="blogroll" rel="blogroll" class="showBlockJS">
-                                        <li><a href="/blog/felix56/post/deception-point/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Deception Point</p></a><span class="explanation">by <a class="plain aclColor_1" href="/user/felix56/">felix56</a> <time class="timeago" datetime="2015-12-01T05:32:48+00:00">01 Dec 2015, 05:32</time></span></li>
-                                        <li><a href="/blog/TheDels/post/derek-savage-roasted/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Derek Savage #Roasted</p></a><span class="explanation">by <a class="plain aclColor_1" href="/user/TheDels/">TheDels</a> <time class="timeago" datetime="2015-12-01T05:17:55+00:00">01 Dec 2015, 05:17</time></span></li>
-                                        <li><a href="/blog/Ajay.Ghale/post/li-fi-technology-is-coming-soon-you-are-ready/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Li-Fi Technology Is Coming Soon. You are Ready?</p></a><span class="explanation">by <a class="plain aclColor_1" href="/user/Ajay.Ghale/">Ajay.Ghale</a> <time class="timeago" datetime="2015-12-01T04:06:45+00:00">01 Dec 2015, 04:06</time></span></li>
-                                        <li><a href="/blog/CindyKAT/post/december-original-12-days-of-christmas-25-dec-to-5-jan/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> December - ORIGINAL 12 Days of Christmas 25 Dec. to 5 Jan.</p></a><span class="explanation">by <a class="plain aclColor_2" href="/user/CindyKAT/">CindyKAT</a> <time class="timeago" datetime="2015-11-30T22:35:20+00:00">30 Nov 2015, 22:35</time></span></li>
-                                        <li><a href="/blog/RoughJustice/post/let-me-be-perfectly-clear/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Let Me Be (Perfectly) Clear ...</p></a><span class="explanation">by <a class="plain aclColor_2" href="/user/RoughJustice/">RoughJustice</a> <time class="timeago" datetime="2015-11-30T08:00:56+00:00">30 Nov 2015, 08:00</time></span></li>
-                                        <li><a href="/blog/condoghost/post/torrent-removed-by-the-request-of-copyright-owner-and-not-available-for-download/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Torrent &quot;Removed by the request of copyright owner and not available for download&quot;</p></a><span class="explanation">by <a class="plain aclColor_1" href="/user/condoghost/">condoghost</a> <time class="timeago" datetime="2015-11-29T22:43:06+00:00">29 Nov 2015, 22:43</time></span></li>
-                                    </ul>
-                                </div>
-                                <!-- div class="sliderbox" -->
-
-                                <div class="sliderbox">
-                                    <h3>Goodies<i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
-                                    <ul id="goodies" rel="goodies" class="showBlockJS">
-
-                                        <li>
-                                            <a data-nop target="_blank" rel="external" href="http://addons.mozilla.org/en-US/firefox/addon/11412" target="_blank" rel="external">
-                                                <span class="ifirefox thirdPartIcons"></span>Firefox search plugin
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a data-nop target="_blank" rel="external" href="/content/utorrent.btsearch">
-                                                <span class="iutorrent thirdPartIcons"></span>uTorrent search template
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a data-nop target="_blank" rel="external" href="http://twitter.com/kickasstorrents">
-                                                <span class="ifollow thirdPartIcons"></span>Follow us on Twitter
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a data-nop target="_blank" rel="external" href="/blog/post/30/">
-                                                <span class="ikat thirdPartIcons"></span>Kickass wallpapers
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a data-nop target="_blank" rel="external" href="http://www.facebook.com/official.KAT.fanclub">
-                                                <span class="ifacebook thirdPartIcons"></span>Like us on Facebook
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a data-nop target="_blank" rel="external nofollow" href="http://chat.efnet.org:9090/?channels=%23KAT.ph"><span class="iirc thirdPartIcons"></span>IRC official chat</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                                <!-- div class="sliderbox" -->
-                                <div class="sliderbox">
-                                    <h3>Latest Searches<i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
-                                    <ul id="latestSearches" rel="latestSearches" class="showBlockJS">
-                                        <li>
-                                            <a href="/search/the%20conjuring%202013/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    the conjuring 2013
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/john%20legend%20all%20of%20me/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    john legend all of me
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/megumi%20shino/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    megumi shino
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/forbidden/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    Forbidden
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/frozen/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    frozen
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/minecraft%20server/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    minecraft server
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/nabokov/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    nabokov
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/greys%20anatomy%20s12e04/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    Greys Anatomy s12e04
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/girls%20gone%20wild/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    Girls Gone Wild
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/alloy%20of%20law/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    alloy of law
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                        <li>
-                                            <a href="/search/battle%20of%20the%20sexes%202015/">
-                                                <i class="ka ka16 ka-zoom latest-icon"></i>
-                                                <p class="latest-title">
-                                                    battle of the sexes 2015
-                                                </p>
-                                            </a>
-                                            <span class="explanation">just&nbsp;now</span>
-                                        </li>
-
-                                    </ul>
-                                </div>
-                                <!-- div class="sliderbox" -->
-                                <div class="sliderbox">
-                                    <h3>Friends Links<i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
-                                    <ul id="friendsLinks" rel="friendsLinks" class="showBlockJS">
-
-                                        <li>
-                                            <a data-nop href="http://torrents.to/" target="_blank" rel="external">
-                                                <span class="itorrentsto thirdPartIcons"></span>Torrents.to
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a data-nop href="http://www.torrentdownloads.net/" target="_blank" rel="external">
-                                                <span class="itorrentdownloads thirdPartIcons"></span>Torrent Downloads
-                                            </a>
-                                        </li>
-
-
-
-
-                                        <li>
-                                            <a data-nop href="http://torrent-finder.info/" target="_blank" rel="external">
-                                                <span class="itorrentfinder thirdPartIcons"></span>Torrent Finder
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                                <!-- div class="sliderbox" -->
-
-                            </div>
-                            <a class="showSidebar" id="showsidebar" onclick="showSidebar();" style="display:none;"></a>
-
-                        </td>
-                    </tr>
-                </table>
-                <div class="rightcell">
-                </div>
-                <!-- div class="rightcell" -->
-                <div class="leftcell">
-                </div>
-                </div>
-                <div id="translate_site" style="display:none">
-                    <h3>Select Your Language</h3>
-                    <div class="textcontent">
-                        <div style="-moz-column-width: 12em; -moz-columns: 12em; -webkit-columns: 12em; columns:12em;">
-                            <ul>
-                                <li class="current_lang"><a href="#" onclick="setLanguage('en', '.kat.cr');return false;" class="plain"><strong>English</strong></a></li>
-                                <li><a href="#" onclick="setLanguage('af', '.kat.cr');return false;" class="plain">Afrikaans</a></li>
-                                <li><a href="#" onclick="setLanguage('al', '.kat.cr');return false;" class="plain">Albanian</a></li>
-                                <li><a href="#" onclick="setLanguage('ar', '.kat.cr');return false;" class="plain">Arabic (Modern)</a></li>
-                                <li><a href="#" onclick="setLanguage('eu', '.kat.cr');return false;" class="plain">Basque</a></li>
-                                <li><a href="#" onclick="setLanguage('bn', '.kat.cr');return false;" class="plain">Bengali</a></li>
-                                <li><a href="#" onclick="setLanguage('bs', '.kat.cr');return false;" class="plain">Bosnian</a></li>
-                                <li><a href="#" onclick="setLanguage('bsc', '.kat.cr');return false;" class="plain">Bosnian-Cyrillic</a></li>
-                                <li><a href="#" onclick="setLanguage('br', '.kat.cr');return false;" class="plain">Brazilian Portuguese</a></li>
-                                <li><a href="#" onclick="setLanguage('bg', '.kat.cr');return false;" class="plain">Bulgarian</a></li>
-                                <li><a href="#" onclick="setLanguage('ch', '.kat.cr');return false;" class="plain">Chinese Simplified</a></li>
-                                <li><a href="#" onclick="setLanguage('tw', '.kat.cr');return false;" class="plain">Chinese Traditional</a></li>
-                                <li><a href="#" onclick="setLanguage('hr', '.kat.cr');return false;" class="plain">Croatian</a></li>
-                                <li><a href="#" onclick="setLanguage('cz', '.kat.cr');return false;" class="plain">Czech</a></li>
-                                <li><a href="#" onclick="setLanguage('da', '.kat.cr');return false;" class="plain">Danish</a></li>
-                                <li><a href="#" onclick="setLanguage('nl', '.kat.cr');return false;" class="plain">Dutch</a></li>
-                                <li><a href="#" onclick="setLanguage('tl', '.kat.cr');return false;" class="plain">Filipino</a></li>
-                                <li><a href="#" onclick="setLanguage('fi', '.kat.cr');return false;" class="plain">Finnish</a></li>
-                                <li><a href="#" onclick="setLanguage('fr', '.kat.cr');return false;" class="plain">French</a></li>
-                                <li><a href="#" onclick="setLanguage('ka', '.kat.cr');return false;" class="plain">Georgian</a></li>
-                                <li><a href="#" onclick="setLanguage('de', '.kat.cr');return false;" class="plain">German</a></li>
-                                <li><a href="#" onclick="setLanguage('el', '.kat.cr');return false;" class="plain">Greek</a></li>
-                                <li><a href="#" onclick="setLanguage('he', '.kat.cr');return false;" class="plain">Hebrew</a></li>
-                                <li><a href="#" onclick="setLanguage('hi', '.kat.cr');return false;" class="plain">Hindi</a></li>
-                                <li><a href="#" onclick="setLanguage('hu', '.kat.cr');return false;" class="plain">Hungarian</a></li>
-                                <li><a href="#" onclick="setLanguage('id', '.kat.cr');return false;" class="plain">Indonesian</a></li>
-                                <li><a href="#" onclick="setLanguage('it', '.kat.cr');return false;" class="plain">Italian</a></li>
-                                <li><a href="#" onclick="setLanguage('kn', '.kat.cr');return false;" class="plain">Kannada</a></li>
-                                <li><a href="#" onclick="setLanguage('ko', '.kat.cr');return false;" class="plain">Korean</a></li>
-                                <li><a href="#" onclick="setLanguage('lv', '.kat.cr');return false;" class="plain">Latvian</a></li>
-                                <li><a href="#" onclick="setLanguage('lt', '.kat.cr');return false;" class="plain">Lithuanian</a></li>
-                                <li><a href="#" onclick="setLanguage('mk', '.kat.cr');return false;" class="plain">Macedonian</a></li>
-                                <li><a href="#" onclick="setLanguage('ml', '.kat.cr');return false;" class="plain">Malayalam</a></li>
-                                <li><a href="#" onclick="setLanguage('ms', '.kat.cr');return false;" class="plain">Malaysian</a></li>
-                                <li><a href="#" onclick="setLanguage('no', '.kat.cr');return false;" class="plain">Norwegian</a></li>
-                                <li><a href="#" onclick="setLanguage('pr', '.kat.cr');return false;" class="plain">Pirate</a></li>
-                                <li><a href="#" onclick="setLanguage('pl', '.kat.cr');return false;" class="plain">Polish</a></li>
-                                <li><a href="#" onclick="setLanguage('pt', '.kat.cr');return false;" class="plain">Portuguese</a></li>
-                                <li><a href="#" onclick="setLanguage('pa', '.kat.cr');return false;" class="plain">Punjabi</a></li>
-                                <li><a href="#" onclick="setLanguage('ro', '.kat.cr');return false;" class="plain">Romanian</a></li>
-                                <li><a href="#" onclick="setLanguage('ru', '.kat.cr');return false;" class="plain">Russian</a></li>
-                                <li><a href="#" onclick="setLanguage('sr', '.kat.cr');return false;" class="plain">Serbian</a></li>
-                                <li><a href="#" onclick="setLanguage('src', '.kat.cr');return false;" class="plain">Serbian-Cyrillic</a></li>
-                                <li><a href="#" onclick="setLanguage('si', '.kat.cr');return false;" class="plain">Sinhala</a></li>
-                                <li><a href="#" onclick="setLanguage('sk', '.kat.cr');return false;" class="plain">Slovak</a></li>
-                                <li><a href="#" onclick="setLanguage('sl', '.kat.cr');return false;" class="plain">Slovenian</a></li>
-                                <li><a href="#" onclick="setLanguage('es', '.kat.cr');return false;" class="plain">Spanish</a></li>
-                                <li><a href="#" onclick="setLanguage('sv', '.kat.cr');return false;" class="plain">Swedish</a></li>
-                                <li><a href="#" onclick="setLanguage('ta', '.kat.cr');return false;" class="plain">Tamil</a></li>
-                                <li><a href="#" onclick="setLanguage('te', '.kat.cr');return false;" class="plain">Telugu</a></li>
-                                <li><a href="#" onclick="setLanguage('tr', '.kat.cr');return false;" class="plain">Turkish</a></li>
-                                <li><a href="#" onclick="setLanguage('uk', '.kat.cr');return false;" class="plain">Ukrainian</a></li>
-                                <li><a href="#" onclick="setLanguage('ur', '.kat.cr');return false;" class="plain">Urdu</a></li>
-                                <li><a href="#" onclick="setLanguage('vi', '.kat.cr');return false;" class="plain">Vietnamese</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                    <!-- div class="textcontent" -->
-                </div>
-                </div>
-                <!--id="main"-->
-                </div>
-                <!--id="wrap"-->
-
-                <footer class="lightgrey">
-                    <ul>
-                        <li><a class="plain" data-nop href="#translate_site" id="translate_link"><strong>change language</strong></a></li>
-                        <li><a href="/rules/" class="lower">rules</a></li>
-                        <li><a href="/ideabox/">idea box</a></li>
-                        <li class="lower"><a href="/achievements/">Achievements</a></li>
-                        <li><a href="/trends/">trends</a></li>
-                        <li class="lower"><a href="/latest-searches/">Latest Searches</a></li>
-                        <li><a href="/request/">torrent requests</a></li>
-                    </ul>
-                    <ul>
-                        <li><a href="/about/">about</a></li>
-                        <li><a href="/privacy/">privacy</a></li>
-                        <li><a href="/dmca/">dmca</a></li>
-                        <li><a href="/logos/">logos</a></li>
-                        <li><a href="/contacts/">contacts</a></li>
-                        <li><a href="/api/">api</a></li>
-                        <li><a href="https://kastatus.com">KAT status</a></li>
-                        <li><a target="_blank" rel="external nofollow" href="http://chat.efnet.org:9090/?channels=%23KAT.ph">chat</a></li>
-                    </ul>
-                </footer>
-                <a class="feedbackButton eventsButtons" href="/issue/create/" id="feedback"><span>Report a bug</span></a>
-                <span data-sc-slot="_673e31f53f8166159b8e996c4124765b"></span>
-                <span data-sc-slot="_e7050fb15fd39b3e4e99a5be4a57b6ea"></span>
-                <script>
-                    sc('addGlobal', 'pagetype', 'other');
-                </script>
-                <script type="text/javascript">
-                    <!--
-                    document.write("<a style='display:none;' href='http://www.liveinternet.ru/click' " +
-                            "target=_blank><img src='//counter.yadro.ru/hit?t45.6;r" +
-                            escape(document.referrer) + ((typeof (screen) == "undefined") ? "" :
-                                ";s" + screen.width + "*" + screen.height + "*" + (screen.colorDepth ?
-                                    screen.colorDepth : screen.pixelDepth)) + ";u" + escape(document.URL) +
-                            ";h" + escape(document.title.substring(0, 80)) + ";" + Math.random() +
-                            "' alt='' title='LiveInternet' " +
-                            "border='0' width='0' height='0'><\/a>")
-                        //-->
-                </script>
-
-</body>
-
-</html>
-'''
-import bs4
-from ast import literal_eval
-soup = bs4.BeautifulSoup(data)
-
-links = soup.select("div.iaconbox span")
-for span in links:
-    magnet = literal_eval(span["data-sc-params"])
-    print magnet["name"], magnet["magnet"]
-
-# import requests
-#
-# url = "http://www.elitetorrent.net/categoria/1/estrenos/modo:listado/pag:1"
-# browser = requests.Session()
-# page = "1"
-# import bs4
-#
-# response = browser.get( url + page)
-# soup = bs4.BeautifulSoup(response.text)
-# links = soup.select("a.nombre")
-# for link in links:
-#     print link.get("title", ""), link["href"]
-
-# import re
-#
-# datos = re.search("var datos =(.*?);", data, re.DOTALL).group(1).replace("{", "").replace("}", "")
-# params = {}
-# for item in datos.split("\n"):
-#     if item.strip() != "":
-#         key, value = item.strip()[:-1].split(':')
-#         params[key] = value.replace("'", "")
-# #settings.debug(params)
-# opciones = re.search("var options =(.*?);", data, re.DOTALL).group(1).replace("{", "").replace("}", "") + ": ''"
-# params1 = {}
-# for item in opciones.split("\n"):
-#     if item.strip() != "":
-#         key, value = item.strip()[:-1].split(':')
-#         params1[key] = value.replace("'", "")
-# #settings.debug(params1)
-# urlPage = re.search('url: "(.*?)"', data).group(1)
+# coding: utf-8
+__author__ = 'Ruben'
+data = '''
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" dir="auto">
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Style-Type" content="text/css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="description" content="Come and download frozen absolutely for free. Fast downloads." />
+    <meta name="robots" content="noindex" rel="usearch" />
+    <title>Download frozen Torrents - Kickass Torrents</title>
+    <link rel="stylesheet" type="text/css" href="//kastatic.com/all-261c451.css" charset="utf-8" />
+    <link rel="shortcut icon" href="//kastatic.com/images/favicon.ico" />
+
+
+    <link rel="apple-touch-icon" href="//kastatic.com/images/apple-touch-icon.png" />
+
+    <!--[if IE 7]>
+    <link href="//kastatic.com/css/ie7-261c451.css" rel="stylesheet" type="text/css"/>
+    <![endif]-->
+
+    <!--[if IE 8]>
+    <link href="//kastatic.com/css/ie8.css" rel="stylesheet" type="text/css"/>
+    <![endif]-->
+
+    <!--[if lt IE 9]>
+    <script src="//kastatic.com/js/html5.min-261c451.js" type="text/javascript"></script>
+    <![endif]-->
+
+    <!--[if gte IE 9]>
+    <link href="//kastatic.com/css/ie9-261c451.css" rel="stylesheet" type="text/css"/>
+    <![endif]-->
+    <script type="text/javascript">
+        + function (S, p, a, r, e, C, l, i, c, k) {
+            S[r] = S[r] || [];
+            S[e] || (S[e] = function () {
+                S[r].push(Array.prototype.slice.call(arguments))
+            });
+            i = p.createElement(a);
+            c = p.getElementsByTagName(a)[0];
+            i.src = C;
+            i.async = true;
+            c.parentNode.insertBefore(i, c)
+        }
+        (window, document, 'script', '_scq', 'sc', '//a.kickass.to/sc-261c451.js');
+
+        sc('setHost', 'a.kickass.to');
+        sc('setAccount', '_b894d6cb1e370fb9ad89f8d6d99eeb33');
+        var kat = {
+            release_id: '261c451',
+            detect_lang: 0,
+            spare_click: 1,
+            mobile: false
+        };
+    </script>
+    <script src="//kastatic.com/js/all-261c451.js" type="text/javascript"></script>
+    <link rel="alternate" type="application/rss+xml" title="Subscribe to RSS feed" href="http://kat.cr/usearch/frozen/?rss=1" />
+    <meta name="verify-v1" content="YccN/iP28SifHNEFY6u92i0ou3tAegQAIk2OyOJLp1s=" />
+    <meta name="y_key" content="f0b40c3f5fee758f" />
+    <meta name="google-site-verification" content="C1rNEC4fJIvFoyyccMV2PbuqX3P-SFtlD2MNZ9D2uy0" />
+    <link rel="search" type="application/opensearchdescription+xml" title="KickassTorrents Torrent Search" href="/opensearch.xml" />
+    <meta property="fb:app_id" content="123694587642603" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+    <script type="text/javascript">
+        var _scq = _scq || [];
+    </script>
+</head>
+
+<body>
+    <div id="wrapper">
+        <div id="wrapperInner">
+            <span data-sc-slot="_60318cd4e8d28f6fb76fe34e9bd9c498"></span>
+            <span data-sc-slot="_39ecb76dd457e5ac33776fdf11500d56"></span>
+            <div id="logindiv"></div>
+            <header>
+                <nav id="menu">
+                    <a href="/" id="logo"></a>
+                    <i id="showHideSearch" class="ka ka-zoom"></i>
+                    <div id="torrentSearch">
+                        <form action="/usearch/" method="get" id="searchform" accept-charset="utf-8" onsubmit="return doSearch(this.q.value);">
+                            <input id="contentSearch" class="input-big" type="text" name="q" value="frozen" autocomplete="off" placeholder="Search query" />
+                            <div id="searchTool"><a title="Advanced search" href="/advanced/?q=frozen" class="ajaxLink"><i class="ka ka-settings"></i></a>
+                                <button title="search" type="submit" value="" onfocus="this.blur();" onclick="this.blur();"><i class="ka ka-search"></i></button>
+                            </div>
+                        </form>
+                    </div>
+                    <span data-sc-slot="_277923e5f9d753c5b0630c28e641790c"></span>
+                    <ul id="navigation">
+
+                        <li>
+                            <a href="/browse/"> <i class="ka ka-torrent"></i><span class="menuItem">browse</span></a>
+                            <ul class="dropdown dp-middle dropdown-msg upper">
+
+                                <li class="topMsg"><a href="/new/"><i class="ka ka16 ka-torrent"></i>latest</a></li>
+                                <li class="topMsg"><a href="/movies/"><i class="ka ka16 ka-movie lower"></i>Movies</a></li>
+                                <li class="topMsg"><a href="/tv/"><i class="ka ka16 ka-movie lower"></i>TV</a></li>
+                                <li class="topMsg"><a href="/music/"><i class="ka ka16 ka-music-note lower"></i>Music</a></li>
+                                <li class="topMsg"><a href="/games/"><i class="ka ka16 ka-settings lower"></i>Games</a></li>
+                                <li class="topMsg"><a href="/books/"><i class="ka ka16 ka-bookmark"></i>Books</a></li>
+                                <li class="topMsg"><a href="/applications/"><i class="ka ka16 ka-settings lower"></i>Apps</a></li>
+                                <li class="topMsg"><a href="/anime/"><i class="ka ka16 ka-movie lower"></i>Anime</a></li>
+                                <li class="topMsg"><a href="/other/"><i class="ka ka16 ka-torrent"></i>Other</a></li>
+                                <li class="topMsg"><a href="/xxx/"><i class="ka ka16 ka-delete"></i>XXX</a></li>
+                            </ul>
+                        </li>
+                        </li>
+                        <li>
+                            <a data-nop href="/community/"> <i class="ka ka-community"></i><span class="menuItem">community</span></a>
+                            <li><a data-nop href="/blog/"><i class="ka ka-rss lower"></i><span class="menuItem">Blog</span></a></li>
+                            <li><a data-nop href="/faq/"><i class="ka ka-faq lower"></i><span class="menuItem">FAQ</span></a></li>
+                        </li>
+
+                        <li> <a data-nop href="/auth/login/" class="ajaxLink"><i class="ka ka-user"></i><span class="menuItem">Register / Sign In</span></a></li>
+                    </ul>
+                </nav>
+            </header>
+
+            <div class="pusher"></div>
+            <div class="mainpart">
+
+
+                <table width="100%" cellspacing="0" cellpadding="0" class="doublecelltable" id="mainSearchTable">
+                    <tr>
+                        <td width="100%">
+                            <div class="spareBlock hzSpare">
+                                <div class="legend">Advertising (<a href="/auth/login/register/" class="ajaxLink removeAdv" title="Login or register to remove advertising">remove</a>)</div>
+                                <span data-sc-slot="_b77c3599a877a4e9d6097b83ec9f23bb" data-sc-params="{ 'searchQuery': 'frozen' }"></span>
+                            </div>
+
+                            <div class="tabs">
+                                <ul class="tabNavigation">
+                                    <li><a class="selectedTab" href="/search/frozen/"><span>Sponsored Links</span></a></li>
+                                </ul>
+                                <hr class="tabsSeparator" />
+                            </div>
+                            <span data-sc-slot="_c039297fb3d18cf107e21460970475f0"></span>
+                            <br />
+                            <br />
+
+                            <h1><a itemprop="url" class="plain" href="/frozen-i2294629/">Frozen</a></h1>
+                            <div class="torrentMediaInfo">
+                                <a class="movieCover" href="/frozen-i2294629/"><img src="//yuq.me/movies/22/946/2294629.jpg" /></a>
+                                <div class="dataList">
+                                    <ul class="block overauto botmarg0">
+                                        <li><strong>IMDb link:</strong> <a class="plain" href="http://www.imdb.com/title/tt2294629/">2294629</a></li>
+                                        <li><strong>IMDb rating:</strong> 7.6 (372,962 votes) </li>
+                                        <li><strong>RottenTomatoes:</strong> <span class="rottentomatoes positive" title="fresh!"></span>89% <span class="rottenaudience positive" title="audience like it!"></span>86% </li>
+                                        <li><strong>Watch on <a data-nop target="_blank" href="https://www.solarmovie.ph">Solarmovie</a>:</strong> <a data-nop target="_blank" href="https://www.solarmovie.ph/watch-frozen-2013.html">Frozen</a></li>
+                                        <li><strong>Genres:</strong> <a class="plain" href="/movies/genre/animation/"><span>Animation</span></a>, <a class="plain" href="/movies/genre/adventure/"><span>Adventure</span></a>, <a class="plain" href="/movies/genre/family/"><span>Family</span></a>, <a class="plain" href="/movies/genre/comedy/"><span>Comedy</span></a>, <a class="plain" href="/movies/genre/fantasy/"><span>Fantasy</span></a>, <a class="plain" href="/movies/genre/musical/"><span>Musical</span></a> </li>
+                                    </ul>
+                                    <ul>
+                                        <li><a href="/bookmarks/add/movie/2294629/" class="ajaxLink kaButton smallButton normalText"><i class="ka ka-bookmark"></i> add <strong>Frozen</strong> to bookmarks</a></li>
+                                        <li><strong>Release date:</strong> 27 November 2013</li>
+                                        <li><strong>Writers:</strong> Jennifer Lee (screenplay), Hans Christian Andersen (inspired by the story &quot;The Snow Queen&quot; by), Chris Buck (story), Jennifer Lee (story), Shane Morris (story), Dean Wellins (additional story)</li>
+
+                                    </ul>
+                                    <div class="floatleft width100perc botmarg10px"><strong>Cast:</strong> <span><a href="/movies/actor/kristen-bell-a0068338/">Kristen Bell</a></span>, <span><a href="/movies/actor/idina-menzel-a0579953/">Idina Menzel</a></span>, <span><a href="/movies/actor/josh-gad-a1265802/">Josh Gad</a></span>, <span><a href="/movies/actor/jonathan-groff-a2676147/">Jonathan Groff</a></span> and others </div>
+                                    <div class="floatleft width100perc botmarg10px">
+                                        <strong>Summary:</strong>
+                                        <div id="summary">
+                                            <p class="accentbox botmarg10px">
+                                                When a princess with the power to turn things into ice curses her home in infinite winter, her sister, Anna teams up with a mountain man, his playful reindeer, and a snowman to change the weather condition.
+                                                <br />
+                                            </p>
+                                            <strong><small>Written by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_9"><a class="plain" href="/user/Thhaque/">Thhaque</a></span><span title="Reputation" class="repValue positive">397.95K</span></span></small></strong>
+
+
+
+
+                                        </div>
+
+                                    </div>
+                                    <span data-sc-slot="_16b9d77edbc49edc5a7a757cde4dfe28" data-sc-params="{ 'movie_name': 'Frozen' }"></span>
+                                    <div class="pages marg0 floatleft"> <strong class="botpad5px block">Available in versions:</strong> <a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#1080p">1080p</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#720p">720p</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#BDRip">BDRip</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#HDRiP">HDRiP</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#DVD">DVD</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#DVDRip">DVDRip</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#VCD">VCD</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#Screener">Screener</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#TeleSync">TeleSync</a><a class="turnoverButton siteButton bigButton " href="/frozen-i2294629/#Cam">Cam</a> </div>
+                                </div>
+                                <!-- div class="dataList" -->
+                            </div>
+
+
+
+                            <div class="tabs">
+                                <ul class="tabNavigation">
+                                    <li>
+                                        <a class="darkButton selectedTab" href="/usearch/frozen/"><span>All</span></a>
+                                    </li>
+                                    <li>
+                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:movies/"><span>Movies <i class="menuValue">928</i></span></a>
+                                    </li>
+                                    <li>
+                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:tv/"><span>TV <i class="menuValue">193</i></span></a>
+                                    </li>
+                                    <li>
+                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:anime/"><span>Anime <i class="menuValue">162</i></span></a>
+                                    </li>
+                                    <li>
+                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:music/"><span>Music <i class="menuValue">205</i></span></a>
+                                    </li>
+                                    <li>
+                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:books/"><span>Books <i class="menuValue">83</i></span></a>
+                                    </li>
+                                    <li>
+                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:games/"><span>Games <i class="menuValue">179</i></span></a>
+                                    </li>
+                                    <li>
+                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:applications/"><span>Apps <i class="menuValue">55</i></span></a>
+                                    </li>
+                                    <li>
+                                        <a rel="nofollow" class="darkButton" href="/usearch/frozen category:xxx/"><span>XXX <i class="menuValue">43</i></span></a>
+                                    </li>
+                                </ul>
+                                <hr class="tabsSeparator" />
+                            </div>
+
+                            <div>
+                                <h2>									frozen							<span>  results 1-25 from 1905</span>  <a data-nop class="ka ka16 ka-rss normalText rsssign ka-red" target="_blank" href="http://kat.cr/usearch/frozen/?rss=1" title="rss"></a></h2>
+
+
+                                <table cellpadding="0" cellspacing="0" class="data" style="width: 100%">
+                                    <tr class="firstr">
+                                        <th class="width100perc nopad">torrent name</th>
+                                        <th class="center"><a href="/usearch/frozen/?field=size&sorder=desc" rel="nofollow">size</a></th>
+                                        <th class="center"><span class="files"><a href="/usearch/frozen/?field=files_count&sorder=desc" rel="nofollow">files</a></span></th>
+                                        <th class="center"><span><a href="/usearch/frozen/?field=time_add&sorder=desc" rel="nofollow">age</a></span></th>
+                                        <th class="center"><span class="seed"><a href="/usearch/frozen/?field=seeders&sorder=desc" rel="nofollow">seed</a></span></th>
+                                        <th class="lasttd nobr center"><a href="/usearch/frozen/?field=leechers&sorder=desc" rel="nofollow">leech</a></th>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen8817152">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8817152,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-720p-brrip-x264-yify-t8817152.html#comment">834 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-720p-brrip-x264-yify-t8817152.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20720p%20BrRip%20x264%20-%20YIFY', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A25B4CD46E389E96F80EE42E418CD89D3A65ECD66%26dn%3Dfrozen%2B2013%2B720p%2Bbrrip%2Bx264%2Byify%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:25B4CD46E389E96F80EE42E418CD89D3A65ECD66&dn=frozen+2013+720p+brrip+x264+yify&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/25B4CD46E389E96F80EE42E418CD89D3A65ECD66.torrent?title=[kat.cr]frozen.2013.720p.brrip.x264.yify" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-720p-brrip-x264-yify-t8817152.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-720p-brrip-x264-yify-t8817152.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-720p-brrip-x264-yify-t8817152.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) 720p BrRip x264 - YIFY</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/YIFY/">YIFY</a> in <span id="cat_8817152"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">805.48 <span>MB</span></td>
+                                        <td class="center">2</td>
+                                        <td class="center" title="27 Feb 2014, 06:30">1&nbsp;year</td>
+                                        <td class="green center">722</td>
+                                        <td class="red lasttd center">57</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen11022236">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="11022236,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html#comment">120 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%20BDRip%20XviD%20AC3-EVO', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AA2CBB29651C2BA34B38D1A2BDE1043A1E921591A%26dn%3Dfrozen%2Bfever%2B2015%2Bbdrip%2Bxvid%2Bac3%2Bevo%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:A2CBB29651C2BA34B38D1A2BDE1043A1E921591A&dn=frozen+fever+2015+bdrip+xvid+ac3+evo&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/A2CBB29651C2BA34B38D1A2BDE1043A1E921591A.torrent?title=[kat.cr]frozen.fever.2015.bdrip.xvid.ac3.evo" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html" class="torType filmType"></a>
+                                                <a href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-fever-2015-bdrip-xvid-ac3-evo-t11022236.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 BDRip XviD AC3-EVO</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/Silmarillion/">Silmarillion</a> in <span id="cat_11022236"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">391.15 <span>MB</span></td>
+                                        <td class="center">4</td>
+                                        <td class="center" title="31 Jul 2015, 07:30">4&nbsp;months</td>
+                                        <td class="green center">409</td>
+                                        <td class="red lasttd center">88</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen11022962">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="11022962,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html#comment">30 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%20720p%20Bluray%20X264%20DTS-EVO', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A864D8EF095B4A8D7F9D90BD8846D6E51576D81BD%26dn%3Dfrozen%2Bfever%2B2015%2B720p%2Bbluray%2Bx264%2Bdts%2Bevo%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:864D8EF095B4A8D7F9D90BD8846D6E51576D81BD&dn=frozen+fever+2015+720p+bluray+x264+dts+evo&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/864D8EF095B4A8D7F9D90BD8846D6E51576D81BD.torrent?title=[kat.cr]frozen.fever.2015.720p.bluray.x264.dts.evo" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html" class="torType filmType"></a>
+                                                <a href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-fever-2015-720p-bluray-x264-dts-evo-t11022962.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 720p Bluray X264 DTS-EVO</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/SS132203/">SS132203</a> in <span id="cat_11022962"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">792.66 <span>MB</span></td>
+                                        <td class="center">3</td>
+                                        <td class="center" title="31 Jul 2015, 10:57">4&nbsp;months</td>
+                                        <td class="green center">184</td>
+                                        <td class="red lasttd center">25</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen8821806">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8821806,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html#comment">1 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20MULTi%201080p%20BluRay%20x264-ROUGH', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AB53C3AA969C13DBC58FE9394EA3A553C08839238%26dn%3Dfrozen%2B2013%2Bmulti%2B1080p%2Bbluray%2Bx264%2Brough%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:B53C3AA969C13DBC58FE9394EA3A553C08839238&dn=frozen+2013+multi+1080p+bluray+x264+rough&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/B53C3AA969C13DBC58FE9394EA3A553C08839238.torrent?title=[kat.cr]frozen.2013.multi.1080p.bluray.x264.rough" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-multi-1080p-bluray-x264-rough-t8821806.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 MULTi 1080p BluRay x264-ROUGH</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/Alex_Kid/">Alex_Kid</a> in <span id="cat_8821806"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">6.56 <span>GB</span></td>
+                                        <td class="center">1</td>
+                                        <td class="center" title="28 Feb 2014, 12:00">1&nbsp;year</td>
+                                        <td class="green center">154</td>
+                                        <td class="red lasttd center">20</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen8819093">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8819093,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html#comment">16 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20FRENCH%20720p%20BluRay%20x264-ROUGH', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AFDBE9CABF1604205AF1556A2E4D3A336079EE0B1%26dn%3Dfrozen%2B2013%2Bfrench%2B720p%2Bbluray%2Bx264%2Brough%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:FDBE9CABF1604205AF1556A2E4D3A336079EE0B1&dn=frozen+2013+french+720p+bluray+x264+rough&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/FDBE9CABF1604205AF1556A2E4D3A336079EE0B1.torrent?title=[kat.cr]frozen.2013.french.720p.bluray.x264.rough" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-french-720p-bluray-x264-rough-t8819093.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 FRENCH 720p BluRay x264-ROUGH</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/Alex_Kid/">Alex_Kid</a> in <span id="cat_8819093"><strong><a href="/movies/">Movies</a> > <a href="/dubbed-movies/">Dubbed Movies</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">3.28 <span>GB</span></td>
+                                        <td class="center">2</td>
+                                        <td class="center" title="27 Feb 2014, 18:00">1&nbsp;year</td>
+                                        <td class="green center">157</td>
+                                        <td class="red lasttd center">8</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen9319243">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="9319243,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html#comment">9 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%3A%20Uma%20Aventura%20Congelante%20%282013%29%201080p%20Dublado%20pt-BR', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A5B51FC9689D51E0B80402BA5285F2107909B4275%26dn%3Dfrozen%2Buma%2Baventura%2Bcongelante%2B2013%2B1080p%2Bdublado%2Bpt%2Bbr%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:5B51FC9689D51E0B80402BA5285F2107909B4275&dn=frozen+uma+aventura+congelante+2013+1080p+dublado+pt+br&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/5B51FC9689D51E0B80402BA5285F2107909B4275.torrent?title=[kat.cr]frozen.uma.aventura.congelante.2013.1080p.dublado.pt.br" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html" class="torType filmType"></a>
+                                                <a href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-uma-aventura-congelante-2013-1080p-dublado-pt-br-t9319243.html" class="cellMainLink"><strong class="red">Frozen</strong>: Uma Aventura Congelante (2013) 1080p Dublado pt-BR</a>
+
+                                                    <span class="font11px lightgrey block">
+                in <span id="cat_9319243"><strong><a href="/movies/">Movies</a> > <a href="/dubbed-movies/">Dubbed Movies</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">1.71 <span>GB</span></td>
+                                        <td class="center">4</td>
+                                        <td class="center" title="11 Jul 2014, 15:54">1&nbsp;year</td>
+                                        <td class="green center">157</td>
+                                        <td class="red lasttd center">6</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen10248473">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a class="icon16" href="/frozen-2013-bdrip-xvid-eng-ita-ac3-subs-il-regno-di-ghiaccio-t10248473.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20BDRip%20XviD%20ENG-ITA%20Ac3%20subs%20-%20Il%20Regno%20Di%20Ghiaccio', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AE2167529F2A86ABD6F8F32C98B82450D88E38326%26dn%3Dfrozen%2B2013%2Bbdrip%2Bxvid%2Beng%2Bita%2Bac3%2Bsubs%2Bil%2Bregno%2Bdi%2Bghiaccio%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:E2167529F2A86ABD6F8F32C98B82450D88E38326&dn=frozen+2013+bdrip+xvid+eng+ita+ac3+subs+il+regno+di+ghiaccio&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/E2167529F2A86ABD6F8F32C98B82450D88E38326.torrent?title=[kat.cr]frozen.2013.bdrip.xvid.eng.ita.ac3.subs.il.regno.di.ghiaccio" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-bdrip-xvid-eng-ita-ac3-subs-il-regno-di-ghiaccio-t10248473.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-bdrip-xvid-eng-ita-ac3-subs-il-regno-di-ghiaccio-t10248473.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-bdrip-xvid-eng-ita-ac3-subs-il-regno-di-ghiaccio-t10248473.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) BDRip XviD ENG-ITA Ac3 subs - Il Regno Di Ghiaccio</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/ShivaShanti/">ShivaShanti</a> in <span id="cat_10248473"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">1.75 <span>GB</span></td>
+                                        <td class="center">3</td>
+                                        <td class="center" title="20 Feb 2015, 12:14">9&nbsp;months</td>
+                                        <td class="green center">145</td>
+                                        <td class="red lasttd center">30</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen8893033">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8893033,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html#comment">19 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Il%20Regno%20Di%20Ghiaccio%202013%20iTALiAN%20AC3%20DUAL%201080p%20BrRiP%20x264-TrTd_TeaM', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AA794083F24D2E20C9E9C935B32CC880F1E2A064E%26dn%3Dfrozen%2Bil%2Bregno%2Bdi%2Bghiaccio%2B2013%2Bitalian%2Bac3%2Bdual%2B1080p%2Bbrrip%2Bx264%2Btrtd%2Bteam%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:A794083F24D2E20C9E9C935B32CC880F1E2A064E&dn=frozen+il+regno+di+ghiaccio+2013+italian+ac3+dual+1080p+brrip+x264+trtd+team&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/A794083F24D2E20C9E9C935B32CC880F1E2A064E.torrent?title=[kat.cr]frozen.il.regno.di.ghiaccio.2013.italian.ac3.dual.1080p.brrip.x264.trtd.team" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html" class="torType filmType"></a>
+                                                <a href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-il-regno-di-ghiaccio-2013-italian-ac3-dual-1080p-brrip-x264-trtd-team-t8893033.html" class="cellMainLink"><strong class="red">Frozen</strong> Il Regno Di Ghiaccio 2013 iTALiAN AC3 DUAL 1080p BrRiP x264-TrTd_TeaM</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/ignazio71/">ignazio71</a> in <span id="cat_8893033"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">2.48 <span>GB</span></td>
+                                        <td class="center">5</td>
+                                        <td class="center" title="18 Mar 2014, 17:32">1&nbsp;year</td>
+                                        <td class="green center">121</td>
+                                        <td class="red lasttd center">24</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen11084298">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="11084298,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html#comment">1 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%20BluRay%20720p%20DTS%20x264-ETRG', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A0B85DC86F425AB492D8B091227036B684F516A26%26dn%3Dfrozen%2Bfever%2B2015%2Bbluray%2B720p%2Bdts%2Bx264%2Betrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:0B85DC86F425AB492D8B091227036B684F516A26&dn=frozen+fever+2015+bluray+720p+dts+x264+etrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/0B85DC86F425AB492D8B091227036B684F516A26.torrent?title=[kat.cr]frozen.fever.2015.bluray.720p.dts.x264.etrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html" class="torType filmType"></a>
+                                                <a href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-fever-2015-bluray-720p-dts-x264-etrg-t11084298.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 BluRay 720p DTS x264-ETRG</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/MgB/">MgB</a> in <span id="cat_11084298"><strong><a href="/movies/">Movies</a> > <a href="/highres-movies/">Highres Movies</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">354.29 <span>MB</span></td>
+                                        <td class="center">11</td>
+                                        <td class="center" title="12 Aug 2015, 12:09">3&nbsp;months</td>
+                                        <td class="green center">52</td>
+                                        <td class="red lasttd center">120</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen11031930">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="11031930,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html#comment">5 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%201080p%20Bluray%20X264%20DTS%20en%205%201%20NL%20Subs-EVO', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AEA114BD7462649DF42888D77FD2B8BA43FFC7B09%26dn%3Dfrozen%2Bfever%2B2015%2B1080p%2Bbluray%2Bx264%2Bdts%2Ben%2B5%2B1%2Bnl%2Bsubs%2Bevo%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:EA114BD7462649DF42888D77FD2B8BA43FFC7B09&dn=frozen+fever+2015+1080p+bluray+x264+dts+en+5+1+nl+subs+evo&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/EA114BD7462649DF42888D77FD2B8BA43FFC7B09.torrent?title=[kat.cr]frozen.fever.2015.1080p.bluray.x264.dts.en.5.1.nl.subs.evo" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html" class="torType filmType"></a>
+                                                <a href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-fever-2015-1080p-bluray-x264-dts-en-5-1-nl-subs-evo-t11031930.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 1080p Bluray X264 DTS en 5 1 NL Subs-EVO</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/PitBuLL/">PitBuLL</a> in <span id="cat_11031930"><strong><a href="/movies/">Movies</a> > <a href="/highres-movies/">Highres Movies</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">1.17 <span>GB</span></td>
+                                        <td class="center">1</td>
+                                        <td class="center" title="02 Aug 2015, 09:04">4&nbsp;months</td>
+                                        <td class="green center">84</td>
+                                        <td class="red lasttd center">13</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen8881471">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8881471,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-3d-brrip-x264-yify-t8881471.html#comment">145 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-3d-brrip-x264-yify-t8881471.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%203D%20BrRip%20x264%20-%20YIFY', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A06C0D76D3B5AB230FCF2584FB381D529C6FABD2F%26dn%3Dfrozen%2B2013%2B3d%2Bbrrip%2Bx264%2Byify%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:06C0D76D3B5AB230FCF2584FB381D529C6FABD2F&dn=frozen+2013+3d+brrip+x264+yify&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/06C0D76D3B5AB230FCF2584FB381D529C6FABD2F.torrent?title=[kat.cr]frozen.2013.3d.brrip.x264.yify" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-3d-brrip-x264-yify-t8881471.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-3d-brrip-x264-yify-t8881471.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-3d-brrip-x264-yify-t8881471.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) 3D BrRip x264 - YIFY</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/YIFY/">YIFY</a> in <span id="cat_8881471"><strong><a href="/movies/">Movies</a> > <a href="/3d-movies/">3D Movies</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">1.63 <span>GB</span></td>
+                                        <td class="center">2</td>
+                                        <td class="center" title="15 Mar 2014, 13:20">1&nbsp;year</td>
+                                        <td class="green center">72</td>
+                                        <td class="red lasttd center">7</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen11026819">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="11026819,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html#comment">17 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%20720p%20BluRay%20x264%20AAC-ETRG', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A43A9F98724BD8C77596E81EB3028B44AA8F5FDDB%26dn%3Dfrozen%2Bfever%2B2015%2B720p%2Bbluray%2Bx264%2Baac%2Betrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:43A9F98724BD8C77596E81EB3028B44AA8F5FDDB&dn=frozen+fever+2015+720p+bluray+x264+aac+etrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/43A9F98724BD8C77596E81EB3028B44AA8F5FDDB.torrent?title=[kat.cr]frozen.fever.2015.720p.bluray.x264.aac.etrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html" class="torType filmType"></a>
+                                                <a href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-fever-2015-720p-bluray-x264-aac-etrg-t11026819.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 720p BluRay x264 AAC-ETRG</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/megaradon/">megaradon</a> in <span id="cat_11026819"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">62.41 <span>MB</span></td>
+                                        <td class="center">2</td>
+                                        <td class="center" title="01 Aug 2015, 06:08">4&nbsp;months</td>
+                                        <td class="green center">65</td>
+                                        <td class="red lasttd center">3</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen8516976">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8516976,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html#comment">127 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20720p%20DVDSCR%20XViD%20AC3-HuMPDaY', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A8631A6C1FEE556246A798946A638D2661C634946%26dn%3Dfrozen%2B2013%2B720p%2Bdvdscr%2Bxvid%2Bac3%2Bhumpday%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:8631A6C1FEE556246A798946A638D2661C634946&dn=frozen+2013+720p+dvdscr+xvid+ac3+humpday&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/8631A6C1FEE556246A798946A638D2661C634946.torrent?title=[kat.cr]frozen.2013.720p.dvdscr.xvid.ac3.humpday" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-720p-dvdscr-xvid-ac3-humpday-t8516976.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 720p DVDSCR XViD AC3-HuMPDaY</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/ChrisDen/">ChrisDen</a> in <span id="cat_8516976"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">2.36 <span>GB</span></td>
+                                        <td class="center">1</td>
+                                        <td class="center" title="07 Jan 2014, 21:00">1&nbsp;year</td>
+                                        <td class="green center">59</td>
+                                        <td class="red lasttd center">4</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen8903675">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8903675,0" class="icommentjs kaButton smallButton rightButton" href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html#comment">8 <i class="ka ka-comment"></i></a> <a class="icon16" href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Disney%27s%20Frozen%20%282013%29%20Eng%20NL%20Audio%20Eng%20NL%20Sub%20BR2DVD-NLU002', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A17EA7E292B54A62069594D061D58C8D83CA9B83E%26dn%3Ddisney%2Bs%2Bfrozen%2B2013%2Beng%2Bnl%2Baudio%2Beng%2Bnl%2Bsub%2Bbr2dvd%2Bnlu002%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:17EA7E292B54A62069594D061D58C8D83CA9B83E&dn=disney+s+frozen+2013+eng+nl+audio+eng+nl+sub+br2dvd+nlu002&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/17EA7E292B54A62069594D061D58C8D83CA9B83E.torrent?title=[kat.cr]disney.s.frozen.2013.eng.nl.audio.eng.nl.sub.br2dvd.nlu002" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html" class="torType filmType"></a>
+                                                <a href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/disney-s-frozen-2013-eng-nl-audio-eng-nl-sub-br2dvd-nlu002-t8903675.html" class="cellMainLink">Disney's <strong class="red">Frozen</strong> (2013) Eng NL Audio Eng NL Sub BR2DVD-NLU002</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <a class="plain" href="/user/NLUPPER002/">NLUPPER002</a> in <span id="cat_8903675"><strong><a href="/movies/">Movies</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">4.36 <span>GB</span></td>
+                                        <td class="center">16</td>
+                                        <td class="center" title="21 Mar 2014, 12:44">1&nbsp;year</td>
+                                        <td class="green center">47</td>
+                                        <td class="red lasttd center">5</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen11026844">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="11026844,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html#comment">15 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20Fever%202015%201080p%20BluRay%20x264%20AAC-ETRG', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A47A506E8885C128E2706B72D07AD9C8674330AE9%26dn%3Dfrozen%2Bfever%2B2015%2B1080p%2Bbluray%2Bx264%2Baac%2Betrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:47A506E8885C128E2706B72D07AD9C8674330AE9&dn=frozen+fever+2015+1080p+bluray+x264+aac+etrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/47A506E8885C128E2706B72D07AD9C8674330AE9.torrent?title=[kat.cr]frozen.fever.2015.1080p.bluray.x264.aac.etrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html" class="torType filmType"></a>
+                                                <a href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-fever-2015-1080p-bluray-x264-aac-etrg-t11026844.html" class="cellMainLink"><strong class="red">Frozen</strong> Fever 2015 1080p BluRay x264 AAC-ETRG</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/megaradon/">megaradon</a> in <span id="cat_11026844"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">119.29 <span>MB</span></td>
+                                        <td class="center">2</td>
+                                        <td class="center" title="01 Aug 2015, 06:20">4&nbsp;months</td>
+                                        <td class="green center">47</td>
+                                        <td class="red lasttd center">3</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen10726648">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="10726648,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html#comment">2 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20720p%20BRRip%20900MB%20-%20MkvCage', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A9D51B42EB769D409F26269BA01CE58E0DD14A7BC%26dn%3Dfrozen%2B2013%2B720p%2Bbrrip%2B900mb%2Bmkvcage%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:9D51B42EB769D409F26269BA01CE58E0DD14A7BC&dn=frozen+2013+720p+brrip+900mb+mkvcage&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/9D51B42EB769D409F26269BA01CE58E0DD14A7BC.torrent?title=[kat.cr]frozen.2013.720p.brrip.900mb.mkvcage" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-720p-brrip-900mb-mkvcage-t10726648.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) 720p BRRip 900MB - MkvCage</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/MkvCage/">MkvCage</a> in <span id="cat_10726648"><strong><a href="/movies/">Movies</a> > <a href="/highres-movies/">Highres Movies</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">899.49 <span>MB</span></td>
+                                        <td class="center">1</td>
+                                        <td class="center" title="31 May 2015, 19:59">6&nbsp;months</td>
+                                        <td class="green center">42</td>
+                                        <td class="red lasttd center">9</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen8792999">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8792999,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html#comment">35 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20-%20An%20Original%20Walt%20Disney%20Records%20Soundtrack', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AE46A9E7708AD062DBE509249F4824C8138097495%26dn%3Dfrozen%2Ban%2Boriginal%2Bwalt%2Bdisney%2Brecords%2Bsoundtrack%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:E46A9E7708AD062DBE509249F4824C8138097495&dn=frozen+an+original+walt+disney+records+soundtrack&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/E46A9E7708AD062DBE509249F4824C8138097495.torrent?title=[kat.cr]frozen.an.original.walt.disney.records.soundtrack" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html" class="torType musicType"></a>
+                                                <a href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType musicType">
+                                                    <a href="/frozen-an-original-walt-disney-records-soundtrack-t8792999.html" class="cellMainLink"><strong class="red">Frozen</strong> - An Original Walt Disney Records Soundtrack</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/catparrot/">catparrot</a> in <span id="cat_8792999"><strong><a href="/music/">Music</a> > <a href="/soundtrack/">Soundtrack</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">602.7 <span>MB</span></td>
+                                        <td class="center">61</td>
+                                        <td class="center" title="20 Feb 2014, 14:33">1&nbsp;year</td>
+                                        <td class="green center">32</td>
+                                        <td class="red lasttd center">19</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen8813192">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8813192,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html#comment">20 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20English%20Movies%20DVDRip%20XViD%20Multi%20Subs%20with%20Sample%20~%20%E2%98%BBrDX%E2%98%BB', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A2608B0232D5AD9E70447F724AE9111CEDC8E3405%26dn%3Dfrozen%2B2013%2Benglish%2Bmovies%2Bdvdrip%2Bxvid%2Bmulti%2Bsubs%2Bwith%2Bsample%2Brdx%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:2608B0232D5AD9E70447F724AE9111CEDC8E3405&dn=frozen+2013+english+movies+dvdrip+xvid+multi+subs+with+sample+rdx&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/2608B0232D5AD9E70447F724AE9111CEDC8E3405.torrent?title=[kat.cr]frozen.2013.english.movies.dvdrip.xvid.multi.subs.with.sample.rdx" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-english-movies-dvdrip-xvid-multi-subs-with-sample-rdx-t8813192.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 English Movies DVDRip XViD Multi Subs with Sample ~ ☻rDX☻</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Elite Uploader" class="ka ka-star ka-vul2" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/teamrdx/">teamrdx</a> in <span id="cat_8813192"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">704.82 <span>MB</span></td>
+                                        <td class="center">5</td>
+                                        <td class="center" title="26 Feb 2014, 04:34">1&nbsp;year</td>
+                                        <td class="green center">38</td>
+                                        <td class="red lasttd center">5</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen8351831">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8351831,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html#comment">662 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%202013%20TS%20x264%20AC3-MiLLENiUM', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AF165B9F028B092B2F44E128EB570DB994B0FB6AA%26dn%3Dfrozen%2B2013%2Bts%2Bx264%2Bac3%2Bmillenium%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:F165B9F028B092B2F44E128EB570DB994B0FB6AA&dn=frozen+2013+ts+x264+ac3+millenium&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/F165B9F028B092B2F44E128EB570DB994B0FB6AA.torrent?title=[kat.cr]frozen.2013.ts.x264.ac3.millenium" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-ts-x264-ac3-millenium-t8351831.html" class="cellMainLink"><strong class="red">Frozen</strong> 2013 TS x264 AC3-MiLLENiUM</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <a class="plain" href="/user/Acesn8s/">Acesn8s</a> in <span id="cat_8351831"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">873.14 <span>MB</span></td>
+                                        <td class="center">5</td>
+                                        <td class="center" title="12 Dec 2013, 04:14">1&nbsp;year</td>
+                                        <td class="green center">33</td>
+                                        <td class="red lasttd center">9</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen8517377">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8517377,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html#comment">188 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%5B2013%5D%20DVDScr%20XviD-SaM%5BETRG%5D', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A6B03287DA83A543190D1ECFA947632351F5F0B33%26dn%3Dfrozen%2B2013%2Bdvdscr%2Bxvid%2Bsam%2Betrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:6B03287DA83A543190D1ECFA947632351F5F0B33&dn=frozen+2013+dvdscr+xvid+sam+etrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/6B03287DA83A543190D1ECFA947632351F5F0B33.torrent?title=[kat.cr]frozen.2013.dvdscr.xvid.sam.etrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-dvdscr-xvid-sam-etrg-t8517377.html" class="cellMainLink"><strong class="red">Frozen</strong> [2013] DVDScr XviD-SaM[ETRG]</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/SaM/">SaM</a> in <span id="cat_8517377"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">708.3 <span>MB</span></td>
+                                        <td class="center">5</td>
+                                        <td class="center" title="07 Jan 2014, 23:28">1&nbsp;year</td>
+                                        <td class="green center">32</td>
+                                        <td class="red lasttd center">11</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen10734807">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="10734807,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html#comment">3 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20El%20reino%20del%20hielo%20SPANISH%20ESPA%C3%91OL%20HDRip%20ELITETORRENT', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A12AA6990023EE2D3B0C8A5243C75D66C7E99EAC6%26dn%3Dfrozen%2Bel%2Breino%2Bdel%2Bhielo%2Bspanish%2Bespa%25C3%2591ol%2Bhdrip%2Belitetorrent%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:12AA6990023EE2D3B0C8A5243C75D66C7E99EAC6&dn=frozen+el+reino+del+hielo+spanish+espa%C3%91ol+hdrip+elitetorrent&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/12AA6990023EE2D3B0C8A5243C75D66C7E99EAC6.torrent?title=[kat.cr]frozen.el.reino.del.hielo.spanish.espa%C3%91ol.hdrip.elitetorrent" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html" class="torType filmType"></a>
+                                                <a href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-el-reino-del-hielo-spanish-espaÑol-hdrip-elitetorrent-t10734807.html" class="cellMainLink"><strong class="red">Frozen</strong> El reino del hielo SPANISH ESPAÑOL HDRip ELITETORRENT</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/hkcrew/">hkcrew</a> in <span id="cat_10734807"><strong><a href="/movies/">Movies</a> > <a href="/dubbed-movies/">Dubbed Movies</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">1.92 <span>GB</span></td>
+                                        <td class="center">1</td>
+                                        <td class="center" title="02 Jun 2015, 04:40">6&nbsp;months</td>
+                                        <td class="green center">34</td>
+                                        <td class="red lasttd center">4</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen9020905">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="9020905,0" class="icommentjs kaButton smallButton rightButton" href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html#comment">2 <i class="ka ka-comment"></i></a> <a class="icon16" href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Idina%20Menzel%20%E2%80%93%20Let%20It%20Go%20%28From%20Frozen%29%20%5BArmin%20van%20Buuren%20Remix%5D', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A32D7BFD939DC455DCFD64C76ECF89E375788235C%26dn%3Didina%2Bmenzel%2Blet%2Bit%2Bgo%2Bfrom%2Bfrozen%2Barmin%2Bvan%2Bbuuren%2Bremix%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:32D7BFD939DC455DCFD64C76ECF89E375788235C&dn=idina+menzel+let+it+go+from+frozen+armin+van+buuren+remix&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/32D7BFD939DC455DCFD64C76ECF89E375788235C.torrent?title=[kat.cr]idina.menzel.let.it.go.from.frozen.armin.van.buuren.remix" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html" class="torType musicType"></a>
+                                                <a href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType musicType">
+                                                    <a href="/idina-menzel-let-it-go-from-frozen-armin-van-buuren-remix-t9020905.html" class="cellMainLink">Idina Menzel – Let It Go (From <strong class="red">Frozen</strong>) [Armin van Buuren Remix]</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/pamabego/">pamabego</a> in <span id="cat_9020905"><strong><a href="/music/">Music</a> > <a href="/mp3/">Mp3</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">14.51 <span>MB</span></td>
+                                        <td class="center">1</td>
+                                        <td class="center" title="21 Apr 2014, 16:31">1&nbsp;year</td>
+                                        <td class="green center">23</td>
+                                        <td class="red lasttd center">22</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen10064281">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="10064281,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html#comment">3 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20BDRip%201080p%20ENG-ITA%20x265%20BluRay%20-%20Il%20Regno%20Di%20Ghiaccio', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AAEE029C8D3D0A76D8384376E6C126C2EFE885BBC%26dn%3Dfrozen%2B2013%2Bbdrip%2B1080p%2Beng%2Bita%2Bx265%2Bbluray%2Bil%2Bregno%2Bdi%2Bghiaccio%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:AEE029C8D3D0A76D8384376E6C126C2EFE885BBC&dn=frozen+2013+bdrip+1080p+eng+ita+x265+bluray+il+regno+di+ghiaccio&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/AEE029C8D3D0A76D8384376E6C126C2EFE885BBC.torrent?title=[kat.cr]frozen.2013.bdrip.1080p.eng.ita.x265.bluray.il.regno.di.ghiaccio" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-bdrip-1080p-eng-ita-x265-bluray-il-regno-di-ghiaccio-t10064281.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) BDRip 1080p ENG-ITA x265 BluRay - Il Regno Di Ghiaccio</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <i title="Verified Uploader" class="ka ka-verify" style="font-size: 16px;color:orange;"></i> <a class="plain" href="/user/ShivaShanti/">ShivaShanti</a> in <span id="cat_10064281"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">4.08 <span>GB</span></td>
+                                        <td class="center">1</td>
+                                        <td class="center" title="11 Jan 2015, 11:41">10&nbsp;months</td>
+                                        <td class="green center">31</td>
+                                        <td class="red lasttd center">4</td>
+                                    </tr>
+                                    <tr class="even" id="torrent_frozen8525060">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8525060,0" class="icommentjs kaButton smallButton rightButton" href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html#comment">20 <i class="ka ka-comment"></i></a> <a class="icon16" href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'Frozen%20%282013%29%20DVDScr%20NL%20subs%20DutchReleaseTeam', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3A43D1B1B91D8BC4911EF62440E1E813265BC2AEE2%26dn%3Dfrozen%2B2013%2Bdvdscr%2Bnl%2Bsubs%2Bdutchreleaseteam%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:43D1B1B91D8BC4911EF62440E1E813265BC2AEE2&dn=frozen+2013+dvdscr+nl+subs+dutchreleaseteam&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/43D1B1B91D8BC4911EF62440E1E813265BC2AEE2.torrent?title=[kat.cr]frozen.2013.dvdscr.nl.subs.dutchreleaseteam" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html" class="torType filmType"></a>
+                                                <a href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType filmType">
+                                                    <a href="/frozen-2013-dvdscr-nl-subs-dutchreleaseteam-t8525060.html" class="cellMainLink"><strong class="red">Frozen</strong> (2013) DVDScr NL subs DutchReleaseTeam</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <a class="plain" href="/user/Koedje/">Koedje</a> in <span id="cat_8525060"><strong><a href="/movies/">Movies</a> > <a href="/animation/">Animation</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">887.4 <span>MB</span></td>
+                                        <td class="center">9</td>
+                                        <td class="center" title="08 Jan 2014, 22:10">1&nbsp;year</td>
+                                        <td class="green center">27</td>
+                                        <td class="red lasttd center">5</td>
+                                    </tr>
+                                    <tr class="odd" id="torrent_frozen8320897">
+                                        <td>
+                                            <div class="iaconbox center floatright">
+                                                <a rel="8320897,0" class="icommentjs kaButton smallButton rightButton" href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html#comment">22 <i class="ka ka-comment"></i></a> <a class="icon16" href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html" title="Verified Torrent"><i class="ka ka16 ka-verify ka-green"></i></a> <span data-sc-replace data-sc-slot="_ae58c272c09a10c792c6b17d55c20208" class="none" data-sc-params="{ 'name': 'VA%20-%20Frozen%20%5BSoundtrack%5D%20-%202013%20%28MP3%29%20-%20C4%20%7BGTRG%7D', 'magnet': 'magnet%3A%3Fxt%3Durn%3Abtih%3AA6892632EA49265007B47747B5833568B66F07FB%26dn%3Dva%2Bfrozen%2Bsoundtrack%2B2013%2Bmp3%2Bc4%2Bgtrg%26tr%3Dudp%253A%252F%252Ftracker.publicbt.com%252Fannounce%26tr%3Dudp%253A%252F%252Fglotorrents.pw%253A6969%252Fannounce' }"></span>
+                                                <a data-nop title="Torrent magnet link" href="magnet:?xt=urn:btih:A6892632EA49265007B47747B5833568B66F07FB&dn=va+frozen+soundtrack+2013+mp3+c4+gtrg&tr=udp%3A%2F%2Ftracker.publicbt.com%2Fannounce&tr=udp%3A%2F%2Fglotorrents.pw%3A6969%2Fannounce" class="icon16"><i class="ka ka16 ka-magnet"></i></a>
+                                                <a data-download title="Download torrent file" href="//torcache.net/torrent/A6892632EA49265007B47747B5833568B66F07FB.torrent?title=[kat.cr]va.frozen.soundtrack.2013.mp3.c4.gtrg" class="icon16"><i class="ka ka16 ka-arrow-down"></i></a>
+                                            </div>
+                                            <div class="torrentname">
+                                                <a href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html" class="torType musicType"></a>
+                                                <a href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html" class="normalgrey font12px plain bold"></a>
+                                                <div class="markeredBlock torType musicType">
+                                                    <a href="/va-frozen-soundtrack-2013-mp3-c4-gtrg-t8320897.html" class="cellMainLink">VA - <strong class="red">Frozen</strong> [Soundtrack] - 2013 (MP3) - C4 {GTRG}</a>
+
+                                                    <span class="font11px lightgrey block">
+                                Posted by <a class="plain" href="/user/Kashi2052/">Kashi2052</a> in <span id="cat_8320897"><strong><a href="/music/">Music</a> > <a href="/soundtrack/">Soundtrack</a></strong></span> </span>
+                                                </div>
+                                        </td>
+                                        <td class="nobr center">115.61 <span>MB</span></td>
+                                        <td class="center">39</td>
+                                        <td class="center" title="07 Dec 2013, 09:18">1&nbsp;year</td>
+                                        <td class="green center">27</td>
+                                        <td class="red lasttd center">4</td>
+                                    </tr>
+                                </table>
+                                <div class="pages botmarg5px floatright" baseurl="/usearch/frozen/">
+                                    <a class="turnoverButton siteButton bigButton kaTurnoverButton pagespecify_js" title="Go to a specific page"><i class="ka ka-zoom"></i></a><a class="turnoverButton siteButton bigButton active">1</a><a rel="nofollow" href="/usearch/frozen/2/" class="turnoverButton siteButton bigButton">2</a><a rel="nofollow" href="/usearch/frozen/3/" class="turnoverButton siteButton bigButton">3</a><a rel="nofollow" href="/usearch/frozen/4/" class="turnoverButton siteButton bigButton">4</a><a rel="nofollow" href="/usearch/frozen/5/" class="turnoverButton siteButton bigButton">5</a>
+                                    <a class="turnoverButton siteButton blank nohov"></a><a rel="nofollow" href="/usearch/frozen/77/" class="turnoverButton siteButton bigButton">77</a>
+                                    <script type="text/javascript">
+                                        $(function () {
+                                            if ($('.pages .nohov').length == 0)
+                                                $('.pages .kaTurnoverButton').hide();
+                                        });
+                                        $('.pagespecify_js').unbind('click').on('click', function () {
+                                            var pageNum = prompt('Enter page number');
+                                            if (!isNaN(pageNum) && parseInt(pageNum) > 0) {
+                                                var url = $(this).parent().attr('baseurl');
+                                                var last = $(this).parent().find('a[href]').last();
+                                                var paramStyle = /\/\?page=/.test(last.attr('href')) ? 2 : (/\/\?.*\&page=/.test(last.attr('href')) ? 1 : 0);
+                                                var url_to = paramStyle == 0 || paramStyle == 2 ? (url.substring(0, url.lastIndexOf('/')) + '/' + (paramStyle == 2 ? '?page=' + pageNum + url.substring(url.lastIndexOf('/') + 1).replace(/^\?([^\=]+=)/, '&$1') : pageNum + url.substring(url.lastIndexOf('/')))) : url + '&page=' + pageNum;
+                                                console.log(url_to);
+                                                if (last.is('.ajaxLink')) { // if last button is .ajaxLink then it implies it's being fancyboxed, or at least the destination page(s) should be fancyboxed.
+                                                    $('<a href="' + url_to + '"' + (last.is('[rel="nofollow"]') ? ' rel="nofollow"' : '') + '></a>').fancybox().click();
+                                                } else {
+                                                    location.href = url_to;
+                                                }
+                                            }
+                                        });
+                                    </script>
+                                </div>
+                                </div>
+                                <div class="lightgrey">
+                                    Search for "frozen" on <a href="http://torrentz.eu/search?f=frozen">Torrentz.eu</a>
+                                </div>
+                        </td>
+                        <td class="sidebarCell">
+
+                            <div id="sidebar">
+
+
+                                <span data-sc-slot="_119b0a17fab5493361a252d04bf527db"></span>
+
+
+                                <div class="spareBlock">
+                                    <div class="legend">Advertising (<a href="/auth/login/register/" class="ajaxLink removeAdv" title="Login or register to remove advertising">remove</a>)</div>
+                                    <span data-sc-slot="_7063408f1c01d50e0dc2d833186ce962" data-sc-params="{ 'searchQuery': 'frozen' }"></span>
+                                </div>
+
+
+                                <div class="sliderbox">
+                                    <h3><a href="/community/">Latest Forum Threads</a><i id="hideLatestThreads" class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
+                                    <ul id="latestForum" rel="latestForum" class="showBlockJS">
+                                        <li>
+                                            <a href="/community/show/please-request-ebooks-and-audio-books-here-v12/?unread=17162197">
+                                                <i class="ka ka16 ka-community latest-icon"></i>
+                                                <p class="latest-title">
+                                                    Please request ebooks and audio books here. V12
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by <span class="badgeInline"><span class="online" title="online"></span> <span class="aclColor_1"><a class="plain" href="/user/bcsaturdai/">bcsaturdai</a></span></span>
+                                            <time class="timeago" datetime="2015-12-01T15:16:17+00:00">01 Dec 2015, 15:16</time>
+                                            </span>
+                                        </li>
+                                        <li>
+                                            <a href="/community/show/ask-experienced-encoder-here/?unread=17162196">
+                                                <i class="ka ka16 ka-community latest-icon"></i>
+                                                <p class="latest-title">
+                                                    Ask an Experienced Encoder Here
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by <span class="badgeInline"><span class="online" title="online"></span> <span class="aclColor_1"><a class="plain" href="/user/Arggonawght/">Arggonawght</a></span></span>
+                                            <time class="timeago" datetime="2015-12-01T15:15:57+00:00">01 Dec 2015, 15:15</time>
+                                            </span>
+                                        </li>
+                                        <li>
+                                            <a href="/community/show/rap-discography-s-320-kbps-quality/?unread=17162187">
+                                                <i class="ka ka16 ka-community latest-icon"></i>
+                                                <p class="latest-title">
+                                                    RAP Discography`s in 320 kbps quality
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_eliteuploader"><a class="plain" href="/user/dragan09/">dragan09</a></span></span>
+                                            <time class="timeago" datetime="2015-12-01T15:13:51+00:00">01 Dec 2015, 15:13</time>
+                                            </span>
+                                        </li>
+                                        <li>
+                                            <a href="/community/show/adopt-uploader-program-v12-all-users-help-thread-115043/?unread=17162181">
+                                                <i class="ka ka16 ka-community latest-icon"></i>
+                                                <p class="latest-title">
+                                                    **Adopt an uploader Program v12-- For all Users to Help**
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_1"><a class="plain" href="/user/Uterkof/">Uterkof</a></span></span>
+                                            <time class="timeago" datetime="2015-12-01T15:12:20+00:00">01 Dec 2015, 15:12</time>
+                                            </span>
+                                        </li>
+                                        <li>
+                                            <a href="/community/show/walking-dead-discussion-thread-v2-thread-103224/?unread=17162180">
+                                                <i class="ka ka16 ka-community latest-icon"></i>
+                                                <p class="latest-title">
+                                                    THE WALKING DEAD Discussion Thread V2
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_1"><a class="plain" href="/user/Leroy_Brown/">Leroy_Brown</a></span></span>
+                                            <time class="timeago" datetime="2015-12-01T15:12:18+00:00">01 Dec 2015, 15:12</time>
+                                            </span>
+                                        </li>
+                                        <li>
+                                            <a href="/community/show/flac-and-other-lossless-only-thread/?unread=17162174">
+                                                <i class="ka ka16 ka-community latest-icon"></i>
+                                                <p class="latest-title">
+                                                    FLAC and Other Lossless Only Thread.
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by <span class="badgeInline"><span class="offline" title="offline"></span> <span class="aclColor_verified"><a class="plain" href="/user/andyt1000/">andyt1000</a></span></span>
+                                            <time class="timeago" datetime="2015-12-01T15:11:14+00:00">01 Dec 2015, 15:11</time>
+                                            </span>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <!-- div class="sliderbox" -->
+
+                                <div class="sliderbox">
+                                    <h3><a href="/blog/">Latest News</a><i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
+                                    <ul id="latestNews" rel="latestNews" class="showBlockJS">
+                                        <li>
+                                            <a href="/blog/post/new-site-rules/">
+                                                <i class="ka ka16 ka-rss latest-icon"></i>
+                                                <p class="latest-title">
+                                                    New site Rules
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by KickassTorrents <time class="timeago" datetime="2015-10-15T14:18:43+00:00">15 Oct 2015, 14:18</time></span>
+                                        </li>
+                                        <li>
+                                            <a href="/blog/post/look-mama-i-m-popular/">
+                                                <i class="ka ka16 ka-rss latest-icon"></i>
+                                                <p class="latest-title">
+                                                    Look, mama, I&#039;m popular!
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by KickassTorrents <time class="timeago" datetime="2015-10-05T17:42:40+00:00">05 Oct 2015, 17:42</time></span>
+                                        </li>
+                                        <li>
+                                            <a href="/blog/post/summer-updates-september-1/">
+                                                <i class="ka ka16 ka-rss latest-icon"></i>
+                                                <p class="latest-title">
+                                                    Summer updates [September, 1]
+                                                </p>
+                                            </a>
+                                            <span class="explanation">by KickassTorrents <time class="timeago" datetime="2015-09-01T16:13:36+00:00">01 Sep 2015, 16:13</time></span>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <!-- div class="sliderbox" -->
+                                <div class="sliderbox">
+                                    <h3>Blogroll<i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
+                                    <ul id="blogroll" rel="blogroll" class="showBlockJS">
+                                        <li><a href="/blog/felix56/post/deception-point/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Deception Point</p></a><span class="explanation">by <a class="plain aclColor_1" href="/user/felix56/">felix56</a> <time class="timeago" datetime="2015-12-01T05:32:48+00:00">01 Dec 2015, 05:32</time></span></li>
+                                        <li><a href="/blog/TheDels/post/derek-savage-roasted/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Derek Savage #Roasted</p></a><span class="explanation">by <a class="plain aclColor_1" href="/user/TheDels/">TheDels</a> <time class="timeago" datetime="2015-12-01T05:17:55+00:00">01 Dec 2015, 05:17</time></span></li>
+                                        <li><a href="/blog/Ajay.Ghale/post/li-fi-technology-is-coming-soon-you-are-ready/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Li-Fi Technology Is Coming Soon. You are Ready?</p></a><span class="explanation">by <a class="plain aclColor_1" href="/user/Ajay.Ghale/">Ajay.Ghale</a> <time class="timeago" datetime="2015-12-01T04:06:45+00:00">01 Dec 2015, 04:06</time></span></li>
+                                        <li><a href="/blog/CindyKAT/post/december-original-12-days-of-christmas-25-dec-to-5-jan/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> December - ORIGINAL 12 Days of Christmas 25 Dec. to 5 Jan.</p></a><span class="explanation">by <a class="plain aclColor_2" href="/user/CindyKAT/">CindyKAT</a> <time class="timeago" datetime="2015-11-30T22:35:20+00:00">30 Nov 2015, 22:35</time></span></li>
+                                        <li><a href="/blog/RoughJustice/post/let-me-be-perfectly-clear/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Let Me Be (Perfectly) Clear ...</p></a><span class="explanation">by <a class="plain aclColor_2" href="/user/RoughJustice/">RoughJustice</a> <time class="timeago" datetime="2015-11-30T08:00:56+00:00">30 Nov 2015, 08:00</time></span></li>
+                                        <li><a href="/blog/condoghost/post/torrent-removed-by-the-request-of-copyright-owner-and-not-available-for-download/"><i class="ka ka16 ka-rss latest-icon"></i><p class="latest-title"> Torrent &quot;Removed by the request of copyright owner and not available for download&quot;</p></a><span class="explanation">by <a class="plain aclColor_1" href="/user/condoghost/">condoghost</a> <time class="timeago" datetime="2015-11-29T22:43:06+00:00">29 Nov 2015, 22:43</time></span></li>
+                                    </ul>
+                                </div>
+                                <!-- div class="sliderbox" -->
+
+                                <div class="sliderbox">
+                                    <h3>Goodies<i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
+                                    <ul id="goodies" rel="goodies" class="showBlockJS">
+
+                                        <li>
+                                            <a data-nop target="_blank" rel="external" href="http://addons.mozilla.org/en-US/firefox/addon/11412" target="_blank" rel="external">
+                                                <span class="ifirefox thirdPartIcons"></span>Firefox search plugin
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a data-nop target="_blank" rel="external" href="/content/utorrent.btsearch">
+                                                <span class="iutorrent thirdPartIcons"></span>uTorrent search template
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a data-nop target="_blank" rel="external" href="http://twitter.com/kickasstorrents">
+                                                <span class="ifollow thirdPartIcons"></span>Follow us on Twitter
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a data-nop target="_blank" rel="external" href="/blog/post/30/">
+                                                <span class="ikat thirdPartIcons"></span>Kickass wallpapers
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a data-nop target="_blank" rel="external" href="http://www.facebook.com/official.KAT.fanclub">
+                                                <span class="ifacebook thirdPartIcons"></span>Like us on Facebook
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a data-nop target="_blank" rel="external nofollow" href="http://chat.efnet.org:9090/?channels=%23KAT.ph"><span class="iirc thirdPartIcons"></span>IRC official chat</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <!-- div class="sliderbox" -->
+                                <div class="sliderbox">
+                                    <h3>Latest Searches<i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
+                                    <ul id="latestSearches" rel="latestSearches" class="showBlockJS">
+                                        <li>
+                                            <a href="/search/the%20conjuring%202013/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    the conjuring 2013
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/john%20legend%20all%20of%20me/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    john legend all of me
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/megumi%20shino/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    megumi shino
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/forbidden/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    Forbidden
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/frozen/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    frozen
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/minecraft%20server/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    minecraft server
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/nabokov/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    nabokov
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/greys%20anatomy%20s12e04/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    Greys Anatomy s12e04
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/girls%20gone%20wild/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    Girls Gone Wild
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/alloy%20of%20law/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    alloy of law
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                        <li>
+                                            <a href="/search/battle%20of%20the%20sexes%202015/">
+                                                <i class="ka ka16 ka-zoom latest-icon"></i>
+                                                <p class="latest-title">
+                                                    battle of the sexes 2015
+                                                </p>
+                                            </a>
+                                            <span class="explanation">just&nbsp;now</span>
+                                        </li>
+
+                                    </ul>
+                                </div>
+                                <!-- div class="sliderbox" -->
+                                <div class="sliderbox">
+                                    <h3>Friends Links<i class="sliderBoxToggle ka ka16 ka-arrow2-up foldClose"></i></h3>
+                                    <ul id="friendsLinks" rel="friendsLinks" class="showBlockJS">
+
+                                        <li>
+                                            <a data-nop href="http://torrents.to/" target="_blank" rel="external">
+                                                <span class="itorrentsto thirdPartIcons"></span>Torrents.to
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a data-nop href="http://www.torrentdownloads.net/" target="_blank" rel="external">
+                                                <span class="itorrentdownloads thirdPartIcons"></span>Torrent Downloads
+                                            </a>
+                                        </li>
+
+
+
+
+                                        <li>
+                                            <a data-nop href="http://torrent-finder.info/" target="_blank" rel="external">
+                                                <span class="itorrentfinder thirdPartIcons"></span>Torrent Finder
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <!-- div class="sliderbox" -->
+
+                            </div>
+                            <a class="showSidebar" id="showsidebar" onclick="showSidebar();" style="display:none;"></a>
+
+                        </td>
+                    </tr>
+                </table>
+                <div class="rightcell">
+                </div>
+                <!-- div class="rightcell" -->
+                <div class="leftcell">
+                </div>
+                </div>
+                <div id="translate_site" style="display:none">
+                    <h3>Select Your Language</h3>
+                    <div class="textcontent">
+                        <div style="-moz-column-width: 12em; -moz-columns: 12em; -webkit-columns: 12em; columns:12em;">
+                            <ul>
+                                <li class="current_lang"><a href="#" onclick="setLanguage('en', '.kat.cr');return false;" class="plain"><strong>English</strong></a></li>
+                                <li><a href="#" onclick="setLanguage('af', '.kat.cr');return false;" class="plain">Afrikaans</a></li>
+                                <li><a href="#" onclick="setLanguage('al', '.kat.cr');return false;" class="plain">Albanian</a></li>
+                                <li><a href="#" onclick="setLanguage('ar', '.kat.cr');return false;" class="plain">Arabic (Modern)</a></li>
+                                <li><a href="#" onclick="setLanguage('eu', '.kat.cr');return false;" class="plain">Basque</a></li>
+                                <li><a href="#" onclick="setLanguage('bn', '.kat.cr');return false;" class="plain">Bengali</a></li>
+                                <li><a href="#" onclick="setLanguage('bs', '.kat.cr');return false;" class="plain">Bosnian</a></li>
+                                <li><a href="#" onclick="setLanguage('bsc', '.kat.cr');return false;" class="plain">Bosnian-Cyrillic</a></li>
+                                <li><a href="#" onclick="setLanguage('br', '.kat.cr');return false;" class="plain">Brazilian Portuguese</a></li>
+                                <li><a href="#" onclick="setLanguage('bg', '.kat.cr');return false;" class="plain">Bulgarian</a></li>
+                                <li><a href="#" onclick="setLanguage('ch', '.kat.cr');return false;" class="plain">Chinese Simplified</a></li>
+                                <li><a href="#" onclick="setLanguage('tw', '.kat.cr');return false;" class="plain">Chinese Traditional</a></li>
+                                <li><a href="#" onclick="setLanguage('hr', '.kat.cr');return false;" class="plain">Croatian</a></li>
+                                <li><a href="#" onclick="setLanguage('cz', '.kat.cr');return false;" class="plain">Czech</a></li>
+                                <li><a href="#" onclick="setLanguage('da', '.kat.cr');return false;" class="plain">Danish</a></li>
+                                <li><a href="#" onclick="setLanguage('nl', '.kat.cr');return false;" class="plain">Dutch</a></li>
+                                <li><a href="#" onclick="setLanguage('tl', '.kat.cr');return false;" class="plain">Filipino</a></li>
+                                <li><a href="#" onclick="setLanguage('fi', '.kat.cr');return false;" class="plain">Finnish</a></li>
+                                <li><a href="#" onclick="setLanguage('fr', '.kat.cr');return false;" class="plain">French</a></li>
+                                <li><a href="#" onclick="setLanguage('ka', '.kat.cr');return false;" class="plain">Georgian</a></li>
+                                <li><a href="#" onclick="setLanguage('de', '.kat.cr');return false;" class="plain">German</a></li>
+                                <li><a href="#" onclick="setLanguage('el', '.kat.cr');return false;" class="plain">Greek</a></li>
+                                <li><a href="#" onclick="setLanguage('he', '.kat.cr');return false;" class="plain">Hebrew</a></li>
+                                <li><a href="#" onclick="setLanguage('hi', '.kat.cr');return false;" class="plain">Hindi</a></li>
+                                <li><a href="#" onclick="setLanguage('hu', '.kat.cr');return false;" class="plain">Hungarian</a></li>
+                                <li><a href="#" onclick="setLanguage('id', '.kat.cr');return false;" class="plain">Indonesian</a></li>
+                                <li><a href="#" onclick="setLanguage('it', '.kat.cr');return false;" class="plain">Italian</a></li>
+                                <li><a href="#" onclick="setLanguage('kn', '.kat.cr');return false;" class="plain">Kannada</a></li>
+                                <li><a href="#" onclick="setLanguage('ko', '.kat.cr');return false;" class="plain">Korean</a></li>
+                                <li><a href="#" onclick="setLanguage('lv', '.kat.cr');return false;" class="plain">Latvian</a></li>
+                                <li><a href="#" onclick="setLanguage('lt', '.kat.cr');return false;" class="plain">Lithuanian</a></li>
+                                <li><a href="#" onclick="setLanguage('mk', '.kat.cr');return false;" class="plain">Macedonian</a></li>
+                                <li><a href="#" onclick="setLanguage('ml', '.kat.cr');return false;" class="plain">Malayalam</a></li>
+                                <li><a href="#" onclick="setLanguage('ms', '.kat.cr');return false;" class="plain">Malaysian</a></li>
+                                <li><a href="#" onclick="setLanguage('no', '.kat.cr');return false;" class="plain">Norwegian</a></li>
+                                <li><a href="#" onclick="setLanguage('pr', '.kat.cr');return false;" class="plain">Pirate</a></li>
+                                <li><a href="#" onclick="setLanguage('pl', '.kat.cr');return false;" class="plain">Polish</a></li>
+                                <li><a href="#" onclick="setLanguage('pt', '.kat.cr');return false;" class="plain">Portuguese</a></li>
+                                <li><a href="#" onclick="setLanguage('pa', '.kat.cr');return false;" class="plain">Punjabi</a></li>
+                                <li><a href="#" onclick="setLanguage('ro', '.kat.cr');return false;" class="plain">Romanian</a></li>
+                                <li><a href="#" onclick="setLanguage('ru', '.kat.cr');return false;" class="plain">Russian</a></li>
+                                <li><a href="#" onclick="setLanguage('sr', '.kat.cr');return false;" class="plain">Serbian</a></li>
+                                <li><a href="#" onclick="setLanguage('src', '.kat.cr');return false;" class="plain">Serbian-Cyrillic</a></li>
+                                <li><a href="#" onclick="setLanguage('si', '.kat.cr');return false;" class="plain">Sinhala</a></li>
+                                <li><a href="#" onclick="setLanguage('sk', '.kat.cr');return false;" class="plain">Slovak</a></li>
+                                <li><a href="#" onclick="setLanguage('sl', '.kat.cr');return false;" class="plain">Slovenian</a></li>
+                                <li><a href="#" onclick="setLanguage('es', '.kat.cr');return false;" class="plain">Spanish</a></li>
+                                <li><a href="#" onclick="setLanguage('sv', '.kat.cr');return false;" class="plain">Swedish</a></li>
+                                <li><a href="#" onclick="setLanguage('ta', '.kat.cr');return false;" class="plain">Tamil</a></li>
+                                <li><a href="#" onclick="setLanguage('te', '.kat.cr');return false;" class="plain">Telugu</a></li>
+                                <li><a href="#" onclick="setLanguage('tr', '.kat.cr');return false;" class="plain">Turkish</a></li>
+                                <li><a href="#" onclick="setLanguage('uk', '.kat.cr');return false;" class="plain">Ukrainian</a></li>
+                                <li><a href="#" onclick="setLanguage('ur', '.kat.cr');return false;" class="plain">Urdu</a></li>
+                                <li><a href="#" onclick="setLanguage('vi', '.kat.cr');return false;" class="plain">Vietnamese</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                    <!-- div class="textcontent" -->
+                </div>
+                </div>
+                <!--id="main"-->
+                </div>
+                <!--id="wrap"-->
+
+                <footer class="lightgrey">
+                    <ul>
+                        <li><a class="plain" data-nop href="#translate_site" id="translate_link"><strong>change language</strong></a></li>
+                        <li><a href="/rules/" class="lower">rules</a></li>
+                        <li><a href="/ideabox/">idea box</a></li>
+                        <li class="lower"><a href="/achievements/">Achievements</a></li>
+                        <li><a href="/trends/">trends</a></li>
+                        <li class="lower"><a href="/latest-searches/">Latest Searches</a></li>
+                        <li><a href="/request/">torrent requests</a></li>
+                    </ul>
+                    <ul>
+                        <li><a href="/about/">about</a></li>
+                        <li><a href="/privacy/">privacy</a></li>
+                        <li><a href="/dmca/">dmca</a></li>
+                        <li><a href="/logos/">logos</a></li>
+                        <li><a href="/contacts/">contacts</a></li>
+                        <li><a href="/api/">api</a></li>
+                        <li><a href="https://kastatus.com">KAT status</a></li>
+                        <li><a target="_blank" rel="external nofollow" href="http://chat.efnet.org:9090/?channels=%23KAT.ph">chat</a></li>
+                    </ul>
+                </footer>
+                <a class="feedbackButton eventsButtons" href="/issue/create/" id="feedback"><span>Report a bug</span></a>
+                <span data-sc-slot="_673e31f53f8166159b8e996c4124765b"></span>
+                <span data-sc-slot="_e7050fb15fd39b3e4e99a5be4a57b6ea"></span>
+                <script>
+                    sc('addGlobal', 'pagetype', 'other');
+                </script>
+                <script type="text/javascript">
+                    <!--
+                    document.write("<a style='display:none;' href='http://www.liveinternet.ru/click' " +
+                            "target=_blank><img src='//counter.yadro.ru/hit?t45.6;r" +
+                            escape(document.referrer) + ((typeof (screen) == "undefined") ? "" :
+                                ";s" + screen.width + "*" + screen.height + "*" + (screen.colorDepth ?
+                                    screen.colorDepth : screen.pixelDepth)) + ";u" + escape(document.URL) +
+                            ";h" + escape(document.title.substring(0, 80)) + ";" + Math.random() +
+                            "' alt='' title='LiveInternet' " +
+                            "border='0' width='0' height='0'><\/a>")
+                        //-->
+                </script>
+
+</body>
+
+</html>
+'''
+import bs4
+from ast import literal_eval
+soup = bs4.BeautifulSoup(data)
+
+links = soup.select("div.iaconbox span")
+for span in links:
+    magnet = literal_eval(span["data-sc-params"])
+    print magnet["name"], magnet["magnet"]
+
+# import requests
+#
+# url = "http://www.elitetorrent.net/categoria/1/estrenos/modo:listado/pag:1"
+# browser = requests.Session()
+# page = "1"
+# import bs4
+#
+# response = browser.get( url + page)
+# soup = bs4.BeautifulSoup(response.text)
+# links = soup.select("a.nombre")
+# for link in links:
+#     print link.get("title", ""), link["href"]
+
+# import re
+#
+# datos = re.search("var datos =(.*?);", data, re.DOTALL).group(1).replace("{", "").replace("}", "")
+# params = {}
+# for item in datos.split("\n"):
+#     if item.strip() != "":
+#         key, value = item.strip()[:-1].split(':')
+#         params[key] = value.replace("'", "")
+# #settings.debug(params)
+# opciones = re.search("var options =(.*?);", data, re.DOTALL).group(1).replace("{", "").replace("}", "") + ": ''"
+# params1 = {}
+# for item in opciones.split("\n"):
+#     if item.strip() != "":
+#         key, value = item.strip()[:-1].split(':')
+#         params1[key] = value.replace("'", "")
+# #settings.debug(params1)
+# urlPage = re.search('url: "(.*?)"', data).group(1)
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/test2.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/test2.py
index 57d631c3f004f9f6e24c31388e4df58801b8aba1..cab973e96950169ee75340232deb0ecb46ab9663 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/test2.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.kickass/test2.py
@@ -1 +1 @@
-# coding: utf-8
+# coding: utf-8
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/addon.xml
index fa8f66f153d260bcb4e430bead94ea03bfafde96..8e18910bcae82e891dc293cc6b06dbaa30131656 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.magnetdl" name="[COLOR FF017BD4]MagnetDL[/COLOR] viewer" version="1.2.4"
+<addon id="plugin.video.magnetdl" name="[COLOR FF017BD4]MagnetDL[/COLOR] viewer" version="1.2.5"
        provider-name="mancuniancol">
     <requires>
         <import addon="xbmc.python" version="2.12.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/changelog.txt
index 58b95ee11bdca48c8a3633463772c89a15b46af7..b72c5a1d444ce4c149d90a82b01f6fe97b087ba0 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/changelog.txt
@@ -1,3 +1,4 @@
+Version 1.2.5 Adding Quasar support
 Version 1.2.4 refreshing view
 Version 1.2.3 fixing dialog error
 Version 1.2.2 extended info support
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/main.py
index c465bdb9593b7a909997160bcc69729cb29dbcd0..593011e535bdd9a788ddb5d04ceb96c802a4ead3 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/main.py
@@ -138,7 +138,9 @@ def play(url):
     magnet = url
     # Set-up the plugin
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/main.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/main.pyo
index d433ac34bc0eab574d88d0b5b942c2a27d708b80..f339fd34b613be00593ec903644ab9495e819422 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/main.pyo and b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/main.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/resources/settings.xml
index 541535eaac77fb5083ad62b9869c39a957a0859b..3a0ba7170c7fb70c2e6cee7055a2ba89baffd721 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.magnetdl/resources/settings.xml
@@ -5,8 +5,8 @@
         <setting label="32051" type="folder" id="movieFolder" source="videos" option="writeable" default=""/>
         <setting label="32052" type="folder" id="showFolder" source="videos" option="writeable" default=""/>
         <setting label="32053" type="folder" id="animeFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32045" type="bool" id="viewUrl" default="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/addon.xml
index e1b94abd4124b261dfc51f86c7d73e34f7da2eb6..018fc4d96ffdb24833aa16be5aaf35e4528d588d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.newpct1" name="[COLOR FFFF0000]NewPCT1[/COLOR] viewer" version="1.2.4"
+<addon id="plugin.video.newpct1" name="[COLOR FFFF0000]NewPCT1[/COLOR] viewer" version="1.2.5"
        provider-name="mancuniancol">
     <requires>
         <import addon="xbmc.python" version="2.12.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/changelog.txt
index ae1ff2738db31e8f8d6f3a81f970ea7f276f0441..11abb666a9049719b5e89eded201aed921a7e16b 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/changelog.txt
@@ -1,3 +1,4 @@
+Version 1.2.5 Adding Quasar support
 Version 1.2.4 refreshing view
 Version 1.2.3 fixing dialog error
 Version 1.2.2 Extended info support
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/main.py
index c4e8763cb97210d8bd9772d671e4c4a15da68ed7..e72b5efea0f7319fde4e2c75bc7c7d3cd2dad93a 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/main.py
@@ -181,7 +181,9 @@ def play(url):
     # Set-up the plugin
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
     settings.log("'### %s" % uri_string)
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/main.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/main.pyo
index 5f90ecfe93b33cae6fa0fea1cda8b09eaf5550b3..b94a37806e8a5919f4c5a4160405af30e5987748 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/main.pyo and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/main.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/ayuda.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/ayuda.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aa044b196d53bb8ccd894168fd908761c27e1e1
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/ayuda.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/busqueda-manual.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/busqueda-manual.png
new file mode 100644
index 0000000000000000000000000000000000000000..88f3e6f884fdf1188e9fe06b3bee14b351747af2
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/busqueda-manual.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/estrenos-de-cine.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/estrenos-de-cine.png
new file mode 100644
index 0000000000000000000000000000000000000000..10fc95a3a54f3d6ae21058a953d96ab56ecbdd56
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/estrenos-de-cine.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/otras-peliculas.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/otras-peliculas.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7ac2fb1ac6132a0a9f1a3ff4c3a3a66ca96541d
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/otras-peliculas.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-castellano.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-castellano.png
new file mode 100644
index 0000000000000000000000000000000000000000..532bff08474848a55949d7a751622b23edd56ff6
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-castellano.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-en-3d.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-en-3d.png
new file mode 100644
index 0000000000000000000000000000000000000000..985fa87f690eca4c9063c7750a0e9c2a6d6a0f3b
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-en-3d.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-hd.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-hd.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2f925e5c009d884d552a39cf3ffb4c79f7383f3
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-hd.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-latino.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-latino.png
new file mode 100644
index 0000000000000000000000000000000000000000..3773c78709a95560a112aaf1a19427351c5f1964
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-latino.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-subtituladas.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-subtituladas.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ab7a8095a64cdd0134813f0b7d6f4ff05beb2c3
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/images/peliculas-subtituladas.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/settings.xml
index 762443296ed993da97c62a08b11e8d5281d5f4d3..1d402271af4f658ca86622c2cc907c86948e3e63 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.newpct1/resources/settings.xml
@@ -4,8 +4,8 @@
         <setting label="32093" type="text" id="urlAddress" default="http://www.newpct1.com"/>
         <setting label="32051" type="folder" id="movieFolder" source="videos" option="writeable" default=""/>
         <setting label="32052" type="folder" id="showFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32045" type="bool" id="viewUrl" default="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/addon.xml
index 7996f740c6af0cf12d0e6c2981441ced046e2075..a121f0306f3121871b97dedcab24fab20f0c6f9f 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.pelisalacarta"
     name="pelisalacarta"
-    version="4.0.5"
+    version="4.0.6"
     provider-name="tvalacarta">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
@@ -15,6 +15,11 @@
     <summary lang="en">Movies and TV Shows on demand</summary>
     <description lang="en">Movies, Series, Documentaries, Anime, ... everything you can find on Internet now on your media center. Includes channels in Spanish, Italian and English.</description>
     <platform>all</platform>
+    <license>GNU GPL v3</license>
+    <forum>http://www.mimediacenter.info/foro</forum>
+    <website>http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta</website>
+    <email>tvalacarta@gmail.com</email>
+    <source>https://github.com/tvalacarta/pelisalacarta</source>
   </extension>
   <extension point="xbmc.service" library="library_service.py" start="login|startup">
   </extension>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/animeflv.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/animeflv.py
index a215fe48e6cccfbf61c0231411c8a3eb7bd5d67b..af71080d64f5007ab980a747b3cb7d99b88ca589 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/animeflv.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/animeflv.py
@@ -4,17 +4,18 @@
 # http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
 # ------------------------------------------------------------
 
+import urllib2
 import urlparse
 import re
 import sys
 import os
+import time
 
 from core import logger
 from core import config
 from core import scrapertools
 from core import jsontools
 from core.item import Item
-from lib import requests
 
 DEBUG = config.get_setting("debug")
 
@@ -26,6 +27,12 @@ __language__ = "ES"
 
 host = "http://animeflv.net/"
 
+headers = [
+    ["User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:22.0) Gecko/20100101 Firefox/22.0"],
+    ["Accept-Encoding", "gzip, deflate"],
+    ["Referer", host]
+]
+
 '''
 ### PARA USAR CON TRATK.TV ###
 
@@ -71,12 +78,6 @@ animeflv.data.json
 '''
 
 
-def get_page(url):
-
-    response = requests.get(url)
-    return response.status_code, response.content
-
-
 def isGeneric():
     return True
 
@@ -101,7 +102,7 @@ def mainlist(item):
 def menuseries(item):
     logger.info("pelisalacarta.channels.animeflv menuseries")
 
-    itemlist = list([])
+    itemlist = list()
     itemlist.append(Item(channel=__channel__, action="letras", title="Por orden alfabético",
                          url=urlparse.urljoin(host, "animes/?orden=nombre&mostrar=series")))
     itemlist.append(Item(channel=__channel__, action="generos", title="Por géneros",
@@ -115,7 +116,7 @@ def menuseries(item):
 def menuovas(item):
     logger.info("pelisalacarta.channels.animeflv menuovas")
 
-    itemlist = list([])
+    itemlist = list()
     itemlist.append(Item(channel=__channel__, action="letras", title="Por orden alfabético",
                          url=urlparse.urljoin(host, "animes/?orden=nombre&mostrar=ovas")))
     itemlist.append(Item(channel=__channel__, action="generos", title="Por géneros",
@@ -129,7 +130,7 @@ def menuovas(item):
 def menupeliculas(item):
     logger.info("pelisalacarta.channels.animeflv menupeliculas")
 
-    itemlist = list([])
+    itemlist = list()
     itemlist.append(Item(channel=__channel__, action="letras", title="Por orden alfabético",
                          url=urlparse.urljoin(host, "animes/?orden=nombre&mostrar=peliculas")))
     itemlist.append(Item(channel=__channel__, action="generos", title="Por géneros",
@@ -145,30 +146,22 @@ def letras(item):
 
     itemlist = []
 
-    status_code, data = get_page(item.url)
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(status_code))
-
-    if status_code == requests.codes.ok:
+    data = anti_cloudflare(item.url)
 
-        data = scrapertools.get_match(data, '<div class="alfabeto_box"(.*?)</div>')
-        patron = '<a href="([^"]+)[^>]+>([^<]+)</a>'
-        matches = re.compile(patron, re.DOTALL).findall(data)
+    data = scrapertools.get_match(data, '<div class="alfabeto_box"(.*?)</div>')
+    patron = '<a href="([^"]+)[^>]+>([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
-        for scrapedurl, scrapedtitle in matches:
-            title = scrapertools.entityunescape(scrapedtitle)
-            url = urlparse.urljoin(item.url, scrapedurl)
-            thumbnail = ""
-            plot = ""
-            if DEBUG:
-                logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
+    for scrapedurl, scrapedtitle in matches:
+        title = scrapertools.entityunescape(scrapedtitle)
+        url = urlparse.urljoin(item.url, scrapedurl)
+        thumbnail = ""
+        plot = ""
+        if DEBUG:
+            logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
 
-            itemlist.append(Item(channel=__channel__, action="series", title=title, url=url, thumbnail=thumbnail,
-                                 plot=plot))
-
-    else:
-        itemlist.append(Item(channel=__channel__, action="mainlist",
-                             title="No se ha podido cargar la pagina ERROR:{0}".format(status_code), url="",
-                             thumbnail="", plot=""))
+        itemlist.append(Item(channel=__channel__, action="series", title=title, url=url, thumbnail=thumbnail,
+                             plot=plot))
 
     return itemlist
 
@@ -177,32 +170,22 @@ def generos(item):
     logger.info("pelisalacarta.channels.animeflv generos")
 
     itemlist = []
+    data = anti_cloudflare(item.url)
 
-    status_code, data = get_page(item.url)
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(item.url))
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(status_code))
-
-    if status_code == requests.codes.ok:
+    data = scrapertools.get_match(data, '<div class="generos_box"(.*?)</div>')
+    patron = '<a href="([^"]+)[^>]+>([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
-        data = scrapertools.get_match(data, '<div class="generos_box"(.*?)</div>')
-        patron = '<a href="([^"]+)[^>]+>([^<]+)</a>'
-        matches = re.compile(patron, re.DOTALL).findall(data)
+    for scrapedurl, scrapedtitle in matches:
+        title = scrapertools.entityunescape(scrapedtitle)
+        url = urlparse.urljoin(item.url, scrapedurl)
+        thumbnail = ""
+        plot = ""
+        if DEBUG:
+            logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
 
-        for scrapedurl, scrapedtitle in matches:
-            title = scrapertools.entityunescape(scrapedtitle)
-            url = urlparse.urljoin(item.url, scrapedurl)
-            thumbnail = ""
-            plot = ""
-            if DEBUG:
-                logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
-
-            itemlist.append(Item(channel=__channel__, action="series", title=title, url=url, thumbnail=thumbnail,
-                                 plot=plot))
-
-    else:
-        itemlist.append(Item(channel=__channel__, action="mainlist",
-                             title="No se ha podido cargar la pagina ERROR:{0}".format(status_code), url="",
-                             thumbnail="", plot=""))
+        itemlist.append(Item(channel=__channel__, action="series", title=title, url=url, thumbnail=thumbnail,
+                             plot=plot))
 
     return itemlist
 
@@ -226,46 +209,35 @@ def search(item, texto):
 def novedades(item):
     logger.info("pelisalacarta.channels.animeflv novedades")
 
-    itemlist = []
+    data = anti_cloudflare(item.url)
 
-    status_code, data = get_page(item.url)
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(item.url))
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(status_code))
+    '''
+    <div class="not">
+        <a href="/ver/cyclops-shoujo-saipu-12.html" title="Cyclops Shoujo Saipu 12">
+        <img class="imglstsr lazy" src="http://cdn.animeflv.net/img/mini/957.jpg" border="0">
+        <span class="tit_ep"><span class="tit">Cyclops Shoujo Saipu 12</span></span>
+        </a>
+    </div>
+    '''
 
-    if status_code == requests.codes.ok:
-
-        '''
-        <div class="not">
-            <a href="/ver/cyclops-shoujo-saipu-12.html" title="Cyclops Shoujo Saipu 12">
-            <img class="imglstsr lazy" src="http://cdn.animeflv.net/img/mini/957.jpg" border="0">
-            <span class="tit_ep"><span class="tit">Cyclops Shoujo Saipu 12</span></span>
-            </a>
-        </div>
-        '''
-
-        patronvideos = '<div class="not"[^<]+<a href="([^"]+)" title="([^"]+)"[^<]+<img class="[^"]+" ' \
-                       'src="([^"]+)"[^<]+<span class="tit_ep"><span class="tit">([^<]+)<'
-        matches = re.compile(patronvideos, re.DOTALL).findall(data)
-        itemlist = []
-
-        for match in matches:
-            scrapedtitle = scrapertools.entityunescape(match[3])
-            fulltitle = scrapedtitle
-            # directory = match[1]
-            scrapedurl = urlparse.urljoin(item.url, match[0])
-            scrapedthumbnail = urlparse.urljoin(item.url, match[2].replace("mini", "portada"))
-            scrapedplot = ""
-            if DEBUG:
-                logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(scrapedtitle, scrapedurl,
-                                                                             scrapedthumbnail))
+    patronvideos = '<div class="not"[^<]+<a href="([^"]+)" title="([^"]+)"[^<]+<img class="[^"]+" ' \
+                   'src="([^"]+)"[^<]+<span class="tit_ep"><span class="tit">([^<]+)<'
+    matches = re.compile(patronvideos, re.DOTALL).findall(data)
+    itemlist = []
 
-            itemlist.append(Item(channel=__channel__, action="findvideos", title=scrapedtitle, url=scrapedurl,
-                                 thumbnail=scrapedthumbnail, plot=scrapedplot, fulltitle=fulltitle, viewmode="movie"))
+    for match in matches:
+        scrapedtitle = scrapertools.entityunescape(match[3])
+        fulltitle = scrapedtitle
+        # directory = match[1]
+        scrapedurl = urlparse.urljoin(item.url, match[0])
+        scrapedthumbnail = urlparse.urljoin(item.url, match[2].replace("mini", "portada"))
+        scrapedplot = ""
+        if DEBUG:
+            logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(scrapedtitle, scrapedurl,
+                                                                         scrapedthumbnail))
 
-    else:
-        itemlist.append(Item(channel=__channel__, action="mainlist",
-                             title="No se ha podido cargar la pagina ERROR:{0}".format(status_code), url="",
-                             thumbnail="", plot=""))
+        itemlist.append(Item(channel=__channel__, action="findvideos", title=scrapedtitle, url=scrapedurl,
+                             thumbnail=scrapedthumbnail, plot=scrapedplot, fulltitle=fulltitle, viewmode="movie"))
 
     return itemlist
 
@@ -273,78 +245,67 @@ def novedades(item):
 def series(item):
     logger.info("pelisalacarta.channels.animeflv series")
 
+    data = anti_cloudflare(item.url)
+
+    '''
+    <div class="aboxy_lista">
+        <a href="/ova/nurarihyon-no-mago-ova.html" title="Nurarihyon no Mago OVA">
+            <img class="lazy portada" src="/img/blank.gif"
+                data-original="http://cdn.animeflv.net/img/portada/1026.jpg" alt="Nurarihyon no Mago OVA"/>
+        </a>
+        <span style="float: right; margin-top: 0px;" class="tipo_1"></span>
+        <a href="/ova/nurarihyon-no-mago-ova.html" title="Nurarihyon no Mago OVA" class="titulo">
+            Nurarihyon no Mago OVA
+        </a>
+        <div class="generos_links">
+            <b>Generos:</b>
+            <a href="/animes/genero/accion/">Acci&oacute;n</a>,
+            <a href="/animes/genero/shonen/">Shonen</a>,
+            <a href="/animes/genero/sobrenatural/">Sobrenatural</a>
+        </div>
+        <div class="sinopsis">
+            La historia empieza en alrededor de 100 a&ntilde;os despu&eacute;s de la desaparici&oacute;n de
+            Yamabuki Otome, la primera esposa Rihan Nura. Rihan por fin recobr&oacute; la compostura y la vida
+            vuelve a la normalidad. A medida que la cabeza del Clan Nura, est&aacute; ocupado trabajando en la
+            construcci&oacute;n de un mundo armonioso para los seres humanos y youkai. Un d&iacute;a, &eacute;l
+            ve a Setsura molesta por lo que decide animarla tomando el clan para ir a disfrutar de las aguas
+            termales &hellip;
+        </div>
+    </div>
+    '''
+
+    patron = '<div class="aboxy_lista"[^<]+'
+    patron += '<a href="([^"]+)"[^<]+<img class="[^"]+" src="[^"]+" data-original="([^"]+)"[^<]+</a[^<]+'
+    patron += '<span[^<]+</span[^<]+'
+    patron += '<a[^>]+>([^<]+)</a.*?'
+    patron += '<div class="sinopsis">(.*?)</div'
+    matches = re.compile(patron, re.DOTALL).findall(data)
     itemlist = []
 
-    status_code, data = get_page(item.url)
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(item.url))
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(status_code))
-
-    if status_code == requests.codes.ok:
-
-        '''
-        <div class="aboxy_lista">
-            <a href="/ova/nurarihyon-no-mago-ova.html" title="Nurarihyon no Mago OVA">
-                <img class="lazy portada" src="/img/blank.gif"
-                    data-original="http://cdn.animeflv.net/img/portada/1026.jpg" alt="Nurarihyon no Mago OVA"/>
-            </a>
-            <span style="float: right; margin-top: 0px;" class="tipo_1"></span>
-            <a href="/ova/nurarihyon-no-mago-ova.html" title="Nurarihyon no Mago OVA" class="titulo">
-                Nurarihyon no Mago OVA
-            </a>
-            <div class="generos_links">
-                <b>Generos:</b>
-                <a href="/animes/genero/accion/">Acci&oacute;n</a>,
-                <a href="/animes/genero/shonen/">Shonen</a>,
-                <a href="/animes/genero/sobrenatural/">Sobrenatural</a>
-            </div>
-            <div class="sinopsis">
-                La historia empieza en alrededor de 100 a&ntilde;os despu&eacute;s de la desaparici&oacute;n de
-                Yamabuki Otome, la primera esposa Rihan Nura. Rihan por fin recobr&oacute; la compostura y la vida
-                vuelve a la normalidad. A medida que la cabeza del Clan Nura, est&aacute; ocupado trabajando en la
-                construcci&oacute;n de un mundo armonioso para los seres humanos y youkai. Un d&iacute;a, &eacute;l
-                ve a Setsura molesta por lo que decide animarla tomando el clan para ir a disfrutar de las aguas
-                termales &hellip;
-            </div>
-        </div>
-        '''
-
-        patron = '<div class="aboxy_lista"[^<]+'
-        patron += '<a href="([^"]+)"[^<]+<img class="[^"]+" src="[^"]+" data-original="([^"]+)"[^<]+</a[^<]+'
-        patron += '<span[^<]+</span[^<]+'
-        patron += '<a[^>]+>([^<]+)</a.*?'
-        patron += '<div class="sinopsis">(.*?)</div'
-        matches = re.compile(patron, re.DOTALL).findall(data)
-        itemlist = []
-
-        for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedplot in matches:
-            title = scrapertools.unescape(scrapedtitle)
-            fulltitle = title
-            url = urlparse.urljoin(item.url, scrapedurl)
-            thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
-            plot = scrapertools.htmlclean(scrapedplot)
-            show = title
-            if DEBUG:
-                logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
-            itemlist.append(Item(channel=__channel__, action="episodios", title=title, url=url, thumbnail=thumbnail,
-                                 plot=plot, show=show, fulltitle=fulltitle, fanart=thumbnail,
-                                 viewmode="movies_with_plot", folder=True))
-
-        patron = '<a href="([^"]+)">\&raquo\;</a>'
-        matches = re.compile(patron, re.DOTALL).findall(data)
-        for match in matches:
-            if len(matches) > 0:
-                scrapedurl = urlparse.urljoin(item.url, match)
-                scrapedtitle = ">> Pagina Siguiente"
-                scrapedthumbnail = ""
-                scrapedplot = ""
-
-                itemlist.append(Item(channel=__channel__, action="series", title=scrapedtitle, url=scrapedurl,
-                                     thumbnail=scrapedthumbnail, plot=scrapedplot, folder=True))
-
-    else:
-        itemlist.append(Item(channel=__channel__, action="mainlist",
-                             title="No se ha podido cargar la pagina ERROR:{0}".format(status_code), url="",
-                             thumbnail="", plot=""))
+    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedplot in matches:
+        title = scrapertools.unescape(scrapedtitle)
+        fulltitle = title
+        url = urlparse.urljoin(item.url, scrapedurl)
+        thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
+        plot = scrapertools.htmlclean(scrapedplot)
+        show = title
+        if DEBUG:
+            logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
+        itemlist.append(Item(channel=__channel__, action="episodios", title=title, url=url, thumbnail=thumbnail,
+                             plot=plot, show=show, fulltitle=fulltitle, fanart=thumbnail,
+                             viewmode="movies_with_plot", folder=True))
+
+    patron = '<a href="([^"]+)">\&raquo\;</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    for match in matches:
+        if len(matches) > 0:
+            scrapedurl = urlparse.urljoin(item.url, match)
+            scrapedtitle = ">> Pagina Siguiente"
+            scrapedthumbnail = ""
+            scrapedplot = ""
+
+            itemlist.append(Item(channel=__channel__, action="series", title=scrapedtitle, url=scrapedurl,
+                                 thumbnail=scrapedthumbnail, plot=scrapedplot, folder=True))
 
     return itemlist
 
@@ -353,75 +314,66 @@ def episodios(item):
     logger.info("pelisalacarta.channels.animeflv episodios")
     itemlist = []
 
-    status_code, data = get_page(item.url)
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(item.url))
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(status_code))
-
-    if status_code == requests.codes.ok:
-
-        '''
-        <div class="tit">Listado de episodios <span class="fecha_pr">Fecha Pr&oacute;ximo: 2013-06-11</span></div>
-        <ul class="anime_episodios" id="listado_epis">
-            <li><a href="/ver/aiura-9.html">Aiura 9</a></li>
-            <li><a href="/ver/aiura-8.html">Aiura 8</a></li>
-            <li><a href="/ver/aiura-7.html">Aiura 7</a></li>
-            <li><a href="/ver/aiura-6.html">Aiura 6</a></li>
-            <li><a href="/ver/aiura-5.html">Aiura 5</a></li>
-            <li><a href="/ver/aiura-4.html">Aiura 4</a></li>
-            <li><a href="/ver/aiura-3.html">Aiura 3</a></li>
-            <li><a href="/ver/aiura-2.html">Aiura 2</a></li>
-            <li><a href="/ver/aiura-1.html">Aiura 1</a></li>
-        </ul>
-        '''
-
-        data = scrapertools.get_match(data, '<div class="tit">Listado de episodios.*?</div>(.*?)</ul>')
-        patron = '<li><a href="([^"]+)">([^<]+)</a></li>'
-        matches = re.compile(patron, re.DOTALL).findall(data)
-
-        for scrapedurl, scrapedtitle in matches:
-            title = scrapertools.unescape(scrapedtitle)
-            url = urlparse.urljoin(item.url, scrapedurl)
-            thumbnail = item.thumbnail
-            plot = item.plot
-
-            # TODO crear funcion que pasandole el titulo y buscando en un array de series establezca el valor el nombre
-            # y temporada / capitulo para que funcione con trak.tv
-
-            season = 1
-            episode = 1
-            patron = "{0}{1}".format(re.escape(item.show), "\s+(\d+)")
-            # logger.info("title {0}".format(title))
-            # logger.info("patron {0}".format(patron))
-
-            try:
-                episode = scrapertools.get_match(title, patron)
-                episode = int(episode)
-                # logger.info("episode {0}".format(episode))
-            except IndexError:
-                pass
-            except ValueError:
-                pass
-
-            season, episode = numbered_for_tratk(item.show, season, episode)
-
-            if len(str(episode)) == 1:
-                title = "{0}x0{1}".format(season, episode)
-            else:
-                title = "{0}x{1}".format(season, episode)
-
-            title = "{0} {1}".format(item.show, title)
-
-            if DEBUG:
-                logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
-
-            itemlist.append(Item(channel=__channel__, action="findvideos", title=title, url=url,
-                                 thumbnail=thumbnail, plot=plot, show=item.show, fulltitle="{0} {1}"
-                                 .format(item.show, title), fanart=thumbnail, viewmode="movies_with_plot", folder=True))
-
-    else:
-        itemlist.append(Item(channel=__channel__, action="mainlist",
-                             title="No se ha podido cargar la pagina ERROR:{0}".format(status_code), url="",
-                             thumbnail="", plot=""))
+    data = anti_cloudflare(item.url)
+
+    '''
+    <div class="tit">Listado de episodios <span class="fecha_pr">Fecha Pr&oacute;ximo: 2013-06-11</span></div>
+    <ul class="anime_episodios" id="listado_epis">
+        <li><a href="/ver/aiura-9.html">Aiura 9</a></li>
+        <li><a href="/ver/aiura-8.html">Aiura 8</a></li>
+        <li><a href="/ver/aiura-7.html">Aiura 7</a></li>
+        <li><a href="/ver/aiura-6.html">Aiura 6</a></li>
+        <li><a href="/ver/aiura-5.html">Aiura 5</a></li>
+        <li><a href="/ver/aiura-4.html">Aiura 4</a></li>
+        <li><a href="/ver/aiura-3.html">Aiura 3</a></li>
+        <li><a href="/ver/aiura-2.html">Aiura 2</a></li>
+        <li><a href="/ver/aiura-1.html">Aiura 1</a></li>
+    </ul>
+    '''
+
+    data = scrapertools.get_match(data, '<div class="tit">Listado de episodios.*?</div>(.*?)</ul>')
+    patron = '<li><a href="([^"]+)">([^<]+)</a></li>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+        title = scrapertools.unescape(scrapedtitle)
+        url = urlparse.urljoin(item.url, scrapedurl)
+        thumbnail = item.thumbnail
+        plot = item.plot
+
+        # TODO crear funcion que pasandole el titulo y buscando en un array de series establezca el valor el nombre
+        # y temporada / capitulo para que funcione con trak.tv
+
+        season = 1
+        episode = 1
+        patron = "{0}{1}".format(re.escape(item.show), "\s+(\d+)")
+        # logger.info("title {0}".format(title))
+        # logger.info("patron {0}".format(patron))
+
+        try:
+            episode = scrapertools.get_match(title, patron)
+            episode = int(episode)
+            # logger.info("episode {0}".format(episode))
+        except IndexError:
+            pass
+        except ValueError:
+            pass
+
+        season, episode = numbered_for_tratk(item.show, season, episode)
+
+        if len(str(episode)) == 1:
+            title = "{0}x0{1}".format(season, episode)
+        else:
+            title = "{0}x{1}".format(season, episode)
+
+        title = "{0} {1}".format(item.show, title)
+
+        if DEBUG:
+            logger.info("title=[{0}], url=[{1}], thumbnail=[{2}]".format(title, url, thumbnail))
+
+        itemlist.append(Item(channel=__channel__, action="findvideos", title=title, url=url,
+                             thumbnail=thumbnail, plot=plot, show=item.show, fulltitle="{0} {1}"
+                             .format(item.show, title), fanart=thumbnail, viewmode="movies_with_plot", folder=True))
 
     if config.get_library_support() and len(itemlist) > 0:
         itemlist.append(Item(channel=__channel__, title="Añadir esta serie a la biblioteca de XBMC", url=item.url,
@@ -435,33 +387,22 @@ def episodios(item):
 def findvideos(item):
     logger.info("pelisalacarta.channels.animeflv findvideos")
 
-    itemlist = []
-
-    status_code, data = get_page(item.url)
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(item.url))
-    logger.info("pelisalacarta.channels.animeflv **** {0}".format(status_code))
+    data = anti_cloudflare(item.url)
 
-    if status_code == requests.codes.ok:
+    data = scrapertools.get_match(data, "var videos \= (.*?)$")
+    # logger.info("data={0}".format(data))
 
-        data = scrapertools.get_match(data, "var videos \= (.*?)$")
-        # logger.info("data={0}".format(data))
-
-        itemlist = []
-
-        data = data.replace("\\\\", "")
-        data = data.replace("\\/", "/")
-        logger.info("data={0}".format(data))
+    itemlist = []
 
-        from servers import servertools
-        itemlist.extend(servertools.find_video_items(data=data))
-        for videoitem in itemlist:
-            videoitem.channel = __channel__
-            videoitem.folder = False
+    data = data.replace("\\\\", "")
+    data = data.replace("\\/", "/")
+    logger.info("data={0}".format(data))
 
-    else:
-        itemlist.append(Item(channel=__channel__, action="mainlist",
-                             title="No se ha podido cargar la pagina ERROR:{0}".format(status_code), url="",
-                             thumbnail="", plot=""))
+    from servers import servertools
+    itemlist.extend(servertools.find_video_items(data=data))
+    for videoitem in itemlist:
+        videoitem.channel = __channel__
+        videoitem.folder = False
 
     return itemlist
 
@@ -478,7 +419,7 @@ def test():
         if mainlist_item.action != "search":
             exec("itemlist = "+mainlist_item.action+"(mainlist_item)")
             if len(itemlist) == 0:
-                return false
+                return False
 
     # Comprueba si alguno de los vídeos de "Novedades" devuelve mirrors
     episodios_items = novedades(mainlist_items[0])
@@ -493,6 +434,22 @@ def test():
     return bien
 
 
+def anti_cloudflare(url):
+    # global headers
+
+    try:
+        resp_headers = scrapertools.get_headers_from_response(url, headers=headers)
+        resp_headers = dict(resp_headers)
+    except urllib2.HTTPError, e:
+        resp_headers = e.headers
+
+    if 'refresh' in resp_headers:
+        time.sleep(int(resp_headers['refresh'][:1]))
+        scrapertools.get_headers_from_response(host + '/' + resp_headers['refresh'][7:], headers=headers)
+
+    return scrapertools.cache_page(url, headers=headers)
+
+
 def numbered_for_tratk(show, season, episode):
     """
     Devuelve la temporada y episodio convertido para que se marque correctamente en tratk.tv
@@ -511,7 +468,7 @@ def numbered_for_tratk(show, season, episode):
 
     new_season = season
     new_episode = episode
-    SERIES = {}
+    dict_series = {}
 
     name_file = os.path.splitext(os.path.basename(__file__))[0]
     fname = os.path.join(config.get_data_path(), "channels", name_file + ".data.json")
@@ -523,28 +480,28 @@ def numbered_for_tratk(show, season, episode):
         json_data = jsontools.load_json(data)
 
         if 'SERIES' in json_data:
-            SERIES = json_data['SERIES']
+            dict_series = json_data['SERIES']
 
         # ponemos en minusculas el key, ya que previamente hemos hecho lo mismo con show.
-        for key in SERIES.keys():
+        for key in dict_series.keys():
             new_key = key.lower()
             if new_key != key:
-                SERIES[new_key] = SERIES[key]
-                del SERIES[key]
+                dict_series[new_key] = dict_series[key]
+                del dict_series[key]
 
-    if show in SERIES:
-        logger.info("ha encontrado algo: {0}".format(SERIES[show]))
+    if show in dict_series:
+        logger.info("ha encontrado algo: {0}".format(dict_series[show]))
 
-        if SERIES[show]['total_episode']:
-            for idx, valor in enumerate(SERIES[show]['total_episode']):
+        if dict_series[show]['total_episode']:
+            for idx, valor in enumerate(dict_series[show]['total_episode']):
 
                 if new_episode > valor:
                     new_episode -= valor
-                    new_season = SERIES[show]['season'][idx]
+                    new_season = dict_series[show]['season'][idx]
                     break
 
         else:
-            new_season = SERIES[show]['season']
+            new_season = dict_series[show]['season']
 
     logger.info("pelisalacarta.channels.animeflv numbered_for_tratk: {0}:{1}".format(new_season, new_episode))
     return new_season, new_episode
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/animeflv.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/animeflv.xml
index 024264cab208df709bd0f287bb5c54a69469ca66..f4861d5903000750a5187707363bb6ba245b8bf0 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/animeflv.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/animeflv.xml
@@ -12,9 +12,9 @@
 	<bannermenu>http://media.tvalacarta.info/pelisalacarta/bannermenu/animeflv.png</bannermenu>
 
 	<update_url>https://raw.githubusercontent.com/tvalacarta/pelisalacarta/master/python/main-classic/channels/</update_url>
-	<version>4</version>
-	<date>14/11/2015</date>
-    <changes>añadido mejoras para tratk.tv, si da error al mostrar los resultados, etc</changes>
+	<version>5</version>
+	<date>10/01/2016</date>
+    <changes>se elimina referencia a requests por problemas con otras plataformas, anticloudflare</changes>
 
 	<categories>
 		<category>anime</category>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/beeg.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/beeg.py
index 53c627623ec6b582161695dd6dbb433a5b2a9b33..bfd992cc48cc6748687f63a9ca8ec773f8946ab1 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/beeg.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/beeg.py
@@ -37,9 +37,9 @@ def isGeneric():
 def mainlist(item):
     logger.info("[beeg.py] mainlist")
     itemlist = []
-    itemlist.append( Item(channel=__channel__, action="videos"            , title="Útimos videos"       , url="http://beeg.com/api/v1/index/main/0/pc"))
-    itemlist.append( Item(channel=__channel__, action="listcategorias"    , title="Listado categorias"  , url="http://beeg.com/api/v1/index/main/0/pc"))
-    itemlist.append( Item(channel=__channel__, action="search"            , title="Buscar"              , url="http://beeg.com/api/v1/index/search/0/pc?query=%s" ))
+    itemlist.append( Item(channel=__channel__, action="videos"            , title="Útimos videos"       , url="http://beeg.com/api/v5/index/main/0/pc"))
+    itemlist.append( Item(channel=__channel__, action="listcategorias"    , title="Listado categorias"  , url="http://beeg.com/api/v5/index/main/0/pc"))
+    itemlist.append( Item(channel=__channel__, action="search"            , title="Buscar"              , url="http://beeg.com/api/v5/index/search/0/pc?query=%s" ))
     return itemlist
 
 def videos(item):
@@ -52,12 +52,12 @@ def videos(item):
     
     for Video in JSONData["videos"]:
       thumbnail = "http://img.beeg.com/236x177/" + Video["id"].encode("utf8") +  ".jpg"
-      url = "http://beeg.com/api/v1/video/" + Video["id"].encode("utf8")
+      url = "https://api.beeg.com/api/v5/video/" + Video["id"].encode("utf8")
       title = Video["title"].encode("utf8")
       itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot="", show="", viewmode="movie", folder=True))
       
     #Paginador
-    Actual = int(scrapertools.get_match(item.url,'http://beeg.com/api/v1/index/[^/]+/([0-9]+)/pc'))
+    Actual = int(scrapertools.get_match(item.url,'http://beeg.com/api/v5/index/[^/]+/([0-9]+)/pc'))
     if JSONData["pages"]-1 > Actual:
       scrapedurl = item.url.replace("/"+str(Actual)+"/", "/"+str(Actual+1)+"/")
       itemlist.append( Item(channel=__channel__, action="videos", title="Página Siguiente" , url=scrapedurl , thumbnail="" , folder=True) )
@@ -75,7 +75,7 @@ def listcategorias(item):
     
     
     for Tag in JSONData["tags"]["popular"]:
-      url = "http://beeg.com/api/v1/index/tag/0/pc?tag=" + Tag.encode("utf8")
+      url = "http://beeg.com/api/v5/index/tag/0/pc?tag=" + Tag.encode("utf8")
       title = Tag.encode("utf8")
       title = title[:1].upper() + title[1:]
       itemlist.append( Item(channel=__channel__, action="videos" , title=title , url=url, folder=True))
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/bricocine.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/bricocine.py
index 299b6a209897b35d0c14627c6429d4f327f63804..d5d371abe905e76207563d488b7184ee4e41f67e 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/bricocine.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/bricocine.py
@@ -26,8 +26,6 @@ DEBUG = config.get_setting("debug")
 def get_page( url ):
     
     from lib import requests
-    import requests.packages.urllib3
-    requests.packages.urllib3.disable_warnings()
     response = requests.get( url )
     return response.content
 
@@ -43,6 +41,7 @@ def mainlist(item):
     itemlist.append( Item(channel=__channel__, title="[COLOR sandybrown][B]Pelis DVD-Rip[/B][/COLOR]" , action="peliculas", url="http://www.bricocine.com/c/dvdrip/", thumbnail="http://s6.postimg.org/d2dlld4y9/dvd2.jpg", fanart="http://s6.postimg.org/hcehbq5w1/brico_blue_fan.jpg"))
     itemlist.append( Item(channel=__channel__, title="[COLOR sandybrown][B]Pelis 3D[/B][/COLOR]" , action="peliculas", url="http://www.bricocine.com/c/3d/", thumbnail="http://www.eias3d.com/wp-content/uploads/2011/07/3d2_5.png", fanart="http://s6.postimg.org/u18rvec0h/bric3dd.jpg"))
     import xbmc, time
+    ###Para musica(si hay) y borra customkeys
     if xbmc.Player().isPlaying():
        xbmc.executebuiltin('xbmc.PlayMedia(Stop)')
     TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
@@ -63,9 +62,10 @@ def mainlist(item):
         xbmc.executebuiltin('Action(reloadkeymaps)')
         print "No hay customs"
     
-    itemlist.append( Item(channel=__channel__, title="[COLOR sandybrown][B]Series[/B][/COLOR]"         , action="peliculas", url="http://www.bricocine.com/c/series", thumbnail="http://img0.mxstatic.com/wallpapers/bc795faa71ba7c490fcf3961f3b803bf_large.jpeg", fanart="http://s6.postimg.org/z1ath370x/bricoseries.jpg"))
+    itemlist.append( Item(channel=__channel__, title="[COLOR sandybrown][B]Series[/B][/COLOR]"         , action="peliculas", url="http://www.bricocine.com/c/series", thumbnail="http://img0.mxstatic.com/wallpapers/bc795faa71ba7c490fcf3961f3b803bf_large.jpeg", fanart="http://s6.postimg.org/z1ath370x/bricoseries.jpg",extra="Series"))
     import xbmc, time
     if xbmc.Player().isPlaying():
+       print "PLAYIIING"
        xbmc.executebuiltin('xbmc.PlayMedia(Stop)')
     TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
     KEYMAPDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customkey.xml")
@@ -97,7 +97,7 @@ def mainlist(item):
         print "Custom Trailer.txt borrado"
     except:
         print "No hay Trailer.txt"
-    itemlist.append( Item(channel=__channel__, title="[COLOR sandybrown][B]Buscar[/B][/COLOR]"         , action="search", url="", thumbnail="http://fc04.deviantart.net/fs70/i/2012/285/3/2/poltergeist___tv_wallpaper_by_elclon-d5hmmlp.png", fanart="http://s6.postimg.org/f44w84o5t/bricosearch.jpg", extra = "search"))
+    itemlist.append( Item(channel=__channel__, title="[COLOR sandybrown][B]Buscar[/B][/COLOR]"         , action="search", url="", thumbnail="http://fc04.deviantart.net/fs70/i/2012/285/3/2/poltergeist___tv_wallpaper_by_elclon-d5hmmlp.png", fanart="http://s6.postimg.org/f44w84o5t/bricosearch.jpg", extra ="search"))
     
 
     return itemlist
@@ -107,6 +107,9 @@ def search(item,texto):
     logger.info("pelisalacarta.bricocine search")
     texto = texto.replace(" ","+")
     item.url = "http://www.bricocine.com/index.php/?s=%s" % (texto)
+    print"BUUUSQUEDA"
+    print item.url
+    print item.extra
     try:
         return peliculas(item)
     # Se captura la excepciÛn, para no interrumpir al buscador global si un canal falla
@@ -119,6 +122,7 @@ def search(item,texto):
 def peliculas(item):
     logger.info("pelisalacarta.bricocine peliculas")
     itemlist = []
+    ###Borra customkeys
     import xbmc
     if xbmc.Player().isPlaying():
        xbmc.executebuiltin('xbmc.PlayMedia(Stop)')
@@ -150,42 +154,81 @@ def peliculas(item):
 
     # Descarga la página
     data = get_page( item.url )
+    data = re.sub(r"amp;","",data)
     '''
    <div class="post-10888 post type-post status-publish format-standard hentry category-the-leftovers tag-ciencia-ficcion tag-drama tag-fantasia tag-misterio"><div class="entry"> <a href="http://www.bricocine.com/10888/leftovers-temporada-1/"> <img src="http://www.bricocine.com/wp-content/plugins/wp_movies/files/thumb_185_the_leftovers_.jpg" alt="The Leftovers " /> </a></div><div class="entry-meta"><div class="clearfix"><div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating" class="rating"  title="Puntos IMDB: 7.4"><div class="rating-stars imdb-rating"><div class="stars" style="width:74%"></div></div><div itemprop="ratingValue" class="rating-number"> 7.4</div></div><div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating" class="rating"  title="Puntos Bricocine: 6.2"><div class="rating-stars brico-rating"><div class="stars" style="width:62%"></div></div><div itemprop="ratingValue" class="rating-number"> 6.2</div></div> <span class="vcard author none"> Publicado por <a class="fn" href="" rel="author" target="_blank"></a> </span> <span class="date updated none">2014-10-07T23:36:17+00:00</span></div></div><h2 class="title2 entry-title"> <a href="http://www.bricocine.com/10888/leftovers-temporada-1/"> The Leftovers  &#8211; Temporada 1 </a></h2></div> </article> <article class="hentry item-entry"><div class="post-10088 post type-post status-publish format-standard hentry category-the-last-ship tag-accion tag-ciencia-ficcion tag-drama tag-the tag-thriller"><div class="entry"> <a href="http://www.bricocine.com/10088/last-ship-temporada-1/"> <img src="http://www.bricocine.com/wp-content/plugins/wp_movies/files/thumb_185_the_last_ship_.jpg" alt="The Last Ship " /> </a></div><div class="entry-meta"><div class="clearfix"><div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating" class="rating"  title="Puntos IMDB: 7.4"><div class="rating-stars imdb-rating"><div class="stars" style="width:74%"></div></div><div itemprop="ratingValue" class="rating-number"> 7.4</div></div><div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating" class="rating"  title="Puntos Bricocine: 7.0"><div class="rating-stars brico-rating"><div class="stars" style="width:70%"></div></div><div itemprop="ratingValue" class="rating-number"> 7.0</div></div> <span class="vcard author none"> Publicado por <a class="fn" href="" rel="author" target="_blank"></a> </span> <span class="date updated none">2014-10-07T23:32:25+00:00</span></div></div><h2 class="title2 entry-title"> <a href="http://www.bricocine.com/10088/last-ship-temporada-1/"> The Last Ship &#8211; Temporada 1 </a></h2></div> </article> <article class="hentry item-entry">
 
     '''
-    
-    patron = '<div class="entry"> '
+    patron = '<div class="post.*?format-standard hentry category-(.*?) tag.*?'
+    patron += '<div class="entry"> '
     patron += '<a href="([^"]+)"> '
     patron += '<img src="([^"]+)".*?'
-    patron += 'alt="([^"]+)".*?'
-    patron += 'class="rating-number">([^<]+)</div></div>'
-
+    patron += 'class="rating-number">([^<]+)</div></div>.*?'
+    patron += '<h2 class="title2 entry-title">.*?"> ([^<]+).*?</a>'
+    
     matches = re.compile(patron,re.DOTALL).findall(data)
-    if DEBUG: scrapertools.printMatches(matches)
+    scrapertools.printMatches(matches)
     if len(matches)==0 :
         itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]No hay resultados...[/B][/COLOR]", thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg",folder=False) )
 
-    for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedcreatedate in matches:
-        scrapedcreatedate = scrapedcreatedate.replace(scrapedcreatedate,"[COLOR sandybrown][B]"+scrapedcreatedate+"[/B][/COLOR]")
-        scrapedtitle = scrapedtitle.replace(scrapedtitle,"[COLOR white]"+scrapedtitle+"[/COLOR]")
-        scrapedtitle = scrapedtitle + "(Puntuación:" + scrapedcreatedate + ")"
-        title = scrapedtitle
+    for tag, scrapedurl, scrapedthumbnail, scrapedcreatedate, scrapedtitle in matches:
+        title= scrapedtitle
+        #Separa entre series y peliculas
+        if not item.extra== "Series" and not "index" in item.url:
+           title= re.sub(r"\(.*?\) |\[.*?\] |&#.*?;","",title)
+           try:
+              scrapedyear = scrapertools.get_match(scrapedurl,'.*?www.bricocine.com/.*?/.*?(\d\d\d\d)')
+           except:
+              scrapedyear = ""
+           title_fan = title.strip()
+        if item.extra== "Series" and not "index" in item.url:
+            title= re.sub(r"&#.*?;|Temporada.*?\d+ | Todas las Temporadas |\[.*?\]|\([0-9].*?\)|¡|!","",title)
+            title_fan = title.strip()
+            scrapedyear = ""
+        #Diferencia si viene de la búsqueda
         if "index" in item.url:
-             if "temporada" in scrapedurl:
-                 title = scrapedurl
-                 title= re.sub(r"\http://.*?/.*?/|/|&nbsp;","",title)
-                 title= title.replace("-"," ")
-                 title = title.capitalize()
-                 title= title.replace("temporada","[COLOR green]Temporada[/COLOR]")
-                 title = title.replace	(title,"[COLOR white]"+title+"[/COLOR]")
-                 title = title + "(Puntuación:" + scrapedcreatedate + ")"
-                 if item.extra == "search":
-                     import xbmc
-                     SEARCHDESTFILE= os.path.join(xbmc.translatePath('special://userdata/keymaps'), "search.txt")
-                     urllib.urlretrieve ("https://raw.githubusercontent.com/neno1978/script.palc.forcerefresh/master/search.txt", SEARCHDESTFILE )
-        
-        itemlist.append( Item(channel=__channel__, title=title, url=scrapedurl, action="fanart", thumbnail=scrapedthumbnail, fanart="http://s15.postimg.org/id6ec47vf/bricocinefondo.jpg",  folder=True) )
+             #Se usa tag en busqueda para diferenciar series no bien tipificadas
+             if not "3d" in tag and not "dvdrip" in tag and not "bluray-rip" in tag and not "hd-microhd" in tag and not "bdrip" in tag and not "estrenos" in tag and not "latino" in tag:
+                title= re.sub(r"\n|\r|\t|\s{2}|&nbsp;|&#.*?;|\(.*?\)|\d\d\d\d","",title)
+                title_fan =re.sub(r"\n|\r|\t|\s{2}|&nbsp;|&#.*?;|Temporada.*?\d+| Todas Las Temp.*?das","",title)
+                title= title.replace("Temporada","[COLOR green]Temporada[/COLOR]")
+                title = title.replace	(title,"[COLOR white]"+title+"[/COLOR]")
+                
+                import xbmc
+                #Crea el archivo search.txt.Regula el buen funcionaiento de la música y volver atras en la busqueda
+                SEARCHDESTFILE= os.path.join(xbmc.translatePath('special://userdata/keymaps'), "search.txt")
+                urllib.urlretrieve ("https://raw.githubusercontent.com/neno1978/script.palc.forcerefresh/master/search.txt", SEARCHDESTFILE )
+                item.extra= "Series"
+                scrapedyear= ""
+             else:
+                 
+                 title = scrapedtitle
+                 title= re.sub(r"\(.*?\)|\[.*?\]|&#.*?;|","",scrapedtitle)
+                 title = title.strip()
+                 try:
+                     scrapedyear = scrapertools.get_match(scrapedurl,'.*?www.bricocine.com/.*?/.*?(\d\d\d\d)')
+                 
+                 except:
+                     scrapedyear = ""
+                 print scrapedyear
+                 print item.extra
+                 print "pero quillooooo"
+                 print title
+                 print item.extra
+                 print scrapedcreatedate
+                 title_fan = title.strip()
+                 if item.extra == "Series":
+                    item.extra ="peliculas"
+                 print item.extra
+                 #Crea el archivo search.txt.Regula el buen funcionaiento de la música y volver atras en la busqueda
+                 import xbmc
+                 SEARCHDESTFILE= os.path.join(xbmc.translatePath('special://userdata/keymaps'), "search.txt")
+                 urllib.urlretrieve ("https://raw.githubusercontent.com/neno1978/script.palc.forcerefresh/master/search.txt", SEARCHDESTFILE )
+        scrapedcreatedate = scrapedcreatedate.replace(scrapedcreatedate,"[COLOR sandybrown][B]"+scrapedcreatedate+"[/B][/COLOR]")
+        title = title.replace(title,"[COLOR white]"+title+"[/COLOR]")
+        title = title +"(Puntuación:" + scrapedcreatedate + ")"
+        show = title_fan+"|"+scrapedyear
+        itemlist.append( Item(channel=__channel__, title=title, url=scrapedurl, action="fanart", thumbnail=scrapedthumbnail, fanart="http://s15.postimg.org/id6ec47vf/bricocinefondo.jpg",show= show,extra=item.extra,  folder=True) )
 
     
     ## Paginación
@@ -195,7 +238,7 @@ def peliculas(item):
     try:
         next_page = scrapertools.get_match(data,"<span class='current'>\d+</span><a href='([^']+)'")
         title= "[COLOR red]Pagina siguiente>>[/COLOR]"
-        itemlist.append( Item(channel=__channel__, title=title, url=next_page, action="peliculas", fanart="http://s15.postimg.org/id6ec47vf/bricocinefondo.jpg", thumbnail="http://s7.postimg.org/w2e0nr7hn/pdksiguiente.jpg", folder=True) )
+        itemlist.append( Item(channel=__channel__, title=title, url=next_page, action="peliculas", fanart="http://s15.postimg.org/id6ec47vf/bricocinefondo.jpg",extra= item.extra, thumbnail="http://s7.postimg.org/w2e0nr7hn/pdksiguiente.jpg", folder=True) )
     except: pass
     
     return itemlist
@@ -209,10 +252,27 @@ def fanart(item):
     url = item.url
     data = get_page( item.url )
     data = re.sub(r"\n|\r|\t|\s{2}|\(.*?\)|\[.*?\]|&nbsp;","",data)
+    title= item.show.split("|")[0].strip()
     
-    if "temporada" in item.url:
+   
+    print title
+    print "ya esta bien"
+    print item.extra
+    title= title.replace('á','a')
+    title= title.replace('Á','A')
+    title= title.replace('é','e')
+    title= title.replace('É','E')
+    title= title.replace('í','i')
+    title= title.replace('Í','i')
+    title= title.replace('ó','o')
+    title= title.replace('Ó','o')
+    title= title.replace('ú','u')
+    title= title.replace('Ú','U')
+    title= title.replace('ñ','n')
+    title= title.replace('Ñ','N')
+    if "temporada" in item.url or "Temporada" in item.show.split("|")[0] or item.extra=="Series":
         import xbmc
-        
+        #Establece destino customkey
         SEARCHDESTFILE= os.path.join(xbmc.translatePath('special://userdata/keymaps'), "search.txt")
         TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
         KEYMAPDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customkey.xml")
@@ -220,21 +280,26 @@ def fanart(item):
         APPCOMMANDDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customapp.xml")
         TRAILERDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "trailer.txt")
         
-           
-        title= scrapertools.get_match(data,'<title>(.*?) -')
-        title= re.sub(r"3D|,|#|;|SBS|-|","",title)
-        title= title.replace('Temporada','')
-        title= title.replace('Torrent','')
-        title= title.replace('á','a')
-        title= title.replace('Á','A')
-        title= title.replace('é','e')
-        title= title.replace('í','i')
-        title= title.replace('ó','o')
-        title= title.replace('ú','u')
-        title= title.replace('ñ','n')
-        title= title.replace('Fin','')
-        title= title.replace(' ','%20')
-        title_tunes= title.replace('%20','+')
+        title= re.sub(r"&#.*?;|Temporada.*?\d+ | Todas las Temporadas ","",title)
+        title = title.replace ("&","y")
+        if "Los originales" in title:
+            title = (translate(title,"en"))
+        if title == "Hope":
+           title = "Raising hope"
+        if title == "Invisibles":
+           title = "The whispers"
+        if title == "Secretos y mentiras":
+           title = "Secrets and lies"
+        if title == "Brotherhood":
+           title =title+" "+"comedy"
+        if title == "Las Palomas de Judea":
+           title ="the dovekeepers"
+        if title == "90210 Sensacion de vivir":
+           title ="90210"
+        plot = title
+        title_tunes= (translate(title,"en"))
+        title_tunes = title_tunes.replace("&#39;","")
+        ###Prepara customkeys y borra cuando vuelve
         import xbmc,time
         if not xbmc.Player().isPlaying() and not os.path.exists ( TRAILERDESTFILE ):
             
@@ -257,20 +322,29 @@ def fanart(item):
                print "No hay customs"
 
                try:
+                   ###Busca música serie y caraga customkey. En la vuelta evita busqueda si ya suena música
                    import  xbmc, time
-            
-                   url ="http://www.televisiontunes.com/search.php?q=" + title_tunes
-                   if "Anatomia+de+Grey" in url:
-                       url="http://www.televisiontunes.com/search.php?q=greys+anatomy"
-                   data = scrapertools.cachePage( url )
-                   scrapedurl = scrapertools.get_match(data,'<div class=\'name\'>.*?<li><a href="(.*?)">')
-                   url = "http://www.televisiontunes.com" + scrapedurl
-                   if "Castle" in url :
-                      url = "http://www.televisiontunes.com/Castle_-_Ending.html"
-                   data = scrapertools.cachePage( url )
-                   data = re.sub(r"\n|\r|\t|\s{2}|\(.*?\)|\[.*?\]|&nbsp;","",data)
+                   url_bing ="http://www.bing.com/search?q=%s+theme+song+site:televisiontunes.com" % title_tunes.replace(' ', '+')
+                   
+                   data = scrapertools.cachePage( url_bing)
+                   try:
+                       subdata_tvt = scrapertools.get_match(data,'<li class="b_algo">(.*?)h="ID')
+                   except:
+                       pass
+                   try:
+                      url_tvt = scrapertools.get_match(subdata_tvt,'<a href="(.*?)"')
+                   except:
+                      url_tvt = ""
+                   
+                   if "-theme-songs.html" in url_tvt:
+                       url_tvt = ""
+                   if "http://m.televisiontunes" in url_tvt:
+                       url_tvt= url_tvt.replace ("http://m.televisiontunes","http://televisiontunes")
+                  
+                   data = scrapertools.cachePage( url_tvt )
                    song = scrapertools.get_match(data,'<form name="song_name_form">.*?type="hidden" value="(.*?)"')
                    song = song.replace (" ","%20")
+                   print song
                    xbmc.executebuiltin('xbmc.PlayMedia('+song+')')
                    import xbmc, time
                    TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
@@ -309,71 +383,133 @@ def fanart(item):
             except Exception as inst:
                 xbmc.executebuiltin('Action(reloadkeymaps)')
                 print "No hay customs"
+        ###Busqueda en bing el id de imdb de la serie
+        urlbing_imdb = "http://www.bing.com/search?q=%s+tv+serie+site:imdb.com" % title.replace(' ', '+')
+        data = scrapertools.cachePage(urlbing_imdb)
+        data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+        try:
+           subdata_imdb = scrapertools.get_match(data,'<li class="b_algo">(.*?)h="ID')
+        except:
+           pass
+
 
-        url="http://thetvdb.com/api/GetSeries.php?seriesname=" + title + "&language=es"
-        if "Érase%20una%20vez" in url:
-            url ="http://thetvdb.com/api/GetSeries.php?seriesname=Erase%20una%20vez%20(2011)&language=es"
-        if "Hawaii%20Five%200%20" in url:
-            url ="http://thetvdb.com/api/GetSeries.php?seriesname=hawaii%205.0&language=es"
-        if "The%20Big%20Bang%20Theory" in url:
-            url = "http://thetvdb.com/api/GetSeries.php?seriesname=The%20Big%20Bang%20Theory%20%20&language=es"
-        data = scrapertools.cachePage(url)
+        try:
+            imdb_id = scrapertools.get_match(subdata_imdb,'<a href=.*?http.*?imdb.com/title/(.*?)/.*?"')
+        except:
+            imdb_id = ""
+        ###Busca id de tvdb mediante imdb id
+        urltvdb_remote="http://thetvdb.com/api/GetSeriesByRemoteID.php?imdbid="+imdb_id+"&language=es"
+        data = scrapertools.cachePage(urltvdb_remote)
         data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
         patron = '<Data><Series><seriesid>([^<]+)</seriesid>'
         matches = re.compile(patron,re.DOTALL).findall(data)
-        if len(matches)==0:
-            extra= item.thumbnail
-            show=  item.thumbnail
-            fanart_info = item.thumbnail
-            fanart_trailer = item.thumbnail
-            category= ""
-            itemlist.append( Item(channel=__channel__, title=item.title, url=item.url, action="findvideos", thumbnail=item.thumbnail, fanart=item.thumbnail ,extra=extra, category= category,  show=show , folder=True) )
-        else:
-            #fanart
-            for id in matches:
-                category = id
-                id_serie = id
-                
-                url ="http://thetvdb.com/api/1D62F2F90030C444/series/"+id_serie+"/banners.xml"
-                if "Castle" in title:
-                    url ="http://thetvdb.com/api/1D62F2F90030C444/series/83462/banners.xml"
-                data = scrapertools.cachePage(url)
+        print matches
+        if len(matches)== 0 :
+        ###Si no hay coincidencia busca en tvdb directamente
+
+
+            if ":" in title or "(" in title:
+               
+                title= title.replace(" ","%20")
+                url_tvdb="http://thetvdb.com/api/GetSeries.php?seriesname=" + title + "&language=es"
+                data = scrapertools.cachePage(url_tvdb)
                 data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
-                patron = '<Banners><Banner>.*?<VignettePath>(.*?)</VignettePath>'
+                patron = '<Data><Series><seriesid>([^<]+)</seriesid>'
                 matches = re.compile(patron,re.DOTALL).findall(data)
-                if len(matches)==0:
-                    extra=item.thumbnail
-                    show= item.thumbnail
-                    fanart_info = item.thumbnail
-                    fanart_trailer = item.thumbnail
-                    itemlist.append( Item(channel=__channel__, title=item.title, url=item.url, action="findvideos", thumbnail=item.thumbnail, fanart=item.thumbnail ,category = category, extra=extra, show=show,folder=True) )
+                print "perro"
+                print matches
+                if len(matches)== 0:
+                   title= re.sub(r"(:.*)|\(.*?\)","",title)
+                   title= title.replace(" ","%20")
+                                    
+                   url_tvdb="http://thetvdb.com/api/GetSeries.php?seriesname=" + title + "&language=es"
+                   data = scrapertools.cachePage(url_tvdb)
+                   data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                   patron = '<Data><Series><seriesid>([^<]+)</seriesid>'
+                   matches = re.compile(patron,re.DOTALL).findall(data)
+                    
+                   if len(matches) == 0:
+                      postertvdb = item.thumbnail
+                      extra= "http://s6.postimg.org/6flcihb69/brico1sinopsis.png"
+                      show=  "http://s6.postimg.org/4asrg755b/bricotvshows2.png"
+                      fanart_info = "http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg"
+                      fanart_trailer = "http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg"
+                      category= ""
+                      itemlist.append( Item(channel=__channel__, title=item.title, url=item.url, action="findvideos", thumbnail=item.thumbnail,plot=plot, fanart="http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg" ,extra=extra, category= category,  show=show , folder=True) )
+        
+            else:
+                title= title.replace(" ","%20")
+                url_tvdb="http://thetvdb.com/api/GetSeries.php?seriesname=" + title + "&language=es"
+                data = scrapertools.cachePage(url_tvdb)
+                data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                patron = '<Data><Series><seriesid>([^<]+)</seriesid>'
+                matches = re.compile(patron,re.DOTALL).findall(data)
+                if len(matches) == 0:
+                   postertvdb = item.thumbnail
+                   extra= "http://s6.postimg.org/6flcihb69/brico1sinopsis.png"
+                   show=  "http://s6.postimg.org/4asrg755b/bricotvshows2.png"
+                   fanart_info = "http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg"
+                   fanart_trailer = "http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg"
+                   category= ""
+                   itemlist.append( Item(channel=__channel__, title=item.title, url=item.url, action="findvideos", thumbnail=item.thumbnail,plot=plot, fanart="http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg" ,extra=extra, category= category,  show=show , folder=True) )
+
+        #1ºfanart mediante id tvdb
+        
+        for id in matches:
+            print id
+            category = id
+            id_serie = id
+            print "@@@@"
+            print id
+            urltvdb_banners ="http://thetvdb.com/api/1D62F2F90030C444/series/"+id_serie+"/banners.xml"
+            
+            data = scrapertools.cachePage(urltvdb_banners)
+            data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+            patron = '<Banners><Banner>.*?<VignettePath>(.*?)</VignettePath>'
+            matches = re.compile(patron,re.DOTALL).findall(data)
+            try:
+                #intenta poster tvdb
+                postertvdb = scrapertools.get_match(data,'<Banners><Banner>.*?<BannerPath>posters/(.*?)</BannerPath>')
+                postertvdb =  "http://thetvdb.com/banners/_cache/posters/" + postertvdb
+            except:
+                postertvdb = item.thumbnail
+            print "FOTOOOO"
+            print postertvdb
+            if len(matches)==0:
+                extra="http://s6.postimg.org/6flcihb69/brico1sinopsis.png"
+                show= "http://s6.postimg.org/4asrg755b/bricotvshows2.png"
+                fanart_info = "http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg"
+                fanart_trailer = "http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg"
+                itemlist.append( Item(channel=__channel__, title=item.title, url=item.url, action="findvideos", thumbnail=postertvdb, fanart="http://s6.postimg.org/77fsghaz3/bricotvshows4.jpg" ,plot=plot ,category = category, extra=extra, show=show,folder=True) )
 
             for fan in matches:
                 fanart="http://thetvdb.com/banners/" + fan
-                item.extra= fanart
+                fanart_1= fanart
+                #Busca fanart para info, fanart para trailer y 2ºfanart
                 patron= '<Banners><Banner>.*?<BannerPath>.*?</BannerPath>.*?</Banner><Banner>.*?<BannerPath>(.*?)</BannerPath>.*?</Banner><Banner>.*?<BannerPath>(.*?)</BannerPath>.*?</Banner><Banner>.*?<BannerPath>(.*?)</BannerPath>'
                 matches = re.compile(patron,re.DOTALL).findall(data)
                 if len(matches)==0:
-                    fanart_info= item.extra
-                    fanart_trailer = item.extra
-                    fanart_2 = item.extra
+                    fanart_info= fanart_1
+                    fanart_trailer = fanart_1
+                    fanart_2 = fanart_1
+                    show= fanart_1
+                    extra=postertvdb
+                    itemlist.append( Item(channel=__channel__, title=item.title, url=item.url, action="findvideos", thumbnail=postertvdb, fanart=fanart_1 ,plot=plot ,category = category, extra=extra, show=show,folder=True) )
                 for fanart_info, fanart_trailer, fanart_2 in matches:
                     fanart_info = "http://thetvdb.com/banners/" + fanart_info
                     fanart_trailer = "http://thetvdb.com/banners/" + fanart_trailer
                     fanart_2 = "http://thetvdb.com/banners/" + fanart_2
-            #clearart, fanart_2 y logo
+            #Busqueda de todos loas arts posibles
             for id in matches:
-                url ="http://webservice.fanart.tv/v3/tv/"+id_serie+"?api_key=dffe90fba4d02c199ae7a9e71330c987"
-                if "Castle" in title:
-                    url ="http://webservice.fanart.tv/v3/tv/83462?api_key=dffe90fba4d02c199ae7a9e71330c987"
-                data = scrapertools.cachePage(url)
+                url_fanartv ="http://webservice.fanart.tv/v3/tv/"+id_serie+"?api_key=dffe90fba4d02c199ae7a9e71330c987"
+                data = scrapertools.cachePage(url_fanartv)
                 data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
                 patron = '"clearlogo":.*?"url": "([^"]+)"'
                 matches = re.compile(patron,re.DOTALL).findall(data)
                 if '"tvposter"' in data:
                     tvposter = scrapertools.get_match(data,'"tvposter":.*?"url": "([^"]+)"')
                 if '"tvbanner"' in data:
-                    tvbanner = scrapertools.get_match(data,'"tvbanner":.*?"url": "([^"]+)"')
+                     tvbanner = scrapertools.get_match(data,'"tvbanner":.*?"url": "([^"]+)"')
                 if '"tvthumb"' in data:
                     tvthumb = scrapertools.get_match(data,'"tvthumb":.*?"url": "([^"]+)"')
                 if '"hdtvlogo"' in data:
@@ -381,18 +517,19 @@ def fanart(item):
                 if '"hdclearart"' in data:
                     hdtvclear = scrapertools.get_match(data,'"hdclearart":.*?"url": "([^"]+)"')
                 if len(matches)==0:
-                    if '"hdtvlogo"' in data:
+                   item.thumbnail = postertvdb
+                   if '"hdtvlogo"' in data:
                         if "showbackground" in data:
                             
                             if '"hdclearart"' in data:
-                                 thumbnail = hdtvlogo
-                                 extra=  hdtvclear
-                                 show = fanart_2
+                                thumbnail = hdtvlogo
+                                extra=  hdtvclear
+                                show = fanart_2
                             else:
-                                 thumbnail = hdtvlogo
-                                 extra= thumbnail
-                                 show = fanart_2
-                            itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail, fanart=item.extra, category=category, extra=extra, show=show, folder=True) )
+                                thumbnail = hdtvlogo
+                                extra= thumbnail
+                                show = fanart_2
+                            itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail,plot=plot , fanart=fanart_1, category=category, extra=extra, show=show, folder=True) )
                                 
     
                         else:
@@ -405,31 +542,31 @@ def fanart(item):
                                 extra= thumbnail
                                 show= fanart_2
                             
-                            itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail, fanart=item.extra, extra=extra, show=show,  category= category, folder=True) )
-                    else:
-                        extra=  item.thumbnail
+                            itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail,plot=plot , fanart=fanart_1, extra=extra, show=show,  category= category, folder=True) )
+                   else:
+                        extra=  "http://s6.postimg.org/6flcihb69/brico1sinopsis.png"
                         show = fanart_2
-                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=item.thumbnail, fanart=item.extra, extra=extra, show=show, category = category, folder=True) )
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=item.thumbnail,plot=plot , fanart=fanart_1, extra=extra, show=show, category = category, folder=True) )
                 
             for logo in matches:
                 if '"hdtvlogo"' in data:
                     thumbnail = hdtvlogo
                 elif not '"hdtvlogo"' in data :
-                        if '"clearlogo"' in data:
-                            thumbnail= logo
+                          if '"clearlogo"' in data:
+                               thumbnail= logo
                 else:
-                     thumbnail= item.thumbnail
+                    thumbnail= item.thumbnail
                 if '"clearart"' in data:
                     clear=scrapertools.get_match(data,'"clearart":.*?"url": "([^"]+)"')
                     if "showbackground" in data:
                         
                         extra=clear
                         show= fanart_2
-                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail, fanart=item.extra, extra=extra,show=show, category= category, folder=True) )
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail,plot=plot , fanart=fanart_1, extra=extra,show=show, category= category, folder=True) )
                     else:
-                         extra= clear
-                         show=fanart_2
-                         itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail, fanart=item.extra, extra=extra,show=show, category= category, folder=True) )
+                        extra= clear
+                        show=fanart_2
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail,plot=plot , fanart=fanart_1, extra=extra,show=show, category= category, folder=True) )
                 
                 if "showbackground" in data:
                     
@@ -440,7 +577,7 @@ def fanart(item):
                     else:
                         extra=logo
                         show= fanart_2
-                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail, fanart=item.extra, extra=extra,show=show,  category = category, folder=True) )
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail,plot=plot , fanart=fanart_1, extra=extra,show=show,  category = category, folder=True) )
 
                 if not '"clearart"' in data and not '"showbackground"' in data:
                         if '"hdclearart"' in data:
@@ -449,140 +586,302 @@ def fanart(item):
                         else:
                             extra= thumbnail
                             show=  fanart_2
-                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail, fanart=item.extra, extra=extra,show=show , category = category, folder=True) )
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos", url=item.url, server="torrent", thumbnail=thumbnail,plot=plot , fanart=fanart_1, extra=extra,show=show , category = category, folder=True) )
                 
     else:
-            title= scrapertools.get_match(data,'<title>(.*?)Torrent')
-            title= re.sub(r"3D|SBS|\(.*?\)|\[.*?\]|-|","",title)
-            title= title.replace('á','a')
-            title= title.replace('é','e')
-            title= title.replace('í','i')
-            title= title.replace('ó','o')
-            title= title.replace('ú','u')
-            title= title.replace('Torrent','')
-            title= title.replace(' ','%20')
-            url="http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&query=" + title + "&language=es&include_adult=false"
-            data = get_page( url )
+        ###Películas
+            title= title.decode('utf8').encode('latin1')
+            title = title.replace ("&"," y ")
+            if title == "JustiCia":
+               title ="Justi&cia"
+            if title == "El milagro":
+               title ="Miracle"
+            year = item.show.split("|")[1]
+            print "Mongolo"
+            print item.show.split("|")[1]
+            try:
+                try:
+                    ###Busqueda en Tmdb la peli por titulo y año
+                    title_tmdb = title.replace(" ","%20")
+                    url_tmdb="http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&query=" + title_tmdb +"&year="+year+"&language=es&include_adult=false"
+                    data = scrapertools.cachePage(url_tmdb)
+                    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                    id = scrapertools.get_match(data,'"page":1.*?,"id":(.*?),')
+                except:
+                    if ":" in title or "(" in title:
+                        title_tmdb = title.replace(" ","%20")
+                        url_tmdb="http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&query=" + title_tmdb +"&year="+year+"&language=es&include_adult=false"
+                        data = scrapertools.cachePage(url_tmdb)
+                        data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                        id = scrapertools.get_match(data,'"page":1.*?,"id":(.*?),')
+                    else:
+                       title_tmdb = title.replace(" ","%20")
+                       title_tmdb= re.sub(r"(:.*)|\(.*?\)","",title_tmdb)
+                       url_tmdb="http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&query=" + title_tmdb +"&year="+year+"&language=es&include_adult=false"
+                       data = scrapertools.cachePage(url_tmdb)
+                       data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                       id = scrapertools.get_match(data,'"page":1.*?,"id":(.*?),')
+    
+                    
+            except:
+                ###Si no hay coincidencia realiza busqueda por bing del id Imdb
+                urlbing_imdb="http://www.bing.com/search?q=%s+%s+site:imdb.com" % (title.replace(' ', '+'),  year)
+                print "#####"
+                data = scrapertools.cachePage( urlbing_imdb )
+                try:
+                    subdata_imdb = scrapertools.get_match(data,'<li class="b_algo">(.*?)h="ID')
+                except:
+                    pass
+
+                try:
+                    url_imdb = scrapertools.get_match(subdata_imdb,'<a href="([^"]+)"')
+                
+                except:
+                   pass
+                try:
+                   id_imdb = scrapertools.get_match(url_imdb,'.*?www.imdb.com/.*?/(.*?)/')
+                except:
+                   pass
+                try:
+                    ###Busca id Tmdb mediante el id de Imdb
+                    urltmdb_remote ="https://api.themoviedb.org/3/find/"+id_imdb+"?external_source=imdb_id&api_key=57983e31fb435df4df77afb854740ea9"
+                    data = scrapertools.cachePage(urltmdb_remote)
+                    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                    id = scrapertools.get_match(data,'"movie_results".*?,"id":(\d+)')
+                except:
+                    id = ""
+            ###Llegados aqui ya tenemos(o no) el id(Tmdb);Busca fanart_1
+            urltmdb_fan1 ="http://api.themoviedb.org/3/movie/"+id+"?api_key=57983e31fb435df4df77afb854740ea9"
+            data = scrapertools.cachePage( urltmdb_fan1 )
             data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
-            patron = '"page":1.*?,"id":(.*?),.*?"backdrop_path":"\\\(.*?)"'
+            patron = '"adult".*?"backdrop_path":"(.*?)"'
             matches = re.compile(patron,re.DOTALL).findall(data)
-            if len(matches)==0:
-                extra=item.thumbnail
-                show= item.thumbnail
+            try:
+                ###Prueba poster de Tmdb
+                posterdb = scrapertools.get_match(data,'"adult".*?"poster_path":"(.*?)"')
+                posterdb =  "https://image.tmdb.org/t/p/original" + posterdb
+            except:
                 posterdb = item.thumbnail
-                fanart_info = item.thumbnail
-                fanart_trailer = item.thumbnail
-                category= item.thumbnail
-                itemlist.append( Item(channel=__channel__, title=item.title, url=item.url, action="findvideos_peli", thumbnail=item.thumbnail, fanart=item.thumbnail ,extra=extra, show=show, category= category, folder=True) )
-            
-            else:
-                for id, fan in matches:
+
+
+            if len(matches)==0:
+                ###Si no encuentra fanart_1 en Tmdb realiza busqueda directamente en Imdb
+                try:
+                    urlbing_imdb="http://www.bing.com/search?q=imdb+movie+%s+%s" % (title.replace(' ', '+'),  year)
+                    print "#####"
+                    data = scrapertools.cachePage( urlbing_imdb )
+                    try:
+                        subdata_imdb = scrapertools.get_match(data,'<li class="b_algo">(.*?)h="ID')
+                    except:
+                        pass
                     try:
-                        posterdb = scrapertools.get_match(data,'"page":1,.*?"poster_path":"\\\(.*?)"')
-                        posterdb =  "https://image.tmdb.org/t/p/original" + posterdb
+                       url_imdb = scrapertools.get_match(subdata_imdb,'<a href="([^"]+)"')
                     except:
-                        posterdb = item.thumbnail
+                       url_imdb = data
+                    data = scrapertools.cachePage( url_imdb )
 
-                    fanart="https://image.tmdb.org/t/p/original" + fan
-                    item.extra= fanart
-                    url ="http://api.themoviedb.org/3/movie/"+id+"/images?api_key=57983e31fb435df4df77afb854740ea9"
-                    data = get_page( url )
-                    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                    try:
+                       poster_imdb = scrapertools.get_match(data,'<td rowspan="2" id="img_primary">.*?src="([^"]+)"')
+                       poster_imdb = poster_imdb.replace("._.*?jpg","._V1_SX640_SY720_.jpg")
+                        
+                    except:
+                       poster_imdb = item.thumbnail
+                                
+                                
+                    try:
+                       url_photo=scrapertools.get_match(data,'<div class="combined-see-more see-more">.*?<a href="([^"]+)"')
+                       url_photos = "http://www.imdb.com"+url_photo
+                       data = scrapertools.cachePage( url_photos )
+                       try:
+                          photo_imdb= scrapertools.get_match(data,'<div class="media_index_thumb_list".*?src="([^"]+)"')
+                          photo_imdb = re.sub(r"._.*?jpg","._V1_SX1280_SY720_.jpg",photo_imdb)
                     
-                    patron = '"backdrops".*?"file_path":".*?",.*?"file_path":"(.*?)",.*?"file_path":"(.*?)",.*?"file_path":"(.*?)"'
-                    matches = re.compile(patron,re.DOTALL).findall(data)
+                       except:
+                         photo_imdb= item.thumbnail
+                            
+                       try:
+                          photo_imdb2= scrapertools.get_match(data,'<div class="media_index_thumb_list".*?src=.*?src="([^"]+)"')
+                          photo_imdb2 = re.sub(r"._.*?jpg","._V1_SX1280_SY720_.jpg",photo_imdb2)
+                       except:
+                          photo_imdb2= item.thumbnail
+                       try:
+                          photo_imdb3= scrapertools.get_match(data,'<div class="media_index_thumb_list".*?src=.*?src=.*?src="([^"]+)"')
+                          photo_imdb3 = re.sub(r"._.*?jpg","._V1_SX1280_SY720_.jpg",photo_imdb3)
+                       except:
+                          photo_imdb3= item.thumbnail
+                       try:
+                          photo_imdb4= scrapertools.get_match(data,'<div class="media_index_thumb_list".*?src=.*?src=.*?src=.*?src="([^"]+)"')
+                          photo_imdb4 = re.sub(r"._.*?jpg","._V1_SX1280_SY720_.jpg",photo_imdb4)
+                       except:
+                          photo_imdb4= item.thumbnail
+
+                    except:
+                        pass
+                except:
+                      pass
+                
+                extra="http://s6.postimg.org/6flcihb69/brico1sinopsis.png"#http://4.bp.blogspot.com/-0rYZjLStWrM/TcIqkbq-MaI/AAAAAAAACiM/7_qFGM4WvnA/s1600/BarraSeparadora-Sinopsis.png
+
+                try:
+                   try:
+                      fanart_info = photo_imdb2
+                   except:
+                      try:
+                         fanart_info = photo_imdb
+                      except:
+                        fanart_info = photo_imdb3
+                   try:
+                      fanart_trailer = photo_imdb3
+                   except:
+                         try:
+                            fanart_trailer = photo_imdb
+                         except:
+                            fanart_trailer = photo_imdb2
+
+                   try:
+                      category= photo_imdb3
+                   except:
+                         try:
+                            category = photo_imdb
+                         except:
+                               category = photo_imdb3
+                   try:
+                       fanart = photo_imdb
+                   except:
+                       try:
+                          fanart = photo_imdb2
+                       except:
+                          category = photo_imdb3
+                   try:
+                      show = photo_imdb4
+                   except:
+                          try:
+                             show = photo_imdb2
+                          except:
+                             show= photo_imdb1
+                except:
+                    
+                    fanart = "http://img1.gtsstatic.com/wallpapers/55cb135265088aeee5147c2db20515d8_large.jpeg"
+                    fanart_info = "http://img1.gtsstatic.com/wallpapers/55cb135265088aeee5147c2db20515d8_large.jpeg"
+                    fanart_trailer ="http://img1.gtsstatic.com/wallpapers/55cb135265088aeee5147c2db20515d8_large.jpeg"
+                    category="http://s6.postimg.org/yefi9ccsx/briconofotoventanuco.png" #"http://img1.gtsstatic.com/wallpapers/55cb135265088aeee5147c2db20515d8_large.jpeg"
+                    show= "http://img1.gtsstatic.com/wallpapers/55cb135265088aeee5147c2db20515d8_large.jpeg"
+                itemlist.append( Item(channel=__channel__, title=item.title, url=item.url, action="findvideos_peli", thumbnail=posterdb, fanart=fanart ,extra=extra, show=show, category= category, folder=True) )
+            ###Encontrado fanart_1 en Tmdb
+            for fan in matches:
+
+                fanart="https://image.tmdb.org/t/p/original" + fan
+                fanart_1= fanart
+                ###Busca fanart para info, fanart para trailer y fanart_2(finvideos) en Tmdb
+                urltmdb_images ="http://api.themoviedb.org/3/movie/"+id+"/images?api_key=57983e31fb435df4df77afb854740ea9"
+                data = scrapertools.cachePage(urltmdb_images)
+                data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+            
+                patron = '"backdrops".*?"file_path":".*?",.*?"file_path":"(.*?)",.*?"file_path":"(.*?)",.*?"file_path":"(.*?)"'
+                matches = re.compile(patron,re.DOTALL).findall(data)
                     
+                if len(matches) == 0:
+                    patron = '"backdrops".*?"file_path":"(.*?)",.*?"file_path":"(.*?)",.*?"file_path":"(.*?)"'
+                    matches = re.compile(patron,re.DOTALL).findall(data)
                     if len(matches) == 0:
-                        patron = '"backdrops".*?"file_path":"(.*?)",.*?"file_path":"(.*?)",.*?"file_path":"(.*?)"'
-                        matches = re.compile(patron,re.DOTALL).findall(data)
-                        if len(matches) == 0:
-                           fanart_info = item.extra
-                           fanart_trailer = item.extra
-                           fanart_2 = item.extra
-                    for fanart_info, fanart_trailer, fanart_2 in matches:
-                        fanart_info = "https://image.tmdb.org/t/p/original" + fanart_info
-                        fanart_trailer = "https://image.tmdb.org/t/p/original" + fanart_trailer
-                        fanart_2 = "https://image.tmdb.org/t/p/original" + fanart_2
+                        fanart_info = fanart_1
+                        fanart_trailer = fanart_1
+                        fanart_2 = fanart_1
+                for fanart_info, fanart_trailer, fanart_2 in matches:
+                    fanart_info = "https://image.tmdb.org/t/p/original" + fanart_info
+                    fanart_trailer = "https://image.tmdb.org/t/p/original" + fanart_trailer
+                    fanart_2 = "https://image.tmdb.org/t/p/original" + fanart_2
+                    if fanart_info == fanart:
+                       ###Busca fanart_info en Imdb si coincide con fanart
+                       try:
+                          url_imdbphoto = "http://www.imdb.com/title/"+id_imdb+"/mediaindex"
+                          photo_imdb= scrapertools.get_match(url_imdbphoto,'<div class="media_index_thumb_list".*?src="([^"]+)"')
+                          photo_imdb = photo_imdb.replace("@._V1_UY100_CR25,0,100,100_AL_.jpg","@._V1_SX1280_SY720_.jpg")
+                          fanart_info = photo_imdb
+                       except:
+                          fanart_info = fanart_2
+                    
+
                     
-            #fanart_2 y arts
+                #Busqueda de todos los arts posibles
             
-                    url ="http://webservice.fanart.tv/v3/movies/"+id+"?api_key=dffe90fba4d02c199ae7a9e71330c987"
-                    data = scrapertools.cachePage(url)
-                    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
-                    patron = '"hdmovielogo":.*?"url": "([^"]+)"'
-                    matches = re.compile(patron,re.DOTALL).findall(data)
-                    if '"moviedisc"' in data:
-                        disc = scrapertools.get_match(data,'"moviedisc":.*?"url": "([^"]+)"')
-                    if '"movieposter"' in data:
-                        poster = scrapertools.get_match(data,'"movieposter":.*?"url": "([^"]+)"')
-                    if '"moviethumb"' in data:
-                        thumb = scrapertools.get_match(data,'"moviethumb":.*?"url": "([^"]+)"')
-                    if '"moviebanner"' in data:
-                        banner= scrapertools.get_match(data,'"moviebanner":.*?"url": "([^"]+)"')
-
-                    if len(matches)==0:
-                       extra= posterdb
-                       show = fanart_2
-                       category = item.extra
-                       itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=posterdb, fanart=item.extra,  extra=extra, show=show, category= category, folder=True) )
-                for logo in matches:
-                    if '"hdmovieclearart"' in data:
-                         clear=scrapertools.get_match(data,'"hdmovieclearart":.*?"url": "([^"]+)"')
-                         if '"moviebackground"' in data:
-                             extra=clear
-                             show= fanart_2
-                             if '"moviebanner"' in data:
-                                  category= banner
-                             else:
-                                  category= clear
-                             itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=logo, fanart=item.extra, extra=extra,show=show, category= category, folder=True) )
-                         else:
-                             extra= clear
-                             show=fanart_2
-                             if '"moviebanner"' in data:
-                                 category = banner
-                             else:
-                                 category = clear
-                             itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=logo, fanart=item.extra, extra=extra,show=show, category= category, folder=True) )
+                url_fanartv ="http://webservice.fanart.tv/v3/movies/"+id+"?api_key=dffe90fba4d02c199ae7a9e71330c987"
+                data = scrapertools.cachePage(url_fanartv)
+                data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                patron = '"hdmovielogo":.*?"url": "([^"]+)"'
+                matches = re.compile(patron,re.DOTALL).findall(data)
+                if '"moviedisc"' in data:
+                    disc = scrapertools.get_match(data,'"moviedisc":.*?"url": "([^"]+)"')
+                if '"movieposter"' in data:
+                    poster = scrapertools.get_match(data,'"movieposter":.*?"url": "([^"]+)"')
+                if '"moviethumb"' in data:
+                    thumb = scrapertools.get_match(data,'"moviethumb":.*?"url": "([^"]+)"')
+                if '"moviebanner"' in data:
+                    banner= scrapertools.get_match(data,'"moviebanner":.*?"url": "([^"]+)"')
 
+                if len(matches)==0:
+                    extra= "http://s6.postimg.org/6flcihb69/brico1sinopsis.png"
+                    show = fanart_2
+                    category = fanart_1
+                    itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=posterdb, fanart=fanart,  extra=extra, show=show, category= category, folder=True) )
+            for logo in matches:
+                if '"hdmovieclearart"' in data:
+                    clear=scrapertools.get_match(data,'"hdmovieclearart":.*?"url": "([^"]+)"')
                     if '"moviebackground"' in data:
+                        extra=clear
+                        show= fanart_2
+                        if '"moviebanner"' in data:
+                            category= banner
+                        else:
+                            category= clear
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=logo, fanart=fanart_1, extra=extra,show=show, category= category, folder=True) )
+                    else:
+                        extra= clear
+                        show=fanart_2
+                        if '"moviebanner"' in data:
+                            category = banner
+                        else:
+                            category = clear
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=logo, fanart=fanart_1, extra=extra,show=show, category= category, folder=True) )
+
+                if '"moviebackground"' in data:
                         
-                        if '"hdmovieclearart"' in data:
-                            clear=scrapertools.get_match(data,'"hdmovieclearart":.*?"url": "([^"]+)"')
-                            extra=clear
-                            show= fanart_2
-                            if '"moviebanner"' in data:
-                                category= banner
-                            else:
-                                category= clear
+                    if '"hdmovieclearart"' in data:
+                        clear=scrapertools.get_match(data,'"hdmovieclearart":.*?"url": "([^"]+)"')
+                        extra=clear
+                        show= fanart_2
+                        if '"moviebanner"' in data:
+                            category= banner
+                        else:
+                            category= clear
                     
+                    else:
+                        extra=logo
+                        show= fanart_2
+                        if '"moviebanner"' in data:
+                            category= banner
                         else:
-                            extra=logo
-                            show= fanart_2
-                            if '"moviebanner"' in data:
-                                category= banner
-                            else:
-                                category= logo
-                            itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=logo, fanart=item.extra, extra=extra,show=show, category= category,  folder=True) )
+                            category= logo
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=logo, fanart=fanart_1, extra=extra,show=show, category= category,  folder=True) )
         
-                    if not '"hdmovieclearart"' in data and not '"moviebackground"' in data:
-                            extra= logo
-                            show=  fanart_2
-                            if '"moviebanner"' in data:
-                                category= banner
-                            else:
-                                category= item.extra
-                            itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=logo, fanart=item.extra,category= category, extra=extra,show=show ,  folder=True) )
-    
+                if not '"hdmovieclearart"' in data and not '"moviebackground"' in data:
+                        extra= logo
+                        show=  fanart_2
+                        if '"moviebanner"' in data:
+                            category= banner
+                        else:
+                            category= extra
+                        itemlist.append( Item(channel=__channel__, title = item.title , action="findvideos_peli", url=item.url, server="torrent", thumbnail=logo, fanart=fanart_1,category= category, extra=extra,show=show ,  folder=True) )
+    ####Info item. Se añade item.show.split("|")[0] and item.extra != "Series" para salvar el error de cuando una serie no está perfectamente tipificada como tal en Bricocine
     title ="Info"
     title = title.replace(title,"[COLOR skyblue]"+title+"[/COLOR]")
-    if not "temporada" in item.url:
+    if not "temporada" in item.url and not "Temporada" in item.show.split("|")[0] and item.extra != "Series":
        thumbnail = posterdb
-    if "temporada" in item.url:
+    if "temporada" in item.url or "Temporada" in item.show.split("|")[0] or  item.extra == "Series":
         if '"tvposter"' in data:
             thumbnail= tvposter
         else:
-            thumbnail = item.thumbnail
+            thumbnail = postertvdb
         
         if "tvbanner" in data:
             category = tvbanner
@@ -592,19 +891,13 @@ def fanart(item):
 
     itemlist.append( Item(channel=__channel__, action="info" , title=title , url=item.url, thumbnail=thumbnail, fanart=fanart_info, show= show, extra= extra, category= category, folder=False ))
 
-
+    ####Trailer item
     title= "[COLOR crimson]Trailer[/COLOR]"
-    
-    if len(item.extra)==0:
-       fanart=item.thumbnail
-    else:
-        fanart = item.extra
-
-    if "temporada" in item.url:
+    if "temporada" in item.url or "Temporada" in item.show.split("|")[0] or item.extra == "Series":
         if '"tvthumb"' in data:
             thumbnail = tvthumb
         else:
-           thumbnail = item.thumbnail
+           thumbnail = postertvdb
         if '"tvbanner"' in data:
             extra= tvbanner
         elif '"tvthumb"' in data:
@@ -635,12 +928,14 @@ def findvideos(item):
     logger.info("pelisalacarta.bricocine findvideos")
     
     itemlist = []
+    ###Ubicacion Customkey
     import xbmc, time
     SEARCHDESTFILE= os.path.join(xbmc.translatePath('special://userdata/keymaps'), "search.txt")
     TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
     KEYMAPDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customkey.xml")
     REMOTEDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "remote.xml")
     APPCOMMANDDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customapp.xml")
+    ###Carga Customkey en Finvideos cuando se trata de una busqueda
     if  xbmc.Player().isPlaying():
         if not os.path.exists ( TESTPYDESTFILE ):
            import xbmc
@@ -653,7 +948,8 @@ def findvideos(item):
            xbmc.executebuiltin('Action(reloadkeymaps)')
 
     data = get_page( item.url )
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;| - REPARADO","",data)
+    ###Borra Customkey cuando no hay música
     import xbmc, time
     if not xbmc.Player().isPlaying():
         TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
@@ -674,87 +970,332 @@ def findvideos(item):
             xbmc.executebuiltin('Action(reloadkeymaps)')
             print "No hay customs"
     
-
-    
-
-    #id_torrent = scrapertools.get_match(item.url,"(\d+)-")
-    
-    patron = '<span class="title">([^<]+)- (\d)(\d+)([^<]+).*?'
-    patron += 'id="([^"]+)" href="([^"]+)".*?'
-    
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    if len(matches)==0:
+    ###Busca video cuando hay torrents y magnet en la serie
+    if 'id="magnet"' in data:
+        if 'id="file"' in data:
+            bloque_capitulos= scrapertools.get_match(data,'<table class="table table-series">(.*?)<span class="block mtop clearfix">')
+            patron = '<span class="title">([^<]+)-.*?(\d)(\d+)([^<]+)</span></td>.*?'
+            patron += 'id="([^"]+)".*?href="([^"]+)".*?id="([^"]+)" href="([^"]+)"'
+            matches = re.compile(patron,re.DOTALL).findall(bloque_capitulos)
+            if len(matches)==0:
+               show = item.show
+               extra = item.thumbnail
+               ###Se identifica como serie respetando en anterior item.category
+               category = item.category+"|"+"series"
+               itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]Ooops!! Algo no va bien,pulsa para ser dirigido a otra busqueda, ...[/B][/COLOR]",action="findvideos_peli", url=item.url, thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg", extra=extra, show=show, category=category,plot = item.plot, folder=True) )
+            import base64
+            for title_links, seasson, epi, calidad, title_torrent, url_torrent,title_magnet, url_magnet in matches:
+                try:
+                   season=scrapertools.get_match(data,'<title>.*?Temporada.*?(\d+).*?Torrent')
+                except:
+                   ###Busqueda de season el las series que no vienen bien tipificadas como tal
+                   season=scrapertools.get_match(data,'<span class="title">.*?-.*?(\d+)x')
+                epi=re.sub(r"101|201|301|401|501|601|701|801|901","01",epi)
+                epi=re.sub(r"102|202|302|402|502|602|702|802|902","02",epi)
+                epi=re.sub(r"103|203|303|403|503|603|703|803|903","03",epi)
+                epi=re.sub(r"104|204|304|404|504|604|704|804|904","04",epi)
+                epi=re.sub(r"105|205|305|405|505|605|705|805|905","05",epi)
+                epi=re.sub(r"106|206|306|406|506|606|706|806|906","06",epi)
+                epi=re.sub(r"107|207|307|407|507|607|707|807|907","07",epi)
+                epi=re.sub(r"108|208|308|408|508|608|708|808|908","08",epi)
+                epi=re.sub(r"109|209|309|409|509|609|709|809|909","09",epi)
+                epi=re.sub(r"110|210|310|410|510|610|710|810|910","10",epi)
+                epi=re.sub(r"111|211|311|411|511|611|711|811|911","11",epi)
+                epi=re.sub(r"112|212|312|412|512|612|712|812|912","12",epi)
+                epi=re.sub(r"113|213|313|413|513|613|713|813|913","13",epi)
+                epi=re.sub(r"114|214|314|414|514|614|714|814|914","14",epi)
+                epi=re.sub(r"115|215|315|415|515|615|715|815|915","15",epi)
+                epi=re.sub(r"116|216|316|416|516|616|716|816|916","16",epi)
+                epi=re.sub(r"117|217|317|417|517|617|717|817|917","17",epi)
+                epi=re.sub(r"118|218|318|418|518|618|718|818|918","18",epi)
+                epi=re.sub(r"119|219|319|419|519|619|719|819|919","19",epi)
+                epi=re.sub(r"120|220|320|420|520|620|720|820|920","20",epi)
+                epi=re.sub(r"121|221|321|421|521|621|721|821|921","21",epi)
+                epi=re.sub(r"122|222|322|422|522|622|722|822|922","22",epi)
+                epi=re.sub(r"123|223|323|423|523|623|723|823|923","23",epi)
+                epi=re.sub(r"124|224|324|424|524|624|724|824|924","24",epi)
+                epi=re.sub(r"125|225|325|425|525|625|725|825|925","25",epi)
+                epi=re.sub(r"126|226|326|426|526|626|726|826|926","26",epi)
+                epi=re.sub(r"127|227|327|427|527|627|727|827|927","27",epi)
+                epi=re.sub(r"128|228|328|428|528|628|728|828|928","28",epi)
+                epi=re.sub(r"129|229|329|429|529|629|729|829|929","29",epi)
+                epi=re.sub(r"130|230|330|430|530|630|730|830|930","30",epi)
+        
+                seasson_epi = season+"x"+epi
+                seasson_epi = seasson_epi.replace(seasson_epi,"[COLOR sandybrown]"+seasson_epi+"[/COLOR]")
+                ###Ajuste de episodio para info_epi
+                if "x0" in seasson_epi:
+                   epi = epi.replace("0","")
+            
+                title_links = title_links.replace("\\'s","'s")
+                title_torrent = "["+title_torrent.replace("file","torrent")+"]"
+                title_torrent = title_torrent.replace(title_torrent,"[COLOR green]"+title_torrent+"[/COLOR]")
+                title_magnet = "["+"magnet"+"]"
+                title_magnet = "[COLOR red]Opción[/COLOR]"+" "+ title_magnet.replace(title_magnet,"[COLOR crimson]"+title_magnet+"[/COLOR]")
+                calidad = calidad.replace(calidad,"[COLOR sandybrown]"+calidad+"[/COLOR]")
+                title_links = title_links.replace(title_links,"[COLOR orange]"+title_links+"[/COLOR]")
+                title_torrent = title_links+" "+seasson_epi+calidad+"- "+title_torrent
+                url_torrent = base64.decodestring(url_torrent.split('&u=')[1][::-1])
+                url_magnet = base64.decodestring(url_magnet.split('&u=')[1][::-1])
+                title_links = re.sub(r"\n|\r|\t|\s{2}|\(.*?\)|\[.*?\]|&nbsp;|REPARADO","",title_links)
+                title_links= title_links.replace('\[.*?\]','')
+                title_links= title_links.replace('á','a')
+                title_links= title_links.replace('Á','A')
+                title_links= title_links.replace('é','e')
+                title_links= title_links.replace('í','i')
+                title_links= title_links.replace('ó','o')
+                title_links= title_links.replace('ú','u')
+                title_links= title_links.replace(' ','%20')
+                
+                
+                extra = season+"|"+title_links+"|"+epi
+                if "sinopsis.png" in item.extra:
+                    item.extra =item.thumbnail
+                if "bricotvshows2.png" in item.show:
+                    item.show = item.fanart
+                    
+                itemlist.append( Item(channel=__channel__, title = title_torrent , action="episodios", url=url_torrent, thumbnail=item.extra, fanart=item.show,plot=item.plot , extra=extra, category= item.category, folder=True) )
+                itemlist.append( Item(channel=__channel__, title = title_magnet , action="episodios", url=url_magnet, thumbnail=item.extra, fanart=item.show, extra=extra,plot=item.plot , category= item.category, folder=True) )
+            try:
+               ###Comprueba si, aparte de cápitulos torrent/magnet hay algun torrent suelto sin magnet
+               checktorrent=scrapertools.get_match(data,'id="magnet".*?Descargar .torrent<\/a><\/li><\/ul><\/td><\/tr><tr><td><span class="title">.*?rel="nofollow">(.*?)<\/a><\/li><\/ul><\/td><\/tr><tr><td>')
+            except:
+               checktorrent= ""
+            ###Busqueda Torrent si los encuentra sueltos
+            if checktorrent == "Descargar .torrent":
+               torrent_bloque =scrapertools.get_match(data,'id="file".*?id="magnet".*?<span class="title">.*?<a id="file".*?a id="file".*?class="btn btn-primary".*?d="file"(.*?class="btn btn-primary".*?)</table>')
+               
+               patron = '<span class="title">([^<]+)- (\d)(\d+)([^<]+).*?'
+               patron += 'id="file".*?href="([^"]+)"'
+               matches = re.compile(patron,re.DOTALL).findall(torrent_bloque)
+               if len(matches)==0:
+                  show = item.show
+                  extra = item.thumbnail
+                  category = item.category+"|"+"series"
+                  print "extraaaa"
+                  print item.thumbnail
+                  itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]Ooops!! Algo no va bien,pulsa para ser dirigido a otra busqueda, ...[/B][/COLOR]",action="findvideos_peli", url=item.url, thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg", extra=extra, show=show, category=category,plot = item.plot, folder=True) )
+                                                
+               import base64
+                
+               for title_links, seasson, epi, calidad, url_torrent in matches:
+               ## torrent
+                   try:
+                       season=scrapertools.get_match(data,'<title>.*?Temporada.*?(\d+).*?Torrent')
+                   except:
+                       ###Busqueda de season el las series que no vienen bien tipificadas como tal
+                       season=scrapertools.get_match(data,'<span class="title">.*?-.*?(\d+)x')
+                   epi=re.sub(r"101|201|301|401|501|601|701|801|901","01",epi)
+                   epi=re.sub(r"102|202|302|402|502|602|702|802|902","02",epi)
+                   epi=re.sub(r"103|203|303|403|503|603|703|803|903","03",epi)
+                   epi=re.sub(r"104|204|304|404|504|604|704|804|904","04",epi)
+                   epi=re.sub(r"105|205|305|405|505|605|705|805|905","05",epi)
+                   epi=re.sub(r"106|206|306|406|506|606|706|806|906","06",epi)
+                   epi=re.sub(r"107|207|307|407|507|607|707|807|907","07",epi)
+                   epi=re.sub(r"108|208|308|408|508|608|708|808|908","08",epi)
+                   epi=re.sub(r"109|209|309|409|509|609|709|809|909","09",epi)
+                   epi=re.sub(r"110|210|310|410|510|610|710|810|910","10",epi)
+                   epi=re.sub(r"111|211|311|411|511|611|711|811|911","11",epi)
+                   epi=re.sub(r"112|212|312|412|512|612|712|812|912","12",epi)
+                   epi=re.sub(r"113|213|313|413|513|613|713|813|913","13",epi)
+                   epi=re.sub(r"114|214|314|414|514|614|714|814|914","14",epi)
+                   epi=re.sub(r"115|215|315|415|515|615|715|815|915","15",epi)
+                   epi=re.sub(r"116|216|316|416|516|616|716|816|916","16",epi)
+                   epi=re.sub(r"117|217|317|417|517|617|717|817|917","17",epi)
+                   epi=re.sub(r"118|218|318|418|518|618|718|818|918","18",epi)
+                   epi=re.sub(r"119|219|319|419|519|619|719|819|919","19",epi)
+                   epi=re.sub(r"120|220|320|420|520|620|720|820|920","20",epi)
+                   epi=re.sub(r"121|221|321|421|521|621|721|821|921","21",epi)
+                   epi=re.sub(r"122|222|322|422|522|622|722|822|922","22",epi)
+                   epi=re.sub(r"123|223|323|423|523|623|723|823|923","23",epi)
+                   epi=re.sub(r"124|224|324|424|524|624|724|824|924","24",epi)
+                   epi=re.sub(r"125|225|325|425|525|625|725|825|925","25",epi)
+                   epi=re.sub(r"126|226|326|426|526|626|726|826|926","26",epi)
+                   epi=re.sub(r"127|227|327|427|527|627|727|827|927","27",epi)
+                   epi=re.sub(r"128|228|328|428|528|628|728|828|928","28",epi)
+                   epi=re.sub(r"129|229|329|429|529|629|729|829|929","29",epi)
+                   epi=re.sub(r"130|230|330|430|530|630|730|830|930","30",epi)
+                   seasson_epi = season+"x"+epi
+                   seasson_epi = seasson_epi.replace(seasson_epi,"[COLOR sandybrown]"+seasson_epi+"[/COLOR]")
+                   if "x0" in seasson_epi:
+                       epi = epi.replace("0","")
+                   title_torrent = "[torrent]"
+                   title_torrent = title_torrent.replace(title_torrent,"[COLOR green]"+title_torrent+"[/COLOR]")
+                   calidad = calidad.replace(calidad,"[COLOR sandybrown]"+calidad+"[/COLOR]")
+                   title_links = title_links.replace(title_links,"[COLOR orange]"+title_links+"[/COLOR]")
+                   title_torrent = title_links+" "+seasson_epi+calidad+"- "+title_torrent
+                   url_torrent = base64.decodestring(url_torrent.split('&u=')[1][::-1])
+                   title_links = re.sub(r"\n|\r|\t|\s{2}|\(.*?\)|\[.*?\]|&nbsp;|REPARADO","",title_links)
+                   title_links= title_links.replace('\[.*?\]','')
+                   title_links= title_links.replace('á','a')
+                   title_links= title_links.replace('Á','A')
+                   title_links= title_links.replace('é','e')
+                   title_links= title_links.replace('í','i')
+                   title_links= title_links.replace('ó','o')
+                   title_links= title_links.replace('ú','u')
+                   title_links= title_links.replace(' ','%20')
+                   extra = season+"|"+title_links+"|"+epi
+                   itemlist.append( Item(channel=__channel__, title = title_torrent , action="episodios", url=url_torrent, thumbnail=item.extra, fanart=item.show, extra=extra,plot=item.plot , category= item.category, folder=True) )
+    else:
+        ###Busqueda cuando hay Torrent pero no magnet en la serie
+        if 'id="file"' in data and  not 'id="magnet"'in data :
+           print "OPCION T"
+           patron = '<span class="title">([^<]+)- (\d)(\d+)([^<]+).*?'
+           patron += 'id="([^"]+)".*?href="([^"]+)"'
+           matches = re.compile(patron,re.DOTALL).findall(data)
+           if len(matches)==0:
+               show = item.show
+               extra = item.thumbnail
+               category = item.category+"|"+"series"
+               print "extraaaa"
+               print item.thumbnail
+               itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]Ooops!! Algo no va bien,pulsa para ser dirigido a otra busqueda, ...[/B][/COLOR]",action="findvideos_peli", url=item.url, thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg", extra=extra, show=show, category=category,plot = item.plot, folder=True) )
+           import base64
+           for title_links, seasson, epi, calidad, title_torrent, url_torrent in matches:
+               try:
+                   season=scrapertools.get_match(data,'<title>.*?Temporada.*?(\d+).*?Torrent')
+               except:
+                   ###Busqueda de season el las series que no vienen bien tipificadas como tal
+                   season=scrapertools.get_match(data,'<span class="title">.*?-.*?(\d+)x')
+               epi=re.sub(r"101|201|301|401|501|601|701|801|901","01",epi)
+               epi=re.sub(r"102|202|302|402|502|602|702|802|902","02",epi)
+               epi=re.sub(r"103|203|303|403|503|603|703|803|903","03",epi)
+               epi=re.sub(r"104|204|304|404|504|604|704|804|904","04",epi)
+               epi=re.sub(r"105|205|305|405|505|605|705|805|905","05",epi)
+               epi=re.sub(r"106|206|306|406|506|606|706|806|906","06",epi)
+               epi=re.sub(r"107|207|307|407|507|607|707|807|907","07",epi)
+               epi=re.sub(r"108|208|308|408|508|608|708|808|908","08",epi)
+               epi=re.sub(r"109|209|309|409|509|609|709|809|909","09",epi)
+               epi=re.sub(r"110|210|310|410|510|610|710|810|910","10",epi)
+               epi=re.sub(r"111|211|311|411|511|611|711|811|911","11",epi)
+               epi=re.sub(r"112|212|312|412|512|612|712|812|912","12",epi)
+               epi=re.sub(r"113|213|313|413|513|613|713|813|913","13",epi)
+               epi=re.sub(r"114|214|314|414|514|614|714|814|914","14",epi)
+               epi=re.sub(r"115|215|315|415|515|615|715|815|915","15",epi)
+               epi=re.sub(r"116|216|316|416|516|616|716|816|916","16",epi)
+               epi=re.sub(r"117|217|317|417|517|617|717|817|917","17",epi)
+               epi=re.sub(r"118|218|318|418|518|618|718|818|918","18",epi)
+               epi=re.sub(r"119|219|319|419|519|619|719|819|919","19",epi)
+               epi=re.sub(r"120|220|320|420|520|620|720|820|920","20",epi)
+               epi=re.sub(r"121|221|321|421|521|621|721|821|921","21",epi)
+               epi=re.sub(r"122|222|322|422|522|622|722|822|922","22",epi)
+               epi=re.sub(r"123|223|323|423|523|623|723|823|923","23",epi)
+               epi=re.sub(r"124|224|324|424|524|624|724|824|924","24",epi)
+               epi=re.sub(r"125|225|325|425|525|625|725|825|925","25",epi)
+               epi=re.sub(r"126|226|326|426|526|626|726|826|926","26",epi)
+               epi=re.sub(r"127|227|327|427|527|627|727|827|927","27",epi)
+               epi=re.sub(r"128|228|328|428|528|628|728|828|928","28",epi)
+               epi=re.sub(r"129|229|329|429|529|629|729|829|929","29",epi)
+               epi=re.sub(r"130|230|330|430|530|630|730|830|930","30",epi)
+                   
+               seasson_epi = season+"x"+epi
+               seasson_epi = seasson_epi.replace(seasson_epi,"[COLOR sandybrown]"+seasson_epi+"[/COLOR]")
+               if "x0" in seasson_epi:
+                  epi = epi.replace("0","")
+               title_torrent = "["+title_torrent.replace("file","torrent")+"]"
+               title_torrent = title_torrent.replace(title_torrent,"[COLOR green]"+title_torrent+"[/COLOR]")
+               calidad = calidad.replace(calidad,"[COLOR sandybrown]"+calidad+"[/COLOR]")
+               title_links = title_links.replace(title_links,"[COLOR orange]"+title_links+"[/COLOR]")
+               title_torrent = title_links+" "+seasson_epi+calidad+"- "+title_torrent
+               url_torrent = base64.decodestring(url_torrent.split('&u=')[1][::-1])
+               title_links = re.sub(r"\n|\r|\t|\s{2}|\(.*?\)|\[.*?\]|&nbsp;|REPARADO","",title_links)
+               title_links= title_links.replace('\[.*?\]','')
+               title_links= title_links.replace('á','a')
+               title_links= title_links.replace('Á','A')
+               title_links= title_links.replace('é','e')
+               title_links= title_links.replace('í','i')
+               title_links= title_links.replace('ó','o')
+               title_links= title_links.replace('ú','u')
+               title_links= title_links.replace(' ','%20')
+               extra = season+"|"+title_links+"|"+epi
+               itemlist.append( Item(channel=__channel__, title = title_torrent , action="episodios", url=url_torrent, thumbnail=item.extra, fanart=item.show, extra=extra,plot=item.plot , category= item.category, folder=True) )
+    ###Busqueda cuando hay Magnet pero no Torrent
+    if 'id="magnet"' in data and not 'id="file"' in data:
+        patron = '<span class="title">([^<]+)- (\d)(\d+)([^<]+).*?'
+        patron += 'id="([^"]+)" href="([^"]+)"'
+        matches = re.compile(patron,re.DOTALL).findall(data)
+        if len(matches)==0:
+            show = item.show
+            extra = item.extra
+            itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]Ooops!! Algo no va bien,pulsa para ser dirigido a otra busqueda, ...[/B][/COLOR]",action="findvideos_peli", url=item.url, thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg", extra=extra, show=show, folder=True) )
+        import base64
+        for title_links, seasson, epi, calidad, title_magnet, url_magnet in matches:
+            try:
+                season=scrapertools.get_match(data,'<title>.*?Temporada.*?(\d+).*?Torrent')
+            except:
+                ###Busqueda de season el las series que no vienen bien tipificadas como tal
+                season=scrapertools.get_match(data,'<span class="title">.*?-.*?(\d+)x')
+            epi=re.sub(r"101|201|301|401|501|601|701|801|901","01",epi)
+            epi=re.sub(r"102|202|302|402|502|602|702|802|902","02",epi)
+            epi=re.sub(r"103|203|303|403|503|603|703|803|903","03",epi)
+            epi=re.sub(r"104|204|304|404|504|604|704|804|904","04",epi)
+            epi=re.sub(r"105|205|305|405|505|605|705|805|905","05",epi)
+            epi=re.sub(r"106|206|306|406|506|606|706|806|906","06",epi)
+            epi=re.sub(r"107|207|307|407|507|607|707|807|907","07",epi)
+            epi=re.sub(r"108|208|308|408|508|608|708|808|908","08",epi)
+            epi=re.sub(r"109|209|309|409|509|609|709|809|909","09",epi)
+            epi=re.sub(r"110|210|310|410|510|610|710|810|910","10",epi)
+            epi=re.sub(r"111|211|311|411|511|611|711|811|911","11",epi)
+            epi=re.sub(r"112|212|312|412|512|612|712|812|912","12",epi)
+            epi=re.sub(r"113|213|313|413|513|613|713|813|913","13",epi)
+            epi=re.sub(r"114|214|314|414|514|614|714|814|914","14",epi)
+            epi=re.sub(r"115|215|315|415|515|615|715|815|915","15",epi)
+            epi=re.sub(r"116|216|316|416|516|616|716|816|916","16",epi)
+            epi=re.sub(r"117|217|317|417|517|617|717|817|917","17",epi)
+            epi=re.sub(r"118|218|318|418|518|618|718|818|918","18",epi)
+            epi=re.sub(r"119|219|319|419|519|619|719|819|919","19",epi)
+            epi=re.sub(r"120|220|320|420|520|620|720|820|920","20",epi)
+            epi=re.sub(r"121|221|321|421|521|621|721|821|921","21",epi)
+            epi=re.sub(r"122|222|322|422|522|622|722|822|922","22",epi)
+            epi=re.sub(r"123|223|323|423|523|623|723|823|923","23",epi)
+            epi=re.sub(r"124|224|324|424|524|624|724|824|924","24",epi)
+            epi=re.sub(r"125|225|325|425|525|625|725|825|925","25",epi)
+            epi=re.sub(r"126|226|326|426|526|626|726|826|926","26",epi)
+            epi=re.sub(r"127|227|327|427|527|627|727|827|927","27",epi)
+            epi=re.sub(r"128|228|328|428|528|628|728|828|928","28",epi)
+            epi=re.sub(r"129|229|329|429|529|629|729|829|929","29",epi)
+            epi=re.sub(r"130|230|330|430|530|630|730|830|930","30",epi)
+            
+            seasson_epi = season+"x"+epi
+            seasson_epi = seasson_epi.replace(seasson_epi,"[COLOR sandybrown]"+seasson_epi+"[/COLOR]")
+            if "x0" in seasson_epi:
+                epi = epi.replace("0","")
+            title_magnet = "["+"magnet"+"]"
+            title_magnet = "[COLOR red]Opción[/COLOR]"+" "+ title_magnet.replace(title_magnet,"[COLOR crimson]"+title_magnet+"[/COLOR]")
+            calidad = calidad.replace(calidad,"[COLOR sandybrown]"+calidad+"[/COLOR]")
+            title_links = title_links.replace(title_links,"[COLOR orange]"+title_links+"[/COLOR]")
+            title_magnet = title_links+" "+seasson_epi+calidad+"- "+title_magnet
+            url_magnet = base64.decodestring(url_magnet.split('&u=')[1][::-1])
+            title_links = re.sub(r"\n|\r|\t|\s{2}|\(.*?\)|\[.*?\]|&nbsp;|REPARADO","",title_links)
+            title_links= title_links.replace('\[.*?\]','')
+            title_links= title_links.replace('á','a')
+            title_links= title_links.replace('Á','A')
+            title_links= title_links.replace('é','e')
+            title_links= title_links.replace('í','i')
+            title_links= title_links.replace('ó','o')
+            title_links= title_links.replace('ú','u')
+            title_links= title_links.replace(' ','%20')
+            extra = season+"|"+title_links+"|"+epi
+            itemlist.append( Item(channel=__channel__, title = title_magnet , action="episodios", url=url_magnet, thumbnail=item.extra, fanart=item.show, extra=extra,plot=item.plot , category= item.category, folder=True) )
+    ###No hay video
+    if not 'id="file"' in data and not 'id="magnet"' in data:
         show = item.show
         extra = item.extra
         itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]Ooops!! Algo no va bien,pulsa para ser dirigido a otra busqueda, ...[/B][/COLOR]",action="findvideos_peli", url=item.url, thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg", extra=extra, show=show, folder=True) )
-    
-    import base64
-    for title_links, seasson, epi, calidad, title_torrent, url_torrent in matches:
-        ## torrent
-        season=scrapertools.get_match(data,'<title>.*?Temporada.*?(\d+).*?Torrent')
-        epi=re.sub(r"101|201|301|401|501|601|701|801|901","01",epi)
-        epi=re.sub(r"102|202|302|402|502|602|702|802|902","02",epi)
-        epi=re.sub(r"103|203|303|403|503|603|703|803|903","03",epi)
-        epi=re.sub(r"104|204|304|404|504|604|704|804|904","04",epi)
-        epi=re.sub(r"105|205|305|405|505|605|705|805|905","05",epi)
-        epi=re.sub(r"106|206|306|406|506|606|706|806|906","06",epi)
-        epi=re.sub(r"107|207|307|407|507|607|707|807|907","07",epi)
-        epi=re.sub(r"108|208|308|408|508|608|708|808|908","08",epi)
-        epi=re.sub(r"109|209|309|409|509|609|709|809|909","09",epi)
-        epi=re.sub(r"110|210|310|410|510|610|710|810|910","10",epi)
-        epi=re.sub(r"111|211|311|411|511|611|711|811|911","11",epi)
-        epi=re.sub(r"112|212|312|412|512|612|712|812|912","12",epi)
-        epi=re.sub(r"113|213|313|413|513|613|713|813|913","13",epi)
-        epi=re.sub(r"114|214|314|414|514|614|714|814|914","14",epi)
-        epi=re.sub(r"115|215|315|415|515|615|715|815|915","15",epi)
-        epi=re.sub(r"116|216|316|416|516|616|716|816|916","16",epi)
-        epi=re.sub(r"117|217|317|417|517|617|717|817|917","17",epi)
-        epi=re.sub(r"118|218|318|418|518|618|718|818|918","18",epi)
-        epi=re.sub(r"119|219|319|419|519|619|719|819|919","19",epi)
-        epi=re.sub(r"120|220|320|420|520|620|720|820|920","20",epi)
-        epi=re.sub(r"121|221|321|421|521|621|721|821|921","21",epi)
-        epi=re.sub(r"122|222|322|422|522|622|722|822|922","22",epi)
-        epi=re.sub(r"123|223|323|423|523|623|723|823|923","23",epi)
-        epi=re.sub(r"124|224|324|424|524|624|724|824|924","24",epi)
-        epi=re.sub(r"125|225|325|425|525|625|725|825|925","25",epi)
-        epi=re.sub(r"126|226|326|426|526|626|726|826|926","26",epi)
-        epi=re.sub(r"127|227|327|427|527|627|727|827|927","27",epi)
-        epi=re.sub(r"128|228|328|428|528|628|728|828|928","28",epi)
-        epi=re.sub(r"129|229|329|429|529|629|729|829|929","29",epi)
-        epi=re.sub(r"130|230|330|430|530|630|730|830|930","30",epi)
-        
-        seasson_epi = season+"x"+epi
-        seasson_epi = seasson_epi.replace(seasson_epi,"[COLOR sandybrown]"+seasson_epi+"[/COLOR]")
-        if "x0" in seasson_epi:
-            epi = epi.replace("0","")
-        title_torrent = "["+title_torrent.replace("file","torrent")+"]"
-        title_torrent = title_torrent.replace(title_torrent,"[COLOR green]"+title_torrent+"[/COLOR]")
-        calidad = calidad.replace(calidad,"[COLOR sandybrown]"+calidad+"[/COLOR]")
-        title_links = title_links.replace(title_links,"[COLOR orange]"+title_links+"[/COLOR]")
-        title_torrent = title_links+" "+seasson_epi+calidad+"- "+title_torrent
-        url_torrent = base64.decodestring(url_torrent.split('&u=')[1][::-1])
-        title_links = re.sub(r"\n|\r|\t|\s{2}|\(.*?\)|\[.*?\]|&nbsp;","",title_links)
-        title_links= title_links.replace('\[.*?\]','')
-        title_links= title_links.replace('á','a')
-        title_links= title_links.replace('Á','A')
-        title_links= title_links.replace('é','e')
-        title_links= title_links.replace('í','i')
-        title_links= title_links.replace('ó','o')
-        title_links= title_links.replace('ú','u')
-        title_links= title_links.replace(' ','%20')
-        extra = season+"|"+title_links+"|"+epi
-        itemlist.append( Item(channel=__channel__, title = title_torrent , action="episodios", url=url_torrent, thumbnail=item.extra, fanart=item.show, extra=extra, category= item.category, folder=True) )
 
     return itemlist
 
 def episodios(item):
     logger.info("pelisalacarta.bricocine episodios")
     itemlist = []
+    ###Borra Customkey si no hay música
     import xbmc, time
     TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
-    if os.path.exists ( TESTPYDESTFILE ):
-        TRAILERDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "trailer.txt")
-        urllib.urlretrieve ("https://raw.githubusercontent.com/neno1978/script.palc.forcerefresh/master/trailer.txt", TRAILERDESTFILE )
+    if not xbmc.Player().isPlaying() and os.path.exists ( TESTPYDESTFILE ):
+        TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
+        KEYMAPDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customkey.xml")
+        REMOTEDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "remote.xml")
+        APPCOMMANDDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customapp.xml")
         try:
             os.remove(KEYMAPDESTFILE)
             print "Custom Keyboard.xml borrado"
@@ -769,53 +1310,109 @@ def episodios(item):
             xbmc.executebuiltin('Action(reloadkeymaps)')
             print "No hay customs"
     
+
+    
     season = item.extra.split("|")[0]
     title_links = item.extra.split("|")[1]
     epi = item.extra.split("|")[2]
     title_tag="[COLOR yellow]Ver --[/COLOR]"
-    title = title_tag + item.title
-    url="http://api.themoviedb.org/3/search/tv?api_key=57983e31fb435df4df77afb854740ea9&query="+ item.extra.split("|")[1] +"&language=es&include_adult=false"
-    if "%2090210%20Sensacion%20de%20vivir" in url:
-        url="http://api.themoviedb.org/3/search/tv?api_key=57983e31fb435df4df77afb854740ea9&query=90210&language=es&include_adult=false"
-    if "%20De%20vuelta%20al%20nido%20" in url:
-        url ="http://api.themoviedb.org/3/search/tv?api_key=57983e31fb435df4df77afb854740ea9&query=packed%20to%20the%20rafter&language=es&include_adult=false"
-    if "%20Asuntos%20de%20estado%20" in url:
-        url="http://api.themoviedb.org/3/search/tv?api_key=57983e31fb435df4df77afb854740ea9&query=state%20of%20affair&language=es&include_adult=false"
-    if "%20Como%20defender%20a%20un%20asesino%20" in url:
-       url="http://api.themoviedb.org/3/search/tv?api_key=57983e31fb435df4df77afb854740ea9&query=how%20to%20get%20away%20with%20murder&language=es&include_adult=false"
-    data = scrapertools.cachePage(url)
+    item.title= item.title.replace("Ver --","")
+    if "magnet" in item.title:
+        title_links = title_links.replace("%20","")
+        title_links = "[COLOR orange]"+title_links+" "+season+"x"+epi+"[/COLOR]"
+        title = title_tag + title_links+" "+ item.title
+    else:
+        item.title= re.sub(r"\[.*?\]","",item.title)
+        title = title_tag +"[COLOR orange]"+item.title+"[/COLOR]"+"[COLOR green][torrent][/COLOR]"
+
+    if item.plot == "Sensación de vivir: La nueva generación":
+       item.plot ="90210"
+    if item.plot =="La historia del universo":
+        item.plot ="how the universe works"
+    try:
+       #Nueva busqueda bing de Imdb serie id
+       url_imdb = "http://www.bing.com/search?q=%s+tv+series+site:imdb.com" % item.plot.replace(' ', '+')
+       data = scrapertools.cachePage(url_imdb)
+       data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+       try:
+           subdata_imdb = scrapertools.get_match(data,'<li class="b_algo">(.*?)h="ID')
+       except:
+           pass
+       try:
+          imdb_id = scrapertools.get_match(subdata_imdb,'<a href=.*?http.*?imdb.com/title/(.*?)/.*?"')
+       except:
+          imdb_id = ""
+       ### Busca en Tmdb quinta imagen para episodios mediate Imdb id
+       urltmdb_imdb="https://api.themoviedb.org/3/find/"+imdb_id+"?api_key=57983e31fb435df4df77afb854740ea9&external_source=imdb_id"
+       data = scrapertools.cachePage(urltmdb_imdb)
+       data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+       id = scrapertools.get_match(data,'"tv_results":.*?,"id":(.*?),"')
+       
+    except:
+         ###Si no hay coincidencia busca directamente en Tmdb por título
+         if ":" in item.plot:
+            try:
+               item.plot = item.plot.replace(" ","%20")
+               url_tmdb="http://api.themoviedb.org/3/search/tv?api_key=57983e31fb435df4df77afb854740ea9&query="+ item.plot +"&language=es&include_adult=false"
+               data = scrapertools.cachePage(url_tmdb)
+               data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+               id = scrapertools.get_match(data,'page":1.*?,"id":(.*?),"')
+            except:
+                   try:
+                       item.plot= re.sub(r"(:.*)","",item.plot)
+                       item.plot = item.plot.replace(" ","%20")
+                       url_tmdb="http://api.themoviedb.org/3/search/tv?api_key=57983e31fb435df4df77afb854740ea9&query="+ item.plot +"&language=es&include_adult=false"
+                       data = scrapertools.cachePage(url_tmdb)
+                       data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                       id = scrapertools.get_match(data,'page":1.*?,"id":(.*?),"')
+                   except:
+                      thumbnail= item.thumbnail
+                      fanart = item.fanart
+                      id =""
+         else:
+             try:
+                 if "De la A a la Z" in item.plot:
+                     item.plot = "A to Z"
+                 item.plot = item.plot.replace(" ","%20")
+                 url_tmdb="http://api.themoviedb.org/3/search/tv?api_key=57983e31fb435df4df77afb854740ea9&query="+ item.plot +"&language=es&include_adult=false"
+                 data = scrapertools.cachePage(url_tmdb)
+                 data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+                 id = scrapertools.get_match(data,'page":1.*?,"id":(.*?),"')
+             except:
+                 thumbnail= item.thumbnail
+                 fanart = item.fanart
+                 id =""
+
+    ###Teniendo (o no) el id Tmdb busca imagen
+    urltmdb_images = "https://api.themoviedb.org/3/tv/"+id+"?api_key=57983e31fb435df4df77afb854740ea9"
+    data = scrapertools.cachePage(urltmdb_images)
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
+    try:
+        backdrop=scrapertools.get_match(data,'"backdrop_path":"(.*?)"')
+        fanart_3 = "https://image.tmdb.org/t/p/original" + backdrop
+        fanart = fanart_3
+    except:
+        fanart_3= item.fanart
+        fanart= fanart_3
+    ###Se hace también la busqueda de el thumb del episodio en Tmdb
+    urltmdb_epi ="https://api.themoviedb.org/3/tv/"+id+"/season/"+item.extra.split("|")[0]+"/episode/"+item.extra.split("|")[2]+"/images?api_key=57983e31fb435df4df77afb854740ea9"
+    data = scrapertools.cachePage(urltmdb_epi)
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
-    patron = 'page":1.*?,"id":(.*?),"'
+    patron = '{"id".*?"file_path":"(.*?)","height"'
     matches = re.compile(patron,re.DOTALL).findall(data)
     if len(matches)==0:
-        thumbnail= item.thumbnail
-        fanart = item.fanart
-        id = ""
-        itemlist.append( Item(channel=__channel__, title = title , action="play", url=item.url, thumbnail=thumbnail, fanart=fanart,  folder=False) )
-
-    for id in matches:
-        if not 'page":1.*?,"id".*?"backdrop_path":null' in data:
-                backdrop=scrapertools.get_match(data,'page":1.*?,"id".*?"backdrop_path":"\\\(.*?)"')
-                fanart_3 = "https://image.tmdb.org/t/p/original" + backdrop
-                fanart = fanart_3
-        else:
-             fanart= item.fanart
-        url ="https://api.themoviedb.org/3/tv/"+id+"/season/"+item.extra.split("|")[0]+"/episode/"+item.extra.split("|")[2]+"/images?api_key=57983e31fb435df4df77afb854740ea9"
-        data = scrapertools.cachePage(url)
-        data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
-        patron = '{"id".*?"file_path":"(.*?)","height"'
-        matches = re.compile(patron,re.DOTALL).findall(data)
-        if len(matches)==0:
-           thumbnail = item.thumbnail
-           itemlist.append( Item(channel=__channel__, title = title , action="play", url=item.url, thumbnail=thumbnail, fanart=fanart,  folder=False) )
-        for foto in matches:
-            thumbnail = "https://image.tmdb.org/t/p/original" + foto
+        thumbnail = item.thumbnail
+        fanart = fanart_3
+        itemlist.append( Item(channel=__channel__, title = title , action="play", url=item.url, server="torrent", thumbnail=thumbnail, fanart=fanart,  folder=False) )
+
+    for foto in matches:
+        thumbnail = "https://image.tmdb.org/t/p/original" + foto
             
-            extra = id+"|"+season
-            itemlist.append( Item(channel=__channel__, title = title , action="play", url=item.url, thumbnail=thumbnail, fanart=fanart,  category = item.category, folder=False) )
-    ###thumb temporada###
-    url= "http://api.themoviedb.org/3/tv/"+id+"/season/"+season+"/images?api_key=57983e31fb435df4df77afb854740ea9"
-    data = get_page( url )
+        extra = id+"|"+season
+        itemlist.append( Item(channel=__channel__, title = title , action="play", url=item.url, thumbnail=thumbnail, fanart=fanart,  category = item.category, folder=False) )
+    ###Busca poster de temporada Tmdb
+    urltmdb_temp= "http://api.themoviedb.org/3/tv/"+id+"/season/"+season+"/images?api_key=57983e31fb435df4df77afb854740ea9"
+    data = get_page( urltmdb_temp )
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
     patron = '{"id".*?"file_path":"(.*?)","height"'
     matches = re.compile(patron,re.DOTALL).findall(data)
@@ -823,9 +1420,9 @@ def episodios(item):
        thumbnail= item.thumbnail
     for temp in matches:
         thumbnail= "https://image.tmdb.org/t/p/original"+ temp
-    ####fanart info####
-    url ="http://api.themoviedb.org/3/tv/"+id+"/images?api_key=57983e31fb435df4df77afb854740ea9"
-    data = get_page( url )
+    ####Busca el fanart para el item info####
+    urltmdb_faninfo ="http://api.themoviedb.org/3/tv/"+id+"/images?api_key=57983e31fb435df4df77afb854740ea9"
+    data = get_page( urltmdb_faninfo )
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
     patron = '{"backdrops".*?"file_path":".*?","height".*?"file_path":"(.*?)",'
     matches = re.compile(patron,re.DOTALL).findall(data)
@@ -834,7 +1431,9 @@ def episodios(item):
     for fanart_4 in matches:
         fanart = "https://image.tmdb.org/t/p/original" + fanart_4
     show = item.category+"|"+item.thumbnail
-
+    ### Item info de episodios
+    import xbmc
+    xbmc.executebuiltin('Action(reloadkeymaps)')
     title ="Info"
     title = title.replace(title,"[COLOR skyblue]"+title+"[/COLOR]")
     itemlist.append( Item(channel=__channel__, action="info_capitulos" , title=title , url=item.url, thumbnail=thumbnail, fanart=fanart, extra = item.extra, show = show, folder=False ))
@@ -844,10 +1443,12 @@ def episodios(item):
 def play(item):
     logger.info("pelisalacarta.bricocine play")
     itemlist = []
+    ###Opción para trailers
     if "youtube" in item.url:
         itemlist.append( Item(channel=__channel__, action="play", server="youtube",  url=item.url ,  fulltitle = item.title , fanart="http://s23.postimg.org/84vkeq863/movietrailers.jpg", folder=False) )
     
-
+    import xbmc
+    xbmc.executebuiltin('Action(reloadkeymaps)')
     itemlist.append( Item(channel=__channel__, title = item.title , action="play", url=item.url, server="torrent", thumbnail=item.thumbnail, fanart=item.fanart,  category = item.category, folder=False) )
 
 
@@ -861,33 +1462,138 @@ def findvideos_peli(item):
     
     itemlist = []
     data = get_page( item.url )
-   
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;| - REPARADO","",data)
     
-    #id_torrent = scrapertools.get_match(item.url,"(\d+)-")
+    #Busca video si hay magnet y torrent
+    if 'id="magnet"' in data:
+        if 'id="file"' in data:
+           patron = '<span class="title">([^"]+)</span>.*?'
+           patron += 'id="([^"]+)".*?href="([^"]+)".*?id="([^"]+)" href="([^"]+)"'
     
-    patron = '<span class="title">([^"]+)</span>.*?'
-    patron += 'id="([^"]+)" href="([^"]+)".*?'
+           matches = re.compile(patron,re.DOTALL).findall(data)
+           if len(matches)==0 :
+              itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]El video ya no se encuentra en la web, prueba a encontrala por busqueda...[/B][/COLOR]", thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg",folder=False) )
+           import base64
+           for title_links, title_torrent, url_torrent, title_magnet, url_magnet in matches:
+              
+              title_torrent = "["+title_torrent.replace("file","torrent")+"]"
+              title_torrent = title_torrent.replace(title_torrent,"[COLOR green]"+title_torrent+"[/COLOR]")
+              title_magnet = "["+"magnet"+"]"
+              title_magnet = "[COLOR red]Opción[/COLOR]"+" "+ title_magnet.replace(title_magnet,"[COLOR crimson]"+title_magnet+"[/COLOR]")
+              title_links = title_links.replace(title_links,"[COLOR sandybrown]"+title_links+"[/COLOR]")
+              title_links = re.sub(r"&#.*?;|\[HD .*?\]|\(.*?\)","",title_links)
+              title_tag="[COLOR yellow]Ver --[/COLOR]"
+              title_torrent = title_tag+title_links+"- "+title_torrent
+              url_torrent = base64.decodestring(url_torrent.split('&u=')[1][::-1])
+              url_magnet = base64.decodestring(url_magnet.split('&u=')[1][::-1])
+              if "sinopsis.png" in item.extra and not "series" in item.category:
+                 item.extra ="http://oi67.tinypic.com/28sxwrs.jpg"
+              ###Se identifica si es una serie mal tipificada
+              if  "series" in item.category and not "Completa" in title_links:
+                 try:
+                    season=scrapertools.get_match(data,'<title>.*?Temporada.*?(\d+).*?Torrent')
+                 except:
+                    season = "1"
+                 title_link =scrapertools.get_match(title_links,'(.*?) -')
+                 epi =scrapertools.get_match(title_links,'-.*?(x\d+)')
+                 if "x0" in epi:
+                    epi = epi.replace( "x0","")
+                 title_links = title_link
+                 print title_links
+                 action ="episodios"
+                 extra = season+"|"+title_links+"|"+epi
+                 itemlist.append( Item(channel=__channel__, title = title_torrent , action=action, url=url_torrent, server="torrent", thumbnail=item.extra, fanart=item.show,extra=extra,category=item.category,plot = item.plot,  folder=True) )
+                 itemlist.append( Item(channel=__channel__, title = title_magnet , action=action, url=url_magnet, server="torrent", thumbnail=item.extra,category=item.category, fanart=item.show,extra=extra,plot= item.plot,  folder=True) )
+              else:
+                 action = "play"
+                 itemlist.append( Item(channel=__channel__, title = title_torrent , action=action, url=url_torrent, server="torrent", thumbnail=item.extra, fanart=item.show, folder=False) )
+                 itemlist.append( Item(channel=__channel__, title = title_magnet , action=action, url=url_magnet, server="torrent", thumbnail=item.extra, fanart=item.show, folder=False) )
+    else:
+        ###Busca video cuando hay torrent pero no magnet
+        if 'id="file"' in data and  not 'id="magnet"'in data :
+           patron = '<span class="title">([^"]+)</span>.*?'
+           patron += 'id="([^"]+)".*?href="([^"]+)".*?'
     
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    if len(matches)==0 :
-        itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]El video ya no se encuentra en la web, prueba a encontrala por busqueda...[/B][/COLOR]", thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg",folder=False) )
-    import base64
-    for title_links, title_torrent, url_torrent in matches:
-        ## torrent
-        title_torrent = "["+title_torrent.replace("file","torrent")+"]"
-        title_torrent = title_torrent.replace(title_torrent,"[COLOR green]"+title_torrent+"[/COLOR]")
-        title_links = title_links.replace(title_links,"[COLOR sandybrown]"+title_links+"[/COLOR]")
-        title_links = re.sub(r"&#.*?;","",title_links)
-        title_tag="[COLOR yellow]Ver --[/COLOR]"
-        title_torrent = title_tag+title_links+"- "+title_torrent
-        url_torrent = base64.decodestring(url_torrent.split('&u=')[1][::-1])
-        itemlist.append( Item(channel=__channel__, title = title_torrent , action="play", url=url_torrent, server="torrent", thumbnail=item.extra, fanart=item.show,  folder=False) )
-
-
+           matches = re.compile(patron,re.DOTALL).findall(data)
+           if len(matches)==0 :
+              itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]El video ya no se encuentra en la web, prueba a encontrala por busqueda...[/B][/COLOR]", thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg",folder=False) )
+           import base64
+           for title_links, title_torrent, url_torrent in matches:
+               ## torrent
+               title_torrent = "["+title_torrent.replace("file","torrent")+"]"
+               title_torrent = title_torrent.replace(title_torrent,"[COLOR green]"+title_torrent+"[/COLOR]")
+               title_links = title_links.replace(title_links,"[COLOR sandybrown]"+title_links+"[/COLOR]")
+               title_links = re.sub(r"&#.*?;","",title_links)
+               title_tag="[COLOR yellow]Ver --[/COLOR]"
+               title_torrent = title_tag+title_links+"- "+title_torrent
+               url_torrent = base64.decodestring(url_torrent.split('&u=')[1][::-1])
+               if "sinopsis.png" in item.extra:
+                   item.extra ="http://oi67.tinypic.com/28sxwrs.jpg"
+               ###Se identifica si es una serie mal tipificada
+               if  "series" in item.category and not "Completa" in title_links:
+                    try:
+                        season=scrapertools.get_match(data,'<title>.*?Temporada.*?(\d+).*?Torrent')
+                    except:
+                        season = "1"
+                    title_link =scrapertools.get_match(title_links,'(.*?) -')
+                    epi =scrapertools.get_match(title_links,'-.*?(x\d+)')
+                    if "x0" in epi:
+                       epi = epi.replace( "x0","")
+                    title_links = title_link
+                    print title_links
+                    action ="episodios"
+                    extra = season+"|"+title_links+"|"+epi
+                    itemlist.append( Item(channel=__channel__, title = title_torrent , action=action, url=url_torrent, server="torrent", thumbnail=item.extra, fanart=item.show,extra=extra,category=item.category,plot = item.plot,  folder=True) )
+                        
+               else:
+                    action = "play"
+                    itemlist.append( Item(channel=__channel__, title = title_torrent , action=action, url=url_torrent, server="torrent", thumbnail=item.extra, fanart=item.show,  folder=False) )
+    ###Busca video cuando solo hay magnet y no torrent
+    if 'id="magnet"' in data and not 'id="file"' in data:
+        patron = '<span class="title">([^"]+)</span>.*?'
+        patron += 'id="([^"]+)" href="([^"]+)"'
+        
+        matches = re.compile(patron,re.DOTALL).findall(data)
+        if len(matches)==0 :
+            itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]El video ya no se encuentra en la web, prueba a encontrala por busqueda...[/B][/COLOR]", thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg",folder=False) )
+        import base64
+        for title_links, title_magnet, url_magnet in matches:
+            title_magnet = "["+"magnet"+"]"
+            title_links = title_links.replace(title_links,"[COLOR sandybrown]"+title_links+"[/COLOR]")
+            title_links = re.sub(r"&#.*?;","",title_links)
+            title_tag="[COLOR red]Ver --[/COLOR]"
+            title_magnet = title_tag+title_links+"- "+title_magnet.replace(title_magnet,"[COLOR crimson]"+title_magnet+"[/COLOR]")
+            url_magnet = base64.decodestring(url_magnet.split('&u=')[1][::-1])
+            if "sinopsis.png" in item.extra:
+                item.extra ="http://oi67.tinypic.com/28sxwrs.jpg"
+            ###Se identifica si es una serie mal tipificada
+            if  "series" in item.category and not "Completa" in title_links:
+                try:
+                    season=scrapertools.get_match(data,'<title>.*?Temporada.*?(\d+).*?Torrent')
+                except:
+                    season = "1"
+                    title_link =scrapertools.get_match(title_links,'(.*?) -')
+                    epi =scrapertools.get_match(title_links,'-.*?(x\d+)')
+                    if "x0" in epi:
+                        epi = epi.replace( "x0","")
+                    title_links = title_link
+                    print title_links
+                    action ="episodios"
+                    extra = season+"|"+title_links+"|"+epi
+                    itemlist.append( Item(channel=__channel__, title = title_torrent , action=action, url=url_torrent, server="torrent", thumbnail=item.extra, fanart=item.show,extra=extra,category=item.category,plot = item.plot,  folder=True) )
+                        
+            else:
+                 action = "play"
+        
+                 itemlist.append( Item(channel=__channel__, title = title_magnet , action=action, url=url_magnet, server="torrent", thumbnail=item.extra, fanart=item.show,  folder=False) )
+    ###No hay torrent ni magnet
+    if not 'id="file"' in data and not 'id="magnet"' in data:
+       itemlist.append( Item(channel=__channel__, title="[COLOR gold][B]El video ya no se encuentra en la web, prueba a encontrala por busqueda...[/B][/COLOR]", thumbnail ="http://s6.postimg.org/fay99h9ox/briconoisethumb.png", fanart ="http://s6.postimg.org/uie8tu1jl/briconoisefan.jpg",folder=False) )
     return itemlist
 def trailer(item):
     
     logger.info("pelisalacarta.bricocine trailer")
+    ###Crea archivo control trailer.txt para evitar la recarga de la música cuando se vuelve de trailer
     import xbmc
     TESTPYDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "test.py")
     if os.path.exists ( TESTPYDESTFILE ):
@@ -914,7 +1620,7 @@ def trailer(item):
             url =video [1]
             server = video[2]
         
-        #xbmctools.addnewvideo( __channel__ , "play" , category , server ,  , url , thumbnail , plot )
+        
         title= "[COLOR crimson]Trailer - [/COLOR]"
         itemlist.append( Item(channel=__channel__, action="play", server="youtube", title=title + videotitle   , url=url , thumbnail=item.extra ,  fulltitle = item.title , fanart="http://s23.postimg.org/84vkeq863/movietrailers.jpg", folder=False) )
     return itemlist
@@ -926,6 +1632,7 @@ def info(item):
     data = get_page( url )
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
     if "temporada" in item.url:
+      ###Se prepara el Customkey para no permitir el forcerefresh y evitar conflicto con info
       import xbmc
       APPCOMMANDDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customapp.xml")
       try:
@@ -983,7 +1690,7 @@ def info(item):
           photo= item.extra
           foto = item.category
           quit = "Pulsa"+" [COLOR crimson][B]INTRO [/B][/COLOR]"+ "para quitar"
-         
+          ###Se carga Customkey no atras
           NOBACKDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "noback.xml")
           REMOTENOBACKDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "remotenoback.xml")
           APPNOBACKDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "appnoback.xml")
@@ -993,11 +1700,12 @@ def info(item):
           xbmc.executebuiltin('Action(reloadkeymaps)')
     else:
         data = get_page( item.url )
-        data = re.sub(r"\n|\r|\t|\(.*?\)|\s{2}|&nbsp;","",data)
+        data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
         patron = '<div class="description" itemprop="text.*?">.*?([^<]+).*?</div></div></div>.*?'
         patron += '<span class="title">([^"]+)</span>'
         matches = re.compile(patron,re.DOTALL).findall(data)
         
+        
         if len(matches)==0 :
             title = "[COLOR red][B]LO SENTIMOS...[/B][/COLOR]"
             plot = "Esta pelicula no tiene sinopsis..."
@@ -1008,9 +1716,10 @@ def info(item):
             quit = "Pulsa"+" [COLOR crimson][B]INTRO [/B][/COLOR]"+ "para quitar"
 
         for plot, title in matches:
+            print title
             title = title.upper()
             title = title.replace(title,"[COLOR sandybrown][B]"+title+"[/B][/COLOR]")
-            title = re.sub(r"&#.*?;","",title)
+            title = re.sub(r"&#.*?;|\[HD .*?\]|","",title)
             plot_title = "Sinopsis" + "[CR]"
             plot_title = plot_title.replace(plot_title,"[COLOR red]"+plot_title+"[/COLOR]")
             plot= plot_title + plot
@@ -1078,6 +1787,7 @@ class TextBox1( xbmcgui.WindowDialog ):
             try:
                self.plot.autoScroll(7000,6000,30000)
             except:
+               ###Información de incompatibilidd autoscroll con versiones inferiores a isengrd
                print "Actualice a la ultima version de kodi para mejor info"
                import xbmc
                xbmc.executebuiltin('Notification([COLOR red][B]Actualiza Kodi a su última versión[/B][/COLOR], [COLOR skyblue]para mejor info[/COLOR],8000,"https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kodi-icon.png")')
@@ -1090,6 +1800,7 @@ class TextBox1( xbmcgui.WindowDialog ):
             
         def onAction(self, action):
             if action == ACTION_SELECT_ITEM:
+               ###Se vuelven a cargar Customkey al salir de info
                import os, sys
                import xbmc
                APPCOMMANDDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "customapp.xml")
@@ -1123,9 +1834,12 @@ def info_capitulos(item):
     except:
        pass
     url= item.url
-    data = get_page(url)
+    data = scrapertools.cache_page(url)
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
-    item.category = item.show.split("|")[0]
+    if "series" in item.category:
+        item.category=  item.category.split("|")[0]
+    else:
+        item.category = item.show.split("|")[0]
     item.thumbnail = item.show.split("|")[1]
     capitulo =item.extra.split("|")[2]
     capitulo = re.sub(r"(0)\d;","",capitulo)
@@ -1152,14 +1866,20 @@ def info_capitulos(item):
                fanart = "http://thetvdb.com/banners/" + foto
             else:
                 fanart=item.show.split("|")[1]
+                if item.show.split("|")[1] == item.thumbnail:
+                   fanart = "http://s6.postimg.org/4asrg755b/bricotvshows2.png"
             
             plot = info
+            plot = (translate(plot,"es"))
             plot = plot.replace(plot,"[COLOR yellow][B]"+plot+"[/B][/COLOR]")
-            name_epi = re.sub(r"&#.*?;","",name_epi)
+            name_epi = re.sub(r"&#.*?;|&amp;","",name_epi)
+            plot = re.sub(r"&#.*?;","",plot)
             title = name_epi.upper()
             title = title.replace(title,"[COLOR sandybrown][B]"+title+"[/B][/COLOR]")
             image=fanart
             foto= item.show.split("|")[1]
+            if not ".png" in item.show.split("|")[1] :
+               foto ="http://s6.postimg.org/6flcihb69/brico1sinopsis.png"
             quit = "Pulsa"+" [COLOR greenyellow][B]INTRO [/B][/COLOR]"+ "para quitar"
             NOBACKDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "noback.xml")
             REMOTENOBACKDESTFILE = os.path.join(xbmc.translatePath('special://userdata/keymaps'), "remotenoback.xml")
@@ -1186,7 +1906,7 @@ class TextBox2( xbmcgui.WindowDialog ):
             
             self.background = xbmcgui.ControlImage( 70, 20, 1150, 630, 'http://s6.postimg.org/n3ph1uxn5/ventana.png')
             self.title = xbmcgui.ControlTextBox(120, 60, 430, 50)
-            self.quit = xbmcgui.ControlTextBox(145, 90, 1030, 45)
+            self.quit = xbmcgui.ControlTextBox(145, 110, 1030, 45)
             self.plot = xbmcgui.ControlTextBox( 120, 150, 1056, 100 )
             self.thumbnail = xbmcgui.ControlImage( 120, 300, 1056, 300, self.getThumbnail )
             self.fanart = xbmcgui.ControlImage( 780, 43, 390, 100, self.getFanart )
@@ -1224,6 +1944,7 @@ class TextBox2( xbmcgui.WindowDialog ):
                    os.remove(NOBACKDESTFILE)
                    os.remove(REMOTENOBACKDESTFILE)
                    os.remove(APPNOBACKDESTFILE)
+                   xbmc.executebuiltin('Action(reloadkeymaps)')
                    if os.path.exists ( TESTPYDESTFILE ):
                       urllib.urlretrieve ("https://raw.githubusercontent.com/neno1978/script.palc.forcerefresh/master/Bricocine/customapp.xml", APPCOMMANDDESTFILE )
                    xbmc.executebuiltin('Action(reloadkeymaps)')
@@ -1234,6 +1955,32 @@ def test():
     return True
 
 
+def translate(to_translate, to_langage="auto", langage="auto"):
+    ###Traducción atraves de Google
+    '''Return the translation using google translate
+        you must shortcut the langage you define (French = fr, English = en, Spanish = es, etc...)
+        if you don't define anything it will detect it or use english by default
+        Example:
+        print(translate("salut tu vas bien?", "en"))
+        hello you alright?'''
+    agents = {'User-Agent':"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30)"}
+    before_trans = 'class="t0">'
+    link = "http://translate.google.com/m?hl=%s&sl=%s&q=%s" % (to_langage, langage, to_translate.replace(" ", "+"))
+    request = urllib2.Request(link, headers=agents)
+    page = urllib2.urlopen(request).read()
+    result = page[page.find(before_trans)+len(before_trans):]
+    result = result.split("<")[0]
+    return result
+
+if __name__ == '__main__':
+    to_translate = 'Hola como estas?'
+    print("%s >> %s" % (to_translate, translate(to_translate)))
+    print("%s >> %s" % (to_translate, translate(to_translate, 'fr')))
+#should print Hola como estas >> Hello how are you
+#and Hola como estas? >> Bonjour comment allez-vous?
+
+
+
 
 
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/buscador.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/buscador.py
index 26921d6e742327a587b44dc01a39d411cea49290..2df438bc1c68530854ebf7a7a243c00525f578e6 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/buscador.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/buscador.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
-#------------------------------------------------------------
+# ------------------------------------------------------------
 # pelisalacarta - XBMC Plugin
 # http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re,os,sys
+# ------------------------------------------------------------
+
+import os
 
 from core import config
 from core import logger
 from core.item import Item
-from core import scrapertools
 from core import channeltools
 
 __channel__ = "buscador"
@@ -17,36 +17,41 @@ logger.info("pelisalacarta.channels.buscador init")
 
 DEBUG = True
 
+
 def isGeneric():
     return True
 
-def mainlist(item,preferred_thumbnail="squares"):
+
+def mainlist(item):
     logger.info("pelisalacarta.channels.buscador mainlist")
 
-    itemlist = []
-    itemlist.append( Item(channel=__channel__ , action="search"  , title="Realizar nueva búsqueda..." ))
+    itemlist = list()
+    itemlist.append(Item(channel=__channel__, action="search", title="Realizar nueva búsqueda..."))
 
-    saved_searches_list = get_saved_searches(item.channel)
+    saved_searches_list = get_saved_searches()
 
     for saved_search_text in saved_searches_list:
-        itemlist.append( Item(channel=__channel__ , action="do_search"  , title=' "'+saved_search_text+'"', extra=saved_search_text ))
+        itemlist.append(Item(channel=__channel__, action="do_search", title=' "'+saved_search_text+'"',
+                             extra=saved_search_text))
 
-    if len(saved_searches_list)>0:
-        itemlist.append( Item(channel=__channel__ , action="clear_saved_searches"  , title="Borrar búsquedas guardadas" ))
+    if len(saved_searches_list) > 0:
+        itemlist.append(Item(channel=__channel__, action="clear_saved_searches", title="Borrar búsquedas guardadas"))
 
     return itemlist
 
+
 # Al llamar a esta función, el sistema pedirá primero el texto a buscar
 # y lo pasará en el parámetro "tecleado"
-def search(item,tecleado):
+def search(item, tecleado):
     logger.info("pelisalacarta.channels.buscador search")
 
-    if tecleado!="":
-        save_search(item.channel,tecleado)
+    if tecleado != "":
+        save_search(tecleado)
 
     item.extra = tecleado
     return do_search(item)
 
+
 # Esta es la función que realmente realiza la búsqueda
 def do_search(item):
     logger.info("pelisalacarta.channels.buscador do_search")
@@ -59,23 +64,26 @@ def do_search(item):
     import glob
     import imp
 
-    channels_path = os.path.join( config.get_runtime_path() , "channels" , '*.xml' )
+    channels_path = os.path.join(config.get_runtime_path(), "channels", '*.xml')
     logger.info("pelisalacarta.channels.buscador channels_path="+channels_path)
 
     channel_language = config.get_setting("channel_language")
     logger.info("pelisalacarta.channels.buscador channel_language="+channel_language)
-    if channel_language=="":
+    if channel_language == "":
         channel_language = "all"
         logger.info("pelisalacarta.channels.buscador channel_language="+channel_language)
 
+    show_dialog = False
+    progreso = None
     if config.is_xbmc():
         show_dialog = True
 
     try:
         import xbmcgui
         progreso = xbmcgui.DialogProgressBG()
-        progreso.create("Buscando "+ tecleado.title())
-    except:
+        progreso.create("Buscando " + tecleado.title())
+    except ImportError:
+        xbmcgui = None
         show_dialog = False
 
     channel_files = glob.glob(channels_path)
@@ -90,39 +98,40 @@ def do_search(item):
         channel_parameters = channeltools.get_channel_parameters(basename_without_extension)
 
         # No busca si es un canal inactivo
-        if channel_parameters["active"]!="true":
+        if channel_parameters["active"] != "true":
             continue
 
         # No busca si es un canal excluido de la busqueda global
-        if channel_parameters["include_in_global_search"]!="true":
+        if channel_parameters["include_in_global_search"] != "true":
             continue
 
         # No busca si es un canal para adultos, y el modo adulto está desactivado
-        if channel_parameters["adult"]=="true" and config.get_setting("adult_mode")=="false":
+        if channel_parameters["adult"] == "true" and config.get_setting("adult_mode") == "false":
             continue
 
         # No busca si el canal es en un idioma filtrado
-        if channel_language!="all" and channel_parameters["language"]!=channel_language:
+        if channel_language != "all" and channel_parameters["language"] != channel_language:
             continue
 
         if show_dialog:
-            progreso.update(percentage, ' Buscando "' + tecleado+ '"', basename_without_extension)
+            progreso.update(percentage, ' Buscando "' + tecleado + '"', basename_without_extension)
 
-        logger.info("pelisalacarta.channels.buscador Intentado busqueda en " + basename_without_extension + " de "+ tecleado)
+        logger.info("pelisalacarta.channels.buscador Intentado busqueda en " + basename_without_extension + " de " +
+                    tecleado)
         try:
 
             # http://docs.python.org/library/imp.html?highlight=imp#module-imp
             obj = imp.load_source(basename_without_extension, infile[:-4]+".py")
-            logger.info("pelisalacarta.channels.buscador cargado " + basename_without_extension + " de "+ infile)
-            channel_result_itemlist = obj.search( Item() , tecleado)
+            logger.info("pelisalacarta.channels.buscador cargado " + basename_without_extension + " de " + infile)
+            channel_result_itemlist = obj.search(Item(), tecleado)
             for item in channel_result_itemlist:
                 item.title = item.title + "[" + basename_without_extension + "]"
                 item.viewmode = "list"
 
-            itemlist.extend( channel_result_itemlist )
+            itemlist.extend(channel_result_itemlist)
         except:
             import traceback
-            logger.error( traceback.format_exc() )
+            logger.error(traceback.format_exc())
 
     itemlist = sorted(itemlist, key=lambda Item: Item.title) 
 
@@ -131,12 +140,13 @@ def do_search(item):
 
     return itemlist
 
-def save_search(channel,text):
 
-    saved_searches_limit = ( 10, 20, 30, 40, )[ int( config.get_setting( "saved_searches_limit" ) ) ]
+def save_search(text):
+
+    saved_searches_limit = (10, 20, 30, 40, )[int(config.get_setting("saved_searches_limit"))]
 
-    if os.path.exists(os.path.join( config.get_data_path() , "saved_searches.txt" )):
-        f = open( os.path.join( config.get_data_path() , "saved_searches.txt" ) , "r" )
+    if os.path.exists(os.path.join(config.get_data_path(), "saved_searches.txt")):
+        f = open(os.path.join(config.get_data_path(), "saved_searches.txt"), "r")
         saved_searches_list = f.readlines()
         f.close()
     else:
@@ -144,25 +154,27 @@ def save_search(channel,text):
 
     saved_searches_list.append(text)
 
-    if len(saved_searches_list)>=saved_searches_limit:
+    if len(saved_searches_list) >= saved_searches_limit:
         # Corta la lista por el principio, eliminando los más recientes
         saved_searches_list = saved_searches_list[-saved_searches_limit:]
 
-    f = open( os.path.join( config.get_data_path() , "saved_searches.txt" ) , "w" )
+    f = open(os.path.join(config.get_data_path(), "saved_searches.txt"), "w")
     for saved_search in saved_searches_list:
         f.write(saved_search+"\n")
     f.close()
 
+
 def clear_saved_searches(item):
 
-    f = open( os.path.join( config.get_data_path() , "saved_searches.txt" ) , "w" )
+    f = open(os.path.join(config.get_data_path(), "saved_searches.txt"), "w")
     f.write("")
     f.close()
 
-def get_saved_searches(channel):
 
-    if os.path.exists(os.path.join( config.get_data_path() , "saved_searches.txt" )):
-        f = open( os.path.join( config.get_data_path() , "saved_searches.txt" ) , "r" )
+def get_saved_searches():
+
+    if os.path.exists(os.path.join(config.get_data_path(), "saved_searches.txt")):
+        f = open(os.path.join(config.get_data_path(), "saved_searches.txt"), "r")
         saved_searches_list = f.readlines()
         f.close()
     else:
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinehanwer.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinehanwer.py
index 9b2454c68db1f849c727efaff4bc77e78410621e..8ab9e3455575be59c705e1693ed6fbd0a0b3bbe6 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinehanwer.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinehanwer.py
@@ -1,460 +1,460 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-# pelisalacarta - XBMC Plugin
-# Canal para cinehanwer
-# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
-#------------------------------------------------------------
-
-import urlparse,urllib2,urllib,re
-import os, sys
-
-from core import logger
-from core import config
-from core import scrapertools
-from core import jsontools
-from core.item import Item
-from servers import servertools
-
-DEBUG = config.get_setting("debug")
-
-__category__ = "A"
-__type__ = "generic"
-__title__ = "cinehanwer"
-__channel__ = "cinehanwer"
-__language__ = "ES"
-__creationdate__ = "20140615"
-
-def isGeneric():
-    return True
-
-def mainlist(item):
-    logger.info("pelisalacarta.channels.cinehanwer mainlist")
-
-    itemlist = []
-    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Estrenos"            , url="http://cinehanwer.us/estrenos/" ))
-    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Novedades"            , url="http://cinehanwer.us" ))
-    itemlist.append( Item(channel=__channel__, action="calidades" , title="Por calidad"          , url="http://cinehanwer.us/estrenos/" ))
-    itemlist.append( Item(channel=__channel__, action="generos" , title="Por género"          , url="http://cinehanwer.us/estrenos/" ))
-    itemlist.append( Item(channel=__channel__, action="search"  , title="Buscar..."            , url="http://cinehanwer.us/estrenos/" ))
-    
-      
-    return itemlist
-    
-def series(item):
-    logger.info("pelisalacarta.channels.cinehanwer series")
-
-    itemlist = []
-    itemlist.append( Item(channel=__channel__, action="series_new"  , title="Novedades Series"            , url="http://series.cinehanwer.us" ))
-    itemlist.append( Item(channel=__channel__, action="series_list"  , title="Listado Series"            , url="http://series.cinehanwer.us/series/" ))
-    itemlist.append( Item(channel=__channel__, action="search"  , title="Buscar..."            , url="http://series.cinehanwer.us" ))
-  
-    return itemlist
-
-def calidades(item):
-    logger.info("pelisalacarta.channels.cinehanwer calidades")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    data = scrapertools.find_single_match(data,'<div class="titc[^>]+>Buscar por C(.*?)</ul>')
-    logger.info("data="+data)
-
-    # Extrae las entradas (carpetas)
-    patron  = '<li><a title="[^"]+" href="([^"]+)"><strong>([^<]+)</strong></a></li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl,scrapedtitle in matches:
-        title = scrapedtitle.strip()
-        thumbnail = ""
-        plot = ""
-        url = urlparse.urljoin(item.url,scrapedurl)
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="peliculas" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
-
-    return itemlist
-
-def generos(item):
-    logger.info("pelisalacarta.channels.cinehanwer generos")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    data = scrapertools.find_single_match(data,'<div class="titc[^>]+>Buscar por G(.*?)</ul>')
-    logger.info("data="+data)
-
-    # Extrae las entradas (carpetas)
-    patron  = '<li><a href="([^"]+)"[^>]+>([^<]+)</a></li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl,scrapedtitle in matches:
-        title = scrapedtitle.strip()
-        thumbnail = ""
-        plot = ""
-        url = urlparse.urljoin(item.url,scrapedurl)
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="peliculas" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
-
-    return itemlist
-'''
-def search(item,texto):
-    logger.info("pelisalacarta.channels.cinehanwer search")
-    if item.url=="":
-        item.url="http://www.cinehanwer.us/pelis"
-    texto = texto.replace(" ","-")
-    # Mete el referer en item.extra
-    item.extra = item.url
-    item.url = item.url+"/search/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 search(item,texto):
-    logger.info("pelisalacarta.channels.cinehanwer search")
-    texto = texto.replace(" ","-")
-    if item.url=="":
-        item.url="http://cinehanwer.us/estrenos/"
-    if item.url=="http://www.cinehanwer.us/estrenos/" or item.url=="http://cinehanwer.us/estrenos/":
-        # Mete el referer en item.extra
-        item.extra = item.url
-        #item.url = item.url+"/search/query/"+texto+"/years/1950/on/undefined/showlist/all"
-	item.url = "http://www.cinehanwer.us/buscar/?q="+texto
-        try:
-            #return buscar(item)
-	    return peliculas(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 []
-    if item.url=="http://series.cinehanwer.us":
-        item.extra = item.url
-        item.url = "http://series.cinehanwer.us/wp-admin/admin-ajax.php?action=dwls_search&s="+texto
-        try:
-            return series_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("pelisalacarta.channels.cinehanwer buscar")
-
-    # Descarga la pagina
-    headers = DEFAULT_HEADERS[:]
-    headers.append(["Referer",item.extra])
-    headers.append(["X-Requested-With","XMLHttpRequest"])
-    data = scrapertools.cache_page(item.url,headers=headers)
-    logger.info("data="+data)
-
-    # Extrae las entradas (carpetas)  
-    '''
-    {"html":"\n\t<div class=\"ddItemContainer modelContainer\" data-model=\"serie\" data-id=\"13051\">\n\n\t\t<div data-action=\"status\" class=\"dropdownContainer desplegableAbstract\">\n\t\t\t<span><i class=\"icon-caret-down\"><\/i><\/span>\n\t\t\t<ul class=\"dropdown\">\n\t\t\t\t<li data-value=\"1\"><a href=\"#\"><i class=\"icon-check\"><\/i>Pendiente<\/a><\/li>\n\t\t\t\t<li data-value=\"2\"><a href=\"#\"><i class=\"icon-eye-open\"><\/i>Siguiendo<\/a><\/li>                <li data-value=\"3\"><a href=\"#\"><i class=\"icon-eye-close\"><\/i>Finalizada<\/a><\/li>\n                <li data-value=\"4\"><a href=\"#\"><i class=\"icon-heart\"><\/i>Favorita<\/a><\/li>\n                <li data-value=\"tolist\"><a href=\"\/serie\/attack-on-titan\/addtolist\"><i class=\"icon-list\"><\/i>A\u00f1adir a lista<\/a><\/li>\n\t\t\t\t<li data-value=\"0\" class=\"cancel\"><a href=\"#\" style=\"color:#999;\"><i class=\"icon-remove\"><\/i>Cancelar<\/a><\/li>\n\t\t\t<\/ul>\n\t\t<\/div>\n\n        <a class=\"defaultLink extended\" href=\"\/serie\/attack-on-titan\">\n\n\t\t\t<div class=\"coverMini shadow tiptip\" title=\"Ataque a los Titanes\">\n\n\n\t\t\t\t\t<img class=\"centeredPic centeredPicFalse\"  onerror=\"this.src='\/images\/cover-notfound.png';\"  src=\"\/content\/covers\/mediathumb-13051-5.png\"\/>\n\n                    <img src=\"\/images\/loading-mini.gif\" class=\"loader\"\/>\n\t\t\t<\/div>\n\t\t\t<span class=\"title\">Ataque a los Titanes<\/span>\n        <\/a>\n\n        \n\n\n        \t<\/div>\n\n\n\t<div class=\"ddItemContainer modelContainer\" data-model=\"serie\" data-id=\"4901\">\n\n\t\t<div data-action=\"status\" class=\"dropdownContainer desplegableAbstract\">\n\t\t\t<span><i class=\"icon-caret-down\"><\/i><\/span>\n\t\t\t<ul class=\"dropdown\">\n\t\t\t\t<li data-value=\"1\"><a href=\"#\"><i class=\"icon-check\"><\/i>Pendiente<\/a><\/li>\n\t\t\t\t<li data-value=\"2\"><a href=\"#\"><i class=\"icon-eye-open\"><\/i>Siguiendo<\/a><\/li>                <li data-value=\"3\"><a href=\"#\"><i class=\"icon-eye-close\"><\/i>Finalizada<\/a><\/li>\n                <li data-value=\"4\"><a href=\"#\"><i class=\"icon-heart\"><\/i>Favorita<\/a><\/li>\n                <li data-value=\"tolist\"><a href=\"\/serie\/huntik-secrets-&-seekers\/addtolist\"><i class=\"icon-list\"><\/i>A\u00f1adir a lista<\/a><\/li>\n\t\t\t\t<li data-value=\"0\" class=\"cancel\"><a href=\"#\" style=\"color:#999;\"><i class=\"icon-remove\"><\/i>Cancelar<\/a><\/li>\n\t\t\t<\/ul>\n\t\t<\/div>\n\n        <a class=\"defaultLink extended\" href=\"\/serie\/huntik-secrets-&-seekers\">\n\n\t\t\t<div class=\"coverMini shadow tiptip\" title=\"Huntik: Secrets &amp; Seekers\">\n\n\n\t\t\t\t\t<img class=\"centeredPic centeredPicFalse\"  onerror=\"this.src='\/images\/cover-notfound.png';\"  src=\"\/content\/covers\/mediathumb-4901-5.png\"\/>\n\n                    <img src=\"\/images\/loading-mini.gif\" class=\"loader\"\/>\n\t\t\t<\/div>\n\t\t\t<span class=\"title\">Huntik: Secrets &amp; Seekers<\/span>\n        <\/a>\n\n        \n\n\n        \t<\/div>\n\n<div class=\"loadingBar\" data-url=\"\/series\/loadmedia\/offset\/30\/showlist\/all\/years\/1950\/query\/titanes\/on\/undefined\">\n    <span class=\"text\">Cargar m\u00e1s    <\/span><i class=\"icon-caret-down text\"><\/i>\n    <img src=\"\/images\/loading.gif\">\n<\/div>","ready":"\n\t\tcontroller.userStatus(\"serie\", \"13051\", \"0\");\n\t\n\t\tcontroller.userStatus(\"serie\", \"4901\", \"0\");\n\t","error":"","title":"cinehanwer.us - Search Series - cinehanwer.us","data":[],"facets":"<a class=\"mediaFilterLink active\" data-value=\"0\" href=\"\/series\">Todos<\/a><a class=\"mediaFilterLink\" data-value=\"action and adventure\" href=\"\/series\/index\/genre\/action+and+adventure\">Acci\u00f3n y Aventura <span class=\"num\">(2)<\/span><\/a><a class=\"mediaFilterLink\" data-value=\"animation\" href=\"\/series\/index\/genre\/animation\">Animaci\u00f3n <span class=\"num\">(2)<\/span><\/a><a class=\"mediaFilterLink\" data-value=\"drama\" href=\"\/series\/index\/genre\/drama\">Drama <span class=\"num\">(1)<\/span><\/a><a class=\"mediaFilterLink\" data-value=\"fantasy\" href=\"\/series\/index\/genre\/fantasy\">Fantas\u00eda <span class=\"num\">(1)<\/span><\/a><a class=\"mediaFilterLink\" data-value=\"children\" href=\"\/series\/index\/genre\/children\">Infantil <span class=\"num\">(1)<\/span><\/a>","session":"1v1jo5vqu64g3obvnt44cdtl07","screenId":"screen-1739968202"}
-    '''
-    json_object = jsontools.load_json(data)
-    logger.info("html="+json_object["html"])
-    data = json_object["html"]
-
-    '''
-    <a class="defaultLink extended" href="/serie/huntik-secrets-&-seekers">
-    <div class="coverMini shadow tiptip" title="Huntik: Secrets &amp; Seekers">
-    <img class="centeredPic centeredPicFalse"  onerror="this.src='/images/cover-notfound.png';"  src="/content/covers/mediathumb-4901-5.png"/>
-    <img src="/images/loading-mini.gif" class="loader"/>
-    </div>
-    <span class="title">Huntik: Secrets &amp; Seekers</span>
-    </a>
-    '''
-    patron  = '<a class="defaultLink extended" href="([^"]+)"[^<]+'
-    patron += '<div class="coverMini shadow tiptip" title="([^"]+)"[^<]+'
-    patron += '<img class="centeredPic.*?src="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
-        title = scrapertools.htmlclean(scrapedtitle)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        plot = ""
-        #http://www.cinehanwer.us/peli/the-lego-movie
-        #http://www.cinehanwer.us/links/view/slug/the-lego-movie/what/peli?popup=1
-
-        if "/peli/" in scrapedurl:
-            referer = urlparse.urljoin(item.url,scrapedurl)
-            url = referer.replace("/peli/","/links/view/slug/")+"/what/peli"
-            if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-            itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , extra=referer, url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
-        else:
-            referer = item.url
-            url = urlparse.urljoin(item.url,scrapedurl)
-            itemlist.append( Item(channel=__channel__, action="episodios" , title=title , extra=referer, url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
-
-    return itemlist
-
-def series_buscar(item):
-    logger.info("pelisalacarta.channels.cinehanwer series_buscar")
-
-    # Descarga la pagina
-    headers = DEFAULT_HEADERS[:]
-    headers.append(["Referer",item.extra])
-    headers.append(["X-Requested-With","XMLHttpRequest"])
-    data = scrapertools.cache_page(item.url,headers=headers)
-    logger.info("data="+data)
-
-    # Extrae las entradas (carpetas)  
-    '''
-    {"searchTerms":"yes","results":[{"ID":4501,"post_author":"1","post_date":"mayo 23, 2014","post_date_gmt":"2014-05-23 17:56:47","post_title":"4x06 - Leyes de dioses y hombres","post_excerpt":"<p>La historia de Canci\u00f3n de Hielo y Fuego se sit\u00faa en un mundo ficticio medieval. Hay tres l\u00edneas [...]<\/p>\n","post_status":"publish","comment_status":"open","ping_status":"open","post_password":"","post_name":"4x06-leyes-de-dioses-y-hombres","to_ping":"","pinged":"","post_modified":"2014-05-23 19:56:47","post_modified_gmt":"2014-05-23 17:56:47","post_content_filtered":"","post_parent":0,"guid":"http:\/\/series.cinehanwer.us\/?p=4501","menu_order":0,"post_type":"post","post_mime_type":"","comment_count":"0","filter":"raw","post_author_nicename":"admin","permalink":"http:\/\/series.cinehanwer.us\/4x06-leyes-de-dioses-y-hombres\/","attachment_thumbnail":"http:\/\/series.cinehanwer.us\/wp-content\/uploads\/2013\/04\/\u00edndice-150x150.jpg","show_more":true},{"ID":4424,"post_author":"1","post_date":"mayo 16, 2014","post_date_gmt":"2014-05-16 09:02:06","post_title":"1x20 - El hacedor de reyes","post_excerpt":"<p>El criminal m\u00e1s buscado del mundo, Thomas Raymond Reddington (James Spader, se entrega [...]<\/p>\n","post_status":"publish","comment_status":"open","ping_status":"open","post_password":"","post_name":"1x20-el-hacedor-de-reyes","to_ping":"","pinged":"","post_modified":"2014-05-16 11:02:06","post_modified_gmt":"2014-05-16 09:02:06","post_content_filtered":"","post_parent":0,"guid":"http:\/\/series.cinehanwer.us\/?p=4424","menu_order":0,"post_type":"post","post_mime_type":"","comment_count":"0","filter":"raw","post_author_nicename":"admin","permalink":"http:\/\/series.cinehanwer.us\/1x20-el-hacedor-de-reyes\/","attachment_thumbnail":"http:\/\/series.cinehanwer.us\/wp-content\/uploads\/2014\/01\/The-Blacklist-128x128.jpeg","show_more":true}],"displayPostMeta":true}
-    '''
-    json_object = jsontools.load_json(data)
-    logger.info("results="+json_object["results"])
-    data = json_object["results"]
-    
-    for entries in data:
-        title = scrapertools.htmlclean(entries["post_title"])
-        thumbnail = scrapertools.htmlclean(entries["attachment_thumbnail"])
-        url = scrapertools.htmlclean(entries["permalink"])
-        plot = ""
-   
-        itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
- 
-    return itemlist    
-    
-def peliculas(item):
-    logger.info("pelisalacarta.channels.cinehanwer peliculas")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    logger.info("data="+data)
-
-    # Extrae las entradas
-    '''
-    <a href="/pelicula/3708/tarzan.html" title="Tarzan" >
-    <img style="margin-top:0;" src="/files/uploads/3708.jpg" alt="" />
-    <cite><center>Tarzan<br/><br><br><span class="txcnhd cowh dino" style=" color: #fff; ">
-    <strong>Genero:</strong> Animacion<br>
-    <strong>A&ntilde;o:</strong> 2014<br>
-    <strong>Calidad:</strong> BR-Screener<br>
-    <strong>Idiomas :</strong>  Espa&ntilde;ol
-    '''
-    patron  = '<a href="([^"]+)" title="([^"]+)"[^<]+'
-    patron += '<img style="[^"]+" src="([^"]+)"[^<]+'
-    patron += '<cite>(.*?)</cite>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedplot in matches:
-        title = scrapedtitle.strip()
-        title = scrapertools.htmlclean(title)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        plot = scrapertools.htmlclean(scrapedplot)
-        url = urlparse.urljoin(item.url,scrapedurl)
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
-
-    #</b></span></a></li[^<]+<li><a href="?page=2">
-    next_page = scrapertools.find_single_match(data,'</b></span></a></li[^<]+<li><a href="([^"]+)">')
-    if next_page!="":
-    #    itemlist.append( Item(channel=__channel__, action="peliculas" , title=">> Página siguiente" , url=item.url+next_page, folder=True))
-        itemlist.append( Item(channel=__channel__, action="peliculas" , title=">> Página siguiente" , url=urlparse.urljoin(item.url,next_page), folder=True))
-      
-    return itemlist
-    
-def series_new(item):
-    logger.info("pelisalacarta.channels.cinehanwer series_new")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    logger.info("data="+data)
-
-    # Extrae las entradas
-
-    patron = '<div class="show-thumbnail">[^<]+<a href="([^"]+)">[\s\S]+?<img src="([^"]+)"[\s\S]+?<h3><a[\s\S]+?title="([^"]+?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
-        #title = unicode( scrapedtitle, "iso-8859-1" , errors="replace" ).encode("utf-8")
-        title = scrapedtitle
-        title = title.strip()
-        title = scrapertools.htmlclean(title)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        plot = ""
-        url = urlparse.urljoin(item.url,scrapedurl)
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
-      
-    return itemlist
-    
-def series_list(item):
-    logger.info("pelisalacarta.channels.cinehanwer series_list")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    logger.info("data="+data)
-
-    # Extrae las entradas
-
-    patron = '<li><a href="([^"]+)">([^"]+)<\/a><\/li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl, scrapedtitle in matches:
-        #title = unicode( scrapedtitle, "iso-8859-1" , errors="replace" ).encode("utf-8")
-        title = scrapedtitle
-        title = title.strip()
-        title = scrapertools.htmlclean(title)
-        thumbnail = ""
-        plot = ""
-        url = "http://series.cinehanwer.us/wp-content/themes/bueno/ajax/seriesajaxresp_get.php?serie="+scrapedurl+"&status=0"
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="series_seasons"  , title=title ,  url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
-        #itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
-      
-    return itemlist
-    
-def series_seasons(item):
-    logger.info("pelisalacarta.channels.cinehanwer series_seasons")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    logger.info("data="+data)
-
-    # Extrae las entradas
-
-    patron = '<li><a href="([^"]+)">([^"]+)<\/a><\/li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl, scrapedtitle in matches:
-        #title = unicode( scrapedtitle, "iso-8859-1" , errors="replace" ).encode("utf-8")
-        title = scrapedtitle
-        title = title.strip()
-        title = scrapertools.htmlclean(title)
-        thumbnail = ""
-        plot = ""
-        url = "http://series.cinehanwer.us/wp-content/themes/bueno/ajax/seriesajaxresp_get.php?serie="+scrapedurl+"&status=1"
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="series_chapters"  , title=title ,  url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
-        #itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
-      
-    return itemlist
-    
-def series_chapters(item):
-    logger.info("pelisalacarta.channels.cinehanwer series_chapters")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    logger.info("data="+data)
-
-    # Extrae las entradas
-
-    patron = '<li><a href="([^"]+)">([^"]+)<\/a><\/li>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl, scrapedtitle in matches:
-        #title = unicode( scrapedtitle, "iso-8859-1" , errors="replace" ).encode("utf-8")
-        title = scrapedtitle
-        title = title.strip()
-        title = scrapertools.htmlclean(title)
-        thumbnail = ""
-        plot = ""
-        url = "http://series.cinehanwer.us/wp-content/themes/bueno/ajax/seriesajaxresp_get.php?id="+scrapedurl+"&status=2"
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos_series"  , title=title ,  url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
-        #itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
-      
-    return itemlist
-
-
-def findvideos(item):
-    logger.info("pelisalacarta.channels.cinehanwer findvideos")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    #logger.info("data="+data)
-
-    # Extrae las entradas (carpetas)  
-    patron  = '<tr[^<]+'
-    patron += '<td[^<]+<div[^<]+'
-    patron += '<img[^<]+'
-    patron += '<a href="([^"]+)"[^<]+</a></td[^<]+'
-    patron += '<td[^<]+<img src="([^"]+)"</td[^<]+'
-    patron += '<td[^<]+<img[^>]+>([^<]+)</td[^<]+'
-    patron += '<td[^>]+>([^<]+)</td[^<]+'
-    patron += '<td[^<]+</td[^<]+'
-    patron += '<td[^<]+'
-    patron += '<a title="Reportar este enlace"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl,serverthumb,idioma,calidad in matches:
-        idioma = idioma.strip()
-        calidad = calidad.strip()
-        nombre_servidor = serverthumb.split("/")[-1]
-
-        title = "Ver en "+nombre_servidor+" ("+idioma+") (Calidad "+calidad+")"
-        url = scrapedurl
-        thumbnail = ""
-        plot = ""
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False))
-
-    return itemlist
-
-def findvideos_series(item):
-    logger.info("pelisalacarta.channels.cinehanwer findvideos_series")
-
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    #logger.info("data="+data)
-
-    # Extrae las entradas (carpetas)  
-    patron  = '<div class="download_buttton">[\s\S]+?<a href="([^"<]+)[\S\s]+?<img border="0" src="">[\s\S]+?<br>([^"<]+)'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    
-    for scrapedurl, title in matches:
-        if (title == "") : title = scapedurl 
-        title = title.strip()
-        url = scrapedurl
-        thumbnail = ""
-        plot = ""
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"]")
-        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False))
-        
-    # Extrae las entradas (links)
-    patron  = '<iframe src="([^"<]+)'
-    matches = re.compile(patron,re.DOTALL).findall(data)    
-    # Extra las entradas dentro de un iframe
-    for scrapedurl in matches:
-        title = "Ver en "+ scrapedurl 
-        title = title.strip()
-        url = scrapedurl
-        thumbnail = ""
-        plot = ""
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"]")
-        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False))
-    
-    return itemlist
-    
-
-def play(item):
-    logger.info("pelisalacarta.channels.cinehanwer play url="+item.url)
-
-    itemlist = servertools.find_video_items(data=item.url)
-
-    for videoitem in itemlist:
-        videoitem.title = item.title
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = __channel__
-
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+# pelisalacarta - XBMC Plugin
+# Canal para cinehanwer
+# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
+#------------------------------------------------------------
+
+import urlparse,urllib2,urllib,re
+import os, sys
+
+from core import logger
+from core import config
+from core import scrapertools
+from core import jsontools
+from core.item import Item
+from servers import servertools
+
+DEBUG = config.get_setting("debug")
+
+__category__ = "A"
+__type__ = "generic"
+__title__ = "cinehanwer"
+__channel__ = "cinehanwer"
+__language__ = "ES"
+__creationdate__ = "20140615"
+
+def isGeneric():
+    return True
+
+def mainlist(item):
+    logger.info("pelisalacarta.channels.cinehanwer mainlist")
+
+    itemlist = []
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Estrenos"            , url="http://cinehanwer.us/estrenos/" ))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Novedades"            , url="http://cinehanwer.us" ))
+    itemlist.append( Item(channel=__channel__, action="calidades" , title="Por calidad"          , url="http://cinehanwer.us/estrenos/" ))
+    itemlist.append( Item(channel=__channel__, action="generos" , title="Por género"          , url="http://cinehanwer.us/estrenos/" ))
+    itemlist.append( Item(channel=__channel__, action="search"  , title="Buscar..."            , url="http://cinehanwer.us/estrenos/" ))
+    
+      
+    return itemlist
+    
+def series(item):
+    logger.info("pelisalacarta.channels.cinehanwer series")
+
+    itemlist = []
+    itemlist.append( Item(channel=__channel__, action="series_new"  , title="Novedades Series"            , url="http://series.cinehanwer.us" ))
+    itemlist.append( Item(channel=__channel__, action="series_list"  , title="Listado Series"            , url="http://series.cinehanwer.us/series/" ))
+    itemlist.append( Item(channel=__channel__, action="search"  , title="Buscar..."            , url="http://series.cinehanwer.us" ))
+  
+    return itemlist
+
+def calidades(item):
+    logger.info("pelisalacarta.channels.cinehanwer calidades")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    data = scrapertools.find_single_match(data,'<div class="txc[^>]+>Buscar por C(.*?)</ul>')
+    logger.info("data="+data)
+
+    # Extrae las entradas (carpetas)
+    patron  = '<li><a title="[^"]+" href="([^"]+)"><strong>([^<]+)</strong></a></li>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl,scrapedtitle in matches:
+        title = scrapedtitle.strip()
+        thumbnail = ""
+        plot = ""
+        url = urlparse.urljoin(item.url,scrapedurl)
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=__channel__, action="peliculas" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
+
+    return itemlist
+
+def generos(item):
+    logger.info("pelisalacarta.channels.cinehanwer generos")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    data = scrapertools.find_single_match(data,'<div class="txc[^>]+>Buscar por G(.*?)</ul>')
+    logger.info("data="+data)
+
+    # Extrae las entradas (carpetas)
+    patron  = '<li><a href="([^"]+)"[^>]+>([^<]+)</a></li>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl,scrapedtitle in matches:
+        title = scrapedtitle.strip()
+        thumbnail = ""
+        plot = ""
+        url = urlparse.urljoin(item.url,scrapedurl)
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=__channel__, action="peliculas" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
+
+    return itemlist
+'''
+def search(item,texto):
+    logger.info("pelisalacarta.channels.cinehanwer search")
+    if item.url=="":
+        item.url="http://www.cinehanwer.us/pelis"
+    texto = texto.replace(" ","-")
+    # Mete el referer en item.extra
+    item.extra = item.url
+    item.url = item.url+"/search/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 search(item,texto):
+    logger.info("pelisalacarta.channels.cinehanwer search")
+    texto = texto.replace(" ","-")
+    if item.url=="":
+        item.url="http://cinehanwer.us/estrenos/"
+    if item.url=="http://www.cinehanwer.us/estrenos/" or item.url=="http://cinehanwer.us/estrenos/":
+        # Mete el referer en item.extra
+        item.extra = item.url
+        #item.url = item.url+"/search/query/"+texto+"/years/1950/on/undefined/showlist/all"
+	item.url = "http://www.cinehanwer.us/buscar/?q="+texto
+        try:
+            #return buscar(item)
+	    return peliculas(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 []
+    if item.url=="http://series.cinehanwer.us":
+        item.extra = item.url
+        item.url = "http://series.cinehanwer.us/wp-admin/admin-ajax.php?action=dwls_search&s="+texto
+        try:
+            return series_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("pelisalacarta.channels.cinehanwer buscar")
+
+    # Descarga la pagina
+    headers = DEFAULT_HEADERS[:]
+    headers.append(["Referer",item.extra])
+    headers.append(["X-Requested-With","XMLHttpRequest"])
+    data = scrapertools.cache_page(item.url,headers=headers)
+    logger.info("data="+data)
+
+    # Extrae las entradas (carpetas)  
+    '''
+    {"html":"\n\t<div class=\"ddItemContainer modelContainer\" data-model=\"serie\" data-id=\"13051\">\n\n\t\t<div data-action=\"status\" class=\"dropdownContainer desplegableAbstract\">\n\t\t\t<span><i class=\"icon-caret-down\"><\/i><\/span>\n\t\t\t<ul class=\"dropdown\">\n\t\t\t\t<li data-value=\"1\"><a href=\"#\"><i class=\"icon-check\"><\/i>Pendiente<\/a><\/li>\n\t\t\t\t<li data-value=\"2\"><a href=\"#\"><i class=\"icon-eye-open\"><\/i>Siguiendo<\/a><\/li>                <li data-value=\"3\"><a href=\"#\"><i class=\"icon-eye-close\"><\/i>Finalizada<\/a><\/li>\n                <li data-value=\"4\"><a href=\"#\"><i class=\"icon-heart\"><\/i>Favorita<\/a><\/li>\n                <li data-value=\"tolist\"><a href=\"\/serie\/attack-on-titan\/addtolist\"><i class=\"icon-list\"><\/i>A\u00f1adir a lista<\/a><\/li>\n\t\t\t\t<li data-value=\"0\" class=\"cancel\"><a href=\"#\" style=\"color:#999;\"><i class=\"icon-remove\"><\/i>Cancelar<\/a><\/li>\n\t\t\t<\/ul>\n\t\t<\/div>\n\n        <a class=\"defaultLink extended\" href=\"\/serie\/attack-on-titan\">\n\n\t\t\t<div class=\"coverMini shadow tiptip\" title=\"Ataque a los Titanes\">\n\n\n\t\t\t\t\t<img class=\"centeredPic centeredPicFalse\"  onerror=\"this.src='\/images\/cover-notfound.png';\"  src=\"\/content\/covers\/mediathumb-13051-5.png\"\/>\n\n                    <img src=\"\/images\/loading-mini.gif\" class=\"loader\"\/>\n\t\t\t<\/div>\n\t\t\t<span class=\"title\">Ataque a los Titanes<\/span>\n        <\/a>\n\n        \n\n\n        \t<\/div>\n\n\n\t<div class=\"ddItemContainer modelContainer\" data-model=\"serie\" data-id=\"4901\">\n\n\t\t<div data-action=\"status\" class=\"dropdownContainer desplegableAbstract\">\n\t\t\t<span><i class=\"icon-caret-down\"><\/i><\/span>\n\t\t\t<ul class=\"dropdown\">\n\t\t\t\t<li data-value=\"1\"><a href=\"#\"><i class=\"icon-check\"><\/i>Pendiente<\/a><\/li>\n\t\t\t\t<li data-value=\"2\"><a href=\"#\"><i class=\"icon-eye-open\"><\/i>Siguiendo<\/a><\/li>                <li data-value=\"3\"><a href=\"#\"><i class=\"icon-eye-close\"><\/i>Finalizada<\/a><\/li>\n                <li data-value=\"4\"><a href=\"#\"><i class=\"icon-heart\"><\/i>Favorita<\/a><\/li>\n                <li data-value=\"tolist\"><a href=\"\/serie\/huntik-secrets-&-seekers\/addtolist\"><i class=\"icon-list\"><\/i>A\u00f1adir a lista<\/a><\/li>\n\t\t\t\t<li data-value=\"0\" class=\"cancel\"><a href=\"#\" style=\"color:#999;\"><i class=\"icon-remove\"><\/i>Cancelar<\/a><\/li>\n\t\t\t<\/ul>\n\t\t<\/div>\n\n        <a class=\"defaultLink extended\" href=\"\/serie\/huntik-secrets-&-seekers\">\n\n\t\t\t<div class=\"coverMini shadow tiptip\" title=\"Huntik: Secrets &amp; Seekers\">\n\n\n\t\t\t\t\t<img class=\"centeredPic centeredPicFalse\"  onerror=\"this.src='\/images\/cover-notfound.png';\"  src=\"\/content\/covers\/mediathumb-4901-5.png\"\/>\n\n                    <img src=\"\/images\/loading-mini.gif\" class=\"loader\"\/>\n\t\t\t<\/div>\n\t\t\t<span class=\"title\">Huntik: Secrets &amp; Seekers<\/span>\n        <\/a>\n\n        \n\n\n        \t<\/div>\n\n<div class=\"loadingBar\" data-url=\"\/series\/loadmedia\/offset\/30\/showlist\/all\/years\/1950\/query\/titanes\/on\/undefined\">\n    <span class=\"text\">Cargar m\u00e1s    <\/span><i class=\"icon-caret-down text\"><\/i>\n    <img src=\"\/images\/loading.gif\">\n<\/div>","ready":"\n\t\tcontroller.userStatus(\"serie\", \"13051\", \"0\");\n\t\n\t\tcontroller.userStatus(\"serie\", \"4901\", \"0\");\n\t","error":"","title":"cinehanwer.us - Search Series - cinehanwer.us","data":[],"facets":"<a class=\"mediaFilterLink active\" data-value=\"0\" href=\"\/series\">Todos<\/a><a class=\"mediaFilterLink\" data-value=\"action and adventure\" href=\"\/series\/index\/genre\/action+and+adventure\">Acci\u00f3n y Aventura <span class=\"num\">(2)<\/span><\/a><a class=\"mediaFilterLink\" data-value=\"animation\" href=\"\/series\/index\/genre\/animation\">Animaci\u00f3n <span class=\"num\">(2)<\/span><\/a><a class=\"mediaFilterLink\" data-value=\"drama\" href=\"\/series\/index\/genre\/drama\">Drama <span class=\"num\">(1)<\/span><\/a><a class=\"mediaFilterLink\" data-value=\"fantasy\" href=\"\/series\/index\/genre\/fantasy\">Fantas\u00eda <span class=\"num\">(1)<\/span><\/a><a class=\"mediaFilterLink\" data-value=\"children\" href=\"\/series\/index\/genre\/children\">Infantil <span class=\"num\">(1)<\/span><\/a>","session":"1v1jo5vqu64g3obvnt44cdtl07","screenId":"screen-1739968202"}
+    '''
+    json_object = jsontools.load_json(data)
+    logger.info("html="+json_object["html"])
+    data = json_object["html"]
+
+    '''
+    <a class="defaultLink extended" href="/serie/huntik-secrets-&-seekers">
+    <div class="coverMini shadow tiptip" title="Huntik: Secrets &amp; Seekers">
+    <img class="centeredPic centeredPicFalse"  onerror="this.src='/images/cover-notfound.png';"  src="/content/covers/mediathumb-4901-5.png"/>
+    <img src="/images/loading-mini.gif" class="loader"/>
+    </div>
+    <span class="title">Huntik: Secrets &amp; Seekers</span>
+    </a>
+    '''
+    patron  = '<a class="defaultLink extended" href="([^"]+)"[^<]+'
+    patron += '<div class="coverMini shadow tiptip" title="([^"]+)"[^<]+'
+    patron += '<img class="centeredPic.*?src="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+        title = scrapertools.htmlclean(scrapedtitle)
+        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
+        plot = ""
+        #http://www.cinehanwer.us/peli/the-lego-movie
+        #http://www.cinehanwer.us/links/view/slug/the-lego-movie/what/peli?popup=1
+
+        if "/peli/" in scrapedurl:
+            referer = urlparse.urljoin(item.url,scrapedurl)
+            url = referer.replace("/peli/","/links/view/slug/")+"/what/peli"
+            if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+            itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , extra=referer, url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
+        else:
+            referer = item.url
+            url = urlparse.urljoin(item.url,scrapedurl)
+            itemlist.append( Item(channel=__channel__, action="episodios" , title=title , extra=referer, url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
+
+    return itemlist
+
+def series_buscar(item):
+    logger.info("pelisalacarta.channels.cinehanwer series_buscar")
+
+    # Descarga la pagina
+    headers = DEFAULT_HEADERS[:]
+    headers.append(["Referer",item.extra])
+    headers.append(["X-Requested-With","XMLHttpRequest"])
+    data = scrapertools.cache_page(item.url,headers=headers)
+    logger.info("data="+data)
+
+    # Extrae las entradas (carpetas)  
+    '''
+    {"searchTerms":"yes","results":[{"ID":4501,"post_author":"1","post_date":"mayo 23, 2014","post_date_gmt":"2014-05-23 17:56:47","post_title":"4x06 - Leyes de dioses y hombres","post_excerpt":"<p>La historia de Canci\u00f3n de Hielo y Fuego se sit\u00faa en un mundo ficticio medieval. Hay tres l\u00edneas [...]<\/p>\n","post_status":"publish","comment_status":"open","ping_status":"open","post_password":"","post_name":"4x06-leyes-de-dioses-y-hombres","to_ping":"","pinged":"","post_modified":"2014-05-23 19:56:47","post_modified_gmt":"2014-05-23 17:56:47","post_content_filtered":"","post_parent":0,"guid":"http:\/\/series.cinehanwer.us\/?p=4501","menu_order":0,"post_type":"post","post_mime_type":"","comment_count":"0","filter":"raw","post_author_nicename":"admin","permalink":"http:\/\/series.cinehanwer.us\/4x06-leyes-de-dioses-y-hombres\/","attachment_thumbnail":"http:\/\/series.cinehanwer.us\/wp-content\/uploads\/2013\/04\/\u00edndice-150x150.jpg","show_more":true},{"ID":4424,"post_author":"1","post_date":"mayo 16, 2014","post_date_gmt":"2014-05-16 09:02:06","post_title":"1x20 - El hacedor de reyes","post_excerpt":"<p>El criminal m\u00e1s buscado del mundo, Thomas Raymond Reddington (James Spader, se entrega [...]<\/p>\n","post_status":"publish","comment_status":"open","ping_status":"open","post_password":"","post_name":"1x20-el-hacedor-de-reyes","to_ping":"","pinged":"","post_modified":"2014-05-16 11:02:06","post_modified_gmt":"2014-05-16 09:02:06","post_content_filtered":"","post_parent":0,"guid":"http:\/\/series.cinehanwer.us\/?p=4424","menu_order":0,"post_type":"post","post_mime_type":"","comment_count":"0","filter":"raw","post_author_nicename":"admin","permalink":"http:\/\/series.cinehanwer.us\/1x20-el-hacedor-de-reyes\/","attachment_thumbnail":"http:\/\/series.cinehanwer.us\/wp-content\/uploads\/2014\/01\/The-Blacklist-128x128.jpeg","show_more":true}],"displayPostMeta":true}
+    '''
+    json_object = jsontools.load_json(data)
+    logger.info("results="+json_object["results"])
+    data = json_object["results"]
+    
+    for entries in data:
+        title = scrapertools.htmlclean(entries["post_title"])
+        thumbnail = scrapertools.htmlclean(entries["attachment_thumbnail"])
+        url = scrapertools.htmlclean(entries["permalink"])
+        plot = ""
+   
+        itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
+ 
+    return itemlist    
+    
+def peliculas(item):
+    logger.info("pelisalacarta.channels.cinehanwer peliculas")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    logger.info("data="+data)
+
+    # Extrae las entradas
+    '''
+    <a href="/pelicula/3708/tarzan.html" title="Tarzan" >
+    <img style="margin-top:0;" src="/files/uploads/3708.jpg" alt="" />
+    <cite><center>Tarzan<br/><br><br><span class="txcnhd cowh dino" style=" color: #fff; ">
+    <strong>Genero:</strong> Animacion<br>
+    <strong>A&ntilde;o:</strong> 2014<br>
+    <strong>Calidad:</strong> BR-Screener<br>
+    <strong>Idiomas :</strong>  Espa&ntilde;ol
+    '''
+    patron  = '<a href="([^"]+)" title="([^"]+)"[^<]+'
+    patron += '<img style="[^"]+" src="([^"]+)"[^<]+'
+    patron += '<cite>(.*?)</cite>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl,scrapedtitle,scrapedthumbnail,scrapedplot in matches:
+        title = scrapedtitle.decode('iso-8859-1').encode('utf8')
+        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
+        plot = scrapertools.htmlclean(scrapedplot)
+        plot = re.compile("\s+",re.DOTALL).sub(" ",plot)
+        url = urlparse.urljoin(item.url,scrapedurl)
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
+
+    #</b></span></a></li[^<]+<li><a href="?page=2">
+    next_page = scrapertools.find_single_match(data,'</b></span></a></li[^<]+<li><a href="([^"]+)">')
+    if next_page!="":
+    #    itemlist.append( Item(channel=__channel__, action="peliculas" , title=">> Página siguiente" , url=item.url+next_page, folder=True))
+        itemlist.append( Item(channel=__channel__, action="peliculas" , title=">> Página siguiente" , url=urlparse.urljoin(item.url,next_page), folder=True))
+      
+    return itemlist
+    
+def series_new(item):
+    logger.info("pelisalacarta.channels.cinehanwer series_new")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    logger.info("data="+data)
+
+    # Extrae las entradas
+
+    patron = '<div class="show-thumbnail">[^<]+<a href="([^"]+)">[\s\S]+?<img src="([^"]+)"[\s\S]+?<h3><a[\s\S]+?title="([^"]+?)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
+        #title = unicode( scrapedtitle, "iso-8859-1" , errors="replace" ).encode("utf-8")
+        title = scrapedtitle
+        title = title.strip()
+        title = scrapertools.htmlclean(title)
+        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
+        plot = ""
+        url = urlparse.urljoin(item.url,scrapedurl)
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
+      
+    return itemlist
+    
+def series_list(item):
+    logger.info("pelisalacarta.channels.cinehanwer series_list")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    logger.info("data="+data)
+
+    # Extrae las entradas
+
+    patron = '<li><a href="([^"]+)">([^"]+)<\/a><\/li>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl, scrapedtitle in matches:
+        #title = unicode( scrapedtitle, "iso-8859-1" , errors="replace" ).encode("utf-8")
+        title = scrapedtitle
+        title = title.strip()
+        title = scrapertools.htmlclean(title)
+        thumbnail = ""
+        plot = ""
+        url = "http://series.cinehanwer.us/wp-content/themes/bueno/ajax/seriesajaxresp_get.php?serie="+scrapedurl+"&status=0"
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=__channel__, action="series_seasons"  , title=title ,  url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
+        #itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
+      
+    return itemlist
+    
+def series_seasons(item):
+    logger.info("pelisalacarta.channels.cinehanwer series_seasons")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    logger.info("data="+data)
+
+    # Extrae las entradas
+
+    patron = '<li><a href="([^"]+)">([^"]+)<\/a><\/li>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl, scrapedtitle in matches:
+        #title = unicode( scrapedtitle, "iso-8859-1" , errors="replace" ).encode("utf-8")
+        title = scrapedtitle
+        title = title.strip()
+        title = scrapertools.htmlclean(title)
+        thumbnail = ""
+        plot = ""
+        url = "http://series.cinehanwer.us/wp-content/themes/bueno/ajax/seriesajaxresp_get.php?serie="+scrapedurl+"&status=1"
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=__channel__, action="series_chapters"  , title=title ,  url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
+        #itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
+      
+    return itemlist
+    
+def series_chapters(item):
+    logger.info("pelisalacarta.channels.cinehanwer series_chapters")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    logger.info("data="+data)
+
+    # Extrae las entradas
+
+    patron = '<li><a href="([^"]+)">([^"]+)<\/a><\/li>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl, scrapedtitle in matches:
+        #title = unicode( scrapedtitle, "iso-8859-1" , errors="replace" ).encode("utf-8")
+        title = scrapedtitle
+        title = title.strip()
+        title = scrapertools.htmlclean(title)
+        thumbnail = ""
+        plot = ""
+        url = "http://series.cinehanwer.us/wp-content/themes/bueno/ajax/seriesajaxresp_get.php?id="+scrapedurl+"&status=2"
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=__channel__, action="findvideos_series"  , title=title ,  url=url, thumbnail=thumbnail, plot=plot, fulltitle=title))
+        #itemlist.append( Item(channel=__channel__, action="findvideos_series" , title=title , url=url, thumbnail=thumbnail, plot=plot, fulltitle=title, viewmode="movie"))
+      
+    return itemlist
+
+
+def findvideos(item):
+    logger.info("pelisalacarta.channels.cinehanwer findvideos")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    #logger.info("data="+data)
+
+    # Extrae las entradas (carpetas)  
+    patron  = '<tr[^<]+'
+    patron += '<td[^<]+<div[^<]+'
+    patron += '<img[^<]+'
+    patron += '<a href="([^"]+)"[^<]+</a></td[^<]+'
+    patron += '<td[^<]+<img src="([^"]+)"</td[^<]+'
+    patron += '<td[^<]+<img[^>]+>([^<]+)</td[^<]+'
+    patron += '<td[^>]+>([^<]+)</td[^<]+'
+    patron += '<td[^<]+</td[^<]+'
+    patron += '<td[^<]+'
+    patron += '<a title="Reportar este enlace"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl,serverthumb,idioma,calidad in matches:
+        idioma = idioma.strip()
+        calidad = calidad.strip()
+        nombre_servidor = serverthumb.split("/")[-1].split(".")[0]
+
+        title = "Ver en "+nombre_servidor+" ("+idioma+") (Calidad "+calidad+")"
+        url = scrapedurl
+        thumbnail = ""
+        plot = ""
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False))
+
+    return itemlist
+
+def findvideos_series(item):
+    logger.info("pelisalacarta.channels.cinehanwer findvideos_series")
+
+    # Descarga la pagina
+    data = scrapertools.cache_page(item.url)
+    #logger.info("data="+data)
+
+    # Extrae las entradas (carpetas)  
+    patron  = '<div class="download_buttton">[\s\S]+?<a href="([^"<]+)[\S\s]+?<img border="0" src="">[\s\S]+?<br>([^"<]+)'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    itemlist = []
+    
+    for scrapedurl, title in matches:
+        if (title == "") : title = scapedurl 
+        title = title.strip()
+        url = scrapedurl
+        thumbnail = ""
+        plot = ""
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"]")
+        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False))
+        
+    # Extrae las entradas (links)
+    patron  = '<iframe src="([^"<]+)'
+    matches = re.compile(patron,re.DOTALL).findall(data)    
+    # Extra las entradas dentro de un iframe
+    for scrapedurl in matches:
+        title = "Ver en "+ scrapedurl 
+        title = title.strip()
+        url = scrapedurl
+        thumbnail = ""
+        plot = ""
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"]")
+        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False))
+    
+    return itemlist
+    
+
+def play(item):
+    logger.info("pelisalacarta.channels.cinehanwer play url="+item.url)
+
+    itemlist = servertools.find_video_items(data=item.url)
+
+    for videoitem in itemlist:
+        videoitem.title = item.title
+        videoitem.fulltitle = item.fulltitle
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = __channel__
+
     return itemlist
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinetemagay.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinetemagay.py
index a278e00bf89c52ccd328270cb03c81a3e1ffc361..8136fb7645ff3068ff629718fe579121bf9315ca 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinetemagay.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinetemagay.py
@@ -34,12 +34,11 @@ def isGeneric():
 def mainlist(item):
     logger.info("[cinetemagay.py] mainlist")
 
-    itemlist = []
-    itemlist.append( Item(channel=__channel__, action="lista"  , title="New latin queer channel" , url="http://newlatinqueerchannel.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",thumbnail="http://2.bp.blogspot.com/-UmC0SWRlQbk/Uuc7G66FmMI/AAAAAAAADbg/fc2MIkJJBlw/s1600/banner%2Bnewlqch.png"))         
-    itemlist.append( Item(channel=__channel__, action="lista"  , title="Modo gay" , url="http://www.modogay.com/feeds/posts/default/?max-results=100&start-index=1",thumbnail="http://4.bp.blogspot.com/--oGFfDhcJg8/T4iGRMsNFOI/AAAAAAAABV4/oXKs9PMbrYU/s1600/mgbanner2.jpg"))         
-    itemlist.append( Item(channel=__channel__, action="lista"  , title="Cine gay online (México)" , url="http://cinegayonlinemexico.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",thumbnail="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTmmqL6tS2Ced1VoxlGQT0q-ibPEz1DCV3E1waHFDI5KT0pg1lJ"))               
-    itemlist.append( Item(channel=__channel__, action="lista"  , title="Myquerchannel" , url="http://myqueerchannel.blogspot.com.es//feeds/posts/default/?max-results=100&start-index=1",thumbnail="http://1.bp.blogspot.com/-FKkBi7VyE-U/Tz7Le9vtQ5I/AAAAAAAAAd4/OXjxaycEPb8/s1600/myqueer.jpg"))               
-    itemlist.append( Item(channel=__channel__, action="lista"  , title="La videotecagay" , url="http://lavideotecagay.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",thumbnail="https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcSqnVLvoiVXfrHAlvo6n9b-sokU35qDWQTn4IVVqS0lpTneSWIK"))               
+    itemlist = []     
+    itemlist.append( Item(channel=__channel__, action="lista"  , title="Cine gay latinoamericano" , url="http://cinegaylatinoamericano.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",thumbnail="http://www.americaeconomia.com/sites/default/files/imagecache/foto_nota/homosexual1.jpg"))       
+    itemlist.append( Item(channel=__channel__, action="lista"  , title="Cine y cortos gay" , url="http://cineycortosgay.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",thumbnail="http://www.elmolar.org/wp-content/uploads/2015/05/cortometraje.jpg"))    
+    itemlist.append( Item(channel=__channel__, action="lista"  , title="Cine gay online (México)" , url="http://cinegayonlinemexico.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",thumbnail="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTmmqL6tS2Ced1VoxlGQT0q-ibPEz1DCV3E1waHFDI5KT0pg1lJ"))                           
+    itemlist.append( Item(channel=__channel__, action="lista"  , title="Sentido gay" , url="http://www.sentidogay.blogspot.com.es//feeds/posts/default/?max-results=100&start-index=1",thumbnail="http://1.bp.blogspot.com/-epOPgDD_MQw/VPGZGQOou1I/AAAAAAAAAkI/lC25GrukDuo/s1048/SentidoGay.jpg"))               
     itemlist.append( Item(channel=__channel__, action="lista"  , title="PGPA" , url="http://pgpa.blogspot.com.es/feeds/posts/default/?max-results=100&start-index=1",thumbnail="http://themes.googleusercontent.com/image?id=0BwVBOzw_-hbMNTRlZjk2YWMtYTVlMC00ZjZjLWI3OWEtMWEzZDEzYWVjZmQ4"))               
          
     return itemlist
@@ -79,6 +78,8 @@ def lista(item):
         scrapedtitle = match[3]
         scrapedtitle = scrapedtitle.replace("&apos;","'")
         scrapedtitle = scrapedtitle.replace("&quot;","'")
+        scrapedtitle = scrapedtitle.replace("&amp;amp;","'")
+        scrapedtitle = scrapedtitle.replace("&amp;#39;","'")
         scrapedurl = match[2]
         scrapedthumbnail = match[0]
         imagen = ""
@@ -93,7 +94,7 @@ def lista(item):
         scrapedplot = scrapedplot.replace("&amp;","")
         scrapedplot = scrapedplot.replace("nbsp;","")
         scrapedplot=strip_tags(scrapedplot)
-        itemlist.append( Item(channel=__channel__, action="detail", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=__channel__, action="detail", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedurl+scrapedplot , folder=True) )
    
 
     variable = item.url.split("index=")[1]
@@ -102,7 +103,7 @@ def lista(item):
     variable=str(variable)
     variable_url = item.url.split("index=")[0]
     url_nueva=variable_url+"index="+variable
-    itemlist.append( Item(channel=__channel__, action="lista", title="Ir a la página siguiente (desde "+variable+")" , url=url_nueva , thumbnail="" , plot="Pasar a la página siguiente (en grupos de 100)\n\n"+url_nueva) )
+    itemlist.append( Item(channel=__channel__, action="lista", title="Ir a la página siguiente (desde "+variable+")" , url=url_nueva , thumbnail="" , plot="Pasar a la página siguiente (en grupos de 100)\n\n"+url_nueva) )
    
     return itemlist
 
@@ -114,73 +115,19 @@ def lista(item):
 
 
 
-def lista_2(item):
-    logger.info("[cinetemagay.py] lista")
-    itemlist = []
-
-   
-  
-         
-    # Descarga la pagina
-    data = scrapertools.cache_page(item.url)
-    #logger.info(data)
-
-
-
-    # Extrae las entradas (carpetas)
-   
-    patronvideos ='img.*?src="([^"]+)".*?' 
-    patronvideos += "<link rel='replies' type='text/html' href='([^']+)' title='([^']+)'/><link"
-
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-
-
-    for match in matches:
-        scrapedtitle = "ver película"
-        scrapedtitle = scrapedtitle.replace("&apos;","'")
-        scrapedtitle = scrapedtitle.replace("@","a")
-		
-        scrapedtitle = scrapedtitle.replace("&quot;","'")
-        scrapedtitle = scrapedtitle.replace("&lt;h1&gt;","")
-        scrapedtitle = scrapedtitle.replace("&lt;/h1&gt;","")
-    
-        
-        scrapedurl = match[1]
-        scrapedthumbnail = match[0]
-        imagen = ""
-        scrapedplot = match[1]  
-        tipo = match[0]
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        scrapedplot = "<"+scrapedplot     
-        scrapedplot = scrapedplot.replace("&gt;",">")
-        scrapedplot = scrapedplot.replace("&lt;","<")
-        scrapedplot = scrapedplot.replace("</div>","\n")
-        scrapedplot = scrapedplot.replace("<br />","\n")
-        scrapedplot = scrapedplot.replace("&amp;","")
-        scrapedplot = scrapedplot.replace("nbsp;","")
-        scrapedplot=strip_tags(scrapedplot)
-        itemlist.append( Item(channel=__channel__, action="detail", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
-   
-
-    variable = item.url.split("index=")[1]
-    variable=int(variable)
-    variable+=100
-    variable=str(variable)
-    variable_url = item.url.split("index=")[0]
-    url_nueva=variable_url+"index="+variable
-    itemlist.append( Item(channel=__channel__, action="lista", title="Ir a la página siguiente (desde "+variable+")" , url=url_nueva , thumbnail="" , plot="Pasar a la página siguiente (en grupos de 100)\n\n"+url_nueva) )
-   
-    return itemlist
-
-
-
-
 def detail(item):
     logger.info("[cinetemagay.py] detail")
     itemlist = []
 
     # Descarga la pagina
     data = scrapertools.cachePage(item.url)
+
+
+    data =data.replace("%3A", ":")
+    data =data.replace("%2F", "/")
+    data =data.replace("%3D", "=")   
+    data =data.replace("%3", "?")   
+    data =data.replace("%26", "&")
     descripcion = ""
     plot = ""
     patrondescrip = 'SINOPSIS:(.*?)'
@@ -199,28 +146,29 @@ def detail(item):
         except:
             plot = descripcion
 
+
+   
+        
     # Busca los enlaces a los videos de  servidores
     video_itemlist = servertools.find_video_items(data=data)
     for video_item in video_itemlist:
-        itemlist.append( Item(channel=__channel__ , action="play" , server=video_item.server, title=item.title+video_item.title,url=video_item.url, thumbnail=item.thumbnail, plot=item.plot, folder=False))
 
-    # Extrae los enlaces a los videos (Directo)
-    patronvideos = "file: '([^']+)'"
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    if len(matches)>0:
-        if not "www.youtube" in matches[0]:
-            itemlist.append( Item(channel=__channel__ , action="play" , server="Directo", title=item.title+" [directo]",url=matches[0], thumbnail=item.thumbnail, plot=item.plot))
+        itemlist.append( Item(channel=__channel__ , action="play" , server=video_item.server, title=item.title+"  "+video_item.title,url=video_item.url, thumbnail=item.thumbnail, plot=video_item.url, folder=False))
+
+
 
     return itemlist
 
 
-# Verificación automática de canales: Esta función debe devolver "True" si está ok el canal.
+
+
+# Verificación automática de canales: Esta función debe devolver "True" si está ok el canal.
 def test():
     from servers import servertools
     
     # mainlist
     mainlist_items = mainlist(Item())
-    # Da por bueno el canal si alguno de los vídeos de "Novedades" devuelve mirrors
+    # Da por bueno el canal si alguno de los vídeos de "Novedades" devuelve mirrors
     onesite_items = lista(mainlist_items[0])
     bien = False
     for onesite_item in onesite_items:
@@ -229,4 +177,4 @@ def test():
             bien = True
             break
 
-    return bien
\ No newline at end of file
+    return bien
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinetux.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinetux.py
index dbcff8c70729c5ec7187011d506aac9c0d13dca8..5b7d81ba3bcd74110a9c94bc506c8e5b450803ba 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinetux.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/cinetux.py
@@ -105,14 +105,17 @@ def peliculas(item):
     patron  = '<div class="movielist textcenter[^<]+'
     patron += '<div id="titlecat[^<]+<a href="([^"]+)" rel="bookmark" title="([^"]+)"><img style="[^"]+" width="[^"]+" height="[^"]+" src=(.*?) /[^<]+'
     matches = re.compile(patron,re.DOTALL).findall(data)
+    logger.info("[cinetux.py] peliculas [patron 1]")
     scrapertools.printMatches(matches)
 
     for scrapedurl,title,thumbnail in matches:
         scrapedplot = ""
         scrapedthumbnail = thumbnail[:-2]
         scrapedtitle = title[14:]
+        scrapedtitle = scrapedtitle.replace("Online Gratis","")
+        scrapedtitle = scrapedtitle.replace("Online 2015 Gratis","")
         if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg", folder=True) )
+        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg", folder=True, hasContentDetails="true", contentTitle=scrapedtitle, contentThumbnail=scrapedthumbnail) )
 
 
     '''
@@ -130,6 +133,7 @@ def peliculas(item):
     patron += '<a href="([^"]+)[^<]+<img alt="" src="([^"]+)".*?'
     patron += '<span class="rosa">(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
+    logger.info("[cinetux.py] peliculas [patron 2]")
     scrapertools.printMatches(matches)
 
     for scrapedurl,scrapedthumbnail,calidad in matches:
@@ -144,7 +148,7 @@ def peliculas(item):
         scrapedplot = ""
         scrapedtitle = titulo + " ["+calidad+"]"
         if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg",  folder=True) )
+        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg",  folder=True, hasContentDetails="true", contentTitle=scrapedtitle, contentThumbnail=scrapedthumbnail) )
 
     '''
     <div id="post-57573">
@@ -156,14 +160,17 @@ def peliculas(item):
     patron += '<a href="([^"]+)" rel="[^"]+" title="([^"]+)"[^<]+'
     patron += '<img style="[^"]+" width="\d+" height="\d+" src=([^>]+)>'
     matches = re.compile(patron,re.DOTALL).findall(data)
+    logger.info("[cinetux.py] peliculas [patron 3]")
     scrapertools.printMatches(matches)
 
     for scrapedurl,title,thumbnail in matches:
         scrapedplot = ""
         scrapedthumbnail = thumbnail[:-2]
         scrapedtitle = title[14:]
+        scrapedtitle = scrapedtitle.replace("Online Gratis","")
+        scrapedtitle = scrapedtitle.replace("Online 2015 Gratis","")
         if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg", folder=True) )
+        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg", folder=True, hasContentDetails="true", contentTitle=scrapedtitle, contentThumbnail=scrapedthumbnail) )
 
     '''
     <td class="contenido">
@@ -188,14 +195,17 @@ def peliculas(item):
     patron += '<a href="([^"]+)"[^<]+'
     patron += '<img src="([^"]+)" style="[^"]+" alt="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
+    logger.info("[cinetux.py] peliculas [patron 4]")
     scrapertools.printMatches(matches)
 
     for scrapedurl,thumbnail,title in matches:
         scrapedplot = ""
         scrapedthumbnail = thumbnail
         scrapedtitle = title[14:]
+        scrapedtitle = scrapedtitle.replace("Online Gratis","")
+        scrapedtitle = scrapedtitle.replace("Online 2015 Gratis","")
         if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg", folder=True) )
+        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg", folder=True, hasContentDetails="true", contentTitle=scrapedtitle, contentThumbnail=scrapedthumbnail) )
 
     # Extrae el paginador
     next_page_link = scrapertools.find_single_match(data,'<a href="([^"]+)"[^<]+<strong>Siguiente</strong>')
@@ -231,7 +241,7 @@ def bloque(item):
         scrapedtitle = scrapedtitle.capitalize()
 
         if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg" , folder=True) )
+        itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , fulltitle=scrapedtitle, url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , viewmode="movie", fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg" , folder=True, hasContentDetails="true", contentTitle=scrapedtitle, contentThumbnail=scrapedthumbnail) )
 
     return itemlist
 
@@ -281,6 +291,11 @@ def findvideos(item):
     # Busca el argumento
     data = scrapertools.cache_page(item.url)
     logger.info("data="+data)
+
+    item.plot = scrapertools.find_single_match(data,'<td><span class="info">Sinops[^<]+</span>([^<]+)</td>')
+    item.plot = scrapertools.htmlclean(item.plot)
+    item.contentPlot = item.plot
+
     '''
     <tr class="tabletr">
     <td class="episode-server" align="left"><img src="http://www.cinetux.org/imagenes/veronline.png" alt="" width="22" height="22" />Opción 01</td>
@@ -303,9 +318,9 @@ def findvideos(item):
     for scrapedtitle,scrapedserver,scrapedlanguage,scrapedquality,scrapedlink in matches:
         title = "Ver "+scrapedtitle+" en "+scrapedserver+" ("+scrapedlanguage+") ("+scrapedquality+")"
         url = scrapedlink
-        thumbnail = item.thumbnail
+        thumbnail = servertools.guess_server_thumbnail(scrapedserver)
         plot = ""
-        itemlist.append( Item(channel=__channel__, action="play", title=title , fulltitle=item.fulltitle+" ["+scrapedlanguage+"]["+scrapedquality+"]", url=url , thumbnail=thumbnail , plot=plot , fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg" , folder=False) )
+        itemlist.append( Item(channel=__channel__, action="play", title=title , fulltitle=item.fulltitle+" ["+scrapedlanguage+"]["+scrapedquality+"]", url=url , thumbnail=thumbnail , plot=plot , fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg" , parentContent=item, folder=False) )
 
     patron  = '<tr class="tabletr">[^<]+'
     patron += '<td class="opcion-td"><img[^>]+>([^>]+)</td>[^<]+'
@@ -318,9 +333,9 @@ def findvideos(item):
     for scrapedtitle,scrapedserver,scrapedlanguage,scrapedquality,scrapedlink in matches:
         title = "Ver "+scrapedtitle+" en "+scrapedserver+" ("+scrapedlanguage+") ("+scrapedquality+")"
         url = scrapedlink
-        thumbnail = item.thumbnail
+        thumbnail = servertools.guess_server_thumbnail(scrapedserver)
         plot = ""
-        itemlist.append( Item(channel=__channel__, action="play", title=title , fulltitle=item.fulltitle, url=url , thumbnail=thumbnail , plot=plot , fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg" , folder=False) )
+        itemlist.append( Item(channel=__channel__, action="play", title=title , fulltitle=item.fulltitle, url=url , thumbnail=thumbnail , plot=plot , fanart="http://pelisalacarta.mimediacenter.info/fanart/cinetux.jpg" , parentContent=item , folder=False) )
 
     patron  = '<tr class="tabletr">[^<]+'
     patron += '<td class="episode-server[^>]+><img[^>]+>([^>]+)</td>[^<]+'
@@ -333,12 +348,12 @@ def findvideos(item):
     for scrapedtitle,scrapedserver,scrapedlanguage,scrapedquality,scrapedlink in matches:
         title = "Ver "+scrapedtitle+" en "+scrapedserver+" ("+scrapedlanguage+") ("+scrapedquality+")"
         url = scrapedlink
-        thumbnail = item.thumbnail
+        thumbnail = servertools.guess_server_thumbnail(scrapedserver)
         plot = ""
-        itemlist.append( Item(channel=__channel__, action="play", title=title , fulltitle=item.fulltitle+" ["+scrapedlanguage+"]["+scrapedquality+"]", url=url , thumbnail=thumbnail , plot=plot , folder=False) )
+        itemlist.append( Item(channel=__channel__, action="play", title=title , fulltitle=item.fulltitle+" ["+scrapedlanguage+"]["+scrapedquality+"]", url=url , thumbnail=thumbnail , plot=plot , parentContent=item , folder=False) )
 
     if len(itemlist)==0:
-        itemlist = servertools.find_video_items(data=data)
+        itemlist = servertools.find_video_items(item=item,data=data)
         i=1
         for videoitem in itemlist:
             videoitem.title = "Ver Opción %d en %s" % (i,videoitem.server)
@@ -350,7 +365,7 @@ def findvideos(item):
 def play(item):
     logger.info("[cinetux.py] play item.url="+item.url)
     itemlist=[]
-    itemlist = servertools.find_video_items(data=item.url)
+    itemlist = servertools.find_video_items(item=item,data=item.url)
     i=1
     for videoitem in itemlist:
         videoitem.title = "Mirror %d%s" % (i,videoitem.title)
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/discoverymx.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/discoverymx.py
index 29da1f159527099237e12e4e3993120de319fefe..6130dd0e1ba57c854e418e676ecacf56e1ceba95 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/discoverymx.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/discoverymx.py
@@ -37,79 +37,6 @@ def mainlist(item):
 
     return itemlist
 
-def search(item):
-    logger.info("[discoverymx.py] search")
-
-    keyboard = xbmc.Keyboard('')
-    keyboard.doModal()
-    if (keyboard.isConfirmed()):
-        tecleado = keyboard.getText()
-        if len(tecleado)>0:
-            #convert to HTML
-            tecleado = tecleado.replace(" ", "+")
-            searchUrl = "http://discoverymx.blogspot.com/index.php?s="+tecleado
-            SearchResult(params,searchUrl,category)
-            
-def SearchResult(item):
-    logger.info("[discoverymx.py] SearchResult")
-    
-    # Descarga la página
-    data = scrapertools.cachePage(url)
-
-    # Extrae las entradas (carpetas)
-    patronvideos  = '<p class="entry-title"><[^>]+>[^<]+</span><a href="([^"]+)"[^>]+>([^<]+)</a></p>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for match in matches:
-        # Atributos
-        scrapedurl = match[0]
-        
-        scrapedtitle =match[1]
-        scrapedtitle = scrapedtitle.replace("&#8211;","-")
-        scrapedtitle = scrapedtitle.replace("&nbsp;"," ")
-        scrapedthumbnail = ""
-        scrapedplot = ""
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # Añade al listado de XBMC
-        xbmctools.addnewfolder( __channel__ , "detail" , category , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot )
-
-    # Propiedades
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-        
-
-def performsearch(texto):
-    logger.info("[discoverymx.py] performsearch")
-    url = "http://discoverymx.blogspot.com/index.php?s="+texto
-
-    # Descarga la página
-    data = scrapertools.cachePage(url)
-
-    # Extrae las entradas (carpetas)
-    patronvideos  = '<p class="entry-title"><[^>]+>[^<]+</span><a href="([^"]+)"[^>]+>([^<]+)</a></p>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    resultados = []
-
-    for match in matches:
-        scrapedtitle = match[1]
-        scrapedtitle = scrapedtitle.replace("&#8211;","-")
-        scrapedtitle = scrapedtitle.replace("&nbsp;"," ")
-        scrapedurl = match[0]
-        scrapedthumbnail = ""
-        scrapedplot = ""
-
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # Añade al listado de XBMC
-        resultados.append( [__channel__ , "detail" , "buscador" , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot ] )
-        
-    return resultados
-
 def DocuSeries(item):
     logger.info("[discoverymx.py] DocuSeries")
     itemlist=[]
@@ -173,34 +100,6 @@ def DocuARCHIVO(item):
 
     return itemlist
     
-def DocuCat(item):
-    logger.info("[discoverymx.py] peliscat")
-    itemlist=[]
-
-    # Descarga la página
-    data = scrapertools.cache_page(item.url)
-
-    # Extrae las entradas (carpetas)
-    patronvideos  = '<li class="cat-item cat-item[^"]+"><a href="([^"]+)" title="[^"]+">([^<]+)</a>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for match in matches:
-        # Atributos
-        scrapedtitle = match[1]
-        scrapedurl = match[0]
-        scrapedthumbnail = ""
-        scrapedplot = ""
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # Añade al listado de XBMC
-        xbmctools.addnewfolder( __channel__ , "listvideos" , category , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot )
-
-    # Propiedades
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
 def listvideos(item):
     logger.info("[discoverymx.py] listvideos")
     itemlist=[]
@@ -239,7 +138,6 @@ def listvideos(item):
         if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
 
         # Añade al listado de XBMC
-        #xbmctools.addnewfolder( __channel__ , "findevi" , category , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot )
         itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
 
     # Extrae la marca de siguiente página
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.py
index 5f644e60e37cae99f748faea4e7f8f95903b529e..c69c9bdf10abcea1461d37013b7d72a9272e0941 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.py
@@ -106,10 +106,11 @@ def lista(item):
         plot = ""
         if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
 
-        if "divxatope.com/serie/" in url:
+        if "divxatope.com/serie" in url:
             itemlist.append( Item(channel=__channel__, action="episodios", title=title , fulltitle = title, url=url , thumbnail=thumbnail , plot=plot , folder=True) )
         else:
-            itemlist.append( Item(channel=__channel__, action="findvideos", title=title , fulltitle = title, url=url , thumbnail=thumbnail , plot=plot , folder=True) )
+            contentTitle = scrapertools.htmlclean(title.strip())
+            itemlist.append( Item(channel=__channel__, action="findvideos", title=title , fulltitle = title, url=url , thumbnail=thumbnail , plot=plot , folder=True, hasContentDetails="true", contentTitle=contentTitle, contentThumbnail=thumbnail) )
 
     next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)">Next</a></li>')
     if next_page_url!="":
@@ -180,11 +181,15 @@ def findvideos(item):
     # Descarga la pagina
     data = scrapertools.cachePage(item.url)
 
-    link = scrapertools.find_single_match(data,'href="http://tumejorserie.*?url=([^"]+)"')
+    item.plot = scrapertools.find_single_match(data,'<div class="post-entry" style="height:300px;">(.*?)</div>')
+    item.plot = scrapertools.htmlclean(item.plot).strip()
+    item.contentPlot = item.plot
+
+    link = scrapertools.find_single_match(data,'href="http://tumejorserie.*?link=([^"]+)"')
     if link!="":
-        #link = "http://www.divxatope.com/"+link
+        link = "http://www.divxatope.com/"+link
         logger.info("pelisalacarta.channels.divxatope torrent="+link)
-        itemlist.append( Item(channel=__channel__, action="play", server="torrent", title="Vídeo en torrent" , fulltitle = item.title, url=link , thumbnail=item.thumbnail , plot=item.plot , folder=False) )
+        itemlist.append( Item(channel=__channel__, action="play", server="torrent", title="Vídeo en torrent" , fulltitle = item.title, url=link , thumbnail=servertools.guess_server_thumbnail("torrent") , plot=item.plot , folder=False, parentContent=item) )
 
     patron  = "<div class=\"box1\"[^<]+<img[^<]+</div[^<]+"
     patron += '<div class="box2">([^<]+)</div[^<]+'
@@ -203,10 +208,10 @@ def findvideos(item):
         if comentarios.strip()!="":
             title = title + " ("+comentarios.strip()+")"
         url = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = ""
+        thumbnail = servertools.guess_server_thumbnail(title)
         plot = ""
         if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        new_item = Item(channel=__channel__, action="extract_url", title=title , fulltitle = title, url=url , thumbnail=thumbnail , plot=plot , folder=True)
+        new_item = Item(channel=__channel__, action="extract_url", title=title , fulltitle = title, url=url , thumbnail=thumbnail , plot=plot , folder=True, parentContent=item)
         if comentarios.startswith("Ver en"):
             itemlist_ver.append( new_item)
         else:
@@ -219,7 +224,7 @@ def findvideos(item):
         itemlist.append(new_item)
 
     if len(itemlist)==0:
-        itemlist = servertools.find_video_items(data=data)
+        itemlist = servertools.find_video_items(item=item,data=data)
         for videoitem in itemlist:
             videoitem.title = "Enlace encontrado en "+videoitem.server+" ("+scrapertools.get_filename_from_url(videoitem.url)+")"
             videoitem.fulltitle = item.fulltitle
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.py-original b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.py-original
deleted file mode 100644
index 6fc7efa4d4c363868e161a26a2a773a91de4d5bc..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.py-original
+++ /dev/null
@@ -1,218 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-# pelisalacarta - XBMC Plugin
-# Canal para divxatope
-# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-
-from core import logger
-from core import config
-from core import scrapertools
-from core.item import Item
-from servers import servertools
-
-__channel__ = "divxatope"
-__category__ = "F,S,D"
-__type__ = "generic"
-__title__ = "Mejor Torrent"
-__language__ = "ES"
-
-DEBUG = config.get_setting("debug")
-
-def isGeneric():
-    return True
-
-def mainlist(item):
-    logger.info("pelisalacarta.channels.divxatope mainlist")
-
-    itemlist = []
-    itemlist.append( Item(channel=__channel__, action="menu" , title="Películas" , url="http://www.divxatope.com/",extra="Peliculas",folder=True))
-    itemlist.append( Item(channel=__channel__, action="menu" , title="Series" , url="http://www.divxatope.com",extra="Series",folder=True))
-    itemlist.append( Item(channel=__channel__, action="search" , title="Buscar..."))
-    return itemlist
-
-def menu(item):
-    logger.info("pelisalacarta.channels.divxatope menu")
-    itemlist=[]
-
-    data = scrapertools.cache_page(item.url)
-    #logger.info("data="+data)
-
-    data = scrapertools.find_single_match(data,item.extra+"</a[^<]+<ul(.*?)</ul>")
-    #logger.info("data="+data)
-
-    patron = "<li><a.*?href='([^']+)'[^>]+>([^<]+)</a></li>"
-    matches = re.compile(patron,re.DOTALL).findall(data)
-
-    for scrapedurl,scrapedtitle in matches:
-        title = scrapedtitle
-        url = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = ""
-        plot = ""
-        itemlist.append( Item(channel=__channel__, action="lista", title=title , url=url , thumbnail=thumbnail , plot=plot , folder=True) )
-
-    return itemlist
-
-def search(item,texto):
-    logger.info("pelisalacarta.channels.divxatope search")
-    if item.url=="":
-        item.url="http://www.divxatope.com/buscar/descargas"
-    item.extra = urllib.urlencode({'search':texto})
-
-    try:
-        return lista(item)
-    # Se captura la excepci?n, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error( "%s" % line )
-        return []
-
-def lista(item):
-    logger.info("pelisalacarta.channels.divxatope lista")
-    itemlist = []
-
-    '''
-    <li style="width:136px;height:263px;margin:0px 15px 0px 0px;">
-    <a href="http://www.divxatope.com/descargar/374639_ahi-os-quedais-web-screener-r6-español-castellano-2014.html" title="Descargar Ahi Os Quedais Web  en DVD-Screener torrent gratis"><div  class='ribbon-estreno' ></div>                           <img class="torrent-image" src="http://www.divxatope.com/uploads/torrents/images/thumbnails2/6798_ahi--os--quedais.jpg" alt="Descargar Ahi Os Quedais Web  en DVD-Screener torrent gratis" style="width:130px;height:184px;" />
-    <h2 style="float:left;width:100%;margin:3px 0px 0px 0px;padding:0px 0px 3px 0px;line-height:12px;font-size:12px;height:23px;border-bottom:solid 1px #C2D6DB;">Ahi Os Quedais Web </h2>
-    <strong style="float:left;width:100%;text-align:center;color:#000;margin:0px;padding:3px 0px 0px 0px;font-size:11px;line-height:12px;">DVD-Screener<br>Español Castellano                                                       </strong>
-    </a>
-    </li>
-    '''
-
-    # Descarga la pagina
-    if item.extra=="":
-        data = scrapertools.cachePage(item.url)
-    else:
-        data = scrapertools.cachePage(item.url , post=item.extra)
-    #logger.info("data="+data)
-
-    patron  = '<li [^<]+'
-    patron += '<a href="([^"]+)".*?'
-    patron += '<img class="[^"]+" src="([^"]+)"[^<]+'
-    patron += '<h2[^>]+">([^<]+)</h2[^<]+'
-    patron += '<strong[^>]+>(.*?)</strong>'
-
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for scrapedurl,scrapedthumbnail,scrapedtitle,calidad in matches:
-        title = scrapedtitle.strip()+" ("+scrapertools.htmlclean(calidad)+")"
-        url = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
-        plot = ""
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos", title=title , fulltitle = title, url=url , thumbnail=thumbnail , plot=plot , folder=True) )
-
-    next_page_url = scrapertools.find_single_match(data,'<li><a href="([^"]+)">Next</a></li>')
-    if next_page_url!="":
-        itemlist.append( Item(channel=__channel__, action="lista", title=">> Página siguiente" , url=urlparse.urljoin(item.url,next_page_url) , folder=True) )
-    else:
-        next_page_url = scrapertools.find_single_match(data,'<li><input type="button" class="btn-submit" value="Siguiente" onClick="paginar..(\d+)')
-        if next_page_url!="":
-            itemlist.append( Item(channel=__channel__, action="lista", title=">> Página siguiente" , url=item.url, extra=item.extra+"&pg="+next_page_url, folder=True) )
-
-    return itemlist
-
-def findvideos(item):
-    logger.info("pelisalacarta.channels.divxatope findvideos")
-    itemlist=[]
-
-    # Descarga la pagina
-    item.url = item.url.replace("divxatope.com/descargar/","divxatope.com/ver-online/")
-
-    '''
-    <div class="box1"><img src='http://www.divxatope.com/uploads/images/gestores/thumbs/1411605666_nowvideo.jpg' width='33' height='33'></div>
-    <div class="box2">nowvideo</div>
-    <div class="box3">Español Castel</div>
-    <div class="box4">DVD-Screene</div>
-    <div class="box5"><a href="http://www.nowvideo.ch/video/affd21b283421" rel="nofollow" target="_blank">Ver Online</a></div>
-    '''
-    # Descarga la pagina
-    data = scrapertools.cachePage(item.url)
-
-    link = scrapertools.find_single_match(data,'href="http://tumejorserie.*?url=([^"]+)"')
-    if link!="":
-        #link = "http://www.divxatope.com/"+link
-        logger.info("pelisalacarta.channels.divxatope torrent="+link)
-        itemlist.append( Item(channel=__channel__, action="play", server="torrent", title="Vídeo en torrent" , fulltitle = item.title, url=link , thumbnail=item.thumbnail , plot=item.plot , folder=False) )
-
-    patron  = "<div class=\"box1\"[^<]+<img[^<]+</div[^<]+"
-    patron += '<div class="box2">([^<]+)</div[^<]+'
-    patron += '<div class="box3">([^<]+)</div[^<]+'
-    patron += '<div class="box4">([^<]+)</div[^<]+'
-    patron += '<div class="box5">(.*?)</div[^<]+'
-    patron += '<div class="box6">([^<]+)<'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    itemlist_ver = []
-    itemlist_descargar = []
-
-    for servername,idioma,calidad,scrapedurl,comentarios in matches:
-        title = "Mirror en "+servername+" ("+calidad+")"+" ("+idioma+")"
-        if comentarios.strip()!="":
-            title = title + " ("+comentarios.strip()+")"
-        url = urlparse.urljoin(item.url,scrapedurl)
-        thumbnail = ""
-        plot = ""
-        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        new_item = Item(channel=__channel__, action="extract_url", title=title , fulltitle = title, url=url , thumbnail=thumbnail , plot=plot , folder=True)
-        if comentarios.startswith("Ver en"):
-            itemlist_ver.append( new_item)
-        else:
-            itemlist_descargar.append( new_item )
-
-    for new_item in itemlist_ver:
-        itemlist.append(new_item)
-    
-    for new_item in itemlist_descargar:
-        itemlist.append(new_item)
-
-    if len(itemlist)==0:
-        itemlist = servertools.find_video_items(data=data)
-        for videoitem in itemlist:
-            videoitem.title = "Enlace encontrado en "+videoitem.server+" ("+scrapertools.get_filename_from_url(videoitem.url)+")"
-            videoitem.fulltitle = item.fulltitle
-            videoitem.thumbnail = item.thumbnail
-            videoitem.channel = __channel__
-
-    return itemlist
-
-def extract_url(item):
-    logger.info("pelisalacarta.channels.divxatope extract_url")
-
-    itemlist = servertools.find_video_items(data=item.url)
-
-    for videoitem in itemlist:
-        videoitem.title = "Enlace encontrado en "+videoitem.server+" ("+scrapertools.get_filename_from_url(videoitem.url)+")"
-        videoitem.fulltitle = item.fulltitle
-        videoitem.thumbnail = item.thumbnail
-        videoitem.channel = __channel__
-
-    return itemlist    
-
-# Verificaci?n autom?tica de canales: Esta funci?n debe devolver "True" si todo est? ok en el canal.
-def test():
-    bien = True
-    
-    # mainlist
-    mainlist_items = mainlist(Item())
-    
-    # Da por bueno el canal si alguno de los v?deos de "Novedades" devuelve mirrors
-    for mainlist_item in mainlist_items:
-        if "DVDRip Castellano" in mainlist_item.title:
-            peliculas_items = lista(mainlist_item)
-            break
-    
-    bien = False
-    for pelicula_item in peliculas_items:
-        mirrors = findvideos(pelicula_item)
-        if len(mirrors)>0:
-            bien = True
-            break
-
-    return bien
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.xml
index 30789f58577b1b8bbb23260bb880810c00b65fa0..6ecfc4f4947a1bb15141f84d97afa7abf20a3922 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/divxatope.xml
@@ -12,9 +12,9 @@
 	<bannermenu>http://media.tvalacarta.info/pelisalacarta/bannermenu/divxatope.png</bannermenu>
 
 	<update_url>https://raw.githubusercontent.com/tvalacarta/pelisalacarta/master/python/main-classic/channels/</update_url>
-	<version>4</version>
-	<date>11/10/2014</date>
-	<changes>Actualizado por cambios en la web</changes>
+	<version>5</version>
+	<date>31/12/2015</date>
+	<changes>Corregida expresion regular para los torrents</changes>
 
 	<categories>
 		<category>torrent</category>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/documentalesatonline2.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/documentalesatonline2.py
index c82366e0bc07e63630a6b67b1cdc363372632b64..06a875ab3d8046193702b3d5f8685fdf2bd7ce1d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/documentalesatonline2.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/documentalesatonline2.py
@@ -69,7 +69,6 @@ def categorias(item):
     scrapertools.printMatches(matches)
 
     for match in matches:
-        #xbmctools.addnewfolder( __channel__ , "novedades" , category , match[1] , match[0] + "feed?paged=1" , "" , "")
         itemlist.append( Item(channel=__channel__, action="novedades", title=match[1] , url=match[0] , folder=True) )
 
     return itemlist
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/filesmonster_catalogue.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/filesmonster_catalogue.py
index bec281dad1e7a3f34fcb010b56d9286cd22c997f..86d065c02653afc8936562f4dd16bb06338b28e7 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/filesmonster_catalogue.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/filesmonster_catalogue.py
@@ -7,6 +7,8 @@
 import urlparse,urllib2,urllib,re
 import os,sys
 
+
+
 from core import logger
 from core import config
 from core import scrapertools
@@ -51,9 +53,9 @@ def menu_1(item):
 
     itemlist = []
     itemlist.append( Item(channel=__channel__, action="hetero"  ,  title="Categorías porno hetero" , thumbnail="http://photosex.biz/imager/w_400/h_500/e48337cd95bbb6c2c372ffa6e71441ac.jpg"))    
-    itemlist.append( Item(channel=__channel__, action="gay"  ,  title="Categorí­as porno gay y lesbian" , thumbnail="http://photosex.biz/imager/w_400/h_500/93df13c85224d428c195ea6581e7cdb3.jpg"))   
+    itemlist.append( Item(channel=__channel__, action="gay"  ,  title="Categorías porno gay y lesbian" , thumbnail="http://photosex.biz/imager/w_400/h_500/93df13c85224d428c195ea6581e7cdb3.jpg"))   
     itemlist.append( Item(channel=__channel__, action="bisex"  , title="Categorías porno bisex, trans y otras" , thumbnail="http://photosex.biz/imager/w_400/9dbaf07ad77788fd3d1f2f533bb25544.jpg"))     
-    itemlist.append( Item(channel=__channel__, action="lista_categoria"  ,  title="Listado global (todas las categorí­as)" ,  url="http://filesmonster.filesdl.net/posts/index/",  thumbnail="http://photosex.biz/imager/w_400/h_400/9f869c6cb63e12f61b58ffac2da822c9.jpg"))         
+    itemlist.append( Item(channel=__channel__, action="lista_categoria"  ,  title="Listado global (todas las categorías)" ,  url="http://filesmonster.filesdl.net/posts/index/",  thumbnail="http://photosex.biz/imager/w_400/h_400/9f869c6cb63e12f61b58ffac2da822c9.jpg"))         
     itemlist.append( Item(channel=__channel__, title="Búsqueda global"     , action="search") )
     return itemlist
 
@@ -214,7 +216,7 @@ def lista_categoria(item):
     pagina_despues=str(pagina+4)
     pagina=str(pagina)
     videos=str(cuantos_videos)
-    if (cuantos_videos==25): itemlist.append( Item(channel=__channel__, action="lista_categoria", title=">> siguientes (páginas "+pagina +" a "+pagina_despues+")", url=item.url , thumbnail="", plot=pagina , folder=True) )
+    if (cuantos_videos==25): itemlist.append( Item(channel=__channel__, action="lista_categoria", title=">> siguientes (páginas "+pagina +" a "+pagina_despues+")", url=item.url , thumbnail="", plot=pagina , folder=True) )
     itemlist.append( Item(channel=__channel__, action="mainlist", title="<< volver al inicio",  folder=True) )
   
 
@@ -304,7 +306,7 @@ def lista_buscar(item):
     pagina=plot+5
     pagina_despues=str(pagina+4)
     pagina=str(pagina)
-    if (cuantos_videos==25 ) : itemlist.append( Item(channel=__channel__, action="lista_buscar", title=">> siguientes resultados (páginas "+pagina +" a "+pagina_despues+")", url=texto , thumbnail="", plot=pagina , folder=True) )
+    if (cuantos_videos==25 ) : itemlist.append( Item(channel=__channel__, action="lista_buscar", title=">> siguientes resultados (páginas "+pagina +" a "+pagina_despues+")", url=texto , thumbnail="", plot=pagina , folder=True) )
     itemlist.append( Item(channel=__channel__, action="mainlist", title="<< volver al inicio",  folder=True) )
   
   
@@ -391,7 +393,7 @@ def search(item,texto):
     pagina=plot+5
     pagina_despues=str(pagina+4)
     pagina=str(pagina)
-    if (cuantos_videos==25 ) : itemlist.append( Item(channel=__channel__, action="lista_buscar", title=">> siguientes resultados (páginas "+pagina +" a "+pagina_despues+")", url=texto , thumbnail="", plot=pagina , folder=True) )
+    if (cuantos_videos==25 ) : itemlist.append( Item(channel=__channel__, action="lista_buscar", title=">> siguientes resultados (páginas "+pagina +" a "+pagina_despues+")", url=texto , thumbnail="", plot=pagina , folder=True) )
     itemlist.append( Item(channel=__channel__, action="mainlist", title="<< volver al inicio",  folder=True) )
   
   
@@ -442,6 +444,7 @@ def detail_1(item):
 
 
 def detail(item):
+
     logger.info("[filesmonster_catalogue.py] detail")
     itemlist = []
 
@@ -449,13 +452,25 @@ def detail(item):
     data=scrapertools.downloadpageGzip(item.url)
     # descubre la url
     
-    
+    titulo=item.title.replace(" [abrir carpeta en filesmonster ]","")
+    contador=0
     patronvideos2  = 'http://filesmonster.com/download.php(.*?)".(.*?)'
     matches2 = re.compile(patronvideos2,re.DOTALL).findall(data)
     for match2 in matches2:
         scrapedurl2 ="http://filesmonster.com/download.php"+match2[0] 
+        contador=contador+1
+        contador_t=str(contador)
+       
+        itemlist.append( Item(channel=__channel__ , action="play" ,  plot=data ,  server="filesmonster", title="CONTENIDO "+contador_t+": "+titulo+" [ver en filesmonster]" ,url=scrapedurl2, thumbnail=item.thumbnail, folder=False))
+
+
+
+    patronvideos2  = 'http://filesmonster.com/folders.php(.*?)".(.*?)'
+    matches2 = re.compile(patronvideos2,re.DOTALL).findall(data)
+    for match2 in matches2:
+        scrapedurl2 ="http://filesmonster.com/folders.php"+match2[0] 
         
-        itemlist.append( Item(channel=__channel__ , action="play" ,  plot=data ,  server="filesmonster", title=item.title+" [ver en filesmonster]" ,url=scrapedurl2, thumbnail=item.thumbnail, folder=False))
+        itemlist.append( Item(channel=__channel__ , action="detail" ,  plot=data ,  title=item.title+" [abrir carpeta en filesmonster ]" ,url=scrapedurl2, thumbnail=item.thumbnail, folder=True))
 
 
     return itemlist
@@ -472,7 +487,7 @@ def menu_2(item):
     itemlist = []
     itemlist.append( Item(channel=__channel__, action="categorias_2"  ,  url="hetero",  title="Categorías porno hetero" , thumbnail="http://photosex.biz/imager/w_400/h_500/e48337cd95bbb6c2c372ffa6e71441ac.jpg"))    
     itemlist.append( Item(channel=__channel__, action="categorias_2"  ,  url="gay",  title="Categorías porno gay, lesbian, bisexual" , thumbnail="http://photosex.biz/imager/w_400/h_500/93df13c85224d428c195ea6581e7cdb3.jpg"))        
-    itemlist.append( Item(channel=__channel__, action="categorias_2"  ,  url="", title="Todas las categorias" , thumbnail="http://photosex.biz/imager/w_400/9dbaf07ad77788fd3d1f2f533bb25544.jpg"))     
+    itemlist.append( Item(channel=__channel__, action="categorias_2"  ,  url="", title="Todas las categorÍas" , thumbnail="http://photosex.biz/imager/w_400/9dbaf07ad77788fd3d1f2f533bb25544.jpg"))     
     itemlist.append( Item(channel=__channel__, action="lista_categoria_2"  ,  title="Listado global (vídeos de todas las categorías)" ,  url="http://filesmonster.biz/index.php?page=1",  thumbnail="http://photosex.biz/imager/w_400/h_400/9f869c6cb63e12f61b58ffac2da822c9.jpg"))         
 
     return itemlist
@@ -648,7 +663,7 @@ def search_2(item,texto):
     pagina=str(pagina)
     pagina_inicial=str(pagina_inicial)
     url_siguiente=re.sub(pagina_inicial, pagina, url)
-    itemlist.append( Item(channel=__channel__, action="lista_categoria_2", title=">> siguientes [pagina "+pagina+"]",   url=url_siguiente, folder=True) )
+    itemlist.append( Item(channel=__channel__, action="lista_categoria_2", title=">> siguientes [página "+pagina+"]",   url=url_siguiente, folder=True) )
     itemlist.append( Item(channel=__channel__, action="mainlist_2", title="<< volver al inicio",  folder=True) )
     return itemlist
 
@@ -689,6 +704,15 @@ def detail_2(item):
         itemlist.append( Item(channel=__channel__ , action="play" ,  plot=scrapedplot ,  server="filesmonster", title=item.title+" [ver en filesmonster]" ,url=scrapedurl2, thumbnail=scrapedthumbnail,  folder=False))
 
 
+
+    patronvideos2  = 'http://filesmonster.com/folders.php(.*?)".(.*?)'
+    matches2 = re.compile(patronvideos2,re.DOTALL).findall(data)
+    for match2 in matches2:
+        scrapedurl2 ="http://filesmonster.com/folders.php"+match2[0] 
+        
+        itemlist.append( Item(channel=__channel__ , action="detail" ,  plot=data ,  title=item.title+" [abrir carpeta en filesmonster ]" ,url=scrapedurl2, thumbnail=item.thumbnail, folder=True))
+
+
     return itemlist
     
     
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/gnula.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/gnula.py
index cd4ed93f943acb4b71a250ab9492dbfdef1ada33..e4ac8aa24537ef048099b9126b771678618ba799 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/gnula.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/gnula.py
@@ -81,13 +81,32 @@ def peliculas(item):
         plot = scrapertools.htmlclean(resto).strip()
         title = scrapedtitle+" "+plot
         fulltitle = title
+        contentTitle = title
         url = urlparse.urljoin(item.url,scrapedurl)
         thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
         if DEBUG: logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action='findvideos', title=title , fulltitle=fulltitle , url=url , thumbnail=thumbnail , plot=plot , viewmode="movie", extra=title) )
+        itemlist.append( Item(channel=__channel__, action='findvideos', title=title , fulltitle=fulltitle , url=url , thumbnail=thumbnail , plot=plot , viewmode="movie", extra=title, hasContentDetails="true", contentTitle=contentTitle, contentThumbnail=thumbnail) )
 
     return itemlist
 
+def findvideos(item):
+    logger.info("pelisalacarta.channels.zpeliculas gnula item="+item.tostring())
+
+    # Descarga la página para obtener el argumento
+    data = scrapertools.cachePage(item.url)
+    item.plot = scrapertools.find_single_match(data,'<div class="entry">(.*?)<div class="iframes">')
+    item.plot = scrapertools.htmlclean(item.plot).strip()
+    item.contentPlot = item.plot
+
+    newthumbnail = scrapertools.find_single_match(data,'<div class="entry"[^<]+<p align="center"><img alt="[^"]+" src="([^"]+)"')
+    if newthumbnail!="":
+        item.thumbnail = newthumbnail
+        item.contentThumbnail = newthumbnail
+
+    logger.info("[pelisalacarta.channels.zpeliculas findvideos plot="+item.plot)
+
+    return servertools.find_video_items(item=item,data=data)
+
 # Verificación automática de canales: Esta función debe devolver "True" si está ok el canal.
 def test():
     from servers import servertools
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/guaridavalencianista.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/guaridavalencianista.py
index 5b392a8a945bff055ec1ac1d79735301a6653593..568bcae5fd3e391a8fe01445e13b69c2051efe1e 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/guaridavalencianista.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/guaridavalencianista.py
@@ -37,79 +37,6 @@ def mainlist(item):
 
     return itemlist
 
-def search(item):
-    logger.info("[guaridavalencianista.py] search")
-
-    keyboard = xbmc.Keyboard('')
-    keyboard.doModal()
-    if (keyboard.isConfirmed()):
-        tecleado = keyboard.getText()
-        if len(tecleado)>0:
-            #convert to HTML
-            tecleado = tecleado.replace(" ", "+")
-            searchUrl = "http://guaridavalencia.blogspot.com/index.php?s="+tecleado
-            SearchResult(params,searchUrl,category)
-            
-def SearchResult(item):
-    logger.info("[guaridavalencianista.py] SearchResult")
-    
-    # Descarga la página
-    data = scrapertools.cachePage(url)
-
-    # Extrae las entradas (carpetas)
-    patronvideos  = '<p class="entry-title"><[^>]+>[^<]+</span><a href="([^"]+)"[^>]+>([^<]+)</a></p>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for match in matches:
-        # Atributos
-        scrapedurl = match[0]
-        
-        scrapedtitle =match[1]
-        scrapedtitle = scrapedtitle.replace("&#8211;","-")
-        scrapedtitle = scrapedtitle.replace("&nbsp;"," ")
-        scrapedthumbnail = ""
-        scrapedplot = ""
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # Añade al listado de XBMC
-        xbmctools.addnewfolder( __channel__ , "detail" , category , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot )
-
-    # Propiedades
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-        
-
-def performsearch(texto):
-    logger.info("[guaridavalencianista.py] performsearch")
-    url = "http://guaridavalencia.blogspot.com/index.php?s="+texto
-
-    # Descarga la página
-    data = scrapertools.cachePage(url)
-
-    # Extrae las entradas (carpetas)
-    patronvideos  = '<p class="entry-title"><[^>]+>[^<]+</span><a href="([^"]+)"[^>]+>([^<]+)</a></p>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    resultados = []
-
-    for match in matches:
-        scrapedtitle = match[1]
-        scrapedtitle = scrapedtitle.replace("&#8211;","-")
-        scrapedtitle = scrapedtitle.replace("&nbsp;"," ")
-        scrapedurl = match[0]
-        scrapedthumbnail = ""
-        scrapedplot = ""
-
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # Añade al listado de XBMC
-        resultados.append( [__channel__ , "detail" , "buscador" , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot ] )
-        
-    return resultados
-
 def DocuSeries(item):
     logger.info("[guaridavalencianista.py] DocuSeries")
     itemlist=[]
@@ -177,34 +104,6 @@ def DocuARCHIVO(item):
 
     return itemlist
     
-def DocuCat(item):
-    logger.info("[guaridavalencianista.py] peliscat")
-    itemlist=[]
-
-    # Descarga la página
-    data = scrapertools.cache_page(item.url)
-
-    # Extrae las entradas (carpetas)
-    patronvideos  = '<li class="cat-item cat-item[^"]+"><a href="([^"]+)" title="[^"]+">([^<]+)</a>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for match in matches:
-        # Atributos
-        scrapedtitle = match[1]
-        scrapedurl = match[0]
-        scrapedthumbnail = ""
-        scrapedplot = ""
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # Añade al listado de XBMC
-        xbmctools.addnewfolder( __channel__ , "listvideos" , category , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot )
-
-    # Propiedades
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
 def listvideos(item):
     logger.info("[guaridavalencianista.py] listvideos")
     itemlist=[]
@@ -241,9 +140,6 @@ def listvideos(item):
         scrapedplot = re.sub("<[^>]+>"," ",scrapedplot)
         scrapedplot = scrapertools.unescape(scrapedplot)
         if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # Añade al listado de XBMC
-        #xbmctools.addnewfolder( __channel__ , "findevi" , category , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot )
         itemlist.append( Item(channel=__channel__, action="findvideos", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
 
     # Extrae la marca de siguiente página
@@ -260,24 +156,6 @@ def listvideos(item):
 
     return itemlist
 
-#~ def findvideos(item):
-    #~ logger.info("[guaridavalencianista.py] findvideos")
-    #~ itemlist=[]
-    
-    #~ # Descarga la página
-    #~ data = scrapertools.cachePage(item.url)
-    #~ data = scrapertools.get_match(data,"<div� class='post-body entry-content'(.*?)<div class='post-footer'>")
-
-    #~ # Busca los enlaces a los videos
-    #~ listavideos = servertools.findvideos(data)
-
-    #~ for video in listavideos:
-        #~ videotitle = scrapertools.unescape(video[0])
-        #~ url = video[1]
-        #~ server = video[2]
-        #~ #xbmctools.addnewvideo( __channel__ , "play" , category , server ,  , url , thumbnail , plot )
-        #~ itemlist.append( Item(channel=__channel__, action="play", server=server, title=videotitle , url=url , thumbnail=item.thumbnail , plot=item.plot , fulltitle = item.title , folder=False) )
-
     #~ return itemlist
 def findvideos(item):
     logger.info("[guaridavalencianista.py] findvideos")
@@ -297,7 +175,7 @@ def findvideos(item):
         scrapedurl = video[1]
         server = video[2]
         
-        itemlist.append( Item(channel=item.channel, title=scrapedtitle , action="play" , server=server, page=item.page, url=scrapedurl, thumbnail=item.thumbnail, show=item.show , plot=item.plot , folder=False) )
+        itemlist.append( Item(channel=item.channel, title=scrapedtitle , action="play" , server=server, url=scrapedurl, thumbnail=item.thumbnail, show=item.show , plot=item.plot , folder=False) )
 
     return itemlist
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/los_simpsons_online.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/los_simpsons_online.py
deleted file mode 100644
index af8de52b11d64f25ede3dee5353f5f1dad37d11c..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/los_simpsons_online.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- coding: utf-8 -*-
-#------------------------------------------------------------
-# pelisalacarta - XBMC Plugin
-# Canal para lossimpsonsonline.com.ar por Ignite
-# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
-
-from core import logger
-from core import config
-from core import scrapertools
-from core.item import Item
-from servers import servertools
-
-__channel__ = "los_simpsons_online"
-__category__ = "S"
-__type__ = "generic"
-__title__ = "Los Simpsons Online"
-__language__ = "ES"
-
-DEBUG = config.get_setting("debug")
-    
-def isGeneric():
-    return True
-
-def mainlist(item):
-    logger.info("[simpsonsonline.py] mainlist")
-    
-    url = "http://www.lossimpsonsonline.com.ar/"
-    data = scrapertools.cachePage(url)
-    patron  = '<li><a href="([^"]+)" title="([^"]+)">'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-
-    for match in matches:
-         scrapedtitle = match[1]
-         scrapedurl = match[0]
-         scrapedthumbnail = ""
-         scrapedplot = ""
-         itemlist.append( Item(channel=__channel__, action="episodios", title=scrapedtitle, url=scrapedurl))
-
-    return itemlist
-    
-def episodios(item):
-    logger.info("[simpsonsonline.py] episodios")
-
-    url = item.url
-    url = "http://www.lossimpsonsonline.com.ar"+url
-    data = scrapertools.cachePage(url)
-    patron = '<div class="item"><a href="([^"]+)" class="thumbnail"><img src="([^"]+)" alt="([^"]+)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    itemlist = []
-    for match in matches:
-         scrapedtitle = match[2]
-         scrapedurl = "http://www.lossimpsonsonline.com.ar"+match[0]
-         scrapedthumbnail = "http://www.lossimpsonsonline.com.ar"+match[1]
-         scrapedplot = ""
-         itemlist.append( Item(channel=__channel__, action="findvideos" , title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot))
-
-    return itemlist
-
-# Verificación automática de canales: Esta función debe devolver "True" si está ok el canal.
-def test():
-    from servers import servertools
-
-    # Lee todas las temporadas buscando un episodio visible
-    temporadas_items = mainlist(Item())
-    
-    # Empezando por las últimas que es más fácil
-    temporadas_items.reverse()
-    
-    for temporada_item in temporadas_items:
-    
-        # Da por bueno el canal si alguno de los vídeos devuelve mirrors
-        episodios_items = episodios(temporada_item)
-        bien = False
-        for episodio_item in episodios_items:
-            mirrors = servertools.find_video_items( item=episodio_item )
-            if len(mirrors)>0:
-                return True
-
-    return False
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/los_simpsons_online.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/los_simpsons_online.xml
deleted file mode 100644
index c863ad487078df91f093da40b833ff3fc3f20bac..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/los_simpsons_online.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<channel>
-	<id>los_simpsons_online</id>
-	<name>Los Simpsons Online</name>
-	<language>es</language>
-	<update_url></update_url>
-	<active>false</active>
-	<include_in_global_search>false</include_in_global_search>
-	<version>0</version>
-	<adult>false</adult>
-	<date></date>
-	<changes></changes>
-	<fanart></fanart>
-	<thumbnail></thumbnail>
-	<categories>
-		<category>serie</category>
-	</categories>
-</channel>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/newpct1.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/newpct1.py
index 8460e640bd78f66dfc1b77610cd2853cab639f70..c9fff3779a9c84ffd8af017ec07e3b0c327281bf 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/newpct1.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/newpct1.py
@@ -424,7 +424,7 @@ def findvideos(item):
                     devuelve= server_module.find_videos(enlace)
                     if devuelve:
                         enlace=devuelve[0][1]
-                        itemlist.append( Item(fanart=item.fanart, channel=__channel__, action="play", server=servidor, title=titulo , fulltitle = item.title, url=enlace , thumbnail=logo , plot=item.plot, folder=False) )
+                        itemlist.append( Item(fanart=item.fanart, channel=__channel__, action="play", server=servidor, title=parte_titulo , fulltitle = item.title, url=enlace , thumbnail=logo , plot=item.plot, folder=False) )
                 except:
                     pass
     return itemlist
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/newpct1.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/newpct1.xml
index 78881dbe1493e6399cdae3a995803f70e5a3ba92..063466d8c6b25b5197e56be9753a42fe89c37489 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/newpct1.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/newpct1.xml
@@ -2,27 +2,19 @@
 <channel>
 	<id>newpct1</id>
 	<name>Newpct1</name>
-
+	<language>es</language>
+	<update_url></update_url>
 	<active>true</active>
+	<include_in_global_search>false</include_in_global_search>
+	<version>13.3</version>
 	<adult>false</adult>
-	<language>es</language>
-
+	<date>14/01/16</date>
+	<changes>Corregido titulo en enlaces para descargas</changes>
 	<fanart></fanart>
-	<thumbnail>http://media.tvalacarta.info/pelisalacarta/squares/newpct1.png</thumbnail>
-	<bannermenu>http://media.tvalacarta.info/pelisalacarta/bannermenu/newpct1.png</bannermenu>
-
-	<update_url>https://raw.githubusercontent.com/tvalacarta/pelisalacarta/master/python/main-classic/channels/</update_url>
-	<version>13.2</version>
-	<date>19/12/15</date>
-	<changes>Añadidos enlaces para descargas</changes>
-
+	<thumbnail></thumbnail>
 	<categories>
 		<category>movie</category>
 		<category>serie</category>
 		<category>anime</category>
 	</categories>
-
-	<settings>
-		<include_in_global_search>false</include_in_global_search>
-	</settings>
 </channel>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/novedades.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/novedades.py
index 667352bc7e1ea93726ce9f2619a95ca4dc934ed0..b170fbd8b29f890b9c2fd66a021a10a818d520e2 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/novedades.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/novedades.py
@@ -52,9 +52,9 @@ def peliculas(item):
     item.url = "http://www.divxatope.com/categoria/peliculas-castellano"
     itemlist.extend( divxatope.lista(item) )
 
-    import gnula
-    item.url = "http://gnula.nu/peliculas-online/lista-de-peliculas-online-parte-1/"
-    itemlist.extend( gnula.peliculas(item)[:20] )
+    import yaske
+    item.url = "http://www.yaske.cc/"
+    itemlist.extend( yaske.peliculas(item) )
 
     sorted_itemlist = []
 
@@ -81,9 +81,9 @@ def peliculas_infantiles(item):
     item.url = "http://www.cinetux.org/genero/infantil"
     itemlist.extend( cinetux.peliculas(item) )
 
-    import gnula
-    item.url = "http://gnula.nu/generos/lista-de-peliculas-del-genero-infantil/"
-    itemlist.extend( gnula.peliculas(item)[:20] )
+    import yaske
+    item.url = "http://www.yaske.cc/es/peliculas/custom/?gender=animation"
+    itemlist.extend( yaske.peliculas(item) )
 
     import oranline
     item.url = "http://www.oranline.com/Películas/infantil/"
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/peliculaseroticas.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/peliculaseroticas.py
index cb81404d77e0c95f909a5b775ca357532478dbe5..641862b1940542d4c3d4066910b4b3835cb1b12c 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/peliculaseroticas.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/peliculaseroticas.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #------------------------------------------------------------
 # pelisalacarta - XBMC Plugin
 # Canal para peliculaseroticas
@@ -14,238 +14,48 @@ from core.item import Item
 from servers import servertools
 
 __channel__ = "peliculaseroticas"
-__category__ = "F"
-__type__ = "generic"
-__title__ = "PeliculasEroticas"
-__language__ = "ES"
-__adult__ = "true"
-
-from xml.dom import minidom
-from xml.dom import EMPTY_NAMESPACE
 
 DEBUG = config.get_setting("debug")
 
-ATOM_NS = 'http://www.w3.org/2005/Atom'
-
 def isGeneric():
     return True
     
 def mainlist(item):
-    logger.info("[peliculaseroticas.py] mainlist")
-
-    itemlist = []
-    itemlist.append( Item(channel=__channel__, action="novedades"  , title="Novedades"  , url="http://www.blogger.com/feeds/6886871729120330561/posts/default?start-index=1&max-results=25" ))
-    return itemlist
-    
-def novedades(item):
-    logger.info("[peliculaseroticas.py] novedades")
-    url = item.url
-    data = None
-    thumbnail = ""
-    xmldata = urllib2.urlopen(url,data)
-    
-    xmldoc = minidom.parse(xmldata)
-    xmldoc.normalize()
-    #print xmldoc.toxml().encode('utf-8')
-    xmldata.close()
-    c = 0
-    itemlist = []
-    plot = ""
-    for entry in xmldoc.getElementsByTagNameNS(ATOM_NS, u'entry'):
-    #First title element in doc order within the entry is the title
-        entrytitle = entry.getElementsByTagNameNS(ATOM_NS, u'title')[0]
-        entrylink = entry.getElementsByTagNameNS(ATOM_NS, u'link')[2]
-        entrythumbnail = entry.getElementsByTagNameNS(ATOM_NS, u'content')[0]
-        etitletext = get_text_from_construct(entrytitle)
-        elinktext = entrylink.getAttributeNS(EMPTY_NAMESPACE, u'href')
-        ethumbnailtext = get_text_from_construct(entrythumbnail)
-        regexp = re.compile(r'src="([^"]+)"')
-        match = regexp.search(ethumbnailtext)
-        if match is not None:
-            thumbnail = match.group(1)
-        regexp = re.compile(r'/><br />([^<]+)<')
-        match = regexp.search(ethumbnailtext)
-        if match is not None:
-            plot = match.group(1)
-        regexp = re.compile(r'</span><a href="([^"]+)"')
-        match = regexp.search(ethumbnailtext)
-        if match is not None:
-            elinktext = match.group(1)		
-        
-        # Depuracion
-        if (DEBUG):
-            logger.info("scrapedtitle="+etitletext)
-            logger.info("scrapedurl="+elinktext)
-            logger.info("scrapedthumbnail="+thumbnail)
-                
-        #print etitletext, '(', elinktext, thumbnail,plot, ')'
-        #xbmctools.addnewfolder( __channel__ , "detail" , category ,  etitletext,  elinktext, thumbnail, plot )
-        itemlist.append( Item(channel=__channel__, action="detail" , title=etitletext , url=elinktext, thumbnail=thumbnail, plot=plot))
-        c +=1
-    
-    if c >= 25:
-        regexp = re.compile(r'start-index=([^\&]+)&')
-        match = regexp.search(url)
-        if match is not None:
-            start_index = int(match.group(1)) + 25
-        scrapedtitle = "P�gina siguiente"
-        scrapedurl =  "http://www.blogger.com/feeds/6886871729120330561/posts/default?start-index="+str(start_index)+"&max-results=25"
-        scrapedthumbnail = ""
-        scrapedplot = ""
-        #xbmctools.addnewfolder( __channel__ , "novedades" , category , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot )
-        itemlist.append( Item(channel=__channel__, action="novedades", title=scrapedtitle , url=scrapedurl , folder=True) )
-    
-    return itemlist
+    logger.info("pelisalacarta.channels.peliculaseroticas mainlist")
 
-def get_text_from_construct(element):
-    '''
-    Return the content of an Atom element declared with the
-    atomTextConstruct pattern.  Handle both plain text and XHTML
-    forms.  Return a UTF-8 encoded string.
-    '''
-    if element.getAttributeNS(EMPTY_NAMESPACE, u'type') == u'xhtml':
-        #Grab the XML serialization of each child
-        childtext = [ c.toxml('utf-8') for c in element.childNodes ]
-        #And stitch it together
-        content = ''.join(childtext).strip()
-        return content
-    else:
-        return element.firstChild.data.encode('utf-8')
-
-def detail(item):
-    logger.info("[peliculaseroticas.py] detail")
+    if item.url=="":
+        item.url = "http://www.peliculaseroticas.net/"
 
-    itemlist = []
-    if "videobb" in item.url:
-        itemlist.append( Item(channel=__channel__, action="play" , title=item.title , url=item.url, thumbnail=item.thumbnail, plot=item.plot, server="videobb", folder=False))
-        return itemlist
-    # Descarga la p�gina
+    # Descarga la página
     data = scrapertools.cachePage(item.url)
-    
-    # ------------------------------------------------------------------------------------
-    # Busca los enlaces a los videos
-    # ------------------------------------------------------------------------------------
-    listavideos = servertools.findvideos(data)
-
-    for video in listavideos:
-
-        titulo = item.title.replace("%28"," ")
-        titulo = titulo.replace("%29"," ")
-        scrapedtitle = titulo.strip().replace("(Megavideo)","").replace("+"," ") +" - "+video[0]
-        server = video[2]
-        scrapedurl = video[1]
-        #	xbmctools.addvideo( __channel__ , video[0], video[1] , category ,         #plot )
-        #xbmctools.addnewvideo( __channel__ , "play" , category , server , titulo.strip().replace("(Megavideo)","").replace("+"," ") +" - "+video[0]  , video[1] ,thumbnail, plot )
-        itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=scrapedurl, thumbnail=item.thumbnail, plot=item.plot, server=server, folder=False))
-        # ------------------------------------------------------------------------------------
-
-    # Extrae los enlaces a los v�deos (Directo)
-
-     # Extrae los videos para el servidor mystream.to
-
-    patronvideos = '(http://www.mystream.to/.*?)"'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    #logger.info(data)
-    #logger.info("[peliculaseroticas.py] matches="+matches[0])  
-    if len(matches)>0:
-        data1 = scrapertools.cachePage(matches[0])
-        patronvideos = 'flashvars" value="file=(.*?)"'
-        videosdirecto = re.compile(patronvideos,re.DOTALL).findall(data1)
-        #logger.info("[peliculaseroticas.py] videosdirecto="+videosdirecto[0])
-        if len(videosdirecto)>0:
-            scrapedtitle = item.title +" - Directo con mystream.to"
-            scrapedurl = videosdirecto[0]
-            #xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title+" - Directo con mystream.to"  , videosdirecto[0] ,thumbnail, plot )
-            itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=scrapedurl, thumbnail=item.thumbnail, plot=item.plot, server="Directo", folder=False))
-
-    patronvideos = "<div class='post-body entry-content'>.*?</span><a href=\"(.*?)\" target="
-    matches = re.compile(patronvideos,re.DOTALL).findall(data) 
-    if len(matches)>0: 
-        # extrae los videos para servidor movshare
-        data1 = scrapertools.cachePage(matches[0])
-        patronvideos ='param name="src" value="http://stream.movshare.net/(.*?).avi'   
-        videosdirecto = re.compile(patronvideos,re.DOTALL).findall(data1)
-        #logger.info("[peliculaseroticas.py] videosdirecto="+videosdirecto[0])
-        if len(videosdirecto)>0:
-            from servers import movshare
-            mediaurl = "http://www.movshare.net/video/" + videosdirecto[0]
-            logger.info("[peliculaseroticas.py] mediaurl = "+ mediaurl)
-            
-            scrapedtitle = item.title +" - Video en movshare" 
-            # xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title+" - Video en movshare"  , mediaurl ,thumbnail, plot )
-            itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=mediurl, thumbnail=item.thumbnail, plot=item.plot, server="Movshare", folder=False))
 
-    patronvideos = 'file=(http://www.wildscreen.tv.*?)\?'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    if len(matches)>0:
-        #xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title+" - Video en wildscreen.tv"  , matches[0] ,thumbnail, plot )
-        scrapedtitle = item.title +" - Video en wildscreen.tv"
-        itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=matches[0], thumbnail=item.thumbnail, plot=item.plot, server="Directo", folder=False))
+    # Extrae las entradas de la pagina seleccionada
+    patron  = '<div class="post"[^<]+'
+    patron += '<a href="([^"]+)">([^<]+)</a[^<]+'
+    patron += '<hr[^<]+'
+    patron += '<a[^<]+<img src="([^"]+)"'
 
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    if DEBUG: scrapertools.printMatches(matches)
+    itemlist = []
 
-    # extrae los videos para servidor myspacecdn      
+    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+        url = urlparse.urljoin(item.url,scrapedurl)
+        title = scrapedtitle.strip()
+        thumbnail = urlparse.urljoin(item.url,scrapedthumbnail)
+        plot = ""
 
-    #data = scrapertools.cachePage(url)
-    patronvideos = 'flashvars.*?file=(.*?.flv).*?'
-    videosdirecto = re.compile(patronvideos,re.DOTALL).findall(data)
-    #logger.info("[peliculaseroticas.py] videosdirecto="+videosdirecto[0])
-    if len(videosdirecto)>0:
-        #xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title+" - Video en myspacecdn"  , videosdirecto[0] ,thumbnail, plot )
-        itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=scrapedurl, thumbnail=item.thumbnail, plot=item.plot, server=server, folder=False))
-    # --------------------------------------------------------------------------------
+        # Añade al listado
+        itemlist.append( Item(channel=__channel__, action="findvideos", title=title , fulltitle=title, url=url , thumbnail=thumbnail , plot=plot , viewmode="movie", folder=True) )
 
-    # extrae los videos para del servidor adnstream.com
-      
-    patronvideos = '<a href=\"http://www.adnstream.tv/video/(.*?)/.*?"'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    #logger.info("[peliculaseroticas.py] matches="+matches[0])
-    if len(matches)>0:
+    # Extrae la marca de siguiente página
+    if item.url=="http://www.peliculaseroticas.net/":
+        next_page_url = "http://www.peliculaseroticas.net/cine-erotico/2.html"
+    else:
+        current_page = scrapertools.find_single_match(item.url,"(\d+)")
+        next_page = int(current_page)+1
+        next_page_url = "http://www.peliculaseroticas.net/cine-erotico/"+str(next_page)+".html"
 
-        logger.info("[peliculaseroticas.py] videocode = "+ matches[0])
-        crapedtitle = item.title +" - Video en adnstream.tv"
-        #xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title+" - Video en adnstream.tv"  , matchvideo[0] ,thumbnail, plot )
-        itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=matches[0], thumbnail=item.thumbnail, plot=item.plot, server="adnstream", folder=False))
+    itemlist.append( Item(channel=__channel__, action="peliculas", title=">> Página siguiente" , url=next_page_url, folder=True) )
 
-    patronvideos = 'src="(http://vk[^\/]+\/video_ext.php[^"]+)"'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    if len(matches)>0:
-        print " encontro VK.COM :%s" %matches[0]
-        scrapedtitle = item.title + " [VKServer]"
-        videourl = matches[0]
-        itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=videourl, thumbnail=item.thumbnail, plot=item.plot, server="vk", folder=False))
-    
-    patronvideos = 'http://static.xvideos.com.*?id_video=([^"]+)"'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    if len(matches)>0:
-        videourl = matches[0]
-        scrapedtitle = item.title + " [Xvideos]"
-        itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=videourl, thumbnail=item.thumbnail, plot=item.plot, server="xvideos", folder=False))
-    '''
-    patronvideos = '<embed src="http://www.userporn.com/e/([^"]+)"'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    if len(matches)>0:
-        from servers import userporn
-        
-        videourl = userporn.geturl(matches[0])
-        scrapedtitle = item.title + " [Userporn]"
-        itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=videourl, thumbnail=item.thumbnail, plot=item.plot, server="Directo", folder=False))
-    '''
-        
     return itemlist
-
-# Verificaci�n autom�tica de canales: Esta funci�n debe devolver "True" si est� ok el canal.
-def test():
-    from servers import servertools
-    
-    # Da por bueno el canal si alguno de los v�deos de "Novedades" devuelve mirrors
-    mainlist_items = mainlist(Item())
-    novedades_items = novedades(mainlist_items[0])
-
-    bien = False
-    for novedades_item in novedades_items:
-        mirrors = detail( item=novedades_item )
-        if len(mirrors)>0:
-            bien = True
-            break
-
-    return bien
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/peliculasmx.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/peliculasmx.py
index 5fd4bcb3166e68f69b4ad0aee722f1706b619cfa..7b30c9318542580cd0f6b211fc5232573354e57f 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/peliculasmx.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/peliculasmx.py
@@ -144,72 +144,6 @@ def peliculas(item):
     
     return itemlist
 
-def findvideos(item):
-    logger.info("pelisalacarta.channels.peliculasmx videos")
-    # Descarga la página
-    data = scrapertools.cachePage(item.url)
-    title = item.title
-    scrapedthumbnail = item.thumbnail
-    itemlist = []
-    patron = '<li><a href="#ms.*?">([^"]+)</a></li>.*?<iframe src="(.*?)"'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    #itemlist.append( Item(channel=__channel__, action="play", title=title , fulltitle=item.fulltitle, url=item.url , thumbnail=scrapedthumbnail , folder=False) )
-
-    if (DEBUG): scrapertools.printMatches(matches)
-    for match in matches:
-        url = match[1]
-        title = "SERVIDOR: " + match[0]
-        itemlist.append( Item(channel=__channel__, action="play", title=title , fulltitle=item.fulltitle, url=url , thumbnail=scrapedthumbnail , folder=False) )
-
-    return itemlist
-
-def play(item):
-    logger.info("pelisalacarta.channels.peliculasmx play")
-    itemlist=[]
-
-
-    from servers import servertools
-    itemlist = servertools.find_video_items(data=item.url)
-    for videoitem in itemlist:
-        videoitem.channel=__channel__
-        videoitem.action="play"
-        videoitem.folder=False
-
-    return itemlist	
-    #data2 = scrapertools.cache_page(item.url)
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/mv.php?url=","http://www.megavideo.com/?v=")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/videobb.php?url=","http://www.videobb.com/watch_video.php?v=")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/vidbux.php?url=","http://www.vidbux.com/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/vidxden.php?url=","http://www.vidxden.com/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/videozer.php?url=","http://www.videozer.com/video/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/v/pl/play.php?url=","http://www.putlocker.com/embed/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/v/mv/play.php?url=","http://www.modovideo.com/frame.php?v=")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/v/ss/play.php?url=","http://www.sockshare.com/embed/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/v/vb/play.php?url=","http://vidbull.com/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/sockshare.php?url=","http://www.sockshare.com/embed/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/moevide.php?url=","http://moevideo.net/?page=video&uid=")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/novamov.php?url=","http://www.novamov.com/video/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/movshare.php?url=","http://www.movshare.net/video/")
-    #data2 = data2.replace("http://www.peliculasaudiolatino.com/show/divxstage.php?url=","http://www.divxstage.net/video/")
-    #listavideos = servertools.findvideos(data2)
-    
-	#for video in listavideos:
-    #    invalid = video[1]
-    #    invalid = invalid[0:8]
-    #    if invalid!= "FN3WE43K" and invalid!="9CC3F8&e":
-    #        scrapedtitle = item.title+video[0]
-    #        videourl = item.url
-    #        server = video[2]
-    #        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+videourl+"]")
-    #logger.info("url=" + item.url)
-	
-            # Añade al listado de XBMC
-            #itemlist.append( Item(channel=__channel__, action="play", title=scrapedtitle , fulltitle=item.fulltitle, url=videourl , server=server , folder=False) )
-#    itemlist.append( Item(channel=__channel__, action="play" , title=item.title , url=item.url, thumbnail="", plot="", server=item.url))
-	
-    
- #   return itemlist
-
 def search(item,texto):
     logger.info("pelisalacarta.channels.peliculasmx search")
     itemlist = []
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pelispekes.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pelispekes.py
index 58bde67e50c4b191006b88bc4bd96d37be7dd6f8..2feb45be3ce0b812fd9738361827ec48b44005e4 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pelispekes.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pelispekes.py
@@ -28,140 +28,69 @@ def mainlist(item):
     logger.info("[pelispekes.py] mainlist")
     itemlist=[]
 
-    itemlist.append( Item(channel=__channel__ , action="novedades"  , title="Novedades"          , url="http://pelispekes.com/"))
-    itemlist.append( Item(channel=__channel__ , action="categorias" , title="Listado por género" , url="http://pelispekes.com/"))
-    itemlist.append( Item(channel=__channel__ , action="letras"     , title="Listado alfabético" , url="http://pelispekes.com/"))
+    if item.url=="":
+        item.url = "http://www.pelispekes.com/"
 
-    return itemlist
-
-def novedades(item):
-    logger.info("[pelispekes.py] novedades")
-    itemlist = []
-
-    # Extrae las entradas (carpetas)
     data = scrapertools.cachePage(item.url)
-    patron = 'class="filmgal">(.*?)<strong>Duraci[^<]+</strong>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    logger.info("hay %d matches" % len(matches))
-
-    for match in matches:
-        '''
-        <a target="_blank" href="http://www.pelispekes.com/bob-el-constructor-la-gran-dino-excavacion-la-pelicula/">
-        <img width="145" height="199" border="0" src="http://www.pelispekes.com/caratula-pekes/6783-145x199.jpg" alt="Ver pelicula Bob El constructor La Gran Dino Excavacion La Pelicula"/>
-        </a>
-        </div>
-        <div class="pelInfoToolTip" id="divtool6783">
-        <div class="divTituloTool">
-        <span class="titulotool"><strong>Bob El constructor La Gran Dino Excavacion La Pelicula</strong></span> <strong>(2011)</strong>
-        </div>
-        <div>
-        <strong>Género: </strong>2011 / Animacion / B / Infantil       </div>
-        <div class="sinopsis">
-        <strong>Sinopsis:</strong> Coge tu pala y unete a la diversion con bob el constructor y su excelente equipo desenterrando antiguas sorpresas en esta nueva pelicula Un camion nuevo llamado escombros se une al equipo Can-Do para ayudar a construir un parque de atracciones enorme pero cuando las cosas se ponen dificiles con las gaviotas y bultos imposibles [...]       </div>
-        <div>
-        <strong>Duración: </strong>61 min       </div>
-        <!-- modificar -->
-        <!--
-        <div class="datos">
-        <div class="verde">+6 puntos</div>  
-        <div class="reproducciones">&nbsp;22248 reproducciones</div> 
-        </div>
-        -->
-        </div>
-        '''
-        patron  = '<a target="_blank" href="([^"]+)"[^<]+'
-        patron += '<img width="\d+" height="\d+" border="0" src="([^"]+)" alt="([^"]+)".*?'
-        patron += '<strong>Sinopsis:</strong>(.*?)</div>'
-        matches2 = re.compile(patron,re.DOTALL).findall(match)
-        logger.info("hay %d matches2" % len(matches2))
-
-        for match2 in matches2:
-            # Atributos
-            scrapedurl = match2[0]
-            scrapedtitle =match2[2].replace("Ver pelicula","").replace("&#8211;","")
-            scrapedthumbnail = match2[1]
-            scrapedplot = match2[3]
-            if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-            itemlist.append( Item(channel=item.channel , action="findvideos"   , title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail, fanart=scrapedthumbnail, plot=scrapedplot , viewmode="movie_with_plot"))
-    
-    # Extrae la pagina siguiente
-    patron  = '<a class="nextpostslink" href="([^"]+)"'
+    '''
+    <div class="poster-media-card">
+    <a href="http://www.pelispekes.com/un-gallo-con-muchos-huevos/" title="Un gallo con muchos Huevos">
+    <div class="poster">
+    <div class="title">
+    <span class="under-title">Animacion</span>
+    </div>
+    <span class="rating">
+    <i class="glyphicon glyphicon-star"></i><span class="rating-number">6.2</span>
+    </span>
+    <div class="poster-image-container">
+    <img width="300" height="428" src="http://image.tmdb.org/t/p/w185/cz3Kb6Xa1q0uCrsTIRDS7fYOZyw.jpg" title="Un gallo con muchos Huevos" alt="Un gallo con muchos Huevos"/>
+    '''
+    patron  = '<div class="poster-media-card"[^<]+'
+    patron += '<a href="([^"]+)" title="([^"]+)"[^<]+'
+    patron += '<div class="poster"[^<]+'
+    patron += '<div class="title"[^<]+'
+    patron += '<span[^<]+</span[^<]+'
+    patron += '</div[^<]+'
+    patron += '<span class="rating"[^<]+'
+    patron += '<i[^<]+</i><span[^<]+</span[^<]+'
+    patron += '</span[^<]+'
+    patron += '<div class="poster-image-container"[^<]+'
+    patron += '<img width="\d+" height="\d+" src="([^"]+)"'
+
     matches = re.compile(patron,re.DOTALL).findall(data)
 
-    for match in matches:
-        scrapedtitle = ">> Pagina siguiente"
-        scrapedurl = match
-        scrapedthumbnail = ""
-        scrapeddescription = ""
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
+    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+        url = scrapedurl
+        title = scrapedtitle
+        thumbnail = scrapedthumbnail
+        plot = ""
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
+        itemlist.append( Item(channel=item.channel , action="findvideos"   , title=title , url=url , thumbnail=thumbnail, fanart=thumbnail, plot=plot , viewmode="movie", hasContentDetails="true", contentTitle=title, contentThumbnail=thumbnail))
 
-        itemlist.append( Item(channel=item.channel , action="novedades"   , title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail, plot=scrapedplot ))
+    # Extrae la pagina siguiente
+    next_page_url = scrapertools.find_single_match(data,'<a href="([^"]+)"><i class="glyphicon glyphicon-chevron-right')
+    if next_page_url!="":
+        itemlist.append( Item(channel=item.channel , action="mainlist"   , title=">> Página siguiente" , url=next_page_url ))
 
     return itemlist
 
-def categorias(item):
-    logger.info("[pelispekes.py] categorias")
+def findvideos(item):
+    logger.info("pelisalacarta.channels.zpeliculas findvideos item="+item.tostring())
 
-    url = item.url
-                
-    data = scrapertools.cachePage(url)
+    '''
+    <h2>Sinopsis</h2>
+    <p>Para que todo salga bien en la prestigiosa Academia Werth, la pequeña y su madre se mudan a una casa nueva. La pequeña es muy seria y madura para su edad y planea estudiar durante las vacaciones siguiendo un estricto programa organizado por su madre; pero sus planes son perturbados por un vecino excéntrico y generoso. Él le enseña un mundo extraordinario en donde todo es posible. Un mundo en el que el Aviador se topó alguna vez con el misterioso Principito. Entonces comienza la aventura de la pequeña en el universo del Principito. Y así descubre nuevamente su infancia y comprenderá que sólo se ve bien con el corazón. Lo esencial es invisible a los ojos. Adaptación de la novela homónima de Antoine de Saint-Exupery.</p>
+    <div
+    '''
 
-    # Extrae las entradas (carpetas)
-   
-    patron = '<div id="genero">(.*?)<div class="corte"></div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    logger.info("hay %d matches" % len(matches))
-    
-    itemlist = []
-    for match in matches:
-        patron  = '<a href="(.*?)">(.*?)</a>'
-        matches2 = re.compile(patron,re.DOTALL).findall(match)
-        logger.info("hay %d matches2" % len(matches2))
-
-        for match2 in matches2:
-        # Atributos
-            scrapedurl = "http://pelispekes.com"+match2[0]
-            scrapedtitle =match2[1]
-            scrapedthumbnail = ""
-            scrapedplot = ""
-            if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-            
-            # A�ade al listado de XBMC
-            itemlist.append( Item(channel=item.channel , action="novedades"   , title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail, plot=scrapedplot ))
-        
-    return itemlist
-
-def letras(item):
-    logger.info("[pelispekes.py] letras")
-
-    url = item.url
-                
-    data = scrapertools.cachePage(url)
+    # Descarga la página para obtener el argumento
+    data = scrapertools.cachePage(item.url)
+    item.plot = scrapertools.find_single_match(data,'<h2>Sinopsis</h2>(.*?)<div')
+    item.plot = scrapertools.htmlclean(item.plot).strip()
+    item.contentPlot = item.plot
+    logger.info("pelisalacarta.channels.zpeliculas findvideos plot="+item.plot)
 
-    # Extrae las entradas (carpetas)
-   
-    patron = '<div id="abecedario">(.*?)<div class="corte"></div>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    logger.info("hay %d matches" % len(matches))
-    
-    itemlist = []
-    for match in matches:
-        patron  = '<a href="(.*?)">(.*?)</a>'
-        matches2 = re.compile(patron,re.DOTALL).findall(match)
-        logger.info("hay %d matches2" % len(matches2))
-
-        for match2 in matches2:
-        # Atributos
-            scrapedurl = "http://pelispekes.com"+match2[0]
-            scrapedtitle =match2[1]
-            scrapedthumbnail = ""
-            scrapedplot = ""
-            if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-            
-            # A�ade al listado de XBMC
-            itemlist.append( Item(channel=item.channel , action="novedades"   , title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail, plot=scrapedplot ))
-        
-    return itemlist
+    return servertools.find_video_items(item=item,data=data)
 
 # Verificación automática de canales: Esta función debe devolver "True" si está ok el canal.
 def test():
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pepecine.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pepecine.py
index 9fa6bba170e7411878f50d00b243d41f04cddddf..f16c81cf858178cd1c4dd3badd9ca7cda63fc5ea 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pepecine.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pepecine.py
@@ -131,7 +131,9 @@ def listado(item):
             infoLabels['episode']=i['episode'].zfill(2)
             item.extra=infoLabels["season"] + "x" + infoLabels["episode"]
             infoLabels['tvshowtitle']= i["title"]
-            title='[COLOR 0xFF994D00]'  + i["title"] + '[/COLOR] [COLOR 0xFFFFCE9C]'  + item.extra + '[/COLOR] [COLOR 0xFFFFE6CC](' + i['label'] + ')[/COLOR]'
+            flag= scrapertools.find_single_match(i["label"],'(\s*\<img src=.*\>)')
+            idioma=i["label"].replace(flag,"")
+            title='[COLOR 0xFF994D00]'  + i["title"] + '[/COLOR] [COLOR 0xFFFFCE9C]'  + item.extra + '[/COLOR] [COLOR 0xFFFFE6CC](' + idioma + ')[/COLOR]'
             url= urlparse.urljoin(__url_base__,"series-online/" + str(i["id"])) #+"-"+i["title"]).lower().replace(" ","-"))) 
         
         if i.has_key("poster") and i["poster"]: 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pepecine.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pepecine.xml
index ed475fc5fe0f9b927be8571094d37ef4c4bbb95f..e4cd015c07ab929a94baad8c934fa6e1960be61f 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pepecine.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pepecine.xml
@@ -2,26 +2,19 @@
 <channel>
 	<id>pepecine</id>
 	<name>Pepecine</name>
-
+	<language>es</language>
+	<update_url></update_url>
 	<active>true</active>
+	<include_in_global_search>false</include_in_global_search>
+	<version>1.3</version>
 	<adult>false</adult>
-	<language>es</language>
-
+	<date>14/01/16</date>
+	<changes>Corregido el idioma en la seccion Ultimos capitulos</changes>
+	</changes>
 	<fanart>https://d12.usercdn.com/i/02278/u875vjx9c0xs.png</fanart>
 	<thumbnail>https://d12.usercdn.com/i/02278/nwm6todp6yyk.png</thumbnail>
-	<bannermenu>http://media.tvalacarta.info/pelisalacarta/bannermenu/pepecine.png</bannermenu>
-
-	<update_url>https://raw.githubusercontent.com/tvalacarta/pelisalacarta/master/python/main-classic/channels/</update_url>
-	<version>4</version>
-	<date>19/12/2015</date>
-	<changes>Adaptacion por cambios en la web</changes>
-
 	<categories>
 		<category>movie</category>
 		<category>serie</category>
 	</categories>
-
-	<settings>
-		<include_in_global_search>false</include_in_global_search>
-	</settings>
-</channel>
+</channel>
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pornhub.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pornhub.py
index 77bd094c46c879ece280e07242098c5731b8fb7e..f08673da3236183db544b383f3b18bba6a198834 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pornhub.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/pornhub.py
@@ -64,7 +64,7 @@ def mainlist(item):
         #thumbnail =""
        
         #try:
-        itemlist.append( Item(channel=__channel__, action="peliculas", title=title, url=url , fanart=__fanart__ , thumbnail=thumbnail, folder=True) )
+        itemlist.append( Item(channel=__channel__, action="peliculas", title=title, url=url , fanart=__fanart__ , thumbnail=thumbnail, folder=True, viewmode="movie") )
         #except:
             #logger.info("pelisalacarta.channels.pornhub except")
             
@@ -77,7 +77,7 @@ def peliculas(item):
        
     # Descarga la página
     data = get_main_page(item.url)
-    data = scrapertools.find_single_match(data,'<ul class="nf-videos videos row-4-thumbs">(.*?)<div class="pre-footer">')
+    data = scrapertools.find_single_match(data,'<ul class="nf-videos videos(.*?)<div class="reset"></div>')
     
     '''
     <li class="videoblock" id="37717631" _vkey="2064578485" >
@@ -125,7 +125,7 @@ def peliculas(item):
         url= 'http://es.pornhub.com/embed/' + viewkey
                 
         if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="play", title=title , url=url ,fanart=__fanart__, thumbnail=thumbnail) )
+        itemlist.append( Item(channel=__channel__, action="play", title=title , url=url ,fanart=__fanart__, thumbnail=thumbnail, viewmode="movie") )
         
     # Paginador
     patron = '<li class="page_next"><a href="([^"]+)"'
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/seriesblanco.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/seriesblanco.py
index 947edf82b7deed015fbfd858fd5788025bcef219..ffe99bcb30cce2b230cb53fd0a1b0e52eeaa523e 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/seriesblanco.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/seriesblanco.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#------------------------------------------------------------
+# ------------------------------------------------------------
 # pelisalacarta - XBMC Plugin
 # http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os, sys
+# ------------------------------------------------------------
+import urlparse
+import re
+import os
+import sys
 
+from core import channeltools
 from core import logger
 from core import config
 from core import scrapertools
@@ -13,80 +16,93 @@ from core.item import Item
 from servers import servertools
 from channelselector import get_thumbnail_path
 
-
 __channel__ = "seriesblanco"
-
 __category__ = "F"
-
 __type__ = "generic"
-
 __title__ = "Series Blanco"
-
 __language__ = "ES"
 
+channel_xml = channeltools.get_channel_parameters(__channel__)
+HOST = "http://seriesblanco.com/"
+IDIOMAS = {'es': 'Español', 'la': 'Latino', 'vos': 'VOS', 'vo': 'VO', 'japovose': 'VOSE', 'jp-sub': 'VOSE'}
 
-host = "http://seriesblanco.com/"
-
-# En el listado alfabético de series usan este dominio en vez del .com
-host_tv = "http://seriesblanco.tv/"
 
-idiomas = {'es':'Español','la':'Latino','vos':'VOS','vo':'VO', 'japovose':'VOSE'}
+DEBUG = config.get_setting("debug")
 
 
-DEBUG = config.get_setting("debug")
 def isGeneric():
     return True
 
+
 def mainlist(item):
     logger.info("pelisalacarta.seriesblanco mainlist")
 
-    thumb_series    = get_thumbnail("thumb_canales_series.png")
+    thumb_series = get_thumbnail("thumb_canales_series.png")
     thumb_series_az = get_thumbnail("thumb_canales_series_az.png")
-    thumb_buscar    = get_thumbnail("thumb_buscar.png")
+    thumb_buscar = get_thumbnail("thumb_buscar.png")
 
-    itemlist = []
-    itemlist.append( Item( channel=__channel__, title="Series Listado Alfabetico" , action="series_listado_alfabetico", thumbnail=thumb_series_az ) )
-    itemlist.append( Item( channel=__channel__, title="Todas las Series", action="series", url=urlparse.urljoin(host,"lista_series/"), thumbnail=thumb_series ) )
-    itemlist.append( Item( channel=__channel__, title="Buscar...", action="search", url=host, thumbnail=thumb_buscar, extra='buscar') )
+    itemlist = list([])
+    itemlist.append(Item(channel=__channel__, title="Series Listado Alfabetico", action="series_listado_alfabetico",
+                         thumbnail=thumb_series_az))
+    itemlist.append(Item(channel=__channel__, title="Todas las Series", action="series",
+                         url=urlparse.urljoin(HOST, "lista_series/"), thumbnail=thumb_series))
+    itemlist.append(Item(channel=__channel__, title="Buscar...", action="search", url=HOST, thumbnail=thumb_buscar))
 
     return itemlist
 
+
 def series_listado_alfabetico(item):
     logger.info("pelisalacarta.seriesblanco series_listado_alfabetico")
 
     itemlist = []
 
-    for letra in ['0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']:
-        itemlist.append( Item(channel=__channel__, action="series_por_letra" , title=letra, url=urlparse.urljoin(host_tv, "series/" + letra.upper() + "/buscar_letra.html"), extra="letra") )
+    for letra in ['0', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+                  'T', 'U', 'V', 'W', 'X', 'Y', 'Z']:
+        itemlist.append(Item(channel=__channel__, action="series_por_letra", title=letra,
+                             url=urlparse.urljoin(HOST, "series/{0}/buscar_letra.html".format(letra.upper()))))
 
     return itemlist
 
+
 # La página de series por letra es igual que la de buscar
-# así que abuso un poco de esa función con el parámetro extra
 def series_por_letra(item):
     return search(item, '')
 
+
 def search(item, texto):
-    logger.info("[pelisalacarta.seriesblanco search texto="+texto)
+    logger.info("[pelisalacarta.seriesblanco search texto={0}".format(texto))
 
     itemlist = []
 
-    if item.extra == 'buscar':
-        item.url = urlparse.urljoin(host,"/search.php?q1=%s" % (texto))
+    if texto != "":
+        item.url = urlparse.urljoin(HOST, "/search.php?q1={0}".format(texto))
 
     data = scrapertools.cache_page(item.url)
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s","",data)
-    data = re.sub(r"<!--.*?-->","",data)
-    data = unicode( data, "iso-8859-1" , errors="replace" ).encode("utf-8")
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s", "", data)
+    data = re.sub(r"<!--.*?-->", "", data)
+    data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
 
-    #<div style='float:left;width: 620px;'><div style='float:left;width: 33%;text-align:center;'><a href='/serie/20/against-the-wall.html' '><img class='ict' src='http://4.bp.blogspot.com/-LBERI18Cq-g/UTendDO7iNI/AAAAAAAAPrk/QGqjmfdDreQ/s320/Against_the_Wall_Seriesdanko.jpg' alt='Capitulos de: Against The Wall' height='184' width='120'></a><br><div style='text-align:center;line-height:20px;height:20px;'><a href='/serie/20/against-the-wall.html' style='font-size: 11px;'> Against The Wall</a></div><br><br>
+    '''
+    <div style='float:left;width: 33%;text-align:center;'>
+        <a href='/serie/2561/acacias-38.html' '>
+            <img class='ict' src='http://seriesblanco.com/files/uploads/2561.jpg' alt='Capitulos de: Acacias 38'
+                height='184' width='120'>
+        </a>
+        <div style='text-align:center;line-height:20px;height:20px;'>
+            <a href='/serie/2561/acacias-38.html' style='font-size: 11px;'> Acacias 38</a>
+        </div>
+    </div>
+    '''
 
-    patron = "<div style='text-align:center;line-height:20px;height:20px;'><a href='([^']+)' style='font-size: 11px;'>([^<]+)</a>"
+    patron = "<img class='ict' src='([^']+)'[^>]+></a>" \
+             "<div style='text-align:center;line-height:20px;height:20px;'>" \
+             "<a href='([^']+)' style='font-size: 11px;'>([^<]+)</a>"
 
-    matches = re.compile(patron,re.DOTALL).findall(data)
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for scrapedurl, scrapedtitle in matches:
-        itemlist.append( Item(channel=__channel__, title =scrapedtitle , url=urlparse.urljoin(host,scrapedurl), action="episodios", show=scrapedtitle) )
+    for scrapedthumb, scrapedurl, scrapedtitle in matches:
+        itemlist.append(Item(channel=__channel__, title=scrapedtitle, url=urlparse.urljoin(HOST, scrapedurl),
+                             action="episodios", show=scrapedtitle, thumbnail=scrapedthumb))
 
     try:
         return itemlist
@@ -94,9 +110,10 @@ def search(item, texto):
     except:
         import sys
         for line in sys.exc_info():
-            logger.error( "%s" % line )
+            logger.error("%s" % line)
         return []
 
+
 def series(item):
     logger.info("pelisalacarta.seriesblanco series")
 
@@ -104,19 +121,23 @@ def series(item):
 
     # Descarga la página
     data = scrapertools.cache_page(item.url)
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s","",data)
-    data = re.sub(r"<!--.*?-->","",data)
-    data = unicode( data, "iso-8859-1" , errors="replace" ).encode("utf-8")
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s", "", data)
+    data = re.sub(r"<!--.*?-->", "", data)
+    data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
 
     patron = "<li><a href='([^']+)' title='([^']+)'>[^<]+</a></li>"
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
-    matches = re.compile(patron,re.DOTALL).findall(data)
+    # como no viene el thumbnail en esta pagina ponemos el thumbnail generico del canal
+    thumbnail = channel_xml["thumbnail"]
 
     for scrapedurl, scrapedtitle in matches:
-        itemlist.append( Item(channel=__channel__, title =scrapedtitle , url=urlparse.urljoin(host,scrapedurl), action="episodios", show=scrapedtitle) )
+        itemlist.append(Item(channel=__channel__, title=scrapedtitle, url=urlparse.urljoin(HOST, scrapedurl),
+                             action="episodios", show=scrapedtitle, thumbnail=thumbnail))
 
     return itemlist
 
+
 def episodios(item):
     logger.info("pelisalacarta.seriesblanco episodios")
 
@@ -124,37 +145,59 @@ def episodios(item):
 
     # Descarga la página
     data = scrapertools.cache_page(item.url)
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s","",data)
-    data = re.sub(r"<!--.*?-->","",data)
-    data = unicode( data, "iso-8859-1" , errors="replace" ).encode("utf-8")
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s", "", data)
+    data = re.sub(r"<!--.*?-->", "", data)
+    data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
+
+    data = re.sub(r"a></td><td> <img src=/banderas/", "a><idioma/", data)
+    data = re.sub(r"<img src=/banderas/", "|", data)
+    data = re.sub(r"\.png border='\d+' height='\d+' width='\d+'[^>]+><", "/idioma><", data)
+    data = re.sub(r"\.png border='\d+' height='\d+' width='\d+'[^>]+>", "", data)
+
+    patron = "<img id='port_serie' src='([^']+)'.*?<li data-content=\"settings\"><p>(.*?)</p>"
+    matches = re.compile(patron, re.DOTALL).findall(data)
+    thumbnail = ""
+    plot = ""
 
-    data = re.sub(r"a></td><td> <img src=/banderas/","a><idioma/",data)
-    data = re.sub(r"<img src=/banderas/","|",data)
-    data = re.sub(r"\.png border='\d+' height='\d+' width='\d+'[^>]+><","/idioma><",data)
-    data = re.sub(r"\.png border='\d+' height='\d+' width='\d+'[^>]+>","",data)
+    for scrapedthumbnail, scrapedplot in matches:
+        thumbnail = scrapedthumbnail
+        plot = scrapedplot
 
-    #<a href='/serie/534/temporada-1/capitulo-00/the-big-bang-theory.html'>1x00 - Capitulo 00 </a></td><td> <img src=/banderas/vo.png border='0' height='15' width='25' /> <img src=/banderas/vos.png border='0' height='15' width='25' /></td></tr>
+    '''
+    <td>
+        <a href='/serie/534/temporada-1/capitulo-00/the-big-bang-theory.html'>1x00 - Capitulo 00 </a>
+    </td>
+    <td>
+        <img src=/banderas/vo.png border='0' height='15' width='25' />
+        <img src=/banderas/vos.png border='0' height='15' width='25' />
+    </td>
+    '''
 
     patron = "<a href='([^']+)'>([^<]+)</a><idioma/([^/]+)/idioma>"
 
-    matches = re.compile(patron,re.DOTALL).findall(data)
+    matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle, scrapedidioma in matches:
         idioma = ""
         for i in scrapedidioma.split("|"):
-            idioma+= " [" + idiomas[i] + "]"
+            idioma += " [" + IDIOMAS[i] + "]"
         title = item.title + " - " + scrapedtitle + idioma
-        itemlist.append( Item(channel=__channel__, title =title , url=urlparse.urljoin(host,scrapedurl), action="findvideos", show=item.show) )
+        itemlist.append(Item(channel=__channel__, title=title, url=urlparse.urljoin(HOST, scrapedurl),
+                             action="findvideos", show=item.show, thumbnail=thumbnail, plot=plot))
 
     if len(itemlist) == 0 and "<title>404 Not Found</title>" in data:
-        itemlist.append( Item(channel=__channel__, title ="la url '"++"' parece no estar disponible en la web. Iténtalo más tarde." , url=item.url, action="series") )
+        itemlist.append(Item(channel=__channel__, title="la url '" + item.url +
+                                                        "' parece no estar disponible en la web. Iténtalo más tarde.",
+                             url=item.url, action="series"))
 
-    ## Opción "Añadir esta serie a la biblioteca de XBMC"
-    if config.get_library_support() and len(itemlist)>0:
-        itemlist.append( Item(channel=__channel__, title="Añadir esta serie a la biblioteca de XBMC", url=item.url, action="add_serie_to_library", extra="episodios", show=item.show) )
+    # Opción "Añadir esta serie a la biblioteca de XBMC"
+    if config.get_library_support() and len(itemlist) > 0:
+        itemlist.append(Item(channel=__channel__, title="Añadir esta serie a la biblioteca de XBMC", url=item.url,
+                             action="add_serie_to_library", extra="episodios", show=item.show))
 
     return itemlist
 
+
 def findvideos(item):
     logger.info("pelisalacarta.seriesblanco findvideos")
 
@@ -165,54 +208,45 @@ def findvideos(item):
 
     # Hacer la petición ajax con los enlaces
     params = scrapertools.get_match(data, 'data : "(action=load[^\"]+)"')
-    data = scrapertools.cachePagePost(host + 'ajax.php', params)
+    data = scrapertools.cachePagePost(HOST + 'ajax.php', params)
 
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s","",data)
-    data = re.sub(r"<!--.*?-->","",data)
-    data = unicode( data, "iso-8859-1" , errors="replace" ).encode("utf-8")
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s", "", data)
+    data = re.sub(r"<!--.*?-->", "", data)
+    data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
 
     data = re.sub(r"<center>|</center>|</a>", "", data)
-    data = re.sub(r'<div class="grid_content([^>]+)><span></span>',r'<div class="grid_content\1><span>SD</span>', data)
+    data = re.sub(r'<div class="grid_content([^>]+)><span></span>', r'<div class="grid_content\1><span>SD</span>', data)
 
     '''
     <td><div class="grid_content*ATTR*><span>(*FECHA*)</span></div></td>
+    <td><div class="grid_content2*ATTR*><span><img src="*PATH*/(*IDIOMA*)\.*ATTR*></span></td>
     <td>
-    <div class="grid_content2*ATTR*><span><img src="*PATH*/(*IDIOMA*)\.*ATTR*></span></td>
-    <td><div class="grid_content*ATTR*><span><a href="(*ENLACE*)"*ATTR*><img src='/servidores/(*SERVIDOR*).*ATTR*></span></div></td>"
-    <td>
-    <div class="grid_content*ATTR*><span>(*UPLOADER*)</span></td>
-    <td>
-    <div class="grid_content*ATTR*><span>(*SUB|CALIDAD*)</span></td>
+        <div class="grid_content*ATTR*>
+            <span><a href="(*ENLACE*)"*ATTR*><img src='/servidores/(*SERVIDOR*).*ATTR*></span>
+        </div>
+    </td>
+    <td><div class="grid_content*ATTR*><span>(*UPLOADER*)</span></td>
+    <td><div class="grid_content*ATTR*><span>(*SUB|CALIDAD*)</span></td>
     '''
 
     online = scrapertools.get_match(data, '<table class="as_gridder_table">(.+?)</table>')
     download = scrapertools.get_match(data, '<div class="grid_heading"><h2>Descarga</h2></div>(.*)')
 
-    online = re.sub(
-        r"<td><div class=\"grid_content[^>]+><span>([^>]+)</span></div></td>" + \
-         "<td>" + \
-         "<div class=\"grid_content2[^>]+><span><img src=\".+?banderas/([^\.]+)\.[^>]+></span></td>" + \
-         "<td><div class=\"grid_content[^>]+><span><a href=\"([^\"]+)\"[^>]+><img src='/servidores/([^\.]+)\.[^>]+></span></div></td>" + \
-         "<td>" + \
-         "<div class=\"grid_content[^>]+><span>([^>]+)</span></td>" + \
-         "<td>" + \
-         "<div class=\"grid_content[^>]+><span>([^>]+)</span></td>",
-        r"<patron>\3;\2;\1;\4;\5;\6;Ver</patron>",
-        online
-    )
-
-    download = re.sub(
-        r"<td><div class=\"grid_content[^>]+><span>([^>]+)</span></div></td>" + \
-         "<td>" + \
-         "<div class=\"grid_content2[^>]+><span><img src=\".+?banderas/([^\.]+)\.[^>]+></span></td>" + \
-         "<td><div class=\"grid_content[^>]+><span><a href=\"([^\"]+)\"[^>]+><img src='/servidores/([^\.]+)\.[^>]+></span></div></td>" + \
-         "<td>" + \
-         "<div class=\"grid_content[^>]+><span>([^>]+)</span></td>" + \
-         "<td>" + \
-         "<div class=\"grid_content[^>]+><span>([^>]+)</span></td>",
-        r"<patron>\3;\2;\1;\4;\5;\6;Descargar</patron>",
-        download
-    )
+    online = re.sub(r"<td><div class=\"grid_content[^>]+><span>([^>]+)</span></div></td><td>" +
+                    "<div class=\"grid_content2[^>]+><span><img src=\".+?banderas/([^\.]+)\.[^>]+></span></td>" +
+                    "<td><div class=\"grid_content[^>]+><span><a href=\"([^\"]+)\"[^>]+>"
+                    "<img src='/servidores/([^\.]+)\.[^>]+></span></div></td>" +
+                    "<td><div class=\"grid_content[^>]+><span>([^>]+)</span></td>" +
+                    "<td><div class=\"grid_content[^>]+><span>([^>]+)</span></td>",
+                    r"<patron>\3;\2;\1;\4;\5;\6;Ver</patron>", online)
+
+    download = re.sub(r"<td><div class=\"grid_content[^>]+><span>([^>]+)</span></div></td><td>" +
+                      "<div class=\"grid_content2[^>]+><span><img src=\".+?banderas/([^\.]+)\.[^>]+></span></td>" +
+                      "<td><div class=\"grid_content[^>]+><span><a href=\"([^\"]+)\"[^>]+>"
+                      "<img src='/servidores/([^\.]+)\.[^>]+></span></div></td>" +
+                      "<td><div class=\"grid_content[^>]+><span>([^>]+)</span></td>" +
+                      "<td><div class=\"grid_content[^>]+><span>([^>]+)</span></td>",
+                      r"<patron>\3;\2;\1;\4;\5;\6;Descargar</patron>", download)
 
     data = online+download
 
@@ -222,21 +256,26 @@ def findvideos(item):
 
     patron = '<patron>([^;]+);([^;]+);([^;]+);([^;]+);([^;]+);([^;]+);([^<]+)</patron>'
 
-    matches = re.compile(patron,re.DOTALL).findall(data)
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedidioma, scrapedfecha, scrapedservidor, scrapeduploader, scrapedsubcalidad, scrapedtipo \
+            in matches:
+        title = "{0} en {1} [{2}] [{3}] ({4}: {5})".format(scrapedtipo, scrapedservidor, IDIOMAS[scrapedidioma],
+                                                           scrapedsubcalidad, scrapeduploader, scrapedfecha)
 
-    for scrapedurl, scrapedidioma, scrapedfecha, scrapedservidor, scrapeduploader, scrapedsubcalidad, scrapedtipo in matches:
-        title = scrapedtipo + " en " + scrapedservidor + " [" + idiomas[scrapedidioma] + "] [" + scrapedsubcalidad + "] (" + scrapeduploader + ": "+ scrapedfecha + ")"
-        itemlist.append( Item(channel=__channel__, title =title , url=urlparse.urljoin(host,scrapedurl), action="play", show=item.show) )
+        itemlist.append(Item(channel=__channel__, title=title, url=urlparse.urljoin(HOST, scrapedurl), action="play",
+                             show=item.show))
 
     return itemlist
 
+
 def play(item):
-    logger.info("pelisalacarta.channels.seriesblanco play url="+item.url)
+    logger.info("pelisalacarta.channels.seriesblanco play url={0}".format(item.url))
 
     data = scrapertools.cache_page(item.url)
 
     patron = "<input type='button' value='Ver o Descargar' onclick='window.open\(\"([^\"]+)\"\);'/>"
-    url = scrapertools.find_single_match(data,patron)
+    url = scrapertools.find_single_match(data, patron)
 
     itemlist = servertools.find_video_items(data=url)
 
@@ -246,7 +285,8 @@ def play(item):
 
     return itemlist
 
-def get_thumbnail( thumb_name = None ):
+
+def get_thumbnail(thumb_name=None):
     img_path = config.get_runtime_path() + '/resources/images/squares'
     if thumb_name:
         file_path = os.path.join(img_path, thumb_name)
@@ -258,4 +298,3 @@ def get_thumbnail( thumb_name = None ):
         thumb_path = urlparse.urljoin(get_thumbnail_path(), thumb_name)
 
     return thumb_path
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/seriesblanco.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/seriesblanco.xml
index cd2c2cd3752969c046bc71609146e9b2bd397240..304cbcdb61efb2a383c81e7949b1ead80051eed4 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/seriesblanco.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/seriesblanco.xml
@@ -12,9 +12,9 @@
 	<bannermenu>http://media.tvalacarta.info/pelisalacarta/bannermenu/seriesblanco.png</bannermenu>
 
 	<update_url>https://raw.githubusercontent.com/tvalacarta/pelisalacarta/master/python/main-classic/channels/</update_url>
-	<version>6</version>
-	<date>13/05/2015</date>
-	<changes>Arregalda la duplicidad online en download</changes>
+	<version>7</version>
+	<date>06/01/2016</date>
+	<changes>- añadido thumbnail, añadido plot, eliminadas variables que no se usaban, PEP8</changes>
 
 	<categories>
 		<category>serie</category>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/sonolatino.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/sonolatino.py
deleted file mode 100644
index eb948e74a28b60e43d47a395bfaaf4d4067205ca..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/sonolatino.py
+++ /dev/null
@@ -1,1093 +0,0 @@
-# -*- coding: iso-8859-1 -*-
-#------------------------------------------------------------
-# pelisalacarta - XBMC Plugin
-# Canal para sonolatino.com
-# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os
-import sys
-from core import downloadtools
-
-import xbmc
-import xbmcgui
-import xbmcplugin
-
-from core import scrapertools
-from core import config
-from core import logger
-from platformcode import xbmctools
-from core.item import Item
-from servers import servertools
-from servers import vk
-
-__channel__ = "sonolatino"
-__category__ = "M"
-__type__ = "xbmc"
-__title__ = "Sonolatino"
-__language__ = ""
-
-DEBUG = config.get_setting("debug")
-
-# Esto permite su ejecuci�n en modo emulado
-try:
-    pluginhandle = int( sys.argv[ 1 ] )
-except:
-    pluginhandle = ""
-
-logger.info("[sonolatino.py] init")
-
-IMAGES_PATH = xbmc.translatePath( os.path.join( config.get_data_path(), 'resources' , 'images' , 'posters' ) )
-
-
-def mainlist(params,url,category):
-    logger.info("[sonolatino.py] mainlist")
-    
-    xbmctools.addnewfolder( __channel__ , "Videosnuevos"  , category , "Videos Musicales - Nuevos"           ,"http://www.sonolatino.com/newvideos.html","","")
-    xbmctools.addnewfolder( __channel__ , "TipoVideo"     , category , "Videos Musicales - Categorias"       ,"","","")
-    #xbmctools.addnewfolder( __channel__ , "tagvideos"  , category , "Tag de Videos","http://www.sonolatino.com/index.html",os.path.join(IMAGES_PATH, 'tag.png'),"")
-    xbmctools.addnewfolder( __channel__ , "topVideos"     , category , "Top Videos Musicales Online"         ,"http://www.sonolatino.com/topvideos.html","","")
-    xbmctools.addnewfolder( __channel__ , "listatipoVideo", category , "Videos Musicales Siendo Vistas Ahora","http://www.sonolatino.com/index.html","","")
-    xbmctools.addnewfolder( __channel__ , "Videodeldia"   , category , "Video Musical del dia"               ,"http://www.sonolatino.com/index.html","","")
-    xbmctools.addnewfolder( __channel__ , "search"          , category , "Buscar"                              ,"","","")
-    #xbmctools.addnewfolder( __channel__ , "creartag"           , category , "Crear la lista de categorias","http://www.sonolatino.com/",tecleadoultimo,os.path.join(IMAGES_PATH, 'search_icon.png'),"")
-    
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-        
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
-      
-##############------------------------------------------------------#################    
-
-def search(params,url,category):
-    logger.info("[sonolatino.py] search")
-    buscador.listar_busquedas(params,url,category)
-    
-def searchresults(params,url,category):
-    logger.info("[sonolatino.py] search")
-        
-    buscador.salvar_busquedas(params,url,category)
-    
-    #convert to HTML
-    tecleado = url.replace(" ", "+")
-    searchUrl = "http://www.sonolatino.com/search.php?keywords="+tecleado+"&btn=Buscar"
-    searchresults2(params,searchUrl,category)
-
-
-
-###############---------------------------------------------------#####################
-
-def performsearch(texto):
-    logger.info("[sonolatino.py] performsearch")
-    url = "http://www.sonolatino.com/search.php?keywords="+texto+"&btn=Buscar"
-
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-
-    # Extrae las entradas (carpetas)
-    patronvideos = '<li class="video">[^<]+<div class="video_i">[^<]+<a href="([^"]+)">'
-    patronvideos += '[^<]+<img src="([^"]+)"  '
-    patronvideos += 'alt="([^"]+)"[^>]+><div class="tag".*?</div>.*?'
-    patronvideos += '<span class="artist_name">([^<]+)</span>'    
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    
-    resultados = []
-
-    for match in matches:
-        scrapedtitle = acentos(match[2])
-        scrapedurl = match[0]
-        scrapedthumbnail = match[1]
-        scrapedplot = match[3]
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # A�ade al listado de XBMC
-        resultados.append( [__channel__ , "detail" , "buscador" , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot ] )
-        
-    return resultados
-
-def searchresults2(params,url,category):
-    logger.info("[sonolatino.py] searchresults")
-
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-    #logger.info(data)
-
-    # Extrae las entradas (carpetas)
-    patronvideos = '<li class="video">[^<]+<div class="video_i">[^<]+<a href="([^"]+)">'
-    patronvideos += '[^<]+<img src="([^"]+)"  '
-    patronvideos += 'alt="([^"]+)"[^>]+><div class="tag".*?</div>.*?'
-    patronvideos += '<span class="artist_name">([^<]+)</span>'
-    
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for match in matches:
-        # Titulo
-        scrapedtitle = acentos(match[2])
-
-        # URL
-        scrapedurl = match[0]
-        
-        # Thumbnail
-        scrapedthumbnail = match[1]
-        
-        # procesa el resto
-        scrapedplot = match[3]
-
-        # Depuracion
-        if (DEBUG):
-            logger.info("scrapedtitle="+scrapedtitle+" - "+scrapedplot)
-            logger.info("scrapedurl="+scrapedurl)
-            logger.info("scrapedthumbnail="+scrapedthumbnail)
-
-        # A�ade al listado de XBMC
-        xbmctools.addnewfolder( __channel__ , "detail" , category , scrapedtitle + " - " + scrapedplot , scrapedurl , scrapedthumbnail , scrapedplot )
-
-
-        #llama a la rutina paginasiguiente
-    cat = 'busca'
-    paginasiguientes(patronvideos,data,category,cat)
-    
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
-#############----------------------------------------------------------#############        
-
-
-def TipoVideo(params, url, category):
-    logger.info("[sonolatino.py] TipoVideo")
-    
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Bachata","http://www.sonolatino.com/bachata","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Best Rock Songs","http://www.sonolatino.com/toprock","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Blues","http://www.sonolatino.com/blues","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Champeta","http://www.sonolatino.com/champeta","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Country Pop","http://www.sonolatino.com/countrypop","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Cumbia","http://www.sonolatino.com/cumbia","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Dance","http://www.sonolatino.com/dance","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Dance Punk","http://www.sonolatino.com/dancepunk","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Duranguense","http://www.sonolatino.com/duranguense","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Electro hop","http://www.sonolatino.com/electro-hop","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Electro pop","http://www.sonolatino.com/electropop","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Electronica","http://www.sonolatino.com/electronica","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Emo","http://www.sonolatino.com/emo","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Especiales","http://www.sonolatino.com/especiales","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Flamenco","http://www.sonolatino.com/flamenco","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Folklorica","http://www.sonolatino.com/folklorica","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Funk Rock","http://www.sonolatino.com/funkrock","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Grupera","http://www.sonolatino.com/grupera","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Grupos Nuevos","http://www.sonolatino.com/grupos-nuevos","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Hard rock","http://www.sonolatino.com/Hard-rock","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Hip Hop","http://www.sonolatino.com/hiphop","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "House","http://www.sonolatino.com/house","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Humor","http://www.sonolatino.com/humor","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Indie pop","http://www.sonolatino.com/indie-pop","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Indie Rock","http://www.sonolatino.com/indierock","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Jazz","http://www.sonolatino.com/jazz","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Merengue","http://www.sonolatino.com/merengue","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Merengue Urbano","http://www.sonolatino.com/merengue-urbano","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Metal","http://www.sonolatino.com/metal","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Modelos","http://www.sonolatino.com/modelos","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Neo Soul","http://www.sonolatino.com/neosoul","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "New Wave","http://www.sonolatino.com/newwave","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Norte�a","http://www.sonolatino.com/nortena","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Pop","http://www.sonolatino.com/pop","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Pop Punk","http://www.sonolatino.com/poppunk","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Pop Rap","http://www.sonolatino.com/poprap","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Pop Rock","http://www.sonolatino.com/poprock","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Post grunge","http://www.sonolatino.com/Post-grunge","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Post Hardcore","http://www.sonolatino.com/posthardcore","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Punk","http://www.sonolatino.com/punk","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "R'n'B","http://www.sonolatino.com/rnb","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Ranchera","http://www.sonolatino.com/ranchera","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Rap","http://www.sonolatino.com/rap","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Reggae Fusion","http://www.sonolatino.com/reggaefusion","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Reggaeton","http://www.sonolatino.com/reggaeton","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Rock & Alternative","http://www.sonolatino.com/rock","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Salsa","http://www.sonolatino.com/salsa","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Chicas","http://www.sonolatino.com/chicas","","")
-    xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "Chicos","http://www.sonolatino.com/chicos","","")
-
-
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
- 
-
-
-#############--------------------------------------------------------###########
-
-def listarpor(params,url,category):
-    url1=url
-    title = urllib.unquote_plus(params.get("title"))[:11]
-       
-    #verifica si es la primera vez o viene de una paginacion
-    if  url.endswith(".html"):           
-        return(url)
-    else:
-        fecha = "-1-date.html"
-        vistas = "-1-views.html"
-        rating = "-1-rating.html"
-        artista = "-1-artist.html" 
-     # Abre el di�logo de selecci�n
-        opciones = []
-        opciones.append("Fecha")
-        opciones.append("Vistas")
-        opciones.append("Votos")
-        opciones.append("Artista")
-        dia = xbmcgui.Dialog()
-        seleccion = dia.select("Ordenar '"+title+"' por: ", opciones)
-        logger.info("seleccion=%d" % seleccion)    
-        if seleccion==-1:
-           return("")
-        if seleccion==0:
-           url1 = url + fecha
-        elif seleccion==1:
-           url1 = url + vistas
-        elif seleccion==2:
-           url1 = url + rating
-        elif seleccion==3:
-                url1 = url + artista
-         
-        return(url1)
-
-   
-############---------------------------------------------------------###########
-
-def listaseries(params,url,category):
-    logger.info("[sonolatino.py] listaseries")
-    #url2 = "http://www.sonolatino.com/index.html"
-    data = scrapertools.cachePage(url)
-    
-    patron = "Relacionadas</h4>(.*?)</ul>"
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    if len(matches)>0:
-        patron = '<a href="([^"]+)">([^<]+)</a>'
-        matches2 = re.compile(patron,re.DOTALL).findall(matches[0])
-        scrapedplot = ""
-        scrapedthumbnail= ""
-        if len(matches)>0:
-            for match in matches2:
-                scrapedtitle = acentos(match[1])
-                print match[0]
-                scrapedurl = match[0][:-18]
-                print scrapedurl
-                if (DEBUG):
-                    logger.info("scrapedtitle="+scrapedtitle)
-                    logger.info("scrapedurl="+scrapedurl)
-                    logger.info("scrapedthumbnail="+scrapedthumbnail)
-                        # A�ade al listado de XBMC
-                xbmctools.addnewfolder( __channel__ , "listatipodocumental" , category , scrapedtitle , scrapedurl , scrapedthumbnail , scrapedplot )                    
-
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-    
-def listatipoVideo(params,url,category):
-    logger.info("[sonolatino.py] listatipodocumental")
-
-    # busca tipo de listado por : FECHA | VISTAS | RATING #
-    url = listarpor(params,url,category) 
-    if len(url)==0 :
-       return  
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-    
-    # Extrae las entradas (carpetas)
-            
-
-    if url == "http://www.sonolatino.com/index.html":
-        patronvideos = '<li class="item">[^<]+<a href="([^"]+)"><img src="([^"]+)" alt="([^"]+)" class="imag".*?/></a>'
-        cat = "viendose"
-    else:  
-        patronvideos  = '<li class="video">[^<]+<div class="video_i">[^<]+<a href="([^"]+)"'
-        patronvideos += '>[^<]+<img src="([^"]+)"  alt="([^"]+)".*?<span class="artist_name">([^<]+)</span>'
-        cat = "tipo"
-            
-            
-    
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    #logger.info("matches = "+matches[0])
-    scrapedplot = ""
-    for match in matches:
-        # Titulo
-        scrapedtitle = scrapertools.unescape(match[2])
-
-        # URL
-        scrapedurl = match[0]
-        
-        # Thumbnail
-        scrapedthumbnail = match[1]
-        
-        # procesa el resto
-        if cat == "tipo":
-           scrapedplot = scrapertools.unescape(match[3])
-        else:
-           for campo in re.findall("/(.*?)/",match[0]):
-            scrapedplot = campo
-        # Depuracion
-        if (DEBUG):
-            logger.info("scrapedtitle="+scrapedtitle)
-            logger.info("scrapedurl="+scrapedurl)
-            logger.info("scrapedthumbnail="+scrapedthumbnail)
-
-        # A�ade al listado de XBMC
-        xbmctools.addnewfolder( __channel__ , "detail" , category , scrapedtitle + " - " + scrapedplot , scrapedurl , scrapedthumbnail , scrapedplot )
- #  -------------------------------------------
- #     Busqueda de la siguiente pagina
-    
-    if cat == "tipo":
-           patron_pagina_sgte = '</span><a href="([^"]+)"'
-           paginasiguientes(patron_pagina_sgte,data,category,cat)
-
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
-##############---------------------------------------------------------##############
-
-def Videosnuevos(params,url,category):
-    url1=url
-    # Abre el di�logo de selecci�n
-    opciones = []
-    opciones.append("Todo el tiempo")
-    opciones.append("Hoy")
-    opciones.append("Ayer")
-    opciones.append("Este Mes")
-    dia = xbmcgui.Dialog()
-    seleccion = dia.select("Elige uno", opciones)
-    logger.info("seleccion=%d" % seleccion)    
-    if seleccion==-1:
-           return
-    if seleccion==0:
-           url1 = "http://www.sonolatino.com/newvideos.html"
-    elif seleccion==1:
-           url1 = "http://www.sonolatino.com/newvideos.html?d=today"
-    elif seleccion==2:
-           url1 = "http://www.sonolatino.com/newvideos.html?d=yesterday"
-    elif seleccion==3:
-           url1 = "http://www.sonolatino.com/newvideos.html?d=month"
-    Videosnuevoslist(params,url1,category)
-
-
-
-#############----------------------------------------########################
-
-
-
-def Videosnuevoslist(params,url,category):
-    logger.info("[sonolatino.py] VideoesNuevos")
-
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-    #logger.info(data)
-
-    # Extrae las entradas (carpetas)
-
-    
-    patronvideos  = '<tr><td.*?<a href="([^"]+)">'
-    patronvideos += '<img src="([^"]+)" '
-    patronvideos += 'alt="[^"]+".*?'
-    patronvideos += 'width="250">([^<]+)<'
-    patronvideos += 'td class.*?<a href="[^>]+>([^<]+)</a></td><td class.*?>([^<]+)</td></tr>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    #logger.info("matches = "+str(matches))
-    if DEBUG:
-        scrapertools.printMatches(matches)
-    for match in matches:
-        # Titulo
-        # Titulo
-        scrapedtitle = match[2] + " - " + match[3]+" - " + match[4].replace('&iacute;','i')
-        print scrapedtitle
-        scrapedtitle = scrapertools.unescape(scrapedtitle)
-
-        # URL
-        scrapedurl = match[0]
-        
-        # Thumbnail
-        scrapedthumbnail = match[1]
-        imagen = ""
-        # procesa el resto
-        scrapedplot = match[3]
-        tipo = match[3]
-
-        # Depuracion
-        if (DEBUG):
-            logger.info("scrapedtitle="+scrapedtitle)
-            logger.info("scrapedurl="+scrapedurl)
-            logger.info("scrapedthumbnail="+scrapedthumbnail)
-
-        # A�ade al listado de XBMC
-            #xbmctools.addthumbnailfolder( __channel__ , scrapedtitle, scrapedurl , scrapedthumbnail, "detail" )
-            xbmctools.addnewfolder( __channel__ , "detail" , category , scrapedtitle ,scrapedurl , scrapedthumbnail , scrapedplot )
-    
-
-    # Busca enlaces de paginas siguientes...
-    cat = "nuevo"
-    patronvideo = patronvideos
-    paginasiguientes(patronvideo,data,category,cat)     
-
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
-##########---------------------------------------------------------------#############
-
-def Videodeldia(params,url,category):
-#    list(params,url,category,patronvideos)
-    logger.info("[sonolatino.py] Videodeldia")
-           
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-    #logger.info(data)
-    
-    patronvideos = 'Video Musical: <a href="([^"]+)">([^<]+)</a>'
-    matches =  re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for match in matches:
-        # Titulo
-        # Titulo
-        scrapedtitle = acentos(match[1])
-
-        # URL
-        scrapedurl = match[0]
-          
-        # Thumbnail
-        scrapedthumbnail = ""
-
-        # scrapedplot
-        scrapedplot = ""
-        if (DEBUG):
-            logger.info("scrapedtitle="+scrapedtitle)
-            logger.info("scrapedurl="+scrapedurl)
-            logger.info("scrapedthumbnail="+scrapedthumbnail)
- 
-        xbmctools.addnewfolder( __channel__ , "detail" , category , scrapedtitle , scrapedurl , scrapedthumbnail , scrapedplot ) 
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True ) 
-
-################---------------------------------------------------------###########
-
-
-############---------------------------------------------------#######################
-def topVideos(params,url,category):
-    url2=url
-    data = scrapertools.cachePage(url)
-    patron = '<option value="([^"]+)" >([^<]+)</option>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    if len(matches)>0:
-        opciones = []
-        urls = []
-        opciones.append("Todo el Tiempo")
-        urls.append("http://www.sonolatino.com/topvideos.html")
-        opciones.append("Ultimos 2 dias")
-        urls.append("http://www.sonolatino.com/topvideos.html?do=recent")
-        
-        for match in matches:
-            opciones.append(scrapertools.unescape(match[1]))
-            urls.append(match[0])
-            # Abre el di�logo de selecci�n
-        
-        dia = xbmcgui.Dialog()
-        seleccion = dia.select("Elige Listar Top por :", opciones)
-        logger.info("seleccion=%d" % seleccion) 
-        if seleccion==-1:
-            return
-        
-        url2 = urls[seleccion]
-        toplist(params,url2,category)
-
-
-
-############----------------------------------------------####################
-
-def toplist(params,url,category):
-    logger.info("[sonolatino.py] toplist")
-
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-    #logger.info(data)
-
-
-    # Extrae las entradas (carpetas)
-    logger.info("[sonolatino.py] toplist "+url) 
-    if url== "http://www.sonolatino.com/topvideos.html?do=recent":
-        
-        patronvideos = '<tr>[^<]+<td[^>]+>([^<]+)</td>[^<]+<td'
-        patronvideos += '[^>]+><a href="([^"]+)">'
-        patronvideos += '<img src="([^"]+)" alt=[^>]+>'
-        patronvideos += '</a></td>[^<]+<td[^>]+>([^<]+)</td>[^<]+<td[^>]+>'
-        patronvideos += '<a href="[^"]+">([^<]+)</a>'
-        patronvideos += '</td>[^<]+<td[^>]+>([^<]+)</td>'
-
-    else:
-        
-        patronvideos = '<tr>[^>]+>([^<]+)</td>'
-        patronvideos += '[^>]+><a href="([^"]+)">'
-        patronvideos += '<img src="([^"]+)"'
-        patronvideos += ' alt="([^"]+)"[^>]+>'
-        patronvideos += '</a></td>[^>]+>([^<]+)</td>[^>]+>'
-        patronvideos += '<a href="[^"]+">[^>]+></td>[^>]+>([^<]+)</td>'
-    
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for match in matches:
-        # Titulo
-        scrapedtitle = match[3]
-
-        # URL
-        scrapedurl = match[1]
-        
-        # Thumbnail
-        scrapedthumbnail = match[2]
-        
-        # procesa el resto
-        scrapedplot = match[4]+" - " + "Vistas : "+match[5]+" veces"
-
-        # Depuracion
-        if (DEBUG):
-            logger.info("scrapedtitle="+scrapedtitle)
-            logger.info("scrapedurl="+scrapedurl)
-            logger.info("scrapedthumbnail="+scrapedthumbnail)
-
-        # A�ade al listado de XBMC
-        #    xbmctools.addnewvideo( __channel__ , "detail" , category , "directo" , match[0]+") "+scrapedtitle + " - " + scrapedplot , scrapedurl , scrapedthumbnail , scrapedplot )
-
-        xbmctools.addthumbnailfolder( __channel__ , match[0]+") "+scrapedtitle+" - "+scrapedplot, scrapedurl , scrapedthumbnail, "detail" )
-
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
-#############----------------------------------------------------------#############
-
-def detail(params,url,category):
-    logger.info("[sonolatino.py] detail")
-
-    title = urllib.unquote_plus( params.get("title") )
-    thumbnail = urllib.unquote_plus( params.get("thumbnail") )
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-    if len(thumbnail)<=0:
-        patron = '<td valign="top">[^<]+<img src="([^"]+)"'
-        matches = re.compile(patron,re.DOTALL).findall(data)
-        if len(matches)>0:
-            thumbnail = matches[0]
-    print thumbnail
-    thumnbail = thumbnail
-    ok = "false"
-    
-    patrondescrip = '<td.+?class="letra">[^<]+<h3>(.*?)</td>'
-    descripcion = ""
-    plot = ""
-    uri = url
-    matches = re.compile(patrondescrip,re.DOTALL).findall(data)
-    
-    if len(matches)>0:
-        descripcion = matches[0]
-        descripcion = descripcion.replace("&nbsp;","")
-        descripcion = descripcion.replace("<BR>","\n")
-        #descripcion = descripcion.replace("\r","")
-        #descripcion = descripcion.replace("\n"," ")
-        descripcion = descripcion.replace("\t","")
-        descripcion = re.sub("<[^>]+>"," ",descripcion)
-#        logger.info("descripcion="+descripcion)
-        descripcion = acentos(descripcion)
-#        logger.info("descripcion="+descripcion)
-        try :
-            plot = unicode( descripcion, "utf-8" ).encode("iso-8859-1")
-        except:
-            plot = descripcion
-    # ----------------------------------------------------------------------------
-    # Busca los enlaces a los videos de : "Megavideo"
-    # ------------------------------------------------------------------------------------
-    listavideos = servertools.findvideos(data)
-
-    for video in listavideos:
-        videotitle = video[0]
-        url1 = video[1].replace("&amp;","&")
-        logger.info("url   ="+url)
-        if  url.endswith(".jpg"):break
-        server = video[2]
-        if server=="Megavideo" or "Veoh":
-            xbmctools.addnewvideo( __channel__ , "play" , category , server , title.strip().replace("(Megavideo)","").replace("  "," ") + " - " + videotitle , url1 , thumbnail , plot )
-            
-        else:
-            xbmctools.addnewvideo( __channel__ , "play" , category , server , title.strip().replace(server,"").replace("  "," ") + " - " + videotitle , url1 , thumbnail , plot )
-
-
-        
-      
-    # ------------------------------------------------------------------------------------
-       #  ---- Extrae los videos directos ----- 
-
-    # Extrae los enlaces a los v�deos (Directo)
-    patronvideos = "file: '([^']+)'"
-    servidor = "Directo"
-    extraevideos(patronvideos,data,category,title,thumbnail,plot,servidor)
-       # ---------------------------------------
-       
-    # Extrae los enlaces a los v�deos (izlesene)
-    patronvideos = 'http://www.izlesene.com/.+?video=([0-9]{7})'
-    servidor = "izlesene"
-    extraevideos(patronvideos,data,category,title,thumbnail,plot,servidor)
-
-       #  --- Extrae los videos de veoh  ----
-    patronvideos = 'var embed_code[^>]+>   <param name="movie" value="http://www.veoh.com/static/swf/webplayer/WebPlayer.swf.*?permalinkId=(.*?)&player=videodetailsembedded&videoAutoPlay=0&id=anonymous"></param>'
-    servidor = "Veoh"
-    extraevideos(patronvideos,data,category,title+" - Video en  Veoh",thumbnail,plot,servidor)
-       # ---------------------------------------
-
-
-     
-#var embed_code =  '<embed id="VideoPlayback" src="http://video.google.com/googleplayer.swf?docid=1447612366747092264&hl=en&fs=true" style="width:496px;height:401px" allowFullScreen="true" allowScriptAccess="always" type="application/x-shockwave-flash" wmode="window">  </embed>' ;
-
-       #  --- Extrae los videos de google  ----
-    patronvideos = '<embed id="VideoPlayback" src="http://video.google.com/googleplayer.swf.*?docid=(.*?)&hl=en&'
-    servidor = "Google"
-    extraevideos(patronvideos,data,category,title+" - [Video en google]",thumbnail,plot,servidor)
-       # --------------------------------------- 
-
-       #  --- Extrae los videos de http://n59.stagevu.com  ----
-    patronvideos = '"http://.*?.stagevu.com/v/.*?/(.*?).avi"'
-    servidor = "Stagevu"
-    extraevideos(patronvideos,data,category,title,thumbnail,plot,servidor)
-    
-    #  --- Extrae los videos de dailymotion.com  ----
-    patronvideos = 'value="http://www.dailymotion.com/([^"]+)"'
-    
-    servidor = "Dailymotion"
-    extraevideos(patronvideos,data,category,title,thumbnail,plot,servidor)
-    
-    #  --- Extrae los videos de vimeo.com  ----
-    patronvideos = "http://vimeo.com.*?clip_id=([0-9]{8})"
-    servidor = "Vimeo"
-    extraevideos(patronvideos,data,category,title,thumbnail,plot,servidor)
-    
-    #  --- Extrae los videos de yahoo.com  ----
-    patronvideos = "http://.*?video.yahoo.com.*?id=([v0-9]{10})"
-    servidor = "Yahoo"
-    extraevideos(patronvideos,data,category,title,thumbnail,plot,servidor)
-    
-       # --Muestra Una opcion mas para videos documentales relacionados con el tema--
-    print "esta es la url :%s" %url
-    try:
-            patron = "http://www.sonolatino.com.*?\_(.*?)\.html"
-            matches = re.compile(patron,re.DOTALL).findall(url)
-            url = uri
-            titulo = "Ver Videos Relacionados"
-            xbmctools.addnewfolder( __channel__ , "Relacionados" , category , titulo , url , "" , "L�sta algunos videos relacionados con el mismo video musical" )
-                    
-            url = "http://www.sonolatino.com/ajax.php?p=detail&do=show_more_best&vid="+matches[0]
-            titulo = "Ver Videos mas vistos"
-            xbmctools.addnewfolder( __channel__ , "Relacionados" , category , titulo , url , "" , "L�sta algunos mas vistos relacionados con el video musical" )
-        
-            titulo = "Ver Videos del mismo Artista"
-            url = "http://www.sonolatino.com/ajax.php?p=detail&do=show_more_artist&vid="+matches[0]
-            xbmctools.addnewfolder( __channel__ , "Relacionados" , category , titulo , url , "" , "L�sta algunos videos relacionados con el mismo Artista" )
-    except:
-            pass
-    patron  = '<h1 class="h2_artistnuevo">([^<]+)</h1>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    if len(matches)>0:
-        xbmctools.addnewfolder( "trailertools" , "buscartrailer" , category , "[Buscar la cancion en Youtube:] "+matches[0] , title , os.path.join(IMAGES_PATH, 'youtube_logo.png') , "Busca el video en Youtube" )
-        try:
-            artista = matches[0].split("-")[0].strip()
-            xbmctools.addnewfolder( "trailertools" , "buscartrailer" , category , "[Buscar artista en Youtube:] "+artista , title , os.path.join(IMAGES_PATH, 'youtube_logo.png') , "Busca el video en Youtube" )
-        except:
-                pass
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=pluginhandle, category=category )
-        
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=pluginhandle, sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=pluginhandle, succeeded=True )
-
-#############----------------------------------------------------------#############
-
-def extraevideos(patronvideos,data,category,title,thumbnail,plot,servidor):
-    logger.info("patron="+patronvideos)
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)        
-
-    if len(matches)>0 :
-        # A�ade al listado de XBMC
-        if servidor == "Directo":
-            if "youtube.com" in  matches[0]:
-                from youtube import Extract_id
-                url = Extract_id(matches[0])
-                xbmctools.addnewvideo( __channel__ , "play" , category , "Youtube" , "%s [YOUTUBE]" %title , url , thumbnail , plot )
-            else:
-                xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , "%s [Directo]" %title, matches[0] , thumbnail , plot )
-
-        elif servidor == "Veoh":
-            from servers import veoh
-            veohurl = veoh.get_video_url(matches[0])
-            logger.info(" veohurl = " +veohurl)
-
-            if len(veohurl)>0:
-                if  veohurl=="http://./default.asp":
-                    advertencia = xbmcgui.Dialog()
-                    resultado = advertencia.ok('El Video Video' , title , 'no existe en Veoh','visite la pagina www.sonolatino.com para reportarlo' )
-                    return
-                logger.info(" newmatches = "+veohurl)
-                xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title, veohurl , thumbnail , plot )
-            else:
-                advertencia = xbmcgui.Dialog()
-                resultado = advertencia.ok('El Video Video' , title , 'no existe en Veoh')
-                return 
-
-        elif servidor == "Google":
-            url = "http://www.flashvideodownloader.org/download.php?u=http://video.google.com/videoplay?docid="+matches[0]
-            logger.info(" Url = "+url)
-            data1 = scrapertools.cachePage(url)
-            newpatron = '</script>.*?<a href="(.*?)" title="Click to Download">'
-            newmatches = re.compile(newpatron,re.DOTALL).findall(data1)
-            if len(newmatches)>0:
-                logger.info(" newmatches = "+newmatches[0])
-                xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title, newmatches[0] , thumbnail , plot )
-
-        elif servidor == "Stagevu":
-            url= "http://stagevu.com/video/"+matches[0]
-            from servers import stagevu
-            url = stagevu.get_video_url(url)
-            
-            logger.info(" url = "+url)
-            
-            
-            videotitle = "Video en Stagevu"
-            server = servidor
-            xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title.strip().replace(server,"").replace("  "," ") + " - " + videotitle , url , thumbnail , plot )
-        
-        elif servidor == "izlesene":
-            url = "http://www.izlesene.com/actions/video/embed.php?video="+matches[0]
-            data1 = scrapertools.cachePage(url)
-            newpatron = "fURL=([^\&]+)\&vduration=([^\&]+)\&"
-            newmatches = re.compile(newpatron,re.DOTALL).findall(data1)
-            if len(newmatches)>0:
-                logger.info(" izlesene furl = "+newmatches[0][0])
-                url = "http://dcdn.nokta.com/%s%s" %(newmatches[0][0], "_1_5_1.xml")
-                xbmctools.addnewvideo( __channel__ , "play" , category , "izlesene" , "%s (%s) [IZLESENE]" %(title,newmatches[0][1]) , url , thumbnail , plot )
-        
-        elif servidor == "Dailymotion":
-            if "/" in matches[0]:
-                idd = matches[0].split("/")
-                id  = idd[len(idd)-1]
-            else:
-                id = matches[0]
-            daily = 'http://www.dailymotion.com/video/%s'%id
-            data2 = scrapertools.cachePage(daily)
-            Lowres=re.compile('%22sdURL%22%3A%22(.+?)%22').findall(data2)
-            if len(Lowres)>0:
-                videourl = urllib.unquote(Lowres[0])
-                videourl = videourl.replace("\/","/")
-                
-                    
-                subtitle = "[FLV-Directo-Dailymotion]"
-                xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title + " - "+subtitle, videourl , thumbnail , plot )
-            
-            # Busca el enlace al video con formato HQ (H264)        
-            Highres=re.compile('%22hqURL%22%3A%22(.+?)%22').findall(data2)
-            if len(Highres)>0:
-                videourl = urllib.unquote(Highres[0])
-                videourl = videourl.replace("\/","/")
-                
-                        
-                subtitle = "[h264-Directo-Dailymotion-este video no es soportado en versiones antiguas o xbox plataforma]"
-                xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title + " - "+subtitle, videourl , thumbnail , plot )
-        
-        elif servidor == "Vimeo":
-            subtitle = "[Vimeo]"
-            xbmctools.addnewvideo( __channel__ , "play" , category , "Vimeo" , title + " - "+subtitle, matches[0] , thumbnail , plot )
-        ## -------------------------
-        
-        elif servidor == "Yahoo":
-            import yahoo
-            subtitle  = "[Yahoo]"
-            video_url = yahoo.geturl(matches[0])
-            if len(video_url)>0:
-                if "rtmp" in video_url:
-                    addnewvideo( __channel__ , "playRtmp" , category , "Directo" , title + " - "+subtitle, video_url , thumbnail , plot )
-                else:
-                    xbmctools.addnewvideo( __channel__ , "play" , category , "Directo" , title + " - "+subtitle, video_url , thumbnail , plot )
-#############----------------------------------------------------------#############
-
-def play(params,url,category):
-    logger.info("[sonolatino.py] play")
-
-    title = unicode( xbmc.getInfoLabel( "ListItem.Title" ), "utf-8" )
-    
-    try:
-        thumbnail = urllib.unquote_plus( params.get("thumbnail") )
-    except:
-        thumbnail = xbmc.getInfoImage( "ListItem.Thumb" )
-    plot = urllib.unquote_plus( params.get("plot") )
-    plot = urllib.unquote_plus( params.get("plot") )
-
-    try:
-        plot = unicode( xbmc.getInfoLabel( "ListItem.Plot" ), "utf-8" )
-    except:
-        plot = xbmc.getInfoLabel( "ListItem.Plot" )
-
-    server = params["server"]
-    logger.info("[sonolatino.py] thumbnail="+thumbnail)
-    logger.info("[sonolatino.py] server="+server)
-    
-    if server == "izlesene":
-        print server
-        data = scrapertools.cachePage(url)
-        print data
-        patron = 'durl="([^"]+)"'
-        matches = re.compile(patron,re.DOTALL).findall(data)
-        if len(matches)>0:
-            url = matches[0]
-            server = "Directo"
-    xbmctools.play_video(__channel__,server,url,category,title,thumbnail,plot)
-
-
-def playRtmp(params,url,category):
-    logger.info("[sonolatino.py] playRtmp")
-
-    title = unicode( xbmc.getInfoLabel( "ListItem.Title" ), "utf-8" )
-    
-    try:
-        thumbnail = urllib.unquote_plus( params.get("thumbnail") )
-    except:
-        thumbnail = xbmc.getInfoImage( "ListItem.Thumb" )
-    plot = urllib.unquote_plus( params.get("plot") )
-    plot = urllib.unquote_plus( params.get("plot") )
-
-    try:
-        plot = unicode( xbmc.getInfoLabel( "ListItem.Plot" ), "utf-8" )
-    except:
-        plot = xbmc.getInfoLabel( "ListItem.Plot" )
-
-    server = params["server"]
-    logger.info("[sonolatino.py] thumbnail="+thumbnail)
-    logger.info("[sonolatino.py] server="+server    )
-    
-    
-    
-
-    item=xbmcgui.ListItem(title, iconImage='', thumbnailImage=thumbnail, path=url)
-    item.setInfo( type="Video",infoLabels={ "Title": title})
-    xbmcplugin.setResolvedUrl(pluginhandle, True, item)
-    
-
-
-
-
-#############----------------------------------------------------------#############
-
-def paginasiguientes(patronvideos,data,category,cat):
-
-# ------------------------------------------------------
-    # Extrae la p�gina siguiente
-    # ------------------------------------------------------
-    patron    = '</span><a href="([^"]+)"' 
-    matches   = re.compile(patron,re.DOTALL).findall(data)
-    #menutitle = "Volver Al Menu Principal"
-    #menurl    = "http://www.sonolatino.com/"
-    if DEBUG:
-        scrapertools.printMatches(matches)
-
-    for match in matches:
-        scrapedtitle = "Pagina siguiente"
-        scrapedurl = "http://www.sonolatino.com/" + match
-        scrapedthumbnail = os.path.join(IMAGES_PATH, 'next.png')
-        scrapeddescription = ""
-
-        # Depuracion
-        if DEBUG:
-            logger.info("scrapedtitle="+scrapedtitle)
-            logger.info("scrapedurl="+scrapedurl)
-            logger.info("scrapedthumbnail="+scrapedthumbnail)
-
-        if cat == 'tipo':   
-        # A�ade al listado de XBMC
-            xbmctools.addthumbnailfolder( __channel__ , scrapedtitle , scrapedurl , scrapedthumbnail, "listatipoVideo" )
-        elif cat == 'nuevo':
-            xbmctools.addthumbnailfolder( __channel__ , scrapedtitle , scrapedurl , scrapedthumbnail, "Videosnuevoslist" )
-        elif cat == 'tag':
-            xbmctools.addthumbnailfolder( __channel__ , scrapedtitle , "http://www.sonolatino.com.es/series"+match , scrapedthumbnail, "tagdocumentaleslist" )
-        elif cat == 'busca':
-            xbmctools.addthumbnailfolder( __channel__ , scrapedtitle , scrapedurl , scrapedthumbnail, "searchresults" )
-               
-
-    #xbmctools.addthumbnailfolder( __channel__ , menutitle , menurl , "", "volvermenu" )
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=pluginhandle, category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=pluginhandle, sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=pluginhandle, succeeded=True )
-########-------------------------------------------------------############
-  
-def acentos(title):
-
-    title = title.replace("�", "")
-    title = title.replace("é","�")
-    title = title.replace("á","�")
-    title = title.replace("ó","�")
-    title = title.replace("ú","�")
-    title = title.replace("í","�")
-    title = title.replace("ñ","�")
-    title = title.replace("”", "")
-    title = title.replace("“�", "")
-    title = title.replace("“","")
-    title = title.replace("é","�")
-    title = title.replace("á","�")
-    title = title.replace("ó","�")
-    title = title.replace("ú","�")
-    title = title.replace("í","�")
-    title = title.replace("ñ","�")
-    title = title.replace("Ó","�")
-    return(title)
-######-----------------------------------------------##############
-
-def verRelacionados(params,data,category):
-    
-    patronvideos  = '<div class="item">.*?<a href="([^"]+)"'
-    patronvideos += '><img src="([^"]+)".*?'
-    patronvideos += 'alt="([^"]+)".*?/></a>.*?'
-    patronvideos += '<span class="artist_name">([^<]+)</span>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    for match in matches:
-        # Titulo
-        scrapedtitle = acentos(match[2])
-
-        # URL
-        scrapedurl = match[0]
-        
-        # Thumbnail
-        scrapedthumbnail = match[1]
-        
-        # procesa el resto
-        scrapeddescription = match[3]
-
-        # procesa el resto
-        scrapedplot = ""
-
-        # Depuracion
-        if (DEBUG):
-            logger.info("scrapedtitle="+scrapedtitle)
-            logger.info("scrapedurl="+scrapedurl)
-            logger.info("scrapedthumbnail="+scrapedthumbnail)
-
-        # A�ade al listado de XBMC
-            xbmctools.addnewfolder( __channel__ , "detail" , category , scrapedtitle+" - "+scrapeddescription , scrapedurl , scrapedthumbnail , scrapedplot )
-
-        # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=pluginhandle, category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=pluginhandle, sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=pluginhandle, succeeded=True )
- 
-def Relacionados(params,url,category): 
-    
-    data = scrapertools.cachePage(url)
-    print data
-    verRelacionados(params,data,category)
-
-
-def addnewvideo( canal , accion , category , server , title , url , thumbnail, plot ,Serie=""):
-    if DEBUG:
-        try:
-            logger.info('[xbmctools.py] addnewvideo( "'+canal+'" , "'+accion+'" , "'+category+'" , "'+server+'" , "'+title+'" , "' + url + '" , "'+thumbnail+'" , "'+plot+'")" , "'+Serie+'")"')
-        except:
-            logger.info('[xbmctools.py] addnewvideo(<unicode>)')
-    listitem = xbmcgui.ListItem( title, iconImage="DefaultVideo.png", thumbnailImage=thumbnail )
-    listitem.setInfo( "video", { "Title" : title, "Plot" : plot, "Studio" : canal } )
-    listitem.setProperty('IsPlayable', 'true')
-    #listitem.setProperty('fanart_image',os.path.join(IMAGES_PATH, "cinetube.png"))
-    itemurl = '%s?channel=%s&action=%s&category=%s&title=%s&url=%s&thumbnail=%s&plot=%s&server=%s&Serie=%s' % ( sys.argv[ 0 ] , canal , accion , urllib.quote_plus( category ) , urllib.quote_plus( title ) , urllib.quote_plus( url ) , urllib.quote_plus( thumbnail ) , urllib.quote_plus( plot ) , server , Serie)
-    #logger.info("[xbmctools.py] itemurl=%s" % itemurl)
-    xbmcplugin.addDirectoryItem( handle = pluginhandle, url=itemurl, listitem=listitem)
-
-def playrtmp(params,url,category):
-    
-    icon = "DefaultVideo.png"
-    title = unicode( xbmc.getInfoLabel( "ListItem.Title" ), "utf-8" )
-    thumbnail = urllib.unquote_plus( params.get("thumbnail") )
-    plot = unicode( xbmc.getInfoLabel( "ListItem.Plot" ), "utf-8" )
-        
-    item=xbmcgui.ListItem(title, iconImage=icon, thumbnailImage=thumbnail, path=url)
-    item.setInfo( type="Video",infoLabels={ "Title": title, "Plot": plot})
-    item.setProperty( "IsPlayable", "true" )
-    xbmcplugin.setResolvedUrl(pluginhandle, True, item)
-    
-
-def creartag(params,url,category):
-    nombrefichero = os.path.join( config.get_setting("downloadpath"), "sonolatino_category.txt")
-    data = scrapertools.cachePage(url)
-    patron = '<ul id="ul_categories">(.*?)</ul>'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    if len(matches)>0:
-        patron = '<li><a href="([^"]+)">([^<]+)</a></li>'
-        matches2 = re.compile(patron,re.DOTALL).findall(matches[0])
-        if len(matches2)>0:
-            filetag = open(nombrefichero,"w")
-            
-            for match in matches2:
-                filetag.write('xbmctools.addnewfolder(__channel__ , "listatipoVideo" , category , "%s","%s","","")\n' %(match[1],match[0]))
-                
-            filetag.flush();
-            filetag.close()            
-            print "Lista tag creada correctamente"
-        else:
-            print "no encontro ningun tag"
-    xbmcplugin.endOfDirectory( handle=pluginhandle, succeeded=True )
-    
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/sonolatino.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/sonolatino.xml
deleted file mode 100644
index 9235e4c4ea54aa478c7677031369ae6e114fb336..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/sonolatino.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<channel>
-	<id>sonolatino</id>
-	<name>Sonolatino</name>
-	<language></language>
-	<update_url></update_url>
-	<active>false</active>
-	<include_in_global_search>false</include_in_global_search>
-	<version>0</version>
-	<adult>false</adult>
-	<date></date>
-	<changes></changes>
-	<fanart></fanart>
-	<thumbnail></thumbnail>
-	<categories>
-		<category>music</category>
-	</categories>
-</channel>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/stagevusite.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/stagevusite.py
deleted file mode 100644
index 463d293e1e51465689088b3591ec6696c1fb5c54..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/stagevusite.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- coding: iso-8859-1 -*-
-#------------------------------------------------------------
-# pelisalacarta - XBMC Plugin
-# Canal para buscar en stagevu
-# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
-#------------------------------------------------------------
-import urlparse,urllib2,urllib,re
-import os
-import sys
-import xbmc
-import xbmcgui
-import xbmcplugin
-
-from core import scrapertools
-from core import config
-from core import logger
-from platformcode import xbmctools
-from core.item import Item
-from servers import servertools
-from servers import vk
-
-from pelisalacarta import buscador
-
-__channel__ = "stagevusite"
-__category__ = "G"
-__type__ = "xbmc"
-__title__ = "Stagevu"
-__language__ = ""
-
-DEBUG = config.get_setting("debug")
-
-# Esto permite su ejecuci�n en modo emulado
-try:
-    pluginhandle = int( sys.argv[ 1 ] )
-except:
-    pluginhandle = ""
-
-logger.info("[stagevusite.py] init")
-
-def mainlist(params,url,category):
-    logger.info("[stagevusite.py] mainlist")
-
-    # A�ade al listado de XBMC
-    addfolder("Buscar","http://stagevu.com","search")
-
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
-def search(params,url,category):
-    logger.info("[stagevusite.py] list")
-
-    keyboard = xbmc.Keyboard('')
-    keyboard.doModal()
-    if (keyboard.isConfirmed()):
-        tecleado = keyboard.getText()
-        if len(tecleado)>0:
-            #convert to HTML
-            tecleado = tecleado.replace(" ", "+")
-            searchUrl = 'http://stagevu.com/search?for='+tecleado+'&in=Videos&x=0&y=0&perpage=25&page=2'
-            list(params,searchUrl,category)
-
-def performsearch(texto):
-    logger.info("[stagevusite.py] performsearch")
-    url = 'http://stagevu.com/search?for='+texto+'&in=Videos&x=0&y=0&perpage=25&page=2'
-
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-
-    # Extrae las entradas (carpetas)
-    patronvideos  = '<div class="result[^>]+>[^<]+<div class="resultcont">[^<]+<h2><a href="([^"]+)">([^<]+)</a>.*?<img src="([^"]+)".*?</a>(.*?)</div>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-    
-    resultados = []
-
-    for match in matches:
-        # Titulo
-        try:
-            scrapedtitle = unicode( match[1], "utf-8" ).encode("iso-8859-1")
-        except:
-            scrapedtitle = match[1]
-
-        # URL
-        scrapedurl = match[0]
-        
-        # Thumbnail
-        scrapedthumbnail = match[2]
-        
-        # procesa el resto
-        try:
-            scrapedplot = unicode( match[3], "utf-8" ).encode("iso-8859-1")
-        except:
-            scrapedplot = match[3]
-        scrapedplot = scrapedplot.replace("\\t","")
-        scrapedplot = scrapedplot.replace("<p>"," ")
-        scrapedplot = scrapedplot.replace("</p>"," ")
-        scrapedplot = scrapedplot.strip()
-        if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
-
-        # A�ade al listado de XBMC
-        resultados.append( [__channel__ , "play" , "buscador" , scrapedtitle , scrapedurl , scrapedthumbnail, scrapedplot ] )
-        
-    return resultados
-
-
-
-def list(params,url,category):
-    logger.info("[stagevusite.py] list")
-
-    # Descarga la p�gina
-    data = scrapertools.cachePage(url)
-    #logger.info(data)
-
-    # Extrae las entradas (carpetas)
-    patronvideos  = '<div class="result[^>]+>[^<]+<div class="resultcont">[^<]+<h2><a href="([^"]+)">([^<]+)</a>.*?<img src="([^"]+)".*?</a>(.*?)</div>'
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
-
-    for match in matches:
-        # Titulo
-        try:
-            scrapedtitle = unicode( match[1], "utf-8" ).encode("iso-8859-1")
-        except:
-            scrapedtitle = match[1]
-
-        # URL
-        scrapedurl = match[0]
-        
-        # Thumbnail
-        scrapedthumbnail = match[2]
-        
-        # procesa el resto
-        try:
-            scrapeddescription = unicode( match[3], "utf-8" ).encode("iso-8859-1")
-        except:
-            scrapeddescription = match[3]
-        scrapeddescription = scrapeddescription.replace("\\t","")
-        scrapeddescription = scrapeddescription.replace("<p>"," ")
-        scrapeddescription = scrapeddescription.replace("</p>"," ")
-        scrapeddescription = scrapeddescription.strip()
-
-        # Depuracion
-        if (DEBUG):
-            logger.info("scrapedtitle="+scrapedtitle)
-            logger.info("scrapedurl="+scrapedurl)
-            logger.info("scrapedthumbnail="+scrapedthumbnail)
-
-        # A�ade al listado de XBMC
-        addthumbnailvideo(scrapedtitle,scrapedurl,scrapedthumbnail,scrapeddescription,category,"Stagevu")
-
-    # Label (top-right)...
-    xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
-
-    # Disable sorting...
-    xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
-
-    # End of directory...
-    xbmcplugin.endOfDirectory( handle=int( sys.argv[ 1 ] ), succeeded=True )
-
-def play(params,url,category):
-    logger.info("[stagevusite.py] play")
-
-    title = unicode( xbmc.getInfoLabel( "ListItem.Title" ), "utf-8" )
-    thumbnail = xbmc.getInfoImage( "ListItem.Thumb" )
-    plot = unicode( xbmc.getInfoLabel( "ListItem.Plot" ), "utf-8" )
-    logger.info("[stagevusite.py] thumbnail="+thumbnail)
-    server="stagevu"
-
-    xbmctools.play_video(__channel__,server,url,category,title,thumbnail,plot)
-
-def addfolder(nombre,url,accion):
-    logger.info('[stagevusite.py] addfolder( "'+nombre+'" , "' + url + '" , "'+accion+'")"')
-    listitem = xbmcgui.ListItem( nombre , iconImage="DefaultFolder.png")
-    itemurl = '%s?channel=stagevusite&action=%s&category=%s&url=%s' % ( sys.argv[ 0 ] , accion , urllib.quote_plus(nombre) , urllib.quote_plus(url) )
-    xbmcplugin.addDirectoryItem( handle = int(sys.argv[ 1 ]), url = itemurl , listitem=listitem, isFolder=True)
-
-def addvideo(nombre,url,category,server):
-    logger.info('[stagevusite.py] addvideo( "'+nombre+'" , "' + url + '" , "'+server+'")"')
-    listitem = xbmcgui.ListItem( nombre, iconImage="DefaultVideo.png" )
-    listitem.setInfo( "video", { "Title" : nombre, "Plot" : nombre } )
-    itemurl = '%s?channel=stagevusite&action=play&category=%s&url=%s&server=%s' % ( sys.argv[ 0 ] , category , urllib.quote_plus(url) , server )
-    xbmcplugin.addDirectoryItem( handle=int(sys.argv[ 1 ]), url=itemurl, listitem=listitem, isFolder=False)
-
-def addthumbnailvideo(nombre,url,thumbnail,descripcion,category,server):
-    logger.info('[stagevusite.py] addvideo( "'+nombre+'" , "' + url + '" , "'+thumbnail+'" , "'+server+'")"')
-    listitem = xbmcgui.ListItem( nombre, iconImage="DefaultVideo.png", thumbnailImage=thumbnail )
-    listitem.setInfo( "video", { "Title" : nombre, "Plot" : descripcion } )
-    itemurl = '%s?channel=stagevusite&action=play&category=%s&url=%s&server=%s' % ( sys.argv[ 0 ] , category , url , server )
-    xbmcplugin.addDirectoryItem( handle=int(sys.argv[ 1 ]), url=itemurl, listitem=listitem, isFolder=False)
-
-def addthumbnailfolder( scrapedtitle , scrapedurl , scrapedthumbnail , accion ):
-    logger.info('[stagevusite.py] addthumbnailfolder( "'+scrapedtitle+'" , "' + scrapedurl + '" , "'+scrapedthumbnail+'" , "'+accion+'")"')
-    listitem = xbmcgui.ListItem( scrapedtitle, iconImage="DefaultFolder.png", thumbnailImage=scrapedthumbnail )
-    itemurl = '%s?channel=stagevusite&action=%s&category=%s&url=%s' % ( sys.argv[ 0 ] , accion , urllib.quote_plus( scrapedtitle ) , urllib.quote_plus( scrapedurl ) )
-    xbmcplugin.addDirectoryItem( handle = int(sys.argv[ 1 ]), url = itemurl , listitem=listitem, isFolder=True)
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/stagevusite.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/stagevusite.xml
deleted file mode 100644
index 13f6bd9d5978a361656b4c3a27d9d6316e7b1f9b..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/stagevusite.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<channel>
-	<id>stagevusite</id>
-	<name>Stagevu</name>
-	<language></language>
-	<update_url></update_url>
-	<active>false</active>
-	<include_in_global_search>false</include_in_global_search>
-	<version>0</version>
-	<adult>false</adult>
-	<date></date>
-	<changes></changes>
-	<fanart></fanart>
-	<thumbnail></thumbnail>
-	<categories>
-		<category>G</category>
-	</categories>
-</channel>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/submityouflicks.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/submityouflicks.py
index dc8e956a59a68589755d702f30fdc156693dfcce..5ad432816b620489c3e36a28a3c85590904b8ef1 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/submityouflicks.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/submityouflicks.py
@@ -28,11 +28,9 @@ def isGeneric():
     return True
 
 def mainlist(item):
-    logger.info("[submityourflicks.py] mainlist")
+    logger.info("pelisalacarta.channels.submityourflicks mainlist")
     itemlist = []
     itemlist.append( Item(channel=__channel__, action="videos"    , title="Útimos videos" , url="http://www.submityourflicks.com/"))
-    itemlist.append( Item(channel=__channel__, action="videos"    , title="Más vistos" , url="http://www.submityourflicks.com/most-viewed/1.html"))
-    itemlist.append( Item(channel=__channel__, action="videos"    , title="Más votados" , url="http://www.submityourflicks.com/top-rated/1.html"))
     itemlist.append( Item(channel=__channel__, action="search"    , title="Buscar", url="http://www.submityourflicks.com/index.php?mode=search&q=%s&submit=Search"))
     
     return itemlist
@@ -40,7 +38,7 @@ def mainlist(item):
 # REALMENTE PASA LA DIRECCION DE BUSQUEDA
 
 def search(item,texto):
-    logger.info("[submityourflicks.py] search")
+    logger.info("pelisalacarta.channels.submityourflicks search")
     tecleado = texto.replace( " ", "+" )
     item.url = item.url % tecleado
     return videos(item)
@@ -48,80 +46,51 @@ def search(item,texto):
 # SECCION ENCARGADA DE BUSCAR
 
 def videos(item):
-    logger.info("[submityourflicks.py] videos")
-    # <div id="movies" style="width: 100%; ">
-    data = scrapertools.downloadpageGzip(item.url)
+    logger.info("pelisalacarta.channels.submityourflicks videos")
     itemlist = [] 
-    matches = re.compile(r"""<div class='content_item'>.*?</span>.*?<br style='clear: both;' />.*?</div>""",re.DOTALL).findall(data)
-    for match in matches:
-        datos = re.compile(r"""<div class='content_item'>.*?</div>""", re.S).findall(match)
-        for vid in datos:
-            aRef = re.compile(r"""<a href="([^"]+)"><img src="([^"]+)" alt="([^"]+)" title="([^"]+)" name="([^"]+)" border="1" id='([^"]+)' width="170" height="130" onmouseover="([^"]+)" onmouseout="([^"]+)" /></a>""", re.S).findall(vid)
-            aTime= re.compile(r"""<span class='l5'>([^"]+)Min<br />.*?</span>""", re.S).findall(vid)
-            if len(aTime) > 0:
-                cTime= aTime[0].replace("\r\n","")
-                cTime= cTime.replace(" ","")
-            else:
-                cTime=""
-                
-            aPosted = re.compile(r"""<span class='l5'>.*?Posted: ([^"]+)<br /></span>""", re.S).findall(vid)
-            if len(aPosted) > 0:
-                cPosted = aPosted[0].replace("\r\n","")
-                cPosted = cPosted.replace(" ","")
-            else:
-                cPosted = ""
-                
-            video = aRef[0]
-            try:
-                scrapedtitle = unicode( video[2], "utf-8" ).encode("iso-8859-1")
-                scrapedtitle = scrapedtitle+"("+cTime+")["+cPosted+"]"
-            except:
-                scrapedtitle = video[2]
-            scrapedurl =  urlparse.urljoin( "http://www.submityourflicks.com/", video[0] )
-            scrapedthumbnail = urlparse.urljoin( "http://www.submityourflicks.com/", video[1] )
-            scrapedplot = ""
-            # Depuracion
-            if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")            
-            itemlist.append( Item(channel=__channel__, action="play" , title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot, show=scrapedtitle, folder=False))
-
-    #Paginador
-    print "paginador"
-    matches = re.compile('<a href="([^"]+)">Next</a>', re.DOTALL).findall(data)
-    if len(matches)>0:
-        scrapedurl =  urlparse.urljoin( "http://www.submityourflicks.com/", matches[0] )
-        print scrapedurl
-        paginador = Item(channel=__channel__, action="videos" , title="!Página siguiente" , url=scrapedurl, thumbnail="", plot="", extra = "" , show=item.show)
-    else:
-        paginador = None
-    
-    if paginador is not None:
-        itemlist.append( paginador )
 
-    return itemlist
+    '''
+    <div class="item-block item-normal col" >
+    <div class="inner-block">
+    <a href="http://www.submityourflicks.com/1846642-my-hot-wife-bending-over-and-getting-her-cunt-reamed.html" title="My hot wife bending over and getting her cunt reamed..">
+    <span class="image">
+    <script type='text/javascript'>stat['56982c566d05c'] = 0;
+    pic['56982c566d05c'] = new Array();
+    pics['56982c566d05c'] = new Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1);</script>
+    <img src="
+    '''
+
+    data = scrapertools.downloadpageGzip(item.url)
+    patron  = '<div class="item-block[^<]+'
+    patron += '<div class="inner-block[^<]+'
+    patron += '<a href="([^"]+)" title="([^"]+)"[^<]+'
+    patron += '<span class="image".*?'
+    patron += '<img src="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+
+    for scrapedurl,scrapedtitle,scrapedthumbnail in matches:
+
+        title = scrapedtitle
+        url = scrapedurl
+        thumbnail = scrapedthumbnail.replace(" ","%20")
+        plot = ""
+
+        if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")            
+        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False, viewmode="movie"))
+
+    next_page_url = scrapertools.find_single_match(data,"<a href='([^']+)' class=\"next\">NEXT</a>")
+    if next_page_url!="":
+        itemlist.append( Item(channel=__channel__, action="videos", title=">> Página siguiente" , url=next_page_url, folder=True) )
 
-# SECCION ENCARGADA DE VOLCAR EL LISTADO DE CATEGORIAS CON EL LINK CORRESPONDIENTE A CADA PAGINA
-    
-def listcategorias(item):
-    logger.info("[xhamster.py] listcategorias")
-    itemlist = []
     return itemlist
-    
 
-# OBTIENE LOS ENLACES SEGUN LOS PATRONES DEL VIDEO Y LOS UNE CON EL SERVIDOR
 def play(item):
-    logger.info("[xhamster.py] play")
-    data = scrapertools.downloadpage(item.url)
+    logger.info("pelisalacarta.channels.submityourflicks play")
+
+    data = scrapertools.cache_page(item.url)
+    media_url = scrapertools.find_single_match(data,"url\:\s*'([^']+)'")
     itemlist = []
-    matches = re.compile('so.addVariable\("file", "([^"]+)"\);', re.DOTALL).findall(data)
-    if len(matches)>0:
-        parsed_url = urllib.unquote_plus(matches[0])
-        print parsed_url
-        paginador = Item(channel=__channel__, action="play" , title=item.title, fulltitle=item.fulltitle , url=parsed_url, thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False)
-    else:
-        paginador = None
-    
-    if paginador is not None:
-        itemlist.append( paginador )
+    itemlist.append(Item(channel=__channel__, action="play" , title=item.title, fulltitle=item.fulltitle , url=media_url, thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
 
     return itemlist
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/submityourtapes.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/submityourtapes.py
index 83eda0f625b5a70a783c27d764296046e856ea97..1a10eadb51f18ad8df8d99dd434baedbbfe6604c 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/submityourtapes.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/submityourtapes.py
@@ -28,7 +28,7 @@ def isGeneric():
     return True
 
 def mainlist(item):
-    logger.info("[submityourtapes.py] mainlist")
+    logger.info("pelisalacarta.channels.submityourtapes mainlist")
     itemlist = []
     itemlist.append( Item(channel=__channel__, action="videos"    , title="Útimos videos" , url="http://www.submityourtapes.com/"))
     itemlist.append( Item(channel=__channel__, action="videos"    , title="Más vistos" , url="http://www.submityourtapes.com/most-viewed/1.html"))
@@ -40,7 +40,7 @@ def mainlist(item):
 # REALMENTE PASA LA DIRECCION DE BUSQUEDA
 
 def search(item,texto):
-    logger.info("[submityourtapes.py] search")
+    logger.info("pelisalacarta.channels.submityourtapes search")
     tecleado = texto.replace( " ", "+" )
     item.url = item.url % tecleado
     return videos(item)
@@ -48,7 +48,7 @@ def search(item,texto):
 # SECCION ENCARGADA DE BUSCAR
 
 def videos(item):
-    logger.info("[submityourtapes.py] videos")
+    logger.info("pelisalacarta.channels.submityourtapes videos")
 
     itemlist = [] 
     '''
@@ -67,7 +67,7 @@ def videos(item):
         plot = ""
         # Depuracion
         if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")            
-        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False))
+        itemlist.append( Item(channel=__channel__, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, folder=False, viewmode="movie"))
 
     # Paginador
     try:
@@ -82,28 +82,18 @@ def videos(item):
 # SECCION ENCARGADA DE VOLCAR EL LISTADO DE CATEGORIAS CON EL LINK CORRESPONDIENTE A CADA PAGINA
     
 def listcategorias(item):
-    logger.info("[submityourtapes.py] listcategorias")
+    logger.info("pelisalacarta.channels.submityourtapes listcategorias")
     itemlist = []
     return itemlist
     
 
-# OBTIENE LOS ENLACES SEGUN LOS PATRONES DEL VIDEO Y LOS UNE CON EL SERVIDOR
 def play(item):
-    logger.info("[submityourtapes.py] play")
-    # <div id="movies" style="width: 100%; ">
-    data = scrapertools.downloadpage(item.url)
-    
+    logger.info("pelisalacarta.channels.submityourtapes play")
+
+    data = scrapertools.cache_page(item.url)
+    media_url = scrapertools.find_single_match(data,'<source src="([^"]+)"')
     itemlist = []
-    matches = re.compile('so.addVariable\("file", "([^"]+)"\);', re.DOTALL).findall(data)
-    if len(matches)>0:
-        parsed_url = urllib.unquote_plus(matches[0])
-        print parsed_url
-        paginador = Item(channel=__channel__, action="play" , title=item.title, fulltitle=item.fulltitle , url=parsed_url, thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False)
-    else:
-        paginador = None
-    
-    if paginador is not None:
-        itemlist.append( paginador )
+    itemlist.append(Item(channel=__channel__, action="play" , title=item.title, fulltitle=item.fulltitle , url=media_url, thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
 
     return itemlist
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/xhamster.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/xhamster.py
index f1e0c7ee15433d724bfa6632c2d88e48f61947f2..e5bf42074a8c61ffde946068758c0a11a44950e3 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/xhamster.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/xhamster.py
@@ -29,7 +29,7 @@ def isGeneric():
     return True
 
 def mainlist(item):
-    logger.info("[xhamster.py] mainlist")
+    logger.info("pelisalacarta.channels.xhamster mainlist")
     itemlist = []
     itemlist.append( Item(channel=__channel__, action="videos"      , title="Útimos vídeos" , url="http://es.xhamster.com/"))
     itemlist.append( Item(channel=__channel__, action="categorias"    , title="Categorías"))
@@ -40,7 +40,7 @@ def mainlist(item):
 # REALMENTE PASA LA DIRECCION DE BUSQUEDA
 
 def search(item,texto):
-    logger.info("[xhamster.py] search")
+    logger.info("pelisalacarta.channels.xhamster search")
     tecleado = texto.replace( " ", "+" )
     item.url = item.url % tecleado
     item.extra = "buscar"
@@ -49,50 +49,23 @@ def search(item,texto):
 # SECCION ENCARGADA DE BUSCAR
 
 def videos(item):
-    logger.info("[xhamster.py] videos")
-    data = scrapertools.downloadpageGzip(item.url)
+    logger.info("pelisalacarta.channels.xhamster videos")
+    data = scrapertools.cache_page(item.url)
     itemlist = []
 
-    if item.extra != "buscar":
-        data = scrapertools.get_match(data,'<div class="boxC videoList clearfix">(.*?)<div id="footer">')
-        patron = "<div class='vDate'>.*?<\/div><a href='([^']+)'.*?><img src='([^']+)'.*?><img.*?><b>([^']+)</b><u>([^']+)</u>"
-        matches = re.compile(patron,re.DOTALL).findall(data)
-        for scrapedurl,scrapedthumbnail,time,title in matches:
-            scrapedtitle = "" + time + " - " + title
-            # Depuracion
-            if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")            
-            itemlist.append( Item(channel=__channel__, action="detail" , title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail, folder=True))
-		
-    patron = "<div class='video'><a href='([^']+)'.*?><img src='([^']+)'.*?><img.*?><b>([^']+)</b><u>([^']+)</u>"
+    data = scrapertools.get_match(data,'<div class="boxC videoList clearfix">(.*?)<div id="footer">')
+    patron = '<div class="video"><a href="([^"]+)" class="hRotator">'+"<img src='([^']+)' class='thumb'"+' alt="([^"]+)"'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,time,title in matches:
-        scrapedtitle = "" + time + " - " + title
-        # Depuracion
+    for scrapedurl,scrapedthumbnail,scrapedtitle in matches:
         if (DEBUG): logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")            
-        itemlist.append( Item(channel=__channel__, action="detail" , title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail, folder=True))
-        
-    # # EXTRAE EL PAGINADOR
-    if item.extra == "buscar":
-        patron  = "<a href='([^']+)' class='last'"
-    else:
-        patron  = "<div class='pager'>.*?<span>.*?<a href='([^']+)'>([^']+)<\/a>"
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for match in matches:
-        if item.extra == "buscar":
-            page = scrapertools.find_single_match(match, "page=(\d+)")
-            scrapedurl = match.replace("amp;","&")
-            itemlist.append( Item(channel=__channel__, action="videos", title= ">> Página " + page , url=scrapedurl , extra="buscar", folder=True) )
-        else:
-            page = match[1]
-            scrapedurl = match[0]
-            itemlist.append( Item(channel=__channel__, action="videos", title= ">> Página " + page , url=scrapedurl , folder=True) )
-
+        itemlist.append( Item(channel=__channel__, action="detail" , title=scrapedtitle , url=scrapedurl, thumbnail=scrapedthumbnail, folder=True, viewmode="movie"))
+		
     return itemlist
 
 # SECCION ENCARGADA DE VOLCAR EL LISTADO DE CATEGORIAS CON EL LINK CORRESPONDIENTE A CADA PAGINA
     
 def categorias(item):
-    logger.info("[xhamster.py] categorias")
+    logger.info("pelisalacarta.channels.xhamster categorias")
     itemlist = []
 
     itemlist.append( Item(channel=__channel__, action="lista" , title="Heterosexual", url="http://es.xhamster.com/channels.php"))
@@ -101,7 +74,7 @@ def categorias(item):
     return itemlist
 
 def votados(item):
-    logger.info("[xhamster.py] categorias")
+    logger.info("pelisalacarta.channels.xhamster categorias")
     itemlist = []
 
     itemlist.append( Item(channel=__channel__, action="videos" , title="Día", url="http://es.xhamster.com/rankings/daily-top-videos.html"))
@@ -111,7 +84,7 @@ def votados(item):
     return itemlist
 
 def lista(item):
-    logger.info("[xhamster.py] lista")
+    logger.info("pelisalacarta.channels.xhamster lista")
     itemlist = []
     data = scrapertools.downloadpageGzip(item.url)
     #data = data.replace("\n","")
@@ -137,7 +110,7 @@ def lista(item):
 
 # OBTIENE LOS ENLACES SEGUN LOS PATRONES DEL VIDEO Y LOS UNE CON EL SERVIDOR
 def detail(item):
-    logger.info("[xhamster.py] play")
+    logger.info("pelisalacarta.channels.xhamster play")
     itemlist = []
 
     data = scrapertools.cachePage(item.url)
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/yaske.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/yaske.py
index b9fd9418b81935d55f0b614d528022cec9151e7c..872dda012309f542c55da4f0e7dd9f95abcc9ca5 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/yaske.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/yaske.py
@@ -68,7 +68,7 @@ def search(item,texto):
         return []
 
 def peliculas(item):
-    logger.info("pelisalacarta.yaske listado")
+    logger.info("pelisalacarta.yaske peliculas")
 
     data = scrapertools.cache_page(item.url,headers=HEADER)
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;","",data)
@@ -101,12 +101,14 @@ def peliculas(item):
         title = scrapedtitle.strip()+" "+idiomas_disponibles+"["+calidad+"]"
         title = scrapertools.htmlclean(title)
 
+        contentTitle = scrapertools.htmlclean(scrapedtitle.strip())
+
         url = scrapedurl
 
         thumbnail = scrapedthumbnail
         scrapedplot = ""
 
-        itemlist.append( Item(channel=__channel__, action="findvideos", title=title , url=url , thumbnail=thumbnail , plot=scrapedplot , fulltitle=scrapertools.htmlclean(scrapedtitle.strip()), viewmode="movie", folder=True) )
+        itemlist.append( Item(channel=__channel__, action="findvideos", title=title , url=url , thumbnail=thumbnail , plot=scrapedplot , fulltitle=scrapertools.htmlclean(scrapedtitle.strip()), viewmode="movie", folder=True, hasContentDetails="true", contentTitle=contentTitle, contentThumbnail=thumbnail) )
 
     # Extrae el paginador
     patronvideos  = "<a href='([^']+)'>\&raquo\;</a>"
@@ -149,6 +151,10 @@ def findvideos(item):
     # Descarga la página
     data = scrapertools.cache_page(item.url,headers=HEADER)
 
+    item.plot = scrapertools.find_single_match(data,'<meta name="sinopsis" content="([^"]+)"')
+    item.plot = scrapertools.htmlclean(item.plot)
+    item.contentPlot = item.plot
+
     # Extrae las entradas
     '''
     <tr bgcolor="">
@@ -204,17 +210,16 @@ def findvideos(item):
                 url = "http://netu.tv/watch_video.php?v="+id_video
             '''
 
-            thumbnail = ""
-            plot = ""
-
             title = title.replace("&nbsp;","")
 
             if "es_es" in idioma:
-                scrapedtitle = title + " en "+server.strip()+" [Español]["+calidad+"]"
+                scrapedtitle = title + " en "+server.strip()+" [ESP]["+calidad+"]"
             elif "la_la" in idioma:
-                scrapedtitle = title + " en "+server.strip()+" [Latino]["+calidad+"]"
+                scrapedtitle = title + " en "+server.strip()+" [LAT]["+calidad+"]"
             elif "en_es" in idioma:
-                scrapedtitle = title + " en "+server.strip()+" [Inglés SUB Español]["+calidad+"]"
+                scrapedtitle = title + " en "+server.strip()+" [SUB]["+calidad+"]"
+            elif "en_en" in idioma:
+                scrapedtitle = title + " en "+server.strip()+" [ENG]["+calidad+"]"
             else:
                 scrapedtitle = title + " en "+server.strip()+" ["+idioma+" / "+subtitulos+"]["+calidad+"]"
             scrapedtitle = scrapertools.entityunescape(scrapedtitle)
@@ -222,10 +227,11 @@ def findvideos(item):
 
             scrapedurl = url
 
-            scrapedthumbnail = thumbnail
-            scrapedplot = plot
+            scrapedthumbnail = servertools.guess_server_thumbnail(scrapedtitle)
 
-            itemlist.append( Item(channel=__channel__, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , fulltitle=item.fulltitle , folder=False) )
+            logger.info("server="+server+", scrapedurl="+scrapedurl)
+            if scrapedurl.startswith("http"):
+                itemlist.append( Item(channel=__channel__, action="play", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , folder=False, parentContent=item) )
         except:
             import traceback
             logger.info("Excepcion: "+traceback.format_exc())
@@ -251,7 +257,7 @@ def play(item):
     data = urllib.unquote(data)
     logger.info("pelisalacarta.yaske play item.url="+data)
 
-    itemlist = servertools.find_video_items(data=data)
+    itemlist = servertools.find_video_items(item=item,data=data)
     for newitem in itemlist:
         newitem.fulltitle = item.fulltitle
     
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/zpeliculas.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/zpeliculas.py
index 0e19aa1594077573f442802e786da4027cc86483..f6be11441d4828570e56bf7069a9397c6e55ede7 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/zpeliculas.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channels/zpeliculas.py
@@ -27,54 +27,55 @@ def mainlist(item):
     logger.info("pelisalacarta.channels.zpeliculas mainlist")
 
     itemlist = []
-    itemlist.append( Item(channel=__channel__, action="destacadas"        , title="Destacadas", url="http://www.zpeliculas.com", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Últimas peliculas", url="http://www.zpeliculas.com/", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
-    itemlist.append( Item(channel=__channel__, action="sugeridas"        , title="Películas sugeridas", url="http://www.zpeliculas.com", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
-    itemlist.append( Item(channel=__channel__, action="generos"        , title="Por género", url="http://www.zpeliculas.com", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
-    itemlist.append( Item(channel=__channel__, action="alfabetico"   , title="Listado alfabético", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
-    itemlist.append( Item(channel=__channel__, action="search"        , title="Buscador", url="http://www.zpeliculas.com", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
-    
+    itemlist.append( Item(channel=__channel__, action="destacadas" , title="Destacadas", url="http://www.zpeliculas.com", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
+    itemlist.append( Item(channel=__channel__, action="peliculas"  , title="Últimas peliculas", url="http://www.zpeliculas.com/", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
+    itemlist.append( Item(channel=__channel__, action="sugeridas"  , title="Películas sugeridas", url="http://www.zpeliculas.com", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
+    itemlist.append( Item(channel=__channel__, action="generos"    , title="Por género", url="http://www.zpeliculas.com", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
+    itemlist.append( Item(channel=__channel__, action="alfabetico" , title="Listado alfabético", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
+    itemlist.append( Item(channel=__channel__, action="search"     , title="Buscador", url="http://www.zpeliculas.com", fanart="http://www.zpeliculas.com/templates/mytopV2/images/background.png"))
+
     return itemlist
 
 def alfabetico(item):
     logger.info("pelisalacarta.channels.zpeliculas alfabetico")
+
     itemlist = []
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="A", url="http://www.zpeliculas.com/cat/a"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="B", url="http://www.zpeliculas.com/cat/b"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="C", url="http://www.zpeliculas.com/cat/c"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="D", url="http://www.zpeliculas.com/cat/d"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="E", url="http://www.zpeliculas.com/cat/e"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="F", url="http://www.zpeliculas.com/cat/f"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="G", url="http://www.zpeliculas.com/cat/g"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="H", url="http://www.zpeliculas.com/cat/h"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="I", url="http://www.zpeliculas.com/cat/i"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="J", url="http://www.zpeliculas.com/cat/j"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="K", url="http://www.zpeliculas.com/cat/k"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="L", url="http://www.zpeliculas.com/cat/l"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="M", url="http://www.zpeliculas.com/cat/m"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="N", url="http://www.zpeliculas.com/cat/n"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="O", url="http://www.zpeliculas.com/cat/o"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="P", url="http://www.zpeliculas.com/cat/p"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Q", url="http://www.zpeliculas.com/cat/q"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="R", url="http://www.zpeliculas.com/cat/r"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="S", url="http://www.zpeliculas.com/cat/s"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="T", url="http://www.zpeliculas.com/cat/t"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="U", url="http://www.zpeliculas.com/cat/u"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="V", url="http://www.zpeliculas.com/cat/v"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="W", url="http://www.zpeliculas.com/cat/w"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="X", url="http://www.zpeliculas.com/cat/x"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Y", url="http://www.zpeliculas.com/cat/y"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Z", url="http://www.zpeliculas.com/cat/z"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="0", url="http://www.zpeliculas.com/cat/0"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="1", url="http://www.zpeliculas.com/cat/1"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="2", url="http://www.zpeliculas.com/cat/2"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="3", url="http://www.zpeliculas.com/cat/3"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="4", url="http://www.zpeliculas.com/cat/4"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="5", url="http://www.zpeliculas.com/cat/5"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="6", url="http://www.zpeliculas.com/cat/6"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="7", url="http://www.zpeliculas.com/cat/7"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="8", url="http://www.zpeliculas.com/cat/8"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="9", url="http://www.zpeliculas.com/cat/9"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="A", url="http://www.zpeliculas.com/cat/a"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="B", url="http://www.zpeliculas.com/cat/b"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="C", url="http://www.zpeliculas.com/cat/c"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="D", url="http://www.zpeliculas.com/cat/d"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="E", url="http://www.zpeliculas.com/cat/e"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="F", url="http://www.zpeliculas.com/cat/f"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="G", url="http://www.zpeliculas.com/cat/g"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="H", url="http://www.zpeliculas.com/cat/h"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="I", url="http://www.zpeliculas.com/cat/i"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="J", url="http://www.zpeliculas.com/cat/j"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="K", url="http://www.zpeliculas.com/cat/k"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="L", url="http://www.zpeliculas.com/cat/l"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="M", url="http://www.zpeliculas.com/cat/m"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="N", url="http://www.zpeliculas.com/cat/n"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="O", url="http://www.zpeliculas.com/cat/o"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="P", url="http://www.zpeliculas.com/cat/p"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Q", url="http://www.zpeliculas.com/cat/q"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="R", url="http://www.zpeliculas.com/cat/r"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="S", url="http://www.zpeliculas.com/cat/s"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="T", url="http://www.zpeliculas.com/cat/t"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="U", url="http://www.zpeliculas.com/cat/u"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="V", url="http://www.zpeliculas.com/cat/v"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="W", url="http://www.zpeliculas.com/cat/w"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="X", url="http://www.zpeliculas.com/cat/x"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Y", url="http://www.zpeliculas.com/cat/y"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Z", url="http://www.zpeliculas.com/cat/z"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="0", url="http://www.zpeliculas.com/cat/0"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="1", url="http://www.zpeliculas.com/cat/1"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="2", url="http://www.zpeliculas.com/cat/2"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="3", url="http://www.zpeliculas.com/cat/3"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="4", url="http://www.zpeliculas.com/cat/4"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="5", url="http://www.zpeliculas.com/cat/5"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="6", url="http://www.zpeliculas.com/cat/6"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="7", url="http://www.zpeliculas.com/cat/7"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="8", url="http://www.zpeliculas.com/cat/8"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="9", url="http://www.zpeliculas.com/cat/9"))
 
     return itemlist
     
@@ -83,27 +84,26 @@ def generos(item):
     logger.info("pelisalacarta.channels.zpeliculas generos")
 
     itemlist = []
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Acción", url="http://www.zpeliculas.com/peliculas/p-accion/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Animación", url="http://www.zpeliculas.com/peliculas/p-animacion/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Aventura", url="http://www.zpeliculas.com/peliculas/p-aventura/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Biografía", url="http://www.zpeliculas.com/peliculas/p-biografia/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Bélico", url="http://www.zpeliculas.com/peliculas/p-belico/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Ciencia Ficción", url="http://www.zpeliculas.com/peliculas/p-cienciaficcion/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Comedia", url="http://www.zpeliculas.com/peliculas/p-comedia/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Crimen", url="http://www.zpeliculas.com/peliculas/p-crimen/"))  
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Drama", url="http://www.zpeliculas.com/peliculas/p-drama/"))	
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Fantasía", url="http://www.zpeliculas.com/peliculas/p-fantasia/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Histórico", url="http://www.zpeliculas.com/peliculas/p-historico/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Intriga", url="http://www.zpeliculas.com/peliculas/p-intriga/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Musical", url="http://www.zpeliculas.com/peliculas/p-musical/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Romántica", url="http://www.zpeliculas.com/peliculas/p-romantica/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Terror", url="http://www.zpeliculas.com/peliculas/p-terror/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Thriller", url="http://www.zpeliculas.com/peliculas/p-thriller/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Western", url="http://www.zpeliculas.com/peliculas/p-western/"))
-    itemlist.append( Item(channel=__channel__, action="peliculas"        , title="Otros", url="http://www.zpeliculas.com/peliculas/p-otros/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Acción", url="http://www.zpeliculas.com/peliculas/p-accion/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Animación", url="http://www.zpeliculas.com/peliculas/p-animacion/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Aventura", url="http://www.zpeliculas.com/peliculas/p-aventura/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Biografía", url="http://www.zpeliculas.com/peliculas/p-biografia/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Bélico", url="http://www.zpeliculas.com/peliculas/p-belico/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Ciencia Ficción", url="http://www.zpeliculas.com/peliculas/p-cienciaficcion/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Comedia", url="http://www.zpeliculas.com/peliculas/p-comedia/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Crimen", url="http://www.zpeliculas.com/peliculas/p-crimen/"))  
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Drama", url="http://www.zpeliculas.com/peliculas/p-drama/"))	
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Fantasía", url="http://www.zpeliculas.com/peliculas/p-fantasia/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Histórico", url="http://www.zpeliculas.com/peliculas/p-historico/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Intriga", url="http://www.zpeliculas.com/peliculas/p-intriga/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Musical", url="http://www.zpeliculas.com/peliculas/p-musical/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Romántica", url="http://www.zpeliculas.com/peliculas/p-romantica/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Terror", url="http://www.zpeliculas.com/peliculas/p-terror/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Thriller", url="http://www.zpeliculas.com/peliculas/p-thriller/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Western", url="http://www.zpeliculas.com/peliculas/p-western/"))
+    itemlist.append( Item(channel=__channel__, action="peliculas" , title="Otros", url="http://www.zpeliculas.com/peliculas/p-otros/"))
     return itemlist
 
-
 def search(item,texto):
 
     post = urllib.urlencode({"story": texto, "do": "search", "subaction": "search", "x": "0", "y": "0"})
@@ -126,7 +126,7 @@ def search(item,texto):
         thumbnail = scrapedthumbnail
         plot = ""
         if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
-        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, show=title, viewmode="movie", fanart=thumbnail))
+        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, show=title, viewmode="movie", fanart=thumbnail, hasContentDetails="true", contentTitle=title, contentThumbnail=thumbnail))
 
     return itemlist
 
@@ -162,10 +162,7 @@ def peliculas(item):
     <div style="float:right">
     '''
     patron  = '<div class="leftpane">(.*?)<div style="float\:right">'
-    #<a href="(.*?)"><img src="(.*?)".*?alt="(.*?)".*?<div class="shortname">.*?</div>.*?<div.*?>(.*?)</div>.*?<div class="rightpane">.*?<div class="year" title="A&ntilde;o">(.*?)<.*?"Idioma">(.*?)</div>'
-
     matches = re.compile(patron,re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
 
     itemlist = []
     
@@ -178,14 +175,15 @@ def peliculas(item):
         scrapedidioma = scrapertools.find_single_match(match,'<div class="year[^>]+>[^<]+</div[^<]+<div class[^>]+>([^<]+)')
         
         title = scrapedtitle
-        logger.info("title="+scrapedtitle)
+        #logger.info("title="+scrapedtitle)
         title = title + ' ('+scrapedyear+') ['+scrapedidioma+'] ['+scrapedcalidad+']'
+        title = scrapertools.htmlclean(title)
         url = scrapedurl
         thumbnail = scrapedthumbnail
         plot = ""
         if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
         
-        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, show=title, viewmode="movie", fanart=thumbnail))
+        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, hasContentDetails="true", contentTitle=title, contentThumbnail=thumbnail, viewmode="movie", fanart=thumbnail))
 
     next_page = scrapertools.find_single_match(body,'<a href="([^"]+)">Siguiente')
     if next_page!="":
@@ -218,13 +216,14 @@ def destacadas(item):
         
         logger.info("title="+scrapedtitle)
         title = scrapedtitle
+        title = scrapertools.htmlclean(title)
         url = "http://www.zpeliculas.com" + scrapedurl
         thumbnail = scrapedthumbnail
         plot = ""
         plot = unicode( plot, "iso-8859-1" , errors="replace" ).encode("utf-8")
         if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
         
-        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, show=title, viewmode="movie", fanart=thumbnail))
+        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, show=title, viewmode="movie", fanart=thumbnail, hasContentDetails="true", contentTitle=title, contentThumbnail=thumbnail))
         
     return itemlist
 
@@ -248,12 +247,24 @@ def sugeridas(item):
         
         logger.info("title="+scrapedtitle)
         title = scrapedtitle
+        title = scrapertools.htmlclean(title)
         url = "http://www.zpeliculas.com" + scrapedurl
         thumbnail = scrapedthumbnail
         plot = ""
         plot = unicode( plot, "iso-8859-1" , errors="replace" ).encode("utf-8")
         if (DEBUG): logger.info("title=["+title+"], url=["+url+"], thumbnail=["+thumbnail+"]")
         
-        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, show=title, viewmode="movie", fanart=thumbnail))
+        itemlist.append( Item(channel=__channel__, action="findvideos" , title=title , url=url, thumbnail=thumbnail, plot=plot, show=title, viewmode="movie", fanart=thumbnail, hasContentDetails="true", contentTitle=title, contentThumbnail=thumbnail))
         
-    return itemlist
\ No newline at end of file
+    return itemlist
+
+def findvideos(item):
+    logger.info("pelisalacarta.channels.zpeliculas findvideos item="+item.tostring())
+
+    # Descarga la página para obtener el argumento
+    data = scrapertools.cachePage(item.url)
+    item.plot = scrapertools.find_single_match(data,'<div class="contenttext">([^<]+)<').strip()
+    item.contentPlot = item.plot
+    logger.info("pelisalacarta.channels.zpeliculas findvideos plot="+item.plot)
+
+    return servertools.find_video_items(item=item,data=data)
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channelselector.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channelselector.py
index 6fae0e0d6313b391bb13cac18585380cd2a186e7..51f5f2654d07c81a032c52d1e92058e520af8b7d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channelselector.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/channelselector.py
@@ -1,9 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 #------------------------------------------------------------
 # pelisalacarta - XBMC Plugin
 # http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
 #------------------------------------------------------------
-import urlparse,urllib2,urllib,re
+import urlparse
 import os
 import sys
 import traceback
@@ -126,12 +126,26 @@ def getchanneltypes(preferred_thumb=""):
 
     # Ahora construye el itemlist ordenadamente
     itemlist = []
-    itemlist.append( Item( title=config.get_localized_string(30121) , channel="channelselector" , action="listchannels" , category="all"         , thumbnail=urlparse.urljoin(get_thumbnail_path(preferred_thumb),"thumb_canales_todos.png")))
+
+    dict_cat_lang = {'movie': config.get_localized_string(30122), 'serie': config.get_localized_string(30123),
+                     'anime': config.get_localized_string(30124), 'documentary': config.get_localized_string(30125),
+                     'vos': config.get_localized_string(30136), 'adult': config.get_localized_string(30126),
+                     'latino': config.get_localized_string(30127)}
+
+    itemlist.append(Item(title=config.get_localized_string(30121), channel="channelselector", action="listchannels",
+                         category="all", thumbnail=urlparse.urljoin(get_thumbnail_path(preferred_thumb),
+                                                                    "thumb_canales_todos.png")))
     logger.info("channelselector.getchanneltypes Ordenados:")
     for channel_type in valid_types:
         logger.info("channelselector.getchanneltypes channel_type="+channel_type)
         if channel_type in channel_types:
-            itemlist.append( Item( title=channel_type , channel="channelselector" , action="listchannels" , category=channel_type , thumbnail=urlparse.urljoin(get_thumbnail_path(preferred_thumb),"thumb_canales_"+channel_type+".png")))
+            title = channel_type
+            if channel_type in dict_cat_lang:
+                title = dict_cat_lang[channel_type]
+
+            itemlist.append(Item(title=title, channel="channelselector", action="listchannels", category=channel_type,
+                                 thumbnail=urlparse.urljoin(get_thumbnail_path(preferred_thumb),
+                                                            "thumb_canales_"+channel_type+".png")))
 
     return itemlist
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/__init__.pyo
deleted file mode 100644
index a48246d9b1887eefb860c48cd87eee532933d0be..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/channeltools.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/channeltools.pyo
deleted file mode 100644
index 2440bd477a9678851e196da4ec2c36cf983d119f..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/channeltools.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/config.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/config.pyo
deleted file mode 100644
index 60d4cf8f131d7e1ec97037b53bc947ff487295b6..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/config.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/downloadtools.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/downloadtools.pyo
deleted file mode 100644
index 6bb9cb96b66c48e16c10c0282d65f8846150c878..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/downloadtools.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/item.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/item.py
index 98090f289062ccbcc0fd226126d800fa9250f0f4..c4ca288fb59660f20ac3553e5c90d67d4076ab35 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/item.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/item.py
@@ -1,92 +1,169 @@
-class Item(object):
-    channel = ""
-    title = ""
-    url = ""
-    page = ""
-    thumbnail = ""
-    plot = ""
-    duration = ""
-    fanart = ""
-    folder = ""
-    action = ""
-    server = "directo"
-    extra = ""
-    show = ""
-    category = ""
-    childcount = 0
-    language = ""
-    type = ""
-    context = ""
-    subtitle = ""
-    totalItems =0
-    overlay = None
-    password = ""
-    fulltitle = ""
-    viewmode = "list"
-
-    def __init__(self, channel="", title="", url="", page="", thumbnail="", plot="", duration="", fanart="", action="", server="directo", extra="", show="", category = "" , language = "" , subtitle="" , folder=True, context = "",totalItems = 0, overlay = None, type="", password="", fulltitle="", viewmode="list" ):
-        self.channel = channel
-        self.title = title
-        self.url = url
-        if page=="":
-            self.page = url
-        else:
-            self.page = page
-        self.thumbnail = thumbnail
-        self.plot = plot
-        self.duration = duration
-        self.fanart = fanart
-        self.folder = folder
-        self.server = server
-        self.action = action
-        self.extra = extra
-        self.show = show
-        self.category = category
-        self.childcount = 0
-        self.language = language
-        self.type = type
-        self.context = context
-        self.subtitle = subtitle
-        self.totalItems = totalItems
-        self.overlay = overlay
-        self.password = password
-        self.fulltitle = fulltitle
-        self.viewmode = viewmode
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+# pelisalacarta - XBMC Plugin
+# Item
+# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
+#------------------------------------------------------------
+import json
+import base64
+import urllib
+import copy
+
+class Item(object):  
+
+    def __contains__(self, m):
+        return m in self.__dict__
+        
+    def __init__(self,  **kwargs):     
+        #Campos por defecto de la clase Item
+        kwargs.setdefault("channel", "")            #Canal en el que se ejecuta
+        kwargs.setdefault("action", "")             #funcion que ejecutará en el canal
+        kwargs.setdefault("title", "")              #Nombre para mostrar y nombre de la pelicula
+        kwargs.setdefault("fulltitle", "")          #Titulo de la pelicula en caso de ser distinto al del campo "title"
+        kwargs.setdefault("show", "")               #Nombre de la serie
+        kwargs.setdefault("plot", "")               #Descripción
+        kwargs.setdefault("url", "")                #Url
+        kwargs.setdefault("thumbnail", "")          #Imagen
+        kwargs.setdefault("fanart", "")             #Imagen de Fondo
+        kwargs.setdefault("password", "")           #Password del video
+
+        kwargs.setdefault("folder", True)           #Carpeta o vídeo
+        kwargs.setdefault("server", "directo")      #Servidor que contiene el vídeo
+        kwargs.setdefault("extra", "")              #Datos extra
+        
+        kwargs.setdefault("language", "")           #Idioma del contenido
+        kwargs.setdefault("context", "")            #Items para el Menú Contextual
+        kwargs.setdefault("subtitle", "")           #Subtitulos
+        kwargs.setdefault("duration", 0)            #Duracion de la pelicula
+        kwargs.setdefault("category", "")           #Categoria de la pelicula
+        
+        kwargs.setdefault("viewmode", "list")       #Modo de ventana
+
+        kwargs.setdefault("hasContentDetails", "false")
+
+        kwargs.setdefault("contentChannel", "list") # En qué canal estaba el contenido
+        kwargs.setdefault("contentTitle","")
+        kwargs.setdefault("contentThumbnail","")
+        kwargs.setdefault("contentPlot","")
+        kwargs.setdefault("contentType","")
+        kwargs.setdefault("contentSerieName","")
+        kwargs.setdefault("contentSeason","")
+        kwargs.setdefault("contentEpisodeNumber","")
+        kwargs.setdefault("contentEpisodeTitle","")
+
+        self.__dict__.update(kwargs)
+        self.__dict__ = self.toutf8(self.__dict__)
+
+        if kwargs.has_key("parentContent") and kwargs["parentContent"] is not None:
+
+            print "Tiene parentContent: "+repr(kwargs["parentContent"])
+            parentContent = kwargs["parentContent"]
+            self.contentChannel = parentContent.contentChannel;
+            self.contentTitle = parentContent.contentTitle;
+            self.contentThumbnail = parentContent.contentThumbnail;
+            self.contentPlot = parentContent.contentPlot;
+
+            self.hasContentDetails = parentContent.hasContentDetails;
+            self.contentType = parentContent.contentType;
+            self.contentSerieName = parentContent.contentSerieName;
+            self.contentSeason = parentContent.contentSeason;
+            self.contentEpisodeNumber = parentContent.contentEpisodeNumber;
+            self.contentEpisodeTitle = parentContent.contentEpisodeTitle;
 
     def tostring(self):
-        return "title=["+self.title+"], url=["+self.url+"], thumbnail=["+self.thumbnail+"], action=["+self.action+"], show=["+self.show+"], category=["+self.category+"]"
-    
-    def serialize(self):
-        separator = "|>|<|"
-        devuelve = ""
-        devuelve = devuelve + self.title + separator
-        devuelve = devuelve + self.url + separator
-        devuelve = devuelve + self.channel + separator
-        devuelve = devuelve + self.action + separator
-        devuelve = devuelve + self.server + separator
-        devuelve = devuelve + self.extra + separator
-        devuelve = devuelve + self.category + separator
-        devuelve = devuelve + self.fulltitle + separator
-        devuelve = devuelve + self.viewmode + separator
-        return devuelve
-    
-    def deserialize(self,cadena):
-        trozos=cadena.split("|>|<|")
-        self.title = trozos[0]
-        self.url = trozos[1]
-        self.channel = trozos[2]
-        self.action = trozos[3]
-        self.server = trozos[4]
-        self.extra = trozos[5]
-        self.category = trozos[6]
-        self.fulltitle = trozos[7]
-        self.viewmode = trozos[8]
-
-if __name__ == "__main__":
-    item = Item(title="bla b", url="http://bla")
-    cadena=item.serialize()
-    print cadena
-    
-    item2 = Item()
-    item2.deserialize(cadena)
-    print item2.title,item2.url
+        '''
+        Genera una cadena de texto con los datos del item para el log
+        Uso: logger.info(item.tostring())
+        '''
+        return ", ".join([var + "=["+str(self.__dict__[var])+"]" for var in sorted(self.__dict__)])        
+        
+
+    def tourl(self):
+        '''
+        Genera una cadena de texto con los datos del item para crear una url, para volver generar el Item usar item.fromurl()
+        Uso: url = item.tourl()
+        '''
+        return urllib.quote(base64.b64encode(json.dumps(self.__dict__)))
+              
+
+    def fromurl(self,url): 
+        '''
+        Genera un item a partir de la cadena de texto creada por la funcion tourl()
+        Uso: item.fromurl("cadena")
+        '''
+        STRItem = base64.b64decode(urllib.unquote(url))
+        JSONItem = json.loads(STRItem,object_hook=self.toutf8)
+        self.__dict__.update(JSONItem)
+        return self
+
+
+    def tojson(self, path=""):
+        '''
+        Crea un JSON a partir del item, para guardar archivos de favoritos, lista de descargas, etc...
+        Si se especifica un path, te lo guarda en la ruta especificada, si no, devuelve la cadena json
+        Usos: item.tojson(path="ruta\archivo\json.json")
+              file.write(item.tojson())
+        '''      
+        if path:
+          open(path,"wb").write(json.dumps(self.__dict__, indent=4, sort_keys=True))
+        else:
+          return json.dumps(self.__dict__, indent=4, sort_keys=True)
+              
+
+    def fromjson(self,STRItem={}, path=""): 
+        '''
+        Genera un item a partir de un archivo JSON
+        Si se especifica un path, lee directamente el archivo, si no, lee la cadena de texto pasada.
+        Usos: item = Item().fromjson(path="ruta\archivo\json.json")
+              item = Item().fromjson("Cadena de texto json")
+        '''
+        if path:
+          if os.path.exists(path):
+            STRItem = open(path,"rb").read()
+          else:
+            STRItem = {}
+            
+        JSONItem = json.loads(STRItem,object_hook=self.toutf8)
+        self.__dict__.update(JSONItem)
+        return self
+          
+        
+    def clone(self,**kwargs):
+        '''
+        Genera un nuevo item clonando el item actual
+        Usos: NuevoItem = item.clone()
+              NuevoItem = item.clone(title="Nuevo Titulo", action = "Nueva Accion")
+        '''
+        newitem = copy.deepcopy(self)
+        newitem.__dict__.update(kwargs)
+        newitem.__dict__ = newitem.toutf8(newitem.__dict__)
+        return newitem
+      
+
+    def toutf8(self, *args):
+        if len(args)>0:  value = args[0]
+        else: value = self.__dict__
+        
+        if type(value)== unicode:
+            return value.encode("utf8")
+          
+        elif type(value)== str:
+            return unicode(value,"utf8", "ignore").encode("utf8")
+          
+        elif type(value)== list:
+            for x, key in enumerate(value):
+                value[x] = self.toutf8(value[x])
+            return value
+          
+        elif type(value)== dict:
+            newdct = {}
+            for key in value:
+                if type(key) == unicode:
+                    key = key.encode("utf8")
+                  
+                newdct[key] = self.toutf8(value[key])
+
+            if len(args)>0: return newdct
+        
+        else:
+            return value
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/item.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/item.pyo
deleted file mode 100644
index 760e1b53943198fc839cf7e917fc0fc157e7dce7..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/item.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/jsunpack.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/jsunpack.py
index c9ff769759948d849492aa49832ebd2fb215f347..629f1b4370a35a891d1923c2abb2deafacb02a37 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/jsunpack.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/jsunpack.py
@@ -1,139 +1,109 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2013 Bstrdsmkr
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    Adapted for use in xbmc from:
-    https://github.com/einars/js-beautify/blob/master/python/jsbeautifier/unpackers/packer.py
-    
-    usage:
-
-    if detect(some_string):
-        unpacked = unpack(some_string)
-
-
-Unpacker for Dean Edward's p.a.c.k.e.r
-"""
-
-import re
-import string
-import logger
-
-def detect(source):
-    """Detects whether `source` is P.A.C.K.E.R. coded."""
-    return source.replace(' ', '').startswith('eval(function(p,a,c,k,e,')
-
-def unpack(source):
-    """Unpacks P.A.C.K.E.R. packed js code."""
-    payload, symtab, radix, count = _filterargs(source)
-    logger.info("payload="+repr(payload))
-    logger.info("symtab="+repr(symtab))
-    logger.info("radix="+repr(radix))
-    logger.info("count="+repr(count))
-
-    if count != len(symtab):
-        raise UnpackingError('Malformed p.a.c.k.e.r. symtab.')
-
-    try:
-        unbase = Unbaser(radix)
-    except TypeError:
-        raise UnpackingError('Unknown p.a.c.k.e.r. encoding.')
-
-    def lookup(match):
-        """Look up symbols in the synthetic symtab."""
-        word  = match.group(0)
-        return symtab[unbase(word)] or word
-
-    source = re.sub(r'\b\w+\b', lookup, payload)
-    return _replacestrings(source)
-
-def _filterargs(source):
-    """Juice from a source file the four args needed by decoder."""
-    juicers = [ (r"}\('(.*)', *(\d+), *(\d+), *'(.*)'\.split\('\|'\), *(\d+), *(.*)\)\)"),
-                (r"}\('(.*)', *(\d+), *(\d+), *'(.*)'\.split\('\|'\)"),
-              ]
-    for juicer in juicers:
-        args = re.search(juicer, source, re.DOTALL)
-        if args:
-            a = args.groups()
-            try:
-                return a[0], a[3].split('|'), int(a[1]), int(a[2])
-            except ValueError:
-                raise UnpackingError('Corrupted p.a.c.k.e.r. data.')
-
-    # could not find a satisfying regex
-    raise UnpackingError('Could not make sense of p.a.c.k.e.r data (unexpected code structure)')
-
-def _replacestrings(source):
-    """Strip string lookup table (list) and replace values in source."""
-    match = re.search(r'var *(_\w+)\=\["(.*?)"\];', source, re.DOTALL)
-
-    if match:
-        varname, strings = match.groups()
-        startpoint = len(match.group(0))
-        lookup = strings.split('","')
-        variable = '%s[%%d]' % varname
-        for index, value in enumerate(lookup):
-            source = source.replace(variable % index, '"%s"' % value)
-        return source[startpoint:]
-    return source
-
-
-class Unbaser(object):
-    """Functor for a given base. Will efficiently convert
-    strings to natural numbers."""
-    ALPHABET  = {
-        62 : '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
-        95 : (' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-              '[\]^_`abcdefghijklmnopqrstuvwxyz{|}~')
-    }
-
-    def __init__(self, base):
-        self.base = base
-
-        # If base can be handled by int() builtin, let it do it for us
-        if 2 <= base <= 36:
-            self.unbase = lambda string: int(string, base)
-        else:
-            # Build conversion dictionary cache
-            try:
-                self.dictionary = dict((cipher, index) for
-                    index, cipher in enumerate(self.ALPHABET[base]))
-
-                print "self.dictionary=", self.dictionary
-
-            except KeyError:
-                raise TypeError('Unsupported base encoding.')
-
-            self.unbase = self._dictunbaser
-
-    def __call__(self, string):
-        return self.unbase(string)
-
-    def _dictunbaser(self, string):
-        """Decodes a  value to an integer."""
-        ret = 0
-        for index, cipher in enumerate(string[::-1]):
-            ret += (self.base ** index) * self.dictionary[cipher]
-        return ret
-
-class UnpackingError(Exception):
-    """Badly packed source or general error. Argument is a
-    meaningful description."""
-    pass
-
-if __name__ == "__main__":
-    test='''eval(function(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}('4(\'30\').2z({2y:\'5://a.8.7/i/z/y/w.2x\',2w:{b:\'2v\',19:\'<p><u><2 d="20" c="#17">2u 19.</2></u><16/><u><2 d="18" c="#15">2t 2s 2r 2q.</2></u></p>\',2p:\'<p><u><2 d="20" c="#17">2o 2n b.</2></u><16/><u><2 d="18" c="#15">2m 2l 2k 2j.</2></u></p>\',},2i:\'2h\',2g:[{14:"11",b:"5://a.8.7/2f/13.12"},{14:"2e",b:"5://a.8.7/2d/13.12"},],2c:"11",2b:[{10:\'2a\',29:\'5://v.8.7/t-m/m.28\'},{10:\'27\'}],26:{\'25-3\':{\'24\':{\'23\':22,\'21\':\'5://a.8.7/i/z/y/\',\'1z\':\'w\',\'1y\':\'1x\'}}},s:\'5://v.8.7/t-m/s/1w.1v\',1u:"1t",1s:"1r",1q:\'1p\',1o:"1n",1m:"1l",1k:\'5\',1j:\'o\',});l e;l k=0;l 6=0;4().1i(9(x){f(6>0)k+=x.r-6;6=x.r;f(q!=0&&k>=q){6=-1;4().1h();4().1g(o);$(\'#1f\').j();$(\'h.g\').j()}});4().1e(9(x){6=-1});4().1d(9(x){n(x)});4().1c(9(){$(\'h.g\').j()});9 n(x){$(\'h.g\').1b();f(e)1a;e=1;}',36,109,'||font||jwplayer|http|p0102895|me|vidto|function|edge3|file|color|size|vvplay|if|video_ad|div||show|tt102895|var|player|doPlay|false||21600|position|skin|test||static|1y7okrqkv4ji||00020|01|type|360p|mp4|video|label|FFFFFF|br|FF0000||deleted|return|hide|onComplete|onPlay|onSeek|play_limit_box|setFullscreen|stop|onTime|dock|provider|391|height|650|width|over|controlbar|5110|duration|uniform|stretching|zip|stormtrooper|213|frequency|prefix||path|true|enabled|preview|timeslidertooltipplugin|plugins|html5|swf|src|flash|modes|hd_default|3bjhohfxpiqwws4phvqtsnolxocychumk274dsnkblz6sfgq6uz6zt77gxia|240p|3bjhohfxpiqwws4phvqtsnolxocychumk274dsnkba36sfgq6uzy3tv2oidq|hd|original|ratio|broken|is|link|Your|such|No|nofile|more|any|availabe|Not|File|OK|previw|jpg|image|setup|flvplayer'.split('|')))'''
-    print unpack(test)
+"""
+    urlresolver XBMC Addon
+    Copyright (C) 2013 Bstrdsmkr
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    Adapted for use in xbmc from:
+    https://github.com/einars/js-beautify/blob/master/python/jsbeautifier/unpackers/packer.py
+    
+    usage:
+    if detect(some_string):
+        unpacked = unpack(some_string)
+Unpacker for Dean Edward's p.a.c.k.e.r
+"""
+import re
+def detect(source):
+    """Detects whether `source` is P.A.C.K.E.R. coded."""
+    source = source.replace(' ', '')
+    if re.search('eval\(function\(p,a,c,k,e,(?:r|d)', source):
+        return True
+    else:
+        return False
+def unpack(source):
+    """Unpacks P.A.C.K.E.R. packed js code."""
+    payload, symtab, radix, count = _filterargs(source)
+    if count != len(symtab):
+        raise UnpackingError('Malformed p.a.c.k.e.r. symtab.')
+    try:
+        unbase = Unbaser(radix)
+    except TypeError:
+        raise UnpackingError('Unknown p.a.c.k.e.r. encoding.')
+    def lookup(match):
+        """Look up symbols in the synthetic symtab."""
+        word = match.group(0)
+        return symtab[unbase(word)] or word
+    source = re.sub(r'\b\w+\b', lookup, payload)
+    return _replacestrings(source)
+def _filterargs(source):
+    """Juice from a source file the four args needed by decoder."""
+    juicers = [(r"}\('(.*)', *(\d+), *(\d+), *'(.*)'\.split\('\|'\), *(\d+), *(.*)\)\)"),
+               (r"}\('(.*)', *(\d+), *(\d+), *'(.*)'\.split\('\|'\)"),
+               ]
+    for juicer in juicers:
+        args = re.search(juicer, source, re.DOTALL)
+        if args:
+            a = args.groups()
+            try:
+                return a[0], a[3].split('|'), int(a[1]), int(a[2])
+            except ValueError:
+                raise UnpackingError('Corrupted p.a.c.k.e.r. data.')
+    # could not find a satisfying regex
+    raise UnpackingError('Could not make sense of p.a.c.k.e.r data (unexpected code structure)')
+def _replacestrings(source):
+    """Strip string lookup table (list) and replace values in source."""
+    match = re.search(r'var *(_\w+)\=\["(.*?)"\];', source, re.DOTALL)
+    if match:
+        varname, strings = match.groups()
+        startpoint = len(match.group(0))
+        lookup = strings.split('","')
+        variable = '%s[%%d]' % varname
+        for index, value in enumerate(lookup):
+            source = source.replace(variable % index, '"%s"' % value)
+        return source[startpoint:]
+    return source
+class Unbaser(object):
+    """Functor for a given base. Will efficiently convert
+    strings to natural numbers."""
+    ALPHABET = {
+        62: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
+        95: (' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+             '[\]^_`abcdefghijklmnopqrstuvwxyz{|}~')
+    }
+    def __init__(self, base):
+        self.base = base
+        # If base can be handled by int() builtin, let it do it for us
+        if 2 <= base <= 36:
+            self.unbase = lambda string: int(string, base)
+        else:
+            if base < 62:
+                self.ALPHABET[base] = self.ALPHABET[62][0:base]
+            elif 62 < base < 95:
+                self.ALPHABET[base] = self.ALPHABET[95][0:base]
+            # Build conversion dictionary cache
+            try:
+                self.dictionary = dict((cipher, index) for index, cipher in enumerate(self.ALPHABET[base]))
+            except KeyError:
+                raise TypeError('Unsupported base encoding.')
+            self.unbase = self._dictunbaser
+    def __call__(self, string):
+        return self.unbase(string)
+    def _dictunbaser(self, string):
+        """Decodes a  value to an integer."""
+        ret = 0
+        for index, cipher in enumerate(string[::-1]):
+            ret += (self.base ** index) * self.dictionary[cipher]
+        return ret
+
+
+class UnpackingError(Exception):
+    """Badly packed source or general error. Argument is a
+    meaningful description."""
+    pass
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/logger.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/logger.pyo
deleted file mode 100644
index 7e0665948f14a247990d7a66af5185f3d2600fb5..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/logger.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/scrapertools.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/scrapertools.py
index 9818493eb4977ceb4122a3072abaa9dea8ead87c..a6a3deb48d915ac2f695edf03d477e8ef940d5da 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/scrapertools.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/scrapertools.py
@@ -35,12 +35,14 @@ CACHE_NUNCA = "2"   # No cachear nada
 
 CACHE_PATH = config.get_setting("cache.dir")
 
+DEFAULT_TIMEOUT = 20
+
 DEBUG = False
 
-def cache_page(url,post=None,headers=[['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']],modo_cache=CACHE_ACTIVA, timeout=socket.getdefaulttimeout()):
+def cache_page(url,post=None,headers=[['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']],modo_cache=CACHE_ACTIVA, timeout=DEFAULT_TIMEOUT):
     return cachePage(url,post,headers,modo_cache,timeout=timeout)
 
-def cachePage(url,post=None,headers=[['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']],modoCache=CACHE_ACTIVA, timeout=socket.getdefaulttimeout()):
+def cachePage(url,post=None,headers=[['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']],modoCache=CACHE_ACTIVA, timeout=DEFAULT_TIMEOUT):
     logger.info("pelisalacarta.core.scrapertools cachePage url="+url)
 
     # Cache desactivada
@@ -304,7 +306,7 @@ class NoRedirectHandler(urllib2.HTTPRedirectHandler):
     http_error_303 = http_error_302
     http_error_307 = http_error_302
 
-def downloadpage(url,post=None,headers=[['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']],follow_redirects=True, timeout=socket.getdefaulttimeout(), header_to_get=None):
+def downloadpage(url,post=None,headers=[['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']],follow_redirects=True, timeout=DEFAULT_TIMEOUT, header_to_get=None):
     logger.info("pelisalacarta.core.scrapertools downloadpage")
     logger.info("pelisalacarta.core.scrapertools url="+url)
     
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/scrapertools.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/scrapertools.pyo
deleted file mode 100644
index edf3a80aa668304d2a25f8ebdafc5951028d6112..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/scrapertools.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/trailertools.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/trailertools.py
index 3f2ff4be57446646890cb276352548ee3d5bbdad..cc550cf0c36004b3fcdc2178f2333bc7b972b08e 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/trailertools.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/trailertools.py
@@ -67,7 +67,7 @@ def buscartrailer(params,url,category):
             duracion = video[3]
             xbmctools.addnewvideo( "trailertools" , "youtubeplay" , category , "youtube" ,  titulo , url , thumbnail , "Ver Video","",duracion )
     
-    xbmctools.addnewfolder( CHANNELNAME , "buscartrailer" , category , config.get_localized_string(30111)+" "+videotitle , url , os.path.join(IMAGES_PATH, 'trailertools.png'), "" ) #"Insatisfecho?, busca otra vez : "        
+    xbmctools.addnewfolderextra( CHANNELNAME , "buscartrailer" , category , config.get_localized_string(30111)+" "+videotitle , url , os.path.join(IMAGES_PATH, 'trailertools.png'), "" ) #"Insatisfecho?, busca otra vez : "        
     # Propiedades
     xbmcplugin.setPluginCategory( handle=int( sys.argv[ 1 ] ), category=category )
     xbmcplugin.addSortMethod( handle=int( sys.argv[ 1 ] ), sortMethod=xbmcplugin.SORT_METHOD_NONE )
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/updater.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/updater.pyo
deleted file mode 100644
index 6a5162044a9113c6962be399d39e63547bc298af..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/core/updater.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/__init__.pyo
deleted file mode 100644
index fd20d8d1e6bb8a50494525a5e571323f3ac8e269..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/guitools.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/guitools.pyo
deleted file mode 100644
index 68eaec46dff5ebe5f3b9e9820400f32ae2edaea8..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/guitools.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/launcher.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/launcher.py
index b81483222e9fc750ba1e98d751169ebcc5fa3296..88bbc74ed1dcf95d36178302d515a8850ce35a8d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/launcher.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/launcher.py
@@ -34,8 +34,8 @@ def run():
     logger.info("pelisalacarta.platformcode.launcher run")
 
     # Extract parameters from sys.argv
-    params, fanart, channel_name, title, fulltitle, url, thumbnail, plot, action, server, extra, subtitle, viewmode, category, show, password = extract_parameters()
-    logger.info("pelisalacarta.platformcode.launcher fanart=%s, channel_name=%s, title=%s, fulltitle=%s, url=%s, thumbnail=%s, plot=%s, action=%s, server=%s, extra=%s, subtitle=%s, category=%s, show=%s, password=%s" % (fanart, channel_name, title, fulltitle, url, thumbnail, plot, action, server, extra, subtitle, category, show, password))
+    params, fanart, channel_name, title, fulltitle, url, thumbnail, plot, action, server, extra, subtitle, viewmode, category, show, password, hasContentDetails, contentTitle, contentThumbnail, contentPlot = extract_parameters()
+    logger.info("pelisalacarta.platformcode.launcher fanart=%s, channel_name=%s, title=%s, fulltitle=%s, url=%s, thumbnail=%s, plot=%s, action=%s, server=%s, extra=%s, subtitle=%s, category=%s, show=%s, password=%s, hasContentDetails=%s contentTitle=%s contentThumbnail=%s contentPlot=%s" % (fanart, channel_name, title, fulltitle, url, thumbnail, plot, action, server, extra, subtitle, category, show, password,hasContentDetails, contentTitle, contentThumbnail, contentPlot))
 
     if config.get_setting('filter_servers') == 'true':
         server_white_list, server_black_list = set_server_list() 
@@ -158,7 +158,7 @@ def run():
             else:            
                 logger.info("pelisalacarta.platformcode.launcher multiplatform channel")
                 from core.item import Item
-                item = Item(channel=channel_name, title=title , fulltitle=fulltitle, url=url, thumbnail=thumbnail , plot=plot , server=server, category=category, extra=extra, subtitle=subtitle, viewmode=viewmode, show=show, password=password, fanart=fanart)
+                item = Item(channel=channel_name, title=title , fulltitle=fulltitle, url=url, thumbnail=thumbnail , plot=plot , server=server, category=category, extra=extra, subtitle=subtitle, viewmode=viewmode, show=show, password=password, fanart=fanart, hasContentDetails=hasContentDetails, contentTitle=contentTitle, contentThumbnail=contentThumbnail, contentPlot=contentPlot)
                 
                 '''
                 if item.subtitle!="":
@@ -184,14 +184,14 @@ def run():
                         itemlist = channel.play(item)
                         if len(itemlist)>0:
                             item = itemlist[0]
-                            xbmctools.play_video(channel=channel_name, server=item.server, url=item.url, category=item.category, title=item.title, thumbnail=item.thumbnail, plot=item.plot, extra=item.extra, subtitle=item.subtitle, video_password = item.password, fulltitle=item.fulltitle, Serie=item.show)
+                            xbmctools.play_video(channel=channel_name, server=item.server, url=item.url, category=item.category, title=item.title, thumbnail=item.thumbnail, plot=item.plot, extra=item.extra, subtitle=item.subtitle, video_password = item.password, fulltitle=item.fulltitle, Serie=item.show, hasContentDetails=item.hasContentDetails, contentTitle=item.contentTitle, contentThumbnail=item.contentThumbnail, contentPlot=item.contentPlot)
                         else:
                             import xbmcgui
                             ventana_error = xbmcgui.Dialog()
                             ok = ventana_error.ok ("plugin", "No hay nada para reproducir")
                     else:
                         logger.info("pelisalacarta.platformcode.launcher no channel 'play' method, executing core method")
-                        xbmctools.play_video(channel=channel_name, server=item.server, url=item.url, category=item.category, title=item.title, thumbnail=item.thumbnail, plot=item.plot, extra=item.extra, subtitle=item.subtitle, video_password = item.password, fulltitle=item.fulltitle, Serie=item.show)
+                        xbmctools.play_video(channel=channel_name, server=item.server, url=item.url, category=item.category, title=item.title, thumbnail=item.thumbnail, plot=item.plot, extra=item.extra, subtitle=item.subtitle, video_password = item.password, fulltitle=item.fulltitle, Serie=item.show, hasContentDetails=item.hasContentDetails, contentTitle=item.contentTitle, contentThumbnail=item.contentThumbnail, contentPlot=item.contentPlot)
 
                 elif action=="strm_detail" or action=="play_from_library":
                     logger.info("pelisalacarta.platformcode.launcher play_from_library")
@@ -527,6 +527,26 @@ def extract_parameters():
     else:
         password = ""
 
+    if params.has_key("hasContentDetails"):
+        hasContentDetails = urllib.unquote_plus( params.get("hasContentDetails") )
+    else:
+        hasContentDetails = ""
+
+    if params.has_key("contentTitle"):
+        contentTitle = urllib.unquote_plus( params.get("contentTitle") )
+    else:
+        contentTitle = ""
+
+    if params.has_key("contentThumbnail"):
+        contentThumbnail = urllib.unquote_plus( params.get("contentThumbnail") )
+    else:
+        contentThumbnail = ""
+
+    if params.has_key("contentPlot"):
+        contentPlot = urllib.unquote_plus( params.get("contentPlot") )
+    else:
+        contentPlot = ""
+
     if params.has_key("show"):
         show = urllib.unquote_plus( params.get("show") )
     else:
@@ -535,7 +555,7 @@ def extract_parameters():
         else:
             show = ""
 
-    return params, fanart, channel, title, fulltitle, url, thumbnail, plot, action, server, extra, subtitle, viewmode, category, show, password
+    return params, fanart, channel, title, fulltitle, url, thumbnail, plot, action, server, extra, subtitle, viewmode, category, show, password, hasContentDetails, contentTitle, contentThumbnail, contentPlot
 
 def episodio_ya_descargado(show_title,episode_title):
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/launcher.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/launcher.pyo
deleted file mode 100644
index 775b1e1e8a03641864d52dc01ef65d1c86aa2c91..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/launcher.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/library.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/library.pyo
deleted file mode 100644
index 73a462ca153def3d31bf9c8d1f3c79d59940211f..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/library.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/xbmctools.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/xbmctools.py
index db1667e39f5beb532f267f28610473e70cd74a56..7111b613b7553118ea1108de1a1c0a6290ba30d5 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/xbmctools.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/xbmctools.py
@@ -25,14 +25,7 @@ except:
 
 DEBUG = True
 
-# TODO: (3.2) Esto es un lío, hay que unificar
-def addnewfolder( canal , accion , category , title , url , thumbnail , plot , Serie="",totalItems=0,fanart="",context="", show="",fulltitle=""):
-    if fulltitle=="":
-        fulltitle=title
-    ok = addnewfolderextra( canal , accion , category , title , url , thumbnail , plot , "" ,Serie,totalItems,fanart,context,show, fulltitle)
-    return ok
-
-def addnewfolderextra( canal , accion , category , title , url , thumbnail , plot , extradata ,Serie="",totalItems=0,fanart="",context="",show="",fulltitle=""):
+def addnewfolderextra( canal , accion , category , title , url , thumbnail , plot , extradata ,Serie="",totalItems=0,fanart="",context="",show="",fulltitle="",hasContentDetails="false",contentTitle="",contentThumbnail="",contentPlot=""):
     if fulltitle=="":
         fulltitle=title
     
@@ -51,13 +44,16 @@ def addnewfolderextra( canal , accion , category , title , url , thumbnail , plo
         try:
             logger.info('[xbmctools.py] addnewfolderextra( "'+extradata+'","'+canal+'" , "'+accion+'" , "'+category+'" , "'+title+'" , "' + url + '" , "'+thumbnail+'" , "'+plot+'")" , "'+Serie+'")"')
         except:
-            logger.info('[xbmctools.py] addnewfolder(<unicode>)')
+            logger.info('[xbmctools.py] addnewfolderextra(<unicode>)')
+
+    logger.info("[xbmctools.py] addnewfolderextra hasContentDetails="+hasContentDetails+" contentTitle="+contentTitle+", contentThumbnail="+contentThumbnail+", contentPlot="+contentPlot)
+
     listitem = xbmcgui.ListItem( title, iconImage="DefaultFolder.png", thumbnailImage=thumbnail )
 
     listitem.setInfo( "video", { "Title" : title, "Plot" : plot, "Studio" : canal.capitalize() } )
-    
+
     set_infoLabels(listitem,plot) # Modificacion introducida por super_berny para añadir infoLabels al ListItem
-        
+
     if fanart!="":
         listitem.setProperty('fanart_image',fanart) 
         xbmcplugin.setPluginFanart(pluginhandle, fanart)
@@ -67,7 +63,8 @@ def addnewfolderextra( canal , accion , category , title , url , thumbnail , plo
         title = title.encode ("utf-8") #This only aplies to unicode strings. The rest stay as they are.
     except:
         pass
-    itemurl = '%s?fanart=%s&channel=%s&action=%s&category=%s&title=%s&fulltitle=%s&url=%s&thumbnail=%s&plot=%s&extradata=%s&Serie=%s&show=%s' % ( sys.argv[ 0 ] , fanart, canal , accion , urllib.quote_plus( category ) , urllib.quote_plus(title) , urllib.quote_plus(fulltitle) , urllib.quote_plus( url ) , urllib.quote_plus( thumbnail ) , urllib.quote_plus( plot ) , urllib.quote_plus( extradata ) , Serie, urllib.quote_plus( show ))
+
+    itemurl = '%s?fanart=%s&channel=%s&action=%s&category=%s&title=%s&fulltitle=%s&url=%s&thumbnail=%s&plot=%s&extradata=%s&Serie=%s&show=%s&hasContentDetails=%s&contentTitle=%s&contentThumbnail=%s&contentPlot=%s' % ( sys.argv[ 0 ] , fanart, canal , accion , urllib.quote_plus( category ) , urllib.quote_plus(title) , urllib.quote_plus(fulltitle) , urllib.quote_plus( url ) , urllib.quote_plus( thumbnail ) , urllib.quote_plus( plot ) , urllib.quote_plus( extradata ) , Serie, urllib.quote_plus( show ), urllib.quote_plus( hasContentDetails ), urllib.quote_plus( contentTitle ), urllib.quote_plus( contentThumbnail ), urllib.quote_plus( contentPlot ))
 
     if Serie != "": #Añadimos opción contextual para Añadir la serie completa a la biblioteca
         addSerieCommand = "XBMC.RunPlugin(%s?channel=%s&action=addlist2Library&category=%s&title=%s&fulltitle=%s&url=%s&extradata=%s&Serie=%s&show=%s)" % ( sys.argv[ 0 ] , canal , urllib.quote_plus( category ) , urllib.quote_plus( title ) , urllib.quote_plus(fulltitle) , urllib.quote_plus( url ) , urllib.quote_plus( extradata ) , Serie, urllib.quote_plus( show ) )
@@ -94,6 +91,8 @@ def addnewfolderextra( canal , accion , category , title , url , thumbnail , plo
         justinCommand = "XBMC.Container.Update(%s?channel=%s&action=%s&category=%s&title=%s&url=%s&thumbnail=%s&plot=%s)" % ( sys.argv[ 0 ] , "justintv" , "removeFromFavorites" , urllib.quote_plus( category ) , urllib.quote_plus( title ) , urllib.quote_plus( url ) , urllib.quote_plus( thumbnail ) , urllib.quote_plus( "" )  )
         contextCommands.append((config.get_localized_string(30407),justinCommand))
 
+    logger.info("[xbmctools.py] addnewfolderextra itemurl="+itemurl)
+
     if config.get_platform()=="boxee":
         #logger.info("Modo boxee")
         ok = xbmcplugin.addDirectoryItem( handle = pluginhandle, url = itemurl , listitem=listitem, isFolder=True)
@@ -108,7 +107,7 @@ def addnewfolderextra( canal , accion , category , title , url , thumbnail , plo
             ok = xbmcplugin.addDirectoryItem( handle = pluginhandle, url = itemurl , listitem=listitem, isFolder=True, totalItems=totalItems)
     return ok
 
-def addnewvideo( canal , accion , category , server , title , url , thumbnail, plot ,Serie="",duration="",fanart="",IsPlayable='false',context = "", subtitle="", viewmode="", totalItems = 0, show="", password="", extra="",fulltitle=""):
+def addnewvideo( canal , accion , category , server , title , url , thumbnail, plot ,Serie="",duration="",fanart="",IsPlayable='false',context = "", subtitle="", viewmode="", totalItems = 0, show="", password="", extra="",fulltitle="",hasContentDetails="false",contentTitle="",contentThumbnail="",contentPlot=""):
     contextCommands = []
     ok = False
     try:
@@ -122,11 +121,13 @@ def addnewvideo( canal , accion , category , server , title , url , thumbnail, p
             logger.info('[xbmctools.py] addnewvideo( "'+canal+'" , "'+accion+'" , "'+category+'" , "'+server+'" , "'+title+'" ("'+fulltitle+'") , "' + url + '" , "'+thumbnail+'" , "'+plot+'")" , "'+Serie+'")"')
         except:
             logger.info('[xbmctools.py] addnewvideo(<unicode>)')
-            
+
+    logger.info("[xbmctools.py] addnewvideo hasContentDetails="+hasContentDetails+" contentTitle="+contentTitle+", contentThumbnail="+contentThumbnail+", contentPlot="+contentPlot)
+
     icon_image = os.path.join( config.get_runtime_path() , "resources" , "images" , "servers" , server+".png" )
     if not os.path.exists(icon_image):
         icon_image = "DefaultVideo.png"
-     
+
     listitem = xbmcgui.ListItem( title, iconImage="DefaultVideo.png", thumbnailImage=thumbnail )
     listitem.setInfo( "video", { "Title" : title, "FileName" : title, "Plot" : plot, "Duration" : duration, "Studio" : canal.capitalize(), "Genre" : category } )
 
@@ -175,7 +176,7 @@ def addnewvideo( canal , accion , category , server , title , url , thumbnail, p
         pass
 
     # Lo restauro como estaba antes, la nueva formula no es compatible con Boxee    
-    itemurl = '%s?fanart=%s&channel=%s&action=%s&category=%s&title=%s&fulltitle=%s&url=%s&thumbnail=%s&plot=%s&server=%s&Serie=%s&subtitle=%s&viewmode=%s&show=%s&extradata=%s' % ( sys.argv[ 0 ] , fanart, canal , accion , urllib.quote_plus( category ) , urllib.quote_plus( title ) , urllib.quote_plus( fulltitle ) , urllib.quote_plus( url ) , urllib.quote_plus( thumbnail ) , urllib.quote_plus( plot ) , server , Serie , urllib.quote_plus(subtitle), urllib.quote_plus(viewmode), urllib.quote_plus( show ) , urllib.quote_plus(extra) )
+    itemurl = '%s?fanart=%s&channel=%s&action=%s&category=%s&title=%s&fulltitle=%s&url=%s&thumbnail=%s&plot=%s&server=%s&Serie=%s&subtitle=%s&viewmode=%s&show=%s&extradata=%s&hasContentDetails=%s&contentTitle=%s&contentThumbnail=%s&contentPlot=%s' % ( sys.argv[ 0 ] , fanart, canal , accion , urllib.quote_plus( category ) , urllib.quote_plus( title ) , urllib.quote_plus( fulltitle ) , urllib.quote_plus( url ) , urllib.quote_plus( thumbnail ) , urllib.quote_plus( plot ) , server , Serie , urllib.quote_plus(subtitle), urllib.quote_plus(viewmode), urllib.quote_plus( show ) , urllib.quote_plus(extra) , urllib.quote_plus( hasContentDetails ), urllib.quote_plus( contentTitle ), urllib.quote_plus( contentThumbnail ), urllib.quote_plus( contentPlot ))
 
     #logger.info("[xbmctools.py] itemurl=%s" % itemurl)
     if totalItems == 0:
@@ -184,27 +185,8 @@ def addnewvideo( canal , accion , category , server , title , url , thumbnail, p
         ok = xbmcplugin.addDirectoryItem( handle = pluginhandle, url=itemurl, listitem=listitem, isFolder=False, totalItems=totalItems)
     return ok
 
-def addthumbnailfolder( canal , scrapedtitle , scrapedurl , scrapedthumbnail , accion ):
-    logger.info('[xbmctools.py] addthumbnailfolder( "'+scrapedtitle+'" , "' + scrapedurl + '" , "'+scrapedthumbnail+'" , "'+accion+'")"')
-    listitem = xbmcgui.ListItem( scrapedtitle, iconImage="DefaultFolder.png", thumbnailImage=scrapedthumbnail )
-    itemurl = '%s?channel=%s&action=%s&category=%s&url=%s&title=%s&thumbnail=%s' % ( sys.argv[ 0 ] , canal , accion , urllib.quote_plus( scrapedtitle ) , urllib.quote_plus( scrapedurl ) , urllib.quote_plus( scrapedtitle ) , urllib.quote_plus( scrapedthumbnail ) )
-    xbmcplugin.addDirectoryItem( handle = pluginhandle, url = itemurl , listitem=listitem, isFolder=True)
-
-def addfolder( canal , nombre , url , accion ):
-    logger.info('[xbmctools.py] addfolder( "'+nombre+'" , "' + url + '" , "'+accion+'")"')
-    listitem = xbmcgui.ListItem( nombre , iconImage="DefaultFolder.png")
-    itemurl = '%s?channel=%s&action=%s&category=%s&url=%s' % ( sys.argv[ 0 ] , canal , accion , urllib.quote_plus(nombre) , urllib.quote_plus(url) )
-    xbmcplugin.addDirectoryItem( handle = pluginhandle, url = itemurl , listitem=listitem, isFolder=True)
-
-def addvideo( canal , nombre , url , category , server , Serie=""):
-    logger.info('[xbmctools.py] addvideo( "'+nombre+'" , "' + url + '" , "'+server+ '" , "'+Serie+'")"')
-    listitem = xbmcgui.ListItem( nombre, iconImage="DefaultVideo.png" )
-    listitem.setInfo( "video", { "Title" : nombre, "Plot" : nombre } )
-    itemurl = '%s?channel=%s&action=play&category=%s&url=%s&server=%s&title=%s&Serie=%s' % ( sys.argv[ 0 ] , canal , category , urllib.quote_plus(url) , server , urllib.quote_plus( nombre ) , Serie)
-    xbmcplugin.addDirectoryItem( handle=pluginhandle, url=itemurl, listitem=listitem, isFolder=False)
-
 # FIXME: ¿Por qué no pasar el item en lugar de todos los parámetros?
-def play_video(channel="",server="",url="",category="",title="", thumbnail="",plot="",extra="",desdefavoritos=False,desdedescargados=False,desderrordescargas=False,strmfile=False,Serie="",subtitle="", video_password="",fulltitle=""):
+def play_video(channel="",server="",url="",category="",title="", thumbnail="",plot="",extra="",desdefavoritos=False,desdedescargados=False,desderrordescargas=False,strmfile=False,Serie="",subtitle="", video_password="",fulltitle="", hasContentDetails="", contentTitle="", contentThumbnail="", contentPlot=""):
     from servers import servertools
     import sys
     import xbmcgui,xbmc
@@ -213,6 +195,8 @@ def play_video(channel="",server="",url="",category="",title="", thumbnail="",pl
     except:
         pass
 
+    logger.info("[xbmctools.py] play_video hasContentDetails="+hasContentDetails+" contentTitle="+contentTitle+", contentThumbnail="+contentThumbnail+", contentPlot="+contentPlot)
+
     try:
         server = server.lower()
     except:
@@ -386,16 +370,21 @@ def play_video(channel="",server="",url="",category="",title="", thumbnail="",pl
 
     # Descargar
     elif opciones[seleccion]==config.get_localized_string(30153): # "Descargar"
+
+        download_title = fulltitle
+        if hasContentDetails=="true":
+            download_title = contentTitle
+
         import xbmc
         # El vídeo de más calidad es el último
         mediaurl = video_urls[len(video_urls)-1][1]
 
         from core import downloadtools
-        keyboard = xbmc.Keyboard(fulltitle)
+        keyboard = xbmc.Keyboard(download_title)
         keyboard.doModal()
         if (keyboard.isConfirmed()):
-            title = keyboard.getText()
-            devuelve = downloadtools.downloadbest(video_urls,title)
+            download_title = keyboard.getText()
+            devuelve = downloadtools.downloadbest(video_urls,download_title)
             
             if devuelve==0:
                 advertencia = xbmcgui.Dialog()
@@ -440,11 +429,20 @@ def play_video(channel="",server="",url="",category="",title="", thumbnail="",pl
         from core import favoritos
         from core import downloadtools
 
-        keyboard = xbmc.Keyboard(downloadtools.limpia_nombre_excepto_1(fulltitle)+" ["+channel+"]")
+        download_title = fulltitle
+        download_thumbnail = thumbnail
+        download_plot = plot
+
+        if hasContentDetails=="true":
+            download_title = contentTitle
+            download_thumbnail = contentThumbnail
+            download_plot = contentPlot
+
+        keyboard = xbmc.Keyboard(downloadtools.limpia_nombre_excepto_1(download_title)+" ["+channel+"]")
         keyboard.doModal()
         if keyboard.isConfirmed():
             title = keyboard.getText()
-            favoritos.savebookmark(titulo=title,url=url,thumbnail=thumbnail,server=server,plot=plot,fulltitle=title)
+            favoritos.savebookmark(titulo=download_title,url=url,thumbnail=download_thumbnail,server=server,plot=download_plot,fulltitle=title)
             advertencia = xbmcgui.Dialog()
             resultado = advertencia.ok(config.get_localized_string(30102) , title , config.get_localized_string(30108)) # 'se ha añadido a favoritos'
         return
@@ -464,14 +462,24 @@ def play_video(channel="",server="",url="",category="",title="", thumbnail="",pl
         from core import descargas
         from core import downloadtools
 
-        keyboard = xbmc.Keyboard(downloadtools.limpia_nombre_excepto_1(fulltitle))
+        download_title = fulltitle
+        download_thumbnail = thumbnail
+        download_plot = plot
+
+        if hasContentDetails=="true":
+            download_title = contentTitle
+            download_thumbnail = contentThumbnail
+            download_plot = contentPlot
+
+        keyboard = xbmc.Keyboard(downloadtools.limpia_nombre_excepto_1(download_title))
         keyboard.doModal()
         if keyboard.isConfirmed():
-            title = keyboard.getText()
-            descargas.savebookmark(titulo=title,url=url,thumbnail=thumbnail,server=server,plot=plot,fulltitle=title)
-            
+            download_title = keyboard.getText()
+
+            descargas.savebookmark(titulo=download_title,url=url,thumbnail=download_thumbnail,server=server,plot=download_plot,fulltitle=download_title)
+
             advertencia = xbmcgui.Dialog()
-            resultado = advertencia.ok(config.get_localized_string(30101) , title , config.get_localized_string(30109)) # 'se ha añadido a la lista de descargas'
+            resultado = advertencia.ok(config.get_localized_string(30101) , download_title , config.get_localized_string(30109)) # 'se ha añadido a la lista de descargas'
         return
 
     elif opciones[seleccion]==config.get_localized_string(30161): #"Añadir a Biblioteca":  # Library
@@ -514,11 +522,22 @@ def play_video(channel="",server="",url="",category="",title="", thumbnail="",pl
         xlistitem = getLibraryInfo(mediaurl)
     else:
         logger.info("b4")
+
+        play_title = fulltitle
+        play_thumbnail = thumbnail
+        play_plot = plot
+
+        if hasContentDetails=="true":
+            play_title = contentTitle
+            play_thumbnail = contentThumbnail
+            play_plot = contentPlot
+
         try:
-            xlistitem = xbmcgui.ListItem( title, iconImage="DefaultVideo.png", thumbnailImage=thumbnail, path=mediaurl)
+            xlistitem = xbmcgui.ListItem( play_title, iconImage="DefaultVideo.png", thumbnailImage=play_thumbnail, path=mediaurl)
         except:
-            xlistitem = xbmcgui.ListItem( title, iconImage="DefaultVideo.png", thumbnailImage=thumbnail)
-        xlistitem.setInfo( "video", { "Title": title, "Plot" : plot , "Studio" : channel , "Genre" : category } )
+            xlistitem = xbmcgui.ListItem( play_title, iconImage="DefaultVideo.png", thumbnailImage=play_thumbnail)
+        
+        xlistitem.setInfo( "video", { "Title": play_title, "Plot" : play_plot , "Studio" : channel , "Genre" : category } )
         
         #set_infoLabels(listitem,plot) # Modificacion introducida por super_berny para añadir infoLabels al ListItem
     
@@ -537,7 +556,6 @@ def play_video(channel="",server="",url="",category="",title="", thumbnail="",pl
         
             from core import scrapertools
             data = scrapertools.cache_page(subtitle)
-            #print data
             fichero = open(ficherosubtitulo,"w")
             fichero.write(data)
             fichero.close()
@@ -835,7 +853,8 @@ def renderItems(itemlist, params, url, category, isPlayable='false'):
     
     if itemlist <> None:
         for item in itemlist:
-            #logger.info("viewmode="+item.viewmode)
+            logger.info("item="+item.tostring())
+            
             if item.category == "":
                 item.category = category
                 
@@ -851,20 +870,16 @@ def renderItems(itemlist, params, url, category, isPlayable='false'):
                 else:
                     item.fanart = os.path.join(config.get_runtime_path(),"fanart.jpg")
 
-            if item.folder :
-                if len(item.extra)>0:
-                    addnewfolderextra( item.channel , item.action , item.category , item.title , item.url , item.thumbnail , item.plot , extradata = item.extra , totalItems = len(itemlist), fanart=item.fanart , context=item.context, show=item.show, fulltitle=item.fulltitle )
-                else:
-                    addnewfolder( item.channel , item.action , item.category , item.title , item.url , item.thumbnail , item.plot , totalItems = len(itemlist) , fanart = item.fanart, context = item.context, show=item.show, fulltitle=item.fulltitle )
+            if item.folder:
+                addnewfolderextra( item.channel , item.action , item.category , item.title , item.url , item.thumbnail , item.plot , extradata = item.extra , totalItems = len(itemlist), fanart=item.fanart , context=item.context, show=item.show, fulltitle=item.fulltitle, hasContentDetails=item.hasContentDetails, contentTitle=item.contentTitle, contentThumbnail=item.contentThumbnail, contentPlot=item.contentPlot )
             else:
                 if config.get_setting("player_mode")=="1": # SetResolvedUrl debe ser siempre "isPlayable = true"
                     isPlayable = "true"
-                
 
                 if item.duration:
-                    addnewvideo( item.channel , item.action , item.category , item.server, item.title , item.url , item.thumbnail , item.plot , "" ,  duration = item.duration , fanart = item.fanart, IsPlayable=isPlayable,context = item.context , subtitle=item.subtitle, totalItems = len(itemlist), show=item.show, password = item.password, extra = item.extra, fulltitle=item.fulltitle )
-                else:    
-                    addnewvideo( item.channel , item.action , item.category , item.server, item.title , item.url , item.thumbnail , item.plot, fanart = item.fanart, IsPlayable=isPlayable , context = item.context , subtitle = item.subtitle , totalItems = len(itemlist), show=item.show , password = item.password , extra=item.extra, fulltitle=item.fulltitle )
+                    addnewvideo( item.channel , item.action , item.category , item.server, item.title , item.url , item.thumbnail , item.plot , "" ,  duration = item.duration , fanart = item.fanart, IsPlayable=isPlayable,context = item.context , subtitle=item.subtitle, totalItems = len(itemlist), show=item.show, password = item.password, extra = item.extra, fulltitle=item.fulltitle, hasContentDetails=item.hasContentDetails, contentTitle=item.contentTitle, contentThumbnail=item.contentThumbnail, contentPlot=item.contentPlot )
+                else:
+                    addnewvideo( item.channel , item.action , item.category , item.server, item.title , item.url , item.thumbnail , item.plot, fanart = item.fanart, IsPlayable=isPlayable , context = item.context , subtitle = item.subtitle , totalItems = len(itemlist), show=item.show , password = item.password , extra=item.extra, fulltitle=item.fulltitle, hasContentDetails=item.hasContentDetails, contentTitle=item.contentTitle, contentThumbnail=item.contentThumbnail, contentPlot=item.contentPlot )
             
             if item.viewmode!="list":
                 viewmode = item.viewmode
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/xbmctools.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/xbmctools.pyo
deleted file mode 100644
index c99492ff8b252c6a6ebccefad6535701f1b11b0e..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/platformcode/xbmctools.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_cloudsix.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_cloudsix.png
new file mode 100644
index 0000000000000000000000000000000000000000..75a01fb5d5080791ce1e89f487a1afbf17ee2e3c
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_cloudsix.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_filefactory.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_filefactory.png
new file mode 100644
index 0000000000000000000000000000000000000000..17d561c4a02f20d392db83da947c26f74fc10442
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_filefactory.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_flashx.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_flashx.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bd65fae1ed27987cc332bd4fe1e0931064873cf
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_flashx.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_gamovideo.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_gamovideo.png
new file mode 100644
index 0000000000000000000000000000000000000000..08bf9194da8b3b6b09fab99d6b4fa24a0601f7dc
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_gamovideo.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_hugefiles.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_hugefiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc7d7993b7574ebe55760c3e79383bf32e2b5605
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_hugefiles.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_idowatch.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_idowatch.png
new file mode 100644
index 0000000000000000000000000000000000000000..20192c4c1d5e3b292249c0f0f356469a2f70f616
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_idowatch.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_letitbit.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_letitbit.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b619123a40aeb807fe47fa1267a2032c2db6871
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_letitbit.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_mega.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_mega.png
new file mode 100644
index 0000000000000000000000000000000000000000..837da85f20cf441c72f1abfaf83915c3582a6c52
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_mega.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_nowdownload.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_nowdownload.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c4220fd4d91fe1a7085c41ebcae5b4ceb362f7b
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_nowdownload.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_okru.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_okru.png
new file mode 100644
index 0000000000000000000000000000000000000000..22772ef19181952d51b36ae7512d130cc0a5c092
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_okru.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_onefichier.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_onefichier.png
new file mode 100644
index 0000000000000000000000000000000000000000..97a4326eba5e46eac192f441872cc465a5b3cca3
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_onefichier.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_openload.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_openload.png
new file mode 100644
index 0000000000000000000000000000000000000000..80cf4b1e82307f44705cb6af7316342f95b5dcec
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_openload.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_rapidgator.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_rapidgator.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef2e9c6b03aa277ed68855cd523c0a23e943b447
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_rapidgator.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_turbobit.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_turbobit.png
new file mode 100644
index 0000000000000000000000000000000000000000..04979bf0b50ce5e251771e5175f1e73e4e43a812
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_turbobit.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uploadable.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uploadable.png
new file mode 100644
index 0000000000000000000000000000000000000000..8136a5da4965d174707c0674fa064aaff39600b1
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uploadable.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uploaded.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uploadedto.png
similarity index 100%
rename from packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uploaded.png
rename to packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uploadedto.png
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uptobox.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uptobox.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ffe1cc051e4044f81e3e87800d592e6e50aaecf
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_uptobox.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_vimpleru.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_vimpleru.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f64a7c4149878273290d0acd5326fdddc90becf
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_vimpleru.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_vodlocker.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_vodlocker.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fcc7c34edc3f705694871baab18c4d60249dce6
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_vodlocker.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_waaw.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_waaw.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bbc76613bdedde03a193e1b096f49e31d74e191
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_waaw.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_youtube.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f2cb995a11851fad3d244920da7bd1d9cde4303
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/images/servers/server_youtube.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/settings.conf b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/settings.conf
index a3cf2726f27304d566335bb45dc895ee5647d422..a0bb266d67786f94a4543c23349471f920d43f32 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/settings.conf
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/settings.conf
@@ -81,6 +81,11 @@ uploadedtopremium=true
 uploadedtouser=
 uploadedtopassword=secreto
 
+# filesmonster
+filesmonsterpremium=true
+filesmonsteruser=
+filesmonsterpassword=secreto
+
 # MocosoftX
 mocosoftxaccount=false
 mocosoftxuser=
@@ -114,16 +119,6 @@ pordedesortlinks=0
 pordedeshowlinks=0
 pordedenumberlinks=0
 
-# quebajamos
-quebajamosaccount=false
-quebajamosuser=usuario@algo.com
-quebajamospassword=password
-
-# playmax
-playmaxaccount=false
-playmaxuser=usuario@algo.com
-playmaxpassword=password
-
 # seriesmu
 seriesmuaccount=false
 seriesmuuser=usuario@algo.com
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/settings.xml
index 49c1b9ca480dc411bb780d4028b0dcdc54c0cdc4..22d10b37e09eaec5f7511e78aea306ed87ddf2bc 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/resources/settings.xml
@@ -55,6 +55,11 @@
     <setting id="onefichieruser" type="text" label="30014"  enable="eq(-1,true)" default=""/>
     <setting id="onefichierpassword" type="text" option="hidden" label="30015" enable="!eq(-1,)+eq(-2,true)" default=""/>
 
+    <setting type="sep" />
+    <setting id="filesmonsterpremium" type="bool" label="Filesmonster" default="false"/>
+    <setting id="filesmonsteruser" type="text" label="30014" enable="eq(-1,true)" default=""/>
+    <setting id="filesmonsterpassword" type="text" label="30015" option="hidden" enable="!eq(-1,)+eq(-2,true)" default=""/>
+
     <setting type="sep" />
     <setting id="mocosoftxaccount" type="bool" label="MocosoftX" default="false"/>
     <setting id="mocosoftxuser" type="text" label="User"  enable="eq(-1,true)" default=""/>
@@ -65,11 +70,6 @@
     <setting id="serieslyuser" type="text" label="User"  enable="eq(-1,true)" default=""/>
     <setting id="serieslypassword" type="text" option="hidden" label="Password" enable="!eq(-1,)+eq(-2,true)" default=""/>
 
-    <setting type="sep" />
-    <setting id="stormtvaccount" type="bool" label="stormtv" default="false"/>
-    <setting id="stormtvuser" type="text" label="User"  enable="eq(-1,true)" default=""/>
-    <setting id="stormtvpassword" type="text" option="hidden" label="Password" enable="!eq(-1,)+eq(-2,true)" default=""/>
-
     <setting type="sep" />
     <setting id="megaspainaccount" type="bool" label="megaspain" default="false"/>
     <setting id="megaspainuser" type="text" label="User"  enable="eq(-1,true)" default=""/>
@@ -93,16 +93,6 @@
     <setting id="pordedeshowlinks" type="enum" values="Todos|Ver online|Descargar" label="Mostrar enlaces" default="0" enable="eq(-4,true)"/>
     <setting id="pordedenumberlinks" type="enum" values="No|5|10|15|20|25|30" label="Limitar número de enlaces" default="0" enable="eq(-5,true)"/>
 
-    <setting type="sep" />
-    <setting id="quebajamosaccount" type="bool" label="quebajamos" default="false"/>
-    <setting id="quebajamosuser" type="text" label="User"  enable="eq(-1,true)" default=""/>
-    <setting id="quebajamospassword" type="text" option="hidden" label="Password" enable="!eq(-1,)+eq(-2,true)" default=""/>
-
-    <setting type="sep" />
-    <setting id="playmaxaccount" type="bool" label="playmax" default="false"/>
-    <setting id="playmaxuser" type="text" label="User"  enable="eq(-1,true)" default=""/>
-    <setting id="playmaxpassword" type="text" option="hidden" label="Password" enable="!eq(-1,)+eq(-2,true)" default=""/>
-
     <setting type="sep" />
     <setting id="seriesmuaccount" type="bool" label="seriesmu" default="false"/>
     <setting id="seriesmuuser" type="text" label="User"  enable="eq(-1,true)" default=""/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/__init__.pyo
deleted file mode 100644
index 1c76bf4dcf3fbda8d4d4c0682f15bccfaee7012d..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/cloudsix.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/cloudsix.py
new file mode 100644
index 0000000000000000000000000000000000000000..89a5dc7e1db942ac9ec17f93e7a64c11c1c98250
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/cloudsix.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+# pelisalacarta - XBMC Plugin
+# Conector para cloudsix
+# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
+#------------------------------------------------------------
+
+import urlparse,urllib2,urllib,re
+import os
+
+from core import scrapertools
+from core import logger
+from core import config
+
+def test_video_exists( page_url ):
+    logger.info("pelisalacarta.servers.cloudsix test_video_exists(page_url='%s')" % page_url)
+    
+    return False,"Este servidor no es compatible con pelisalacarta"
+
+def get_video_url( page_url , premium = False , user="" , password="", video_password="" ):
+    logger.info("pelisalacarta.servers.cloudsix get_video_url(page_url='%s')" % page_url)
+    video_urls = []
+    return video_urls
+
+# Encuentra vídeos del servidor en el texto pasado
+def find_videos(data):
+    encontrados = set()
+    devuelve = []
+
+    # http://cloudsix.me/users/abc/123/BlaBlaBla.cas
+    patronvideos  = 'cloudsix.me/users/([^\/]+/\d+)'
+    logger.info("pelisalacarta.servers.cloudsix find_videos #"+patronvideos+"#")
+    matches = re.compile(patronvideos,re.DOTALL).findall(data)
+
+    for match in matches:
+        titulo = "[cloudsix]"
+        url = "http://cloudsix.me/users/"+match
+        if url not in encontrados:
+            logger.info("  url="+url)
+            devuelve.append( [ titulo , url , 'cloudsix' ] )
+            encontrados.add(url)
+        else:
+            logger.info("  url duplicada="+url)
+
+    return devuelve
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/filesmonster.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/filesmonster.py
index 444a6194645b9159a79ebca5b68c4ed7d57f1c91..efd84760d95a257da7446e0ab7cf8449bc47c556 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/filesmonster.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/filesmonster.py
@@ -1,27 +1,67 @@
 # -*- coding: utf-8 -*-
 #------------------------------------------------------------
 # pelisalacarta - XBMC Plugin
-# Conector para uploaz
+# Conector para filesmonster
 # http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
 #------------------------------------------------------------
 
 import urlparse,urllib2,urllib,re
 import os
-
+import cookielib
 from core import scrapertools
 from core import logger
 from core import config
 
+
 def get_video_url( page_url , premium = False , user="" , password="", video_password="" ):
-    logger.info("[filesmonster.py] get_video_url(page_url='%s')" % page_url)
+    logger.info("[filesmonster.py] get_video_url( page_url='%s')" )
     video_urls = []
+    itemlist=[]
+    data1=''
+    data2=''
+    url=''
+    alerta='[filesmonster premium]'
+    enlace="no"
+    post2 = "username="+user+"&password="+password
+    login_url="http://filesmonster.com/api/public/login"
+    data1=scrapertools.cache_page(login_url, post=post2)
+    partes1=data1.split('"')
+    estado=partes1[3]
+    if estado!='success': alerta="[error de filesmonster premium]: "+estado
+    
+    id=page_url
+    id=id.replace("http://filesmonster.com/download.php","")
+    post=id.replace("?", "")
+    url = 'http://filesmonster.com/api/public/premiumDownload'
+    data2=scrapertools.cache_page(url, post=post)
+    
+    partes=data2.split('"')
+    url=partes[7]
+    if "http" not in url:alerta="[error de filesmonster premium]: "+url
+    
+    video_urls.append( [alerta ,url] )
+
+
+
+     
+		
     return video_urls
+	
+
+    	
+	
 
-# Encuentra vídeos del servidor en el texto pasado
+
+
+
+
+# Encuentra vídeos del servidor en el texto pasado
 def find_videos(data):
     encontrados = set()
     devuelve = []
 
+
+
     # http://uploaz.com/file/
     patronvideos  = '"filesmonster.com/download(.*?)"'
     logger.info("[filemonster.py] find_videos #"+patronvideos+"#")
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/gamovideo.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/gamovideo.py
index 9dffab0e68d9fc171687c6d24e42599040b5bbb3..2bceecc3c69495c658daab48f03729e3bf6731b9 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/gamovideo.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/gamovideo.py
@@ -20,12 +20,19 @@ def test_video_exists( page_url ):
 def get_video_url( page_url , premium = False , user="" , password="", video_password="" ):
     logger.info("pelisalacarta.gamovideo get_video_url(page_url='%s')" % page_url)
     if not "embed" in page_url:
-      page_url = page_url.replace("http://gamovideo.com/","http://gamovideo.com/embed-") + "-640x360.html"
+        page_url = page_url.replace("http://gamovideo.com/","http://gamovideo.com/embed-") + "-640x360.html"
+
+    HEADERS = []
+    HEADERS.append(["User-Agent","Firefox"])
+
+    data = scrapertools.cache_page(page_url,headers=HEADERS)
+    logger.info("pelisalacarta.gamovideo data=="+data)
+
+    data = scrapertools.find_single_match(data,"<script type='text/javascript'>(eval.function.p,a,c,k,e,d..*?)</script>")
+    logger.info("pelisalacarta.gamovideo data=="+data)
 
-    data = scrapertools.cache_page(page_url)
-    data = scrapertools.find_single_match(data,"<script type='text/javascript'>(.*?)</script>")
     data = jsunpack.unpack(data)
-    
+
     host = scrapertools.get_match(data, 'image:"(http://[^/]+/)')
     flv_url = scrapertools.get_match(data, ',\{file:"([^"]+)"')
     rtmp_url = scrapertools.get_match(data, '\[\{file:"([^"]+)"')
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/idowatch.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/idowatch.py
new file mode 100644
index 0000000000000000000000000000000000000000..bb3b15616972e623cd6ab937175116377034fdea
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/idowatch.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+# pelisalacarta - XBMC Plugin
+# Conector para idowatch
+# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
+#------------------------------------------------------------
+
+import urlparse,urllib2,urllib,re
+import os
+
+from core import scrapertools
+from core import logger
+from core import config
+from core import jsunpack
+
+def test_video_exists( page_url ):
+    logger.info("pelisalacarta.idowatch test_video_exists(page_url='%s')" % page_url)
+    return True,""
+
+def get_video_url( page_url , premium = False , user="" , password="", video_password="" ):
+    logger.info("pelisalacarta.idowatch get_video_url(page_url='%s')" % page_url)
+
+    data = scrapertools.cache_page(page_url)
+
+    #file:"http://163.172.7.14/ejvzymzne2gn6devhtlycoglaont3md4cn45tfo7tmyvcrobpf5r66t7sckq/v.mp4",label:"SD"
+    patron = 'file:"([^"]+)",label:"([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    video_urls = []
+    for mediaurl,label in matches:
+        video_urls.append( [ scrapertools.get_filename_from_url(mediaurl)[-4:]+" "+label+" [idowatch]",mediaurl])
+
+    for video_url in video_urls:
+        logger.info("[idowatch.py] %s - %s" % (video_url[0],video_url[1]))
+
+    return video_urls
+
+# Encuentra vídeos del servidor en el texto pasado
+def find_videos(data):
+    encontrados = set()
+    devuelve = []
+
+    # http://idowatch.net/m5k9s1g7il01.html
+    patronvideos  = 'idowatch.net/([a-z0-9]+)'
+    logger.info("pelisalacarta.idowatch find_videos #"+patronvideos+"#")
+    matches = re.compile(patronvideos,re.DOTALL).findall(data)
+
+    for match in matches:
+        titulo = "[idowatch]"
+        url = "http://idowatch.net/"+match+".html"
+        if url not in encontrados:
+            logger.info("  url="+url)
+            devuelve.append( [ titulo , url , 'idowatch' ] )
+            encontrados.add(url)
+        else:
+            logger.info("  url duplicada="+url)
+
+    return devuelve
+
+def test():
+    video_urls = get_video_url("http://idowatch.net/m5k9s1g7il01.html")
+
+    return len(video_urls)>0
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/openload.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/openload.py
index 18a85e9db383e7b21152c406563ce3de4261cd6f..32cfe17481525e1c6fc38e16cee33a0762f55583 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/openload.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/openload.py
@@ -5,7 +5,7 @@
 # http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
 # ------------------------------------------------------------
 
-import re, urllib2, cookielib, xbmc, os
+import re, urllib2, cookielib, os
 from core import scrapertools
 from core import logger
 from core import config
@@ -25,8 +25,8 @@ Request = urllib2.Request
 
 
 if cj != None:
-    if os.path.isfile(xbmc.translatePath(ficherocookies)):
-        cj.load(xbmc.translatePath(ficherocookies))
+    if os.path.isfile(ficherocookies):
+        cj.load(ficherocookies)
     opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
 else:
     opener = urllib2.build_opener()
@@ -73,7 +73,7 @@ def decodeOpenLoad(html):
     decodestring = decode(decodestring)
     decodestring = decodestring.replace("\\/","/")
     
-    videourl = re.search(r'vr="([^"]+)', decodestring, re.DOTALL | re.IGNORECASE).group(1)
+    videourl = re.search(r'vr ="([^"]+)"', decodestring, re.DOTALL | re.IGNORECASE).group(1)
     return videourl
 
 def decode(encoded):
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/servertools.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/servertools.py
index 0684b4b02eed1bdb8b36667d7de6f5ac6bedd798..1ef7b788894da516395444d238c7fea1e509c86d 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/servertools.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/servertools.py
@@ -4,7 +4,7 @@
 # Utilidades para detectar vídeos de los diferentes conectores
 # http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
 #------------------------------------------------------------
-#LvX Edited Patched
+
 import re,sys
 import urllib2
 
@@ -23,11 +23,14 @@ FREE_SERVERS.extend(['royalvids','sockshare','stagevu','tutv','userporn','veoh',
 FREE_SERVERS.extend(['vidbux','videoweed','vimeo','vk','watchfreeinhd','youtube'])
 FREE_SERVERS.extend(['jumbofiles','nowvideo','streamcloud', 'dailymotion', 'vidbull'])
 FREE_SERVERS.extend(['nosvideo','videopremium','flashx','upafile'])
-FREE_SERVERS.extend(['fileflyer','tunepk','powvideo','videomega','mega','vidspot','netutv','rutube'])
+FREE_SERVERS.extend(['fileflyer','tunepk','powvideo','mega','videomega','vidspot','netutv','rutube'])
 FREE_SERVERS.extend(['videozed','documentary', 'firedrive','videott','gamovideo'])
 FREE_SERVERS.extend(['torrent','video4you','mailru','streaminto','backin','akstream', 'speedvideo', 'junkyvideo', 'rapidvideo', 'realvid', 'cloudzilla', 'fakingstv'])
 FREE_SERVERS.extend(['cumlouder','v4y','streamable','videostoring','youwatch'])
-FREE_SERVERS.extend(['vodlocker','thevideome','rocvideo','vidxtreme','vidtome','vidzi','letwatch','sendvid','vkpass','okru','cnubis','yourupload','mp4upload','turbovideos','vimpleru','spruto','openload'])
+FREE_SERVERS.extend(['vodlocker','thevideome','rocvideo','vidxtreme','vidtome','vidzi','letwatch','sendvid','vkpass','okru','cnubis','yourupload','mp4upload','turbovideos','vimpleru','spruto','openload','idowatch','xvideos'])
+
+# Servidores no soportados, pero se ponen como free porque necesitas tener el patrón para poder informar
+FREE_SERVERS.extend(['cloudsix'])
 
 # Lista de TODOS los servidores que funcionan con cuenta premium individual
 PREMIUM_SERVERS = ['uploadedto','nowvideo','onefichier']
@@ -35,7 +38,7 @@ PREMIUM_SERVERS = ['uploadedto','nowvideo','onefichier']
 # Lista de TODOS los servidores soportados por Filenium
 #FILENIUM_SERVERS = jsontools.load_json(urllib2.urlopen('http://filenium.com/domainsxbmc'))
 FILENIUM_SERVERS = []
-FILENIUM_SERVERS.extend(["nitroflare","lolabits","1fichier","dl","dl","mega","allmyvideos","allmyvideos","cliphunter","dailymotion","divxstage","facebook","filefactory","filepost","filesmonster","firedrive","gigasize","justin","k2s","keep2share","keep2share","letitbit","mediafire","metacafe","mitele","moevideos","netload","nowvideo","nowvideo","nowvideo","oboom","played","pornhub","rapidgator","rg","shareflare","streamcloud","turbobit","uploadable","uploaded","uploaded","ul","userporn","videoweed","vidspot","vimeo","vk","xenubox","youngpornvideos","youtube","zippyshare","lix","safelinking","linkto","2shared","4shared","hugefiles","nowdownload","nowdownload","tusfiles","uploading","uptobox"]);
+FILENIUM_SERVERS.extend(["nitroflare","lolabits","1fichier","mega","allmyvideos","cliphunter","dailymotion","divxstage","facebook","filefactory","filepost","filesmonster","firedrive","gigasize","keep2share","keep2share","letitbit","mediafire","metacafe","mitele","moevideos","netload","nowvideo","oboom","played","pornhub","rapidgator","shareflare","streamcloud","turbobit","uploadable","uploaded","uploaded","userporn","videoweed","vidspot","vimeo","vk","xenubox","youngpornvideos","youtube","zippyshare","lix","safelinking","linkto","2shared","4shared","hugefiles","nowdownload","tusfiles","uploading","uptobox"]);
 
 # Lista de TODOS los servidores soportados por Real-Debrid
 REALDEBRID_SERVERS = ['one80upload','tenupload','onefichier','onehostclick','twoshared','fourfastfile','fourshared','abc','asfile','badongo','bitshare','cbscom','crocko','cwtv','dailymotion','dateito',
@@ -81,14 +84,14 @@ ENABLED_SERVERS.sort()
 
 # Función genérica para encontrar vídeos en una página
 def find_video_items(item=None, data=None, channel=""):
-    logger.info("[launcher.py] findvideos")
+    logger.info("[servertools.py] find_video_items")
 
     # Descarga la página
     if data is None:
         from core import scrapertools
         data = scrapertools.cache_page(item.url)
         #logger.info(data)
-    
+
     # Busca los enlaces a los videos
     from core.item import Item
     from servers import servertools
@@ -104,10 +107,38 @@ def find_video_items(item=None, data=None, channel=""):
         server = video[2]
         thumbnail = "http://media.tvalacarta.info/servers/server_"+server+".png"
         
-        itemlist.append( Item(channel=item.channel, title=scrapedtitle , action="play" , server=server, page=item.page, url=scrapedurl, thumbnail=thumbnail, show=item.show , plot=item.plot , folder=False) )
+        itemlist.append( Item(channel=item.channel, title=scrapedtitle , action="play" , server=server, url=scrapedurl, thumbnail=thumbnail, show=item.show , plot=item.plot , parentContent=item, folder=False) )
 
     return itemlist
 
+def guess_server_thumbnail(title):
+    logger.info("[servertools.py] guess_server_thumbnail title="+title)
+
+    lowcase_title = title.lower()
+
+    if "netu" in lowcase_title:
+        logger.info("[servertools.py] guess_server_thumbnail caso especial netutv")
+        return "http://media.tvalacarta.info/servers/server_netutv.png"
+
+    if "ul.to" in lowcase_title:
+        logger.info("[servertools.py] guess_server_thumbnail caso especial ul.to")
+        return "http://media.tvalacarta.info/servers/server_uploadedto.png"
+
+    if "waaw" in lowcase_title:
+        logger.info("[servertools.py] guess_server_thumbnail caso especial waaw")
+        return "http://media.tvalacarta.info/servers/server_waaw.png"
+
+    if "streamin" in lowcase_title:
+        logger.info("[servertools.py] guess_server_thumbnail caso especial streamin")
+        return "http://media.tvalacarta.info/servers/server_streaminto.png"
+
+    for serverid in ENABLED_SERVERS:
+        if serverid in lowcase_title:
+            logger.info("[servertools.py] guess_server_thumbnail encontrado "+serverid)
+            return "http://media.tvalacarta.info/servers/server_"+serverid+".png"
+
+    return ""
+
 def findvideosbyserver(data, serverid):
     logger.info("[servertools.py] findvideos")
     encontrados = set()
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/servertools.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/servertools.pyo
deleted file mode 100644
index c0da0394394388cbeb21ee1cf2f640c7d5ccac5a..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/servertools.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/uploadable.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/uploadable.py
new file mode 100644
index 0000000000000000000000000000000000000000..df6fd46bd5cc04010a41ad885332610f9e61a19f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/uploadable.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+#------------------------------------------------------------
+# pelisalacarta - XBMC Plugin
+# Conector para uploadable
+# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
+#------------------------------------------------------------
+
+import urlparse,urllib2,urllib,re
+import os
+
+from core import scrapertools
+from core import logger
+from core import config
+
+def test_video_exists( page_url ):
+    logger.info("pelisalacarta.servers.uploadable test_video_exists(page_url='%s')" % page_url)
+    
+    return True,""
+
+def get_video_url( page_url , premium = False , user="" , password="", video_password="" ):
+    logger.info("pelisalacarta.servers.uploadable get_video_url(page_url='%s')" % page_url)
+    video_urls = []
+    return video_urls
+
+# Encuentra vídeos del servidor en el texto pasado
+def find_videos(data):
+    encontrados = set()
+    devuelve = []
+
+    # https://www.uploadable.ch/list/cKMCXrm7gZqv
+    patronvideos  = 'uploadable.ch/list/([A-Za-z0-9]+)'
+    logger.info("pelisalacarta.servers.uploadable find_videos #"+patronvideos+"#")
+    matches = re.compile(patronvideos,re.DOTALL).findall(data)
+
+    for match in matches:
+        titulo = "[uploadable]"
+        url = "https://www.uploadable.ch/list/"+match
+        if url not in encontrados:
+            logger.info("  url="+url)
+            devuelve.append( [ titulo , url , 'uploadable' ] )
+            encontrados.add(url)
+        else:
+            logger.info("  url duplicada="+url)
+
+    return devuelve
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/uploadedto.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/uploadedto.py
index f26108f10d45acbfdece105007c859a35a5e36d7..723623b7c812faae1e39fb1203dd8bd455ff9e34 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/uploadedto.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/uploadedto.py
@@ -142,6 +142,21 @@ def find_videos(data):
     logger.info("[uploadedto.py] find_videos #"+patronvideos+"#")
     matches = re.compile(patronvideos,re.DOTALL).findall(data)
 
+    for match in matches:
+        titulo = "[uploaded.to]"
+        url = "http://uploaded.net/file/"+match
+        if url not in encontrados:
+            logger.info("  url="+url)
+            devuelve.append( [ titulo , url , 'uploadedto' ] )
+            encontrados.add(url)
+        else:
+            logger.info("  url duplicada="+url)
+
+    # http://ul.to/f/y2y6nzep
+    patronvideos  = 'ul.to/f/([a-zA-Z0-9]+)'
+    logger.info("[uploadedto.py] find_videos #"+patronvideos+"#")
+    matches = re.compile(patronvideos,re.DOTALL).findall(data)
+
     for match in matches:
         titulo = "[uploaded.to]"
         url = "http://uploaded.net/file/"+match
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/videomega.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/videomega.py
index b2277ddef410d2568db282b6faf34b4ee7e2dd23..3255ab89748da4c7e1260cd615b3adebd1d689d9 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/videomega.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/servers/videomega.py
@@ -1,94 +1,65 @@
 # -*- coding: utf-8 -*-
-#------------------------------------------------------------
+# ------------------------------------------------------------
 # pelisalacarta - XBMC Plugin
 # Conector para videomega
 # http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
-import urlparse,urllib2,urllib,re
-import os
+import re
+import urllib
 
-from core import scrapertools
+from core import jsunpack
 from core import logger
-from core import config
+from core import scrapertools
 
-def test_video_exists( page_url ):
-    logger.info("pelisalacarta.videomega test_video_exists(page_url='%s')" % page_url)
-    
-    return True,""
+headers = [
+    ['User-Agent',
+     'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'],
+]
 
-def get_video_url( page_url , premium = False , user="" , password="", video_password="" ):
-    logger.info("pelisalacarta.videomega get_video_url(page_url='%s')" % page_url)
 
-    #data = scrapertools.cache_page(page_url)
-    data = scrapertools.downloadpage(page_url,follow_redirects=False)
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    logger.info("streamondemand.videomega get_video_url(page_url='%s')" % page_url)
+
+    headers.append(['Referer', page_url])
+    data = scrapertools.cache_page(page_url, headers=headers)
     video_urls = []
 
-    location = scrapertools.find_single_match(data,'<source src="([^"]+)"')
-    logger.info("pelisalacarta.videomega location="+location)
+    patron = r"(eval.function.p,a,c,k,e,.*?)\s*</script>"
+    data = scrapertools.find_single_match(data, patron)
+    if data != '':
+        data = jsunpack.unpack(data)
+
+        location = scrapertools.find_single_match(data, r'"src"\s*,\s*"([^"]+)')
+        location += '|' + urllib.urlencode(dict(headers))
+        logger.info("streamondemand.videomega location=" + location)
 
-    #http://st100.u1.videomega.tv/v/bf38b3577874d7ce424c1c87d6d1b8d9.mp4?st=kuiAz1XJ7XFzOCnaleGVxA&start=0
-    #http://st100.u1.videomega.tv/v/bf38b3577874d7ce424c1c87d6d1b8d9.mp4?st=kuiAz1XJ7XFzOCnaleGVxA
-    video_urls.append( [ scrapertools.get_filename_from_url(location)[-4:]+" [videomega]" , location ] )
+        video_urls.append([scrapertools.get_filename_from_url(location)[-4:] + " [videomega]", location])
 
     for video_url in video_urls:
-        logger.info("pelisalacarta.videomega %s - %s" % (video_url[0],video_url[1]))
+        logger.info("streamondemand.videomega %s - %s" % (video_url[0], video_url[1]))
 
     return video_urls
 
+
 # Encuentra vídeos del servidor en el texto pasado
 def find_videos(data):
     encontrados = set()
     devuelve = []
 
-    # http://videomega.net/auoxxtvyoy
-    patronvideos  = 'videomega.tv/([A-Za-z0-9]+)'
-    logger.info("pelisalacarta.videomega find_videos #"+patronvideos+"#")
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
+    pattern = r'//(?:www.)?videomega\.tv/(?:(?:iframe|cdn|validatehash|view)\.php)?\?(?:ref|hashkey)=([a-zA-Z0-9]+)'
 
-    for match in matches:
-        titulo = "[videomega]"
-        url = "http://videomega.tv/view.php?ref="+match+"&width=100%&height=400"
-        if url not in encontrados:
-            logger.info("  url="+url)
-            devuelve.append( [ titulo , url , 'videomega' ] )
-            encontrados.add(url)
-        else:
-            logger.info("  url duplicada="+url)
-
-    # http://videomega.net/auoxxtvyoy
-    patronvideos  = 'videomega.tv/cdn.php\?ref\=([A-Za-z0-9]+)'
-    logger.info("pelisalacarta.videomega find_videos #"+patronvideos+"#")
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
+    logger.info("[videomega.py] find_videos #" + pattern + "#")
+    matches = re.compile(pattern, re.DOTALL).findall(data)
 
-    for match in matches:
+    for media_id in matches:
         titulo = "[videomega]"
-        url = "http://videomega.tv/view.php?ref="+match+"&width=100%&height=400"
+        url = 'http://videomega.tv/cdn.php?ref=%s' % media_id
         if url not in encontrados:
-            logger.info("  url="+url)
-            devuelve.append( [ titulo , url , 'videomega' ] )
+            logger.info("  url=" + url)
+            devuelve.append([titulo, url, 'videomega'])
             encontrados.add(url)
         else:
-            logger.info("  url duplicada="+url)
-            
-    # http://videomega.tv/?ref=NcYTGcGNUY
-    patronvideos  = 'videomega.tv/\?ref\=([A-Za-z0-9]+)'
-    logger.info("pelisalacarta.videomega find_videos #"+patronvideos+"#")
-    matches = re.compile(patronvideos,re.DOTALL).findall(data)
-
-    for match in matches:
-        titulo = "[videomega]"
-        url = "http://videomega.tv/view.php?ref="+match+"&width=100%&height=400"
-        if url not in encontrados:
-            logger.info("  url="+url)
-            devuelve.append( [ titulo , url , 'videomega' ] )
-            encontrados.add(url)
-        else:
-            logger.info("  url duplicada="+url)
-            
-    return devuelve
-
-def test():
-    video_urls = get_video_url("http://videomega.tv/iframe.php?ref=LWfaTEDONS")
+            logger.info("  url duplicada=" + url)
 
-    return len(video_urls)>0
\ No newline at end of file
+    return devuelve
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/version.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/version.xml
index a50c00f696db3ca1fadb981d16ff04d9c5ef0328..8cc6d130a5f21aeb17d87704b03867a12a944705 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/version.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.pelisalacarta/version.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <version>
 	<name>pelisalacarta</name>
-	<tag>4.0.5</tag>
-	<version>4005</version>
-	<date>20/12/2015</date>
+	<tag>4.0.6</tag>
+	<version>4006</version>
+	<date>14/01/2016</date>
 	<changes>Actualización semanal</changes>
 </version>
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/addon.xml
index 119cd7516e79a1f7fe8c344b0e08bea06f1e993e..eb7274a0fd42c16c63af740cad45a66ca9750202 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/addon.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.phstreams" name="Phoenix" version="2.7.8" provider-name="Blazetamer, lambda, VinMan_JSV">
+<addon id="plugin.video.phstreams" name="Phoenix" version="2.8.5" provider-name="Blazetamer, lambda, VinMan_JSV">
 	<requires>
 		<import addon="xbmc.python" version="2.1.0" />
 		<import addon="script.module.pyxbmct" version="1.1.4" />
 		<import addon="script.module.requests" version="1.1.0" />
-		<import addon="script.module.metahandler" version="2.3.1" />
+		<import addon="script.module.urlresolver" version="2.10.11"/>
+		<import addon="script.module.metahandler" version="1.0.0" />
 		<import addon="plugin.video.youtube" optional="true" />
 	</requires>
 	<extension point="xbmc.python.pluginsource" library="default.py">
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/changelog.txt
index 89cea55bf6813d067eac795d91c33cc3cf18aece..e3380d7fb6edfc0c72a73cd3c2366d20c9eca7ad 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/changelog.txt
@@ -1,3 +1,20 @@
+V2.8.3
+-updated resolvers
+
+V2.8.2
+-updated available resolvers
+
+V2.8.1
+-reworked Huddle 
+-updated resolvers
+
+V2.8.0
+-added randomizer for Huddle
+
+V2.7.9
+-Added WWE and SOCCER in Huddle
+-Fixed connection issues Huddle
+
 V2.7.8
 - Added MMA to Huddle
 - Updated available resolvers.
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/default.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/default.py
index 25422e2409b763db4fdef3fd68bc68c1c864fe1e..22ebb2522a23b5684ff29f4346a6186b1f8fc413 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/default.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/default.py
@@ -20,7 +20,7 @@
 '''
 
 
-import urlparse,sys
+import urlparse,sys,re
 params = dict(urlparse.parse_qsl(sys.argv[2].replace('?','')))
 
 
@@ -164,9 +164,19 @@ elif action == 'radio181fm':
     from resources.lib.indexers import phradios
     phradios.radio181fm(image, fanart)
 
-elif action == 'radiotunes':
-    from resources.lib.indexers import phradios
-    phradios.radiotunes(image, fanart)
+elif ('HH') in action:
+    from resources.lib.libraries import control
+    mediaPath = control.addonInfo('path') + '/resources/lib/indexers/phhuddle.py'
+    print action
+    file = open(mediaPath, 'r')
+    getter = file.read()
+    file.close()
+    list = re.findall('(HH.+?\(url\))', getter)
+    for item in list:
+        test = 'phhuddle.'+ item
+        if item[:-5] == action:
+            from resources.lib.indexers import phhuddle
+            exec test       
 
 elif action == 'Kickinradio':
     from resources.lib.indexers import phradios
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phhuddle.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phhuddle.py
index 5f56d9582bd103d44f0da40cf3f3f88c3718e142..a37a71bd6fa9aa7e4a307674f6dc3a24f374fff7 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phhuddle.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phhuddle.py
@@ -25,31 +25,39 @@
 ### Thanks to Gerikss for the structure of code
 ### Ported to Phoenix by VinMan_JSV 2016
 
+
 import cookielib, calendar, time, json, xbmc
 import re,sys,urllib,urlparse,base64,urllib2
 from resources.lib.libraries import control
 from resources.lib.libraries import client
 from datetime import datetime, timedelta
+from resources.lib.resolvers import sawlive
+
 
-mediaPath = control.addonInfo('path') + '/resources/media/phhuddle/'
 display_status = 'true'
 display_start_time = 'true'
-logos ={'nba': mediaPath+'nba.png',
-        'nhl': mediaPath+'nhl.png',
-        'nfl': mediaPath+'nfl.png',
-        'mlb': mediaPath+'mlb.png',
-        'MMA': mediaPath+'mma.png'}
-back = {'nba':mediaPath+'NBA-Globe.jpg',
-        'nhl':mediaPath+'NHL.jpg',
-        'nfl':mediaPath+'NFL.jpg',
-        'MMA':mediaPath+'mma.jpg'}
+logos ={'nba': 'http://s16.postimg.org/q701239gl/nba.png',
+        'nhl': 'http://s22.postimg.org/je1f082b5/nhl.png',
+        'nfl': 'http://s22.postimg.org/5s0p7okoh/nfl.png',
+        'mlb': 'http://s22.postimg.org/o2ccyal69/mlb.png',
+        'MMA': 'http://s22.postimg.org/vwcyjosz5/mma.png',
+        'Soccer': 'http://s22.postimg.org/g8gta0jox/soccer.png',
+        'WWE': 'http://s22.postimg.org/6du9hj54h/wwe.png'}
+back = {'nba':'http://s22.postimg.org/wed5wnovl/NBA_Globe.jpg',
+        'nhl':'http://s22.postimg.org/4gsxz7p2p/NHL.jpg',
+        'nfl':'http://s22.postimg.org/sw1609nzl/NFL.jpg',
+        'MMA':'http://s22.postimg.org/k8nym9a5t/mma.jpg',
+        'Soccer': 'http://s22.postimg.org/3v3z33u0h/soccer.jpg',
+        'WWE': 'http://s22.postimg.org/4aju9v5bl/wwe.jpg'}
 def HuddleDirectory():
-    addDirectoryItem('[COLOR=FF00FF00][B] NHL  [/B][/COLOR]','Huddle_Main', '0', mediaPath+'nhl.png', mediaPath+'Huddle-fanart.jpg',url='nhl')
-    addDirectoryItem('[COLOR=FF00FF00][B] NBA  [/B][/COLOR]','Huddle_Main', '0', mediaPath+'nba.png', mediaPath+'Huddle-fanart.jpg',url='nba')
-    addDirectoryItem('[COLOR=FF00FF00][B] NFL  [/B][/COLOR]','Huddle_Main', '0', mediaPath+'nfl.png', mediaPath+'Huddle-fanart.jpg',url='nfl')
-    addDirectoryItem('[COLOR=FF00FF00][B] MLB - COMING SOON [/B][/COLOR]','Play_Main', '0', mediaPath+'icon.png', mediaPath+'Huddle-fanart.jpg',url='mlb')
-    addDirectoryItem('[COLOR=FF00FF00][B] MMA  [/B][/COLOR]', 'Huddle_Sites', '0', mediaPath+'mma.png', mediaPath+'Huddle-fanart.jpg',url='MMA')
-    addDirectoryItem('[COLOR=FFFFFF00][B] ARCHIVE [/COLOR][/B]', 'Archive_Main', '0', mediaPath+'archive.png', mediaPath+'Huddle-fanart.jpg','')
+    addDirectoryItem('[COLOR=FF00FF00][B] NHL  [/B][/COLOR]','Huddle_Main', '0', 'http://s22.postimg.org/je1f082b5/nhl.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg',url='nhl')
+    addDirectoryItem('[COLOR=FF00FF00][B] NBA  [/B][/COLOR]','Huddle_Main', '0', 'http://s16.postimg.org/q701239gl/nba.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg',url='nba')
+    addDirectoryItem('[COLOR=FF00FF00][B] NFL  [/B][/COLOR]','Huddle_Main', '0', 'http://s22.postimg.org/5s0p7okoh/nfl.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg',url='nfl')
+    addDirectoryItem('[COLOR=FF00FF00][B] MLB - COMING SOON [/B][/COLOR]','Play_Main', '0', 'http://s22.postimg.org/o2ccyal69/mlb.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg',url='mlb')
+    addDirectoryItem('[COLOR=FF00FF00][B] MMA  [/B][/COLOR]', 'Huddle_Sites', '0', 'http://s22.postimg.org/vwcyjosz5/mma.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg',url='MMA')
+    addDirectoryItem('[COLOR=FF00FF00][B] SOCCER  [/B][/COLOR]', 'Huddle_Sites', '0', 'http://s22.postimg.org/g8gta0jox/soccer.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg',url='Soccer')
+    addDirectoryItem('[COLOR=FF00FF00][B] WWE  [/B][/COLOR]', 'Huddle_Sites', '0', 'http://s22.postimg.org/6du9hj54h/wwe.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg',url='WWE')
+    addDirectoryItem('[COLOR=FFFFFF00][B] ARCHIVE [/COLOR][/B]', 'Archive_Main', '0', 'http://s20.postimg.org/ea1tzp0ct/archive.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg','')
     endCategory()
 
 
@@ -134,151 +142,171 @@ def Huddle_Main(url, image, fanart):
 def Huddle_Sites(url, image, fanart):
     try:
         
-        
-        
-            if url != "MMA":
-            
+            if not ('MMA') in url and not ('Soccer') in url and not ('WWE')in url and not ('match') in url and not ('fight') in url and not ('wwe') in url:            
                 murl = url.split('|')
                 home = murl[1].split('vs')[0]
                 away = murl[1].split('vs')[1]
                 url = murl[0]
                 html = client.request(url)
-                block_content = client.parseDOM(html, "a", attrs={"class": "comments may-blank"}, ret="href") 
+                block_content = client.parseDOM(html, "a", attrs={"class": "comments may-blank"}, ret="href")
                 orig_title = '[COLOR=FF00FF00][B]'+away+' at '+home+'[/B][/COLOR]'
                 home_f = home.lower().split()[0]
                 away_f = away.lower().split()[0]
                 home_l = home.lower().split()[-1]
                 away_l = away.lower().split()[-1]
+                home_sm = home.lower().split()[-1][:3]
+                away_sm = away.lower().split()[-1][:3]
                 link = None	
                 for element in block_content:
-                        if (home_f in element and (away_l in element or away_f in element)) or (home_l in element and (away_l in element or away_f in element)) or (home_f in element and home_l in element) or (away_f in element and away_l in element):
+                        if (home_sm in element and (away_sm in element or away_f in element)) or (home_f in element and (away_l in element or away_f in element)) or (home_l in element and (away_l in element or away_f in element)) or (home_f in element and home_l in element) or (away_f in element and away_l in element):
                                 link = element
                                 break
                         else:
                                 continue
-                            
-            if url =="MMA":
-                    fanart = back['MMA']
-                    link = 'https://www.reddit.com/r/MMAStreams/'
-                    html = client.request(link)
-                    result = client.parseDOM(html, 'p', attrs={'class': 'title'})
-                    channel = client.parseDOM(result, 'a', ret='href')
-                    for item in channel:
-                            if ('fight') in item:
-                                link = 'https://www.reddit.com/'+item
-                                break
-                            else:
-                                continue
-                    if not ('fight') in link:addDirectoryItem("[COLOR=FFFF0000]No live event right now...Try Later![/COLOR]", 'Play_Main', image, image, fanart)
-            if link:   
+            else:pass                
+            if url =="MMA" or url == "Soccer" or url == "WWE":
+                    fanart = back[url]
+                    low = url.lower()
+                    if url == "Soccer": low = "thread"
+                    if url =="WWE": low ="thread"
+                    link = 'https://www.reddit.com/r/'+url+'Streams/'
+                    T = 0
+                    try:
+                        html = client.request(link)
+                        result = client.parseDOM(html, 'p', attrs={'class': 'title'})
+                        channel = client.parseDOM(result, 'a', ret='href')  
+                        for item in channel:
+                                if ('match') in item or ('game') in item or ('fight') in item or ('mma') in item or ('event') in item or ('wwe') in item:
+                                    url = 'https://www.reddit.com/'+item
+                                    url = url.replace('com//', 'com/')
+                                    try:
+                                        title = item.split(low)[1].replace('_',' ').upper()[:-1]
+                                    except:
+                                        
+                                        title = item
+                                    if not ('comment') in title and not ('http') in title:
+                                        T = T + 1
+                                        addDirectoryItem("[COLOR=FFFF0000]"+title+"[/COLOR]", 'Huddle_Sites', image, image, fanart,url)
+                                    else:
+                                        pass         
+                    except:pass
+                    if T == 0:addDirectoryItem("[COLOR=FFFF0000]No live event right now...Try Later![/COLOR]", 'Play_Main', image, image, fanart,'')
+                    endDirectory()
+            else:pass
+                   
+            if ('soccer') in url or ('fight') in url or ('wwe') in url or ('match') in url or ('event') in url or ('mma') in url:link = url       
+            if link:
+                T = 0
                 html = client.request(link)
                 content = client.parseDOM(html, "a", ret="href")
                 cont = client.parseDOM(html, "p")
                 ct = client.parseDOM(html, "code")
+                check = 'http://www.rawstreams.com'
                 urls = []
                 for el in content:
-                           
+                                                
                         if 'blabseal.com' in el:
-                                url = Blabseal(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Blabseal.com', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Blabseal.com', 'HHBlabseal',image, image,fanart, url)
                                         urls.append(url)
                         elif '1apps.com' in el:
-                                url = Oneapp(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Oneapp', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Oneapp', 'HHOneapp',image, image,fanart, url)
                                         urls.append(url)
                         elif 'youtu' in el and 'channel' not in el and 'list' not in el:
-                                url = GetYoutube(el)
+                                url = el
                                 if url and url not in urls:
-                                        addDirectoryItem('Youtube.com', 'Play_Main',image, image,fanart, url)
-                                        urls.append(url)
+                                        addDirectoryItem('Youtube.com', 'HHGetYoutube',image, image,fanart, url)
+                                        urls.append(url)          
+                        elif 'giostreams' in el:
+                                url = (el)
+                                if url and url not in urls:
+                                        addDirectoryItem('Giostreams.eu', 'HHGiostreams', image, image, fanart, url)
+                                        urls.append(url)                
                         elif 'freecast.in' in el:
-                                url = Freecastin(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Freecast.in', 'Play_Main',image, image,fanart, url)
-                                        urls.append(url)
+                                        addDirectoryItem('Freecast.in', 'HHFreecastin',image, image,fanart, url)
+                                        urls.append(url)                
                         elif 'streamboat.tv' in el:
-                                url = Streambot(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Streamboat.tv', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Streamboat.tv', 'HHStreambot',image, image,fanart, url)
                                         urls.append(url)
                         elif 'nbastream.net' in el:
-                                url = Nbanhlstreams(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Nbastream.net', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Nbastream.net', 'HHNbanhlstreams',image, image,fanart, url)
                                         urls.append(url)
                         elif 'nhlstream.net' in el:
-                                url = Nbanhlstreams(el)
+                                url =(el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Nhlstream.net', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Nhlstream.net', 'HHNbanhlstreams',image, image,fanart, url)
                                         urls.append(url)
                         elif 'livenflstream.net' in el:
-                                url = Nbanhlstreams(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Livenflstream.net', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Livenflstream.net', 'HHNbanhlstreams',image, image,fanart, url)
                                         urls.append(url)
+                        elif 'streamendous' in el:
+                                url = (el)
+                                if url and url not in urls:
+                                        addDirectoryItem('Streamendous', 'HHtester',image, image, fanart, url)
+                                        urls.append(url)                
                         elif 'fs.anvato.net' in el:
-                                url = Getanvato(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Fox ToGo (US IP Only)', 'Play_Main',image, image,fanart, url)
-                                        urls.append(url)
+                                        addDirectoryItem('Fox ToGo (US IP Only)', 'HHGetanvato',image, image,fanart, url)
+                                        urls.append(url)               
                         elif 'streamsarena.eu' in el:
-                                url = Streamarena(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Streamsarena.eu', 'Play_Main',image, image,fanart, url)
-                                        urls.append(url)
+                                        addDirectoryItem('Streamsarena.eu', 'HHStreamarena',image, image,fanart, url)
+                                        urls.append(url)              
                         elif 'streamup.com' in el and 'm3u8' not in el:
-                                url = GetStreamup(el.split('/')[3])
+                                url = el
                                 if url and url not in urls:
-                                        addDirectoryItem('Streamup.com', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Streamup.com', 'HHGetStreamup',image, image,fanart, url)
                                         urls.append(url)
                         elif 'torula' in el:
-                                url = Torula(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Torula.us', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Torula.us', 'HHTorula',image, image,fanart, url)
                                         urls.append(url)
                         elif 'gstreams.tv' in el:
-                                url = Gstreams(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Gstreams.tv', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Gstreams.tv', 'HHGstreams',image, image,fanart, url)
                                         urls.append(url)
                         elif 'nfl-watch.com/live/watch' in el or 'nfl-watch.com/live/-watch' in el or 'nfl-watch.com/live/nfl-network' in el:
-                                url = Nflwatch(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Nfl-watch.com', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Nfl-watch.com', 'HHNflwatch',image, image,fanart, url)
                                         urls.append(url)
                         elif 'ducking.xyz' in el:
-                                url = Ducking(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Ducking.xyz', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Ducking.xyz', 'HHDucking',image, image,fanart, url)
                                         urls.append(url)
                         elif 'streamandme' in el:
-                                url = Streamandme(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Streamandme', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Streamandme', 'HHStreamandme',image, image,fanart, url)
                                         urls.append(url)
                         elif 'mursol.moonfruit.com' in el:
-                                url = Moonfruit(el)
-                                if url and url not in urls:
-                                        addDirectoryItem('Moonfruit', 'Play_Main',image, image,fanart, url)
-                                        urls.append(url)
-                        elif 'room' in el and 'm3u8' in el:
-                                url = Getroom(el)
+                                url = (el)
                                 if url and url not in urls:
-                                        addDirectoryItem('Room HD', 'Play_Main',image, image,fanart, url)
+                                        addDirectoryItem('Moonfruit', 'HHMoonfruit',image, image,fanart, url)
                                         urls.append(url)
                         elif 'm3u8' in el and 'room' not in el and 'anvato' not in el and 'turner.com' not in el:
                                 url = el
                                 if url and url not in urls:
                                         addDirectoryItem('M3U8 stream', 'Play_Main',image, image,fanart, url)
-                                        urls.append(url)            
-                for el in cont:
-                        if '101livesportsvideos.com' in el and 'SD' not in el and 'ace' not in el:
-                                url = Livesports101(el)
-                                if url and url not in urls:
-                                        addDirectoryItem('101livesportsvideos.com', 'Play_Main',image, image,fanart, url)
-                                        urls.append(url)
+                                        urls.append(url)        
+                      
+                
                 for el in ct:
                         if 'turner.com' in el and el not in urls:
                                 try:
@@ -288,100 +316,160 @@ def Huddle_Sites(url, image, fanart):
                                         time_exp = ''
                                 addDirectLink('Turner HD (external player) link expires '+time_exp, {'Title': orig_title}, el)
                                 urls.append(el)		
-                                    
+                                  
             else:
-            
+               
                 addDirectoryItem("[COLOR=FFFF0000]Could not find playable link[/COLOR]", 'Play_Main', image, image, fanart)
+            
             endDirectory()
+           
     except:
         pass
     
-def GetStreamup(channel):
+def HHtester(url):
+    try:
+        html = client.request(url)
+        req = client.parseDOM(html, 'iframe', attrs={'id': 'player'},ret='src')
+        url = url.split('/ch')[0]+req[0]
+        html = client.request(url)
+        req = client.parseDOM(html, 'iframe', attrs={'id': 'player'},ret='src')[0]
+        html = client.request(req)
+        link = re.compile('src="(.+?)"').findall(str(html))
+        for item in link:
+            if ('sawlive') in item:
+                url = sawlive.resolve(item)
+                Play_Main(url)
+            else:pass
+        
+    except:
+            return None
+  
+
+    
+def HHGiostreams(url):
+    try:    
+        req = client.request(url)
+        result = client.parseDOM(req, 'iframe', ret='src')[0]
+        if ('astream') in result:
+            req = client.request(result)
+            result = client.parseDOM(req, 'script', attrs={'type': 'text/javascript'})[0]
+            filer = re.compile('fid="(.+?)"; v_width=(.+?); v_height=(.+?);').findall(result)
+            fid = filer[0][0]
+            v_width = filer[0][1] 
+            v_height = filer[0][2]
+            js = re.findall('src="(.+?)"',req)[0]
+            test = str(js)
+            req = client.request(js)
+            ans = re.findall('src=(.+?) ><',req)[0]
+            if '+' in ans:
+                test = ans.replace('fid', fid)
+                test = test.replace('v_width', v_width).replace('v_height', v_height).replace("'",'').replace('+','')
+            req = client.request(test)
+            token = re.findall("'token', '(.+?)'",req)[0]
+            JS = re.findall('getJSON\("(.+?)",',req)[0]
+            req = client.request(JS)
+            jsl = json.loads(req)
+            url = jsl['rtmp'] +' playpath='+jsl['streamname'] + ' swfUrl=http://www.castup.tv/player/plr.swf live=1 pageUrl='+test+ ' token='+token +' timeout=15'
+            Play_Main(url)
+        else:pass
+        this = client.request(result)
+        link = re.compile('src="(.+?)"').findall(str(this))[0]
+        print link
+        if ('sawlive') in link:
+            link = sawlive.resolve(link)
+            print link
+            Play_Main(link)    
+        else:pass     
+    except:
+        return None
+
+       
+        
+def HHGetStreamup(channel):
+       
 	try:
 		req = client.request('https://api.streamup.com/v1/channels/'+channel)
 		chan = json.loads(req)
+		print chan
 		if chan['channel']['live']:
-			return 'https://video-cdn.streamup.com/app/'+chan['channel']['capitalized_slug'].lower()+'/playlist.m3u8'
+                        videoId = chan['channel']['capitalized_slug'].lower()
+                        html = client.request('https://lancer.streamup.com/api/redirect/'+videoId)
+                        link = 'https://'+html+'/app/'+videoId+'/playlist.m3u8'
+                        Play_Main(link)
+
 	except:
-		return None	
+		return 	
 
-def GetYoutube(url):
+def HHGetYoutube(url):
 	try:
 		regex = (r'(https?://)?(www\.)?(youtube|youtu|youtube-nocookie)\.(com|be)/(watch\?v=|embed/|v/|.+\?v=)?([^&=%\?]{11})')
 		youtube_regex_match = re.match(regex, url)
 		videoId = youtube_regex_match.group(6)
 		link = 'plugin://plugin.video.youtube/?action=play_video&videoid=' + videoId
-		return link
+		Play_Main(link)
+		
 	except:
-		return None
+		return 
 		
-def Getanvato(url):
+def HHGetanvato(url):
 	try:
 		if 'master' in url:
 			return url
 		else:	 
 			lst = url.split('/')
 			link = url.replace(lst[len(lst)-2],'4028k')
-			return link
+			Play_Main(link)
 	except:
-		return None
+		return 
 		
-def Getroom(url):
+def HHAstream(url):
 	try:
-		if 'master' in url:
-			return url
+		if ('master') in url:
+			Play_Main(url)
+			return
 		else:	 
 			lst = url.split('/')
 			link = url.replace(lst[len(lst)-2],'4028k')
-			return link
+			Play_Main(link)
 	except:
-		return url
+		return 
 		
-def Blabseal(url):
+def HHBlabseal(url):
 	try:
 		html = client.request(url)
 		block_content = client.parseDOM(html, "iframe", attrs={"name": "thebox"}, ret="src")[0]
-		link = GetYoutube(block_content)
-		return link
+		HHGetYoutube(block_content)
 	except:
-		return None
+		return 
 		
-def Rawstreams(url):
-	try:
-		html = client.request(url)
-		block_content = client.parseDOM(html, "input", ret="value")
-		return block_content
-	except:
-		return None
+
 		
-def Oneapp(url):
+def HHOneapp(url):
 	try:
 		html = client.request(url)
 		block_content = client.parseDOM(html, "iframe", ret="src")[0]
-		link = GetYoutube(block_content)
-		return link
+		HHGetYoutube(block_content)
 	except:
-		return None
+		return 
 		
-def Torula(url):
+def HHTorula(url):
 	try:
 		html = client.request(url)
 		block_content = client.parseDOM(html, "input", attrs={"id": "vlc"}, ret="value")[0]
 		link = block_content
-		return link
+		Play_Main(link)
 	except:
-		return None
+		return 
 
-def Freecastin(url):
+def HHFreecastin(url):
 	try:
 		html = client.request(url)
 		block_content = client.parseDOM(html, "iframe", attrs={"width": "100%"}, ret="src")[0]
-		link = GetYoutube(block_content)
-		return link
+		HHGetYoutube(block_content)
 	except:
-		return None
+		return 
 		
-def Streambot(url):
+def HHStreambot(url):
 	try:
 		cookieJar = cookielib.CookieJar()
 		opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookieJar), urllib2.HTTPHandler())
@@ -408,11 +496,11 @@ def Streambot(url):
 		connection.close()
 		block_content = client.parseDOM(html, "source", attrs={"type": "application/x-mpegURL"}, ret="src")[0]
 		link = block_content
-		return link
+                Play_Main(link)
 	except:
-		return None
+		return 
 
-def Nbanhlstreams(url):
+def HHNbanhlstreams(url):
 	try:
 		if 'nba' in url:
 			URL = 'http://www.nbastream.net/'
@@ -426,22 +514,20 @@ def Nbanhlstreams(url):
 		link = client.parseDOM(html, "iframe",  ret="src")[0]
 		if 'streamup' in link:
 			channel = link.split('/')[3]
-			link = GetStreamup(channel)
-			return link
+			HHGetStreamup(channel)
 	except:
-		return None
+		return 
 		
-def Streamandme(url):
+def HHStreamandme(url):
 	try:
 		html = client.request(url)
 		link = client.parseDOM(html, "iframe",  ret="src")[0]
 		channel = link.split('/')[3]
-		link = GetStreamup(channel)
-		return link
+		HHGetStreamup(channel)
 	except:
-		return None
+		return 
 
-def Gstreams(url):
+def HHGstreams(url):
 	try:
 		html = client.request(url)
 		link = client.parseDOM(html, "iframe",  ret="src")[0]
@@ -450,18 +536,16 @@ def Gstreams(url):
 			link = html.split('https://')[1]
 			link = link.split("'")[0]
 			link = 'https://' + link 
-			return link
+			Play_Main(link)
 		elif 'streamup.com' in link:
 			channel = link.split('/')[3]
-			link = GetStreamup(channel)
-			return link
+			HHGetStreamup(channel)
 		elif 'youtu' in link:
-			link = GetYoutube(link)
-			return link
+			HHGetYoutube(link)
 	except:
 		return None
 		
-def Moonfruit(url):
+def HHMoonfruit(url):
 	try:
 		cookieJar = cookielib.CookieJar()
 		opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookieJar), urllib2.HTTPHandler())
@@ -485,20 +569,19 @@ def Moonfruit(url):
 		link = client.parseDOM(html, "iframe",  ret="src")[0]
 		if 'streamup.com' in link:
 			channel = link.split('/')[4]
-			link = GetStreamup(channel)
-			return link
+			HHGetStreamup(channel)
 	except:
-		return None
+		return 
 
-def Nflwatch(url):
+def HHNflwatch(url):
 	try:
 		html = client.request(url)
 		links = client.parseDOM(html, "iframe",  ret="src")
 		for link in links:
 			if 'streamup' in link:
 				channel = link.split('/')[3]
-				link = GetStreamup(channel)
-				return link
+				HHGetStreamup(channel)
+				
 			else:
 				continue
 		if 'p2pcast.tv' in html:
@@ -523,11 +606,11 @@ def Nflwatch(url):
 			tkn = js['token']
 			link = link+tkn
 			link = link + '|User-Agent='+agent+'&Referer='+url
-			return link
+			Play_Main(link)
 	except:
-		return None
+		return 
 
-def Ducking(url):
+def HHDucking(url):
 	try:
 		request = urllib2.Request('http://www.ducking.xyz/kvaak/stream/basu.php')
 		request.add_header('Referer', 'www.ducking.xyz/kvaak/')
@@ -536,12 +619,11 @@ def Ducking(url):
 		html = response.read()
 		link = client.parseDOM(html, "iframe", ret="src")[0]
 		channel = link.split('/')[3]
-		link = GetStreamup(channel)
-		return link
+		HHGetStreamup(channel)
 	except:
-		return None
+		return 
 		
-def Streamarena(url):
+def HHStreamarena(url):
 	try:
 		html = client.request(url)
 		link = client.parseDOM(html, "iframe",  ret="src")[1]
@@ -549,46 +631,18 @@ def Streamarena(url):
 		html  = client.request(link)
 		link = client.parseDOM(html, "iframe",  ret="src")[0]
 		channel = link.split('/')[3]
-		link = GetStreamup(channel)
-		return link
+		HHGetStreamup(channel)
 	except:
-		return None
+		return 
 		
-def Livesports101(url):
-	try:
-		url = url.split('</strong>')[0]
-		url = 'http://101'+url.split('101')[1]
-		html = client.request(url)
-		block_content = client.parseDOM(html, "meta", attrs={"property": "og:description"}, ret="content")
-		for el in block_content:
-			if 'youtube.com' in el:
-				link = GetYoutube(block_content)
-				return link
-			elif 'streamboat.tv' in el:
-				link = el
-				link = link.split('http://')[1]
-				link = link.split("'")[0]
-				link = 'http://' + link 
-				return link
-			elif 'streamup' in el:
-				link = el
-				link = link.split('https://')[1]
-				link = link.split("'")[0]
-				link = 'https://' + link 
-				return link
-		block_content = client.parseDOM(html, "embed", attrs={"id": "vlcp"}, ret="target")[0]
-		if 'streamboat' in block_content or 'streamup' in block_content:
-			link = block_content
-			return link
-	except:
-		return None
+
       
 
 def Archive_Main(url, image, fanart):
-    addDirectoryItem('[COLOR=FFFFFF00][B] NHL Archive [/B][/COLOR]','NHL_ARC', '0', mediaPath+'nhl.png', mediaPath+'Huddle-fanart.jpg', url="nhlarch")
-    addDirectoryItem('[COLOR=FFFFFF00][B] NBA Archive [/B][/COLOR]','NBANFL_ARC', '0', mediaPath+'nba.png', mediaPath+'Huddle-fanart.jpg', url="nbaarch")
-    addDirectoryItem('[COLOR=FFFFFF00][B] NFL Archive [/B][/COLOR]','NBANFL_ARC', '0', mediaPath+'nfl.png', mediaPath+'Huddle-fanart.jpg', url="nflarch")
-    addDirectoryItem('[COLOR=FFFFFF00][B] MLB Archive - COMING SOON [/B][/COLOR]','Play_Main', '0', mediaPath+'icon.png', mediaPath+'Huddle-fanart.jpg', url="mlbarch")
+    addDirectoryItem('[COLOR=FFFFFF00][B] NHL Archive [/B][/COLOR]','NHL_ARC', '0', 'http://s22.postimg.org/je1f082b5/nhl.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg', url="nhlarch")
+    addDirectoryItem('[COLOR=FFFFFF00][B] NBA Archive [/B][/COLOR]','NBANFL_ARC', '0', 'http://s16.postimg.org/q701239gl/nba.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg', url="nbaarch")
+    addDirectoryItem('[COLOR=FFFFFF00][B] NFL Archive [/B][/COLOR]','NBANFL_ARC', '0', 'http://s22.postimg.org/5s0p7okoh/nfl.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg', url="nflarch")
+    addDirectoryItem('[COLOR=FFFFFF00][B] MLB Archive - COMING SOON [/B][/COLOR]','Play_Main', '0', 'http://s22.postimg.org/o2ccyal69/mlb.png', 'http://s22.postimg.org/gb0owuncd/Huddle_fanart.jpg', url="mlbarch")
     
     endCategory()
 
@@ -681,15 +735,13 @@ def NHL_Stream(url):
         html = client.request(url)
         js = json.loads(html)
         url = js['video_balancer']['m3u8']
-        player().run(url)
+        Play_Main(url)
     except:
-        pass
+        return
     
 def Play_Main(url):
-    print url
+    
     try:
-        control.idle()
-        
         player().run(url)
     except:
         return
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phradios.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phradios.py
index 9b27af70e8f10cad0c74eb831817f57fa020566d..f9818137ea357b094ded1044494e596347e2c550 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phradios.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phradios.py
@@ -23,6 +23,7 @@
 import re,sys,urllib,urlparse
 from resources.lib.libraries import control
 from resources.lib.libraries import client
+from resources.lib.indexers import phhuddle
 
 mediaPath = control.addonInfo('path') + '/resources/media/phradios/'
 base_url = sys.argv[0]
@@ -32,7 +33,6 @@ args = urlparse.parse_qs(sys.argv[2][1:])
 def radioDirectory():
     addCategoryItem('1FM', 'radio1fm', '1fm-icon.png', '1fm-fanart.jpg')
     addCategoryItem('181FM', 'radio181fm', '181fm-icon.png', '181fm-fanart.jpg')
-    #addCategoryItem('RadioTunes', 'radiotunes', 'radiotunes-icon.png', 'radiotunes-fanart.jpg')
     addCategoryItem('KickinRadio','Kickinradio', 'Kickin-icon.png', 'Kickin-fanart.jpg')
     endCategory()
 
@@ -107,39 +107,6 @@ def radio181fm(image, fanart):
     endDirectory()
 
 
-def radiotunes(image, fanart):
-    try:
-        url = 'http://radiotunes.com/channels'
-
-        result = client.request(url)
-        result = client.parseDOM(result, 'ul', attrs={'id': 'channel-nav'})[0]
-        items = client.parseDOM(result, 'li')
-    except:
-        pass
-
-    for item in items:
-        try:
-            name = client.parseDOM(item, 'span')[0]
-            name = client.replaceHTMLCodes(name)
-            name = name.encode('utf-8')
-
-            url = client.parseDOM(item, 'a', ret='href')[0]
-            url = url.replace('/', '')
-            url = 'http://pub7.radiotunes.com:80/radiotunes_%s_aac' % url
-            url = client.replaceHTMLCodes(url)
-            url = url.encode('utf-8')
-
-            thumb = client.parseDOM(item, 'img', ret='src')[0]
-            thumb = thumb.rsplit('?', 1)[0]
-            if thumb.startswith('//'): thumb = 'http:%s' % thumb
-            thumb = client.replaceHTMLCodes(thumb)
-            thumb = thumb.encode('utf-8')
-
-            addDirectoryItem(name, url, thumb, image, fanart)
-        except:
-            pass
-
-    endDirectory()
 
 
 def Kickinradio(image, fanart):
@@ -177,7 +144,7 @@ def Kickinradiocats(url, image, fanart):
     stream = client.parseDOM(stations, 'samp')
     streams = zip(station,stream)
 
-    #addCategoryItem('[B][I]'+cat+'[/B][/I]','',image,fanart)
+    addCategoryItem('[B][I]'+cat+'[/B][/I]','phhuddle.Play_Main',image,fanart)
     
      
     for CHAN,STREAM in streams:
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phstreams.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phstreams.py
index f1883057d381f93e4f0975aad67beee69fb39662..7c154dd99aa1533abfc73c2265377ca79ed33ee2 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phstreams.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/indexers/phstreams.py
@@ -20,7 +20,7 @@
 '''
 
 
-import os,re,sys,urllib,urlparse
+import os,re,sys,base64,urllib,urlparse
 
 from resources.lib.libraries import cache
 from resources.lib.libraries import cachemeta
@@ -61,6 +61,10 @@ def getDirectory(name, url, audio, image, fanart, playable, content, close=True,
     else:
         result = cache.get(client.request, 0, url)
 
+    try: r = base64.b64decode(result)
+    except: r = ''
+    if '</' in r: result = r
+
     result = str(result).replace('\r','').replace('\n','').replace('\t','').replace('&nbsp;','')
 
     try: fanart = re.findall('<fanart>(.+?)</fanart>', result)[0]
@@ -408,7 +412,8 @@ def searchDirectory(query=None):
 
     global global_search ; global_search = []
 
-    def worker(url): global_search.append(str(client.request(url)))
+    def worker(url):
+        global_search.append(str(client.request(url)))
 
     servers = client.request(phLink)
     servers = str(servers).replace('\n','')
@@ -421,7 +426,15 @@ def searchDirectory(query=None):
     [i.start() for i in threads]
     [i.join() for i in threads]
 
-    urls = global_search ; global_search = []
+    urls = []
+    for i in global_search:
+        try: r = base64.b64decode(i)
+        except: r = ''
+        if '</' in r: urls += [r]
+        else: urls += [i]
+
+    global_search = []
+
     urls = [str(i).replace('\n','') for i in urls]
     urls = [re.findall('<link>(.+?)</link>', i)[:30] for i in urls]
     urls = sum(urls, [])
@@ -431,7 +444,14 @@ def searchDirectory(query=None):
     [i.start() for i in threads]
     [i.join() for i in threads]
 
-    links = global_search ; global_search = []
+    links = []
+    for i in global_search:
+        try: r = base64.b64decode(i)
+        except: r = ''
+        if '</' in r: links += [r]
+        else: links += [i]
+
+    global_search = []
 
     for link in links:
         try:
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/_180upload.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/_180upload.py
deleted file mode 100644
index b3f8a398a3ca2e2f5e025efa79ba27bd616554cb..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/_180upload.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://180upload.com/embed-%s.html' % url
-
-        result = client.request(url)
-
-        post = {}
-        f = client.parseDOM(result, 'form', attrs = {'id': 'captchaForm'})[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post)
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("'file' *, *'(.+?)'").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/__init__.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/__init__.py
index e93f9db4b159b38bd98df58919746c29ac7d4feb..3b538525da5b204ca6446a3365dbd3eb44ee64ad 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/__init__.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/__init__.py
@@ -42,16 +42,17 @@ def request(url, debrid=''):
             import base64 ; url = base64.b64decode(re.compile('\$base64\[(.+?)\]$').findall(url)[0])
             if not url == None: u = url
 
-        if not debrid == '': return debridResolver(url, debrid)
-
         n = (urlparse.urlparse(url).netloc).lower() ; n = re.sub('www\d+\.|www\.|embed\.', '', n)
 
         try: url = re.compile('://(http.+)').findall(url)[0]
         except: pass
 
-        r = [i['class'] for i in info() if n in i['netloc']]
-        r += [i['class'] for i in info2() if n in i['netloc']]
-        r = __import__(r[0], globals(), locals(), [], -1)
+        import urlresolver
+        r = urlresolver.HostedMediaFile(url=url).resolve()
+        if not r == False: return r
+
+        r = [i['class'] for i in info() if n in i['netloc']][0]
+        r = __import__(r, globals(), locals(), [], -1)
         r = r.resolve(url)
 
         return r
@@ -59,433 +60,35 @@ def request(url, debrid=''):
         return u
 
 
-
-def rdDict():
-    try:
-        if '' in debridCredentials()['realdebrid'].values(): raise Exception()
-        url = 'http://api.real-debrid.com/rest/1.0/hosts/domains'
-        result = cache.get(client.request, 24, url)
-        hosts = json.loads(result)
-        hosts = [i.lower() for i in hosts]
-        return hosts
-    except:
-        return []
-
-
-def pzDict():
-    try:
-        if '' in debridCredentials()['premiumize'].values(): raise Exception()
-        user, password = debridCredentials()['premiumize']['user'], debridCredentials()['premiumize']['pass']
-        url = 'http://api.premiumize.me/pm-api/v1.php?method=hosterlist&params[login]=%s&params[pass]=%s' % (user, password)
-        result = cache.get(client.request, 24, url)
-        hosts = json.loads(result)['result']['hosterlist']
-        hosts = [i.lower() for i in hosts]
-        return hosts
-    except:
-        return []
-
-
-def adDict():
-    try:
-        if '' in debridCredentials()['alldebrid'].values(): raise Exception()
-        url = 'http://alldebrid.com/api.php?action=get_host'
-        result = cache.get(client.request, 24, url)
-        hosts = json.loads('[%s]' % result)
-        hosts = [i.lower() for i in hosts]
-        return hosts
-    except:
-        return []
-
-
-def rpDict():
-    try:
-        if '' in debridCredentials()['rpnet'].values(): raise Exception()
-        url = 'http://premium.rpnet.biz/hoster2.json'
-        result = cache.get(client.request, 24, url)
-        result = json.loads(result)
-        hosts = result['supported']
-        hosts = [i.lower() for i in hosts]
-        return hosts
-    except:
-        return []
-
-
-def rdAuthorize():
-    try:
-        CLIENT_ID = 'MUQMIQX6YWDSU'
-        USER_AGENT = 'URLResolver for Kodi'
-
-        headers = {'User-Agent': USER_AGENT}
-        url = 'http://api.real-debrid.com/oauth/v2/device/code?client_id=%s&new_credentials=yes' % (CLIENT_ID)
-        result = client.request(url, headers=headers)
-        result = json.loads(result)
-        verification_url = 'Go to URL: %s' % (result['verification_url'])
-        user_code = 'When prompted enter: %s' % (result['user_code'])
-        device_code = result['device_code']
-        interval = result['interval']
-
-        progressDialog = control.progressDialog
-        progressDialog.create('RealDebrid', verification_url, user_code)
-
-        for i in range(0, 3600):
-            try:
-                if progressDialog.iscanceled(): break
-                time.sleep(1)
-                if not float(i) % interval == 0: raise Exception()
-                url = 'https://api.real-debrid.com/oauth/v2/device/credentials?client_id=%s&code=%s' % (CLIENT_ID, device_code)
-                result = client.request(url, headers=headers, error=True)
-                result = json.loads(result)
-                if 'client_secret' in result: break
-            except:
-                pass
-
-        try: progressDialog.close()
-        except: pass
-
-        id, secret = result['client_id'], result['client_secret'] 
-
-        url = 'https://api.real-debrid.com/oauth/v2/token'
-        post = urllib.urlencode({'client_id': id, 'client_secret': secret, 'code': device_code, 'grant_type': 'http://oauth.net/grant_type/device/1.0'})
-
-        result = client.request(url, post=post, headers=headers)
-        result = json.loads(result)
-
-        token, refresh = result['access_token'], result['refresh_token']
-
-        control.setSetting(id='realdebrid_id', value=id)
-        control.setSetting(id='realdebrid_secret', value=secret)
-        control.setSetting(id='realdebrid_token', value=token)
-        control.setSetting(id='realdebrid_refresh', value=refresh)
-    except:
-        return
-
-
-def debridCredentials():
-    return {
-        'realdebrid': {
-        'id': control.setting('realdebrid_id'),
-        'secret': control.setting('realdebrid_secret'),
-        'token': control.setting('realdebrid_token'),
-        'refresh': control.setting('realdebrid_refresh')
-    },
-        'premiumize': {
-        'user': control.setting('premiumize_user'),
-        'pass': control.setting('premiumize_password')
-    },
-        'alldebrid': {
-        'user': control.setting('alldebrid_user'),
-        'pass': control.setting('alldebrid_password')
-    },
-        'rpnet': {
-        'user': control.setting('rpnet_user'),
-        'pass': control.setting('rpnet_password')
-    }}
-
-
-def debridResolver(url, debrid):
-    u = url.replace('filefactory.com/stream/', 'filefactory.com/file/')
-
-    try:
-        if not debrid == 'realdebrid' and not debrid == True: raise Exception()
-
-        credentials = debridCredentials()['realdebrid']
-        if '' in credentials.values(): raise Exception()
-        id, secret, token, refresh = credentials['id'], credentials['secret'], credentials['token'], credentials['refresh']
-
-        USER_AGENT = 'URLResolver for Kodi'
-
-        post = urllib.urlencode({'link': url})
-        headers = {'Authorization': 'Bearer %s' % token, 'User-Agent': USER_AGENT}
-        url = 'http://api.real-debrid.com/rest/1.0/unrestrict/link'
-
-        result = client.request(url, post=post, headers=headers, error=True)
-        result = json.loads(result)
-
-        if 'error' in result and result['error'] == 'bad_token':
-            result = client.request('https://api.real-debrid.com/oauth/v2/token', post=urllib.urlencode({'client_id': id, 'client_secret': secret, 'code': refresh, 'grant_type': 'http://oauth.net/grant_type/device/1.0'}), headers={'User-Agent': USER_AGENT}, error=True)
-            result = json.loads(result)
-            if 'error' in result: return
-
-            headers['Authorization'] = 'Bearer %s' % result['access_token']
-            result = client.request(url, post=post, headers=headers)
-            result = json.loads(result)
-
-        url = result['download']
-        return url
-    except:
-        pass
-
-    try:
-        if not debrid == 'premiumize' and not debrid == True: raise Exception()
-
-        credentials = debridCredentials()['premiumize']
-        if '' in credentials.values(): raise Exception()
-        user, password = credentials['user'], credentials['pass']
-
-        url = 'http://api.premiumize.me/pm-api/v1.php?method=directdownloadlink&params[login]=%s&params[pass]=%s&params[link]=%s' % (user, password, urllib.quote_plus(u))
-        result = client.request(url, close=False)
-        url = json.loads(result)['result']['location']
-        return url
-    except:
-        pass
-
-    try:
-        if not debrid == 'alldebrid' and not debrid == True: raise Exception()
-
-        credentials = debridCredentials()['alldebrid']
-        if '' in credentials.values(): raise Exception()
-        user, password = credentials['user'], credentials['pass']
-
-        login_data = urllib.urlencode({'action': 'login', 'login_login': user, 'login_password': password})
-        login_link = 'http://alldebrid.com/register/?%s' % login_data
-        cookie = client.request(login_link, output='cookie', close=False)
-
-        url = 'http://www.alldebrid.com/service.php?link=%s' % urllib.quote_plus(u)
-        result = client.request(url, cookie=cookie, close=False)
-        url = client.parseDOM(result, 'a', ret='href', attrs = {'class': 'link_dl'})[0]
-        url = client.replaceHTMLCodes(url)
-        url = '%s|Cookie=%s' % (url, urllib.quote_plus(cookie))
-        return url
-    except:
-        pass
-
-    try:
-        if not debrid == 'rpnet' and not debrid == True: raise Exception()
-
-        credentials = debridCredentials()['rpnet']
-        if '' in credentials.values(): raise Exception()
-        user, password = credentials['user'], credentials['pass']
-
-        login_data = urllib.urlencode({'username': user, 'password': password, 'action': 'generate', 'links': u})
-        login_link = 'http://premium.rpnet.biz/client_api.php?%s' % login_data
-        result = client.request(login_link, close=False)
-        result = json.loads(result)
-        url = result['links'][0]['generated']
-        return url
-    except:
-        return
-
-
-
-def hostDict():
-    d = [i['netloc'] for i in info()]
-    try: d = [i.lower() for i in reduce(lambda x, y: x+y, d)]
-    except: pass
-    return [x for y,x in enumerate(d) if x not in d[:y]]
-
-
-def hosthqDict():
-    d = [i['netloc'] for i in info() if 'quality' in i and i['quality'] == 'High']
-    try: d = [i.lower() for i in reduce(lambda x, y: x+y, d)]
-    except: pass
-    return [x for y,x in enumerate(d) if x not in d[:y]]
-
-
-def hostmqDict():
-    d = [i['netloc'] for i in info() if 'quality' in i and i['quality'] == 'Medium']
-    try: d = [i.lower() for i in reduce(lambda x, y: x+y, d)]
-    except: pass
-    return [x for y,x in enumerate(d) if x not in d[:y]]
-
-
-def hostlqDict():
-    d = [i['netloc'] for i in info() if 'quality' in i and i['quality'] == 'Low']
-    try: d = [i.lower() for i in reduce(lambda x, y: x+y, d)]
-    except: pass
-    return [x for y,x in enumerate(d) if x not in d[:y]]
-
-
-def hostcapDict():
-    d = [i['netloc'] for i in info() if 'captcha' in i and i['captcha'] == True]
-    try: d = [i.lower() for i in reduce(lambda x, y: x+y, d)]
-    except: pass
-    return [x for y,x in enumerate(d) if x not in d[:y]]
-
-
-def hostprDict():
-    d = [i['netloc'] for i in info() if 'class' in i and i['class'] == '']
-    try: d = [i.lower() for i in reduce(lambda x, y: x+y, d)]
-    except: pass
-    return [x for y,x in enumerate(d) if x not in d[:y]]
-
-
-
 def info():
     return [{
-        'class': '',
-        'netloc': ['oboom.com', 'rapidgator.net', 'rg.to', 'uploaded.net', 'uploaded.to', 'ul.to', 'filefactory.com', 'nitroflare.com', 'turbobit.net'],
-        'quality': 'High'
-    }, {
-        'class': '_180upload',
-        'netloc': ['180upload.com'],
-        'quality': 'High'
-    }, {
-        'class': 'allmyvideos',
-        'netloc': ['allmyvideos.net'],
-        'quality': 'Medium'
-    }, {
-        'class': 'allvid',
-        'netloc': ['allvid.ch'],
-        'quality': 'High'
-    }, {
-        'class': 'bestreams',
-        'netloc': ['bestreams.net'],
-        'quality': 'Low'
-    }, {
         'class': 'castalba',
         'netloc': ['castalba.tv']
-    }, {
-        'class': 'clicknupload',
-        'netloc': ['clicknupload.me', 'clicknupload.com'],
-        'quality': 'High'
-    }, {
-        'class': 'cloudtime',
-        'netloc': ['cloudtime.to'],
-        'quality': 'Medium'
-    }, {
-        'class': 'cloudyvideos',
-        'netloc': ['cloudyvideos.com'],
-        'quality': 'High'
-    }, {
-        'class': 'cloudzilla',
-        'netloc': ['cloudzilla.to'],
-        'quality': 'Medium'
-    }, {
-        'class': 'daclips',
-        'netloc': ['daclips.in'],
-        'quality': 'Low'
-    }, {
-        'class': 'dailymotion',
-        'netloc': ['dailymotion.com']
-    }, {
-        'class': 'datemule',
-        'netloc': ['datemule.com']
-    }, {
-        'class': 'exashare',
-        'netloc': ['exashare.com'],
-        'quality': 'Low'
-    }, {
-        'class': 'filehoot',
-        'netloc': ['filehoot.com'],
-        'quality': 'Low'
-    }, {
-        'class': 'filenuke',
-        'netloc': ['filenuke.com', 'sharesix.com'],
-        'quality': 'Low'
     }, {
         'class': 'filmon',
         'netloc': ['filmon.com']
     }, {
         'class': 'finecast',
         'netloc': ['finecast.tv']
-    }, {
-        'class': 'filepup',
-        'netloc': ['filepup.net']
-    }, {
-        'class': 'googledocs',
-        'netloc': ['docs.google.com', 'drive.google.com']
-    }, {
-        'class': 'googlephotos',
-        'netloc': ['photos.google.com']
-    }, {
-        'class': 'googlepicasa',
-        'netloc': ['picasaweb.google.com']
-    }, {
-        'class': 'googleplus',
-        'netloc': ['plus.google.com']
-    }, {
-        'class': 'gorillavid',
-        'netloc': ['gorillavid.com', 'gorillavid.in'],
-        'quality': 'Low'
-    }, {
-        'class': 'grifthost',
-        'netloc': ['grifthost.com'],
-        'quality': 'High'
+    }, {   
+        'class': 'google',
+        'netloc': ['docs.google.com', 'drive.google.com', 'photos.google.com', 'picasaweb.google.com', 'plus.google.com']
     }, {
         'class': 'hdcast',
         'netloc': ['hdcast.me']
     }, {
         'class': 'hdcastorg',
         'netloc': ['hdcast.org']
-    }, {
-        'class': 'hugefiles',
-        'netloc': ['hugefiles.net'],
-        'quality': 'High',
-        'captcha': True
-    }, {
-        'class': 'ipithos',
-        'netloc': ['ipithos.to'],
-        'quality': 'High'
-    }, {
-        'class': 'ishared',
-        'netloc': ['ishared.eu'],
-        'quality': 'High'
-    }, {
-        'class': 'letwatch',
-        'netloc': ['letwatch.us'],
-        'quality': 'Medium'
-    }, {
-        'class': 'mailru',
-        'netloc': ['mail.ru', 'my.mail.ru', 'videoapi.my.mail.ru', 'api.video.mail.ru']
-    }, {
-        'class': 'mightyupload',
-        'netloc': ['mightyupload.com'],
-        'quality': 'High'
     }, {
         'class': 'miplayer',
         'netloc': ['miplayer.net'],
         'quality': 'High'
     }, {    
-        'class': 'movdivx',
-        'netloc': ['movdivx.com'],
-        'quality': 'Low'
-    }, {
-        'class': 'movpod',
-        'netloc': ['movpod.net', 'movpod.in'],
-        'quality': 'Low'
-    }, {
-        'class': 'movshare',
-        'netloc': ['movshare.net'],
-        'quality': 'Low'
-    }, {
         'class': 'mybeststream',
         'netloc': ['mybeststream.xyz']
-    }, {
-        'class': 'neodrive',
-        'netloc': ['neodrive.co'],
-        'quality': 'Medium'
-    }, {
-        'class': 'nosvideo',
-        'netloc': ['nosvideo.com', 'noslocker.com'],
-        'quality': 'High'
-    }, {
-        'class': 'novamov',
-        'netloc': ['novamov.com'],
-        'quality': 'Low'
-    }, {
-        'class': 'nowvideo',
-        'netloc': ['nowvideo.eu', 'nowvideo.sx'],
-        'quality': 'Low'
-    }, {
-        'class': 'odnoklassniki',
-        'netloc': ['ok.ru', 'odnoklassniki.ru'],
-        'quality': 'High'
-    }, {
-        'class': 'openload',
-        'netloc': ['openload.io', 'openload.co'],
-        'quality': 'High',
-        'captcha': True
     }, {
         'class': 'p2pcast',
         'netloc': ['p2pcast.tv']
-    }, {
-        'class': 'primeshare',
-        'netloc': ['primeshare.tv'],
-        'quality': 'High'
-    }, {
-        'class': 'promptfile',
-        'netloc': ['promptfile.com'],
-        'quality': 'High'
     }, {
         'class': 'sawlive',
         'netloc': ['sawlive.tv']
@@ -493,68 +96,15 @@ def info():
         'class': 'shadownet',
         'netloc': ['sdw-net.co']
     }, {        
-        'class': 'shared2',
-        'netloc': ['shared2.me'],
-        'quality': 'High'
-    }, {
-        'class': 'sharerepo',
-        'netloc': ['sharerepo.com'],
-        'quality': 'Low'
-    }, {
-        'class': 'speedvideo',
-        'netloc': ['speedvideo.net']
-    }, {
-        'class': 'stagevu',
-        'netloc': ['stagevu.com'],
-        'quality': 'Low'
-    }, {
-        'class': 'streamcloud',
-        'netloc': ['streamcloud.eu'],
-        'quality': 'Medium'
-    }, {
-        'class': 'streamin',
-        'netloc': ['streamin.to'],
-        'quality': 'Medium'
-    }, {
+        'class': 'stream4free',
+        'netloc': ['stream4free.pro', 'stream4free.eu']
+    }, {    
         'class': 'streamlive',
         'netloc': ['streamlive.to'],
         'quality': 'Medium'
     }, {
         'class': 'streamup',
         'netloc': ['streamup.com']
-    }, {
-        'class': 'thevideo',
-        'netloc': ['thevideo.me'],
-        'quality': 'Low'
-    }, {
-        'class': 'tusfiles',
-        'netloc': ['tusfiles.net'],
-        'quality': 'High'
-    }, {
-        'class': 'up2stream',
-        'netloc': ['up2stream.com'],
-        'quality': 'Medium'
-    }, {
-        'class': 'uploadaf',
-        'netloc': ['upload.af'],
-        'quality': 'High'
-    }, {
-        'class': 'uploadc',
-        'netloc': ['uploadc.com', 'uploadc.ch', 'zalaa.com'],
-        'quality': 'High'
-    }, {
-        'class': 'uploadrocket',
-        'netloc': ['uploadrocket.net'],
-        'quality': 'High',
-        'captcha': True
-    }, {
-        'class': 'uptobox',
-        'netloc': ['uptobox.com'],
-        'quality': 'High'
-    }, {
-        'class': 'v_vids',
-        'netloc': ['v-vids.com'],
-        'quality': 'High'
     }, {
         'class': 'vaughnlive',
         'netloc': ['vaughnlive.tv', 'breakers.tv', 'instagib.tv', 'vapers.tv']
@@ -564,88 +114,22 @@ def info():
     }, {
         'class': 'veetle',
         'netloc': ['veetle.com']
-    }, {
-        'class': 'vidag',
-        'netloc': ['vid.ag'],
-        'quality': 'Medium'
-    }, {
-        'class': 'vidbull',
-        'netloc': ['vidbull.com'],
-        'quality': 'Low'
-    }, {
-        'class': 'vidce',
-        'netloc': ['vidce.tv'],
-        'quality': 'High'
-    }, {
-        'class': 'videomega',
-        'netloc': ['videomega.tv'],
-        'quality': 'High'
     }, {
         'class': 'videopremium',
         'netloc': ['videopremium.tv', 'videopremium.me']
     }, {
-        'class': 'videoweed',
-        'netloc': ['videoweed.es'],
-        'quality': 'Low'
-    }, {
-        'class': 'videowood',
-        'netloc': ['videowood.tv'],
-        'quality': 'High'
-    }, {
-        'class': 'vidlockers',
-        'netloc': ['vidlockers.ag'],
-        'quality': 'High'
-    }, {
-        'class': 'vidspot',
-        'netloc': ['vidspot.net'],
-        'quality': 'Medium'
-    }, {
-        'class': 'vidto',
-        'netloc': ['vidto.me'],
-        'quality': 'Medium'
-    }, {
-        'class': 'vidzi',
-        'netloc': ['vidzi.tv'],
-        'quality': 'High'
-    }, {
-        'class': 'vimeo',
-        'netloc': ['vimeo.com']
-    }, {
-        'class': 'vk',
-        'netloc': ['vk.com']
-    }, {
-        'class': 'vodlocker',
-        'netloc': ['vodlocker.com'],
-        'quality': 'Low'
-    }, {
-        'class': 'xvidstage',
-        'netloc': ['xvidstage.com'],
-        'quality': 'Medium'
+        'class': 'watch1080',
+        'netloc': ['watch1080p.com', 'sefilmdk.com']
     }, {
         'class': 'yocast',
         'netloc': ['yocast.tv']
-    }, {
-        'class': 'youtube',
-        'netloc': ['youtube.com'],
-        'quality': 'Medium'
     }, {
         'class': 'zerocast',
         'netloc': ['zerocast.tv']
     }, {
-        'class': 'zettahost',
-        'netloc': ['zettahost.tv'],
-        'quality': 'High'
-    }, {
-        'class': 'zstream',
-        'netloc': ['zstream.to'],
+        'class': 'zoptv',
+        'netloc': ['zoptv.com', 'iptvlinks.tk'],
         'quality': 'High'
     }]
 
 
-def info2():
-    return [{
-        'class': 'watch1080',
-        'netloc': ['watch1080p.com', 'sefilmdk.com']
-    }]
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/allmyvideos.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/allmyvideos.py
deleted file mode 100644
index b11b7319798b5f71d02e4c6b72909e35d421cd0f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/allmyvideos.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://allmyvideos.net/%s' % url
-
-        result = client.request(url, close=False)
-
-        post = {}
-        f = client.parseDOM(result, 'form', attrs = {'action': ''})
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post, close=False)
-
-        url = re.compile('"file" *: *"(http.+?)"').findall(result)[-1]
-        url = '%s?%s&direct=false&ua=false' % (url.split('?')[0], urlparse.urlparse(url).query)
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/allvid.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/allvid.py
deleted file mode 100644
index 2be6e4fc2c01842a72fa95761ae1dd076bf536a8..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/allvid.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://allvid.ch/embed-%s.html' % url
-
-        result = client.request(url)
-
-        r = re.compile('file\s*:\s*"(.+?)".+?label\s*:\s*"(\d+)"').findall(result)
-
-        if len(r) == 0:
-            r = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-            r = jsunpack.unpack(r)
-            r = re.compile('file\s*:\s*"(.+?)".+?label\s*:\s*"(\d+)"').findall(r)
-
-        url = []
-        try: url.append({'quality': '1080p', 'url': [i[0] + headers for i in r if int(i[1]) >= 1080][0]})
-        except: pass
-        try: url.append({'quality': 'HD', 'url': [i[0] + headers for i in r if 720 <= int(i[1]) < 1080][0]})
-        except: pass
-        try: url.append({'quality': 'SD', 'url': [i[0] + headers for i in r if int(i[1]) < 720][0]})
-        except: pass
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/bestreams.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/bestreams.py
deleted file mode 100644
index 6b03865414e201287a72766d7ff546391f7a51d2..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/bestreams.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://bestreams.net/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-        url = re.compile('file *: *"(http.+?)"').findall(result)[-1]
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/clicknupload.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/clicknupload.py
deleted file mode 100644
index 8d67bd4b34549ffadb6634d818252fca855210cd..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/clicknupload.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,time
-from resources.lib.libraries import client
-from resources.lib.libraries import captcha
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('clicknupload.com', 'clicknupload.me')
-
-        result = client.request(url)
-
-        if '>File Not Found<' in result: raise Exception()
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'action': ''})
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update({'method_free': 'Free Download'})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post, close=False)
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'action': '' })
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update({'method_free': 'Free Download'})
-        try: post.update(captcha.request(result))
-        except: pass
-        post = urllib.urlencode(post)
-
-        for i in range(0, 10):
-            try:
-                result = client.request(url, post=post, close=False)
-                if not '>File Download Link Generated<' in result: raise Exception()
-            except:
-                time.sleep(1)
-
-        url = client.parseDOM(result, 'a', ret='onClick')
-        url = [i for i in url if i.startswith('window.open')][0]
-        url = re.compile('[\'|\"](.+?)[\'|\"]').findall(url)[0]
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudtime.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudtime.py
deleted file mode 100644
index 60be4ddc5c2453b537a82645577b782d9e759230..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudtime.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        id = re.compile('//.+?/.+?/([\w]+)').findall(url)
-        id += re.compile('//.+?/.+?v=([\w]+)').findall(url)
-        id = id[0]
-
-        url = 'http://embed.cloudtime.to/embed.php?v=%s' % id
-
-        result = client.request(url)
-
-        key = re.compile('flashvars.filekey=(.+?);').findall(result)[-1]
-        try: key = re.compile('\s+%s="(.+?)"' % key).findall(result)[-1]
-        except: pass
-
-        url = 'http://www.cloudtime.to/api/player.api.php?key=%s&file=%s' % (key, id)
-        result = client.request(url)
-
-        url = re.compile('url=(.+?)&').findall(result)[0]
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudyvideos.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudyvideos.py
deleted file mode 100644
index ea0d6fe417e02a8a91d7e608b05acab93679eb08..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudyvideos.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,time
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        page = 'http://cloudyvideos.com/%s' % url
-
-        result = client.request(page, close=False)
-
-        if '>File Not Found<' in result: raise Exception()
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'action': ''})
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-
-
-        for i in range(0, 5):
-            try:
-                result = client.request(page, post=post, close=False)
-
-                unpacked = ''
-                packed = result.split('\n')
-                for i in packed: 
-                    try: unpacked += jsunpack.unpack(i)
-                    except: unpacked += i
-                result = re.sub('\s\s+', ' ', unpacked)
-
-                url = client.parseDOM(result, 'embed', ret='src')
-                url += re.compile("file *: *[\'|\"](.+?)[\'|\"]").findall(result)
-                url = [i for i in url if '://' in i]
-                url = [i for i in url if not i.endswith('.srt')]
-                url = 'http://' + url[0].split('://', 1)[-1]
-                url += headers
-                return url
-
-            except:
-                time.sleep(1)
-
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudzilla.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudzilla.py
deleted file mode 100644
index 6a4edf29a66e632b4df66d8e0f26b1fb4ba36267..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/cloudzilla.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/share/file/', '/embed/')
-        result = client.request(url)
-
-        url = re.compile('var\s+vurl *= *"(http.+?)"').findall(result)[0]
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/daclips.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/daclips.py
deleted file mode 100644
index a0b8dcccb63283ca96be839f19363765727d2d29..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/daclips.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url, mobile=True)
-
-        url = re.compile('file *: *"(http.+?)"').findall(result)[-1]
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/dailymotion.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/dailymotion.py
deleted file mode 100644
index 9b26ee6a1a805017279ee4cfd1173773b19b1a33..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/dailymotion.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        try: url = urlparse.parse_qs(urlparse.urlparse(url).query)['urlback'][0]
-        except: pass
-
-        id = re.compile('/video/([\w]+)').findall(url)[0]
-
-        u = 'http://www.dailymotion.com/sequence/full/%s' % id
-        result = client.request(u)
-        result = urllib.unquote(result).replace('\\/', '/').replace('\n', '').replace('\'', '"').replace(' ', '')
-
-        content = re.compile('"content_type":"(.+?)"').findall(result)
-        content = '' if len(content) == 0 else content[0]
-
-        if content == 'live':
-            url = re.compile('"autoURL":"(.+?)"').findall(result)[0]
-            protocol = urlparse.parse_qs(urlparse.urlparse(url).query)['protocol'][0]
-            url = url.replace('protocol=%s' % protocol, 'protocol=hls')
-            url += '&redirect=0'
-
-            url = client.request(url)
-            return url
-
-        else:
-            u = 'http://www.dailymotion.com/embed/video/%s' % id
-
-            result = client.request(u, cookie='ff=off')
-            result = urllib.unquote(result).replace('\\/', '/').replace('\n', '').replace('\'', '"').replace(' ', '')
-
-            url = []
-            try: url += [{'quality': 'HD', 'url': client.request(re.compile('"720":.+?"url":"(.+?)"').findall(result)[0], output='geturl')}]
-            except: pass
-            try: url += [{'quality': 'SD', 'url': client.request(re.compile('"480":.+?"url":"(.+?)"').findall(result)[0], output='geturl')}]
-            except: pass
-            if not url == []: return url
-            try: url += [{'quality': 'SD', 'url': client.request(re.compile('"380":.+?"url":"(.+?)"').findall(result)[0], output='geturl')}]
-            except: pass
-            if not url == []: return url
-            try: url += [{'quality': 'SD', 'url': client.request(re.compile('"240":.+?"url":"(.+?)"').findall(result)[0], output='geturl')}]
-            except: pass
-
-            if url == []: return
-            return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/datemule.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/datemule.py
deleted file mode 100644
index 83da57d96d3aae9582cc34dc5a7184c76cae05f0..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/datemule.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import cloudflare
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = cloudflare.request(url, mobile=True)
-
-        result = re.compile('file *: *"(http.+?)"').findall(result)
-
-        result = [(i, urlparse.urlparse(i).path) for i in result]
-        result = [i for i in result if not i[1].endswith('.mpd')]
-
-        url = [i for i in result if i[1].endswith('.m3u8')]
-        url += [i for i in result if not i[1].endswith('.m3u8')]
-        url = url[0][0] + headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/exashare.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/exashare.py
deleted file mode 100644
index c03edb183e8ce07b4e00b7cb2b6fbbc97e82c8a2..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/exashare.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        video = url.replace('/embed-', '/')
-        video = re.compile('//.+?/([\w]+)').findall(video)[0]
-
-        url = 'http://exashare.com/embed-%s.html' % video
-
-        result = client.request(url)
-
-        netloc = client.parseDOM(result, 'iframe', ret='src')[0]
-        netloc = urlparse.urlparse(netloc).netloc
-
-        url = 'http://%s/embed-%s.html' % (netloc, video)
-
-        result = client.request(url)
-
-        url = re.compile('file *: *"(http.+?)"').findall(result)[-1]
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filehoot.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filehoot.py
deleted file mode 100644
index 7419330fcb62b4533630178ee2da53a2d95d12f4..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filehoot.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://filehoot.com/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-        url = re.compile('file *: *"(http.+?)"').findall(result)[0]
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filenuke.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filenuke.py
deleted file mode 100644
index 4d5fd5e4eaca83af9e111b3a6f1a3772f63e960f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filenuke.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url, close=False)
-
-        f = client.parseDOM(result, 'a', ret='href', attrs = {'id': 'go-next'})[0]
-        f = urlparse.urljoin(url, f)
-
-        result = client.request(f)
-
-        url = re.compile("var\s+lnk\d* *= *'(http.+?)'").findall(result)[0]
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filepup.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filepup.py
deleted file mode 100644
index a0ac4185e1c734955f188c07548bd4991ad148b3..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/filepup.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = re.compile('//.+?/.+?/([\w]+)').findall(url)[0]
-        url = 'http://www.filepup.net/play/%s' % url
-
-        result = client.request(url)
-
-        #url = client.parseDOM(result, 'source', ret='src', attrs = {'type': 'video.+?'})[0]
-        url = re.compile('type *: *[\'|\"]video/.+?[\'|\"].+?src *: *[\'|\"](.+?)[\'|\"]').findall(result)[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/google.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/google.py
new file mode 100644
index 0000000000000000000000000000000000000000..fbb9da0850c384f1565bf2bbc03534ef18cb344d
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/google.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+
+'''
+    Genesis Add-on
+    Copyright (C) 2015 lambda
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+'''
+
+
+import re,urllib,urlparse,json
+from resources.lib.libraries import client
+
+
+def resolve(url):
+    try:
+        netloc = urlparse.urlparse(url.strip().lower()).netloc
+        netloc = netloc.split('.google')[0]
+
+
+
+        if netloc == 'docs' or netloc == 'drive':
+            url = url.split('/preview', 1)[0]
+            url = url.replace('drive.google.com', 'docs.google.com')
+
+            result = client.request(url, headers={'User-Agent': client.agent()})
+
+            result = re.compile('"fmt_stream_map",(".+?")').findall(result)[0]
+
+            result = json.loads(result)
+            result = [i.split('|')[-1] for i in result.split(',')]
+            result = sum([tag(i) for i in result], [])
+
+
+
+        elif netloc == 'photos':
+            result = client.request(url, headers={'User-Agent': client.agent()})
+
+            result = result.replace('\r','').replace('\n','').replace('\t','')
+            result = re.compile('"\d*/\d*x\d*.+?","(.+?)"').findall(result)[0]
+
+            result = result.replace('\\u003d','=').replace('\\u0026','&')
+            result = re.compile('url=(.+?)&').findall(result)
+            result = [urllib.unquote(i) for i in result]
+
+            result = [tag(i)[0] for i in result]
+
+
+
+        elif netloc == 'picasaweb':
+            id = re.compile('#(\d*)').findall(url)[0]
+
+            result = client.request(url, headers={'User-Agent': client.agent()})
+
+            result = re.search('feedPreload:\s*(.*}]}})},', result, re.DOTALL).group(1)
+            result = json.loads(result)['feed']['entry']
+
+            if len(result) > 1: result = [i for i in result if str(id) in i['link'][0]['href']][0]
+            elif len(result) == 1: result = result[0]
+
+            result = result['media']['content']
+            result = [i['url'] for i in result if 'video' in i['type']]
+            result = sum([tag(i) for i in result], [])
+
+
+
+        elif netloc == 'plus':
+            result = client.source(url, headers={'User-Agent': client.agent()})
+
+            id = (urlparse.urlparse(url).path).split('/')[-1]
+            result = result.replace('\r','').replace('\n','').replace('\t','')
+            result = result.split('"%s"' % id)[-1].split(']]')[0]
+
+            result = result.replace('\\u003d','=').replace('\\u0026','&')
+            result = re.compile('url=(.+?)&').findall(result)
+            result = [urllib.unquote(i) for i in result]
+
+            result = [tag(i)[0] for i in result]
+
+
+
+        url = []
+        try: url += [[i for i in result if i['quality'] == '1080p'][0]]
+        except: pass
+        try: url += [[i for i in result if i['quality'] == 'HD'][0]]
+        except: pass
+        try: url += [[i for i in result if i['quality'] == 'SD'][0]]
+        except: pass
+
+        if url == []: return
+        return url
+    except:
+        return
+
+
+def tag(url):
+    quality = re.compile('itag=(\d*)').findall(url)
+    quality += re.compile('=m(\d*)$').findall(url)
+    try: quality = quality[0]
+    except: return []
+
+    if quality in ['37', '137', '299', '96', '248', '303', '46']:
+        return [{'quality': '1080p', 'url': url}]
+    elif quality in ['22', '84', '136', '298', '120', '95', '247', '302', '45', '102']:
+        return [{'quality': 'HD', 'url': url}]
+    elif quality in ['35', '44', '135', '244', '94']:
+        return [{'quality': 'SD', 'url': url}]
+    elif quality in ['18', '34', '43', '82', '100', '101', '134', '243', '93']:
+        return [{'quality': 'SD', 'url': url}]
+    elif quality in ['5', '6', '36', '83', '133', '242', '92', '132']:
+        return [{'quality': 'SD', 'url': url}]
+    else:
+        return []
+
+
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googledocs.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googledocs.py
deleted file mode 100644
index 797bbd9ecb71cb192d65ba1b7a1d702ec00ffe92..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googledocs.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,json
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        url = url.split('/preview', 1)[0]
-        url = url.replace('drive.google.com', 'docs.google.com')
-
-        result = client.request(url, headers={'User-Agent': client.agent()})
-
-        result = re.compile('"fmt_stream_map",(".+?")').findall(result)[0]
-
-        u = json.loads(result)
-        u = [i.split('|')[-1] for i in u.split(',')]
-        u = sum([tag(i) for i in u], [])
-
-        url = []
-        try: url += [[i for i in u if i['quality'] == '1080p'][0]]
-        except: pass
-        try: url += [[i for i in u if i['quality'] == 'HD'][0]]
-        except: pass
-        try: url += [[i for i in u if i['quality'] == 'SD'][0]]
-        except: pass
-
-        if url == []: return
-        return url
-    except:
-        return
-
-
-def tag(url):
-    quality = re.compile('itag=(\d*)').findall(url)
-    quality += re.compile('=m(\d*)$').findall(url)
-    try: quality = quality[0]
-    except: return []
-
-    if quality in ['37', '137', '299', '96', '248', '303', '46']:
-        return [{'quality': '1080p', 'url': url}]
-    elif quality in ['22', '84', '136', '298', '120', '95', '247', '302', '45', '102']:
-        return [{'quality': 'HD', 'url': url}]
-    elif quality in ['35', '44', '135', '244', '94']:
-        return [{'quality': 'SD', 'url': url}]
-    elif quality in ['18', '34', '43', '82', '100', '101', '134', '243', '93']:
-        return [{'quality': 'SD', 'url': url}]
-    elif quality in ['5', '6', '36', '83', '133', '242', '92', '132']:
-        return [{'quality': 'SD', 'url': url}]
-    else:
-        return []
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googlephotos.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googlephotos.py
deleted file mode 100644
index 66dc9e441a7f2b3a6bfd32a4250dfb22aa2ea947..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googlephotos.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        result = client.request(url, headers={'User-Agent': client.agent()})
-
-        result = result.replace('\r','').replace('\n','').replace('\t','')
-
-        u = re.compile('"\d*/\d*x\d*.+?","(.+?)"').findall(result)[0]
-        u = urllib.unquote_plus(u).decode('unicode-escape')
-        u = re.compile('(http.+?)\s').findall(u)
-        u = [re.sub(r'(=m\d*).+', r'\1', i) for i in u]
-        u = sum([tag(i) for i in u], [])
-
-        url = []
-        try: url += [[i for i in u if i['quality'] == '1080p'][0]]
-        except: pass
-        try: url += [[i for i in u if i['quality'] == 'HD'][0]]
-        except: pass
-        try: url += [[i for i in u if i['quality'] == 'SD'][0]]
-        except: pass
-
-        if url == []: return
-        return url
-    except:
-        return
-
-
-def tag(url):
-    quality = re.compile('itag=(\d*)').findall(url)
-    quality += re.compile('=m(\d*)$').findall(url)
-    try: quality = quality[0]
-    except: return []
-
-    if quality in ['37', '137', '299', '96', '248', '303', '46']:
-        return [{'quality': '1080p', 'url': url}]
-    elif quality in ['22', '84', '136', '298', '120', '95', '247', '302', '45', '102']:
-        return [{'quality': 'HD', 'url': url}]
-    elif quality in ['35', '44', '135', '244', '94']:
-        return [{'quality': 'SD', 'url': url}]
-    elif quality in ['18', '34', '43', '82', '100', '101', '134', '243', '93']:
-        return [{'quality': 'SD', 'url': url}]
-    elif quality in ['5', '6', '36', '83', '133', '242', '92', '132']:
-        return [{'quality': 'SD', 'url': url}]
-    else:
-        return []
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googlepicasa.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googlepicasa.py
deleted file mode 100644
index 3a6b53136438335e7b466e83c6f8c71f0ff19d52..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googlepicasa.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urlparse,json
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        id = re.compile('#(\d*)').findall(url)[0]
-
-        result = client.request(url, headers={'User-Agent': client.agent()})
-
-        result = re.search('feedPreload:\s*(.*}]}})},', result, re.DOTALL).group(1)
-        result = json.loads(result)['feed']['entry']
-
-        if len(result) > 1: result = [i for i in result if str(id) in i['link'][0]['href']][0]
-        elif len(result) == 1: result = result[0]
-
-        result = result['media']['content']
-        result = [i['url'] for i in result if 'video' in i['type']]
-        result = sum([tag(i) for i in result], [])
-
-        url = []
-        try: url += [[i for i in result if i['quality'] == '1080p'][0]]
-        except: pass
-        try: url += [[i for i in result if i['quality'] == 'HD'][0]]
-        except: pass
-        try: url += [[i for i in result if i['quality'] == 'SD'][0]]
-        except: pass
-
-        if url == []: return
-        return url
-    except:
-        return
-
-
-def tag(url):
-    quality = re.compile('itag=(\d*)').findall(url)
-    quality += re.compile('=m(\d*)$').findall(url)
-    try: quality = quality[0]
-    except: return []
-
-    if quality in ['37', '137', '299', '96', '248', '303', '46']:
-        return [{'quality': '1080p', 'url': url}]
-    elif quality in ['22', '84', '136', '298', '120', '95', '247', '302', '45', '102']:
-        return [{'quality': 'HD', 'url': url}]
-    elif quality in ['35', '44', '135', '244', '94']:
-        return [{'quality': 'SD', 'url': url}]
-    elif quality in ['18', '34', '43', '82', '100', '101', '134', '243', '93']:
-        return [{'quality': 'SD', 'url': url}]
-    elif quality in ['5', '6', '36', '83', '133', '242', '92', '132']:
-        return [{'quality': 'SD', 'url': url}]
-    else:
-        return []
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googleplus.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googleplus.py
deleted file mode 100644
index 5e3f660a6f8fec4f1c95a6ffa869f32ff206712e..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/googleplus.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        result = client.source(url, headers={'User-Agent': client.agent()})
-
-        id = (urlparse.urlparse(url).path).split('/')[-1]
-        result = result.replace('\r','').replace('\n','').replace('\t','')
-        result = result.split('"%s"' % id)[-1].split(']]')[0]
-
-        result = result.replace('\\u003d','=').replace('\\u0026','&')
-        result = re.compile('url=(.+?)&').findall(result)
-        result = [urllib.unquote(i) for i in result]
-
-        result = [tag(i)[0] for i in result]
-
-        url = []
-        try: url += [[i for i in result if i['quality'] == '1080p'][0]]
-        except: pass
-        try: url += [[i for i in result if i['quality'] == 'HD'][0]]
-        except: pass
-        try: url += [[i for i in result if i['quality'] == 'SD'][0]]
-        except: pass
-
-        if url == []: return
-        return url
-    except:
-        return
-
-
-def tag(url):
-    quality = re.compile('itag=(\d*)').findall(url)
-    quality += re.compile('=m(\d*)$').findall(url)
-    try: quality = quality[0]
-    except: return []
-
-    if quality in ['37', '137', '299', '96', '248', '303', '46']:
-        return [{'quality': '1080p', 'url': url}]
-    elif quality in ['22', '84', '136', '298', '120', '95', '247', '302', '45', '102']:
-        return [{'quality': 'HD', 'url': url}]
-    elif quality in ['35', '44', '135', '244', '94']:
-        return [{'quality': 'SD', 'url': url}]
-    elif quality in ['18', '34', '43', '82', '100', '101', '134', '243', '93']:
-        return [{'quality': 'SD', 'url': url}]
-    elif quality in ['5', '6', '36', '83', '133', '242', '92', '132']:
-        return [{'quality': 'SD', 'url': url}]
-    else:
-        return []
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/gorillavid.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/gorillavid.py
deleted file mode 100644
index 5d2e95a36aafa61caff89fd525e6c30a1d4a3d0f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/gorillavid.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urllib2
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://gorillavid.in/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-        url = re.compile('file *: *"(http.+?)"').findall(result)[-1]
-
-        request = urllib2.Request(url)
-        response = urllib2.urlopen(request, timeout=30)
-        response.close()
-
-        type = str(response.info()["Content-Type"])
-        if type == 'text/html': raise Exception()
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/grifthost.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/grifthost.py
deleted file mode 100644
index 823b2b0112e10c817508e538efd82e48b39deb9d..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/grifthost.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://grifthost.com/embed-%s.html' % url
-
-        result = client.request(url)
-
-        try:
-            post = {}
-            f = client.parseDOM(result, 'Form', attrs = {'method': 'POST'})[0]
-            f = f.replace('"submit"', '"hidden"')
-            k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-            for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-            post = urllib.urlencode(post)
-            result = client.request(url, post=post)
-        except:
-            pass
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/hugefiles.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/hugefiles.py
deleted file mode 100644
index fe4733f17ce3233698007a539ab9650ee18d6399..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/hugefiles.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import captcha
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        u = url
-
-        result = client.request(url)
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'action': '' })
-        f += client.parseDOM(result, 'form', attrs = {'action': '' })
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update({'method_free': 'Free Download'})
-        post.update(captcha.request(result))
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post, close=False)
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'action': '' })
-        f += client.parseDOM(result, 'form', attrs = {'action': '' })
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-
-        url = client.request(url, post=post, output='geturl')
-        if u in url or url in u : return
-        return url + headers
-    except:
-        return
-
-
-def check(url):
-    try:
-        result = client.request(url)
-        if result == None: return False
-        if 'File Not Found' in result: return False
-        return True
-    except:
-        return False
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/ipithos.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/ipithos.py
deleted file mode 100644
index f8d3751cddeafaa9b21a75d1775dc440e38ef333..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/ipithos.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://ipithos.to/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/iptvlinks.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/iptvlinks.py
new file mode 100644
index 0000000000000000000000000000000000000000..f4a1adf4328a8e9ed516201689eea5a60c83734b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/iptvlinks.py
@@ -0,0 +1,28 @@
+from resources.lib.libraries import client
+from resources.lib.libraries import cloudflare
+import re,sys,urllib,urlparse,base64,urllib2
+
+
+def resolve(url):
+    
+
+  
+
+    try:
+        
+
+        result = cloudflare.request(url)
+       
+        items = client.parseDOM(result, 'video', attrs={'id': 'player'})
+           
+        items = client.parseDOM(items, 'source', ret='src')[1]
+        if ('http') in items: return items
+        if items[0]!='/':
+            url='http://www.iptvlinks.tk/'+items
+        else:
+            url='http://www.iptvlinks.tk'+items
+        
+        print url        
+        return url
+    except:
+        return None
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/ishared.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/ishared.py
deleted file mode 100644
index 82ff1f9de1acc63d45d2009638549d5610ff5c18..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/ishared.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/video/', '/embed/')
-
-        result = client.request(url)
-
-        unpacked = ''
-        packed = result.split('\n')
-        for i in packed: 
-            try: unpacked += jsunpack.unpack(i)
-            except: pass
-        result += unpacked
-        result = re.sub('\s\s+', ' ', result)
-
-        var = re.compile('var\s(.+?)\s*=\s*\'(.+?)\'').findall(result)
-        for i in range(100):
-            for v in var: result = result.replace("' %s '" % v[0], v[1]).replace("'%s'" % v[0], v[1])
-
-        url = re.compile('sources\s*:\s*\[.+?file\s*:\s*(.+?)\s*\,').findall(result)[0]
-        var = re.compile('var\s+%s\s*=\s*\'(.+?)\'' % url).findall(result)
-        if len(var) > 0: url = var[0].strip()
-        url += headers
-
-        if url.startswith('http'): return url 
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/letwatch.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/letwatch.py
deleted file mode 100644
index ca3417d00fb13b5d5a4d47cfa77e985c49cc320c..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/letwatch.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://letwatch.us/embed-%s.html' % url
-
-        result = client.request(url)
-
-        unpacked = ''
-        packed = result.split('\n')
-        for i in packed: 
-            try: unpacked += jsunpack.unpack(i)
-            except: unpacked += i
-        result = re.sub('\s\s+', ' ', unpacked)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](http.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/mailru.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/mailru.py
deleted file mode 100644
index e2e2ddf4c05cb421517754ee6f624582c7afc573..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/mailru.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,json
-import requests
-
-
-def resolve(url):
-    try:
-        usr = re.compile('/mail/(.+?)/').findall(url)[0]
-        vid = re.compile('(\d*)[.]html').findall(url)[0]
-        url = 'http://videoapi.my.mail.ru/videos/mail/%s/_myvideo/%s.json?ver=0.2.60' % (usr, vid)
-
-        result = requests.get(url).content
-        cookie = requests.get(url).headers['Set-Cookie']
-
-        u = json.loads(result)['videos']
-        h = "|Cookie=%s" % urllib.quote(cookie)
-
-        url = []
-        try: url += [[{'quality': '1080p', 'url': i['url'] + h} for i in u if i['key'] == '1080p'][0]]
-        except: pass
-        try: url += [[{'quality': 'HD', 'url': i['url'] + h} for i in u if i['key'] == '720p'][0]]
-        except: pass
-        try: url += [[{'quality': 'SD', 'url': i['url'] + h} for i in u if not (i['key'] == '1080p' or i ['key'] == '720p')][0]]
-        except: pass
-
-        if url == []: return
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/mightyupload.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/mightyupload.py
deleted file mode 100644
index 531052f4fa7c19c77d8b3ecb532954a4c53cc919..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/mightyupload.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://www.mightyupload.com/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-
-        url = re.compile("file *: *'(.+?)'").findall(result)
-        if len(url) > 0 and url[0].startswith('http'): return url[0] + headers
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movdivx.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movdivx.py
deleted file mode 100644
index 726ba600245160b9e2354e7e294d4029b8c32280..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movdivx.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://www.movdivx.com/%s' % url
- 
-        result = client.request(url)
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'action': '' })[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update({'method_free': 'Free Download'})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post)
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movpod.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movpod.py
deleted file mode 100644
index 6100417f56220665f82d14d1107a27992169c30e..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movpod.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urllib2
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = url.replace('/vid/', '/')
-
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://movpod.in/embed-%s.html' % url
-
-        result = client.request(url)
-        url = re.compile('file *: *"(http.+?)"').findall(result)[-1]
-
-        request = urllib2.Request(url)
-        response = urllib2.urlopen(request, timeout=30)
-        response.close()
-
-        type = str(response.info()["Content-Type"])
-
-        if type == 'text/html': raise Exception()
-
-        url += headers
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movshare.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movshare.py
deleted file mode 100644
index f2b7d27b282b0af14d6c4a1acca100e6107fb44d..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/movshare.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        id = re.compile('//.+?/.+?/([\w]+)').findall(url)
-        id += re.compile('//.+?/.+?v=([\w]+)').findall(url)
-        id = id[0]
-
-        url = 'http://embed.movshare.net/embed.php?v=%s' % id
-
-        result = client.request(url)
-
-        key = re.compile('flashvars.filekey=(.+?);').findall(result)[-1]
-        try: key = re.compile('\s+%s="(.+?)"' % key).findall(result)[-1]
-        except: pass
-
-        url = 'http://www.movshare.net/api/player.api.php?key=%s&file=%s' % (key, id)
-        result = client.request(url)
-
-        url = re.compile('url=(.+?)&').findall(result)[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/neodrive.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/neodrive.py
deleted file mode 100644
index 7d8439897180abfc5d26911c158564f9eb9f546c..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/neodrive.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/share/file/', '/embed/')
-
-        result = client.request(url)
-
-        url = re.compile('var\s+.+?url\s*=\s*[\'|\"](.+?)[\'|\"]').findall(result)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/nosvideo.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/nosvideo.py
deleted file mode 100644
index 19724a0c2877963d4fbf766ac40e7758333e3fd5..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/nosvideo.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,base64
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-
-        u = 'http://nosvideo.com/vj/video.php?u=%s&w=&h=530' % url
-
-        r = 'http://nosvideo.com/%s' % url
-        r = client.request(r, referer='', close=False)
-        r = client.parseDOM(r, 'a', ret='href', attrs = {'class': 'btn.+?'})[0]
-
-        result = client.request(u, referer=r)
-
-        url = re.compile('var\stracker\s*=\s*[\'|\"](.+?)[\'|\"]').findall(result)
-        url += re.compile("tracker *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = base64.b64decode(url[0])
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/novamov.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/novamov.py
deleted file mode 100644
index 2851c88751daeaea1bf342fa31c0150ceb285fea..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/novamov.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        id = re.compile('//.+?/.+?/([\w]+)').findall(url)
-        id += re.compile('//.+?/.+?v=([\w]+)').findall(url)
-        id = id[0]
-
-        url = 'http://embed.novamov.com/embed.php?v=%s' % id
-
-        result = client.request(url)
-
-        key = re.compile('flashvars.filekey=(.+?);').findall(result)[-1]
-        try: key = re.compile('\s+%s="(.+?)"' % key).findall(result)[-1]
-        except: pass
-
-        url = 'http://www.novamov.com/api/player.api.php?key=%s&file=%s' % (key, id)
-        result = client.request(url)
-
-        url = re.compile('url=(.+?)&').findall(result)[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/nowvideo.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/nowvideo.py
deleted file mode 100644
index 9186fe8abcfc64636a424646b25df5171011611c..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/nowvideo.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        id = re.compile('//.+?/.+?/([\w]+)').findall(url)
-        id += re.compile('//.+?/.+?v=([\w]+)').findall(url)
-        id = id[0]
-
-        url = 'http://embed.nowvideo.sx/embed.php?v=%s' % id
-
-        result = client.request(url)
-
-        key = re.compile('flashvars.filekey=(.+?);').findall(result)[-1]
-        try: key = re.compile('\s+%s="(.+?)"' % key).findall(result)[-1]
-        except: pass
-
-        url = 'http://www.nowvideo.sx/api/player.api.php?key=%s&file=%s' % (key, id)
-        result = client.request(url)
-
-        url = re.compile('url=(.+?)&').findall(result)[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/odnoklassniki.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/odnoklassniki.py
deleted file mode 100644
index ebce5d164038e05415547cb3c95e4ba26af38466..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/odnoklassniki.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,json
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        url = re.compile('//.+?/.+?/([\w]+)').findall(url)[0]
-        url = 'http://ok.ru/dk?cmd=videoPlayerMetadata&mid=%s' % url
- 
-        result = client.request(url)
-        result = re.sub(r'[^\x00-\x7F]+',' ', result)
-
-        result = json.loads(result)['videos']
-
-        try: hd = [{'quality': '1080p', 'url': i['url']} for i in result if i['name'] == 'full']
-        except: pass
-        try: hd += [{'quality': 'HD', 'url': i['url']} for i in result if i['name'] == 'hd']
-        except: pass
-        try: sd = [{'quality': 'SD', 'url': i['url']} for i in result if i['name'] == 'sd']
-        except: pass
-        try: sd += [{'quality': 'SD', 'url': i['url']} for i in result if i['name'] == 'low']
-        except: pass
-        try: sd += [{'quality': 'SD', 'url': i['url']} for i in result if i['name'] == 'lowest']
-        except: pass
-        try: sd += [{'quality': 'SD', 'url': i['url']} for i in result if i['name'] == 'mobile']
-        except: pass
-
-        url = hd + sd[:1]
-        if not url == []: return url
-
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/openload.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/openload.py
deleted file mode 100644
index 48f1b535cac2d07bfb60a94888a17edebdd938d2..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/openload.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,json,time
-from resources.lib.libraries import client
-from resources.lib.libraries import captcha
-
-
-def resolve(url):
-    try:
-        if check(url) == False: return
-
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        id = re.compile('//.+?/(?:embed|f)/([0-9a-zA-Z-_]+)').findall(url)[0]
-
-        url = 'https://api.openload.co/1/file/dlticket?file=%s' % id
-
-        result = client.request(url)
-        result = json.loads(result)
-
-        cap = result['result']['captcha_url']
-
-        if not cap == None: cap = captcha.keyboard(cap)
-
-        time.sleep(result['result']['wait_time'])
-
-        url = 'https://api.openload.co/1/file/dl?file=%s&ticket=%s' % (id, result['result']['ticket'])
-
-        if not cap == None:
-            url += '&captcha_response=%s' % urllib.quote(cap)
-
-        result = client.request(url)
-        result = json.loads(result)
-
-        url = result['result']['url'] + '?mime=true'
-        url += headers
-
-        return url
-    except:
-        return
-
-
-def check(url):
-    try:
-        id = re.compile('//.+?/(?:embed|f)/([0-9a-zA-Z-_]+)').findall(url)[0]
-
-        url = 'https://api.openload.co/1/file/info?file=%s' % id
-
-        result = client.request(url)
-        result = json.loads(result)
-
-        status = result['result']['%s' % id]['status']
-        if str(status) == '404': return False
-        return True
-    except:
-        return False
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/primeshare.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/primeshare.py
deleted file mode 100644
index 5e2576438235b48c0d42002603734e88eaabffae..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/primeshare.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url, mobile=True)
-
-        url = client.parseDOM(result, 'video')[0]
-        url = client.parseDOM(url, 'source', ret='src', attrs = {'type': '.+?'})[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/promptfile.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/promptfile.py
deleted file mode 100644
index eb55b1df1ec85ec47702a92b48267337210f705a..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/promptfile.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url)
-
-        post = {}
-        f = client.parseDOM(result, 'form', attrs = {'method': 'post'})[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post)
-
-        url = client.parseDOM(result, 'a', ret='href', attrs = {'class': 'view_dl_link'})[0]
-        url = client.request(url, output='geturl', post=post)
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/shadownet.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/shadownet.py
index c7e8ac9bc23a6ccc6ba8e94a7e33a680f1d65808..deea9ae272f34d4ee1f9d73e4dc7fc16531659c1 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/shadownet.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/shadownet.py
@@ -10,17 +10,23 @@ def resolve(url):
     try:
         
         result = client.request(url)
-        print result
         iframe = client.parseDOM(result, 'div', attrs = {'class': 'player.+?'})
         iframe = client.parseDOM(iframe, 'iframe', ret='src')[-1]
         result = client.request(iframe, referer=url)
-        source = client.parseDOM(result, 'source', ret='src', attrs = {'type': 'video.+?'})[-1]
-        result = client.request(source, referer=iframe)
-        url = re.compile('(http.+?)\n').findall(result)[-1]
-        #url = urllib.unquote_plus(url)
-        print url
-
-        return url
+        #source = client.parseDOM(result, 'source', ret='src', attrs = {'type': 'video.+?'})[-1]
+        #if source == "#":
+        source = re.findall("src : '(.+?)'",result)[0]
+        if 'fetch' in source:
+            url = source
+            return url
+        elif 'php' in source:
+            source = source.split('php/')[1]
+            url = 'http://'+source
+            return url
+        else:
+            result = client.request(source, referer=iframe)
+            url = re.compile('(http.+?)\n').findall(result)[-1]
+            return url
     except:
-        return
+        return None
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/shared2.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/shared2.py
deleted file mode 100644
index 1fed43c10be2e17d4f7e4fffe4c9b01636ff749f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/shared2.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/play/', '/frame/')
-
-        result = client.request(url)
-        url = re.compile('path *: *"(http.+?)"').findall(result)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/sharerepo.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/sharerepo.py
deleted file mode 100644
index ebadfffda77f3c16a2c8da868e650411aa0e0686..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/sharerepo.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url)
-        url = re.compile("file *: *'(http.+?)'").findall(result)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/speedvideo.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/speedvideo.py
deleted file mode 100644
index 59268658adfffecff30eee3f3e255f4c24de883a..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/speedvideo.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,base64
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://speedvideo.net/embed-%s.html' % url
-
-        result = client.request(url)
-
-        a = re.compile('var\s+linkfile *= *"(.+?)"').findall(result)[0]
-        b = re.compile('var\s+linkfile *= *base64_decode\(.+?\s+(.+?)\)').findall(result)[0]
-        c = re.compile('var\s+%s *= *(\d*)' % b).findall(result)[0]
-
-        url = a[:int(c)] + a[(int(c) + 10):]
-        url = base64.urlsafe_b64decode(url)
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/stagevu.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/stagevu.py
deleted file mode 100644
index f297feabc92fb0af1868ab745b5ff4f261c33a65..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/stagevu.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url)
-
-        url = client.parseDOM(result, 'embed', ret='src', attrs = {'type': 'video.+?'})[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/stream4free.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/stream4free.py
new file mode 100644
index 0000000000000000000000000000000000000000..f7f7e4fe5461a81f1be24e70b74e2e886c27d524
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/stream4free.py
@@ -0,0 +1,14 @@
+from resources.lib.libraries import client
+from resources.lib.libraries import cloudflare
+import re,sys,urllib,urlparse,base64,urllib2
+
+
+def resolve(url):
+
+    try:
+        result = cloudflare.request(url)
+        items = client.parseDOM(result, 'video', attrs={'id': 'live_player'})
+        url = client.parseDOM(items, 'source', ret='src')[0]
+        if ('http') in url: return url+'|User-Agent=Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36'
+    except:
+        return None
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/streamcloud.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/streamcloud.py
deleted file mode 100644
index 83458ac73187c656623794151deb5efaf3da189f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/streamcloud.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://streamcloud.eu/%s' % url
- 
-        result = client.request(url)
-
-        post = {}
-        f = client.parseDOM(result, 'form', attrs = {'class': 'proform'})[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-        post = post.replace('op=download1', 'op=download2')
-
-        result = client.request(url, post=post)
-
-        url = re.compile('file *: *"(http.+?)"').findall(result)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/streamin.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/streamin.py
deleted file mode 100644
index 19d1012c6fab2c61fca2132dbb6f8a1e94d92ea6..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/streamin.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://streamin.to/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-        url = re.compile("file *: *[\'|\"](http.+?)[\'|\"]").findall(result)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/thevideo.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/thevideo.py
deleted file mode 100644
index e0d22dc909bd69eaad18eae6dba8ea85f08e5b0e..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/thevideo.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,ast
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://thevideo.me/embed-%s.html' % url
-
-        result = client.request(url)
-        result = result.replace('\n','')
-
-        url = re.compile("sources *: *(\[.+?\])").findall(result)[-1]
-        url = re.compile('file *: *[\'|\"](.+?)[\'|\"]').findall(url)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/tusfiles.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/tusfiles.py
deleted file mode 100644
index 933077220dc15e58c92ba1b28abe2b23b6a7e20d..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/tusfiles.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url)
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-
-        url = url.replace(':%s' % urlparse.urlparse(url).port, '')
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/up2stream.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/up2stream.py
deleted file mode 100644
index 1d5ecfc0b25466f5aa895393c3a19e4dacfb83ce..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/up2stream.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import urllib,urlparse
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = urlparse.urlparse(url).query
-        url = urlparse.parse_qsl(url)[0][1]
-        url = 'http://up2stream.com/view.php?ref=%s' % url
-
-        result = client.request(url, mobile=True)
-
-        url = client.parseDOM(result, 'source', ret='src', attrs = {'type': 'video.+?'})[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadaf.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadaf.py
deleted file mode 100644
index bd1c6f28c6f961cb7509c231df21f23cf9dbd213..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadaf.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url, close=False)
-
-        if '>File Not Found<' in result: raise Exception()
-
-        post = {}
-        f = client.parseDOM(result, 'form', attrs = {'action': ''})
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update({'method_free': 'Free Download >>'})
-        post.update({'method_premium': '', 'rand': '', 'op': 'download2'})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post)
-
-        url = client.parseDOM(result, 'a', ret='href', attrs = {'class': 'downloadbtn.+?'})[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadc.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadc.py
deleted file mode 100644
index d237d4743aa728e56f5b6a99ab00e5f1a40b7e7f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadc.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://uploadc.com/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-
-        url = re.compile("'file' *, *'(.+?)'").findall(result)
-        if len(url) > 0: return url[0] + headers
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadrocket.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadrocket.py
deleted file mode 100644
index 0da5a4e50281e4c7cd606ca249f6f19bb890db0f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uploadrocket.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import captcha
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url)
-        result = result.decode('iso-8859-1').encode('utf-8')
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'name': 'freeorpremium'})[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update({'method_isfree': 'Click for Free Download'})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post)
-        result = result.decode('iso-8859-1').encode('utf-8')
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'name': 'F1'})[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update(captcha.request(result))
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post)
-        result = result.decode('iso-8859-1').encode('utf-8')
-
-        url = client.parseDOM(result, 'a', ret='href', attrs = {'onclick': 'DL.+?'})[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
-def check(url):
-    try:
-        base = 'http://uploadrocket.net/?op=checkfiles'
-        post = urllib.urlencode({'op': 'checkfiles', 'process': 'Check URLs', 'list': url})
-
-        result = client.request(base, post=post)
-        if result == None: return False
-
-        result = client.parseDOM(result, 'Table', attrs = {'class': 'tbl1'})[0]
-        result = client.parseDOM(result, 'td', attrs = {'style': '.+?'})[0]
-        if 'Not found' in result: return False
-
-        return True
-    except:
-        return False
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uptobox.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uptobox.py
deleted file mode 100644
index e3c722f2bf65d0c7f1df3a3ea77f9abbae0fffac..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/uptobox.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import urllib,time
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url)
-
-        post = {}
-        f = client.parseDOM(result, 'form', attrs = {'name': 'F1'})[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-
-        for i in range(0, 3):
-            try:
-                result = client.request(url, post=post)
-                url = client.parseDOM(result, 'div', attrs = {'align': '.+?'})
-                url = [i for i in url if 'button_upload' in i][0]
-                url = client.parseDOM(url, 'a', ret='href')[0]
-                url = ['http' + i for i in url.split('http') if 'uptobox.com' in i][0]
-                return url + headers
-            except:
-                time.sleep(1)
-    except:
-        return
-
-
-def check(url):
-    try:
-        result = client.request(url)
-        if result == None: return False
-
-        result = client.parseDOM(result, 'span', attrs = {'class': 'para_title'})
-        if any('File not found' in x for x in result): raise Exception()
-
-        return True
-    except:
-        return False
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/v_vids.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/v_vids.py
deleted file mode 100644
index 9ac3d581097280f9b442d5c7f03c36ed078895e2..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/v_vids.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url)
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'name': 'F1'})[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update({'method_free': '', 'method_premium': ''})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post)
-
-        url = client.parseDOM(result, 'a', ret='href', attrs = {'id': 'downloadbutton'})[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidag.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidag.py
deleted file mode 100644
index 77724b503c3c90f6f04e3fed54699e78dac2f7ab..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidag.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://vid.ag/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        result = re.compile('sources *: *\[.+?\]').findall(result)[-1]
-        result = re.compile('file *: *"(http.+?)"').findall(result)
-
-        url = [i for i in result if '.m3u8' in i]
-        if len(url) > 0: return url[0] + headers
-
-        url = [i for i in result if not '.m3u8' in i]
-        if len(url) > 0: return url[0] + headers
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidbull.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidbull.py
deleted file mode 100644
index 1096664a60a706daf49204d02fda77a3667eb62f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidbull.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url, mobile=True)
-        url = client.parseDOM(result, 'source', ret='src', attrs = {'type': 'video.+?'})[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidce.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidce.py
deleted file mode 100644
index 470716bf3c9a4f112db890a7135f7c1a73446126..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidce.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        fid = url.replace('/embed-', '/')
-        fid = re.compile('//.+?/([\w]+)').findall(fid)[0]
-
-        url = 'http://vidce.tv/%s' % fid ; cookie = 'fid=%s' % fid
-
-        result = client.request(url, cookie=cookie, close=False)
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'action': '' })
-        f += client.parseDOM(result, 'form', attrs = {'action': '' })
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post.update({'method_free': 'Proceed to File/Video'})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, cookie=cookie, post=post, close=False)
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'action': '' })
-        f += client.parseDOM(result, 'form', attrs = {'action': '' })
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, cookie=cookie, post=post)
-
-        url = result.replace('\\', '')
-        url = re.compile('(<a\s.+?</a>)').findall(url)
-        url = [(client.parseDOM(i, 'a', ret='href'), client.parseDOM(i, 'a')) for i in url]
-        url = [i[0][0] for i in url if len(i[0]) > 0 and len(i[1]) > 0 and 'download.png' in i[1][0]][0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videomega.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videomega.py
deleted file mode 100644
index 09ad40d2690eca8763e6aa9bdb96e780e1c0f106..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videomega.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = urlparse.urlparse(url).query
-        url = urlparse.parse_qsl(url)[0][1]
-        url = 'http://videomega.tv/cdn.php?ref=%s' % url
-
-        result = client.request(url)
-
-        unpacked = ''
-        packed = result.split('\n')
-        for i in packed: 
-            try: unpacked += jsunpack.unpack(i)
-            except: unpacked += i
-        result = unpacked
-        result = re.sub('\s\s+', ' ', result)
-
-        url = re.compile('"video".+?"src"\s*\,\s*"(.+?)"').findall(result)
-        url += client.parseDOM(result, 'source', ret='src', attrs = {'type': 'video.+?'})
-        url = url[0] + headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videoweed.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videoweed.py
deleted file mode 100644
index 64fe6aa53757a6a8376b1b458b3d2ea544a71adb..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videoweed.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        id = re.compile('//.+?/.+?/([\w]+)').findall(url)
-        id += re.compile('//.+?/.+?v=([\w]+)').findall(url)
-        id = id[0]
-
-        url = 'http://embed.videoweed.es/embed.php?v=%s' % id
-
-        result = client.request(url)
-
-        key = re.compile('flashvars.filekey=(.+?);').findall(result)[-1]
-        try: key = re.compile('\s+%s="(.+?)"' % key).findall(result)[-1]
-        except: pass
-
-        url = 'http://www.videoweed.es/api/player.api.php?key=%s&file=%s' % (key, id)
-        result = client.request(url)
-
-        url = re.compile('url=(.+?)&').findall(result)[0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videowood.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videowood.py
deleted file mode 100644
index 2777e0a878d3a9b74a372ec119d6f806543bf251..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/videowood.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = re.compile('//.+?/(?:video|embed)/([0-9a-zA-Z-_]+)').findall(url)[0]
-        url = 'http://videowood.tv/embed/%s' % url
-
-        result = client.request(url)
-
-        result = re.compile('(eval.*?)\n').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("[\'|\"]file[\'|\"] *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = [i.replace('\\', '') for i in url if not i.endswith(('.srt', '.png', '.jpg'))]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidlockers.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidlockers.py
deleted file mode 100644
index b76a100e2ee8f4e37b34834ad041d4930dfd5181..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidlockers.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        cookie = client.request(url, output='cookie')
-        result = client.request(url, cookie=cookie, close=False)
-
-        post = {}
-        f = client.parseDOM(result, 'Form', attrs = {'method': 'POST'})[0]
-        k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-        for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-        post = urllib.urlencode(post)
-
-        result = client.request(url, post=post)
-
-        url = re.compile("file *: *'(http.+?)'").findall(result)
-        url += re.compile('file *: *"(http.+?)"').findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = url[-1] + headers
-
-        return url
-    except:
-        return
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidspot.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidspot.py
deleted file mode 100644
index 06bcbd92c4d89c1feef045792f635efba2695146..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidspot.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://vidspot.net/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-        url = re.compile('"file" *: *"(http.+?)"').findall(result)[-1]
-
-        query = urlparse.urlparse(url).query
-        url = url[:url.find('?')]
-        url = '%s?%s&direct=false' % (url, query)
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidto.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidto.py
deleted file mode 100644
index 548a918eb059decbeed7969800c22e9dce65373e..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidto.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://vidto.me/embed-%s.html' % url
-
-        result = client.request(url)
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](http.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidzi.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidzi.py
deleted file mode 100644
index 5512aad8143d70f1eb77f5c4047314f9c6776319..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vidzi.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,time
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        result = client.request(url, mobile=True, close=False)
-
-        try:
-            post = {}
-            f = client.parseDOM(result, 'Form', attrs = {'method': 'POST'})[0]
-            f = f.replace('"submit"', '"hidden"')
-            k = client.parseDOM(f, 'input', ret='name', attrs = {'type': 'hidden'})
-            for i in k: post.update({i: client.parseDOM(f, 'input', ret='value', attrs = {'name': i})[0]})
-            post = urllib.urlencode(post)
-        except:
-            post=None
-
-        for i in range(0, 10):
-            try:
-                result = client.request(url, post=post, mobile=True, close=False)
-                result = result.replace('\n','')
-
-                result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-                result = jsunpack.unpack(result)
-
-                result = re.compile('sources *: *\[.+?\]').findall(result)[-1]
-                result = re.compile('file *: *"(http.+?)"').findall(result)
-
-                url = [i for i in result if '.m3u8' in i]
-                if len(url) > 0: return url[0] + headers
-
-                url = [i for i in result if not '.m3u8' in i]
-                if len(url) > 0: return url[0] + headers
-            except:
-                time.sleep(1)
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vimeo.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vimeo.py
deleted file mode 100644
index 4ede164ef248532a13094cb0de8e666119720abd..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vimeo.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import json
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        url = [i for i in url.split('/') if i.isdigit()][-1]
-        url = 'http://player.vimeo.com/video/%s/config' % url
-
-        result = client.request(url)
-        result = json.loads(result)
-
-        url = result['request']['files']['progressive'][0]['url']
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vk.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vk.py
deleted file mode 100644
index c8970a79f862686142c1ab538086b11ea14653ae..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vk.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib,urlparse,json
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        try: oid, id = urlparse.parse_qs(urlparse.urlparse(url).query)['oid'][0] , urlparse.parse_qs(urlparse.urlparse(url).query)['id'][0]
-        except: oid, id = re.compile('\/video(.*)_(.*)').findall(url)[0]
-        try: hash = urlparse.parse_qs(urlparse.urlparse(url).query)['hash'][0]
-        except: hash = _hash(oid, id)
-
-        u = 'http://api.vk.com/method/video.getEmbed?oid=%s&video_id=%s&embed_hash=%s' % (oid, id, hash)
- 
-        result = client.request(u)
-        result = re.sub(r'[^\x00-\x7F]+',' ', result)
-
-        try: result = json.loads(result)['response']
-        except: result = _private(oid, id)
-
-        url = []
-        try: url += [{'quality': 'HD', 'url': result['url720']}]
-        except: pass
-        try: url += [{'quality': 'SD', 'url': result['url540']}]
-        except: pass
-        try: url += [{'quality': 'SD', 'url': result['url480']}]
-        except: pass
-        if not url == []: return url
-        try: url += [{'quality': 'SD', 'url': result['url360']}]
-        except: pass
-        if not url == []: return url
-        try: url += [{'quality': 'SD', 'url': result['url240']}]
-        except: pass
-
-        if not url == []: return url
-
-    except:
-        return
-
-
-def _hash(oid, id):
-    try:
-        url = 'http://vk.com/al_video.php?act=show_inline&al=1&video=%s_%s' % (oid, id)
-        result = client.request(url)
-        result = result.replace('\'', '"').replace(' ', '')
-
-        hash = re.compile('"hash2":"(.+?)"').findall(result)
-        hash += re.compile('"hash":"(.+?)"').findall(result)
-        hash = hash[0]
-
-        return hash
-    except:
-        return
-
-def _private(oid, id):
-    try:
-        url = 'http://vk.com/al_video.php?act=show_inline&al=1&video=%s_%s' % (oid, id)
-
-        result = client.request(url)
-        result = re.compile('var vars *= *({.+?});').findall(result)[0]
-        result = re.sub(r'[^\x00-\x7F]+',' ', result)
-        result = json.loads(result)
-
-        return result
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vodlocker.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vodlocker.py
deleted file mode 100644
index bda39ef2cd267390ba916819c7fc9f5f9d3a2f4f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/vodlocker.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://vodlocker.com/embed-%s.html' % url
-
-        result = client.request(url)
-
-        url = re.compile('[\'|\"](http.+?[\w]+)[\'|\"]').findall(result)
-        url = [i for i in url if i.endswith(('.mp4', '.mkv', '.flv', '.avi'))][0]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/watch1080.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/watch1080.py
index beaecce721f0944968707d1daa9b3435a457e35d..c9a194de099803d064ff3745669d6f4933bea2d8 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/watch1080.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/watch1080.py
@@ -21,7 +21,6 @@
 
 import re,urlparse,base64
 from resources.lib.libraries import client
-from resources.lib.resolvers import openload
 
 
 def resolve(url):
@@ -41,8 +40,11 @@ def resolve(url):
         url = client.parseDOM(result, 'iframe', ret='src')
         if len(url) > 0: return resolvers.request(url[0], debrid)
 
-        result = re.compile("\('(.+?)'\)").findall(result)[0]
-        result = base64.b64decode(result)
+        count = len(re.findall('window\.atob', result))
+        result = re.compile("window\.atob\('([^']+)").findall(result)[0]
+
+        for i in xrange(count):
+            result = base64.decodestring(result)
 
         result = re.compile('(\d*p)="([^"]+)"').findall(result)
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/xvidstage.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/xvidstage.py
deleted file mode 100644
index b126ae17ae2c488d2f26bd986387d0ee85ee9300..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/xvidstage.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://xvidstage.com/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("'file' *, *'(.+?)'").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/youtube.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/youtube.py
deleted file mode 100644
index 0da190d7a3a3b919f46352af32524e93108d5708..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/youtube.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        id = url.split("?v=")[-1].split("/")[-1].split("?")[0].split("&")[0]
-        result = client.request('http://www.youtube.com/watch?v=%s' % id)
-
-        message = client.parseDOM(result, 'div', attrs = {'id': 'unavailable-submessage'})
-        message = ''.join(message)
-
-        alert = client.parseDOM(result, 'div', attrs = {'id': 'watch7-notification-area'})
-
-        if re.search('LIVE_WATCHING_NOW', result):
-            url = live(result, id)
-            if not url == None: return url
-
-        if len(alert) > 0: raise Exception()
-        if re.search('[a-zA-Z]', message): raise Exception()
-
-        url = 'plugin://plugin.video.youtube/play/?video_id=%s' % id
-        return url
-    except:
-        return
-
-
-def live(result, id):
-    try:
-        hls = re.compile('"hlsvp" *: *"(.+?)"').findall(result)
-        if len(hls) == 0:
-            url = 'https://www.youtube.com/watch?v=%s' % id
-            url = 'http://translate.googleusercontent.com/translate_c?anno=2&hl=en&sl=mt&tl=en&u=%s' % url
-            hls = client.request(url)
-            hls = re.compile('"hlsvp" *: *"(.+?)"').findall(hls)
-
-        url = urllib.unquote(hls[0]).replace('\\/', '/')
-
-        result = client.request(url)
-        result = result.replace('\n','')
-        url = re.compile('RESOLUTION *= *(\d*)x\d{1}.+?(http.+?\.m3u8)').findall(result)
-        url = [(int(i[0]), i[1]) for i in url]
-        url.sort()
-        url = url[-1][1]
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zettahost.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zettahost.py
deleted file mode 100644
index 521cc1070710d9901dc2c6512995cd848d0de5a8..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zettahost.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-from resources.lib.libraries import jsunpack
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://zettahost.tv/embed-%s.html' % url
-
-        result = client.request(url, mobile=True)
-
-        result = re.compile('(eval.*?\)\)\))').findall(result)[-1]
-        result = jsunpack.unpack(result)
-
-        url = client.parseDOM(result, 'embed', ret='src')
-        url += re.compile("file *: *[\'|\"](.+?)[\'|\"]").findall(result)
-        url = [i for i in url if not i.endswith('.srt')]
-        url = 'http://' + url[0].split('://', 1)[-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zoptv.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zoptv.py
new file mode 100644
index 0000000000000000000000000000000000000000..1a022bea5c9b1f2cb3da067814778ce975a984ac
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zoptv.py
@@ -0,0 +1,33 @@
+from resources.lib.libraries import client
+from resources.lib.libraries import cloudflare
+import re,sys,urllib,urlparse,base64,urllib2,cookielib
+
+
+def resolve(url):
+    test = '|User-Agent=Mozilla/5.0 (compatible; CloudFlare-AlwaysOnline/1.0; +https://www.cloudflare.com/always-online) AppleWebKit/534.34'
+    try:
+        
+        result = cloudflare.request(url)
+        uri = re.findall("decodeURIComponent\(atob\('(.+?)'",result)[0]
+        while not ('http') in uri:
+            uri = base64.b64decode(uri)
+            if not ('http') in uri:
+                uri = re.findall("'(.+?)'",uri)[0]
+            else:
+                pass
+        murl = re.findall('"src":"(.+?)"',uri)[0]  
+            
+    except:
+        return None
+    try:
+        result = cloudflare.request(murl)
+        items = client.parseDOM(result, 'video', attrs={'id': 'player'})
+        url = client.parseDOM(items, 'source', ret='src')[0]
+        if ('http') in url: return url+test
+        if url[0]!='/':
+            url='http://www.iptvlinks.tk/'+url+test
+        else:
+            url='http://www.iptvlinks.tk'+url+test      
+        return url
+    except:
+        return None
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zstream.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zstream.py
deleted file mode 100644
index 918647529489610f086850d66afaaf140973c21e..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/resolvers/zstream.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''
-    Genesis Add-on
-    Copyright (C) 2015 lambda
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''
-
-
-import re,urllib
-from resources.lib.libraries import client
-
-
-def resolve(url):
-    try:
-        headers = '|%s' % urllib.urlencode({'User-Agent': client.agent(), 'Referer': url})
-
-        url = url.replace('/embed-', '/')
-        url = re.compile('//.+?/([\w]+)').findall(url)[0]
-        url = 'http://zstream.to/embed-%s.html' % url
-
-        result = client.request(url)
-
-        url = re.compile('file *: *"(http.+?)"').findall(result)
-        url = [i for i in url if not i.endswith('.srt')][-1]
-        url += headers
-
-        return url
-    except:
-        return
-
-
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/sources/__init__.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/sources/__init__.py
index f1fae343495d9e58c7e443bf6444e7f9e132ff80..5a519307dc9be5cbfb352ce914b12cc9ef627419 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/sources/__init__.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/lib/sources/__init__.py
@@ -558,29 +558,6 @@ class sources:
     def sourcesFilter(self):
         self.sourcesReset()
 
-        try: customhdDict = [control.setting('hosthd50001'), control.setting('hosthd50002'), control.setting('hosthd50003'), control.setting('hosthd50004'), control.setting('hosthd50005'), control.setting('hosthd50006'), control.setting('hosthd50007'), control.setting('hosthd50008'), control.setting('hosthd50009'), control.setting('hosthd50010'), control.setting('hosthd50011'), control.setting('hosthd50012'), control.setting('hosthd50013'), control.setting('hosthd50014'), control.setting('hosthd50015'), control.setting('hosthd50016'), control.setting('hosthd50017'), control.setting('hosthd50018'), control.setting('hosthd50019'), control.setting('hosthd50020')]
-        except: customhdDict = []
-        try: customsdDict = [control.setting('host50001'), control.setting('host50002'), control.setting('host50003'), control.setting('host50004'), control.setting('host50005'), control.setting('host50006'), control.setting('host50007'), control.setting('host50008'), control.setting('host50009'), control.setting('host50010'), control.setting('host50011'), control.setting('host50012'), control.setting('host50013'), control.setting('host50014'), control.setting('host50015'), control.setting('host50016'), control.setting('host50017'), control.setting('host50018'), control.setting('host50019'), control.setting('host50020')]
-        except: customsdDict = []
-
-        hd_rank = []
-        hd_rank += [i for i in self.rdDict if i in self.hostprDict + self.hosthdDict]
-        hd_rank += [i for i in self.pzDict if i in self.hostprDict + self.hosthdDict]
-        hd_rank += customhdDict
-        hd_rank += [i['source'] for i in self.sources if i['quality'] in ['1080p', 'HD'] and not i['source'] in customhdDict + self.hostprDict + self.hosthdDict]
-        hd_rank += self.hosthdDict
-        hd_rank = [i.lower() for i in hd_rank]
-        hd_rank = [x for y,x in enumerate(hd_rank) if x not in hd_rank[:y]]
-
-        sd_rank = []
-        sd_rank += [i for i in self.rdDict if i in self.hostprDict + self.hosthqDict]
-        sd_rank += [i for i in self.pzDict if i in self.hostprDict + self.hosthqDict]
-        sd_rank += customsdDict
-        sd_rank += [i['source'] for i in self.sources if i['quality'] == 'SD' and not i['source'] in customsdDict + self.hostprDict + self.hosthqDict + self.hostmqDict + self.hostlqDict]
-        sd_rank += self.hosthqDict + self.hostmqDict + self.hostlqDict
-        sd_rank = [i.lower() for i in sd_rank]
-        sd_rank = [x for y,x in enumerate(sd_rank) if x not in sd_rank[:y]]
-
         for i in range(len(self.sources)): self.sources[i]['source'] = self.sources[i]['source'].lower()
         self.sources = sorted(self.sources, key=lambda k: k['source'])
 
@@ -592,53 +569,18 @@ class sources:
         if len(filter) < 10: filter += [i for i in self.sources if i['quality'] == 'CAM']
         self.sources = filter
 
-        try: playback_quality = control.setting('playback_quality')
-        except: playback_quality = '0'
-
-        if playback_quality == '1':
-            self.sources = [i for i in self.sources if not i['quality'] == '1080p']
-        elif playback_quality == '2':
-            self.sources = [i for i in self.sources if not i['quality'] in ['1080p', 'HD']]
-        elif playback_quality == '3':
-            self.sources = [i for i in self.sources if not i['quality'] in ['1080p', 'HD'] and i['source'] in self.hostmqDict + self.hostlqDict]
-        elif playback_quality == '4':
-            self.sources = [i for i in self.sources if not i['quality'] in ['1080p', 'HD'] and i['source'] in self.hostlqDict]
-
-        try: playback_captcha = control.setting('playback_captcha_hosts')
-        except: playback_captcha = 'false'
-
-        try: playback_1080p = control.setting('playback_1080p_hosts')
-        except: playback_1080p = 'true'
-
-        try: playback_720p = control.setting('playback_720p_hosts')
-        except: playback_720p = 'true'
-
-        if playback_captcha == 'false':
-            self.sources = [i for i in self.sources if not i['source'] in self.hostcapDict]
-
-        if playback_1080p == 'false':
-            self.sources = [i for i in self.sources if not (i['quality'] == '1080p' and i['source'] in self.hosthdDict and not i['source'] in self.rdDict + self.pzDict)]
-
-        if playback_720p == 'false':
-            self.sources = [i for i in self.sources if not (i['quality'] == 'HD' and i['source'] in self.hosthdDict and not i['source'] in self.rdDict + self.pzDict)]
-
         for i in range(len(self.sources)):
             s = self.sources[i]['source'].lower()
             p = self.sources[i]['provider']
             p = re.sub('v\d*$', '', p)
 
             q = self.sources[i]['quality']
-            if q == 'SD' and s in self.hostmqDict: q = 'MQ'
-            elif q == 'SD' and s in self.hostlqDict: q = 'LQ'
-            elif q == 'SD': q = 'HQ'
 
             try: d = self.sources[i]['info']
             except: d = ''
             if not d == '': d = ' | [I]%s [/I]' % d
 
-            if s in self.rdDict: label = '%02d | [B]realdebrid[/B] | ' % int(i+1)
-            elif s in self.pzDict: label = '%02d | [B]premiumize[/B] | ' % int(i+1)
-            else: label = '%02d | [B]%s[/B] | ' % (int(i+1), p)
+            label = '%02d | [B]%s[/B] | ' % (int(i+1), p)
 
             if q in ['1080p', 'HD']: label += '%s%s | [B][I]%s [/I][/B]' % (s, d, q)
             else: label += '%s%s | [I]%s [/I]' % (s, d, q)
@@ -648,27 +590,6 @@ class sources:
         return self.sources
 
 
-    def sourcesReset(self):
-        try:
-            if control.setting('hosthd1') == '': return
-
-            settingsFile = control.settingsFile
-            file = control.openFile(settingsFile) ; read = file.read().splitlines() ; file.close()
-
-            write = unicode( '<settings>' + '\n', 'UTF-8' )
-            for line in read:
-                if len(re.findall('<settings>', line)) > 0: continue
-                elif len(re.findall('</settings>', line)) > 0: continue
-                elif len(re.findall('id="(host|hosthd)500\d*"', line)) > 0: pass
-                elif len(re.findall('id="(host|hosthd)\d*"', line)) > 0: continue
-                write += unicode(line.rstrip() + '\n', 'UTF-8')
-            write += unicode('</settings>' + '\n', 'UTF-8')
-
-            file = control.openFile(settingsFile, 'w') ; file.write(str(write)) ; file.close()
-        except:
-            return
-
-
     def sourcesResolve(self, url, provider):
         try:
             provider = provider.lower()
@@ -766,15 +687,6 @@ class sources:
 
 
     def sourcesDirect(self):
-        self.sources = [i for i in self.sources if not i['source'] in self.hostcapDict]
-
-        self.sources = [i for i in self.sources if not (i['quality'] in ['1080p', 'HD'] and i['source'] in self.hosthdDict and not i['source'] in self.rdDict + self.pzDict)]
-
-        self.sources = [i for i in self.sources if not i['source'] in ['easynews', 'furk', 'vk']]
-
-        if control.setting("playback_auto_sd") == 'true':
-            self.sources = [i for i in self.sources if not i['quality'] in ['1080p', 'HD']]
-
         u = None
 
         self.progressDialog = control.progressDialog
@@ -807,23 +719,24 @@ class sources:
 
 
     def sourcesDictionary(self):
-        self.rdDict = []
-        self.pzDict = []
-
-        self.hostlocDict = self.hostdirhdDict = resolvers.hosthqDict()
-
-        self.hostprDict = [i.rsplit('.', 1)[0] for i in resolvers.hostprDict()]
-
-        self.hostcapDict = [i.rsplit('.', 1)[0] for i in resolvers.hostcapDict()]
-
-        self.hosthqDict = self.hosthdDict = [i.rsplit('.', 1)[0] for i in resolvers.hosthqDict()]
+        try:
+            import urlresolver.plugnplay
+            self.resolvers = urlresolver.plugnplay.man.implementors(urlresolver.UrlResolver)
+            self.resolvers = [i for i in self.resolvers if not '*' in i.domains]
+        except:
+            self.resolvers = []
 
-        self.hostmqDict = [i.rsplit('.', 1)[0] for i in resolvers.hostmqDict()]
+        try:
+            self.hostDict = [i.domains for i in self.resolvers]
+            self.hostDict = [i.lower() for i in reduce(lambda x, y: x+y, self.hostDict)]
+            self.hostDict = [x for y,x in enumerate(self.hostDict) if x not in self.hostDict[:y]]
+        except:
+            self.hostDict = []
 
-        self.hostlqDict = [i.rsplit('.', 1)[0] for i in resolvers.hostlqDict()]
+        self.hostlocDict = self.hostDict
 
-        self.hostsdfullDict = self.hostprDict + self.hosthqDict + self.hostmqDict + self.hostlqDict
+        self.hostsdfullDict = [i.rsplit('.', 1)[0] for i in self.hostDict]
 
-        self.hosthdfullDict = self.hostprDict + self.hosthdDict
+        self.hosthdfullDict = [i.rsplit('.', 1)[0] for i in self.hostDict]
 
 
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/Huddle-fanart.jpg b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/Huddle-fanart.jpg
deleted file mode 100644
index 5d6fc7e0617ce78841987072df7b96749b3f7b48..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/Huddle-fanart.jpg and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NBA-Globe.jpg b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NBA-Globe.jpg
deleted file mode 100644
index 54e4fc05769eaf1a67d8319bb88c9af4c066b550..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NBA-Globe.jpg and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NFL.jpg b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NFL.jpg
deleted file mode 100644
index d61bc25d50f62e2ffe75bf632d214b91d70885db..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NFL.jpg and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NHL.jpg b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NHL.jpg
deleted file mode 100644
index 95654a58f7db162dece90328b4b7f7483ede984e..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/NHL.jpg and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/archive.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/archive.png
deleted file mode 100644
index 72e4d237facf49703c9803607d8ad1afbe7c887d..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/archive.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/icon.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/icon.png
deleted file mode 100644
index 879c8ae81905d74f0648c90c236df4872f77d305..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/icon.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mlb.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mlb.png
deleted file mode 100644
index 0d7d00840c18bd66fd6d30836ef667e326621a04..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mlb.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mma.jpg b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mma.jpg
deleted file mode 100644
index 3fae88040e462e00db91aed164048e77830656ad..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mma.jpg and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mma.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mma.png
deleted file mode 100644
index 22b265bfc9909c3aff01bf3b53ae11aa6f3cfead..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/mma.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nba.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nba.png
deleted file mode 100644
index e219621591cf4a9655aff2c88b36f2fa3f46f22c..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nba.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nfl.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nfl.png
deleted file mode 100644
index 10191c8e372f199cda193c6baaf24d9d0c915b9c..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nfl.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nhl.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nhl.png
deleted file mode 100644
index 3fe6a465ea7403f9ae3e1ebb83556cd4f3666065..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/nhl.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/soccer.jpg b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/soccer.jpg
deleted file mode 100644
index 2d6883f83d69c16d08e1216ea47f795f3df6bda9..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phhuddle/soccer.jpg and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phstreams/radios.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phstreams/radios.png
index 9067e21e0c437d26ee3411a90adeb8139e8ff60d..8aa560b9ea3b2bcc9d52cfb0a7bbd2eb9ee0d5a8 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phstreams/radios.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.phstreams/resources/media/phstreams/radios.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/addon.xml
index 915f27111c8282bdf2bc81a68fa10675678ae27f..fa822595e38788920d1434f9a46f044139aadea1 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/addon.xml
@@ -1,23 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.torrentrssviewer" name="[COLOR ffff9900]Torrent RSS[/COLOR] Viewer" version="1.1.4" provider-name="mancuniancol">
-	<requires>
-		<import addon="xbmc.python" version="2.12.0"/>
-		<import addon="script.module.mctools" optional="false"/>
-	</requires>
+<addon id="plugin.video.torrentrssviewer" name="[COLOR ffff9900]Torrent RSS[/COLOR] Viewer" version="1.1.7"
+       provider-name="mancuniancol">
+    <requires>
+        <import addon="xbmc.python" version="2.12.0"/>
+        <import addon="script.module.mctools" optional="false"/>
+    </requires>
     <extension point="xbmc.python.pluginsource" library="main.py">
         <provides>video</provides>
-	</extension>
-	<extension point="xbmc.service" library="service.py" start="login">
-	</extension>
-	<extension point="xbmc.addon.metadata">
-		<summary lang="en">Torrent RSS viewer</summary>
-		<summary lang="es">Visor de enlaces RSS Torrents</summary>
-		<description lang="en">This Add-on allows to view links from  RSS source to be play for Pulsar, XBMCtorrent, KmediaTorrent, Torrenter V2 or YATP with additional local library integration option</description>
-		<description lang="es">Este Add-on permite ver los enlaces de fuentes RSS para ser reproducidas por medio de Pulsar, XBMCtorrent, KmediaTorrent, Torrenter V2 o YATP con opción adicional de integración a la librería local</description>
-		<language></language>
-		<platform>all</platform>
-		<forum></forum>
-		<disclaimer lang="en">It is just for educational purpose[CR]Check if it is illegal in your country to use.</disclaimer>
-		<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
-	</extension>
+    </extension>
+    <extension point="xbmc.service" library="service.py" start="login">
+    </extension>
+    <extension point="xbmc.addon.metadata">
+        <summary lang="en">Torrent RSS viewer</summary>
+        <summary lang="es">Visor de enlaces RSS Torrents</summary>
+        <description lang="en">This Add-on allows to view links from RSS source to be play for Pulsar, XBMCtorrent,
+            KmediaTorrent, Torrenter V2 or YATP with additional local library integration option
+        </description>
+        <description lang="es">Este Add-on permite ver los enlaces de fuentes RSS para ser reproducidas por medio de
+            Pulsar, XBMCtorrent, KmediaTorrent, Torrenter V2 o YATP con opción adicional de integración a la librería
+            local
+        </description>
+        <language></language>
+        <platform>all</platform>
+        <forum></forum>
+        <disclaimer lang="en">It is just for educational purpose[CR]Check if it is illegal in your country to use.
+        </disclaimer>
+        <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+    </extension>
 </addon>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/changelog.txt
index cc440e41fe9078afce0f2695b9197a8855533aa6..525313532f66aa549871b1c4ff664cf478656379 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/changelog.txt
@@ -1,3 +1,6 @@
+Version 1.1.7 4K
+Version 1.1.6 Adding Quasar support
+Version 1.1.5 fix bug
 Version 1.1.4 refreshing view
 Version 1.1.3 fixing dialog error
 Version 1.1.2 fix addons.xml
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/main.py
index 160067c04134d4ab7ae9d555530844af50a473f6..f481597bdb06e912b9d58265b7d6d7fe1432d464 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/main.py
@@ -54,7 +54,6 @@ def add():
         name = settings.dialog.input(plugin.get_string(32008)).title()
     storage.database[name] = (selection, False)
     storage.save()
-    'XBMC.Container.Update(%s)' % plugin.url_for('/')
 
 
 # read the information from rss url
@@ -141,7 +140,8 @@ def readList(type):
                           'stream_info': info.infoStream,
                           'context_menu': [
                               (plugin.get_string(32009),
-                               'XBMC.RunPlugin(%s)' % plugin.url_for('importOne', title=title, magnet=normalize(magnet)))
+                               'XBMC.RunPlugin(%s)' % plugin.url_for('importOne', title=title,
+                                                                     magnet=normalize(magnet)))
                           ]
                           })
         except:
@@ -153,7 +153,9 @@ def readList(type):
 def play(magnet):
     # Set-up the plugin
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
@@ -296,7 +298,8 @@ def _readRss(url):
             else:
                 for link in entry.links:
                     value = link.href  # Taking the last link
-            info = formatTitle(entry.title)
+            entry.title = entry.title.replace('/', '')
+            info = formatTitle(entry.title.replace('/', ''))
             if 'MOVIE' in info['type']:
                 titlesMovie.append(entry.title)
                 magnetsMovie.append(value)
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/0.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..26bb54e9a66e9dd12e3fcd8f947aa6809455abae
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/0.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/1.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..03385b2aa39dab0d99d143033cda0a0d9e650bab
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/1.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/2.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..58a621eb9c92475a80f6dc6d0d7c0d4dad6f6e1d
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/2.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/3.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..08a62ef83556ff3bf8ce8712f158089ee594066b
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/3.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/4.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..e93da035a1e04a6473371e526109bc863bb65ebc
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/4.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/5.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..7945cb994ba27413e20484cced9593d2970dacde
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/5.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/6.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..395c0e835e6d9c984b2a16430139ac85f753f738
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/6.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/7.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cf422755c44450ad2eeeb0baca01e7313ce3058
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/7.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/8.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/8.png
new file mode 100644
index 0000000000000000000000000000000000000000..4908a2f44fbfab95b920badc69b0f627bb560bae
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/8.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/9.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec76cebaf94f387379d04822d627d02f2978c8eb
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/9.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/A.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/A.png
index e5f374d24b1f760aa04d428d89b9dd2517b93ec2..7d729748c24c5b8f900465646c11fe956d753c38 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/A.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/A.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/B.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/B.png
index 9a3dead6a4402ccf940212d12fb1d10b9b3498c2..0663c0b97fc3d40a3c1dee7e64f2c33249007ade 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/B.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/B.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/C.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/C.png
index 0cc663c683e87c3dbcf688c295ebc1393fffb5d0..fb1aed5021e8bd8d91fb4a01cf9b1beedd01c1e3 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/C.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/C.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/D.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/D.png
index 82f1e42af3c5edf047ea6e7b5e8c1eaef8c3ef96..b5319eebcab4fba621a0c7722224caacc98bfc5e 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/D.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/D.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/E.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/E.png
index d0db47272e0c2329075d373571e3dda7a75c653e..04b852462b282d8a92a6c86075a9211ec6b136ed 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/E.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/E.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/F.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/F.png
index 71e7a7b00e315d92e5ac9535be6bf3889a1f0b8d..e1b5e4431d5a63bf31ac543b96467c8e78ec8b0a 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/F.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/F.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/G.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/G.png
index 3c791e37f377f6eb01b8eabfa0b72df31da02e53..ffa1e7083bc62e4e360ea4634d8d02096420df8a 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/G.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/G.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/H.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/H.png
index d159d6b4fbbe655ddb53ccab54cb104447ab404b..19c1191c80d5a2a38f38aa934e1f8814fc4bc3cf 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/H.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/H.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/I.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/I.png
index 6c7341d95d2601e6a404003a3698953e9506fe63..840e0dafc53d1f350ed30323f82fa9950c67e958 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/I.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/I.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/J.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/J.png
index 74baec1ea96bf1a62aa46511c3b91893bee9fa14..b4736c2eeecf78ae455d5ecc5451c60615a3cf5f 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/J.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/J.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/K.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/K.png
index 6e3a814c44630339289d48af2aab2c5857f7aa66..9726880d1030f70251a060959495ae9f72948ac9 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/K.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/K.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/L.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/L.png
index 53b9b7b70987d27671c878aed5eecdc78eec40fb..c60af30e0f7348aa1c927fdfa7d12ad74cfb7dec 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/L.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/L.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/M.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/M.png
index c3fb2617ca2e7efa2a2b5bc702647d0e04de9958..5876de142a768b502c97bf6dd43f83b1c8898237 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/M.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/M.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/N.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/N.png
index a9b58c7630035828be4fffbca7ab4067bb0bf577..97f666e4012d4e76d729299b574d0df244f87f39 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/N.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/N.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/O.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/O.png
index 4a5226c647956e22fbcf360e307cfe9a2a43f29d..851f1f05ba4c1b201483bc1857d1d4e1fdcd5b68 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/O.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/O.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/P.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/P.png
index 13f78ada6a9b5db14f870374fd53b3210c870ba2..c214cc0f27299c98ddcbfff9eaf4372c7f657bf2 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/P.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/P.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Q.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Q.png
index 6c1fd78e50573f0a0752ea2a40d06d12e9c0dc9d..96199d05f7b3aae953a4a1f18287221026236524 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Q.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Q.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/R.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/R.png
index e7caa46d99fb33919dff768debc4cc8663468f8c..bf58a391ef3e1719c44e3cfbe4cd0965aadb99d9 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/R.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/R.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/S.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/S.png
index 91686ba372eb3ec7e9c40c088511abc1f7f1a9dd..8dbf55d01a09048b279c4109c4690c0f3e006371 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/S.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/S.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/T.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/T.png
index 271fdcae1db1886549b3d4b4018d53751db0d37f..9268f18df2f6ef4d93f84e1b634e61a68d660876 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/T.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/T.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Thumbs.db b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..76d3ec8c0e535f8f0f2488d638cfc8d79cd5918e
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Thumbs.db differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/U.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/U.png
index 55a3f4a904233d6822320e895effeef6fa43de88..9c21e21b78e11499a81b5d9899122f4d7cb614e9 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/U.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/U.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/V.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/V.png
index 4a57e204a3cebe80cf7091800a7eb61385e0d5dd..3a39c707789892c6422dfd792f96166b000cef9e 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/V.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/V.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/W.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/W.png
index c6ff31a4cbadc3e1f9e83a031af1d942b49e03fa..0bed975f7409b535651192768e87c594796cb14a 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/W.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/W.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/X.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/X.png
index 679d27cff714ac64e19bb9e765aa80f45b0663dd..c23a98155e245a751d7f10b614e4e9e11420c648 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/X.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/X.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Y.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Y.png
index 89406dfc49929a7cb0b6279dbdeb79f6756f6f7f..7da7cf3e3bf7d6daeefd2d496a4b978d00e7dbfb 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Y.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Y.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Z.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Z.png
index eab6cfc469916bffff1958d7561cad1595b3824a..936101763e093a5c6310da916c67c5e5babeb522 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Z.png and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/Z.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addList.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addList.png
new file mode 100644
index 0000000000000000000000000000000000000000..e52dcb7c9ba5f86ceaeed963acd99e44960301ff
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addList.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addSearch.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addSearch.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5af5047981aaefb8156f4a9515fbb2fb52cf29e
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addSearch.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addWatchlist.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addWatchlist.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b5c1071ff83d861640d3f7a17aef92c59b26ab1
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/addWatchlist.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/animes.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/animes.png
new file mode 100644
index 0000000000000000000000000000000000000000..dac966a65691b145dcdcedf32240f7ea1f2354bc
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/animes.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/help.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab5abce4c55483ad98231df4b7913e0905c9804e
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/help.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/movies.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/movies.png
new file mode 100644
index 0000000000000000000000000000000000000000..51f5579d4deaf7b24074713831567b7e9893fbea
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/movies.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/nextPage.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/nextPage.png
new file mode 100644
index 0000000000000000000000000000000000000000..7010dc1f44e42993b434ceb32b04a679f89697b4
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/nextPage.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/search.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..20a8aa0fc3d487f9d6b2e046b1395908dd89ae15
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/search.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/tvShows.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/tvShows.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0447615b3574a6679360c68402509605662476a
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/images/tvShows.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/English/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/English/strings.po
index bb74f8ca1ffa9518b5a43239710212ced88dd999..0808a659c56e12b5917ab93615a484c309bdebe6 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/English/strings.po
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/English/strings.po
@@ -101,12 +101,12 @@ msgstr ""
 
 #: script.py:21
 msgctxt "#32016"
-msgid "-SETTINGS"
+msgid "[B]SETTINGS[/B]"
 msgstr ""
 
 #: script.py:22
 msgctxt "#32017"
-msgid "-HELP"
+msgid "[B]HELP[/B]"
 msgstr ""
 
 #: script.py:23
@@ -557,3 +557,79 @@ msgstr ""
 msgctxt "#32183"
 msgid "Remove this TV Show"
 msgstr ""
+
+#:
+msgctxt "#32184"
+msgid "Add an new Movie..."
+msgstr ""
+
+#:
+msgctxt "#32185"
+msgid "Remove this Movie"
+msgstr ""
+
+#:
+msgctxt "#32186"
+msgid "Add an new item..."
+msgstr ""
+
+#:
+msgctxt "#32187"
+msgid "Remove this item"
+msgstr ""
+
+#:
+msgctxt "#32188"
+msgid "Modify this item"
+msgstr ""
+
+#:Torrents
+msgctxt "#32190"
+msgid "Search for:"
+msgstr ""
+
+#:Torrents
+msgctxt "#32191"
+msgid "Next Page.."
+msgstr ""
+
+#:Torrents
+msgctxt "#32192"
+msgid "Name of this search"
+msgstr ""
+
+#:Torrents
+msgctxt "#32193"
+msgid "Do you want to keep this query?"
+msgstr ""
+
+#:Torrents
+msgctxt "#32194"
+msgid "[B]Search...[/B]"
+msgstr ""
+
+#:Torrents
+msgctxt "#32195"
+msgid "New Search..."
+msgstr ""
+
+#:Torrents
+msgctxt "#32196"
+msgid "New List..."
+msgstr ""
+
+#:Torrents
+msgctxt "#32197"
+msgid "New Watchlist..."
+msgstr ""
+
+#:Torrents
+msgctxt "#32198"
+msgid "From Year:"
+msgstr ""
+
+#:Torrents
+msgctxt "#32199"
+msgid "To Year:"
+msgstr ""
+
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/French/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/French/strings.po
index cfd4ca71c1a64b9dc846049925e066530c93ad6d..d636dad32ca40f8148cb283735ff303b0216a64b 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/French/strings.po
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/French/strings.po
@@ -101,13 +101,13 @@ msgstr "Effacer les dossiers"
 
 #: script.py:21
 msgctxt "#32016"
-msgid "-SETTINGS"
-msgstr "-PARAMÈTRES"
+msgid "[B]SETTINGS[/B]"
+msgstr "[B]PARAMÈTRES[/B]"
 
 #: script.py:22
 msgctxt "#32017"
-msgid "-HELP"
-msgstr "-AIDE"
+msgid "[B]HELP[/B]"
+msgstr "[B]AIDE[/B]"
 
 #: script.py:23
 msgctxt "#32018"
@@ -476,7 +476,7 @@ msgstr "Tendance en Émissions"
 #: TRAKT
 msgctxt "#32110"
 msgid "Watchlist"
-msgstr "Liste pour regarder"
+msgstr "Liste de Surveillance"
 
 # ################################################################
 #: IMDB main.py:6
@@ -565,9 +565,85 @@ msgstr "Effacer cet Anime"
 #:EZTV
 msgctxt "#32182"
 msgid "Add an new TV Show..."
-msgstr "Ajouter à nouveau téléserie..."
+msgstr "Ajouter un nouveau téléserie..."
 
 #:EZTV
 msgctxt "#32183"
 msgid "Remove this TV Show"
-msgstr "Effacer cette téléserie"
\ No newline at end of file
+msgstr "Effacer cette téléserie"
+
+#:
+msgctxt "#32184"
+msgid "Add an new Movie..."
+msgstr "Ajouter un nouveau film..."
+
+#:
+msgctxt "#32185"
+msgid "Remove this Movie"
+msgstr "Effacer ce film"
+
+#:
+msgctxt "#32186"
+msgid "Add an new item..."
+msgstr "Ajouter un nouveau élément..."
+
+#:
+msgctxt "#32187"
+msgid "Remove this item"
+msgstr "Effacer cet élément"
+
+#:
+msgctxt "#32188"
+msgid "Modify this item"
+msgstr "Modifier cet élément"
+
+#:Torrents
+msgctxt "#32190"
+msgid "Search for:"
+msgstr "Rechercher pour:"
+
+#:Torrents
+msgctxt "#32191"
+msgid "Next Page.."
+msgstr "Page Suivante.."
+
+#:Torrents
+msgctxt "#32192"
+msgid "Name of this search"
+msgstr "Nom de cette recherche"
+
+#:Torrents
+msgctxt "#32193"
+msgid "Do you want to keep this query?"
+msgstr "Voulez-vous saugarder cette recherche?"
+
+#:Torrents
+msgctxt "#32194"
+msgid "[B]Search...[/B]"
+msgstr "[B]Recherches...[/B]"
+
+#:Torrents
+msgctxt "#32195"
+msgid "New Search..."
+msgstr "Nouvelle recherche..."
+
+#:Torrents
+msgctxt "#32196"
+msgid "New List..."
+msgstr "Nouvelle Liste..."
+
+#:Torrents
+msgctxt "#32197"
+msgid "New Watchlist..."
+msgstr "Nouvelle Liste de Surveillance..."
+
+#:Torrents
+msgctxt "#32198"
+msgid "From Year:"
+msgstr "De l'année:"
+
+#:Torrents
+msgctxt "#32199"
+msgid "À l'année:"
+msgstr ""
+
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Spanish/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Spanish/strings.po
index 7c388d00797c61113744825a210a2afc92b42c26..1a99f99e84b6588c3d2bbe813677437d45131633 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Spanish/strings.po
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Spanish/strings.po
@@ -51,7 +51,7 @@ msgstr "Agregar Nuevo Enlace [COLOR ffff9900]RSS[/COLOR]"
 #: addon.py:86 script.py:44
 msgctxt "#32006"
 msgid "Do you want Remove %s?"
-msgstr "Está seguro de borrar %s?"
+msgstr "¿Está seguro de borrar %s?"
 
 #: addon.py:93 addon.py:100 script.py:25 script.py:37
 msgctxt "#32007"
@@ -101,13 +101,13 @@ msgstr "Borrar Directorios"
 
 #: script.py:21
 msgctxt "#32016"
-msgid "-SETTINGS"
-msgstr "-CONFIGURACIÓN"
+msgid "[B]SETTINGS[/B]"
+msgstr "[B]CONFIGURACIÓN[/B]"
 
 #: script.py:22
 msgctxt "#32017"
 msgid "-HELP"
-msgstr "-AYUDA"
+msgstr "[B]AYUDA[/B]"
 
 #: script.py:23
 msgctxt "#32018"
@@ -201,7 +201,7 @@ msgid ""
 "Do you want to integrate this list?"
 msgstr ""
 "%s: %s elementos\n"
-"Desea integrar esta lista?"
+"¿Desea integrar esta lista?"
 
 #: tools.py:741
 msgctxt "#32034"
@@ -483,7 +483,7 @@ msgstr "Tendencia en Series"
 #: TRAKT
 msgctxt "#32110"
 msgid "Watchlist"
-msgstr "Lista para mirar"
+msgstr "Lista de Vigilancia"
 
 # ################################################################
 #: IMDB main.py:6
@@ -574,4 +574,80 @@ msgstr "Añadir una nueva Serie..."
 #:EZTV
 msgctxt "#32183"
 msgid "Remove this TV Show"
-msgstr "Borrar esta Serie"
\ No newline at end of file
+msgstr "Borrar esta Serie"
+
+#:
+msgctxt "#32184"
+msgid "Add an new Movie..."
+msgstr "Añadir una nueva Película..."
+
+#:
+msgctxt "#32185"
+msgid "Remove this Movie"
+msgstr "Borrar esta Película"
+
+#:
+msgctxt "#32186"
+msgid "Add an new item..."
+msgstr "Añadir un nuevo elemento..."
+
+#:
+msgctxt "#32187"
+msgid "Remove this item"
+msgstr "Borrar este elemento"
+
+#:
+msgctxt "#32188"
+msgid "Modify this item"
+msgstr "Modificar este elemento"
+
+#:Torrents
+msgctxt "#32190"
+msgid "Search for:"
+msgstr "Buscar por:"
+
+#:Torrents
+msgctxt "#32191"
+msgid "Next Page.."
+msgstr "Próxima Página.."
+
+#:Torrents
+msgctxt "#32192"
+msgid "Name of this search"
+msgstr "Nombre de esta busqueda"
+
+#:Torrents
+msgctxt "#32193"
+msgid "Do you want to keep this query?"
+msgstr "¿Quiere guardar esta busqueda?"
+
+#:Torrents
+msgctxt "#32194"
+msgid "[B]Search...[/B]"
+msgstr "[B]Buquedas[/B]"
+
+#:Torrents
+msgctxt "#32195"
+msgid "New Search..."
+msgstr "Nueva busqueda..."
+
+#:Torrents
+msgctxt "#32196"
+msgid "New List..."
+msgstr "Nueva Lista..."
+
+#:Torrents
+msgctxt "#32197"
+msgid "New Watchlist..."
+msgstr "Nueva Lista de Vigilancia..."
+
+#:Torrents
+msgctxt "#32198"
+msgid "From Year:"
+msgstr "Del año:"
+
+#:Torrents
+msgctxt "#32199"
+msgid "Al año:"
+msgstr ""
+
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Swedish/strings.mo b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Swedish/strings.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d794a78eb6a17d70376949eae31b2f7ce67f97d3
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Swedish/strings.mo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Swedish/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Swedish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..740b77d913fab3524732f5e58fb5f70cf70e9e94
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/language/Swedish/strings.po
@@ -0,0 +1,637 @@
+# Kodi Media Center language file
+# Addon Name: RSS Torrents Integration, trakt
+# Addon id: plugin.video.rsstorrentintegration
+# Addon Provider: mancuniancol
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-05 05:53-0400\n"
+"PO-Revision-Date: 2016-01-10 07:02-0500\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: addon.py:21
+msgctxt "#32000"
+msgid ""
+"Warning!\n"
+"This addon uses torrent addon player that it could be illegal in your country.\n"
+"\n"
+"Be sure to consult the local laws before use those torrent addon players.\n"
+"\n"
+"It is highly recommended that you use a VPN provider,\n"
+"in order to avoid potential legal repercussions in the future.\n"
+"\n"
+"For any assistance, please, visit http://tutvguia.com/forums/"
+msgstr "Varning! Denna addon använder torrent addon spelare som det kan vara olagligt i ditt land. Var noga med att samråda med lokala lagar före användning dessa torrent addon spelare. Det rekommenderas starkt att du använder en VPN-leverantör, för att undvika eventuella rättsliga konsekvenser i framtiden. För någon hjälp, snälla, besök http://tutvguia.com/forums/"
+
+#: addon.py:21
+msgctxt "#32001"
+msgid "Disable Automatic Library Integration"
+msgstr "Inaktivera automatisk Bibliotek Integration"
+
+#: addon.py:24
+msgctxt "#32002"
+msgid "Enable Automatic Library Integration"
+msgstr "Aktivera automatisk Library Integration"
+
+#: addon.py:29
+msgctxt "#32003"
+msgid "Remove RSS URL"
+msgstr "Ta bort RSS-URL"
+
+#: addon.py:30
+msgctxt "#32004"
+msgid "Modify RSS URL"
+msgstr "Ändra RSS URL"
+
+#: addon.py:75 script.py:15
+msgctxt "#32005"
+msgid "Add a New [COLOR ffff9900]RSS[/COLOR]"
+msgstr "Lägga till en ny [COLOR ffff9900] RSS [/ COLOR]"
+
+#: addon.py:86 script.py:44
+msgctxt "#32006"
+msgid "Do you want Remove %s?"
+msgstr "Vill du ta bort%s?"
+
+#: addon.py:93 addon.py:100 script.py:25 script.py:37
+msgctxt "#32007"
+msgid "URL RSS:"
+msgstr "URL-RSS:"
+
+#: addon.py:103 script.py:28
+msgctxt "#32008"
+msgid "Name to this RSS:"
+msgstr "Namn på det här Rss:"
+
+#: addon.py:176
+msgctxt "#32009"
+msgid "Import to the local library"
+msgstr "Import till det lokala biblioteket"
+
+#: script.py:15 script.py:99
+msgctxt "#32010"
+msgid "Choose an Option:"
+msgstr "Välj ett alternativ"
+
+#: script.py:16
+msgctxt "#32011"
+msgid "Modify Saved [COLOR ffff9900]RSS[/COLOR]"
+msgstr "Ändra sparade [COLOR ffff9900] RSS [/ COLOR]"
+
+#: script.py:17
+msgctxt "#32012"
+msgid "Remove a [COLOR ffff9900]RSS[/COLOR]"
+msgstr "Ta en [COLOR ffff9900] RSS [/ COLOR]"
+
+#: script.py:18
+msgctxt "#32013"
+msgid "View Saved [COLOR ffff9900]RSS[/COLOR] list"
+msgstr "Se sparade [COLOR ffff9900] RSS [/ COLOR] listan"
+
+#: script.py:19
+msgctxt "#32014"
+msgid "Read [COLOR ffff9900]RSS[/COLOR] list and create .strm Files in"
+msgstr "Läs [COLOR ffff9900] RSS [/ COLOR] listan och skapa .strm filer"
+
+# ################################################################
+#: script.py:20
+msgctxt "#32015"
+msgid "Erase Folders"
+msgstr "Rensa mappar"
+
+#: script.py:21
+msgctxt "#32016"
+msgid "[B]SETTINGS[/B]"
+msgstr "[B]INSTÄLLNINGAR[/B]"
+
+#: script.py:22
+msgctxt "#32017"
+msgid "-HELP"
+msgstr "-HJÄLP"
+
+#: script.py:23
+msgctxt "#32018"
+msgid "Exit"
+msgstr "Lämna"
+
+#: script.py:34 script.py:42
+msgctxt "#32019"
+msgid "CANCEL"
+msgstr "AVBRYT"
+
+#: script.py:42
+msgctxt "#32020"
+msgid "Choose RSS to Remove"
+msgstr "Välj RSS för att ta bort"
+
+#: script.py:63 service.py:27
+msgctxt "#32021"
+msgid ""
+"Checking Online\n"
+"%s..."
+msgstr "Kontrollerar Online%s ..."
+
+#: addon.py:126 script.py:99
+msgctxt "#32022"
+msgid "Movies"
+msgstr "Filmer"
+
+#: script.py:99
+msgctxt "#32023"
+msgid "TV Shows"
+msgstr "TV serier"
+
+#: script.py:113
+msgctxt "#32024"
+msgid "Animes"
+msgstr "Animes"
+
+#: script.py:114
+msgctxt "#32025"
+msgid ""
+"Please, check this address to find the user's operation:\n"
+"[B]http://goo.gl/8nYU6R[/B]"
+msgstr "Vänligen kontrollera denna adress för att hitta användarens drift: [B] http://goo.gl/8nYU6R [/ B]"
+
+# ################################################################
+#: service.py:65
+msgctxt "#32026"
+msgid "Persistent Update Service starting..."
+msgstr "Regelbundna Uppdaterings Service startar ..."
+
+#: service.py:71
+msgctxt "#32027"
+msgid "Update List at %s"
+msgstr "Uppdatera lista på%s"
+
+#: service.py:72
+msgctxt "#32028"
+msgid "Next Update in %s"
+msgstr "Vill du ta bort%s?"
+
+# ################################################################
+#: tools.py:140 tools.py:141
+msgctxt "#32029"
+msgid "All .strm files removed!"
+msgstr "Alla .strm filer avlägsnas!"
+
+#: tools.py:145
+msgctxt "#32030"
+msgid "Erasing Database..."
+msgstr "Rensar Databas ..."
+
+#: tools.py:732
+msgctxt "#32031"
+msgid "MOVIES"
+msgstr "FILMER"
+
+#: tools.py:732
+msgctxt "#32032"
+msgid "EPISODES"
+msgstr "AVSNITT"
+
+#: tools.py:736
+msgctxt "#32033"
+msgid ""
+"%s: %s items\n"
+"Do you want to integrate this list?"
+msgstr "%s:%s Vill du integrera denna lista?"
+
+#: tools.py:741
+msgctxt "#32034"
+msgid ""
+"Checking for %s\n"
+"%s"
+msgstr "Kontroll av%s%s"
+
+#: tools.py:795
+msgctxt "#32035"
+msgid "Code %s=%s"
+msgstr "Kod%s =%s"
+
+#: tools.py:806
+msgctxt "#32036"
+msgid "Creating %s/%s.strm..."
+msgstr "Skapa%s /%s.strm ..."
+
+#: tools.py:806
+msgctxt "#32037"
+msgid ""
+"%s %s found - Still working...\n"
+"%s"
+msgstr "%s%s hittades - Arbetar Fortfarande ...%s"
+
+#: tools.py:809
+msgctxt "#32038"
+msgid "%s added"
+msgstr "%s tillagd"
+
+#: tools.py:847
+msgctxt "#32039"
+msgid "%s/%s.strm added"
+msgstr "%s /%s.strm tillagd"
+
+#: tools.py:857
+msgctxt "#32040"
+msgid "%s %s added. %s"
+msgstr "%s%s tillagd. %s"
+
+#: tools.py:864
+msgctxt "#32041"
+msgid "No new %s. %s"
+msgstr "Inga nyheter. %s"
+
+#: tools.py:866
+msgctxt "#32042"
+msgid ""
+"No new %s\n"
+"%s"
+msgstr "Inga nya%s%s"
+
+#: tools.py:732
+msgctxt "#32043"
+msgid "EPISODES ANIMES"
+msgstr "AVSNITT ANIMES"
+
+#: tools.py:741
+msgctxt "#32044"
+msgid "Checking Online"
+msgstr "Kontrollerar Online"
+
+#: tools.py:741
+msgctxt "#32045"
+msgid "Manual library Integration"
+msgstr "Aktivera automatisk Library Integration"
+
+# ################################################################
+#: settings.xml:3
+msgctxt "#32050"
+msgid "General"
+msgstr "Allmänt"
+
+#: settings.xml:4
+msgctxt "#32051"
+msgid "Movie Folder:"
+msgstr "Film Mapp:"
+
+#: settings.xml:5
+msgctxt "#32052"
+msgid "Show Folder:"
+msgstr "TV Serier Mapp:"
+
+#: settings.xml:6
+msgctxt "#32053"
+msgid "Anime Folder:"
+msgstr "Anime Mapp:"
+
+#: settings.xml:7
+msgctxt "#32054"
+msgid "Add-on to use:"
+msgstr "Tilläg för att använda:"
+
+#: settings.xml:9
+msgctxt "#32055"
+msgid "Overwrite Existent .strm Files:"
+msgstr "Alla .strm filer Skrivs över!"
+
+#: settings.xml:10
+msgctxt "#32056"
+msgid "Accept All Duplicated Files:"
+msgstr "Acceptera alla duplicerade filer:"
+
+#: settings.xml:11
+msgctxt "#32057"
+msgid "Notification Message"
+msgstr "Notifierings Meddelande"
+
+#: settings.xml:12
+msgctxt "#32058"
+msgid "Time (seconds):"
+msgstr "Tid (sekunder):"
+
+#: settings.xml:15
+msgctxt "#32059"
+msgid "Automatic Integration"
+msgstr "Aktivera automatisk Library Integration"
+
+#: settings.xml:16
+msgctxt "#32060"
+msgid "Run the Automatic Integration Service (check in every login):"
+msgstr "Kör den automatiska Integration service (checka in varje inloggning):"
+
+#: settings.xml:18
+msgctxt "#32061"
+msgid "Persistent Update @ 8h:"
+msgstr "Regelbundna uppdateringar @ 8T:"
+
+#: settings.xml:20
+msgctxt "#32062"
+msgid "Movies Filters"
+msgstr "Film Filter"
+
+#: settings.xml:21 settings.xml:43
+msgctxt "#32063"
+msgid "Advance Setup (for 'AND' use space, for 'OR' use comma)"
+msgstr "Advance Setup (för \"AND\" Använd mellanslag, \"OR\" användning kommatecken)"
+
+#: settings.xml:22 settings.xml:44
+msgctxt "#32064"
+msgid "Accept File with:"
+msgstr "Acceptera Filen med:"
+
+#: settings.xml:23 settings.xml:45
+msgctxt "#32065"
+msgid "Block File with:"
+msgstr "Blockera Filen med:"
+
+#: settings.xml:24 settings.xml:46
+msgctxt "#32066"
+msgid "Easy Setup Keywords after the query"
+msgstr "Enkel installation Nyckelord efter frågan"
+
+#: settings.xml:25 settings.xml:27 settings.xml:29 settings.xml:31
+#: settings.xml:33 settings.xml:35 settings.xml:37 settings.xml:39
+#: settings.xml:47 settings.xml:49 settings.xml:51 settings.xml:53
+msgctxt "#32067"
+msgid "Accept File|Block File|Filter Off"
+msgstr "Acceptera Arkiv | Blockera Arkiv | Filter Off"
+
+#: settings.xml:26 settings.xml:28 settings.xml:30 settings.xml:32
+#: settings.xml:48 settings.xml:50 settings.xml:52 settings.xml:54
+msgctxt "#32068"
+msgid "Filter Off"
+msgstr "Inaktivera filter"
+
+#: settings.xml:34 settings.xml:36 settings.xml:38 settings.xml:40
+msgctxt "#32069"
+msgid "Block File"
+msgstr "Blockera Fil"
+
+#: settings.xml:42
+msgctxt "#32070"
+msgid "TV Filters"
+msgstr "TV Filter"
+
+#: settings.xml:42
+msgctxt "#32071"
+msgid "Enable MetaInformation (Poster, Fanart, Plot, ...)"
+msgstr "Aktivera metainformation (Poster, Fanart, Plot, ...)"
+
+#: settings.xml:42
+msgctxt "#32072"
+msgid "Default View Mode"
+msgstr "Standardvy"
+
+#: settings.xml:4
+msgctxt "#32080"
+msgid "Action:"
+msgstr "Åtgärd"
+
+#: settings.xml:4
+msgctxt "#32081"
+msgid "Clear Database:"
+msgstr "Rensa Databas:"
+
+#: settings.xml:4
+msgctxt "#32082"
+msgid "Remove All .strm Files:"
+msgstr "Ta bort alla .strm filer:"
+
+#: settings.xml:4
+msgctxt "#32083"
+msgid "Type of Library:"
+msgstr "Typ av biblioteket:"
+
+#: settings.xml:4
+msgctxt "#32084"
+msgid "Include Specials Episodes (Season 0):"
+msgstr "Inkludera Special episoder (Säsong 0):"
+
+#: settings.xml:4
+msgctxt "#32085"
+msgid "Detailed log"
+msgstr "Detaljerad logg"
+
+#: setting.xml:21 settings.xml:4
+msgctxt "#32086"
+msgid "Start Delay (in seconds)"
+msgstr "Starta fördröjning (i sekunder)"
+
+#: setting.xml
+msgctxt "#32090"
+msgid "Login"
+msgstr "Logga in"
+
+#: setting.xml
+msgctxt "#32091"
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: setting.xml
+msgctxt "#32092"
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: setting.xml
+msgctxt "#32093"
+msgid "URL address (ex:http://www.example.com):"
+msgstr "URL-adress (ex: http: //www.example.com):"
+
+# ################################################################
+#: TRAKT main.py:6
+msgctxt "#32100"
+msgid "Choose a category"
+msgstr "Välj en kategori:"
+
+#: TRAKT
+msgctxt "#32101"
+msgid "List"
+msgstr "Lista"
+
+#: TRAKT
+msgctxt "#32105"
+msgid "Movies Popular"
+msgstr "Populära Filmer"
+
+#: TRAKT
+msgctxt "#32106"
+msgid "Movies Trending"
+msgstr "Trendiga Filmer"
+
+#: TRAKT
+msgctxt "#32107"
+msgid "TV Popular"
+msgstr "Populära TV serier"
+
+#: TRAKT
+msgctxt "#32108"
+msgid "TV Trending"
+msgstr "Trendinga TV serier"
+
+#: TRAKT
+msgctxt "#32110"
+msgid "Watchlist"
+msgstr "Bevakningslistor"
+
+# ################################################################
+#: IMDB main.py:6
+msgctxt "#32150"
+msgid "Genre"
+msgstr "Genrer"
+
+#: IMDB main.py:6
+msgctxt "#32151"
+msgid "Language"
+msgstr "Språk"
+
+#: IMDB main.py:6
+msgctxt "#32152"
+msgid "Popular and Oscar Winner"
+msgstr "Populärt och Oscar vinnare"
+
+#: IMDB main.py:6
+msgctxt "#32153"
+msgid "TOP 250"
+msgstr "TOP 250"
+
+#: IMDB main.py:6
+msgctxt "#32154"
+msgid "Keywords"
+msgstr "Nyckelord"
+
+# ################################################################
+#: Favourites main.py:6
+msgctxt "#32158"
+msgid "'No Favourites Found"
+msgstr "'Inga favoriter Funna"
+
+# ##########################
+#: YTS settings.xml
+msgctxt "#32160"
+msgid "Quality:"
+msgstr "Kvalitet:"
+
+#: YTS settings.xml
+msgctxt "#32161"
+msgid "Minimum Rating 0:OFF"
+msgstr "Minsta Rating 0: OFF"
+
+#: YTS settings.xml
+msgctxt "#32162"
+msgid "Sorting by:"
+msgstr "Sortera efter:"
+
+#: YTS settings.xml
+msgctxt "#32163"
+msgid "Number Pages to download:"
+msgstr "Antal sidor att ladda ner:"
+
+#: YTS settings.xml
+msgctxt "#32170"
+msgid "Manual Search"
+msgstr "Manuell Sökning"
+
+#: YTS settings.xml
+msgctxt "#32171"
+msgid "PreFixed List"
+msgstr "FörFixat Lista"
+
+#: YTS settings.xml
+msgctxt "#32172"
+msgid "Name Movie:"
+msgstr "Namn Filmer:"
+
+#: YTS settings.xml
+msgctxt "#32173"
+msgid "Which Movie:"
+msgstr "Vilken film:"
+
+msgctxt "#32180"
+msgid "Add an new Anime..."
+msgstr "Lägg till en ny Anime ..."
+
+msgctxt "#32181"
+msgid "Remove this Anime"
+msgstr "Ta bort denna Anime"
+
+msgctxt "#32182"
+msgid "Add an new TV Show..."
+msgstr "Lägg till en ny TV Show ..."
+
+msgctxt "#32183"
+msgid "Remove this TV Show"
+msgstr "Ta bort den här TV Serien"
+
+msgctxt "#32184"
+msgid "Add an new Movie..."
+msgstr "Lägg till en ny film ..."
+
+msgctxt "#32185"
+msgid "Remove this Movie"
+msgstr "Ta bort den här filmen"
+
+msgctxt "#32186"
+msgid "Add an new item..."
+msgstr "Lägg till en ny punkt ..."
+
+msgctxt "#32187"
+msgid "Remove this item"
+msgstr "Ta bort den här produkten"
+
+msgctxt "#32188"
+msgid "Modify this item"
+msgstr "Ändra detta objekt"
+
+msgctxt "#32190"
+msgid "Search for:"
+msgstr "Sök efter:"
+
+msgctxt "#32191"
+msgid "Next Page.."
+msgstr "Nästa sida.."
+
+msgctxt "#32192"
+msgid "Name of this search"
+msgstr "Namn på den här sökningen"
+
+msgctxt "#32193"
+msgid "Do you want to keep this query?"
+msgstr "Vill du behålla den här frågan?"
+
+msgctxt "#32194"
+msgid "[B]Search...[/B]"
+msgstr "[B] Sök ... [/ B]"
+
+msgctxt "#32195"
+msgid "New Search..."
+msgstr "Ny sökning ..."
+
+#:Torrents
+msgctxt "#32196"
+msgid "New List..."
+msgstr "Ny Lista..."
+
+#:Torrents
+msgctxt "#32197"
+msgid "New Watchlist..."
+msgstr "Ny Bevakningslistor..."
+
+#:Torrents
+msgctxt "#32198"
+msgid "From Year:"
+msgstr "Från år:"
+
+#:Torrents
+msgctxt "#32199"
+msgid "Till år:"
+msgstr ""
+
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/settings.xml
index 7439f60529eaa95d0a04e2ab68f58e8a9b5a9799..2243bd7dc3a6bf2d0495bed941c5000b4a84da6e 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentrssviewer/resources/settings.xml
@@ -4,8 +4,8 @@
         <setting label="32051" type="folder" id="movieFolder" source="videos" option="writeable" default=""/>
         <setting label="32052" type="folder" id="showFolder" source="videos" option="writeable" default=""/>
         <setting label="32053" type="folder" id="animeFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32045" type="bool" id="viewUrl" default="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/addon.xml
index b63cc277df2ccf4606206dfb849941c9aa9e7552..fd1b45104ba002749cefada3cb30ebb7ece61b01 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.torrentz" name="[COLOR FFFFB090]TorrentZ[/COLOR] viewer" version="1.2.5"
+<addon id="plugin.video.torrentz" name="[COLOR FFFFB090]TorrentZ[/COLOR] viewer" version="1.2.6"
        provider-name="mancuniancol">
     <requires>
         <import addon="xbmc.python" version="2.12.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/changelog.txt
index 6752af19754c08dee09fa58dee9c6ee615fe6ab9..4163a1e58d2f05e39bb56d98fd4f262417fac3bd 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/changelog.txt
@@ -1,4 +1,4 @@
-
+Version 1.2.6 Adding Quasar support
 Version 1.2.5 refreshing view
 Version 1.2.4 fixing dialog error
 Version 1.2.3 Extended info support
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/main.py
index cec9dd89f1f1100ace4edb7b257de046ab91a17f..105eefb249aa6f2054d98660dfe59751f5605c78 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/main.py
@@ -56,6 +56,11 @@ def index():
                       'thumbnail': icon,
                       'properties': {'fanart_image': settings.fanart},
                       })
+    items.append({'label': settings.string(32016),
+                  'path': plugin.url_for('configuration'),
+                  'thumbnail': dirImages("settings.png"),
+                  'properties': {'fanart_image': settings.fanart}
+                  })
     items.append({'label': settings.string(32017),
                   'path': plugin.url_for('help'),
                   'thumbnail': dirImages("help.png"),
@@ -92,6 +97,13 @@ def search():
     return readHTML(url, showSeasons='False')
 
 
+# Settings
+@plugin.route('/configuration/')
+def configuration():
+    settings.settings.openSettings()
+    settings.settings = Settings()
+
+
 ####################################################
 @plugin.route('/readHTML/<url>/<showSeasons>', name="readHTML")
 def readHTML(url="", showSeasons='True'):
@@ -154,7 +166,9 @@ def play(url):
     settings.log(url)
     magnet = url
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/main.pyo b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/main.pyo
index 75cfbd00b0b068d4fa461cb6bc8e4b865f1e5b2d..89d3c20cb6d05572805f7353401caf0898887324 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/main.pyo and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/main.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/images/settings.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/images/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c3602e6d6bf263c69a611ebbe1429e06112449d
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/images/settings.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/English/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/English/strings.po
index dc7f932b9dfd90f42d363749ef319d21eab9d8e0..e5bab79d48cf8eb5b5f694ff15fbcbd63310f966 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/English/strings.po
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/English/strings.po
@@ -1,4 +1,5 @@
 # Kodi Media Center language file
+# Kodi Media Center language file
 # Addon Name: RSS Torrents Integration, trakt
 # Addon id: plugin.video.rsstorrentintegration, trakt
 # Addon Provider: mancuniancol
@@ -101,7 +102,7 @@ msgstr ""
 
 #: script.py:21
 msgctxt "#32016"
-msgid "-SETTINGS"
+msgid "[B]SETTINGS[/B]"
 msgstr ""
 
 #: script.py:22
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/French/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/French/strings.po
index 46b0e5816519cdb87bc6bfda960abe3dc3732060..93c172f2fa7f8460c617583709f972161983565c 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/French/strings.po
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/French/strings.po
@@ -101,8 +101,8 @@ msgstr "Effacer les dossiers"
 
 #: script.py:21
 msgctxt "#32016"
-msgid "-SETTINGS"
-msgstr "-PARAMÈTRES"
+msgid "[B]SETTINGS[/B]"
+msgstr "[B]PARAMÈTRES[/B]"
 
 #: script.py:22
 msgctxt "#32017"
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/Spanish/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/Spanish/strings.po
index fd672377c66b4506516150b63ee1b76356f44884..899397383847d13af81c96d6a05f1a75af16de7a 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/Spanish/strings.po
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/Spanish/strings.po
@@ -101,8 +101,8 @@ msgstr "Borrar Directorios"
 
 #: script.py:21
 msgctxt "#32016"
-msgid "-SETTINGS"
-msgstr "-CONFIGURACIÓN"
+msgid "[B]SETTINGS[/B]"
+msgstr "[B]CONFIGURACIÓN[/B]"
 
 #: script.py:22
 msgctxt "#32017"
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/Swedish/strings.po b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/Swedish/strings.po
index e5993f78e26b139dd8ff8427ac1f170ea06b93bb..a9f345d34d3fcc56fbfe2bd0dba6e4f35884c2fb 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/Swedish/strings.po
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/language/Swedish/strings.po
@@ -110,8 +110,8 @@ msgstr "Rensa mappar"
 
 #: script.py:21
 msgctxt "#32016"
-msgid "-SETTINGS"
-msgstr "-INSTÄLLNINGAR"
+msgid "[B]SETTINGS[/B]"
+msgstr "[B]INSTÄLLNINGAR[/B]"
 
 #: script.py:22
 msgctxt "#32017"
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/settings.xml
index 96f42b17d291ea141e20e4983417730aead78f99..cad376474accf6659fa9e36fe246023a465a66a1 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.torrentz/resources/settings.xml
@@ -5,8 +5,8 @@
         <setting label="32051" type="folder" id="movieFolder" source="videos" option="writeable" default=""/>
         <setting label="32052" type="folder" id="showFolder" source="videos" option="writeable" default=""/>
         <setting label="32053" type="folder" id="animeFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32045" type="bool" id="viewUrl" default="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/.cache/example.org,,d0d92cdc9b30c1300fbc3c7ebd304be0 b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/.cache/example.org,,d0d92cdc9b30c1300fbc3c7ebd304be0
new file mode 100644
index 0000000000000000000000000000000000000000..3eb299fbd59c3283b539b5969a0d2b4d73157ff7
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/.cache/example.org,,d0d92cdc9b30c1300fbc3c7ebd304be0
@@ -0,0 +1,64 @@
+status: 200
+content-length: 1270
+expires: Fri, 13 Nov 2015 12:54:20 GMT
+content-location: http://example.org/
+x-cache: HIT
+accept-ranges: bytes
+x-ec-custom-error: 1
+server: ECS (lga/13BA)
+last-modified: Fri, 09 Aug 2013 23:54:35 GMT
+etag: "359670651"
+cache-control: max-age=604800
+date: Fri, 06 Nov 2015 12:54:20 GMT
+content-type: text/html
+
+<!doctype html>
+<html>
+<head>
+    <title>Example Domain</title>
+
+    <meta charset="utf-8" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type="text/css">
+    body {
+        background-color: #f0f0f2;
+        margin: 0;
+        padding: 0;
+        font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+        
+    }
+    div {
+        width: 600px;
+        margin: 5em auto;
+        padding: 50px;
+        background-color: #fff;
+        border-radius: 1em;
+    }
+    a:link, a:visited {
+        color: #38488f;
+        text-decoration: none;
+    }
+    @media (max-width: 700px) {
+        body {
+            background-color: #fff;
+        }
+        div {
+            width: auto;
+            margin: 0 auto;
+            border-radius: 0;
+            padding: 1em;
+        }
+    }
+    </style>    
+</head>
+
+<body>
+<div>
+    <h1>Example Domain</h1>
+    <p>This domain is established to be used for illustrative examples in documents. You may use this
+    domain in examples without prior coordination or asking for permission.</p>
+    <p><a href="http://www.iana.org/domains/example">More information...</a></p>
+</div>
+</body>
+</html>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/addon.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/addon.xml
index 3d2c0c1634f33cb5d770976e10bcac56b5abbaac..593347b3badfff1f40900db3b49047a60cf0cc20 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.yts" name="[COLOR FF6AC045]YTS[/COLOR] Viewer" version="1.0.5" provider-name="mancuniancol">
+<addon id="plugin.video.yts" name="[COLOR FF6AC045]YTS[/COLOR] Viewer" version="1.0.6" provider-name="mancuniancol">
 	<requires>
 		<import addon="xbmc.python" version="2.12.0"/>
 		<import addon="script.module.mctools" optional="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/changelog.txt b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/changelog.txt
index 923a48d06493c4d06d54782379d82d69ac0590d3..0fa23fbac5c7bdba985121f18d9d8a313b738766 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/changelog.txt
@@ -1,3 +1,4 @@
+Version 1.0.6 Adding Quasar support
 Version 1.0.5 refreshing view
 Version 1.0.4 fixing dialog error
 Version 1.0.3 Adding episode title
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/main.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/main.py
index faf46988178b5d2bd24302e4edba5f96ae813ed8..1a0d6d9f03e22554f87b623293dc1c742af333a2 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/main.py
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/main.py
@@ -228,7 +228,9 @@ def play(url):
     magnet = url
     # Set-up the plugin
     uri_string = quote_plus(getPlayableLink(uncodeName(magnet)))
-    if settings.value["plugin"] == 'Pulsar':
+    if settings.value["plugin"] == 'Quasar':
+        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+    elif settings.value["plugin"] == 'Pulsar':
         link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
     elif settings.value["plugin"] == 'KmediaTorrent':
         link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/ayuda.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/ayuda.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aa044b196d53bb8ccd894168fd908761c27e1e1
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/ayuda.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/busqueda-manual.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/busqueda-manual.png
new file mode 100644
index 0000000000000000000000000000000000000000..88f3e6f884fdf1188e9fe06b3bee14b351747af2
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/busqueda-manual.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/documentales.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/documentales.png
new file mode 100644
index 0000000000000000000000000000000000000000..98dcc527d879aacfd59ea3cf66f249fbf4e69aad
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/documentales.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/estrenos.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/estrenos.png
new file mode 100644
index 0000000000000000000000000000000000000000..10fc95a3a54f3d6ae21058a953d96ab56ecbdd56
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/estrenos.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas-hdrip.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas-hdrip.png
new file mode 100644
index 0000000000000000000000000000000000000000..cefd7b8c325803ea10b83b6acca9f4f14a98e008
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas-hdrip.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas-microhd.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas-microhd.png
new file mode 100644
index 0000000000000000000000000000000000000000..b02b1457970393201ae421db6f4357275b6716b5
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas-microhd.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas.png
new file mode 100644
index 0000000000000000000000000000000000000000..6558cebc8b4a17f5dc1af4e3ff52390bec1cf998
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/peliculas.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/series-vose.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/series-vose.png
new file mode 100644
index 0000000000000000000000000000000000000000..793908e177f8610f5da890208c2fb835409405e2
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/series-vose.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/series.png b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/series.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ab0e396ce5c0a1ff2cda99c2d62e083e457c2ca
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/images/series.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/settings.xml
index 0282e43f34034d49c0e991ff05dcae110a137185..afcaf7eb3cde0a646912d38de74a8735ff04f643 100644
--- a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/resources/settings.xml
@@ -3,8 +3,8 @@
     <category label="32050">
         <setting label="32093" type="text" id="urlAddress" default="https://yts.ag"/>
         <setting label="32051" type="folder" id="movieFolder" source="videos" option="writeable" default=""/>
-        <setting label="32054" type="labelenum" id="plugin" default="KmediaTorrent"
-                 values="Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
+        <setting label="32054" type="labelenum" id="plugin" default="Torrenter"
+                 values="Quasar|Pulsar|KmediaTorrent|XBMCtorrent|Torrenter|YATP"/>
         <setting label="32055" type="bool" id="overwrite" default="false"/>
         <setting label="32056" type="bool" id="duplicated" default="false"/>
         <setting label="32045" type="bool" id="viewUrl" default="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/service.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/service.py
new file mode 100644
index 0000000000000000000000000000000000000000..0ab4e91349fc29c108ab6c178c10835735004088
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/service.py
@@ -0,0 +1,37 @@
+# coding: utf-8
+# Service Module
+__author__ = 'mancuniancol'
+from tools2 import *
+from time import time
+from time import asctime
+from time import localtime
+from time import strftime
+from time import gmtime
+from main import importAll
+
+
+def update_service():
+    if settings.value['service'] == 'true':
+        from socket import setdefaulttimeout
+        # Begin Service
+        storage = Storage(settings.storageName, type="dict")
+        for key, url in storage.database.items():
+            importAll(key, url)
+
+
+if settings.value['service'] == 'true':
+    every = 28800  # seconds
+    previous_time = time()
+    settings.log("Persistent Update Service starting...")
+    update_service()
+    while (not xbmc.abortRequested) and settings.value["persistent"] == 'true':
+        if time() >= previous_time + every:  # verification
+            previous_time = time()
+            update_service()
+            settings.log('Update List at %s' % asctime(localtime(previous_time)))
+            settings.log('Next Update in %s' % strftime("%H:%M:%S", gmtime(every)))
+            update_service()
+        sleep(1)
+
+del settings
+del browser
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/test.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/test.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ac914fc1e49c7b33747f08c3129142e632f8e21
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/test.py
@@ -0,0 +1,944 @@
+# coding: utf-8
+__author__ = 'Ruben'
+
+data = '''
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <!--[if IE]> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <![endif]-->
+    <meta name="viewport" content="width=device-width, minimal-ui, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="description" content="Search Browse For Any YIFY Movie Downloads at YTS. Thousands of films in small file size" />
+    <meta name="keywords" content="torrents, yify, yts, movies, movie, download, 720p, 1080p, 3D, browse movies, yify-torrents, yts" />
+    <meta property="og:title" content="Search and Browse YIFY Movie Torrent Downloads - YTS"/>
+    <meta property="og:image" content="https://yts.ag/assets/images/website/og_yts_logo.png"/>
+    <meta property="og:description" content="Search Browse For Any YIFY Movie Downloads at YTS. Thousands of films in small file size"/>
+    <meta property="og:url" content="https://yts.ag/browse-movies/0/all/all/0/latest" />
+    <title>Search and Browse YIFY Movie Torrent Downloads - YTS</title>
+    <!--[if IE]> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" /> <![endif]-->
+    <link rel="shortcut icon" href="/assets/images/website/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="/assets/images/website/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/assets/images/website/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/assets/images/website/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/assets/images/website/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/assets/images/website/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/assets/images/website/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/assets/images/website/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/assets/images/website/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/images/website/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="/assets/images/website/favicon-160x160.png" sizes="160x160">
+    <link rel="icon" type="image/png" href="/assets/images/website/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="/assets/images/website/favicon-16x16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/assets/images/website/favicon-32x32.png" sizes="32x32">
+    <meta name="msapplication-TileColor" content="#00a300">
+    <meta name="msapplication-TileImage" content="/assets/images/website/mstile-144x144.png">
+    <meta name="msapplication-config" content="/assets/images/website/browserconfig.xml">
+    <link rel="search" type="application/opensearchdescription+xml" href="/opensearch" title="YTS - The Official Home of YIFY Movie Torrent Downloads" />
+    <link href='https://fonts.googleapis.com/css?family=Arimo:400,700,400italic,700italic&amp;subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="/assets/fonts/fonts.css">
+    <link rel="stylesheet" href="/assets/minified/8acb5de663bc55f0cbed2b4a7d1504dc.css">
+</head>
+
+<body class="non-touch ">
+
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', 'UA-69675816-1', 'auto');
+      ga('send', 'pageview');
+    </script>
+
+
+    <header class="nav-bar">
+        <div class="nav-logo pull-left">
+            <a href="https://yts.ag/"><img src="/assets/images/website/logo-YTS.svg" alt="" /></a>
+        </div>
+
+        <span class="header-slogan hidden-xs pull-left">HD movies at the smallest file size.</span>
+
+        <div class="main-nav-links hidden-sm hidden-xs">
+            <form method="GET" action="https://yts.ag/search-movies" accept-charset="UTF-8" id="quick-search" name="quick-search">
+                <div id="quick-search-container">
+                    <input id="quick-search-input" name="query" autocomplete="off" type="search" value="Quick search">
+                    <div class="ajax-spinner"></div>
+                </div>
+            </form>
+
+            <ul class="nav-links">
+                <li><a href="https://yts.ag/"> Home </a></li>
+                <li><a href="https://yts.ag/browse-movies"> Browse Movies </a></li>
+            </ul>
+
+            <ul class="nav-links nav-link-guest">
+                                    <li><a class="login-nav-btn" href="javascript:void(0)"> Login </a> &nbsp;|&nbsp; <a class="register-nav-btn" href="javascript:void(0)"> Register </a></li>
+                            </ul>
+        </div>
+
+        <div class="nav-mobile-buttons hidden-md hidden-lg">
+            <a class="touchable" id="mobile-search-btn" href="javascript:void(0)"> <span class="glyphicon glyphicon-search"></span> </a>
+            <a class="touchable" href="https://yts.ag/browse-movies"> <span class="glyphicon glyphicon-list-alt"></span> </a>
+            <a class="touchable" href="https://yts.ag/login"> <span class="glyphicon glyphicon-user"></span> </a>
+        </div>
+    </header>
+
+    <div id="background-image" style="background: url(/assets/images/movies//background.jpg) no-repeat center center; background-size: cover; -webkit-background-size: cover;-moz-background-size: cover; -o-background-size: cover;"></div>
+    <div id="background-overlay"></div>
+    <div class="modal modal-auth hidden-xs hidden-sm">
+        <div class="modal-container">
+            <div class="modal-switcher">
+                <span id="modal-login"> Login </span>
+                <span id="modal-register"> Register </span>
+            </div>
+
+            <div class="modal-content">
+                <div class="modal-login-content">
+                    <form method="POST" action="https://yts.ag/" accept-charset="UTF-8" autocorrect="off" autocapitalize="off" spellcheck="off">
+                        <input name="_token" type="hidden" value="5Vsj4rOZCMfjkM0xlHYsRx2mEprlxRFY00QpuxLp">
+                        <span class="error-msg"></span>
+                        <div class="inner-addon">
+                            <span class="glyphicon glyphicon-user"></span>
+                            <input placeholder="Username or Email" autocorrect="off" autocapitalize="off" spellcheck="off" name="username" type="text">
+                        </div>
+                        <div class="inner-addon">
+                            <span class="glyphicon glyphicon-lock"></span>
+                            <input placeholder="Password" autocorrect="off" autocapitalize="off" spellcheck="off" name="password" type="password" value="">
+                        </div>
+                        <button class="button-green-download-big" type="button">Login</button>
+                    </form>
+
+                    <p class="bottom-msg">
+                        <a class="forgotpassword-nav-btn" href="javascript:void(0)">Forgot your password?</a>
+                    </p>
+                </div>
+
+                <div class="modal-register-content">
+                    <form method="POST" action="https://yts.ag/" accept-charset="UTF-8" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="off">
+                        <input name="_token" type="hidden" value="5Vsj4rOZCMfjkM0xlHYsRx2mEprlxRFY00QpuxLp">
+                        <span class="error-msg"></span>
+                        <div class="inner-addon">
+                            <span class="glyphicon glyphicon-user"></span>
+                            <input placeholder="Username" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="off" name="username" type="text">
+                        </div>
+                        <div class="inner-addon">
+                            <span class="glyphicon glyphicon-envelope"></span>
+                            <input placeholder="E-Mail" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="off" name="email" type="email">
+                        </div>
+                        <div class="inner-addon">
+                            <span class="glyphicon glyphicon-lock"></span>
+                            <input placeholder="Password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="off" name="password" type="password" value="">
+                        </div>
+                        <div class="inner-addon">
+                            <span class="glyphicon glyphicon-lock"></span>
+                            <input placeholder="Confirm Password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="off" name="password_confirmation" type="password" value="">
+                        </div>
+                        <button class="button-green-download-big" type="button">Register</button>
+                    </form>
+                </div>
+
+                <div class="modal-forgotpass-content">
+                    <form method="POST" action="https://yts.ag/" accept-charset="UTF-8" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="off">
+                        <input name="_token" type="hidden" value="5Vsj4rOZCMfjkM0xlHYsRx2mEprlxRFY00QpuxLp">
+                        <span class="error-msg"></span>
+                        <p class="info-msg"> If you have Forgotten your password, just type in your Email and we will send you a link to Reset your password. </p>
+                        <div class="inner-addon">
+                            <span class="glyphicon glyphicon-envelope"></span>
+                            <input placeholder="E-Mail" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="off" name="email" type="email">
+                        </div>
+                        <button class="button-green-download-big" type="button">Reset Password</button>
+                    </form>
+
+                    <p class="bottom-msg">
+                        <a class="login-nav-btn" href="javascript:void(0)">Back to login</a>
+                    </p>
+                </div>
+
+                <div class="modal-loading-content">
+                    <img src="/assets/images/website/ajax-spinner.gif" alt="ajax spinner loading" />
+                    <p class="info-msg"> Loading, please wait </p>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="main-content">
+        <div id="mobile-search-input" class="hidden-md hidden-lg">
+            <form method="POST" action="https://yts.ag/search-movies" accept-charset="UTF-8">
+                <input name="_token" type="hidden" value="5Vsj4rOZCMfjkM0xlHYsRx2mEprlxRFY00QpuxLp">
+                <div class="input-group container search-query">
+                    <input class="form-control" placeholder="Search for a movie&hellip;" autocorrect="off" autocomplete="off" name="keyword" type="search">
+                    <span class="input-group-btn"> <button class="btn btn-success" type="submit">Search</button> </span>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-xs-10">
+                            <div class="selects-container">
+                                <p>Quality:</p>
+                                <select name="quality">
+                                    <option value="all" selected="selected">All</option>
+                                    <option value="720p">720p</option>
+                                    <option value="1080p">1080p</option>
+                                    <option value="3D">3D</option>
+                                </select>
+                            </div>
+                            <div class="selects-container">
+                                <p>Genre:</p>
+                                <select name="genre">
+                                    <option value="all" selected="selected">All</option>
+                                                                            <option value="action">Action</option>
+                                                                            <option value="adventure">Adventure</option>
+                                                                            <option value="animation">Animation</option>
+                                                                            <option value="biography">Biography</option>
+                                                                            <option value="comedy">Comedy</option>
+                                                                            <option value="crime">Crime</option>
+                                                                            <option value="documentary">Documentary</option>
+                                                                            <option value="drama">Drama</option>
+                                                                            <option value="family">Family</option>
+                                                                            <option value="fantasy">Fantasy</option>
+                                                                            <option value="film-noir">Film-Noir</option>
+                                                                            <option value="game-show">Game-Show</option>
+                                                                            <option value="history">History</option>
+                                                                            <option value="horror">Horror</option>
+                                                                            <option value="music">Music</option>
+                                                                            <option value="musical">Musical</option>
+                                                                            <option value="mystery">Mystery</option>
+                                                                            <option value="news">News</option>
+                                                                            <option value="reality-tv">Reality-TV</option>
+                                                                            <option value="romance">Romance</option>
+                                                                            <option value="sci-fi">Sci-Fi</option>
+                                                                            <option value="sport">Sport</option>
+                                                                            <option value="talk-show">Talk-Show</option>
+                                                                            <option value="thriller">Thriller</option>
+                                                                            <option value="war">War</option>
+                                                                            <option value="western">Western</option>
+                                                                    </select>
+                            </div>
+                        </div>
+                        <div class="col-xs-10">
+                            <div class="selects-container">
+                                <p>Rating:</p>
+                                <select name="rating">
+                                    <option value="0" selected="selected">All</option>
+                                    <option value="9">9+</option>
+                                    <option value="8">8+</option>
+                                    <option value="7">7+</option>
+                                    <option value="6">6+</option>
+                                    <option value="5">5+</option>
+                                    <option value="4">4+</option>
+                                    <option value="3">3+</option>
+                                    <option value="2">2+</option>
+                                    <option value="1">1+</option>
+                                </select>
+                            </div>
+                            <div class="selects-container selects-container-last">
+                                <p>Order By:</p>
+                                <select name="order_by">
+                                    <option value="latest" selected="selected">Latest</option>
+                                    <option value="oldest">Oldest</option>
+                                    <option value="seeds">Seeds</option>
+                                    <option value="peers">Peers</option>
+                                    <option value="year">Year</option>
+                                    <option value="rating">Rating</option>
+                                    <option value="likes">Likes</option>
+                                    <option value="alphabetical">Alphabetical</option>
+                                    <option value="downloads">Downloads</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+
+        <div class="ac-results hidden-sm hidden-xs">
+            <ul></ul>
+        </div>
+
+        <noscript>
+            <div class="container">
+                <div class="row">
+                    <div class="col-xs-20 text-center">
+                        <p class="no-javascript-warning">Javascript not supported on your browser, please enable Javascript in order to fully utilize the website</p>
+                    </div>
+                </div>
+            </div>
+        </noscript>
+
+<div id="main-search" class="content-dark hidden-sm hidden-xs">
+    <div class="container">
+        <form method="post" action="https://yts.ag/search-movies" accept-charset="UTF-8">
+            <input name="_token" type="hidden" value="UZzXxauUHxorVLoOQBJB57aJI7kEaVllrx4E9HpP">
+
+            <div id="main-search-fields">
+                <p class="pull-left term">Search Term:</p>
+                <input name="keyword" autocomplete="off" type="search">
+
+                <div class="selects-container">
+                    <p>Quality:</p>
+                    <select name="quality">
+                        <option value="all" selected="selected">All</option>
+                        <option value="720p">720p</option>
+                        <option value="1080p">1080p</option>
+                        <option value="3D">3D</option>
+                    </select>
+                </div>
+
+                <div class="selects-container">
+                    <p>Genre:</p>
+                    <select name="genre">
+                        <option value="all" selected="selected">All</option>
+                                                            <option value="action">Action</option>
+                                                            <option value="adventure">Adventure</option>
+                                                            <option value="animation">Animation</option>
+                                                            <option value="biography">Biography</option>
+                                                            <option value="comedy">Comedy</option>
+                                                            <option value="crime">Crime</option>
+                                                            <option value="documentary">Documentary</option>
+                                                            <option value="drama">Drama</option>
+                                                            <option value="family">Family</option>
+                                                            <option value="fantasy">Fantasy</option>
+                                                            <option value="film-noir">Film-Noir</option>
+                                                            <option value="game-show">Game-Show</option>
+                                                            <option value="history">History</option>
+                                                            <option value="horror">Horror</option>
+                                                            <option value="music">Music</option>
+                                                            <option value="musical">Musical</option>
+                                                            <option value="mystery">Mystery</option>
+                                                            <option value="news">News</option>
+                                                            <option value="reality-tv">Reality-TV</option>
+                                                            <option value="romance">Romance</option>
+                                                            <option value="sci-fi">Sci-Fi</option>
+                                                            <option value="sport">Sport</option>
+                                                            <option value="talk-show">Talk-Show</option>
+                                                            <option value="thriller">Thriller</option>
+                                                            <option value="war">War</option>
+                                                            <option value="western">Western</option>
+                                                </select>
+                </div>
+
+                <div class="selects-container">
+                    <p>Rating:</p>
+                    <select name="rating">
+                        <option value="0" selected="selected">All</option>
+                        <option value="9">9+</option>
+                        <option value="8">8+</option>
+                        <option value="7">7+</option>
+                        <option value="6">6+</option>
+                        <option value="5">5+</option>
+                        <option value="4">4+</option>
+                        <option value="3">3+</option>
+                        <option value="2">2+</option>
+                        <option value="1">1+</option>
+                    </select>
+                </div>
+
+                <div class="selects-container selects-container-last">
+                    <p>Order By:</p>
+                    <select name="order_by">
+                        <option value="latest" selected="selected">Latest</option>
+                        <option value="oldest">Oldest</option>
+                        <option value="seeds">Seeds</option>
+                        <option value="peers">Peers</option>
+                        <option value="year">Year</option>
+                        <option value="rating">Rating</option>
+                        <option value="likes">Likes</option>
+                        <option value="alphabetical">Alphabetical</option>
+                        <option value="downloads">Downloads</option>
+                    </select>
+                </div>
+            </div>
+
+            <div id="main-search-btn">
+                <input class="button-green-download-big" type="submit" value="Search">
+            </div>
+        </form>
+    </div>
+</div>
+
+<div class="browse-content">
+    <div class="container">
+        <h2>4,279 Movies Found</h2>
+
+        <div class="hidden-sm hidden-xs">
+            <ul class="tsc_pagination tsc_paginationA tsc_paginationA06">
+                <li class="hidden"><a href="">&laquo;</a></li><li><a href="javascript:void(0)" class="current">1</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=2">2</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=3">3</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=4">4</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=5">5</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=6">6</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=7">7</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=8">8</a></li><li class="unavailable">...</li><li><a href="/browse-movies/0/all/all/0/latest?page=213">213</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=214">214</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=2">Next &raquo;</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=214">Last &raquo;</a></li>
+            </ul>
+        </div>
+
+        <div class="hidden-md hidden-lg">
+            <ul class="tsc_pagination tsc_paginationA tsc_paginationA06">
+
+                <li class="pagination-bordered">1 of 214</li>
+
+                                    <li><a href="/browse-movies?page=1">Next &raquo;</a></li>
+                            </ul>
+        </div>
+
+        <section>
+            <div class="row">
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/inside-out-2015" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/inside_out_2015/medium-cover.jpg" alt="Inside Out (2015) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">8.40 / 10</h4>
+                                                                            <h4>Adventure</h4>
+                                                                            <h4>Animation</h4>
+                                                                            <h4>Comedy</h4>
+                                                                            <h4>Drama</h4>
+                                                                            <h4>Family</h4>
+                                                                            <h4>Fantasy</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/inside-out-2015" class="browse-movie-title">Inside Out</a>
+                            <div class="browse-movie-year">2015</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/C54EA210FC98A6C7E7F29597E2B89921A412FAF5.torrent">3D</a>
+                                                                    <a href="https://yts.ag/torrent/download/4B3DCE31C713B02726F67E2EF49DE9FF965EC3B7.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/556BE0BD40C4880E29BA567663C65BD8BAE9FBEB.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/the-reivers-1969" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/the_reivers_1969/medium-cover.jpg" alt="The Reivers (1969) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">6.90 / 10</h4>
+                                                                            <h4>Comedy</h4>
+                                                                            <h4>Drama</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/the-reivers-1969" class="browse-movie-title">The Reivers</a>
+                            <div class="browse-movie-year">1969</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/11C5B90E08F90955EC1240C7F881DCD39ACEC7C7.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/the-wizard-of-gore-1970" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/the_wizard_of_gore_1970/medium-cover.jpg" alt="The Wizard of Gore (1970) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">5.50 / 10</h4>
+                                                                            <h4>Horror</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/the-wizard-of-gore-1970" class="browse-movie-title">The Wizard of Gore</a>
+                            <div class="browse-movie-year">1970</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/F3192124BFDF0169EAC415950A50F1CDD3B515F7.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/179224C50340A9DEF377FCED5580290BF5B2AF19.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/dracula-the-impaler-2013" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/dracula_the_impaler_2013/medium-cover.jpg" alt="Dracula: The Impaler (2013) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">3.90 / 10</h4>
+                                                                            <h4>Action</h4>
+                                                                            <h4>Horror</h4>
+                                                                            <h4>Thriller</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/dracula-the-impaler-2013" class="browse-movie-title">Dracula: The Impaler</a>
+                            <div class="browse-movie-year">2013</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/88323B2DC709A2B3049BDACC38C9B66C0AD9B1AF.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/54829D0830560BE08299227A3597FAA1B8355AE1.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/a-nightingale-falling-2014" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/a_nightingale_falling_2014/medium-cover.jpg" alt="A Nightingale Falling (2014) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">5.80 / 10</h4>
+                                                                            <h4>Drama</h4>
+                                                                            <h4>History</h4>
+                                                                            <h4>War</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/a-nightingale-falling-2014" class="browse-movie-title">A Nightingale Falling</a>
+                            <div class="browse-movie-year">2014</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/30E88CD34ABC2666C0DDC6E43B88704F630D07AE.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/the-smoke-2014" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/the_smoke_2014/medium-cover.jpg" alt="The Smoke (2014) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">4.20 / 10</h4>
+                                                                            <h4>Crime</h4>
+                                                                            <h4>Romance</h4>
+                                                                            <h4>Thriller</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/the-smoke-2014" class="browse-movie-title">The Smoke</a>
+                            <div class="browse-movie-year">2014</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/EED7DC762E8AEE4AD79A89D557A83C3ED72ED463.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/9490567BB9E16DE3D9852D079083CB2516C0085F.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/t-force-1994" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/t_force_1994/medium-cover.jpg" alt="T-Force (1994) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">4.30 / 10</h4>
+                                                                            <h4>Action</h4>
+                                                                            <h4>Sci-Fi</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/t-force-1994" class="browse-movie-title">T-Force</a>
+                            <div class="browse-movie-year">1994</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/805A2A714F5D93FA7610226F70C094953329A84E.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/2B438F871DC443A92BEC8BE4762D7EF9483C551B.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/bikini-model-academy-2015" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/bikini_model_academy_2015/medium-cover.jpg" alt="Bikini Model Academy (2015) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">2.00 / 10</h4>
+                                                                            <h4>Comedy</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/bikini-model-academy-2015" class="browse-movie-title">Bikini Model Academy</a>
+                            <div class="browse-movie-year">2015</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/80F67E2D236A1A2854876F6A409C92D2D54C3849.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/BA2DD0FB35E9055372873D420E5C951CD41D6A8F.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/knock-knock-2015" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/knock_knock_2015/medium-cover.jpg" alt="Knock Knock (2015) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">5.00 / 10</h4>
+                                                                            <h4>Horror</h4>
+                                                                            <h4>Mystery</h4>
+                                                                            <h4>Thriller</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/knock-knock-2015" class="browse-movie-title">Knock Knock</a>
+                            <div class="browse-movie-year">2015</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/942CCE48B49CCB80950834B60099870AFBB6DFFF.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/9C1942F9789D7B704C3AB8B1A076101303466AA8.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/badge-of-honor-2015" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/badge_of_honor_2015/medium-cover.jpg" alt="Badge of Honor (2015) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">4.40 / 10</h4>
+                                                                            <h4>Crime</h4>
+                                                                            <h4>Drama</h4>
+                                                                            <h4>Thriller</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/badge-of-honor-2015" class="browse-movie-title">Badge of Honor</a>
+                            <div class="browse-movie-year">2015</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/18C389C09A24FA25B129685A3E75A570079E52DA.torrent">720p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/chloe-and-theo-2015" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/chloe_and_theo_2015/medium-cover.jpg" alt="Chloe & Theo (2015) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">5.70 / 10</h4>
+                                                                            <h4>Comedy</h4>
+                                                                            <h4>Drama</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/chloe-and-theo-2015" class="browse-movie-title">Chloe & Theo</a>
+                            <div class="browse-movie-year">2015</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/06A33E0B7C9029704811D8E31D07A72EEB5100CD.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/B1E4CAC0083F0E70F8E7143096DE339DFA2746ED.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/the-harder-they-come-1972" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/the_harder_they_come_1972/medium-cover.jpg" alt="The Harder They Come (1972) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">7.10 / 10</h4>
+                                                                            <h4>Crime</h4>
+                                                                            <h4>Drama</h4>
+                                                                            <h4>Music</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/the-harder-they-come-1972" class="browse-movie-title">The Harder They Come</a>
+                            <div class="browse-movie-year">1972</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/0435F158C6303AE98CCC1CB1D254507BA1F544A0.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/206A8517D9DCDD327ADA05EF4079A2C6B156238B.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/infini-2015" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/infini_2015/medium-cover.jpg" alt="Infini (2015) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">5.40 / 10</h4>
+                                                                            <h4>Horror</h4>
+                                                                            <h4>Sci-Fi</h4>
+                                                                            <h4>Thriller</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/infini-2015" class="browse-movie-title">Infini</a>
+                            <div class="browse-movie-year">2015</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/BDCCE89E699C96378747DCBC7DC7B4DA8FC55E98.torrent">720p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/sparrows-cant-sing-1963" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/sparrows_cant_sing_1963/medium-cover.jpg" alt="Sparrows Can't Sing (1963) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">6.60 / 10</h4>
+                                                                            <h4>Comedy</h4>
+                                                                            <h4>Drama</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/sparrows-cant-sing-1963" class="browse-movie-title">Sparrows Can't Sing</a>
+                            <div class="browse-movie-year">1963</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/9AD40BA0AC6CE7B107133F0144384B1277A699D2.torrent">720p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/the-pit-and-the-pendulum-1991" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/the_pit_and_the_pendulum_1991/medium-cover.jpg" alt="The Pit and the Pendulum (1991) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">6.10 / 10</h4>
+                                                                            <h4>Horror</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/the-pit-and-the-pendulum-1991" class="browse-movie-title">The Pit and the Pendulum</a>
+                            <div class="browse-movie-year">1991</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/5BEB22F8D0CCFD9E38BE6E479EFC60F196919083.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/school-for-scoundrels-1960" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/school_for_scoundrels_1960/medium-cover.jpg" alt="School for Scoundrels (1960) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">7.60 / 10</h4>
+                                                                            <h4>Comedy</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/school-for-scoundrels-1960" class="browse-movie-title">School for Scoundrels</a>
+                            <div class="browse-movie-year">1960</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/9916669DACD6BCD9E3AC6E489D4602A9C31588FA.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/C2D77DA207F6AF0EE52E63F5958E729E5827CAE2.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/the-mountain-1956" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/the_mountain_1956/medium-cover.jpg" alt="The Mountain (1956) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">6.80 / 10</h4>
+                                                                            <h4>Adventure</h4>
+                                                                            <h4>Drama</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/the-mountain-1956" class="browse-movie-title">The Mountain</a>
+                            <div class="browse-movie-year">1956</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/59B8E5D6BC5C4EEB6C60B7BC16A8D48071C365D3.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/008ECAA479E1845214285FA736B1416CC5C1EEBC.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/hidden-agenda-1990" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/hidden_agenda_1990/medium-cover.jpg" alt="Hidden Agenda (1990) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">7.00 / 10</h4>
+                                                                            <h4>Drama</h4>
+                                                                            <h4>Thriller</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/hidden-agenda-1990" class="browse-movie-title">Hidden Agenda</a>
+                            <div class="browse-movie-year">1990</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/53E93DEFBB313CDBD69FBFF0AC7CD66367378401.torrent">720p</a>
+                                                                    <a href="https://yts.ag/torrent/download/50789BF160BD2D0960657529E64C6286384F1C98.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/the-cokeville-miracle-2015" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/the_cokeville_miracle_2015/medium-cover.jpg" alt="The Cokeville Miracle (2015) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">4.70 / 10</h4>
+                                                                            <h4>Drama</h4>
+                                                                            <h4>Family</h4>
+                                                                            <h4>History</h4>
+                                                                            <h4>Mystery</h4>
+                                                                            <h4>Thriller</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/the-cokeville-miracle-2015" class="browse-movie-title">The Cokeville Miracle</a>
+                            <div class="browse-movie-year">2015</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/AC879EC7C30C6A2C96286AABAC6A7909B0131CD3.torrent">1080p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                                    <div class="browse-movie-wrap col-xs-10 col-sm-4 col-md-5 col-lg-4">
+                        <a href="https://yts.ag/movie/some-kind-of-beautiful-2014" class="browse-movie-link">
+                            <figure>
+                                <img class="img-responsive" src="https://yts.ag/assets/images/movies/some_kind_of_beautiful_2014/medium-cover.jpg" alt="Some Kind Of Beautiful (2014) download">
+                                <figcaption class="hidden-xs hidden-sm">
+                                    <span class="icon-star"></span>
+                                    <h4 class="rating">5.70 / 10</h4>
+                                                                            <h4>Comedy</h4>
+                                                                            <h4>Romance</h4>
+                                                                        <span class="button-green-download-big">View Details</span>
+                                </figcaption>
+                            </figure>
+                        </a>
+
+                        <div class="browse-movie-bottom">
+                            <a href="https://yts.ag/movie/some-kind-of-beautiful-2014" class="browse-movie-title">Some Kind Of Beautiful</a>
+                            <div class="browse-movie-year">2014</div>
+                            <div class="browse-movie-tags">
+                                                                    <a href="https://yts.ag/torrent/download/704BCC3FDB25C32FD99E515C203553A8016C1929.torrent">720p</a>
+                                                            </div>
+                        </div>
+                    </div>
+                            </div>
+        </section>
+
+        <div class="hidden-sm hidden-xs">
+            <ul class="tsc_pagination tsc_paginationA tsc_paginationA06">
+                <li class="hidden"><a href="">&laquo;</a></li><li><a href="javascript:void(0)" class="current">1</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=2">2</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=3">3</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=4">4</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=5">5</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=6">6</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=7">7</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=8">8</a></li><li class="unavailable">...</li><li><a href="/browse-movies/0/all/all/0/latest?page=213">213</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=214">214</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=2">Next &raquo;</a></li><li><a href="/browse-movies/0/all/all/0/latest?page=214">Last &raquo;</a></li>
+            </ul>
+        </div>
+
+        <div class="hidden-md hidden-lg">
+            <ul class="tsc_pagination tsc_paginationA tsc_paginationA06">
+
+                <li class="pagination-bordered">1 of 214</li>
+
+                                    <li><a href="/browse-movies?page=1">Next &raquo;</a></li>
+                            </ul>
+        </div>
+    </div>
+</div>
+
+        <div class="container hidden-md hidden-lg">
+            <div class="row">
+                <div class="mobile-footer">
+                    <div class="col-sm-20">
+                        <a href="https://yts.ag/"> <span class="glyphicon glyphicon-home"></span> <p>Home</p> </a>
+                        <a href="https://yts.ag/browse-movies"> <span class="glyphicon glyphicon-list-alt"></span> <p>Browse</p> </a>
+                        <a href="https://yts.ag/login"> <span class="glyphicon glyphicon-log-in"></span> <p>Login</p> </a>
+                    </div>
+
+                    <div class="col-sm-20">
+                        <a href="https://yts.ag/register"> <span class="glyphicon glyphicon-user"></span> <p>Register</p> </a>
+                        <a href="https://yts.ag/requests"> <span class="glyphicon glyphicon-asterisk"></span> <p>Requests</p> </a>
+                        <a href="https://yts.ag/suggestions"> <span class="glyphicon glyphicon-pushpin"></span> <p>Suggestions</p> </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+
+        <footer>
+            <div class="container">
+                <div class="row">
+                    <div class="col-xs-20">
+                        <ul class="text-center">
+                            <li>YTS &copy; 2011 - 2015</li>
+                            <li>-</li>
+                            <li><a href="https://yts.ag/blog">Blog</a></li>
+                            <li>-</li>
+                            <li><a href="https://yts.ag/dmca">DMCA</a></li>
+                            <li>-</li>
+                            <li><a href="https://yts.ag/api">API</a></li>
+                            <li>-</li>
+                            <li><a href="https://yts.ag/rss-guide">RSS</a></li>
+                            <li>-</li>
+                            <li><a href="https://yts.ag/contact">Contact</a></li>
+                            <li>-</li>
+                            <li><a href="https://yts.ag/browse-movies">Browse Movies</a></li>
+                            <li>-</li>
+                            <li><a href="https://yts.ag/login">Login</a></li>
+
+                        </ul>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="col-xs-20">
+                        <ul class="text-center">
+                            <li><a href="http://www.yifysubtitles.com/" target="_blank" rel="nofollow">YIFYSubtitles</a></li>
+                            <li>-</li>
+                            <li><a href="https://www.facebook.com/YIFYTORRENTS" target="_blank" rel="nofollow"><span class="icon-facebook"></span></a></li>
+
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </footer>
+    </div>
+
+    <script type="text/javascript" src="/assets/minified/b0f127a10831e175bbf44e730789dd85.js"></script>
+</body>
+</html>
+'''
+
+# read from URL
+import bs4
+soup = bs4.BeautifulSoup(data)
+links = soup.select("div.browse-movie-bottom")
+
+# Storage information
+for div in links:
+    baseTitle = div.a.text  #title
+    aList = div.select("div a")
+    for a in aList:
+        title = baseTitle + ' ' + a.text
+        urlSource = a["href"]
+        print title, urlSource[urlSource.rfind("/")+1:-8]
+
+    # title = a.get("title", a.text)
+    # urlSource = a["href"]
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/test2.py b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/test2.py
new file mode 100644
index 0000000000000000000000000000000000000000..8ee85734559ede04599b71354c8acb5a3a75af54
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/plugin.video.yts/test2.py
@@ -0,0 +1,46 @@
+# coding: utf-8
+__author__ = 'Ruben'
+import requests
+import bs4
+keyword = ""
+quality = "720p"
+genre = "all"
+rating = "0"
+order_by = "latest"
+page = "1"
+
+browser = requests.Session()
+urlSearch = "https://yts.ag"
+browser.headers[
+    'User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
+browser.headers['Accept-Language']='en'
+
+response = browser.get(urlSearch)
+soup = bs4.BeautifulSoup(response.text)
+itemToken = soup.select("div#mobile-search-input input")
+token = itemToken[0]["value"]  # hidden token
+print token
+# Read
+# payload = {
+#     "keyword": keyword,
+#     "_token": token,
+#     "quality": quality,
+#     "genre": genre,
+#     "rating": rating,
+#     "order_by": order_by,
+# }
+#
+# print(payload)
+# response = browser.post(urlSearch + "/search-movies", data=payload)
+# print(response.text)
+
+#read the result
+
+urlSearch = urlSearch + "/browse-movies/0/%s/%s/%s/%s?page=%s" % (quality, genre, rating, order_by, page)
+print urlSearch
+#urlSearch = "https://yts.ag/browse-movies/0/720p/all/0/latest"
+print urlSearch
+response = browser.get(urlSearch)
+print(response.text)
+
+
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.beautifulsoup/lib/BeautifulSoup.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.beautifulsoup/lib/BeautifulSoup.pyo
deleted file mode 100644
index 99d5045d4e5b471c4a7879be5990a3a7a5370817..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.beautifulsoup/lib/BeautifulSoup.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/README.md b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/README.md
index 3333db8998eea03d62cc47018e6c5e03647d0283..18dc705c1b285cf6b88087984c79f296f0e1da48 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/README.md
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/README.md
@@ -1,21 +1,21 @@
-# script.module.mctools
-This is a library for the viewer addons.
-
-It requires this libraries to be installed before:
-
-    script.module.beautifulsoup4
-    script.module.html5lib
-    script.module.requests
-    script.module.feedparser
-    script.module.xbmcswift2
-    script.module.simplejson
-    script.module.metahandler
-    script.module.httplib2
-    
-  You can google them and installed one by one or you can instead use this repo and you install directly the script.module.mctools 
-  and it will download everything for you.
-    
-  https://github.com/mancuniancol/repository.providerspulsarunofficial/archive/1.0.6.zip
-  
-  Forum support:
-  http://forums.tvaddons.ag/addon-releases/37973-torrent-rss-kickass-yts-torrentz-viewers-3.html#post314231
+# script.module.mctools
+This is a library for the viewer addons.
+
+It requires this libraries to be installed before:
+
+    script.module.beautifulsoup4
+    script.module.html5lib
+    script.module.requests
+    script.module.feedparser
+    script.module.xbmcswift2
+    script.module.simplejson
+    script.module.metahandler
+    script.module.httplib2
+    
+  You can google them and installed one by one or you can instead use this repo and you install directly the script.module.mctools 
+  and it will download everything for you.
+    
+  https://github.com/mancuniancol/repository.providerspulsarunofficial/archive/1.0.6.zip
+  
+  Forum support:
+  http://forums.tvaddons.ag/addon-releases/37973-torrent-rss-kickass-yts-torrentz-viewers-3.html#post314231
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/addon.xml b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/addon.xml
index f51b0438a51a524af19f108e09ca39b4987555ab..f2ad03f09ebe6a5069ad0b49b6a973e5e495c0eb 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.mctools" name="common tools mc" version="1.3.1" provider-name="mancuniancol">
+<addon id="script.module.mctools" name="common tools mc" version="1.3.5" provider-name="mancuniancol">
   <requires>
     <import addon="xbmc.python" version="2.1.0" />
     <import addon="script.module.beautifulsoup4" optional="false"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/changelog.txt b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/changelog.txt
index 4d404349ab553583d9cc4e57ddf2c8976c237b7f..20170f55777a9ee7687103e2382a474ef29bb410 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/changelog.txt
@@ -1,39 +1,43 @@
-Version 1.3.1 swesub
-Version 1.3.0 fix dependency
-Version 1.2.8 adding episode name
-Version 1.2.7 cpasbien support
-Version 1.2.6 Extended info script support
-Version 1.2.5 adding SAFE parameters to storage
-Version 1.2.4 Adding Support to not duplicated items in the library
-Version 1.2.3 new FormatTitle
-Version 1.2.2 Accept-Content in ENglish
-Version 1.2.1 support Post in httplib2
-Version 1.2.0 support HTTPS with httplib2
-Version 1.1.9 Exclusion Anime episodes
-Version 1.1.8 returning to version 1.1.4
-Version 1.1.7 fixing problem with pyopenssl
-Version 1.1.6 more libraries
-Version 1.1.5 pyopenssl
-Version 1.1.4
-Version 1.1.3 UnTaggle
-Version 1.1.2 Force Shows and Anime
-Version 1.1.1 infoStream
-Version 1.1.0 offshore problem
-Version 0.0.18 improvement in InfoLabels and Microhd format
-Version 0.0.17 update script.module.metahandler 2.9
-Version 0.0.16 fix http in getLinks
-version 0.0.15 adding more keywords
-version 0.0.14 textQuality
-version 0.0.13 removing strm fix
-Version 0.0.12 Subscription title fix
-Version 0.0.11 textViewer
-Version 0.0.10 activation filters
-Version 0.0.9 changing rest for original name
-Version 0.0.8 Additional scraper words
-Version 0.0.7 Fix duration
-Version 0.0.6 more scraper words
-Version 0.0.5 message fix
-Version 0.0.4 some fixes
-Version 0.0.3 More exceptions new cleanTitle routine
-Version 0.0.2 change name addon for addon1 to avoid conflict
+Version 1.3.5 Fix fetching series bug
+Version 1.3.4 subscription moving to Quasar
+Version 1.3.3 4K
+Version 1.3.2 Adding Quasar support
+Version 1.3.1 swesub
+Version 1.3.0 fix dependency
+Version 1.2.8 adding episode name
+Version 1.2.7 cpasbien support
+Version 1.2.6 Extended info script support
+Version 1.2.5 adding SAFE parameters to storage
+Version 1.2.4 Adding Support to not duplicated items in the library
+Version 1.2.3 new FormatTitle
+Version 1.2.2 Accept-Content in ENglish
+Version 1.2.1 support Post in httplib2
+Version 1.2.0 support HTTPS with httplib2
+Version 1.1.9 Exclusion Anime episodes
+Version 1.1.8 returning to version 1.1.4
+Version 1.1.7 fixing problem with pyopenssl
+Version 1.1.6 more libraries
+Version 1.1.5 pyopenssl
+Version 1.1.4
+Version 1.1.3 UnTaggle
+Version 1.1.2 Force Shows and Anime
+Version 1.1.1 infoStream
+Version 1.1.0 offshore problem
+Version 0.0.18 improvement in InfoLabels and Microhd format
+Version 0.0.17 update script.module.metahandler 2.9
+Version 0.0.16 fix http in getLinks
+version 0.0.15 adding more keywords
+version 0.0.14 textQuality
+version 0.0.13 removing strm fix
+Version 0.0.12 Subscription title fix
+Version 0.0.11 textViewer
+Version 0.0.10 activation filters
+Version 0.0.9 changing rest for original name
+Version 0.0.8 Additional scraper words
+Version 0.0.7 Fix duration
+Version 0.0.6 more scraper words
+Version 0.0.5 message fix
+Version 0.0.4 some fixes
+Version 0.0.3 More exceptions new cleanTitle routine
+Version 0.0.2 change name addon for addon1 to avoid conflict
 Version 0.0.1 Initial
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/COMODOECCCertificationAuthority.pem b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/COMODOECCCertificationAuthority.pem
deleted file mode 100644
index 546c95e30de784f7c392160cf5199b914169facc..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/COMODOECCCertificationAuthority.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
-IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
-MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
-ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
-T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
-FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
-cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
-BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
-fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
-GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/__init__.py b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/__init__.py
deleted file mode 100644
index c66fd45ff881ae21910758f1b67a42321e734ed0..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# coding: utf-8
-__author__ = 'Ruben'
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/test.py b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/test.py
index fbf1e46902497e6e015987f6db8aaacaeda0c42c..18e2c839c58e5f5ae697baeecbfa9a258c51ef44 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/test.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/test.py
@@ -1,35 +1,35 @@
-# coding: utf-8
-class Response:
-    def __init__(self, text, status_code):
-        self.text = text
-        self.status_code = status_code
-
-
-class Browser:
-    headers = {}
-    cookies = {}
-    def __init__(self):
-        self.headers['User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
-
-    def get(self, url='', cookies={}):
-        import httplib2
-        from urllib import urlencode
-        h = httplib2.Http(disable_ssl_certificate_validation=True)
-        resp, content = h.request(url, "GET", headers=self.headers, body=urlencode(cookies))
-        self.headers['Cookie'] = resp['set-cookie']
-        return Response(content, int(resp['status']))
-
-    def post(self, url='', data={}, cookies={}):
-        from urllib import urlencode
-        import httplib2
-        h = httplib2.Http(disable_ssl_certificate_validation=True)
-        resp, content = h.request(url,  "POST", urlencode(data), headers=self.headers, body=urlencode(cookies))
-        self.headers['Cookie'] = resp['set-cookie']
-        return Response(content, int(resp['status']))
-
-
-browser = Browser()
-response = browser.get("https://yts.ag")
-
-print response.status_code
-print browser.headers
+# coding: utf-8
+class Response:
+    def __init__(self, text, status_code):
+        self.text = text
+        self.status_code = status_code
+
+
+class Browser:
+    headers = {}
+    cookies = {}
+    def __init__(self):
+        self.headers['User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
+
+    def get(self, url='', cookies={}):
+        import httplib2
+        from urllib import urlencode
+        h = httplib2.Http(disable_ssl_certificate_validation=True)
+        resp, content = h.request(url, "GET", headers=self.headers, body=urlencode(cookies))
+        self.headers['Cookie'] = resp['set-cookie']
+        return Response(content, int(resp['status']))
+
+    def post(self, url='', data={}, cookies={}):
+        from urllib import urlencode
+        import httplib2
+        h = httplib2.Http(disable_ssl_certificate_validation=True)
+        resp, content = h.request(url,  "POST", urlencode(data), headers=self.headers, body=urlencode(cookies))
+        self.headers['Cookie'] = resp['set-cookie']
+        return Response(content, int(resp['status']))
+
+
+browser = Browser()
+response = browser.get("https://yts.ag")
+
+print response.status_code
+print browser.headers
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/test2.py b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/test2.py
index c9db8d686442c692e1b79dca5ee3385655f0164e..87e44efd353a9722ede2c5f3e552c9c1ce35e5fc 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/test2.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/test2.py
@@ -1,334 +1,370 @@
-# coding: utf-8
-__author__ = 'Mancuniancol'
-import re
-
-################################
-#### SCRAPER TITLES ############
-################################
-def normalize(name, onlyDecode=False):
-    from unicodedata import normalize
-    import types
-    if type(name) == types.StringType:
-        unicode_name = name.decode('unicode-escape')
-    else:
-        try:
-            unicode_name = name.encode('latin-1').decode('utf-8')  # to latin-1
-        except:
-            unicode_name = name
-    normalize_name = unicode_name if onlyDecode else normalize('NFKD', unicode_name)
-    return normalize_name.encode('ascii', 'ignore')
-
-
-def uncodeName(name):  # Convert all the &# codes to char, remove extra-space and normalize
-    from HTMLParser import HTMLParser
-    name = name.replace('<![CDATA[', '').replace(']]', '')
-    name = HTMLParser().unescape(name)
-    return name
-
-
-def unquoteName(name):  # Convert all %symbols to char
-    from urllib import unquote
-    return unquote(name).decode("utf-8")
-
-
-def safeName(value):  # Make the name directory and filename safe
-    value = normalize(value)  # First normalization
-    value = unquoteName(value)
-    value = uncodeName(value)
-    value = normalize(value)  # Last normalization, because some unicode char could appear from the previous steps
-    value = value.lower().title().replace('_', ' ')
-    # erase keyword
-    value = re.sub('^\[.*?\]', '', value)  # erase [HorribleSub] for ex.
-    # check for anime
-    value = re.sub('- ([0-9][0-9][0-9][0-9]) ', ' \g<1>', value + " ")
-    value = re.sub('- ([0-9]+) ', '- EP\g<1>', value + " ")
-    if 'season' not in value.lower():
-        value = value.lower().replace(" episode ", " - EP")
-    # check for qualities
-    value = value.replace("1920x1080", "1080p")
-    value = value.replace("1280x720", "720p")
-    value = value.replace("853x480", "480p")
-    value = value.replace("848x480", "480p")
-    value = value.replace("704x480", "480p")
-    value = value.replace("640x480", "480p")
-    value = value.replace("microhd", " microhd")  # sometimes comes with the year
-    value = value.replace("dvdrip", " dvdrip")  # sometimes comes with the year
-    keys = {'"': ' ', '*': ' ', '/': ' ', ':': ' ', '<': ' ', '>': ' ', '?': ' ', '|': ' ',
-            "'": '', 'Of': 'of', 'De': 'de', '.': ' ', ')': ' ', '(': ' ', '[': ' ', ']': ' ', '-': ' '}
-    for key in keys.keys():
-        value = value.replace(key, keys[key])
-    value = ' '.join(value.split())
-    return value.replace('s h i e l d', 'SHIELD').replace('c s i', 'CSI')
-
-
-def checkQuality(text=""):
-    # quality
-    keyWords = {"Cam": ["camrip", "cam"],
-                "Telesync": ["ts", "telesync", "pdvd"],
-                "Workprint": ["wp", "workprint"],
-                "Telecine": ["tc", "telecine"],
-                "Pay-Per-View Rip": ["ppv", "ppvrip"],
-                "Screener": ["scr", "screener", "screeener", "dvdscr", "dvdscreener", "bdscr"],
-                "DDC": ["ddc"],
-                "R5": ["r5", "r5.line", "r5 ac3 5 1 hq"],
-                "DVD-Rip": ["dvdrip", "dvd-rip"],
-                "DVD-R": ["dvdr", "dvd-full", "full-rip", "iso rip", "lossless rip", "untouched rip", "dvd-5 dvd-9"],
-                "HDTV": ["dsr", "dsrip", "dthrip", "dvbrip", "hdtv", "pdtv", "tvrip", "hdtvrip", "hdrip"],
-                "VODRip": ["vodrip", "vodr"],
-                "WEB-DL": ["webdl", "web dl", "web-dl"],
-                "WEBRip": ["web-rip", "webrip", "web rip"],
-                "WEBCap": ["web-cap", "webcap", "web cap"],
-                "BD/BRRip": ["bdrip", "brrip", "blu-ray", "bluray", "bdr", "bd5", "bd"],
-                "MicroHD": ["microhd"],
-                "FullHD": ["fullhd"],
-                "BR-Line": ["br line"],
-                }
-    color = {"Cam": "FFF4AE00",
-             "Telesync": "FFF4AE00",
-             "Workprint": "FFF4AE00",
-             "Telecine": "FFF4AE00",
-             "Pay-Per-View Rip": "FFD35400",
-             "Screener": "FFD35400",
-             "DDC": "FFD35400",
-             "R5": "FFD35400",
-             "DVD-Rip": "FFD35400",
-             "DVD-R": "FFD35400",
-             "HDTV": "FFD35400",
-             "VODRip": "FFD35400",
-             "WEB-DL": "FFD35400",
-             "WEBRip": "FFD35400",
-             "WEBCap": "FFD35400",
-             "BD/BRRip": "FFD35400",
-             "MicroHD": "FFD35400",
-             "FullHD": "FFD35400",
-             "BR-Line": "FFD35400",
-             }
-    quality = "480p"
-    textQuality = ""
-    for key in keyWords:
-        for keyWord in keyWords[key]:
-            if ' ' + keyWord + ' ' in ' ' + text + ' ':
-                quality = "480p"
-                textQuality += " [COLOR %s][%s][/COLOR]" % (color[key], key)
-
-    if "480p" in text:
-        quality = "480p"
-        textQuality += " [COLOR FF2980B9][480p][/COLOR]"
-    if "720p" in text:
-        quality = "720p"
-        textQuality += " [COLOR FF5CD102][720p][/COLOR]"
-    if "1080p" in text:
-        quality = "1080p"
-        textQuality += " [COLOR FFF4AE00][1080p][/COLOR]"
-    if "3d" in text:
-        quality = "1080p"
-        textQuality += " [COLOR FFD61515][3D][/COLOR]"
-    if "4k" in text:
-        quality = "2160p"
-        textQuality += " [COLOR FF16A085][4K][/COLOR]"
-    return quality, textQuality
-
-
-def width(quality="480p"):
-    result = 720
-    if '480p' in quality:
-        result = 720
-    elif '720p' in quality:
-        result = 1280
-    elif '1080p' in quality:
-        result = 1920
-    elif '2160p' in quality:
-        result = 2160
-    return result
-
-
-def height(quality="480p"):
-    result = 480
-    if '480p' in quality:
-        result = 480
-    elif '720p' in quality:
-        result = 720
-    elif '1080p' in quality:
-        result = 1080
-    elif '2160p' in quality:
-        result = 3840
-    return result
-
-
-def findLanguage(value=""):
-    language = ""  # It is english or unknown
-    if "spa" in value or "spanish" in value or "espanol" in value:
-        language = " Español "
-    if "hindi" in value:
-        language = "Hindi"
-    if "castellano" in value:
-        language = "Castellano"
-    return language
-
-
-def exceptionsTitle(title=""):
-    value = title + " "
-    if "csi " in value and "ny" not in value and "miami" not in value and "cyber" not in value:
-        title = title.replace("csi", "CSI Crime Scene Investigation")
-    if "juego de tronos" in value:
-        title = title.replace("juego de tronos", "Game of Thrones")
-    if "mentes criminales" in value:
-        title = title.replace("mentes criminales", "criminal minds")
-    if "les revenants" in value:
-        title = title.replace("les revenants", "The returned")
-    return title
-
-
-def _cleanTitle(value=''):
-    keywordsCleanTitle = ['version', 'extendida', 'extended', 'edition', 'hd', 'unrated', 'version', 'vose',
-                          'special', 'edtion', 'uncensored', 'fixed', 'censurada', 'episode', 'ova', 'complete'
-                          ]
-    for keyword in keywordsCleanTitle:  # checking keywords
-        value = (value + ' ').replace(' ' + keyword.title() + ' ', ' ')
-    return value.strip()
-
-
-def formatTitle(value='', fileName='', typeVideo="MOVIE"):
-    if fileName == '':
-        fileName = value
-    pos = value.rfind("/")
-    value = value if pos < 0 else value[pos:]
-    value = safeName(value).lower() + ' '
-    fileName = safeName(fileName).lower() + ' '
-    quality, textQuality = checkQuality(value + ' ' + fileName)  # find quality
-    language = findLanguage(value)  # find language
-    formats = [' ep[0-9]+', ' s[0-9]+e[0-9]+', ' s[0-9]+ e[0-9]+', ' [0-9]+x[0-9]+',
-               ' [0-9][0-9][0-9][0-9] [0-9][0-9] [0-9][0-9]',
-               ' [0-9][0-9] [0-9][0-9] [0-9][0-9]', ' season [0-9]+ episode [0-9]+',
-               ' season [0-9]+', ' season[0-9]+', ' s[0-9][0-9]',
-               ' temporada [0-9]+ capitulo [0-9]+', ' temporada[0-9]+', ' temporada [0-9]+',
-               ' seizoen [0-9]+ afl [0-9]+',
-               ' temp [0-9]+ cap [0-9]+', ' temp[0-9]+ cap[0-9]+',
-               ]
-    keywords = ['en 1080p', 'en 720p', 'en dvd', 'en dvdrip', 'en hdtv', 'en bluray', 'en blurayrip',
-                'en web', 'en rip', 'en ts screener', 'en screener', 'en cam', 'en camrip', 'pcdvd', 'bdremux',
-                'en ts-screener', 'en hdrip', 'en microhd', '1080p', '720p', 'dvd', 'dvdrip', 'hdtv', 'bluray',
-                'blurayrip', 'web', 'rip', 'ts screener', 'screener', 'cam', 'camrip', 'ts-screener', 'hdrip',
-                'brrip', 'blu', 'webrip', 'hdrip', 'bdrip', 'microhd', 'ita', 'eng', 'esp', "spanish espanol",
-                'castellano', '480p', 'bd', 'bdrip', 'hi10p', 'sub', 'x264', 'sbs', '3d', 'br', 'hdts', 'dts',
-                'dual audio', 'hevc', 'aac', 'batch', 'h264', 'gratis', 'descargar', 'hd', 'html'
-                ]
-    sshow = None
-    for format in formats:  # search if it is a show
-        sshow = re.search(format, value)  # format shows
-        if sshow is not None:
-            break
-    if sshow is None and typeVideo != "MOVIE":
-        if typeVideo == 'SHOW':
-            value += ' s00e00'
-        if typeVideo == 'ANIME':
-            value += ' ep00'
-        for format in formats:  # search if it is a show
-            sshow = re.search(format, value)  # format shows
-            if sshow is not None:
-                break
-    if sshow is None:
-        # it is a movie
-        value += ' 0000 '  # checking year
-        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
-        year = syear.group(0).strip()
-        pos = value.find(year)
-        if pos > 0:
-            title = value[:pos].strip()
-            rest = value[pos + 5:].strip().replace('0000', '')
-        else:
-            title = value.replace('0000', '')
-            rest = ''
-
-        while pos != -1:  # loop until doesn't have any keyword in the title
-            value = title + ' '
-            for keyword in keywords:  # checking keywords
-                pos = value.find(' ' + keyword + ' ')
-                if pos > 0:
-                    title = value[:pos]
-                    rest = value[pos:].strip() + ' ' + rest
-                    break
-
-        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
-        cleanTitle = _cleanTitle(title)
-        # finishing cleanTitle
-        if '0000' not in year:
-            title += ' (' + year.strip() + ')'
-        year = year.replace('0000', '')
-        folder = title
-        result = {'title': title, 'folder': folder, 'rest': rest.strip(), 'type': 'MOVIE', 'cleanTitle': cleanTitle,
-                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
-                  "width": width(quality), 'language': language, 'folderPath': settings.movieFolder
-                  }
-        return result
-    else:
-        # it is a show
-        rest = value.strip()  # original name
-        seasonEpisode = sshow.group(0)
-        # clean title
-        for keyword in keywords:  # checking keywords
-            value = value.replace(' ' + keyword + ' ', ' ')
-        title = value[:value.find(seasonEpisode)].strip()
-        title = title.strip()
-        seasonEpisode = seasonEpisode.replace('temporada ', 's').replace(' capitulo ', 'e')
-        seasonEpisode = seasonEpisode.replace('season ', 's').replace(' episode ', 'e')
-        seasonEpisode = seasonEpisode.replace('temp ', 's').replace(' cap ', 'e')
-        seasonEpisode = seasonEpisode.replace('seizoen ', 's').replace(' afl ', 'e')
-
-        if 'x' in seasonEpisode:
-            seasonEpisode = 's' + seasonEpisode.replace('x', 'e')
-
-        if 's' in seasonEpisode and 'e' in seasonEpisode and 'season' not in seasonEpisode:  # force S00E00 instead S0E0
-            temp_episode = seasonEpisode.replace('s', '').split('e')
-            seasonEpisode = 's%02de%02d' % (int(temp_episode[0]), int(temp_episode[1]))
-
-        if 's' not in seasonEpisode and 'e' not in seasonEpisode:  # date format
-            date = seasonEpisode.split()
-            if len(date[0]) == 4:  # yyyy-mm-dd format
-                seasonEpisode = seasonEpisode.replace(' ', '-')  # date style episode talk shows
-            else:  # dd mm yy format
-                if int(date[2]) > 50:
-                    date[2] = '19' + date[2]
-                else:
-                    date[2] = '20' + date[2]
-                seasonEpisode = date[2] + '-' + date[1] + '-' + date[0]
-
-        seasonEpisode = seasonEpisode.replace(' ', '')  # remove spaces in the episode format
-        title = exceptionsTitle(title)
-        # finding year
-        value = title + ' 0000 '
-        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
-        year = syear.group(0).strip()
-        pos = value.find(year)
-        if pos > 0:
-            title = value[:pos].strip()
-        title = value.replace('0000', '')
-        year = year.replace('0000', '')
-        # the rest
-        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
-        folder = title  # with year
-        cleanTitle = _cleanTitle(title.replace(year, '').strip())  # without year
-        title = folder + ' ' + seasonEpisode.upper()
-        title = title.replace('S00E00', '').replace('EP00', '')
-        ttype = "SHOW"
-        result = {'title': title, 'folder': folder, 'rest': rest, 'type': ttype, 'cleanTitle': cleanTitle,
-                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
-                  "width": width(quality), "language": language, 'folderPath': settings.showFolder
-                  }
-        if bool(re.search("EP[0-9]+", title)):
-            result['type'] = "ANIME"
-            result['folderPath'] = settings.animeFolder
-            result['season'] = 1
-            result['episode'] = int(seasonEpisode.replace('ep', ''))
-        else:
-            temp = (seasonEpisode.replace('s', '')).split('e')
-            result['season'] = 0
-            result['episode'] = 0
-            try:
-                result['season'] = int(temp[0])
-                result['episode'] = int(temp[1])
-            except:
-                pass
-        return result
-
-print formatTitle('A to Z Season 1 Episode 13 | 1337x')
\ No newline at end of file
+# coding: utf-8
+__author__ = 'Mancuniancol'
+import re
+
+
+class Settings():
+    animeFolder = ''
+    movieFolder = ''
+    showFolder = ''
+
+settings = Settings()
+
+
+################################
+#### SCRAPER TITLES ############
+################################
+def normalize(name, onlyDecode=False):
+    from unicodedata import normalize
+    import types
+    if type(name) == types.StringType:
+        unicode_name = name.decode('unicode-escape')
+    else:
+        try:
+            unicode_name = name.encode('latin-1').decode('utf-8')  # to latin-1
+        except:
+            unicode_name = name
+    normalize_name = unicode_name if onlyDecode else normalize('NFKD', unicode_name)
+    return normalize_name.encode('ascii', 'ignore')
+
+
+def uncodeName(name):  # Convert all the &# codes to char, remove extra-space and normalize
+    from HTMLParser import HTMLParser
+    name = name.replace('<![CDATA[', '').replace(']]', '')
+    name = HTMLParser().unescape(name)
+    return name
+
+
+def unquoteName(name):  # Convert all %symbols to char
+    from urllib import unquote
+    return unquote(name).decode("utf-8")
+
+
+def safeName(value):  # Make the name directory and filename safe
+    value = normalize(value)  # First normalization
+    value = unquoteName(value)
+    value = uncodeName(value)
+    value = normalize(value)  # Last normalization, because some unicode char could appear from the previous steps
+    value = value.lower().title().replace('_', ' ')
+    # erase keyword
+    value = re.sub('^\[.*?\]', '', value)  # erase [HorribleSub] for ex.
+    # check for anime
+    value = re.sub('- ([0-9][0-9][0-9][0-9]) ', ' \g<1>', value + " ")
+    value = re.sub('- ([0-9]+) ', '- EP\g<1>', value + " ")
+    if 'season' not in value.lower():
+        value = value.lower().replace(" episode ", " - EP")
+    # check for qualities
+    value = value.replace("1920x1080", "1080p")
+    value = value.replace("1280x720", "720p")
+    value = value.replace("853x480", "480p")
+    value = value.replace("848x480", "480p")
+    value = value.replace("704x480", "480p")
+    value = value.replace("640x480", "480p")
+    value = value.replace("microhd", " microhd")  # sometimes comes with the year
+    value = value.replace("dvdrip", " dvdrip")  # sometimes comes with the year
+    keys = {'"': ' ', '*': ' ', '/': ' ', ':': ' ', '<': ' ', '>': ' ', '?': ' ', '|': ' ', '~': ' ',
+            "'": '', 'Of': 'of', 'De': 'de', '.': ' ', ')': ' ', '(': ' ', '[': ' ', ']': ' ', '-': ' '}
+    for key in keys.keys():
+        value = value.replace(key, keys[key])
+    value = ' '.join(value.split())
+    return value.replace('s h i e l d', 'SHIELD').replace('c s i', 'CSI')
+
+
+def checkQuality(text=""):
+    # quality
+    keyWords = {"Cam": ["camrip", "cam"],
+                "Telesync": ["ts", "telesync", "pdvd"],
+                "Workprint": ["wp", "workprint"],
+                "Telecine": ["tc", "telecine"],
+                "Pay-Per-View Rip": ["ppv", "ppvrip"],
+                "Screener": ["scr", "screener", "screeener", "dvdscr", "dvdscreener", "bdscr"],
+                "DDC": ["ddc"],
+                "R5": ["r5", "r5.line", "r5 ac3 5 1 hq"],
+                "DVD-Rip": ["dvdrip", "dvd-rip"],
+                "DVD-R": ["dvdr", "dvd-full", "full-rip", "iso rip", "lossless rip", "untouched rip", "dvd-5 dvd-9"],
+                "HDTV": ["dsr", "dsrip", "dthrip", "dvbrip", "hdtv", "pdtv", "tvrip", "hdtvrip", "hdrip", "hdit",
+                         "high definition"],
+                "VODRip": ["vodrip", "vodr"],
+                "WEB-DL": ["webdl", "web dl", "web-dl"],
+                "WEBRip": ["web-rip", "webrip", "web rip"],
+                "WEBCap": ["web-cap", "webcap", "web cap"],
+                "BD/BRRip": ["bdrip", "brrip", "blu-ray", "bluray", "bdr", "bd5", "bd", "blurip"],
+                "MicroHD": ["microhd"],
+                "FullHD": ["fullhd"],
+                "BR-Line": ["br line"],
+                # video formats
+                "x264": ["x264", "x 264"],
+                "x265 HEVC": ["x265 hevc", "x265", "x 265", "hevc"],
+                # audio
+                "DD5.1": ["dd5 1", "dd51", "dual audio 5"],
+                "AC3 5.1": ["ac3"],
+                "ACC": ["acc"],
+                "DUAL AUDIO": ["dual", "dual audio"],
+                }
+    color = {"Cam": "FFF4AE00",
+             "Telesync": "FFF4AE00",
+             "Workprint": "FFF4AE00",
+             "Telecine": "FFF4AE00",
+             "Pay-Per-View Rip": "FFD35400",
+             "Screener": "FFD35400",
+             "DDC": "FFD35400",
+             "R5": "FFD35400",
+             "DVD-Rip": "FFD35400",
+             "DVD-R": "FFD35400",
+             "HDTV": "FFD35400",
+             "VODRip": "FFD35400",
+             "WEB-DL": "FFD35400",
+             "WEBRip": "FFD35400",
+             "WEBCap": "FFD35400",
+             "BD/BRRip": "FFD35400",
+             "MicroHD": "FFD35400",
+             "FullHD": "FFD35400",
+             "BR-Line": "FFD35400",
+             # video formats
+             "x264": "FFFB0C06",
+             "x265 HEVC": "FFFB0C06",
+             # audio
+             "DD5.1": "FF089DE3",
+             "AC3 5.1": "FF089DE3",
+             "ACC": "FF089DE3",
+             "DUAL AUDIO": "FF089DE3",
+             }
+    quality = "480p"
+    textQuality = ""
+    for key in keyWords:
+        for keyWord in keyWords[key]:
+            if ' ' + keyWord + ' ' in ' ' + text + ' ':
+                quality = "480p"
+                textQuality += " [COLOR %s][%s][/COLOR]" % (color[key], key)
+
+    if "480p" in text:
+        quality = "480p"
+        textQuality += " [COLOR FF2980B9][480p][/COLOR]"
+    if "720p" in text:
+        quality = "720p"
+        textQuality += " [COLOR FF5CD102][720p][/COLOR]"
+    if "1080p" in text:
+        quality = "1080p"
+        textQuality += " [COLOR FFF4AE00][1080p][/COLOR]"
+    if "3d" in text:
+        quality = "1080p"
+        textQuality += " [COLOR FFD61515][3D][/COLOR]"
+    if "4k" in text:
+        quality = "2160p"
+        textQuality += " [COLOR FF16A085][4K][/COLOR]"
+    return quality, textQuality
+
+
+def width(quality="480p"):
+    result = 720
+    if '480p' in quality:
+        result = 720
+    elif '720p' in quality:
+        result = 1280
+    elif '1080p' in quality:
+        result = 1920
+    elif '2160p' in quality:
+        result = 2160
+    return result
+
+
+def height(quality="480p"):
+    result = 480
+    if '480p' in quality:
+        result = 480
+    elif '720p' in quality:
+        result = 720
+    elif '1080p' in quality:
+        result = 1080
+    elif '2160p' in quality:
+        result = 3840
+    return result
+
+
+def findLanguage(value=""):
+    language = ""  # It is english or unknown
+    if "spa" in value or "spanish" in value or "espanol" in value:
+        language = " Español "
+    if "hindi" in value:
+        language = "Hindi"
+    if "castellano" in value:
+        language = "Castellano"
+    if "french" in value or 'francais' in value:
+        language = "French"
+    if "german" in value:
+        language = "German"
+    return language
+
+
+def exceptionsTitle(title=""):
+    value = title + " "
+    if "csi " in value and "ny" not in value and "miami" not in value and "cyber" not in value:
+        title = title.replace("csi", "CSI Crime Scene Investigation")
+    if "juego de tronos" in value:
+        title = title.replace("juego de tronos", "Game of Thrones")
+    if "mentes criminales" in value:
+        title = title.replace("mentes criminales", "criminal minds")
+    if "les revenants" in value:
+        title = title.replace("les revenants", "The returned")
+    return title
+
+
+def _cleanTitle(value=''):
+    keywordsCleanTitle = ['version', 'extendida', 'extended', 'edition', 'hd', 'unrated', 'version', 'vose',
+                          'special', 'edtion', 'uncensored', 'fixed', 'censurada', 'episode', 'ova', 'complete',
+                          'swesub'
+                          ]
+    for keyword in keywordsCleanTitle:  # checking keywords
+        value = (value + ' ').replace(' ' + keyword.title() + ' ', ' ')
+    return value.strip()
+
+
+def formatTitle(value='', fileName='', typeVideo="MOVIE"):
+    if fileName.startswith('magnet'):
+        fileName = ''
+    if fileName == '':
+        fileName = value
+    pos = value.rfind("/")
+    value = value if pos < 0 else value[pos:]
+    value = safeName(value).lower() + ' '
+    fileName = safeName(fileName).lower() + ' '
+    quality, textQuality = checkQuality(value + ' ' + fileName)  # find quality
+    language = findLanguage(value)  # find language
+    formats = [' ep[0-9]+', ' s[0-9]+e[0-9]+', ' s[0-9]+ e[0-9]+', ' [0-9]+x[0-9]+',
+               ' [0-9][0-9][0-9][0-9] [0-9][0-9] [0-9][0-9]',
+               ' [0-9][0-9] [0-9][0-9] [0-9][0-9]', ' season [0-9]+ episode [0-9]+',
+               ' season [0-9]+', ' season[0-9]+', ' s[0-9][0-9]',
+               ' temporada [0-9]+ capitulo [0-9]+', ' temporada[0-9]+', ' temporada [0-9]+',
+               ' seizoen [0-9]+ afl [0-9]+', ' saison[0-9]+', ' saison [0-9]+',
+               ' temp [0-9]+ cap [0-9]+', ' temp[0-9]+ cap[0-9]+',
+               ]
+    keywords = ['en 1080p', 'en 720p', 'en dvd', 'en dvdrip', 'en hdtv', 'en bluray', 'en blurayrip',
+                'en web', 'en rip', 'en ts screener', 'en screener', 'en cam', 'en camrip', 'pcdvd', 'bdremux',
+                'en ts-screener', 'en hdrip', 'en microhd', '1080p', '720p', 'dvd', 'dvdrip', 'hdtv', 'bluray',
+                'blurayrip', 'web', 'rip', 'ts screener', 'screener', 'cam', 'camrip', 'ts-screener', 'hdrip',
+                'brrip', 'blu', 'webrip', 'hdrip', 'bdrip', 'microhd', 'ita', 'eng', 'esp', "spanish espanol",
+                'castellano', '480p', 'bd', 'bdrip', 'hi10p', 'sub', 'x264', 'sbs', '3d', 'br', 'hdts', 'dts',
+                'dual audio', 'hevc', 'aac', 'batch', 'h264', 'gratis', 'descargar', 'hd', 'html', 'hdit',
+                'blurip', 'high definition', 'german', 'french', 'truefrench', 'vostfr', 'dvdscr', 'swesub',
+                '4k', 'uhd',
+                ]
+    sshow = None
+    for format in formats:  # search if it is a show
+        sshow = re.search(format, value)  # format shows
+        if sshow is not None:
+            break
+    if sshow is None and typeVideo != "MOVIE":
+        if typeVideo == 'SHOW':
+            value += ' s00e00'
+        if typeVideo == 'ANIME':
+            value += ' ep00'
+        for format in formats:  # search if it is a show
+            sshow = re.search(format, value)  # format shows
+            if sshow is not None:
+                break
+    if sshow is None:
+        # it is a movie
+        value += ' 0000 '  # checking year
+        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
+        year = syear.group(0).strip()
+        pos = value.find(year)
+        if pos > 0:
+            title = value[:pos].strip()
+            rest = value[pos + 5:].strip().replace('0000', '')
+        else:
+            title = value.replace('0000', '')
+            rest = ''
+
+        while pos != -1:  # loop until doesn't have any keyword in the title
+            value = title + ' '
+            for keyword in keywords:  # checking keywords
+                pos = value.find(' ' + keyword + ' ')
+                if pos > 0:
+                    title = value[:pos]
+                    rest = value[pos:].strip() + ' ' + rest
+                    break
+
+        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
+        cleanTitle = _cleanTitle(title)
+        # finishing cleanTitle
+        if '0000' not in year:
+            title += ' (' + year.strip() + ')'
+        year = year.replace('0000', '')
+        folder = title
+        result = {'title': title, 'folder': folder, 'rest': rest.strip(), 'type': 'MOVIE', 'cleanTitle': cleanTitle,
+                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
+                  "width": width(quality), 'language': language, 'folderPath': settings.movieFolder
+                  }
+        return result
+    else:
+        # it is a show
+        rest = value.strip()  # original name
+        seasonEpisode = sshow.group(0)
+        # clean title
+        for keyword in keywords:  # checking keywords
+            value = value.replace(' ' + keyword + ' ', ' ')
+        title = value[:value.find(seasonEpisode)].strip()
+        title = title.strip()
+        seasonEpisode = seasonEpisode.replace('temporada ', 's').replace(' capitulo ', 'e')
+        seasonEpisode = seasonEpisode.replace('season ', 's').replace(' episode ', 'e')
+        seasonEpisode = seasonEpisode.replace('temp ', 's').replace(' cap ', 'e')
+        seasonEpisode = seasonEpisode.replace('seizoen ', 's').replace(' afl ', 'e')
+
+        if 'x' in seasonEpisode:
+            seasonEpisode = 's' + seasonEpisode.replace('x', 'e')
+
+        if 's' in seasonEpisode and 'e' in seasonEpisode and 'season' not in seasonEpisode:  # force S00E00 instead S0E0
+            temp_episode = seasonEpisode.replace('s', '').split('e')
+            seasonEpisode = 's%02de%02d' % (int(temp_episode[0]), int(temp_episode[1]))
+
+        if 's' not in seasonEpisode and 'e' not in seasonEpisode:  # date format
+            date = seasonEpisode.split()
+            if len(date[0]) == 4:  # yyyy-mm-dd format
+                seasonEpisode = seasonEpisode.replace(' ', '-')  # date style episode talk shows
+            else:  # dd mm yy format
+                if int(date[2]) > 50:
+                    date[2] = '19' + date[2]
+                else:
+                    date[2] = '20' + date[2]
+                seasonEpisode = date[2] + '-' + date[1] + '-' + date[0]
+
+        seasonEpisode = seasonEpisode.replace(' ', '')  # remove spaces in the episode format
+        title = exceptionsTitle(title)
+        # finding year
+        value = title + ' 0000 '
+        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
+        year = syear.group(0).strip()
+        pos = value.find(year)
+        if pos > 0:
+            title = value[:pos].strip()
+        title = value.replace('0000', '')
+        year = year.replace('0000', '')
+        # the rest
+        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
+        folder = title  # with year
+        cleanTitle = _cleanTitle(title.replace(year, '').strip())  # without year
+        title = folder + ' ' + seasonEpisode.upper()
+        title = title.replace('S00E00', '').replace('EP00', '')
+        ttype = "SHOW"
+        result = {'title': title, 'folder': folder, 'rest': rest, 'type': ttype, 'cleanTitle': cleanTitle,
+                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
+                  "width": width(quality), "language": language, 'folderPath': settings.showFolder
+                  }
+        if bool(re.search("EP[0-9]+", title)):
+            result['type'] = "ANIME"
+            result['folderPath'] = settings.animeFolder
+            result['season'] = 1
+            result['episode'] = int(seasonEpisode.replace('ep', ''))
+        else:
+            temp = (seasonEpisode.replace('s', '')).split('e')
+            result['season'] = 0
+            result['episode'] = 0
+            try:
+                result['season'] = int(temp[0])
+                result['episode'] = int(temp[1])
+            except:
+                pass
+        return result
+
+
+print formatTitle('[4k ultra hd] San Andreas 4K SBS 6 Channel AAC  ENG 3D [SEEDERS (0) LEECHERS (0)]')
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools.py b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools.py
index e84ca1c75f69fc94ea7803d5aebb781074642166..a6e1e6f1e6187a45951dafdb4259874582d9132d 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools.py
@@ -1,1347 +1,1347 @@
-# coding: utf-8
-# library to access URL, translation title and filtering
-# using the great jobs of ElDorado for scrobbling
-__author__ = 'mancuniancol'
-
-import os
-import bs4
-import requests
-import re
-import xbmcaddon
-import xbmc
-import xbmcgui
-from os import path
-from urllib import quote_plus
-from time import sleep
-from ast import literal_eval
-import random
-
-
-################################
-#### SCRAPER TITLES ############
-################################
-def normalize(name, onlyDecode=False):
-    from unicodedata import normalize
-    import types
-    if type(name) == types.StringType:
-        unicode_name = name.decode('unicode-escape')
-    else:
-        try:
-            unicode_name = name.encode('latin-1').decode('utf-8')  # to latin-1
-        except:
-            unicode_name = name
-    normalize_name = unicode_name if onlyDecode else normalize('NFKD', unicode_name)
-    return normalize_name.encode('ascii', 'ignore')
-
-
-def uncodeName(name):  # Convert all the &# codes to char, remove extra-space and normalize
-    from HTMLParser import HTMLParser
-    name = name.replace('<![CDATA[', '').replace(']]', '')
-    name = HTMLParser().unescape(name)
-    return name
-
-
-def unquoteName(name):  # Convert all %symbols to char
-    from urllib import unquote
-    return unquote(name).decode("utf-8")
-
-
-def safeName(value):  # Make the name directory and filename safe
-    value = normalize(value)  # First normalization
-    value = unquoteName(value)
-    value = uncodeName(value)
-    value = normalize(value)  # Last normalization, because some unicode char could appear from the previous steps
-    value = value.lower().title().replace('_', ' ')
-    # erase keyword
-    value = re.sub('^\[.*?\]', '', value)  # erase [HorribleSub] for ex.
-    # check for anime
-    value = re.sub('- ([0-9][0-9][0-9][0-9]) ', ' \g<1>', value + " ")
-    value = re.sub('- ([0-9]+) ', '- EP\g<1>', value + " ")
-    value = value.lower().replace(" episode ", " - EP")
-    # check for qualities
-    value = value.replace("1920x1080", "1080p")
-    value = value.replace("1280x720", "720p")
-    value = value.replace("853x480", "480p")
-    value = value.replace("848x480", "480p")
-    value = value.replace("704x480", "480p")
-    value = value.replace("640x480", "480p")
-    value = value.replace("microhd", " microhd")  # sometimes comes with the year
-    value = value.replace("dvdrip", " dvdrip")  # sometimes comes with the year
-    keys = {'"': ' ', '*': ' ', '/': ' ', ':': ' ', '<': ' ', '>': ' ', '?': ' ', '|': ' ',
-            "'": '', 'Of': 'of', 'De': 'de', '.': ' ', ')': ' ', '(': ' ', '[': ' ', ']': ' ', '-': ' '}
-    for key in keys.keys():
-        value = value.replace(key, keys[key])
-    value = ' '.join(value.split())
-    return value.replace('S H I E L D', 'SHIELD').replace('C S I', 'CSI')
-
-
-def checkQuality(text=""):
-    # quality
-    keyWords = {"Cam": ["camrip", "cam"],
-                "Telesync": ["ts", "telesync", "pdvd"],
-                "Workprint": ["wp", "workprint"],
-                "Telecine": ["tc", "telecine"],
-                "Pay-Per-View Rip": ["ppv", "ppvrip"],
-                "Screener": ["scr", "screener", "screeener", "dvdscr", "dvdscreener", "bdscr"],
-                "DDC": ["ddc"],
-                "R5": ["r5", "r5.line", "r5 ac3 5 1 hq"],
-                "DVD-Rip": ["dvdrip", "dvd-rip"],
-                "DVD-R": ["dvdr", "dvd-full", "full-rip", "iso rip", "lossless rip", "untouched rip", "dvd-5 dvd-9"],
-                "HDTV": ["dsr", "dsrip", "dthrip", "dvbrip", "hdtv", "pdtv", "tvrip", "hdtvrip", "hdrip"],
-                "VODRip": ["vodrip", "vodr"],
-                "WEB-DL": ["webdl", "web dl", "web-dl"],
-                "WEBRip": ["web-rip", "webrip", "web rip"],
-                "WEBCap": ["web-cap", "webcap", "web cap"],
-                "BD/BRRip": ["bdrip", "brrip", "blu-ray", "bluray", "bdr", "bd5", "bd"],
-                "MicroHD": ["microhd"],
-                "FullHD": ["fullhd"],
-                }
-    color = {"Cam": "FFF4AE00",
-             "Telesync": "FFF4AE00",
-             "Workprint": "FFF4AE00",
-             "Telecine": "FFF4AE00",
-             "Pay-Per-View Rip": "FFD35400",
-             "Screener": "FFD35400",
-             "DDC": "FFD35400",
-             "R5": "FFD35400",
-             "DVD-Rip": "FFD35400",
-             "DVD-R": "FFD35400",
-             "HDTV": "FFD35400",
-             "VODRip": "FFD35400",
-             "WEB-DL": "FFD35400",
-             "WEBRip": "FFD35400",
-             "WEBCap": "FFD35400",
-             "BD/BRRip": "FFD35400",
-             "MicroHD": "FFD35400",
-             "FullHD": "FFD35400",
-             }
-    quality = "480p"
-    textQuality = ""
-    for key in keyWords:
-        for keyWord in keyWords[key]:
-            if ' ' + keyWord + ' ' in ' ' + text + ' ':
-                print keyWord
-                quality = "480p"
-                textQuality += " [COLOR %s][%s][/COLOR]" % (color[key], key)
-
-    if "480p" in text:
-        quality = "480p"
-        textQuality += " [COLOR FF2980B9][480p][/COLOR]"
-    if "720p" in text:
-        quality = "720p"
-        textQuality += " [COLOR FF5CD102][720p][/COLOR]"
-    if "1080p" in text:
-        quality = "1080p"
-        textQuality += " [COLOR FFF4AE00][1080p][/COLOR]"
-    if "3d" in text:
-        quality = "1080p"
-        textQuality += " [COLOR FFD61515][3D][/COLOR]"
-    if "4k" in text:
-        quality = "2160p"
-        textQuality += " [COLOR FF16A085][4K][/COLOR]"
-    return quality, textQuality
-
-
-def width(quality="480p"):
-    result = 720
-    if '480p' in quality:
-        result = 720
-    elif '720p' in quality:
-        result = 1280
-    elif '1080p' in quality:
-        result = 1920
-    elif '2160p' in quality:
-        result = 2160
-    return result
-
-
-def height(quality="480p"):
-    result = 480
-    if '480p' in quality:
-        result = 480
-    elif '720p' in quality:
-        result = 720
-    elif '1080p' in quality:
-        result = 1080
-    elif '2160p' in quality:
-        result = 3840
-    return result
-
-
-def findLanguage(value=""):
-    language = ""  # It is english or unknown
-    if "spa" in value or "spanish" in value or "espanol" in value:
-        language = " Español "
-    if "hindi" in value:
-        language = "Hindi"
-    if "castellano" in value:
-        language = "Castellano"
-    return language
-
-
-def exceptionsTitle(title=""):
-    value = title + " "
-    if "csi " in value:
-        title = title.replace("csi", "CSI Crime Scene Investigation")
-    return title
-
-
-def _cleanTitle(value=''):
-    keywordsCleanTitle = ['version', 'extendida', 'extended', 'edition', 'hd', 'unrated', 'version',
-                          'special', 'edtion', 'uncensored', 'fixed', 'censurada', 'episode', 'ova', 'complete'
-                          ]
-    for keyword in keywordsCleanTitle:  # checking keywords
-        value = (value + ' ').replace(' ' + keyword.title() + ' ', ' ')
-    return value.strip()
-
-
-def formatTitle(value='', fileName='', typeVideo="MOVIE"):
-    if fileName == '':
-        fileName = value
-    pos = value.rfind("/")
-    value = value if pos < 0 else value[pos:]
-    value = safeName(value).lower() + ' '
-    fileName = safeName(fileName).lower() + ' '
-    quality, textQuality = checkQuality(fileName)  # find quality
-    language = findLanguage(value)  # find language
-    formats = [' ep[0-9]+', ' s[0-9]+e[0-9]+', ' s[0-9]+ e[0-9]+', ' [0-9]+x[0-9]+',
-               ' [0-9][0-9][0-9][0-9] [0-9][0-9] [0-9][0-9]',
-               ' [0-9][0-9] [0-9][0-9] [0-9][0-9]', ' season [0-9]+', ' season[0-9]+', ' s[0-9][0-9]',
-               ' temporada [0-9]+ capitulo [0-9]+', ' temporada[0-9]+', ' temporada [0-9]+',
-               ' seizoen [0-9]+ afl [0-9]+',
-               ' temp [0-9]+ cap [0-9]+', ' temp[0-9]+ cap[0-9]+',
-               ]
-    keywords = ['en 1080p', 'en 720p', 'en dvd', 'en dvdrip', 'en hdtv', 'en bluray', 'en blurayrip',
-                'en web', 'en rip', 'en ts screener', 'en screener', 'en cam', 'en camrip', 'pcdvd', 'bdremux',
-                'en ts-screener', 'en hdrip', 'en microhd', '1080p', '720p', 'dvd', 'dvdrip', 'hdtv', 'bluray',
-                'blurayrip', 'web', 'rip', 'ts screener', 'screener', 'cam', 'camrip', 'ts-screener', 'hdrip',
-                'brrip', 'blu', 'webrip', 'hdrip', 'bdrip', 'microhd', 'ita', 'eng', 'esp', "spanish espanol",
-                'castellano', '480p', 'bd', 'bdrip', 'hi10p', 'sub', 'x264', 'sbs', '3d', 'br', 'hdts', 'dts',
-                'dual audio', 'hevc', 'aac', 'batch', 'h264', 'gratis', 'descargar', 'hd', 'html'
-                ]
-    sshow = None
-    for format in formats:  # search if it is a show
-        sshow = re.search(format, value)  # format shows
-        if sshow is not None:
-            break
-    if sshow is None and typeVideo != "MOVIE":
-        if typeVideo == 'SHOW':
-            value += ' s00e00'
-        if typeVideo == 'ANIME':
-            value += ' ep00'
-        for format in formats:  # search if it is a show
-            sshow = re.search(format, value)  # format shows
-            if sshow is not None:
-                break
-    if sshow is None:
-        # it is a movie
-        value += ' 0000 '  # checking year
-        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
-        year = syear.group(0).strip()
-        pos = value.find(year)
-        if pos > 0:
-            title = value[:pos].strip()
-            rest = value[pos + 5:].strip().replace('0000', '')
-        else:
-            title = value.replace('0000', '')
-            rest = ''
-
-        while pos != -1:  # loop until doesn't have any keyword in the title
-            value = title + ' '
-            for keyword in keywords:  # checking keywords
-                pos = value.find(' ' + keyword + ' ')
-                if pos > 0:
-                    title = value[:pos]
-                    rest = value[pos:].strip() + ' ' + rest
-                    break
-
-        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
-        cleanTitle = _cleanTitle(title)
-        # finishing cleanTitle
-        if '0000' not in year:
-            title += ' (' + year.strip() + ')'
-        year = year.replace('0000', '')
-        folder = title
-        result = {'title': title, 'folder': folder, 'rest': rest.strip(), 'type': 'MOVIE', 'cleanTitle': cleanTitle,
-                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
-                  "width": width(quality), 'language': language
-                  }
-        return result
-    else:
-        # it is a show
-        rest = value.strip()  # original name
-        seasonEpisode = sshow.group(0)
-        # clean title
-        for keyword in keywords:  # checking keywords
-            value = value.replace(' ' + keyword + ' ', ' ')
-        title = value[:value.find(seasonEpisode)].strip()
-        title = title.strip()
-        seasonEpisode = seasonEpisode.replace('temporada ', 's').replace(' capitulo ', 'e')
-        seasonEpisode = seasonEpisode.replace('temp ', 's').replace(' cap ', 'e')
-        seasonEpisode = seasonEpisode.replace('seizoen ', 's').replace(' afl ', 'e')
-
-        if 'x' in seasonEpisode:
-            seasonEpisode = 's' + seasonEpisode.replace('x', 'e')
-
-        if 's' in seasonEpisode and 'e' in seasonEpisode and 'season' not in seasonEpisode:  # force S00E00 instead S0E0
-            temp_episode = seasonEpisode.replace('s', '').split('e')
-            seasonEpisode = 's%02de%02d' % (int(temp_episode[0]), int(temp_episode[1]))
-
-        if 's' not in seasonEpisode and 'e' not in seasonEpisode:  # date format
-            date = seasonEpisode.split()
-            if len(date[0]) == 4:  # yyyy-mm-dd format
-                seasonEpisode = seasonEpisode.replace(' ', '-')  # date style episode talk shows
-            else:  # dd mm yy format
-                if int(date[2]) > 50:
-                    date[2] = '19' + date[2]
-                else:
-                    date[2] = '20' + date[2]
-                seasonEpisode = date[2] + '-' + date[1] + '-' + date[0]
-
-        seasonEpisode = seasonEpisode.replace(' ', '')  # remove spaces in the episode format
-        title = exceptionsTitle(title)
-        # finding year
-        value = title + ' 0000 '
-        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
-        year = syear.group(0).strip()
-        pos = value.find(year)
-        if pos > 0:
-            title = value[:pos].strip()
-        title = value.replace('0000', '')
-        year = year.replace('0000', '')
-        # the rest
-        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
-        folder = title  # with year
-        cleanTitle = _cleanTitle(title.replace(year, '').strip())  # without year
-        title = folder + ' ' + seasonEpisode.upper()
-        title = title.replace('S00E00', '').replace('EP00', '')
-        ttype = "SHOW"
-        result = {'title': title, 'folder': folder, 'rest': rest, 'type': ttype, 'cleanTitle': cleanTitle,
-                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
-                  "width": width(quality), "language": language,
-                  }
-        if bool(re.search("EP[0-9]+", title)):
-            ttype = "ANIME"
-            result['season'] = 1
-            result['episode'] = int(seasonEpisode.replace('ep', ''))
-        else:
-            temp = (seasonEpisode.replace('s', '')).split('e')
-            result['season'] = int(temp[0])
-            result['episode'] = int(temp[1])
-        return result
-
-
-################################
-#### CLASS #####################
-################################
-class Storage():
-    def __init__(self, fileName="", type="list", eval=False):
-        from ast import literal_eval
-        self.path = os.path.join(xbmc.translatePath('special://temp'), fileName)
-        self.type = type
-        if type == "list":
-            # get the list
-            self.database = []
-            try:
-                with open(self.path, 'r') as fp:
-                    for line in fp:
-                        self.database.append(line.strip())
-            except:
-                pass
-        elif type == "dict":
-            # get the Dictionary
-            self.database = {}
-            try:
-                with open(self.path, 'r') as fp:
-                    for line in fp:
-                        listedline = line.strip().split('::')  # split around the :: sign
-                        if len(listedline) > 1:  # we have the : sign in there
-                            settings.debug(listedline[0] + ' : ' + listedline[1])
-                            self.database[listedline[0]] = listedline[1] if not eval else literal_eval(listedline[1])
-            except:
-                pass
-
-    def destroy(self):  # Erase the database from the HD
-        try:
-            os.remove(self.path)
-        except OSError:
-            pass
-
-    def add(self, key="", info=""):  # add element
-        if self.type == "list" and key not in self.database:
-            self.database.append(key)
-        elif self.type == "dict":
-            keySafe = formatTitle(key)
-            self.database[keySafe['folder']] = info
-
-    def remove(self, key=""):  # remove element
-        if self.type == "list":
-            self.database.remove(key)
-        elif self.type == "dict":
-            keySafe = formatTitle(key)
-            del self.database[keySafe['folder']]
-
-    def save(self):  # save the database
-        if self.type == "list":
-            # save the list
-            with open(self.path, 'w') as fp:
-                for p in self.database:
-                    fp.write("%s\n" % p)
-        elif self.type == "dict":
-            # save the dictionary
-            with open(self.path, 'w') as fp:
-                for p in self.database.items():
-                    fp.write("%s::%s\n" % p)
-
-
-class Settings:  # Read Configuration's Addon
-    def __init__(self, anime=False):
-        # Objects
-        self.dialog = xbmcgui.Dialog()
-        self.pDialog = xbmcgui.DialogProgress()
-        self.settings = xbmcaddon.Addon()
-
-        # General information
-        self.idAddon = self.settings.getAddonInfo('ID')  # gets name
-        self.icon = self.settings.getAddonInfo('icon')
-        self.fanart = self.settings.getAddonInfo('fanart')
-        self.path = self.settings.getAddonInfo('path')
-        self.name = self.settings.getAddonInfo('name')  # gets name
-        self.cleanName = re.sub('.COLOR (.*?)]', '', self.name.replace('[/COLOR]', ''))
-        self.storageName = self.cleanName + ".txt"  # Name Database
-
-        # Everything else
-        self.value = {}  # it contains all the settings from xml file
-        self.value["movieFolder"] = ""
-        self.value["showFolder"] = ""
-        self.value["animeFolder"] = ""
-
-        with open(path.join(self.path, "resources", "settings.xml"), 'r') as fp:
-            data = fp.read()
-        soup = bs4.BeautifulSoup(data)
-        settings = soup.select("setting")
-        for setting in settings:
-            id = setting.attrs.get("id")
-            if id is not None:
-                self.value[id] = self.settings.getSetting(id)
-
-        # Set-up Output folder
-        self.movieFolder = self.__folder__(self.value["movieFolder"], "movies")
-        self.showFolder = self.__folder__(self.value["showFolder"], "shows")
-        self.animeFolder = self.__folder__(self.value["animeFolder"], "animes")
-
-        # subscription
-        if "subscription" in self.cleanName.lower(): self.__subscription__()
-
-    def __folder__(self, folder, default=""):  # Change to OS friendly names
-        if folder == '':  # define default folder
-            folder = 'special://temp/%s/' % default
-        folder = folder.replace('special://temp/', xbmc.translatePath('special://temp'))
-        return folder.replace('smb:', '')  # network compatibility
-
-    def __subscription__(self):  # Additional Code for Subscription List Scripts
-        # remove .strm
-        self.debug("removeStrm= " + self.value["removeStrm"])
-        if self.value["removeStrm"] == 'true':
-            self.notification('Removing .strm files...')
-            if self.value["typeLibrary"] == "Global":
-                self.storageName = "pulsar global subscription.txt"
-            storage = Storage(self.storageName, type="dict")
-            from shutil import rmtree
-            for item in storage.database:
-                data = literal_eval(storage.database[item])
-                rmtree(data['path'])
-                settings.log('path: ' + data['path'] + ' removed!!')
-            self.log('All .strm files removed!')
-            self.notification('All .strm files removed!', force=True)
-            self.settings.setSetting('removeStrm', 'false')
-        # clear the database
-        self.debug("clearDatabase= " + self.value["clearDatabase"])
-        if self.value["clearDatabase"] == 'true':
-            self.notification('Erasing Database...', force=True)
-            storage = Storage(self.storageName, type="dict")
-            storage.destroy()
-            self.settings.setSetting('clearDatabase', 'false')
-
-    def log(self, message="", level=xbmc.LOGNOTICE):  # to write in the Kodi's log
-        try:
-            if message is not str:
-                message = str(message)
-            try:
-                xbmc.log('[' + self.cleanName + '] ' + message, level=level)
-            except:
-                xbmc.log('[' + self.cleanName + '] ' + safeName(message), level=level)
-        except:
-            xbmc.log("Error with the message", level=xbmc.LOGERROR)
-
-    def debug(self, message=""):  # to write in the Kodi's log
-        self.log(message, xbmc.LOGDEBUG)
-
-    def notification(self, message="", force=False, time=1000):  # to display a message in Kodi
-        if float(self.value["timeNotification"]) > 0 or force:
-            xbmcgui.Dialog().notification(self.name, "%s" % message, self.icon,
-                                          time if force else int(float(self.value["timeNotification"]) * 1000))
-
-    def string(self, id):
-        return self.settings.getLocalizedString(id)
-
-
-# Create settings object and browser to be used in the other tool's functions
-settings = Settings()
-browser = requests.Session()
-browser.headers[
-    'User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
-browser.headers['Accept-Language']='en'
-
-class TextViewer_Dialog(xbmcgui.WindowXMLDialog):  # taking from script.toolbox
-    ACTION_PREVIOUS_MENU = [9, 92, 10]
-
-    def __init__(self, *args, **kwargs):
-        xbmcgui.WindowXMLDialog.__init__(self)
-
-        self.text = kwargs.get('text')
-        self.header = kwargs.get('header')
-
-    def onInit(self):
-        self.getControl(1).setLabel(self.header)
-        self.getControl(5).setText(self.text)
-
-    def onAction(self, action):
-        if action in self.ACTION_PREVIOUS_MENU:
-            self.close()
-
-    def onClick(self, controlID):
-        pass
-
-    def onFocus(self, controlID):
-        pass
-
-
-class Filtering:
-    def __init__(self):
-        self.reason = ''
-        self.title = ''
-        self.quality_allow = ['*']
-        self.quality_deny = []
-        self.title = ''
-        self.maxSize = 10.00  # 10 it is not limit
-        self.minSize = 0.00
-
-        # size
-        if settings.value.has_key('movieMinSize'):  # there is size restrictions
-            settings.value['movieMinSize'] = float(settings.value['movieMinSize'])
-        else:
-            settings.value['movieMinSize'] = 0.0
-        self.movieMinSize = settings.value['movieMinSize']
-
-        if settings.value.has_key('movieMaxSize'):  # there is size restrictions
-            settings.value['movieMaxSize'] = float(settings.value['movieMaxSize'])
-        else:
-            settings.value['movieMaxSize'] = 10.0
-        self.movieMaxSize = settings.value['movieMaxSize']
-
-        if settings.value.has_key('tvMinSize'):  # there is size restrictions
-            settings.value['tvMinSize'] = float(settings.value['movieMinSize'])
-        else:
-            settings.value['tvMinSize'] = 0.0
-        self.tvMinSize = settings.value['tvMinSize']
-
-        if settings.value.has_key('tvMaxSize'):  # there is size restrictions
-            settings.value['tvMaxSize'] = float(settings.value['movieMaxSize'])
-        else:
-            settings.value['tvMaxSize'] = 10.0
-        self.tvMaxSize = settings.value['tvMaxSize']
-
-        # movie
-        movieAllow = []
-        if settings.value.has_key('movieKeyAllow') and settings.value['movieKeyAllow'] <> "":
-            movieAllow = re.split(',', settings.value['movieKeyAllow'].replace(', ', ',').replace(' ,', ','))
-        if settings.value.has_key('movieQua1') and settings.value['movieQua1'] == 'Accept File':
-            movieAllow.append('480p')  # 480p
-        if settings.value.has_key('movieQua2') and settings.value['movieQua2'] == 'Accept File':
-            movieAllow.append('HDTV')  # HDTV
-        if settings.value.has_key('movieQua3') and settings.value['movieQua3'] == 'Accept File':
-            movieAllow.append('720p')  # 720p
-        if settings.value.has_key('movieQua4') and settings.value['movieQua4'] == 'Accept File':
-            movieAllow.append('1080p')  # 1080p
-        if settings.value.has_key('movieQua5') and settings.value['movieQua5'] == 'Accept File':
-            movieAllow.append('3D')  # 3D
-        if settings.value.has_key('movieQua6') and settings.value['movieQua6'] == 'Accept File':
-            movieAllow.append('CAM')  # CAM
-        if settings.value.has_key('movieQua7') and settings.value['movieQua7'] == 'Accept File':
-            movieAllow.extend(['TeleSync', ' TS '])  # TeleSync
-        if settings.value.has_key('movieQua8') and settings.value['movieQua8'] == 'Accept File':
-            movieAllow.append('Trailer')  # Trailer
-
-        # Block File
-        movieDeny = []
-        if settings.value.has_key('movieKeyDenied') and settings.value['movieKeyDenied'] <> "":
-            movieDeny = re.split(',', settings.value['movieKeyDenied'].replace(', ', ',').replace(' ,', ','))
-        if settings.value.has_key('movieQua1') and settings.value['movieQua1'] == 'Block File':
-            movieDeny.append('480p')  # 480p
-        if settings.value.has_key('movieQua2') and settings.value['movieQua2'] == 'Block File':
-            movieDeny.append('HDTV')  # HDTV
-        if settings.value.has_key('movieQua3') and settings.value['movieQua3'] == 'Block File':
-            movieDeny.append('720p')  # 720p
-        if settings.value.has_key('movieQua4') and settings.value['movieQua4'] == 'Block File':
-            movieDeny.append('1080p')  # 1080p
-        if settings.value.has_key('movieQua5') and settings.value['movieQua5'] == 'Block File':
-            movieDeny.append('3D')  # 3D
-        if settings.value.has_key('movieQua6') and settings.value['movieQua6'] == 'Block File':
-            movieDeny.append('CAM')  # CAM
-        if settings.value.has_key('movieQua7') and settings.value['movieQua7'] == 'Block File':
-            movieDeny.extend(['TeleSync', ' TS '])  # TeleSync
-        if settings.value.has_key('movieQua8') and settings.value['movieQua8'] == 'Block File':
-            movieDeny.append('Trailer')  # Trailer
-
-        if '' in movieAllow: movieAllow.remove('')
-        if '' in movieDeny: movieDeny.remove('')
-        if len(movieAllow) == 0: movieAllow = ['*']
-        self.movieAllow = movieAllow
-        self.movieDeny = movieDeny
-
-        # TV
-        tvAllow = []
-        if settings.value.has_key('tvKeyAllow'):
-            tvAllow.append(re.split(',', settings.value['tvKeyAllow'].replace(', ', ',').replace(' ,', ',')))
-        if settings.value.has_key('tvQua1') and settings.value['tvQua1'] == 'Accept File':
-            tvAllow.append('480p')  # 480p
-        if settings.value.has_key('tvQua2') and settings.value['tvQua2'] == 'Accept File':
-            tvAllow.append('HDTV')  # HDTV
-        if settings.value.has_key('tvQua3') and settings.value['tvQua3'] == 'Accept File':
-            tvAllow.append('720p')  # 720p
-        if settings.value.has_key('tvQua4') and settings.value['tvQua4'] == 'Accept File':
-            tvAllow.append('1080p')  # 1080p
-
-        # Block File
-        tvDeny = []
-        if settings.value.has_key('tvKeyDeny'):
-            tvDeny.append(re.split(',', settings.value['tvKeyDeny'].replace(', ', ',').replace(' ,', ',')))
-        if settings.value.has_key('tvQua1') and settings.value['tvQua1'] == 'Block File':
-            tvDeny.append('480p')  # 480p
-        if settings.value.has_key('tvQua2') and settings.value['tvQua2'] == 'Block File':
-            tvDeny.append('HDTV')  # HDTV
-        if settings.value.has_key('tvQua3') and settings.value['tvQua3'] == 'Block File':
-            tvDeny.append('720p')  # 720p
-        if settings.value.has_key('tvQua4') and settings.value['tvQua4'] == 'Block File':
-            tvDeny.append('1080p')  # 1080p
-
-        if '' in tvAllow: tvAllow.remove('')
-        if '' in tvDeny: tvDeny.remove('')
-        if len(tvAllow) == 0: tvAllow = ['*']
-        self.tvAllow = tvAllow
-        self.tvDeny = tvDeny
-
-    def useMovie(self):
-        self.qualityAllow = self.movieAllow
-        self.qualityDeny = self.movieDeny
-        self.minSize = self.movieMinSize
-        self.maxSize = self.movieMaxSize
-
-    def useTv(self):
-        self.qualityAllow = self.tvAllow
-        self.qualityDeny = self.tvDeny
-        self.minSize = self.tvMinSize
-        self.maxSize = self.tvMaxSize
-
-    def information(self):
-        settings.log('Accepted Keywords: %s' % str(self.qualityAllow))
-        settings.log('Blocked Keywords: %s' % str(self.qualityDeny))
-        settings.log('min Size: %s' % str(self.minSize) + ' GB')
-        settings.log('max Size: %s' % str(self.maxSize) + ' GB') if self.maxSize != 10 else 'MAX'
-
-    # validate keywords
-    def included(self, value, keys, strict=False):
-        value = ' ' + normalize(value) + ' '
-        res = False
-        if '*' in keys:
-            res = True
-        else:
-            res1 = []
-            for key in keys:
-                res2 = []
-                for item in re.split('\s', key):
-                    item = normalize(item)
-                    item = item.replace('?', ' ')
-                    if strict: item = ' ' + item + ' '  # it makes that strict the comparation
-                    if item.upper() in value.upper():
-                        res2.append(True)
-                    else:
-                        res2.append(False)
-                res1.append(all(res2))
-            res = any(res1)
-        return res
-
-    # validate size
-    def size_clearance(self, size):
-        max_size1 = 100 if self.maxSize == 10 else self.maxSize
-        res = False
-        value = float(re.split('\s', size.replace(',', ''))[0])
-        value *= 0.001 if 'M' in size else 1
-        if self.minSize <= value <= max_size1:
-            res = True
-        return res
-
-    # verify
-    def verify(self, name, size):  # modify to just check quality and size, not name
-        self.reason = name.replace(' - ' + settings.cleanName, '') + ' ***Blocked File by'
-        result = True
-        if name != None:
-            if not self.included(name, self.qualityAllow) or self.included(name, self.qualityDeny):
-                self.reason += ", Keyword"
-                result = False
-        if size != None:
-            if not self.size_clearance(size):
-                result = False
-                self.reason += ", Size"
-        self.reason = self.reason.replace('by,', 'by') + '***'
-        return result
-
-
-#######################################
-######## CLASS FOR SUBSCRIPTION #######
-#######################################
-class TvShow():
-    def __init__(self, name):
-        import urllib
-
-        browser.get('http://localhost:65251/shows/search?q=%s' % urllib.quote(name))
-        sleep(0.2)
-        response = browser.get('http://localhost:65251/shows/search?q=%s' % urllib.quote(name))
-        if response.status_code == requests.codes.ok:
-            data = response.json()
-            dataShow = None
-            if len(data['items']) > 0:  # To find the right Tv Show
-                dataShow = data['items'][0]
-                for item in data['items']:
-                    if item['label'].lower() == name.lower():
-                        dataShow = item
-                        break
-            if dataShow is not None:
-                self.code = dataShow['path'].replace('plugin://plugin.video.pulsar/show/', '').replace(
-                    '/seasons', '')
-                sleep(0.2)
-                response = browser.get('http://localhost:65251/show/%s/seasons' % self.code)
-                data = {}
-                try:
-                    data = response.json()
-                except:
-                    data['items'] = []
-                seasons = []
-                for item in data['items']:
-                    seasons.append(int(item['label'].replace('Season ', '').replace('Specials', '0')))
-                seasons.sort()
-                episodes = {}
-                for season in seasons:
-                    sleep(0.2)
-                    response = browser.get('http://localhost:65251/show/%s/season/%s/episodes' % (self.code, season))
-                    data = response.json()
-                    episodes[season] = len(data['items'])
-                if len(seasons) > 0:
-                    self.firstSeason = seasons[0]
-                    self.lastSeason = seasons[-1]
-                else:
-                    self.firstSeason = 0
-                    self.lastSeason = 0
-                self.lastEpisode = episodes
-            else:
-                self.code = None
-        else:
-            self.code = None
-
-
-class TvShowCode():
-    def __init__(self, code, episodes={}, lastSeason=0):
-        self.code = code
-        response = browser.get('http://localhost:65251/show/%s/seasons' % self.code)
-        data = {}
-        try:
-            data = response.json()
-        except:
-            data['items'] = []
-        seasons = []
-        for item in data['items']:
-            seasons.append(int(item['label'].replace('Season ', '').replace('Specials', '0')))
-        seasons.sort()
-        if episodes.has_key(0):
-            del episodes[0]
-        if lastSeason is not 0:
-            del episodes[lastSeason]
-        for season in seasons:
-            if not episodes.has_key(season):
-                sleep(0.2)
-                response = browser.get('http://localhost:65251/show/%s/season/%s/episodes' % (self.code, season))
-                data = response.json()
-                episodes[season] = len(data['items'])
-        if len(seasons) > 0:
-            self.firstSeason = seasons[0]
-            self.lastSeason = seasons[-1]
-        else:
-            self.firstSeason = 0
-            self.lastSeason = 0
-        self.lastEpisode = episodes
-
-
-class Movie():
-    def __init__(self, name):
-        import urllib
-
-        if ')' in name and '(' in name:
-            try:
-                yearMovie = int(name[name.find("(") + 1:name.find(")")])
-                name = name.replace('(%s)' % yearMovie, '').rstrip()
-            except:
-                yearMovie = None
-        else:
-            yearMovie = None
-        browser.get('http://localhost:65251/movies/search?q=%s' % urllib.quote(name))  # avoid not info
-        sleep(1.0)
-        response = browser.get('http://localhost:65251/movies/search?q=%s' % urllib.quote(name))
-        if response.status_code == requests.codes.ok:
-            data = response.json()
-            if len(data['items']) > 0:
-                if yearMovie is not None:
-                    for movie in data['items']:
-                        label = movie['label']
-                        path = movie['path']
-                        if movie['info'].has_key('year'):
-                            year = movie['info']['year']
-                        else:
-                            year = 0000
-                        if year == yearMovie:
-                            break
-                else:
-                    label = data['items'][0]['label']
-                    path = data['items'][0]['path']
-                    year = data['items'][0]['info']['year']
-                self.code = path.replace('plugin://plugin.video.pulsar/movie/', '').replace('/play', '')
-                self.label = label
-                self.year = year
-            else:
-                self.code = None
-                self.label = name
-        else:
-            self.code = None
-            self.label = name
-
-
-class Magnet():
-    def __init__(self, magnet):
-        self.magnet = magnet + '&'
-        # hash
-        hash = re.search('urn:btih:(.*?)&', self.magnet)
-        result = ''
-        if hash is not None:
-            result = hash.group(1)
-        self.hash = result
-        # name
-        name = re.search('dn=(.*?)&', self.magnet)
-        result = ''
-        if name is not None:
-            result = name.group(1).replace('+', ' ')
-        self.name = safeName(result)
-        # trackers
-        self.trackers = re.findall('tr=(.*?)&', self.magnet)
-
-
-################################
-#### FUNCTIONS #################
-################################
-def printer(message=""):
-    print '****************************'
-    print message
-    print '*-**************************'
-
-
-def find_nth(string="", substring="", nth=1, start=0):
-    start = string.find(substring, start)
-    if nth == 1 or start == -1:
-        return start
-    else:
-        return find_nth(string, substring, nth - 1, start + len(substring))
-
-
-def textViewer(text="", once=False):
-    if not once or (once and settings.settings.getSetting("firstOpen") != "NO"):
-        settings.settings.setSetting("firstOpen", "NO")
-        w = TextViewer_Dialog('DialogTextViewer.xml', settings.path, header=settings.name, text=text)
-        w.doModal()
-
-
-def getMagnet(text=""):
-    pos = text.rfind('/')
-    magnet = text[pos + 1:]
-    return unquoteName(magnet)
-
-
-def goodSpider():
-    from time import sleep
-    import random
-    sleep(random.randrange(100, 1000, 1) / 1000)
-
-
-def dirImages(value):
-    imageFile = os.path.join(settings.path, 'resources', 'images', value)
-    if not os.path.isfile(imageFile):
-        imageFile = settings.icon
-    return imageFile
-
-
-def removeDirectory(folder):
-    from os import listdir
-    from xbmc import translatePath
-
-    folder = folder.replace('special://temp/', translatePath('special://temp'))
-    folder = folder.replace('smb:', '')  # network compatibility
-    listFolders = listdir(folder)
-    rep = settings.dialog.select('Select the Folder to erase:', listFolders + ['-CANCEL'])
-    if rep < len(listFolders):
-        if settings.dialog.yesno("Attention!", "Are you sure to erase?", nolabel="No", yeslabel="Yes"):
-            __removeDirectory__(folder=folder, title=listFolders[rep])
-
-
-def __removeDirectory__(folder="", title=""):
-    info = formatTitle(title)
-    directory = os.path.join(folder, info['folder'])
-    if os.path.exists(directory):
-        import shutil
-        shutil.rmtree(directory, ignore_errors=True)
-    if not xbmc.getCondVisibility('Library.IsScanningVideo'):
-        xbmc.executebuiltin('XBMC.CleanLibrary(video)')  # clean the library
-
-
-def getPlayableLink(page):
-    exceptionsList = Storage(settings.storageName.replace(".txt", "-exceptions.txt"))
-    result = page
-    settings.debug(result)
-    if 'divxatope' in page:
-        page = page.replace('/descargar/', '/torrent/')
-        result = page
-    isLink = True
-    settings.debug(exceptionsList.database)
-    for exception in exceptionsList.database:
-        if exception in page:
-            isLink = False
-            break
-    if page.startswith("http") and isLink:
-        # exceptions
-        settings.debug(result)
-        # download page
-        # try:
-        response = browser.get(page, verify=False)
-        data = normalize(response.text)
-        settings.debug(response.headers)
-        if 'text/html' in response.headers.get("content-type", ""):
-            content = re.findall('magnet:\?[^\'"\s<>\[\]]+', data)
-            if content != None and len(content) > 0:
-                result = content[0]
-            else:
-                content = re.findall('https?:[^\'"\s<>\[\]]+torrent', data)
-                if content != None and len(content) > 0:
-                    result = content[0]
-        else:
-            exceptionsList.add(re.search("^https?:\/\/(.*?)/", page).group(1))
-            exceptionsList.save()
-            # except:
-            #     pass
-    settings.debug(result)
-    return result
-
-
-def getInfoLabels(infoTitle):
-    from metahandler import metahandlers
-    metaget = metahandlers.MetaData()
-    infoLabels = {}
-    try:
-        if infoTitle is str:  # if it is a string get the FormatTitle dict structure
-            infoTitle = formatTitle(infoTitle)
-        settings.debug(infoTitle)
-        cleanTitle = infoTitle["cleanTitle"]
-        year = infoTitle["year"]
-        if infoTitle["type"] == "MOVIE":
-            infoLabels = metaget.get_meta('movie', cleanTitle, year=year)
-        else:  # it is a TV Show or Anime
-            infoLabels = metaget.get_meta('tvshow', cleanTitle, year=year)
-        # cast and castandrole
-        castList = []
-        castAndRoleList = []
-        for item in infoLabels.get("cast", []):
-            if item is not None and item is str:
-                castList.append(item)
-                castAndRoleList.append((item, ""))
-            else:
-                castList.append(item[0])
-                castAndRoleList.append(item)
-        infoLabels["cast"] = castList
-        infoLabels["castandrole"] = castAndRoleList
-        # add episode and season
-        infoLabels['season'] = infoTitle['season']
-        infoLabels['episode'] = infoTitle['episode']
-    except:
-        pass
-    duration = 0
-    if infoLabels.has_key("duration") and infoLabels["duration"] != '' and infoLabels["duration"] != 'None':
-        duration = int(infoLabels["duration"])
-    infoLabels['duration'] = duration
-    # force creation
-    infoLabels['imdb_id'] = infoLabels.get('imdb_id', "")
-    infoLabels['cover_url'] = infoLabels.get("cover_url", settings.icon)
-    infoLabels['backdrop_url'] = infoLabels.get("backdrop_url", settings.fanart)
-    # add label
-    infoLabels['label'] = infoTitle["title"] + infoTitle.get("textQuality", "") + " " + infoTitle["language"]
-    settings.debug(infoLabels)
-    return infoLabels
-
-
-def getInfoStream(infoTitle={}, infoLabels={}):
-    infoStream = {'width': infoTitle["width"],
-                  'height': infoTitle["height"],
-                  'aspect': infoTitle["width"] / infoTitle["height"],
-                  'duration': infoLabels["duration"],
-                  }
-    return infoStream
-
-
-def getInfoSeason(infoLabels, seasons=[]):
-    from metahandler import metahandlers
-    metaget = metahandlers.MetaData()
-    images = metaget.get_seasons(tvshowtitle=infoLabels["title"], imdb_id=infoLabels["imdb_id"],
-                               seasons=seasons, overlay=6)
-    seasons = []
-    for image in images:
-        printer(image)
-        if image["cover_url"] == "":
-            image["cover_url"] = infoLabels["cover_url"]
-        if image["backdrop_url"] == "":
-            image["backdrop_url"] = infoLabels["backdrop_url"]
-        seasons.append(image)
-    return seasons
-
-
-def getInfoEpisode(infoLabels):
-    from metahandler import metahandlers
-    metaget = metahandlers.MetaData()
-    return metaget.get_episode_meta(tvshowtitle=infoLabels["title"], imdb_id=infoLabels["imdb_id"],
-                                    season=infoLabels["season"], episode=infoLabels["episode"])
-
-
-############  INTEGRATION   ###########################
-def integration(titles=[], id=[], magnets=[], typeList='', folder='', silence=False, message=''):
-    messageType = {'MOVIE': settings.string(32031), 'SHOW': settings.string(32032), 'ANIME': settings.string(32043)}
-    filters = Filtering()  # start filtering
-
-    if typeList == 'MOVIE':
-        filters.useMovie()
-    else:
-        filters.useTv()  # TV SHOWS and Anime
-    filters.information()
-
-    total = len(titles)
-    answer = True
-    if not silence:
-        answer = settings.dialog.yesno(settings.string(32033) %
-                                       (normalize(settings.name), total), '%s' % titles)
-    if answer:  # it will integrate the filename list to the local library
-        if not silence:
-            settings.pDialog.create(settings.name, settings.string(32034) % (messageType[typeList], message))
-        else:
-            settings.notification(settings.string(32034) % (messageType[typeList], message))
-
-        cont = 0
-        for cm, title in enumerate(titles):
-            info = formatTitle(title)
-            info['folder'] = info['folder'][:100].strip()  # to limit the length of directory name
-            check = True
-            detailsTitle = ''
-            if len(info['rest']) > 0:  # check for quality filtering
-                filters.title = info['title'] + ' ' + info['rest']
-                if filters.verify(filters.title, None):  # just check the quality no more
-                    check = True
-                    if settings.value.get("duplicated", "false") == "true":
-                        detailsTitle = ' ' + info['rest']
-                else:
-                    check = False
-            if check:  # the file has passed the filtering
-                name = info['title'] + detailsTitle
-                name = name[:99].strip()  # to limit the length of name
-
-                # Try to create the directory if it doesn't exist
-                directory = path.join(folder, info['folder'])
-                try:
-                    os.makedirs(directory)
-                except:
-                    pass
-
-                # Set-up the plugin
-                sleep(random.randrange(50, 1000, 50) / 1000)  # to be a smart spider
-                uri_string = quote_plus(getPlayableLink(uncodeName(normalize(magnets[cm]))))
-                if settings.value["plugin"] == 'Pulsar':
-                    link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
-                elif settings.value["plugin"] == 'KmediaTorrent':
-                    link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
-                elif settings.value["plugin"] == "Torrenter":
-                    link = 'plugin://plugin.video.torrenter/?action=playSTRM&url=' + uri_string + \
-                           '&not_download_only=True'
-                elif settings.value["plugin"] == "YATP":
-                    link = 'plugin://plugin.video.yatp/?action=play&torrent=' + uri_string
-                else:
-                    link = 'plugin://plugin.video.xbmctorrent/play/%s' % uri_string
-                settings.debug(link)
-                # start to create the strm file
-                filename = path.join(directory, name + ".strm")
-                if not os.path.isfile(filename) or settings.value["overwrite"] == 'true':
-                    cont += 1  # add new file's count
-                    with open(filename, "w") as text_file:  # create .strm
-                        text_file.write(link)
-                    codeMovie = ""
-                    codeShow = ""
-                    if not os.path.isfile("*.nfo"):
-                        if len(id) > 0 and id[cm] != "":
-                            codeMovie = codeShow = id[cm]
-                        else:
-                            infoLabels = getInfoLabels(info)
-                            codeMovie = infoLabels.get("imdb_id", "")  # it tries to retrieve the IMDB number from title
-                            codeShow = infoLabels.get("tvdb_id", "")  # it tries to retrieve the TVDB number from title
-                    else:
-                        settings.debug(".nfo existe!!!")
-                    if codeMovie != "" and codeShow != "":  # Only it creates the nfo file if it is a IMDB number
-                        if typeList == "MOVIE":
-                            with open(filename.replace(".strm", ".nfo"), "w") as text_file:  # create .nfo MOVIE
-                                text_file.write("http://www.imdb.com/title/%s/" % codeMovie)
-                            settings.debug("imdb= " + codeMovie)
-                        else:
-                            with open(path.join(directory, "tvshow.nfo"), "w") as text_file:  # create .nfo SHOW
-                                text_file.write("http://thetvdb.com/?tab=series&id=%s" % codeShow)
-                            settings.debug("tvdb= " + codeShow)
-
-                    if not silence: settings.pDialog.update(int(float(cm) / total * 100), settings.string(32036)
-                                                            % (directory, name))
-                    if not silence and settings.pDialog.iscanceled(): break
-                    if cont % 100 == 0: settings.notification(
-                        settings.string(32037) % (cont, messageType[typeList], message))
-                    settings.log(settings.string(32038) % filename)
-                if not silence and settings.pDialog.iscanceled(): break
-        if not silence: settings.pDialog.close()
-
-        if cont > 0:  # There are files added
-            if not xbmc.getCondVisibility('Library.IsScanningVideo'):
-                xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
-            settings.log(settings.string(32040) % (cont, messageType[typeList], message))
-            if not silence:
-                settings.dialog.ok(settings.name, settings.string(32040) % (cont, messageType[typeList], message))
-            else:
-                settings.notification(settings.string(32040) % (cont, messageType[typeList], message))
-        else:
-            settings.log(settings.string(32041) % (messageType[typeList], message))
-            if not silence:
-                settings.dialog.ok(settings.name, settings.string(32042) % (messageType[typeList], message))
-            else:
-                settings.notification(settings.string(32042) % (messageType[typeList], message))
-                # del filters
-
-
-############  SUBSCRIPTION   ###########################
-def subscription(titles=[], id=[], typeList='', folder='', silence=False, message=''):
-    from types import StringType
-    messageType = {'MOVIE': settings.string(32031), 'SHOW': settings.string(32032)}
-    total = len(titles)
-    answer = True
-    if not silence:
-        answer = settings.dialog.yesno(settings.string(32033) %
-                                       (settings.name, total), '%s' % titles)
-
-    if answer:  # it will integrate the filename list to the local library
-        if not silence:
-            settings.pDialog.create(settings.name, "%s %s" % (messageType[typeList], message))
-        else:
-            settings.notification(settings.string(32034) % (messageType[typeList], message))
-        # Open Database
-        storage = Storage(settings.storageName, type="dict")
-        cont = 0
-        for cm, itemList in enumerate(titles):
-            info = formatTitle(itemList if typeList == 'MOVIE' else itemList + ' S00E00')
-            item = info['title'] if typeList == 'MOVIE' else info['cleanTitle']
-            if storage.database.has_key(item):
-                data = storage.database[item]
-                data = literal_eval(data) if type(data) == StringType else data
-                settings.debug('item(' + str(cm) + '): ' + str(data))
-                settings.debug('type item(' + str(cm) + '): ' + str(type(data)))
-                if typeList == 'SHOW':  # update the database to find new episodes
-                    tvShow = TvShowCode(data['ID'], data['lastEpisode'], data['lastSeason'])
-                    data['firstSeason'] = tvShow.firstSeason
-                    data['lastSeason'] = tvShow.lastSeason
-                    data['lastEpisode'] = tvShow.lastEpisode
-            else:
-                # create the item
-                data = {}
-                if len(id) > 0:
-                    data['ID'] = id[cm]
-                    if typeList == 'SHOW':
-                        tvShow = TvShowCode(id[cm])
-                        data['firstSeason'] = tvShow.firstSeason
-                        data['lastSeason'] = tvShow.lastSeason
-                        data['lastEpisode'] = tvShow.lastEpisode
-                else:
-                    if typeList == 'MOVIE':
-                        movie = Movie(item)  # name of the movie with (year) format: Frozen (2013)
-                        data['ID'] = movie.code  # search the IMDB id
-                    elif typeList == 'SHOW':
-                        tvShow = TvShow(info['cleanTitle'])  # search the name without year
-                        data['ID'] = tvShow.code
-                        if data['ID'] is not None:
-                            data['firstSeason'] = tvShow.firstSeason
-                            data['lastSeason'] = tvShow.lastSeason
-                            data['lastEpisode'] = tvShow.lastEpisode
-                data['type'] = typeList
-                data['season'] = 0
-                data['episode'] = 0
-            # start to create strm files
-            if typeList == 'MOVIE' and data['type'] == 'MOVIE' and data['episode'] == 0 and data['ID'] is not None:
-                cont += 1
-                # Try to create the directory if it doesn't exist
-                directory = path.join(folder, info['folder'])
-                try:
-                    os.makedirs(directory)
-                except:
-                    pass
-                data['path'] = directory  # To be able to erase the folder
-
-                if settings.value["detailedLog"] == 'true':
-                    settings.log('Code %s=%s' % (typeList, data['ID']))
-
-                link = 'plugin://plugin.video.pulsar/movie/%s/%s' % (data['ID'], settings.value["action"])
-
-                # start to create the strm file
-                filename = path.join(directory, item + ".strm")
-                with open(filename, "w") as text_file:  # create .strm MOVIE
-                    text_file.write(link)
-                with open(filename.replace(".strm", ".nfo"), "w") as text_file:  # create .nfo MOVIE
-                    text_file.write("http://www.imdb.com/title/%s/" % data['ID'])
-                data['episode'] = 1
-                if not silence: settings.pDialog.update(int(float(cm) / total * 100), settings.string(32036)
-                                                        % (directory, item))
-                if cont % 100 == 0: settings.notification(settings.string(32037)
-                                                          % (cont, messageType[typeList], message))
-                settings.log(settings.string(32038) % filename)
-            elif typeList == 'SHOW' and data['type'] == 'SHOW' and data['ID'] is not None:  # add shows
-                if settings.value["specials"] == 'false' and data['firstSeason'] == 0:
-                    data['firstSeason'] = 1
-                directory = folder + item + folder[-1]
-                # Try to create the directory if it doesn't exist
-                directory = path.join(folder, info['folder'])
-                try:
-                    os.makedirs(directory)
-                except:
-                    pass
-                data['path'] = directory  # To be able to erase the folder
-                if settings.value["detailedLog"] == 'true':
-                    settings.log(settings.string(32035) % (typeList, data['ID']))
-                    settings.log(
-                        '%s %s-%s: %s' % (item, data['firstSeason'], data['lastSeason'], data['lastEpisode']))
-                with open(path.join(directory, "tvshow.nfo"), "w") as text_file:  # create .nfo SHOW
-                    text_file.write("http://thetvdb.com/?tab=series&id=%s" % data['ID'])
-                for season in range(max(data['season'], data['firstSeason']), data['lastSeason'] + 1):
-                    for episode in range(data['episode'] + 1, data['lastEpisode'][season] + 1):
-                        cont += 1
-                        link = 'plugin://plugin.video.pulsar/show/%s/season/%s/episode/%s/%s' % (
-                            data['ID'], season, episode, settings.value["action"])
-                        if not silence: settings.pDialog.update(int(float(cm) / total * 100),
-                                                                "%s%s S%02dE%02d.strm" % (
-                                                                    directory, item, season, episode))
-                        if cont % 100 == 0: settings.notification(
-                            settings.string(32037) % (cont, messageType[typeList], message))
-                        filename = path.join(directory, item + " S%02dE%02d.strm" % (season, episode))
-                        with open(filename, "w") as text_file:  # create .strm
-                            text_file.write(link)
-                            settings.log(settings.string(32038) % filename)
-                        if not silence and settings.pDialog.iscanceled(): break
-                    data['episode'] = 0  # change to new season and reset the episode to 1
-                if not silence and settings.pDialog.iscanceled(): break
-                data['season'] = data['lastSeason']
-                if data['lastEpisode'].has_key(data['lastSeason']):
-                    data['episode'] = data['lastEpisode'][data['lastSeason']]
-                if not silence: settings.pDialog.update(int(float(cm) / total * 100),
-                                                        settings.string(32036) % (directory, item))
-                settings.log(settings.string(32039) % (directory, item))
-            # update database
-            if data['ID'] is not None:
-                storage.database[item] = data
-            if not silence and settings.pDialog.iscanceled(): break
-        # confirmation and close database
-        storage.save()
-        if cont > 0:
-            if not xbmc.getCondVisibility('Library.IsScanningVideo'):
-                xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
-            settings.log(settings.string(32040) % (cont, messageType[typeList], message))
-            if not silence:
-                settings.dialog.ok(settings.name, settings.string(32040) % (cont, messageType[typeList], message))
-            else:
-                settings.notification(settings.string(32040) % (cont, messageType[typeList], message))
-
-        else:
-            settings.log(settings.string(32041) % (messageType[typeList], message))
-            if not silence:
-                settings.dialog.ok(settings.name, settings.string(32042) % (messageType[typeList], message))
-            else:
-                settings.notification(settings.string(32042) % (messageType[typeList], message))
-        del storage
-
-
-def int_pelisalacarta(channel="", url=[], titles=[], typeList='', folder='', silence=False, message=''):
-    total = len(url)
-    if total > 0:
-        if not silence:
-            answer = settings.dialog.yesno(
-                '%s: %s items\nQuiere agregar estos archivos .strm?' % (settings.cleanName, total),
-                '%s' % titles, yeslabel="Ahora", nolabel="Luego")
-        else:
-            answer = True
-        if answer:
-            if not silence:
-                settings.pDialog.create(settings.cleanName, 'Verificando %s\n%s' % (typeList, message))
-            else:
-                settings.notification('Verificando %s\n%s' % (typeList, message))
-            cont = 0
-            cm = 0
-            for item, title in zip(url, titles):  # start writing the list
-                info = formatTitle(title)
-                name = info['title']
-                directory = path.join(folder, info['folder'])
-                if not os.path.exists(directory):
-                    try:
-                        os.makedirs(directory)
-                    except:
-                        pass
-                link = "plugin://plugin.video.pelisalacarta/?channel=%s&action=play_from_library&url=%s" % (
-                    channel, quote_plus(item))
-                cm += 1
-                fullFileName = path.join(directory, "%s.strm" % name)
-                if not os.path.isfile(fullFileName) or settings.value["overwrite"] == 'true':
-                    cont += 1
-                    if len(name) > 100: name = name[:99]
-                    with open(fullFileName, "w") as text_file:  # create .strm
-                        text_file.write(link)
-                    if not silence:
-                        settings.pDialog.update(int(float(cm) / total * 100), 'Creando %s...' % fullFileName)
-                    if not silence and settings.pDialog.iscanceled():
-                        break
-                    if cont % 100 == 0:
-                        settings.notification('%s %s encontrados - Trabajando...\n%s' % (cont, typeList, message))
-                    settings.log('%s Agregados' % fullFileName)
-                if not silence and settings.pDialog.iscanceled(): break
-            if not silence:
-                settings.pDialog.close()
-            if cont > 0:
-                if not xbmc.getCondVisibility('Library.IsScanningVideo'):
-                    xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
-                settings.log('%s %s agregados./n%s' % (cont, typeList, message))
-                if not silence:
-                    settings.dialog.ok(settings.cleanName, '%s %s agregados.\n%s' % (cont, typeList, message))
-                else:
-                    settings.notification('%s %s agregados.\n%s' % (cont, typeList, message))
-            else:
-                settings.log('Nada nuevo %s\n%s' % (typeList, message))
-                if not silence:
-                    settings.dialog.ok('Nada nuevo %s\n%s' % (typeList, message))
-                else:
-                    settings.notification('Nada nuevo %s\n%s' % (typeList, message))
+# coding: utf-8
+# library to access URL, translation title and filtering
+# using the great jobs of ElDorado for scrobbling
+__author__ = 'mancuniancol'
+
+import os
+import bs4
+import requests
+import re
+import xbmcaddon
+import xbmc
+import xbmcgui
+from os import path
+from urllib import quote_plus
+from time import sleep
+from ast import literal_eval
+import random
+
+
+################################
+#### SCRAPER TITLES ############
+################################
+def normalize(name, onlyDecode=False):
+    from unicodedata import normalize
+    import types
+    if type(name) == types.StringType:
+        unicode_name = name.decode('unicode-escape')
+    else:
+        try:
+            unicode_name = name.encode('latin-1').decode('utf-8')  # to latin-1
+        except:
+            unicode_name = name
+    normalize_name = unicode_name if onlyDecode else normalize('NFKD', unicode_name)
+    return normalize_name.encode('ascii', 'ignore')
+
+
+def uncodeName(name):  # Convert all the &# codes to char, remove extra-space and normalize
+    from HTMLParser import HTMLParser
+    name = name.replace('<![CDATA[', '').replace(']]', '')
+    name = HTMLParser().unescape(name)
+    return name
+
+
+def unquoteName(name):  # Convert all %symbols to char
+    from urllib import unquote
+    return unquote(name).decode("utf-8")
+
+
+def safeName(value):  # Make the name directory and filename safe
+    value = normalize(value)  # First normalization
+    value = unquoteName(value)
+    value = uncodeName(value)
+    value = normalize(value)  # Last normalization, because some unicode char could appear from the previous steps
+    value = value.lower().title().replace('_', ' ')
+    # erase keyword
+    value = re.sub('^\[.*?\]', '', value)  # erase [HorribleSub] for ex.
+    # check for anime
+    value = re.sub('- ([0-9][0-9][0-9][0-9]) ', ' \g<1>', value + " ")
+    value = re.sub('- ([0-9]+) ', '- EP\g<1>', value + " ")
+    value = value.lower().replace(" episode ", " - EP")
+    # check for qualities
+    value = value.replace("1920x1080", "1080p")
+    value = value.replace("1280x720", "720p")
+    value = value.replace("853x480", "480p")
+    value = value.replace("848x480", "480p")
+    value = value.replace("704x480", "480p")
+    value = value.replace("640x480", "480p")
+    value = value.replace("microhd", " microhd")  # sometimes comes with the year
+    value = value.replace("dvdrip", " dvdrip")  # sometimes comes with the year
+    keys = {'"': ' ', '*': ' ', '/': ' ', ':': ' ', '<': ' ', '>': ' ', '?': ' ', '|': ' ',
+            "'": '', 'Of': 'of', 'De': 'de', '.': ' ', ')': ' ', '(': ' ', '[': ' ', ']': ' ', '-': ' '}
+    for key in keys.keys():
+        value = value.replace(key, keys[key])
+    value = ' '.join(value.split())
+    return value.replace('S H I E L D', 'SHIELD').replace('C S I', 'CSI')
+
+
+def checkQuality(text=""):
+    # quality
+    keyWords = {"Cam": ["camrip", "cam"],
+                "Telesync": ["ts", "telesync", "pdvd"],
+                "Workprint": ["wp", "workprint"],
+                "Telecine": ["tc", "telecine"],
+                "Pay-Per-View Rip": ["ppv", "ppvrip"],
+                "Screener": ["scr", "screener", "screeener", "dvdscr", "dvdscreener", "bdscr"],
+                "DDC": ["ddc"],
+                "R5": ["r5", "r5.line", "r5 ac3 5 1 hq"],
+                "DVD-Rip": ["dvdrip", "dvd-rip"],
+                "DVD-R": ["dvdr", "dvd-full", "full-rip", "iso rip", "lossless rip", "untouched rip", "dvd-5 dvd-9"],
+                "HDTV": ["dsr", "dsrip", "dthrip", "dvbrip", "hdtv", "pdtv", "tvrip", "hdtvrip", "hdrip"],
+                "VODRip": ["vodrip", "vodr"],
+                "WEB-DL": ["webdl", "web dl", "web-dl"],
+                "WEBRip": ["web-rip", "webrip", "web rip"],
+                "WEBCap": ["web-cap", "webcap", "web cap"],
+                "BD/BRRip": ["bdrip", "brrip", "blu-ray", "bluray", "bdr", "bd5", "bd"],
+                "MicroHD": ["microhd"],
+                "FullHD": ["fullhd"],
+                }
+    color = {"Cam": "FFF4AE00",
+             "Telesync": "FFF4AE00",
+             "Workprint": "FFF4AE00",
+             "Telecine": "FFF4AE00",
+             "Pay-Per-View Rip": "FFD35400",
+             "Screener": "FFD35400",
+             "DDC": "FFD35400",
+             "R5": "FFD35400",
+             "DVD-Rip": "FFD35400",
+             "DVD-R": "FFD35400",
+             "HDTV": "FFD35400",
+             "VODRip": "FFD35400",
+             "WEB-DL": "FFD35400",
+             "WEBRip": "FFD35400",
+             "WEBCap": "FFD35400",
+             "BD/BRRip": "FFD35400",
+             "MicroHD": "FFD35400",
+             "FullHD": "FFD35400",
+             }
+    quality = "480p"
+    textQuality = ""
+    for key in keyWords:
+        for keyWord in keyWords[key]:
+            if ' ' + keyWord + ' ' in ' ' + text + ' ':
+                print keyWord
+                quality = "480p"
+                textQuality += " [COLOR %s][%s][/COLOR]" % (color[key], key)
+
+    if "480p" in text:
+        quality = "480p"
+        textQuality += " [COLOR FF2980B9][480p][/COLOR]"
+    if "720p" in text:
+        quality = "720p"
+        textQuality += " [COLOR FF5CD102][720p][/COLOR]"
+    if "1080p" in text:
+        quality = "1080p"
+        textQuality += " [COLOR FFF4AE00][1080p][/COLOR]"
+    if "3d" in text:
+        quality = "1080p"
+        textQuality += " [COLOR FFD61515][3D][/COLOR]"
+    if "4k" in text:
+        quality = "2160p"
+        textQuality += " [COLOR FF16A085][4K][/COLOR]"
+    return quality, textQuality
+
+
+def width(quality="480p"):
+    result = 720
+    if '480p' in quality:
+        result = 720
+    elif '720p' in quality:
+        result = 1280
+    elif '1080p' in quality:
+        result = 1920
+    elif '2160p' in quality:
+        result = 2160
+    return result
+
+
+def height(quality="480p"):
+    result = 480
+    if '480p' in quality:
+        result = 480
+    elif '720p' in quality:
+        result = 720
+    elif '1080p' in quality:
+        result = 1080
+    elif '2160p' in quality:
+        result = 3840
+    return result
+
+
+def findLanguage(value=""):
+    language = ""  # It is english or unknown
+    if "spa" in value or "spanish" in value or "espanol" in value:
+        language = " Español "
+    if "hindi" in value:
+        language = "Hindi"
+    if "castellano" in value:
+        language = "Castellano"
+    return language
+
+
+def exceptionsTitle(title=""):
+    value = title + " "
+    if "csi " in value:
+        title = title.replace("csi", "CSI Crime Scene Investigation")
+    return title
+
+
+def _cleanTitle(value=''):
+    keywordsCleanTitle = ['version', 'extendida', 'extended', 'edition', 'hd', 'unrated', 'version',
+                          'special', 'edtion', 'uncensored', 'fixed', 'censurada', 'episode', 'ova', 'complete'
+                          ]
+    for keyword in keywordsCleanTitle:  # checking keywords
+        value = (value + ' ').replace(' ' + keyword.title() + ' ', ' ')
+    return value.strip()
+
+
+def formatTitle(value='', fileName='', typeVideo="MOVIE"):
+    if fileName == '':
+        fileName = value
+    pos = value.rfind("/")
+    value = value if pos < 0 else value[pos:]
+    value = safeName(value).lower() + ' '
+    fileName = safeName(fileName).lower() + ' '
+    quality, textQuality = checkQuality(fileName)  # find quality
+    language = findLanguage(value)  # find language
+    formats = [' ep[0-9]+', ' s[0-9]+e[0-9]+', ' s[0-9]+ e[0-9]+', ' [0-9]+x[0-9]+',
+               ' [0-9][0-9][0-9][0-9] [0-9][0-9] [0-9][0-9]',
+               ' [0-9][0-9] [0-9][0-9] [0-9][0-9]', ' season [0-9]+', ' season[0-9]+', ' s[0-9][0-9]',
+               ' temporada [0-9]+ capitulo [0-9]+', ' temporada[0-9]+', ' temporada [0-9]+',
+               ' seizoen [0-9]+ afl [0-9]+',
+               ' temp [0-9]+ cap [0-9]+', ' temp[0-9]+ cap[0-9]+',
+               ]
+    keywords = ['en 1080p', 'en 720p', 'en dvd', 'en dvdrip', 'en hdtv', 'en bluray', 'en blurayrip',
+                'en web', 'en rip', 'en ts screener', 'en screener', 'en cam', 'en camrip', 'pcdvd', 'bdremux',
+                'en ts-screener', 'en hdrip', 'en microhd', '1080p', '720p', 'dvd', 'dvdrip', 'hdtv', 'bluray',
+                'blurayrip', 'web', 'rip', 'ts screener', 'screener', 'cam', 'camrip', 'ts-screener', 'hdrip',
+                'brrip', 'blu', 'webrip', 'hdrip', 'bdrip', 'microhd', 'ita', 'eng', 'esp', "spanish espanol",
+                'castellano', '480p', 'bd', 'bdrip', 'hi10p', 'sub', 'x264', 'sbs', '3d', 'br', 'hdts', 'dts',
+                'dual audio', 'hevc', 'aac', 'batch', 'h264', 'gratis', 'descargar', 'hd', 'html'
+                ]
+    sshow = None
+    for format in formats:  # search if it is a show
+        sshow = re.search(format, value)  # format shows
+        if sshow is not None:
+            break
+    if sshow is None and typeVideo != "MOVIE":
+        if typeVideo == 'SHOW':
+            value += ' s00e00'
+        if typeVideo == 'ANIME':
+            value += ' ep00'
+        for format in formats:  # search if it is a show
+            sshow = re.search(format, value)  # format shows
+            if sshow is not None:
+                break
+    if sshow is None:
+        # it is a movie
+        value += ' 0000 '  # checking year
+        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
+        year = syear.group(0).strip()
+        pos = value.find(year)
+        if pos > 0:
+            title = value[:pos].strip()
+            rest = value[pos + 5:].strip().replace('0000', '')
+        else:
+            title = value.replace('0000', '')
+            rest = ''
+
+        while pos != -1:  # loop until doesn't have any keyword in the title
+            value = title + ' '
+            for keyword in keywords:  # checking keywords
+                pos = value.find(' ' + keyword + ' ')
+                if pos > 0:
+                    title = value[:pos]
+                    rest = value[pos:].strip() + ' ' + rest
+                    break
+
+        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
+        cleanTitle = _cleanTitle(title)
+        # finishing cleanTitle
+        if '0000' not in year:
+            title += ' (' + year.strip() + ')'
+        year = year.replace('0000', '')
+        folder = title
+        result = {'title': title, 'folder': folder, 'rest': rest.strip(), 'type': 'MOVIE', 'cleanTitle': cleanTitle,
+                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
+                  "width": width(quality), 'language': language
+                  }
+        return result
+    else:
+        # it is a show
+        rest = value.strip()  # original name
+        seasonEpisode = sshow.group(0)
+        # clean title
+        for keyword in keywords:  # checking keywords
+            value = value.replace(' ' + keyword + ' ', ' ')
+        title = value[:value.find(seasonEpisode)].strip()
+        title = title.strip()
+        seasonEpisode = seasonEpisode.replace('temporada ', 's').replace(' capitulo ', 'e')
+        seasonEpisode = seasonEpisode.replace('temp ', 's').replace(' cap ', 'e')
+        seasonEpisode = seasonEpisode.replace('seizoen ', 's').replace(' afl ', 'e')
+
+        if 'x' in seasonEpisode:
+            seasonEpisode = 's' + seasonEpisode.replace('x', 'e')
+
+        if 's' in seasonEpisode and 'e' in seasonEpisode and 'season' not in seasonEpisode:  # force S00E00 instead S0E0
+            temp_episode = seasonEpisode.replace('s', '').split('e')
+            seasonEpisode = 's%02de%02d' % (int(temp_episode[0]), int(temp_episode[1]))
+
+        if 's' not in seasonEpisode and 'e' not in seasonEpisode:  # date format
+            date = seasonEpisode.split()
+            if len(date[0]) == 4:  # yyyy-mm-dd format
+                seasonEpisode = seasonEpisode.replace(' ', '-')  # date style episode talk shows
+            else:  # dd mm yy format
+                if int(date[2]) > 50:
+                    date[2] = '19' + date[2]
+                else:
+                    date[2] = '20' + date[2]
+                seasonEpisode = date[2] + '-' + date[1] + '-' + date[0]
+
+        seasonEpisode = seasonEpisode.replace(' ', '')  # remove spaces in the episode format
+        title = exceptionsTitle(title)
+        # finding year
+        value = title + ' 0000 '
+        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
+        year = syear.group(0).strip()
+        pos = value.find(year)
+        if pos > 0:
+            title = value[:pos].strip()
+        title = value.replace('0000', '')
+        year = year.replace('0000', '')
+        # the rest
+        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
+        folder = title  # with year
+        cleanTitle = _cleanTitle(title.replace(year, '').strip())  # without year
+        title = folder + ' ' + seasonEpisode.upper()
+        title = title.replace('S00E00', '').replace('EP00', '')
+        ttype = "SHOW"
+        result = {'title': title, 'folder': folder, 'rest': rest, 'type': ttype, 'cleanTitle': cleanTitle,
+                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
+                  "width": width(quality), "language": language,
+                  }
+        if bool(re.search("EP[0-9]+", title)):
+            ttype = "ANIME"
+            result['season'] = 1
+            result['episode'] = int(seasonEpisode.replace('ep', ''))
+        else:
+            temp = (seasonEpisode.replace('s', '')).split('e')
+            result['season'] = int(temp[0])
+            result['episode'] = int(temp[1])
+        return result
+
+
+################################
+#### CLASS #####################
+################################
+class Storage():
+    def __init__(self, fileName="", type="list", eval=False):
+        from ast import literal_eval
+        self.path = os.path.join(xbmc.translatePath('special://temp'), fileName)
+        self.type = type
+        if type == "list":
+            # get the list
+            self.database = []
+            try:
+                with open(self.path, 'r') as fp:
+                    for line in fp:
+                        self.database.append(line.strip())
+            except:
+                pass
+        elif type == "dict":
+            # get the Dictionary
+            self.database = {}
+            try:
+                with open(self.path, 'r') as fp:
+                    for line in fp:
+                        listedline = line.strip().split('::')  # split around the :: sign
+                        if len(listedline) > 1:  # we have the : sign in there
+                            settings.debug(listedline[0] + ' : ' + listedline[1])
+                            self.database[listedline[0]] = listedline[1] if not eval else literal_eval(listedline[1])
+            except:
+                pass
+
+    def destroy(self):  # Erase the database from the HD
+        try:
+            os.remove(self.path)
+        except OSError:
+            pass
+
+    def add(self, key="", info=""):  # add element
+        if self.type == "list" and key not in self.database:
+            self.database.append(key)
+        elif self.type == "dict":
+            keySafe = formatTitle(key)
+            self.database[keySafe['folder']] = info
+
+    def remove(self, key=""):  # remove element
+        if self.type == "list":
+            self.database.remove(key)
+        elif self.type == "dict":
+            keySafe = formatTitle(key)
+            del self.database[keySafe['folder']]
+
+    def save(self):  # save the database
+        if self.type == "list":
+            # save the list
+            with open(self.path, 'w') as fp:
+                for p in self.database:
+                    fp.write("%s\n" % p)
+        elif self.type == "dict":
+            # save the dictionary
+            with open(self.path, 'w') as fp:
+                for p in self.database.items():
+                    fp.write("%s::%s\n" % p)
+
+
+class Settings:  # Read Configuration's Addon
+    def __init__(self, anime=False):
+        # Objects
+        self.dialog = xbmcgui.Dialog()
+        self.pDialog = xbmcgui.DialogProgress()
+        self.settings = xbmcaddon.Addon()
+
+        # General information
+        self.idAddon = self.settings.getAddonInfo('ID')  # gets name
+        self.icon = self.settings.getAddonInfo('icon')
+        self.fanart = self.settings.getAddonInfo('fanart')
+        self.path = self.settings.getAddonInfo('path')
+        self.name = self.settings.getAddonInfo('name')  # gets name
+        self.cleanName = re.sub('.COLOR (.*?)]', '', self.name.replace('[/COLOR]', ''))
+        self.storageName = self.cleanName + ".txt"  # Name Database
+
+        # Everything else
+        self.value = {}  # it contains all the settings from xml file
+        self.value["movieFolder"] = ""
+        self.value["showFolder"] = ""
+        self.value["animeFolder"] = ""
+
+        with open(path.join(self.path, "resources", "settings.xml"), 'r') as fp:
+            data = fp.read()
+        soup = bs4.BeautifulSoup(data)
+        settings = soup.select("setting")
+        for setting in settings:
+            id = setting.attrs.get("id")
+            if id is not None:
+                self.value[id] = self.settings.getSetting(id)
+
+        # Set-up Output folder
+        self.movieFolder = self.__folder__(self.value["movieFolder"], "movies")
+        self.showFolder = self.__folder__(self.value["showFolder"], "shows")
+        self.animeFolder = self.__folder__(self.value["animeFolder"], "animes")
+
+        # subscription
+        if "subscription" in self.cleanName.lower(): self.__subscription__()
+
+    def __folder__(self, folder, default=""):  # Change to OS friendly names
+        if folder == '':  # define default folder
+            folder = 'special://temp/%s/' % default
+        folder = folder.replace('special://temp/', xbmc.translatePath('special://temp'))
+        return folder.replace('smb:', '')  # network compatibility
+
+    def __subscription__(self):  # Additional Code for Subscription List Scripts
+        # remove .strm
+        self.debug("removeStrm= " + self.value["removeStrm"])
+        if self.value["removeStrm"] == 'true':
+            self.notification('Removing .strm files...')
+            if self.value["typeLibrary"] == "Global":
+                self.storageName = "pulsar global subscription.txt"
+            storage = Storage(self.storageName, type="dict")
+            from shutil import rmtree
+            for item in storage.database:
+                data = literal_eval(storage.database[item])
+                rmtree(data['path'])
+                settings.log('path: ' + data['path'] + ' removed!!')
+            self.log('All .strm files removed!')
+            self.notification('All .strm files removed!', force=True)
+            self.settings.setSetting('removeStrm', 'false')
+        # clear the database
+        self.debug("clearDatabase= " + self.value["clearDatabase"])
+        if self.value["clearDatabase"] == 'true':
+            self.notification('Erasing Database...', force=True)
+            storage = Storage(self.storageName, type="dict")
+            storage.destroy()
+            self.settings.setSetting('clearDatabase', 'false')
+
+    def log(self, message="", level=xbmc.LOGNOTICE):  # to write in the Kodi's log
+        try:
+            if message is not str:
+                message = str(message)
+            try:
+                xbmc.log('[' + self.cleanName + '] ' + message, level=level)
+            except:
+                xbmc.log('[' + self.cleanName + '] ' + safeName(message), level=level)
+        except:
+            xbmc.log("Error with the message", level=xbmc.LOGERROR)
+
+    def debug(self, message=""):  # to write in the Kodi's log
+        self.log(message, xbmc.LOGDEBUG)
+
+    def notification(self, message="", force=False, time=1000):  # to display a message in Kodi
+        if float(self.value["timeNotification"]) > 0 or force:
+            xbmcgui.Dialog().notification(self.name, "%s" % message, self.icon,
+                                          time if force else int(float(self.value["timeNotification"]) * 1000))
+
+    def string(self, id):
+        return self.settings.getLocalizedString(id)
+
+
+# Create settings object and browser to be used in the other tool's functions
+settings = Settings()
+browser = requests.Session()
+browser.headers[
+    'User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
+browser.headers['Accept-Language']='en'
+
+class TextViewer_Dialog(xbmcgui.WindowXMLDialog):  # taking from script.toolbox
+    ACTION_PREVIOUS_MENU = [9, 92, 10]
+
+    def __init__(self, *args, **kwargs):
+        xbmcgui.WindowXMLDialog.__init__(self)
+
+        self.text = kwargs.get('text')
+        self.header = kwargs.get('header')
+
+    def onInit(self):
+        self.getControl(1).setLabel(self.header)
+        self.getControl(5).setText(self.text)
+
+    def onAction(self, action):
+        if action in self.ACTION_PREVIOUS_MENU:
+            self.close()
+
+    def onClick(self, controlID):
+        pass
+
+    def onFocus(self, controlID):
+        pass
+
+
+class Filtering:
+    def __init__(self):
+        self.reason = ''
+        self.title = ''
+        self.quality_allow = ['*']
+        self.quality_deny = []
+        self.title = ''
+        self.maxSize = 10.00  # 10 it is not limit
+        self.minSize = 0.00
+
+        # size
+        if settings.value.has_key('movieMinSize'):  # there is size restrictions
+            settings.value['movieMinSize'] = float(settings.value['movieMinSize'])
+        else:
+            settings.value['movieMinSize'] = 0.0
+        self.movieMinSize = settings.value['movieMinSize']
+
+        if settings.value.has_key('movieMaxSize'):  # there is size restrictions
+            settings.value['movieMaxSize'] = float(settings.value['movieMaxSize'])
+        else:
+            settings.value['movieMaxSize'] = 10.0
+        self.movieMaxSize = settings.value['movieMaxSize']
+
+        if settings.value.has_key('tvMinSize'):  # there is size restrictions
+            settings.value['tvMinSize'] = float(settings.value['movieMinSize'])
+        else:
+            settings.value['tvMinSize'] = 0.0
+        self.tvMinSize = settings.value['tvMinSize']
+
+        if settings.value.has_key('tvMaxSize'):  # there is size restrictions
+            settings.value['tvMaxSize'] = float(settings.value['movieMaxSize'])
+        else:
+            settings.value['tvMaxSize'] = 10.0
+        self.tvMaxSize = settings.value['tvMaxSize']
+
+        # movie
+        movieAllow = []
+        if settings.value.has_key('movieKeyAllow') and settings.value['movieKeyAllow'] <> "":
+            movieAllow = re.split(',', settings.value['movieKeyAllow'].replace(', ', ',').replace(' ,', ','))
+        if settings.value.has_key('movieQua1') and settings.value['movieQua1'] == 'Accept File':
+            movieAllow.append('480p')  # 480p
+        if settings.value.has_key('movieQua2') and settings.value['movieQua2'] == 'Accept File':
+            movieAllow.append('HDTV')  # HDTV
+        if settings.value.has_key('movieQua3') and settings.value['movieQua3'] == 'Accept File':
+            movieAllow.append('720p')  # 720p
+        if settings.value.has_key('movieQua4') and settings.value['movieQua4'] == 'Accept File':
+            movieAllow.append('1080p')  # 1080p
+        if settings.value.has_key('movieQua5') and settings.value['movieQua5'] == 'Accept File':
+            movieAllow.append('3D')  # 3D
+        if settings.value.has_key('movieQua6') and settings.value['movieQua6'] == 'Accept File':
+            movieAllow.append('CAM')  # CAM
+        if settings.value.has_key('movieQua7') and settings.value['movieQua7'] == 'Accept File':
+            movieAllow.extend(['TeleSync', ' TS '])  # TeleSync
+        if settings.value.has_key('movieQua8') and settings.value['movieQua8'] == 'Accept File':
+            movieAllow.append('Trailer')  # Trailer
+
+        # Block File
+        movieDeny = []
+        if settings.value.has_key('movieKeyDenied') and settings.value['movieKeyDenied'] <> "":
+            movieDeny = re.split(',', settings.value['movieKeyDenied'].replace(', ', ',').replace(' ,', ','))
+        if settings.value.has_key('movieQua1') and settings.value['movieQua1'] == 'Block File':
+            movieDeny.append('480p')  # 480p
+        if settings.value.has_key('movieQua2') and settings.value['movieQua2'] == 'Block File':
+            movieDeny.append('HDTV')  # HDTV
+        if settings.value.has_key('movieQua3') and settings.value['movieQua3'] == 'Block File':
+            movieDeny.append('720p')  # 720p
+        if settings.value.has_key('movieQua4') and settings.value['movieQua4'] == 'Block File':
+            movieDeny.append('1080p')  # 1080p
+        if settings.value.has_key('movieQua5') and settings.value['movieQua5'] == 'Block File':
+            movieDeny.append('3D')  # 3D
+        if settings.value.has_key('movieQua6') and settings.value['movieQua6'] == 'Block File':
+            movieDeny.append('CAM')  # CAM
+        if settings.value.has_key('movieQua7') and settings.value['movieQua7'] == 'Block File':
+            movieDeny.extend(['TeleSync', ' TS '])  # TeleSync
+        if settings.value.has_key('movieQua8') and settings.value['movieQua8'] == 'Block File':
+            movieDeny.append('Trailer')  # Trailer
+
+        if '' in movieAllow: movieAllow.remove('')
+        if '' in movieDeny: movieDeny.remove('')
+        if len(movieAllow) == 0: movieAllow = ['*']
+        self.movieAllow = movieAllow
+        self.movieDeny = movieDeny
+
+        # TV
+        tvAllow = []
+        if settings.value.has_key('tvKeyAllow'):
+            tvAllow.append(re.split(',', settings.value['tvKeyAllow'].replace(', ', ',').replace(' ,', ',')))
+        if settings.value.has_key('tvQua1') and settings.value['tvQua1'] == 'Accept File':
+            tvAllow.append('480p')  # 480p
+        if settings.value.has_key('tvQua2') and settings.value['tvQua2'] == 'Accept File':
+            tvAllow.append('HDTV')  # HDTV
+        if settings.value.has_key('tvQua3') and settings.value['tvQua3'] == 'Accept File':
+            tvAllow.append('720p')  # 720p
+        if settings.value.has_key('tvQua4') and settings.value['tvQua4'] == 'Accept File':
+            tvAllow.append('1080p')  # 1080p
+
+        # Block File
+        tvDeny = []
+        if settings.value.has_key('tvKeyDeny'):
+            tvDeny.append(re.split(',', settings.value['tvKeyDeny'].replace(', ', ',').replace(' ,', ',')))
+        if settings.value.has_key('tvQua1') and settings.value['tvQua1'] == 'Block File':
+            tvDeny.append('480p')  # 480p
+        if settings.value.has_key('tvQua2') and settings.value['tvQua2'] == 'Block File':
+            tvDeny.append('HDTV')  # HDTV
+        if settings.value.has_key('tvQua3') and settings.value['tvQua3'] == 'Block File':
+            tvDeny.append('720p')  # 720p
+        if settings.value.has_key('tvQua4') and settings.value['tvQua4'] == 'Block File':
+            tvDeny.append('1080p')  # 1080p
+
+        if '' in tvAllow: tvAllow.remove('')
+        if '' in tvDeny: tvDeny.remove('')
+        if len(tvAllow) == 0: tvAllow = ['*']
+        self.tvAllow = tvAllow
+        self.tvDeny = tvDeny
+
+    def useMovie(self):
+        self.qualityAllow = self.movieAllow
+        self.qualityDeny = self.movieDeny
+        self.minSize = self.movieMinSize
+        self.maxSize = self.movieMaxSize
+
+    def useTv(self):
+        self.qualityAllow = self.tvAllow
+        self.qualityDeny = self.tvDeny
+        self.minSize = self.tvMinSize
+        self.maxSize = self.tvMaxSize
+
+    def information(self):
+        settings.log('Accepted Keywords: %s' % str(self.qualityAllow))
+        settings.log('Blocked Keywords: %s' % str(self.qualityDeny))
+        settings.log('min Size: %s' % str(self.minSize) + ' GB')
+        settings.log('max Size: %s' % str(self.maxSize) + ' GB') if self.maxSize != 10 else 'MAX'
+
+    # validate keywords
+    def included(self, value, keys, strict=False):
+        value = ' ' + normalize(value) + ' '
+        res = False
+        if '*' in keys:
+            res = True
+        else:
+            res1 = []
+            for key in keys:
+                res2 = []
+                for item in re.split('\s', key):
+                    item = normalize(item)
+                    item = item.replace('?', ' ')
+                    if strict: item = ' ' + item + ' '  # it makes that strict the comparation
+                    if item.upper() in value.upper():
+                        res2.append(True)
+                    else:
+                        res2.append(False)
+                res1.append(all(res2))
+            res = any(res1)
+        return res
+
+    # validate size
+    def size_clearance(self, size):
+        max_size1 = 100 if self.maxSize == 10 else self.maxSize
+        res = False
+        value = float(re.split('\s', size.replace(',', ''))[0])
+        value *= 0.001 if 'M' in size else 1
+        if self.minSize <= value <= max_size1:
+            res = True
+        return res
+
+    # verify
+    def verify(self, name, size):  # modify to just check quality and size, not name
+        self.reason = name.replace(' - ' + settings.cleanName, '') + ' ***Blocked File by'
+        result = True
+        if name != None:
+            if not self.included(name, self.qualityAllow) or self.included(name, self.qualityDeny):
+                self.reason += ", Keyword"
+                result = False
+        if size != None:
+            if not self.size_clearance(size):
+                result = False
+                self.reason += ", Size"
+        self.reason = self.reason.replace('by,', 'by') + '***'
+        return result
+
+
+#######################################
+######## CLASS FOR SUBSCRIPTION #######
+#######################################
+class TvShow():
+    def __init__(self, name):
+        import urllib
+
+        browser.get('http://localhost:65251/shows/search?q=%s' % urllib.quote(name))
+        sleep(0.2)
+        response = browser.get('http://localhost:65251/shows/search?q=%s' % urllib.quote(name))
+        if response.status_code == requests.codes.ok:
+            data = response.json()
+            dataShow = None
+            if len(data['items']) > 0:  # To find the right Tv Show
+                dataShow = data['items'][0]
+                for item in data['items']:
+                    if item['label'].lower() == name.lower():
+                        dataShow = item
+                        break
+            if dataShow is not None:
+                self.code = dataShow['path'].replace('plugin://plugin.video.pulsar/show/', '').replace(
+                    '/seasons', '')
+                sleep(0.2)
+                response = browser.get('http://localhost:65251/show/%s/seasons' % self.code)
+                data = {}
+                try:
+                    data = response.json()
+                except:
+                    data['items'] = []
+                seasons = []
+                for item in data['items']:
+                    seasons.append(int(item['label'].replace('Season ', '').replace('Specials', '0')))
+                seasons.sort()
+                episodes = {}
+                for season in seasons:
+                    sleep(0.2)
+                    response = browser.get('http://localhost:65251/show/%s/season/%s/episodes' % (self.code, season))
+                    data = response.json()
+                    episodes[season] = len(data['items'])
+                if len(seasons) > 0:
+                    self.firstSeason = seasons[0]
+                    self.lastSeason = seasons[-1]
+                else:
+                    self.firstSeason = 0
+                    self.lastSeason = 0
+                self.lastEpisode = episodes
+            else:
+                self.code = None
+        else:
+            self.code = None
+
+
+class TvShowCode():
+    def __init__(self, code, episodes={}, lastSeason=0):
+        self.code = code
+        response = browser.get('http://localhost:65251/show/%s/seasons' % self.code)
+        data = {}
+        try:
+            data = response.json()
+        except:
+            data['items'] = []
+        seasons = []
+        for item in data['items']:
+            seasons.append(int(item['label'].replace('Season ', '').replace('Specials', '0')))
+        seasons.sort()
+        if episodes.has_key(0):
+            del episodes[0]
+        if lastSeason is not 0:
+            del episodes[lastSeason]
+        for season in seasons:
+            if not episodes.has_key(season):
+                sleep(0.2)
+                response = browser.get('http://localhost:65251/show/%s/season/%s/episodes' % (self.code, season))
+                data = response.json()
+                episodes[season] = len(data['items'])
+        if len(seasons) > 0:
+            self.firstSeason = seasons[0]
+            self.lastSeason = seasons[-1]
+        else:
+            self.firstSeason = 0
+            self.lastSeason = 0
+        self.lastEpisode = episodes
+
+
+class Movie():
+    def __init__(self, name):
+        import urllib
+
+        if ')' in name and '(' in name:
+            try:
+                yearMovie = int(name[name.find("(") + 1:name.find(")")])
+                name = name.replace('(%s)' % yearMovie, '').rstrip()
+            except:
+                yearMovie = None
+        else:
+            yearMovie = None
+        browser.get('http://localhost:65251/movies/search?q=%s' % urllib.quote(name))  # avoid not info
+        sleep(1.0)
+        response = browser.get('http://localhost:65251/movies/search?q=%s' % urllib.quote(name))
+        if response.status_code == requests.codes.ok:
+            data = response.json()
+            if len(data['items']) > 0:
+                if yearMovie is not None:
+                    for movie in data['items']:
+                        label = movie['label']
+                        path = movie['path']
+                        if movie['info'].has_key('year'):
+                            year = movie['info']['year']
+                        else:
+                            year = 0000
+                        if year == yearMovie:
+                            break
+                else:
+                    label = data['items'][0]['label']
+                    path = data['items'][0]['path']
+                    year = data['items'][0]['info']['year']
+                self.code = path.replace('plugin://plugin.video.pulsar/movie/', '').replace('/play', '')
+                self.label = label
+                self.year = year
+            else:
+                self.code = None
+                self.label = name
+        else:
+            self.code = None
+            self.label = name
+
+
+class Magnet():
+    def __init__(self, magnet):
+        self.magnet = magnet + '&'
+        # hash
+        hash = re.search('urn:btih:(.*?)&', self.magnet)
+        result = ''
+        if hash is not None:
+            result = hash.group(1)
+        self.hash = result
+        # name
+        name = re.search('dn=(.*?)&', self.magnet)
+        result = ''
+        if name is not None:
+            result = name.group(1).replace('+', ' ')
+        self.name = safeName(result)
+        # trackers
+        self.trackers = re.findall('tr=(.*?)&', self.magnet)
+
+
+################################
+#### FUNCTIONS #################
+################################
+def printer(message=""):
+    print '****************************'
+    print message
+    print '*-**************************'
+
+
+def find_nth(string="", substring="", nth=1, start=0):
+    start = string.find(substring, start)
+    if nth == 1 or start == -1:
+        return start
+    else:
+        return find_nth(string, substring, nth - 1, start + len(substring))
+
+
+def textViewer(text="", once=False):
+    if not once or (once and settings.settings.getSetting("firstOpen") != "NO"):
+        settings.settings.setSetting("firstOpen", "NO")
+        w = TextViewer_Dialog('DialogTextViewer.xml', settings.path, header=settings.name, text=text)
+        w.doModal()
+
+
+def getMagnet(text=""):
+    pos = text.rfind('/')
+    magnet = text[pos + 1:]
+    return unquoteName(magnet)
+
+
+def goodSpider():
+    from time import sleep
+    import random
+    sleep(random.randrange(100, 1000, 1) / 1000)
+
+
+def dirImages(value):
+    imageFile = os.path.join(settings.path, 'resources', 'images', value)
+    if not os.path.isfile(imageFile):
+        imageFile = settings.icon
+    return imageFile
+
+
+def removeDirectory(folder):
+    from os import listdir
+    from xbmc import translatePath
+
+    folder = folder.replace('special://temp/', translatePath('special://temp'))
+    folder = folder.replace('smb:', '')  # network compatibility
+    listFolders = listdir(folder)
+    rep = settings.dialog.select('Select the Folder to erase:', listFolders + ['-CANCEL'])
+    if rep < len(listFolders):
+        if settings.dialog.yesno("Attention!", "Are you sure to erase?", nolabel="No", yeslabel="Yes"):
+            __removeDirectory__(folder=folder, title=listFolders[rep])
+
+
+def __removeDirectory__(folder="", title=""):
+    info = formatTitle(title)
+    directory = os.path.join(folder, info['folder'])
+    if os.path.exists(directory):
+        import shutil
+        shutil.rmtree(directory, ignore_errors=True)
+    if not xbmc.getCondVisibility('Library.IsScanningVideo'):
+        xbmc.executebuiltin('XBMC.CleanLibrary(video)')  # clean the library
+
+
+def getPlayableLink(page):
+    exceptionsList = Storage(settings.storageName.replace(".txt", "-exceptions.txt"))
+    result = page
+    settings.debug(result)
+    if 'divxatope' in page:
+        page = page.replace('/descargar/', '/torrent/')
+        result = page
+    isLink = True
+    settings.debug(exceptionsList.database)
+    for exception in exceptionsList.database:
+        if exception in page:
+            isLink = False
+            break
+    if page.startswith("http") and isLink:
+        # exceptions
+        settings.debug(result)
+        # download page
+        # try:
+        response = browser.get(page, verify=False)
+        data = normalize(response.text)
+        settings.debug(response.headers)
+        if 'text/html' in response.headers.get("content-type", ""):
+            content = re.findall('magnet:\?[^\'"\s<>\[\]]+', data)
+            if content != None and len(content) > 0:
+                result = content[0]
+            else:
+                content = re.findall('https?:[^\'"\s<>\[\]]+torrent', data)
+                if content != None and len(content) > 0:
+                    result = content[0]
+        else:
+            exceptionsList.add(re.search("^https?:\/\/(.*?)/", page).group(1))
+            exceptionsList.save()
+            # except:
+            #     pass
+    settings.debug(result)
+    return result
+
+
+def getInfoLabels(infoTitle):
+    from metahandler import metahandlers
+    metaget = metahandlers.MetaData()
+    infoLabels = {}
+    try:
+        if infoTitle is str:  # if it is a string get the FormatTitle dict structure
+            infoTitle = formatTitle(infoTitle)
+        settings.debug(infoTitle)
+        cleanTitle = infoTitle["cleanTitle"]
+        year = infoTitle["year"]
+        if infoTitle["type"] == "MOVIE":
+            infoLabels = metaget.get_meta('movie', cleanTitle, year=year)
+        else:  # it is a TV Show or Anime
+            infoLabels = metaget.get_meta('tvshow', cleanTitle, year=year)
+        # cast and castandrole
+        castList = []
+        castAndRoleList = []
+        for item in infoLabels.get("cast", []):
+            if item is not None and item is str:
+                castList.append(item)
+                castAndRoleList.append((item, ""))
+            else:
+                castList.append(item[0])
+                castAndRoleList.append(item)
+        infoLabels["cast"] = castList
+        infoLabels["castandrole"] = castAndRoleList
+        # add episode and season
+        infoLabels['season'] = infoTitle['season']
+        infoLabels['episode'] = infoTitle['episode']
+    except:
+        pass
+    duration = 0
+    if infoLabels.has_key("duration") and infoLabels["duration"] != '' and infoLabels["duration"] != 'None':
+        duration = int(infoLabels["duration"])
+    infoLabels['duration'] = duration
+    # force creation
+    infoLabels['imdb_id'] = infoLabels.get('imdb_id', "")
+    infoLabels['cover_url'] = infoLabels.get("cover_url", settings.icon)
+    infoLabels['backdrop_url'] = infoLabels.get("backdrop_url", settings.fanart)
+    # add label
+    infoLabels['label'] = infoTitle["title"] + infoTitle.get("textQuality", "") + " " + infoTitle["language"]
+    settings.debug(infoLabels)
+    return infoLabels
+
+
+def getInfoStream(infoTitle={}, infoLabels={}):
+    infoStream = {'width': infoTitle["width"],
+                  'height': infoTitle["height"],
+                  'aspect': infoTitle["width"] / infoTitle["height"],
+                  'duration': infoLabels["duration"],
+                  }
+    return infoStream
+
+
+def getInfoSeason(infoLabels, seasons=[]):
+    from metahandler import metahandlers
+    metaget = metahandlers.MetaData()
+    images = metaget.get_seasons(tvshowtitle=infoLabels["title"], imdb_id=infoLabels["imdb_id"],
+                               seasons=seasons, overlay=6)
+    seasons = []
+    for image in images:
+        printer(image)
+        if image["cover_url"] == "":
+            image["cover_url"] = infoLabels["cover_url"]
+        if image["backdrop_url"] == "":
+            image["backdrop_url"] = infoLabels["backdrop_url"]
+        seasons.append(image)
+    return seasons
+
+
+def getInfoEpisode(infoLabels):
+    from metahandler import metahandlers
+    metaget = metahandlers.MetaData()
+    return metaget.get_episode_meta(tvshowtitle=infoLabels["title"], imdb_id=infoLabels["imdb_id"],
+                                    season=infoLabels["season"], episode=infoLabels["episode"])
+
+
+############  INTEGRATION   ###########################
+def integration(titles=[], id=[], magnets=[], typeList='', folder='', silence=False, message=''):
+    messageType = {'MOVIE': settings.string(32031), 'SHOW': settings.string(32032), 'ANIME': settings.string(32043)}
+    filters = Filtering()  # start filtering
+
+    if typeList == 'MOVIE':
+        filters.useMovie()
+    else:
+        filters.useTv()  # TV SHOWS and Anime
+    filters.information()
+
+    total = len(titles)
+    answer = True
+    if not silence:
+        answer = settings.dialog.yesno(settings.string(32033) %
+                                       (normalize(settings.name), total), '%s' % titles)
+    if answer:  # it will integrate the filename list to the local library
+        if not silence:
+            settings.pDialog.create(settings.name, settings.string(32034) % (messageType[typeList], message))
+        else:
+            settings.notification(settings.string(32034) % (messageType[typeList], message))
+
+        cont = 0
+        for cm, title in enumerate(titles):
+            info = formatTitle(title)
+            info['folder'] = info['folder'][:100].strip()  # to limit the length of directory name
+            check = True
+            detailsTitle = ''
+            if len(info['rest']) > 0:  # check for quality filtering
+                filters.title = info['title'] + ' ' + info['rest']
+                if filters.verify(filters.title, None):  # just check the quality no more
+                    check = True
+                    if settings.value.get("duplicated", "false") == "true":
+                        detailsTitle = ' ' + info['rest']
+                else:
+                    check = False
+            if check:  # the file has passed the filtering
+                name = info['title'] + detailsTitle
+                name = name[:99].strip()  # to limit the length of name
+
+                # Try to create the directory if it doesn't exist
+                directory = path.join(folder, info['folder'])
+                try:
+                    os.makedirs(directory)
+                except:
+                    pass
+
+                # Set-up the plugin
+                sleep(random.randrange(50, 1000, 50) / 1000)  # to be a smart spider
+                uri_string = quote_plus(getPlayableLink(uncodeName(normalize(magnets[cm]))))
+                if settings.value["plugin"] == 'Pulsar':
+                    link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
+                elif settings.value["plugin"] == 'KmediaTorrent':
+                    link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
+                elif settings.value["plugin"] == "Torrenter":
+                    link = 'plugin://plugin.video.torrenter/?action=playSTRM&url=' + uri_string + \
+                           '&not_download_only=True'
+                elif settings.value["plugin"] == "YATP":
+                    link = 'plugin://plugin.video.yatp/?action=play&torrent=' + uri_string
+                else:
+                    link = 'plugin://plugin.video.xbmctorrent/play/%s' % uri_string
+                settings.debug(link)
+                # start to create the strm file
+                filename = path.join(directory, name + ".strm")
+                if not os.path.isfile(filename) or settings.value["overwrite"] == 'true':
+                    cont += 1  # add new file's count
+                    with open(filename, "w") as text_file:  # create .strm
+                        text_file.write(link)
+                    codeMovie = ""
+                    codeShow = ""
+                    if not os.path.isfile("*.nfo"):
+                        if len(id) > 0 and id[cm] != "":
+                            codeMovie = codeShow = id[cm]
+                        else:
+                            infoLabels = getInfoLabels(info)
+                            codeMovie = infoLabels.get("imdb_id", "")  # it tries to retrieve the IMDB number from title
+                            codeShow = infoLabels.get("tvdb_id", "")  # it tries to retrieve the TVDB number from title
+                    else:
+                        settings.debug(".nfo existe!!!")
+                    if codeMovie != "" and codeShow != "":  # Only it creates the nfo file if it is a IMDB number
+                        if typeList == "MOVIE":
+                            with open(filename.replace(".strm", ".nfo"), "w") as text_file:  # create .nfo MOVIE
+                                text_file.write("http://www.imdb.com/title/%s/" % codeMovie)
+                            settings.debug("imdb= " + codeMovie)
+                        else:
+                            with open(path.join(directory, "tvshow.nfo"), "w") as text_file:  # create .nfo SHOW
+                                text_file.write("http://thetvdb.com/?tab=series&id=%s" % codeShow)
+                            settings.debug("tvdb= " + codeShow)
+
+                    if not silence: settings.pDialog.update(int(float(cm) / total * 100), settings.string(32036)
+                                                            % (directory, name))
+                    if not silence and settings.pDialog.iscanceled(): break
+                    if cont % 100 == 0: settings.notification(
+                        settings.string(32037) % (cont, messageType[typeList], message))
+                    settings.log(settings.string(32038) % filename)
+                if not silence and settings.pDialog.iscanceled(): break
+        if not silence: settings.pDialog.close()
+
+        if cont > 0:  # There are files added
+            if not xbmc.getCondVisibility('Library.IsScanningVideo'):
+                xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
+            settings.log(settings.string(32040) % (cont, messageType[typeList], message))
+            if not silence:
+                settings.dialog.ok(settings.name, settings.string(32040) % (cont, messageType[typeList], message))
+            else:
+                settings.notification(settings.string(32040) % (cont, messageType[typeList], message))
+        else:
+            settings.log(settings.string(32041) % (messageType[typeList], message))
+            if not silence:
+                settings.dialog.ok(settings.name, settings.string(32042) % (messageType[typeList], message))
+            else:
+                settings.notification(settings.string(32042) % (messageType[typeList], message))
+                # del filters
+
+
+############  SUBSCRIPTION   ###########################
+def subscription(titles=[], id=[], typeList='', folder='', silence=False, message=''):
+    from types import StringType
+    messageType = {'MOVIE': settings.string(32031), 'SHOW': settings.string(32032)}
+    total = len(titles)
+    answer = True
+    if not silence:
+        answer = settings.dialog.yesno(settings.string(32033) %
+                                       (settings.name, total), '%s' % titles)
+
+    if answer:  # it will integrate the filename list to the local library
+        if not silence:
+            settings.pDialog.create(settings.name, "%s %s" % (messageType[typeList], message))
+        else:
+            settings.notification(settings.string(32034) % (messageType[typeList], message))
+        # Open Database
+        storage = Storage(settings.storageName, type="dict")
+        cont = 0
+        for cm, itemList in enumerate(titles):
+            info = formatTitle(itemList if typeList == 'MOVIE' else itemList + ' S00E00')
+            item = info['title'] if typeList == 'MOVIE' else info['cleanTitle']
+            if storage.database.has_key(item):
+                data = storage.database[item]
+                data = literal_eval(data) if type(data) == StringType else data
+                settings.debug('item(' + str(cm) + '): ' + str(data))
+                settings.debug('type item(' + str(cm) + '): ' + str(type(data)))
+                if typeList == 'SHOW':  # update the database to find new episodes
+                    tvShow = TvShowCode(data['ID'], data['lastEpisode'], data['lastSeason'])
+                    data['firstSeason'] = tvShow.firstSeason
+                    data['lastSeason'] = tvShow.lastSeason
+                    data['lastEpisode'] = tvShow.lastEpisode
+            else:
+                # create the item
+                data = {}
+                if len(id) > 0:
+                    data['ID'] = id[cm]
+                    if typeList == 'SHOW':
+                        tvShow = TvShowCode(id[cm])
+                        data['firstSeason'] = tvShow.firstSeason
+                        data['lastSeason'] = tvShow.lastSeason
+                        data['lastEpisode'] = tvShow.lastEpisode
+                else:
+                    if typeList == 'MOVIE':
+                        movie = Movie(item)  # name of the movie with (year) format: Frozen (2013)
+                        data['ID'] = movie.code  # search the IMDB id
+                    elif typeList == 'SHOW':
+                        tvShow = TvShow(info['cleanTitle'])  # search the name without year
+                        data['ID'] = tvShow.code
+                        if data['ID'] is not None:
+                            data['firstSeason'] = tvShow.firstSeason
+                            data['lastSeason'] = tvShow.lastSeason
+                            data['lastEpisode'] = tvShow.lastEpisode
+                data['type'] = typeList
+                data['season'] = 0
+                data['episode'] = 0
+            # start to create strm files
+            if typeList == 'MOVIE' and data['type'] == 'MOVIE' and data['episode'] == 0 and data['ID'] is not None:
+                cont += 1
+                # Try to create the directory if it doesn't exist
+                directory = path.join(folder, info['folder'])
+                try:
+                    os.makedirs(directory)
+                except:
+                    pass
+                data['path'] = directory  # To be able to erase the folder
+
+                if settings.value["detailedLog"] == 'true':
+                    settings.log('Code %s=%s' % (typeList, data['ID']))
+
+                link = 'plugin://plugin.video.pulsar/movie/%s/%s' % (data['ID'], settings.value["action"])
+
+                # start to create the strm file
+                filename = path.join(directory, item + ".strm")
+                with open(filename, "w") as text_file:  # create .strm MOVIE
+                    text_file.write(link)
+                with open(filename.replace(".strm", ".nfo"), "w") as text_file:  # create .nfo MOVIE
+                    text_file.write("http://www.imdb.com/title/%s/" % data['ID'])
+                data['episode'] = 1
+                if not silence: settings.pDialog.update(int(float(cm) / total * 100), settings.string(32036)
+                                                        % (directory, item))
+                if cont % 100 == 0: settings.notification(settings.string(32037)
+                                                          % (cont, messageType[typeList], message))
+                settings.log(settings.string(32038) % filename)
+            elif typeList == 'SHOW' and data['type'] == 'SHOW' and data['ID'] is not None:  # add shows
+                if settings.value["specials"] == 'false' and data['firstSeason'] == 0:
+                    data['firstSeason'] = 1
+                directory = folder + item + folder[-1]
+                # Try to create the directory if it doesn't exist
+                directory = path.join(folder, info['folder'])
+                try:
+                    os.makedirs(directory)
+                except:
+                    pass
+                data['path'] = directory  # To be able to erase the folder
+                if settings.value["detailedLog"] == 'true':
+                    settings.log(settings.string(32035) % (typeList, data['ID']))
+                    settings.log(
+                        '%s %s-%s: %s' % (item, data['firstSeason'], data['lastSeason'], data['lastEpisode']))
+                with open(path.join(directory, "tvshow.nfo"), "w") as text_file:  # create .nfo SHOW
+                    text_file.write("http://thetvdb.com/?tab=series&id=%s" % data['ID'])
+                for season in range(max(data['season'], data['firstSeason']), data['lastSeason'] + 1):
+                    for episode in range(data['episode'] + 1, data['lastEpisode'][season] + 1):
+                        cont += 1
+                        link = 'plugin://plugin.video.pulsar/show/%s/season/%s/episode/%s/%s' % (
+                            data['ID'], season, episode, settings.value["action"])
+                        if not silence: settings.pDialog.update(int(float(cm) / total * 100),
+                                                                "%s%s S%02dE%02d.strm" % (
+                                                                    directory, item, season, episode))
+                        if cont % 100 == 0: settings.notification(
+                            settings.string(32037) % (cont, messageType[typeList], message))
+                        filename = path.join(directory, item + " S%02dE%02d.strm" % (season, episode))
+                        with open(filename, "w") as text_file:  # create .strm
+                            text_file.write(link)
+                            settings.log(settings.string(32038) % filename)
+                        if not silence and settings.pDialog.iscanceled(): break
+                    data['episode'] = 0  # change to new season and reset the episode to 1
+                if not silence and settings.pDialog.iscanceled(): break
+                data['season'] = data['lastSeason']
+                if data['lastEpisode'].has_key(data['lastSeason']):
+                    data['episode'] = data['lastEpisode'][data['lastSeason']]
+                if not silence: settings.pDialog.update(int(float(cm) / total * 100),
+                                                        settings.string(32036) % (directory, item))
+                settings.log(settings.string(32039) % (directory, item))
+            # update database
+            if data['ID'] is not None:
+                storage.database[item] = data
+            if not silence and settings.pDialog.iscanceled(): break
+        # confirmation and close database
+        storage.save()
+        if cont > 0:
+            if not xbmc.getCondVisibility('Library.IsScanningVideo'):
+                xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
+            settings.log(settings.string(32040) % (cont, messageType[typeList], message))
+            if not silence:
+                settings.dialog.ok(settings.name, settings.string(32040) % (cont, messageType[typeList], message))
+            else:
+                settings.notification(settings.string(32040) % (cont, messageType[typeList], message))
+
+        else:
+            settings.log(settings.string(32041) % (messageType[typeList], message))
+            if not silence:
+                settings.dialog.ok(settings.name, settings.string(32042) % (messageType[typeList], message))
+            else:
+                settings.notification(settings.string(32042) % (messageType[typeList], message))
+        del storage
+
+
+def int_pelisalacarta(channel="", url=[], titles=[], typeList='', folder='', silence=False, message=''):
+    total = len(url)
+    if total > 0:
+        if not silence:
+            answer = settings.dialog.yesno(
+                '%s: %s items\nQuiere agregar estos archivos .strm?' % (settings.cleanName, total),
+                '%s' % titles, yeslabel="Ahora", nolabel="Luego")
+        else:
+            answer = True
+        if answer:
+            if not silence:
+                settings.pDialog.create(settings.cleanName, 'Verificando %s\n%s' % (typeList, message))
+            else:
+                settings.notification('Verificando %s\n%s' % (typeList, message))
+            cont = 0
+            cm = 0
+            for item, title in zip(url, titles):  # start writing the list
+                info = formatTitle(title)
+                name = info['title']
+                directory = path.join(folder, info['folder'])
+                if not os.path.exists(directory):
+                    try:
+                        os.makedirs(directory)
+                    except:
+                        pass
+                link = "plugin://plugin.video.pelisalacarta/?channel=%s&action=play_from_library&url=%s" % (
+                    channel, quote_plus(item))
+                cm += 1
+                fullFileName = path.join(directory, "%s.strm" % name)
+                if not os.path.isfile(fullFileName) or settings.value["overwrite"] == 'true':
+                    cont += 1
+                    if len(name) > 100: name = name[:99]
+                    with open(fullFileName, "w") as text_file:  # create .strm
+                        text_file.write(link)
+                    if not silence:
+                        settings.pDialog.update(int(float(cm) / total * 100), 'Creando %s...' % fullFileName)
+                    if not silence and settings.pDialog.iscanceled():
+                        break
+                    if cont % 100 == 0:
+                        settings.notification('%s %s encontrados - Trabajando...\n%s' % (cont, typeList, message))
+                    settings.log('%s Agregados' % fullFileName)
+                if not silence and settings.pDialog.iscanceled(): break
+            if not silence:
+                settings.pDialog.close()
+            if cont > 0:
+                if not xbmc.getCondVisibility('Library.IsScanningVideo'):
+                    xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
+                settings.log('%s %s agregados./n%s' % (cont, typeList, message))
+                if not silence:
+                    settings.dialog.ok(settings.cleanName, '%s %s agregados.\n%s' % (cont, typeList, message))
+                else:
+                    settings.notification('%s %s agregados.\n%s' % (cont, typeList, message))
+            else:
+                settings.log('Nada nuevo %s\n%s' % (typeList, message))
+                if not silence:
+                    settings.dialog.ok('Nada nuevo %s\n%s' % (typeList, message))
+                else:
+                    settings.notification('Nada nuevo %s\n%s' % (typeList, message))
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools.pyo
deleted file mode 100644
index 374d0b8fb260acf87c05280ed19aa353628c6906..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools2.py b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools2.py
index 737e938b96d1253fddc9587271e50a324f299cf6..56de62dcd4922539dfde081e6016922391bc7107 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools2.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools2.py
@@ -1,1504 +1,1508 @@
-# coding: utf-8
-# library to access URL, translation title and filtering
-# using the great jobs of ElDorado for scrobbling
-__author__ = 'mancuniancol'
-
-import os
-import bs4
-import requests
-import re
-import xbmcaddon
-import xbmc
-import xbmcgui
-from os import path
-from urllib import quote_plus
-from time import sleep
-from ast import literal_eval
-import xbmcplugin
-
-
-################################
-#### SCRAPER TITLES ############
-################################
-def normalize(name, onlyDecode=False):
-    from unicodedata import normalize
-    import types
-    if type(name) == types.StringType:
-        unicode_name = name.decode('unicode-escape')
-    else:
-        try:
-            unicode_name = name.encode('latin-1').decode('utf-8')  # to latin-1
-        except:
-            unicode_name = name
-    normalize_name = unicode_name if onlyDecode else normalize('NFKD', unicode_name)
-    return normalize_name.encode('ascii', 'ignore')
-
-
-def uncodeName(name):  # Convert all the &# codes to char, remove extra-space and normalize
-    from HTMLParser import HTMLParser
-    name = name.replace('<![CDATA[', '').replace(']]', '')
-    name = HTMLParser().unescape(name)
-    return name
-
-
-def unquoteName(name):  # Convert all %symbols to char
-    from urllib import unquote
-    return unquote(name).decode("utf-8")
-
-
-def safeName(value):  # Make the name directory and filename safe
-    value = normalize(value)  # First normalization
-    value = unquoteName(value)
-    value = uncodeName(value)
-    value = normalize(value)  # Last normalization, because some unicode char could appear from the previous steps
-    value = value.lower().title().replace('_', ' ')
-    # erase keyword
-    value = re.sub('^\[.*?\]', '', value)  # erase [HorribleSub] for ex.
-    # check for anime
-    value = re.sub('- ([0-9][0-9][0-9][0-9]) ', ' \g<1>', value + " ")
-    value = re.sub('- ([0-9]+) ', '- EP\g<1>', value + " ")
-    if 'season' not in value.lower():
-        value = value.lower().replace(" episode ", " - EP")
-    # check for qualities
-    value = value.replace("1920x1080", "1080p")
-    value = value.replace("1280x720", "720p")
-    value = value.replace("853x480", "480p")
-    value = value.replace("848x480", "480p")
-    value = value.replace("704x480", "480p")
-    value = value.replace("640x480", "480p")
-    value = value.replace("microhd", " microhd")  # sometimes comes with the year
-    value = value.replace("dvdrip", " dvdrip")  # sometimes comes with the year
-    keys = {'"': ' ', '*': ' ', '/': ' ', ':': ' ', '<': ' ', '>': ' ', '?': ' ', '|': ' ', '~': ' ',
-            "'": '', 'Of': 'of', 'De': 'de', '.': ' ', ')': ' ', '(': ' ', '[': ' ', ']': ' ', '-': ' '}
-    for key in keys.keys():
-        value = value.replace(key, keys[key])
-    value = ' '.join(value.split())
-    return value.replace('s h i e l d', 'SHIELD').replace('c s i', 'CSI')
-
-
-def checkQuality(text=""):
-    # quality
-    keyWords = {"Cam": ["camrip", "cam"],
-                "Telesync": ["ts", "telesync", "pdvd"],
-                "Workprint": ["wp", "workprint"],
-                "Telecine": ["tc", "telecine"],
-                "Pay-Per-View Rip": ["ppv", "ppvrip"],
-                "Screener": ["scr", "screener", "screeener", "dvdscr", "dvdscreener", "bdscr"],
-                "DDC": ["ddc"],
-                "R5": ["r5", "r5.line", "r5 ac3 5 1 hq"],
-                "DVD-Rip": ["dvdrip", "dvd-rip"],
-                "DVD-R": ["dvdr", "dvd-full", "full-rip", "iso rip", "lossless rip", "untouched rip", "dvd-5 dvd-9"],
-                "HDTV": ["dsr", "dsrip", "dthrip", "dvbrip", "hdtv", "pdtv", "tvrip", "hdtvrip", "hdrip", "hdit",
-                         "high definition"],
-                "VODRip": ["vodrip", "vodr"],
-                "WEB-DL": ["webdl", "web dl", "web-dl"],
-                "WEBRip": ["web-rip", "webrip", "web rip"],
-                "WEBCap": ["web-cap", "webcap", "web cap"],
-                "BD/BRRip": ["bdrip", "brrip", "blu-ray", "bluray", "bdr", "bd5", "bd", "blurip"],
-                "MicroHD": ["microhd"],
-                "FullHD": ["fullhd"],
-                "BR-Line": ["br line"],
-                # video formats
-                "x264": ["x264", "x 264"],
-                "x265 HEVC": ["x265 hevc", "x265", "x 265", "hevc"],
-                # audio
-                "DD5.1": ["dd5 1", "dd51", "dual audio 5"],
-                "AC3 5.1": ["ac3"],
-                "ACC": ["acc"],
-                "DUAL AUDIO": ["dual", "dual audio"],
-                }
-    color = {"Cam": "FFF4AE00",
-             "Telesync": "FFF4AE00",
-             "Workprint": "FFF4AE00",
-             "Telecine": "FFF4AE00",
-             "Pay-Per-View Rip": "FFD35400",
-             "Screener": "FFD35400",
-             "DDC": "FFD35400",
-             "R5": "FFD35400",
-             "DVD-Rip": "FFD35400",
-             "DVD-R": "FFD35400",
-             "HDTV": "FFD35400",
-             "VODRip": "FFD35400",
-             "WEB-DL": "FFD35400",
-             "WEBRip": "FFD35400",
-             "WEBCap": "FFD35400",
-             "BD/BRRip": "FFD35400",
-             "MicroHD": "FFD35400",
-             "FullHD": "FFD35400",
-             "BR-Line": "FFD35400",
-             # video formats
-             "x264": "FFFB0C06",
-             "x265 HEVC": "FFFB0C06",
-             # audio
-             "DD5.1": "FF089DE3",
-             "AC3 5.1": "FF089DE3",
-             "ACC": "FF089DE3",
-             "DUAL AUDIO": "FF089DE3",
-             }
-    quality = "480p"
-    textQuality = ""
-    for key in keyWords:
-        for keyWord in keyWords[key]:
-            if ' ' + keyWord + ' ' in ' ' + text + ' ':
-                quality = "480p"
-                textQuality += " [COLOR %s][%s][/COLOR]" % (color[key], key)
-
-    if "480p" in text:
-        quality = "480p"
-        textQuality += " [COLOR FF2980B9][480p][/COLOR]"
-    if "720p" in text:
-        quality = "720p"
-        textQuality += " [COLOR FF5CD102][720p][/COLOR]"
-    if "1080p" in text:
-        quality = "1080p"
-        textQuality += " [COLOR FFF4AE00][1080p][/COLOR]"
-    if "3d" in text:
-        quality = "1080p"
-        textQuality += " [COLOR FFD61515][3D][/COLOR]"
-    if "4k" in text:
-        quality = "2160p"
-        textQuality += " [COLOR FF16A085][4K][/COLOR]"
-    return quality, textQuality
-
-
-def width(quality="480p"):
-    result = 720
-    if '480p' in quality:
-        result = 720
-    elif '720p' in quality:
-        result = 1280
-    elif '1080p' in quality:
-        result = 1920
-    elif '2160p' in quality:
-        result = 2160
-    return result
-
-
-def height(quality="480p"):
-    result = 480
-    if '480p' in quality:
-        result = 480
-    elif '720p' in quality:
-        result = 720
-    elif '1080p' in quality:
-        result = 1080
-    elif '2160p' in quality:
-        result = 3840
-    return result
-
-
-def findLanguage(value=""):
-    language = ""  # It is english or unknown
-    if "spa" in value or "spanish" in value or "espanol" in value:
-        language = " Español "
-    if "hindi" in value:
-        language = "Hindi"
-    if "castellano" in value:
-        language = "Castellano"
-    if "french" in value or 'francais' in value:
-        language = "French"
-    if "german" in value:
-        language = "German"
-    return language
-
-
-def exceptionsTitle(title=""):
-    value = title + " "
-    if "csi " in value and "ny" not in value and "miami" not in value and "cyber" not in value:
-        title = title.replace("csi", "CSI Crime Scene Investigation")
-    if "juego de tronos" in value:
-        title = title.replace("juego de tronos", "Game of Thrones")
-    if "mentes criminales" in value:
-        title = title.replace("mentes criminales", "criminal minds")
-    if "les revenants" in value:
-        title = title.replace("les revenants", "The returned")
-    return title
-
-
-def _cleanTitle(value=''):
-    keywordsCleanTitle = ['version', 'extendida', 'extended', 'edition', 'hd', 'unrated', 'version', 'vose',
-                          'special', 'edtion', 'uncensored', 'fixed', 'censurada', 'episode', 'ova', 'complete',
-                          'swesub'
-                          ]
-    for keyword in keywordsCleanTitle:  # checking keywords
-        value = (value + ' ').replace(' ' + keyword.title() + ' ', ' ')
-    return value.strip()
-
-
-def formatTitle(value='', fileName='', typeVideo="MOVIE"):
-    if fileName.startswith('magnet'):
-        fileName = ''
-    if fileName == '':
-        fileName = value
-    pos = value.rfind("/")
-    value = value if pos < 0 else value[pos:]
-    value = safeName(value).lower() + ' '
-    fileName = safeName(fileName).lower() + ' '
-    quality, textQuality = checkQuality(value + ' ' + fileName)  # find quality
-    language = findLanguage(value)  # find language
-    formats = [' ep[0-9]+', ' s[0-9]+e[0-9]+', ' s[0-9]+ e[0-9]+', ' [0-9]+x[0-9]+',
-               ' [0-9][0-9][0-9][0-9] [0-9][0-9] [0-9][0-9]',
-               ' [0-9][0-9] [0-9][0-9] [0-9][0-9]', ' season [0-9]+ episode [0-9]+',
-               ' season [0-9]+', ' season[0-9]+', ' s[0-9][0-9]',
-               ' temporada [0-9]+ capitulo [0-9]+', ' temporada[0-9]+', ' temporada [0-9]+',
-               ' seizoen [0-9]+ afl [0-9]+', ' saison[0-9]+', ' saison [0-9]+',
-               ' temp [0-9]+ cap [0-9]+', ' temp[0-9]+ cap[0-9]+',
-               ]
-    keywords = ['en 1080p', 'en 720p', 'en dvd', 'en dvdrip', 'en hdtv', 'en bluray', 'en blurayrip',
-                'en web', 'en rip', 'en ts screener', 'en screener', 'en cam', 'en camrip', 'pcdvd', 'bdremux',
-                'en ts-screener', 'en hdrip', 'en microhd', '1080p', '720p', 'dvd', 'dvdrip', 'hdtv', 'bluray',
-                'blurayrip', 'web', 'rip', 'ts screener', 'screener', 'cam', 'camrip', 'ts-screener', 'hdrip',
-                'brrip', 'blu', 'webrip', 'hdrip', 'bdrip', 'microhd', 'ita', 'eng', 'esp', "spanish espanol",
-                'castellano', '480p', 'bd', 'bdrip', 'hi10p', 'sub', 'x264', 'sbs', '3d', 'br', 'hdts', 'dts',
-                'dual audio', 'hevc', 'aac', 'batch', 'h264', 'gratis', 'descargar', 'hd', 'html', 'hdit',
-                'blurip', 'high definition', 'german', 'french', 'truefrench', 'vostfr', 'dvdscr', 'swesub'
-                ]
-    sshow = None
-    for format in formats:  # search if it is a show
-        sshow = re.search(format, value)  # format shows
-        if sshow is not None:
-            break
-    if sshow is None and typeVideo != "MOVIE":
-        if typeVideo == 'SHOW':
-            value += ' s00e00'
-        if typeVideo == 'ANIME':
-            value += ' ep00'
-        for format in formats:  # search if it is a show
-            sshow = re.search(format, value)  # format shows
-            if sshow is not None:
-                break
-    if sshow is None:
-        # it is a movie
-        value += ' 0000 '  # checking year
-        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
-        year = syear.group(0).strip()
-        pos = value.find(year)
-        if pos > 0:
-            title = value[:pos].strip()
-            rest = value[pos + 5:].strip().replace('0000', '')
-        else:
-            title = value.replace('0000', '')
-            rest = ''
-
-        while pos != -1:  # loop until doesn't have any keyword in the title
-            value = title + ' '
-            for keyword in keywords:  # checking keywords
-                pos = value.find(' ' + keyword + ' ')
-                if pos > 0:
-                    title = value[:pos]
-                    rest = value[pos:].strip() + ' ' + rest
-                    break
-
-        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
-        cleanTitle = _cleanTitle(title)
-        # finishing cleanTitle
-        if '0000' not in year:
-            title += ' (' + year.strip() + ')'
-        year = year.replace('0000', '')
-        folder = title
-        result = {'title': title, 'folder': folder, 'rest': rest.strip(), 'type': 'MOVIE', 'cleanTitle': cleanTitle,
-                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
-                  "width": width(quality), 'language': language, 'folderPath': settings.movieFolder
-                  }
-        return result
-    else:
-        # it is a show
-        rest = value.strip()  # original name
-        seasonEpisode = sshow.group(0)
-        # clean title
-        for keyword in keywords:  # checking keywords
-            value = value.replace(' ' + keyword + ' ', ' ')
-        title = value[:value.find(seasonEpisode)].strip()
-        title = title.strip()
-        seasonEpisode = seasonEpisode.replace('temporada ', 's').replace(' capitulo ', 'e')
-        seasonEpisode = seasonEpisode.replace('season ', 's').replace(' episode ', 'e')
-        seasonEpisode = seasonEpisode.replace('temp ', 's').replace(' cap ', 'e')
-        seasonEpisode = seasonEpisode.replace('seizoen ', 's').replace(' afl ', 'e')
-
-        if 'x' in seasonEpisode:
-            seasonEpisode = 's' + seasonEpisode.replace('x', 'e')
-
-        if 's' in seasonEpisode and 'e' in seasonEpisode and 'season' not in seasonEpisode:  # force S00E00 instead S0E0
-            temp_episode = seasonEpisode.replace('s', '').split('e')
-            seasonEpisode = 's%02de%02d' % (int(temp_episode[0]), int(temp_episode[1]))
-
-        if 's' not in seasonEpisode and 'e' not in seasonEpisode:  # date format
-            date = seasonEpisode.split()
-            if len(date[0]) == 4:  # yyyy-mm-dd format
-                seasonEpisode = seasonEpisode.replace(' ', '-')  # date style episode talk shows
-            else:  # dd mm yy format
-                if int(date[2]) > 50:
-                    date[2] = '19' + date[2]
-                else:
-                    date[2] = '20' + date[2]
-                seasonEpisode = date[2] + '-' + date[1] + '-' + date[0]
-
-        seasonEpisode = seasonEpisode.replace(' ', '')  # remove spaces in the episode format
-        title = exceptionsTitle(title)
-        # finding year
-        value = title + ' 0000 '
-        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
-        year = syear.group(0).strip()
-        pos = value.find(year)
-        if pos > 0:
-            title = value[:pos].strip()
-        title = value.replace('0000', '')
-        year = year.replace('0000', '')
-        # the rest
-        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
-        folder = title  # with year
-        cleanTitle = _cleanTitle(title.replace(year, '').strip())  # without year
-        title = folder + ' ' + seasonEpisode.upper()
-        title = title.replace('S00E00', '').replace('EP00', '')
-        ttype = "SHOW"
-        result = {'title': title, 'folder': folder, 'rest': rest, 'type': ttype, 'cleanTitle': cleanTitle,
-                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
-                  "width": width(quality), "language": language, 'folderPath': settings.showFolder
-                  }
-        if bool(re.search("EP[0-9]+", title)):
-            result['type'] = "ANIME"
-            result['folderPath'] = settings.animeFolder
-            result['season'] = 1
-            result['episode'] = int(seasonEpisode.replace('ep', ''))
-        else:
-            temp = (seasonEpisode.replace('s', '')).split('e')
-            result['season'] = 0
-            result['episode'] = 0
-            try:
-                result['season'] = int(temp[0])
-                result['episode'] = int(temp[1])
-            except:
-                pass
-        return result
-
-
-class UnTaggle():
-    infoTitle = {}
-    infoLabels = {}
-    infoStream = {}
-    title = ""
-    fileName = ""
-    typeVideo = ""
-    label = ""
-    id = ""
-    info = {}
-    cover = ""
-    fanart = ""
-    season = ""
-    episode = ""
-    imdb_id = ""
-    titleEpisode = ""
-
-    def __init__(self, value='', fileName='', typeVideo="MOVIE", useUrl=True):
-        self.title = normalize(value)
-        self.fileName = fileName
-        if useUrl:
-            self.infoTitle = formatTitle(value, fileName, typeVideo)  # organize the title information
-        else:
-            self.infoTitle = formatTitle(value, '', typeVideo)  # organize the title information
-        self.typeVideo = self.infoTitle["type"]
-        if settings.value["infoLabels"] == "true":
-            self.infoLabels = getInfoLabels(self.infoTitle)  # using script.module.metahandlers to the the infoLabels
-            self.infoStream = getInfoStream(self.infoTitle, self.infoLabels)
-        settings.debug(self.infoTitle)
-        settings.debug(self.infoLabels)
-        settings.debug(self.infoStream)
-        self.info = self.infoLabels
-        self.label = self.infoTitle["title"] + self.infoTitle.get("textQuality", "") + " " + self.infoTitle["language"]
-        self.id = self.infoLabels.get("imdb_id", "")
-        self.imdb_id = self.id
-        if self.infoTitle["type"] == 'SHOW' and settings.value[
-            "infoLabels"] == "true":  # difference with show and anime
-            self.info = getInfoEpisode(self.infoLabels)
-            self.id = self.infoLabels.get("tvdb_id", "")
-            self.titleEpisode = ' - ' + normalize(self.info.get('title', "")) if self.info.get('title', "") != "" else ""
-            self.label += self.titleEpisode
-            self.season = self.infoTitle.get("season", "")
-            self.episode = self.infoTitle.get("episode", "")
-        self.cover = self.info.get('cover_url', settings.icon)
-        self.fanart = self.info.get("backdrop_url", settings.fanart)
-
-
-################################
-#### CLASS #####################
-################################
-class Storage():
-    def __init__(self, fileName="", type="list", eval=False):
-        from ast import literal_eval
-        self.path = os.path.join(xbmc.translatePath('special://temp'), fileName)
-        self.type = type
-        if type == "list":
-            # get the list
-            self.database = []
-            try:
-                with open(self.path, 'r') as fp:
-                    for line in fp:
-                        self.database.append(line.strip())
-            except:
-                pass
-        elif type == "dict":
-            # get the Dictionary
-            self.database = {}
-            try:
-                with open(self.path, 'r') as fp:
-                    for line in fp:
-                        listedline = line.strip().split('::')  # split around the :: sign
-                        if len(listedline) > 1:  # we have the : sign in there
-                            settings.debug(listedline[0] + ' : ' + listedline[1])
-                            self.database[listedline[0]] = listedline[1] if not eval else literal_eval(listedline[1])
-            except:
-                pass
-
-    def destroy(self):  # Erase the database from the HD
-        try:
-            os.remove(self.path)
-        except OSError:
-            pass
-
-    def add(self, key="", info="", safe=True):  # add element
-        if self.type == "list" and key not in self.database:
-            self.database.append(key)
-        elif self.type == "dict":
-            if safe:
-                keySafe = formatTitle(key)
-                self.database[keySafe['folder']] = info
-            else:
-                self.database[key] = info
-
-    def remove(self, key="", safe=True):  # remove element
-        if self.type == "list":
-            self.database.remove(key)
-        elif self.type == "dict":
-            if safe:
-                keySafe = formatTitle(key)
-                del self.database[keySafe['folder']]
-            else:
-                del self.database[key]
-
-    def save(self):  # save the database
-        if self.type == "list":
-            # save the list
-            with open(self.path, 'w') as fp:
-                for p in self.database:
-                    fp.write("%s\n" % p)
-        elif self.type == "dict":
-            # save the dictionary
-            with open(self.path, 'w') as fp:
-                for p in self.database.items():
-                    fp.write("%s::%s\n" % p)
-
-
-class Settings:  # Read Configuration's Addon
-    def __init__(self, anime=False):
-        # Objects
-        self.dialog = xbmcgui.Dialog()
-        self.pDialog = xbmcgui.DialogProgress()
-        self.settings = xbmcaddon.Addon()
-
-        # General information
-        self.idAddon = self.settings.getAddonInfo('ID')  # gets name
-        self.icon = self.settings.getAddonInfo('icon')
-        self.fanart = self.settings.getAddonInfo('fanart')
-        self.path = self.settings.getAddonInfo('path')
-        self.name = self.settings.getAddonInfo('name')  # gets name
-        self.cleanName = re.sub('.COLOR (.*?)]', '', self.name.replace('[/COLOR]', ''))
-        self.storageName = self.cleanName + ".txt"  # Name Database
-
-        # Everything else
-        self.value = {}  # it contains all the settings from xml file
-        self.value["movieFolder"] = ""
-        self.value["showFolder"] = ""
-        self.value["animeFolder"] = ""
-
-        with open(path.join(self.path, "resources", "settings.xml"), 'r') as fp:
-            data = fp.read()
-        soup = bs4.BeautifulSoup(data)
-        settings = soup.select("setting")
-        for setting in settings:
-            id = setting.attrs.get("id")
-            if id is not None:
-                self.value[id] = self.settings.getSetting(id)
-
-        # Set-up Output folder
-        self.movieFolder = self.__folder__(self.value["movieFolder"], "movies")
-        self.showFolder = self.__folder__(self.value["showFolder"], "shows")
-        self.animeFolder = self.__folder__(self.value["animeFolder"], "animes")
-
-        # subscription
-        if "subscription" in self.cleanName.lower(): self.__subscription__()
-
-    def __folder__(self, folder, default=""):  # Change to OS friendly names
-        if folder == '':  # define default folder
-            folder = 'special://temp/%s/' % default
-        folder = folder.replace('special://temp/', xbmc.translatePath('special://temp'))
-        return folder.replace('smb:', '')  # network compatibility
-
-    def __subscription__(self):  # Additional Code for Subscription List Scripts
-        # remove .strm
-        self.debug("removeStrm= " + self.value["removeStrm"])
-        if self.value["removeStrm"] == 'true':
-            self.notification('Removing .strm files...')
-            if self.value["typeLibrary"] == "Global":
-                self.storageName = "pulsar global subscription.txt"
-            storage = Storage(self.storageName, type="dict")
-            from shutil import rmtree
-            for item in storage.database:
-                data = literal_eval(storage.database[item])
-                rmtree(data['path'])
-                settings.log('path: ' + data['path'] + ' removed!!')
-            self.log('All .strm files removed!')
-            self.notification('All .strm files removed!', force=True)
-            self.settings.setSetting('removeStrm', 'false')
-        # clear the database
-        self.debug("clearDatabase= " + self.value["clearDatabase"])
-        if self.value["clearDatabase"] == 'true':
-            self.notification('Erasing Database...', force=True)
-            storage = Storage(self.storageName, type="dict")
-            storage.destroy()
-            self.settings.setSetting('clearDatabase', 'false')
-
-    def log(self, message="", level=xbmc.LOGNOTICE):  # to write in the Kodi's log
-        try:
-            if message is not str:
-                message = str(message)
-            try:
-                xbmc.log('[' + self.cleanName + '] ' + message, level=level)
-            except:
-                xbmc.log('[' + self.cleanName + '] ' + safeName(message), level=level)
-        except:
-            xbmc.log("Error with the message", level=xbmc.LOGERROR)
-
-    def debug(self, message=""):  # to write in the Kodi's log
-        self.log(message, xbmc.LOGDEBUG)
-
-    def notification(self, message="", force=False, time=1000):  # to display a message in Kodi
-        if float(self.value["timeNotification"]) > 0 or force:
-            xbmcgui.Dialog().notification(self.name, "%s" % message, self.icon,
-                                          time if force else int(float(self.value["timeNotification"]) * 1000))
-
-    def string(self, id):
-        return self.settings.getLocalizedString(id)
-
-
-#############################################
-##############Browser HTTPS support##########
-#############################################
-
-class Response:
-    def __init__(self, text, status_code):
-        self.text = text
-        self.status_code = int(status_code)
-
-
-class Browser:
-    headers = {}
-    cookies = {}
-
-    def __init__(self):
-        self.headers[
-            'User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
-
-    def get(self, url='', cookies={}):
-        import httplib2
-        from urllib import urlencode
-        h = httplib2.Http(disable_ssl_certificate_validation=True)
-        resp, content = h.request(url, method="GET", headers=self.headers, body=urlencode(cookies))
-        self.headers['Cookie'] = resp['set-cookie']
-        return Response(content, resp['status'])
-
-    def post(self, url='', data={}):
-        from urllib import urlencode
-        import httplib2
-        h = httplib2.Http(disable_ssl_certificate_validation=True)
-        resp, content = h.request(url, method="POST", headers=self.headers, body=urlencode(data))
-        self.headers['Cookie'] = resp['set-cookie']
-        return Response(content, resp['status'])
-
-
-# Create settings object and browser to be used in the other tool's functions
-settings = Settings()
-browser = requests.Session()
-browser2 = Browser()
-browser.headers[
-    'User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
-browser.headers['Accept-Language'] = 'en'
-
-
-class TextViewer_Dialog(xbmcgui.WindowXMLDialog):  # taking from script.toolbox
-    ACTION_PREVIOUS_MENU = [9, 92, 10]
-
-    def __init__(self, *args, **kwargs):
-        xbmcgui.WindowXMLDialog.__init__(self)
-
-        self.text = kwargs.get('text')
-        self.header = kwargs.get('header')
-
-    def onInit(self):
-        self.getControl(1).setLabel(self.header)
-        self.getControl(5).setText(self.text)
-
-    def onAction(self, action):
-        if action in self.ACTION_PREVIOUS_MENU:
-            self.close()
-
-    def onClick(self, controlID):
-        pass
-
-    def onFocus(self, controlID):
-        pass
-
-
-class Filtering:
-    def __init__(self):
-        self.reason = ''
-        self.title = ''
-        self.quality_allow = ['*']
-        self.quality_deny = []
-        self.title = ''
-        self.maxSize = 10.00  # 10 it is not limit
-        self.minSize = 0.00
-
-        # size
-        if settings.value.has_key('movieMinSize'):  # there is size restrictions
-            settings.value['movieMinSize'] = float(settings.value['movieMinSize'])
-        else:
-            settings.value['movieMinSize'] = 0.0
-        self.movieMinSize = settings.value['movieMinSize']
-
-        if settings.value.has_key('movieMaxSize'):  # there is size restrictions
-            settings.value['movieMaxSize'] = float(settings.value['movieMaxSize'])
-        else:
-            settings.value['movieMaxSize'] = 10.0
-        self.movieMaxSize = settings.value['movieMaxSize']
-
-        if settings.value.has_key('tvMinSize'):  # there is size restrictions
-            settings.value['tvMinSize'] = float(settings.value['movieMinSize'])
-        else:
-            settings.value['tvMinSize'] = 0.0
-        self.tvMinSize = settings.value['tvMinSize']
-
-        if settings.value.has_key('tvMaxSize'):  # there is size restrictions
-            settings.value['tvMaxSize'] = float(settings.value['movieMaxSize'])
-        else:
-            settings.value['tvMaxSize'] = 10.0
-        self.tvMaxSize = settings.value['tvMaxSize']
-
-        # movie
-        movieAllow = []
-        if settings.value.has_key('movieKeyAllow') and settings.value['movieKeyAllow'] <> "":
-            movieAllow = re.split(',', settings.value['movieKeyAllow'].replace(', ', ',').replace(' ,', ','))
-        if settings.value.has_key('movieQua1') and settings.value['movieQua1'] == 'Accept File':
-            movieAllow.append('480p')  # 480p
-        if settings.value.has_key('movieQua2') and settings.value['movieQua2'] == 'Accept File':
-            movieAllow.append('HDTV')  # HDTV
-        if settings.value.has_key('movieQua3') and settings.value['movieQua3'] == 'Accept File':
-            movieAllow.append('720p')  # 720p
-        if settings.value.has_key('movieQua4') and settings.value['movieQua4'] == 'Accept File':
-            movieAllow.append('1080p')  # 1080p
-        if settings.value.has_key('movieQua5') and settings.value['movieQua5'] == 'Accept File':
-            movieAllow.append('3D')  # 3D
-        if settings.value.has_key('movieQua6') and settings.value['movieQua6'] == 'Accept File':
-            movieAllow.append('CAM')  # CAM
-        if settings.value.has_key('movieQua7') and settings.value['movieQua7'] == 'Accept File':
-            movieAllow.extend(['TeleSync', ' TS '])  # TeleSync
-        if settings.value.has_key('movieQua8') and settings.value['movieQua8'] == 'Accept File':
-            movieAllow.append('Trailer')  # Trailer
-
-        # Block File
-        movieDeny = []
-        if settings.value.has_key('movieKeyDenied') and settings.value['movieKeyDenied'] <> "":
-            movieDeny = re.split(',', settings.value['movieKeyDenied'].replace(', ', ',').replace(' ,', ','))
-        if settings.value.has_key('movieQua1') and settings.value['movieQua1'] == 'Block File':
-            movieDeny.append('480p')  # 480p
-        if settings.value.has_key('movieQua2') and settings.value['movieQua2'] == 'Block File':
-            movieDeny.append('HDTV')  # HDTV
-        if settings.value.has_key('movieQua3') and settings.value['movieQua3'] == 'Block File':
-            movieDeny.append('720p')  # 720p
-        if settings.value.has_key('movieQua4') and settings.value['movieQua4'] == 'Block File':
-            movieDeny.append('1080p')  # 1080p
-        if settings.value.has_key('movieQua5') and settings.value['movieQua5'] == 'Block File':
-            movieDeny.append('3D')  # 3D
-        if settings.value.has_key('movieQua6') and settings.value['movieQua6'] == 'Block File':
-            movieDeny.append('CAM')  # CAM
-        if settings.value.has_key('movieQua7') and settings.value['movieQua7'] == 'Block File':
-            movieDeny.extend(['TeleSync', ' TS '])  # TeleSync
-        if settings.value.has_key('movieQua8') and settings.value['movieQua8'] == 'Block File':
-            movieDeny.append('Trailer')  # Trailer
-
-        if '' in movieAllow: movieAllow.remove('')
-        if '' in movieDeny: movieDeny.remove('')
-        if len(movieAllow) == 0: movieAllow = ['*']
-        self.movieAllow = movieAllow
-        self.movieDeny = movieDeny
-
-        # TV
-        tvAllow = []
-        if settings.value.has_key('tvKeyAllow'):
-            tvAllow.append(re.split(',', settings.value['tvKeyAllow'].replace(', ', ',').replace(' ,', ',')))
-        if settings.value.has_key('tvQua1') and settings.value['tvQua1'] == 'Accept File':
-            tvAllow.append('480p')  # 480p
-        if settings.value.has_key('tvQua2') and settings.value['tvQua2'] == 'Accept File':
-            tvAllow.append('HDTV')  # HDTV
-        if settings.value.has_key('tvQua3') and settings.value['tvQua3'] == 'Accept File':
-            tvAllow.append('720p')  # 720p
-        if settings.value.has_key('tvQua4') and settings.value['tvQua4'] == 'Accept File':
-            tvAllow.append('1080p')  # 1080p
-
-        # Block File
-        tvDeny = []
-        if settings.value.has_key('tvKeyDeny'):
-            tvDeny.append(re.split(',', settings.value['tvKeyDeny'].replace(', ', ',').replace(' ,', ',')))
-        if settings.value.has_key('tvQua1') and settings.value['tvQua1'] == 'Block File':
-            tvDeny.append('480p')  # 480p
-        if settings.value.has_key('tvQua2') and settings.value['tvQua2'] == 'Block File':
-            tvDeny.append('HDTV')  # HDTV
-        if settings.value.has_key('tvQua3') and settings.value['tvQua3'] == 'Block File':
-            tvDeny.append('720p')  # 720p
-        if settings.value.has_key('tvQua4') and settings.value['tvQua4'] == 'Block File':
-            tvDeny.append('1080p')  # 1080p
-
-        if '' in tvAllow: tvAllow.remove('')
-        if '' in tvDeny: tvDeny.remove('')
-        if len(tvAllow) == 0: tvAllow = ['*']
-        self.tvAllow = tvAllow
-        self.tvDeny = tvDeny
-
-    def useMovie(self):
-        self.qualityAllow = self.movieAllow
-        self.qualityDeny = self.movieDeny
-        self.minSize = self.movieMinSize
-        self.maxSize = self.movieMaxSize
-
-    def useTv(self):
-        self.qualityAllow = self.tvAllow
-        self.qualityDeny = self.tvDeny
-        self.minSize = self.tvMinSize
-        self.maxSize = self.tvMaxSize
-
-    def information(self):
-        settings.log('Accepted Keywords: %s' % str(self.qualityAllow))
-        settings.log('Blocked Keywords: %s' % str(self.qualityDeny))
-        settings.log('min Size: %s' % str(self.minSize) + ' GB')
-        settings.log('max Size: %s' % str(self.maxSize) + ' GB') if self.maxSize != 10 else 'MAX'
-
-    # validate keywords
-    def included(self, value, keys, strict=False):
-        value = ' ' + normalize(value) + ' '
-        res = False
-        if '*' in keys:
-            res = True
-        else:
-            res1 = []
-            for key in keys:
-                res2 = []
-                for item in re.split('\s', key):
-                    item = normalize(item)
-                    item = item.replace('?', ' ')
-                    if strict: item = ' ' + item + ' '  # it makes that strict the comparation
-                    if item.upper() in value.upper():
-                        res2.append(True)
-                    else:
-                        res2.append(False)
-                res1.append(all(res2))
-            res = any(res1)
-        return res
-
-    # validate size
-    def size_clearance(self, size):
-        max_size1 = 100 if self.maxSize == 10 else self.maxSize
-        res = False
-        value = float(re.split('\s', size.replace(',', ''))[0])
-        value *= 0.001 if 'M' in size else 1
-        if self.minSize <= value <= max_size1:
-            res = True
-        return res
-
-    # verify
-    def verify(self, name, size):  # modify to just check quality and size, not name
-        self.reason = name.replace(' - ' + settings.cleanName, '') + ' ***Blocked File by'
-        result = True
-        if name != None:
-            if not self.included(name, self.qualityAllow) or self.included(name, self.qualityDeny):
-                self.reason += ", Keyword"
-                result = False
-        if size != None:
-            if not self.size_clearance(size):
-                result = False
-                self.reason += ", Size"
-        self.reason = self.reason.replace('by,', 'by') + '***'
-        return result
-
-
-#######################################
-######## CLASS FOR SUBSCRIPTION #######
-#######################################
-class TvShow():
-    def __init__(self, name):
-        import urllib
-
-        browser.get('http://localhost:65251/shows/search?q=%s' % urllib.quote(name))
-        sleep(0.2)
-        response = browser.get('http://localhost:65251/shows/search?q=%s' % urllib.quote(name))
-        if response.status_code == requests.codes.ok:
-            data = response.json()
-            dataShow = None
-            if len(data['items']) > 0:  # To find the right Tv Show
-                dataShow = data['items'][0]
-                for item in data['items']:
-                    if item['label'].lower() == name.lower():
-                        dataShow = item
-                        break
-            if dataShow is not None:
-                self.code = dataShow['path'].replace('plugin://plugin.video.pulsar/show/', '').replace(
-                    '/seasons', '')
-                sleep(0.2)
-                response = browser.get('http://localhost:65251/show/%s/seasons' % self.code)
-                data = {}
-                try:
-                    data = response.json()
-                except:
-                    data['items'] = []
-                seasons = []
-                for item in data['items']:
-                    seasons.append(int(item['label'].replace('Season ', '').replace('Specials', '0')))
-                seasons.sort()
-                episodes = {}
-                for season in seasons:
-                    sleep(0.2)
-                    response = browser.get('http://localhost:65251/show/%s/season/%s/episodes' % (self.code, season))
-                    data = response.json()
-                    episodes[season] = len(data['items'])
-                if len(seasons) > 0:
-                    self.firstSeason = seasons[0]
-                    self.lastSeason = seasons[-1]
-                else:
-                    self.firstSeason = 0
-                    self.lastSeason = 0
-                self.lastEpisode = episodes
-            else:
-                self.code = None
-        else:
-            self.code = None
-
-
-class TvShowCode():
-    def __init__(self, code, episodes={}, lastSeason=0):
-        self.code = code
-        response = browser.get('http://localhost:65251/show/%s/seasons' % self.code)
-        data = {}
-        try:
-            data = response.json()
-        except:
-            data['items'] = []
-        seasons = []
-        for item in data['items']:
-            seasons.append(int(item['label'].replace('Season ', '').replace('Specials', '0')))
-        seasons.sort()
-        if episodes.has_key(0):
-            del episodes[0]
-        if lastSeason is not 0:
-            del episodes[lastSeason]
-        for season in seasons:
-            if not episodes.has_key(season):
-                sleep(0.2)
-                response = browser.get('http://localhost:65251/show/%s/season/%s/episodes' % (self.code, season))
-                data = response.json()
-                episodes[season] = len(data['items'])
-        if len(seasons) > 0:
-            self.firstSeason = seasons[0]
-            self.lastSeason = seasons[-1]
-        else:
-            self.firstSeason = 0
-            self.lastSeason = 0
-        self.lastEpisode = episodes
-
-
-class Movie():
-    def __init__(self, name):
-        import urllib
-
-        if ')' in name and '(' in name:
-            try:
-                yearMovie = int(name[name.find("(") + 1:name.find(")")])
-                name = name.replace('(%s)' % yearMovie, '').rstrip()
-            except:
-                yearMovie = None
-        else:
-            yearMovie = None
-        browser.get('http://localhost:65251/movies/search?q=%s' % urllib.quote(name))  # avoid not info
-        sleep(1.0)
-        response = browser.get('http://localhost:65251/movies/search?q=%s' % urllib.quote(name))
-        if response.status_code == requests.codes.ok:
-            data = response.json()
-            if len(data['items']) > 0:
-                if yearMovie is not None:
-                    for movie in data['items']:
-                        label = movie['label']
-                        path = movie['path']
-                        if movie['info'].has_key('year'):
-                            year = movie['info']['year']
-                        else:
-                            year = 0000
-                        if year == yearMovie:
-                            break
-                else:
-                    label = data['items'][0]['label']
-                    path = data['items'][0]['path']
-                    year = data['items'][0]['info']['year']
-                self.code = path.replace('plugin://plugin.video.pulsar/movie/', '').replace('/play', '')
-                self.label = label
-                self.year = year
-            else:
-                self.code = None
-                self.label = name
-        else:
-            self.code = None
-            self.label = name
-
-
-class Magnet():
-    def __init__(self, magnet):
-        self.magnet = magnet + '&'
-        # hash
-        hash = re.search('urn:btih:(.*?)&', self.magnet)
-        result = ''
-        if hash is not None:
-            result = hash.group(1)
-        self.hash = result
-        # name
-        name = re.search('dn=(.*?)&', self.magnet)
-        result = ''
-        if name is not None:
-            result = name.group(1).replace('+', ' ')
-        self.name = safeName(result)
-        # trackers
-        self.trackers = re.findall('tr=(.*?)&', self.magnet)
-
-
-################################
-#### FUNCTIONS #################
-################################
-def printer(message=""):
-    print '****************************'
-    print message
-    print '*-**************************'
-
-
-def find_nth(string="", substring="", nth=1, start=0):
-    start = string.find(substring, start)
-    if nth == 1 or start == -1:
-        return start
-    else:
-        return find_nth(string, substring, nth - 1, start + len(substring))
-
-
-def textViewer(text="", once=False):
-    if not once or (once and settings.settings.getSetting("firstOpen") != "NO"):
-        settings.settings.setSetting("firstOpen", "NO")
-        w = TextViewer_Dialog('DialogTextViewer.xml', settings.path, header=settings.name, text=text)
-        w.doModal()
-
-
-def getMagnet(text=""):
-    pos = text.rfind('/')
-    magnet = text[pos + 1:]
-    return unquoteName(magnet)
-
-
-def goodSpider():
-    from time import sleep
-    import random
-    sleep(random.randrange(100, 1000, 1) / 1000)
-
-
-def dirImages(value):
-    imageFile = os.path.join(settings.path, 'resources', 'images', value)
-    if not os.path.isfile(imageFile):
-        imageFile = settings.icon
-    return imageFile
-
-
-def removeDirectory(folder):
-    from os import listdir
-    from xbmc import translatePath
-
-    folder = folder.replace('special://temp/', translatePath('special://temp'))
-    folder = folder.replace('smb:', '')  # network compatibility
-    listFolders = listdir(folder)
-    rep = settings.dialog.select('Select the Folder to erase:', listFolders + ['-CANCEL'])
-    if rep < len(listFolders):
-        if settings.dialog.yesno("Attention!", "Are you sure to erase?", nolabel="No", yeslabel="Yes"):
-            __removeDirectory__(folder=folder, title=listFolders[rep])
-
-
-def __removeDirectory__(folder="", title=""):
-    info = formatTitle(title)
-    directory = os.path.join(folder, info['folder'])
-    if os.path.exists(directory):
-        import shutil
-        shutil.rmtree(directory, ignore_errors=True)
-    if not xbmc.getCondVisibility('Library.IsScanningVideo'):
-        xbmc.executebuiltin('XBMC.CleanLibrary(video)')  # clean the library
-
-
-def getPlayableLink(page):
-    exceptionsList = Storage(settings.storageName.replace(".txt", "-exceptions.txt"))
-    result = page
-    settings.debug(result)
-    if 'divxatope' in page:
-        page = page.replace('/descargar/', '/torrent/')
-        result = page
-    isLink = True
-    settings.debug(exceptionsList.database)
-    for exception in exceptionsList.database:
-        if exception in page:
-            isLink = False
-            break
-    if page.startswith("http") and isLink:
-        # exceptions
-        settings.debug(result)
-        # download page
-        try:
-            response = browser.get(page, verify=False)
-            data = normalize(response.text)
-            settings.debug(response.headers)
-            if 'text/html' in response.headers.get("content-type", ""):
-                content = re.findall('magnet:\?[^\'"\s<>\[\]]+', data)
-                if content != None and len(content) > 0:
-                    result = content[0]
-                else:
-                    content = re.findall('/download\?token=[A-Za-z0-9%]+', data)
-                    if content != None and len(content) > 0:
-                        result = settings.value["urlAddress"] + content[0]
-                    else:
-                        content = re.findall('/telechargement/[a-z0-9-_.]+', data)  #cpasbien
-                        if content != None and len(content) > 0:
-                            result = settings.value["urlAddress"] + content[0]
-                        else:
-                            content = re.findall('https?:[^\'"\s<>\[\]]+torrent', data)
-                            if content != None and len(content) > 0:
-                                result = content[0]
-            else:
-                exceptionsList.add(re.search("^https?:\/\/(.*?)/", page).group(1))
-                exceptionsList.save()
-        except:
-            pass
-    settings.log(result)
-    return result
-
-
-def getInfoLabels(infoTitle):
-    from metahandler import metahandlers
-    metaget = metahandlers.MetaData()
-    infoLabels = {}
-    try:
-        if infoTitle is str:  # if it is a string get the FormatTitle dict structure
-            infoTitle = formatTitle(infoTitle)
-        settings.debug(infoTitle)
-        cleanTitle = infoTitle["cleanTitle"]
-        year = infoTitle["year"]
-        if infoTitle["type"] == "MOVIE":
-            infoLabels = metaget.get_meta('movie', cleanTitle, year=year)
-        else:  # it is a TV Show or Anime
-            infoLabels = metaget.get_meta('tvshow', cleanTitle, year=year)
-        # cast and castandrole
-        castList = []
-        castAndRoleList = []
-        for item in infoLabels.get("cast", []):
-            if item is not None and item is str:
-                castList.append(item)
-                castAndRoleList.append((item, ""))
-            else:
-                castList.append(item[0])
-                castAndRoleList.append(item)
-        infoLabels["cast"] = castList
-        infoLabels["castandrole"] = castAndRoleList
-        # add episode and season
-        infoLabels['season'] = infoTitle['season']
-        infoLabels['episode'] = infoTitle['episode']
-    except:
-        pass
-    duration = 0
-    if infoLabels.has_key("duration") and infoLabels["duration"] != '' and infoLabels["duration"] != 'None':
-        duration = int(infoLabels["duration"])
-    infoLabels['duration'] = duration
-    # force creation
-    infoLabels['imdb_id'] = infoLabels.get('imdb_id', "")
-    infoLabels['cover_url'] = infoLabels.get("cover_url", settings.icon)
-    infoLabels['backdrop_url'] = infoLabels.get("backdrop_url", settings.fanart)
-    # add label
-    infoLabels['label'] = infoTitle["title"] + infoTitle.get("textQuality", "") + " " + infoTitle["language"]
-    settings.debug(infoLabels)
-    return infoLabels
-
-
-def getInfoStream(infoTitle={}, infoLabels={}):
-    infoStream = {'width': infoTitle["width"],
-                  'height': infoTitle["height"],
-                  'aspect': infoTitle["width"] / infoTitle["height"],
-                  'duration': infoLabels["duration"],
-                  }
-    return infoStream
-
-
-def getInfoSeason(infoLabels, seasons=[]):
-    from metahandler import metahandlers
-    metaget = metahandlers.MetaData()
-    images = metaget.get_seasons(tvshowtitle=infoLabels["title"], imdb_id=infoLabels["imdb_id"],
-                                 seasons=seasons, overlay=6)
-    seasons = []
-    for image in images:
-        if image["cover_url"] == "":
-            image["cover_url"] = infoLabels["cover_url"]
-        if image["backdrop_url"] == "":
-            image["backdrop_url"] = infoLabels["backdrop_url"]
-        seasons.append(image)
-    return seasons
-
-
-def getInfoEpisode(infoLabels):
-    from metahandler import metahandlers
-    metaget = metahandlers.MetaData()
-    result = infoLabels
-    try:
-        if infoLabels["episode"] != 0:
-            result = metaget.get_episode_meta(tvshowtitle=infoLabels["title"], imdb_id=infoLabels["imdb_id"],
-                                              season=infoLabels["season"], episode=infoLabels["episode"])
-    except:
-        pass
-    return result
-
-
-#  Search if a video is already in Kodi Database
-def existInKodiLibrary(id, season="1", episode="1"):
-    import json
-
-    result = False
-    if 'tt' in id:
-        # Movies
-        query = {
-            'jsonrpc': '2.0',
-            'id': 0,
-            'method': 'VideoLibrary.GetMovies',
-            'params': {
-                'properties': ['imdbnumber', 'file']
-            }
-        }
-        response = json.loads(xbmc.executeJSONRPC(json.dumps(query)))
-        movieDict = dict(
-            (movie['imdbnumber'], movie['file'])
-            for movie in response.get('result', {}).get('movies', [])
-        )
-        if movieDict.has_key(id):
-            result = True
-    else:
-        # TV Shows
-        query = {
-            'jsonrpc': '2.0',
-            'id': 0,
-            'method': 'VideoLibrary.GetTVShows',
-            'params': {
-                'properties': ['imdbnumber', 'file', 'season', 'episode']
-            }
-        }
-        response = json.loads(xbmc.executeJSONRPC(json.dumps(query)))
-        showDict = dict(
-            (show['imdbnumber'] + "-" + str(show['season']) + "-" + str(show['episode']), show['file'])
-            for show in response.get('result', {}).get('tvshows', [])
-        )
-        if showDict.has_key(id + "-" + str(season) + "-" + str(episode)):
-            result = True
-    return result
-
-
-############  INTEGRATION   ###########################
-def integration(titles=[], id=[], magnets=[], typeList='', folder='', typeVideo=[],
-                silence=False, message='', channel=""):
-    messageType = {'MOVIE': settings.string(32031), 'SHOW': settings.string(32032), 'ANIME': settings.string(32043),
-                   '': 'Videos'}
-    filters = Filtering()  # start filtering
-
-    total = len(titles)
-    answer = True
-    if not silence:
-        answer = settings.dialog.yesno(settings.string(32033) %
-                                       (normalize(settings.name), total), '%s' % titles)
-    if answer:  # it will integrate the filename list to the local library
-        if not silence:
-            settings.pDialog.create(settings.name, settings.string(32034) % (messageType[typeList], message))
-        else:
-            settings.notification(settings.string(32034) % (messageType[typeList], message))
-
-        cont = 0
-        for cm, title in enumerate(titles):
-            # typeVideo or typeList
-            if typeList == "":
-                typeListItem = typeVideo[cm]
-            else:
-                typeListItem = typeList
-            # folder
-            if folder == '':
-                if typeListItem == 'MOVIE':
-                    folder = settings.movieFolder
-                if typeListItem == 'SHOW':
-                    folder = settings.showFolder
-                if typeListItem == 'ANIME':
-                    folder = settings.animeFolder
-            # filters
-            if typeListItem == 'MOVIE':
-                filters.useMovie()
-            else:
-                filters.useTv()  # TV SHOWS and Anime
-            filters.information()
-            # formatTitle
-            info = formatTitle(title, typeVideo=typeListItem)
-            info['folder'] = info['folder'][:100].strip()  # to limit the length of directory name
-            check = True
-            detailsTitle = ''
-
-            if len(info['rest']) > 0:  # check for quality filtering
-                filters.title = info['title'] + ' ' + info['rest']
-                if filters.verify(filters.title, None):  # just check the quality no more
-                    check = True
-                    if settings.value.get("duplicated", "false") == "true":
-                        detailsTitle = ' ' + info['rest']
-                else:
-                    check = False
-            if check:  # the file has passed the filtering
-                name = info['title'] + detailsTitle
-                name = name[:99].strip()  # to limit the length of name
-
-                # Try to create the directory if it doesn't exist
-                directory = path.join(folder, info['folder'])
-                try:
-                    os.makedirs(directory)
-                except:
-                    pass
-                # Set-up the plugin
-                goodSpider()  # to be a smart spider
-                if channel == "":
-                    uri_string = quote_plus(getPlayableLink(uncodeName(normalize(magnets[cm]))))
-                    if settings.value["plugin"] == 'Pulsar':
-                        link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
-                    elif settings.value["plugin"] == 'KmediaTorrent':
-                        link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
-                    elif settings.value["plugin"] == "Torrenter":
-                        link = 'plugin://plugin.video.torrenter/?action=playSTRM&url=' + uri_string + \
-                               '&not_download_only=True'
-                    elif settings.value["plugin"] == "YATP":
-                        link = 'plugin://plugin.video.yatp/?action=play&torrent=' + uri_string
-                    else:
-                        link = 'plugin://plugin.video.xbmctorrent/play/%s' % uri_string
-                else:
-                    link = "plugin://plugin.video.pelisalacarta/?channel=%s&action=play_from_library&url=%s" % (
-                        channel, quote_plus(magnets[cm]))
-                settings.debug(link)
-                # start to create the strm file
-                filename = path.join(directory, name + ".strm")
-                # Find the code for the video
-                codeMovie = ""
-                codeShow = ""
-                infoLabels = getInfoLabels(info)
-                if len(id) > 0 and id[cm] != "":
-                    codeMovie = codeShow = id[cm]
-                else:
-                    codeMovie = infoLabels.get("imdb_id", "")  # it tries to retrieve the IMDB number from title
-                    codeShow = infoLabels.get("tvdb_id", "")  # it tries to retrieve the TVDB number from title
-                # Write the strm file
-                isAlreadyAdded = False
-                if typeListItem == "MOVIE":
-                    isAlreadyAdded = existInKodiLibrary(codeMovie)
-                else:
-                    isAlreadyAdded = existInKodiLibrary(codeShow, infoLabels['season'], infoLabels['episode'])
-                if (not os.path.isfile(filename) and not isAlreadyAdded) or settings.value["overwrite"] == 'true':
-                    cont += 1  # add new file's count
-                    with open(filename, "w") as text_file:  # create .strm
-                        text_file.write(link)
-                    if os.path.isfile("*.nfo"):
-                        settings.debug(".nfo existe!!!")
-                    if codeMovie != "" and codeShow != "":  # Only it creates the nfo file if it is a IMDB number
-                        if typeListItem == "MOVIE":
-                            with open(filename.replace(".strm", ".nfo"), "w") as text_file:  # create .nfo MOVIE
-                                text_file.write("http://www.imdb.com/title/%s/" % codeMovie)
-                            settings.debug("imdb= " + codeMovie)
-                        else:
-                            with open(path.join(directory, "tvshow.nfo"), "w") as text_file:  # create .nfo SHOW
-                                text_file.write("http://thetvdb.com/?tab=series&id=%s" % codeShow)
-                            settings.debug("tvdb= " + codeShow)
-
-                    if not silence: settings.pDialog.update(int(float(cm) / total * 100), settings.string(32036)
-                                                            % (directory, name))
-                    if not silence and settings.pDialog.iscanceled(): break
-                    if cont % 100 == 0: settings.notification(
-                        settings.string(32037) % (cont, messageType[typeListItem], message))
-                    settings.log(settings.string(32038) % filename)
-                elif isAlreadyAdded:
-                    settings.log("%s is already in the library" % name)
-                if not silence and settings.pDialog.iscanceled(): break
-        if not silence: settings.pDialog.close()
-
-        if cont > 0:  # There are files added
-            if not xbmc.getCondVisibility('Library.IsScanningVideo'):
-                xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
-            settings.log(settings.string(32040) % (cont, messageType[typeListItem], message))
-            if not silence:
-                settings.dialog.ok(settings.name, settings.string(32040) % (cont, messageType[typeListItem], message))
-            else:
-                settings.notification(settings.string(32040) % (cont, messageType[typeListItem], message))
-        else:
-            settings.log(settings.string(32041) % (messageType[typeListItem], message))
-            if not silence:
-                settings.dialog.ok(settings.name, settings.string(32042) % (messageType[typeListItem], message))
-            else:
-                settings.notification(settings.string(32042) % (messageType[typeListItem], message))
-                # del filters
-
-
-############  SUBSCRIPTION   ###########################
-def subscription(titles=[], id=[], typeList='', folder='', silence=False, message=''):
-    from types import StringType
-    messageType = {'MOVIE': settings.string(32031), 'SHOW': settings.string(32032)}
-    total = len(titles)
-    answer = True
-    if not silence:
-        answer = settings.dialog.yesno(settings.string(32033) %
-                                       (settings.name, total), '%s' % titles)
-
-    if answer:  # it will integrate the filename list to the local library
-        if not silence:
-            settings.pDialog.create(settings.name, settings.string(32034) % (messageType[typeList], message))
-        else:
-            settings.notification(settings.string(32034) % (messageType[typeList], message))
-        # Open Database
-        storage = Storage(settings.storageName, type="dict")
-        cont = 0
-        for cm, itemList in enumerate(titles):
-            info = formatTitle(itemList if typeList == 'MOVIE' else itemList + ' S00E00')
-            item = info['title'] if typeList == 'MOVIE' else info['cleanTitle']
-            if storage.database.has_key(item):
-                data = storage.database[item]
-                data = literal_eval(data) if type(data) == StringType else data
-                settings.debug('item(' + str(cm) + '): ' + str(data))
-                settings.debug('type item(' + str(cm) + '): ' + str(type(data)))
-                if typeList == 'SHOW':  # update the database to find new episodes
-                    tvShow = TvShowCode(data['ID'], data['lastEpisode'], data['lastSeason'])
-                    data['firstSeason'] = tvShow.firstSeason
-                    data['lastSeason'] = tvShow.lastSeason
-                    data['lastEpisode'] = tvShow.lastEpisode
-            else:
-                # create the item
-                data = {}
-                if len(id) > 0:
-                    data['ID'] = id[cm]
-                    if typeList == 'SHOW':
-                        tvShow = TvShowCode(id[cm])
-                        data['firstSeason'] = tvShow.firstSeason
-                        data['lastSeason'] = tvShow.lastSeason
-                        data['lastEpisode'] = tvShow.lastEpisode
-                else:
-                    if typeList == 'MOVIE':
-                        movie = Movie(item)  # name of the movie with (year) format: Frozen (2013)
-                        data['ID'] = movie.code  # search the IMDB id
-                    elif typeList == 'SHOW':
-                        tvShow = TvShow(info['cleanTitle'])  # search the name without year
-                        data['ID'] = tvShow.code
-                        if data['ID'] is not None:
-                            data['firstSeason'] = tvShow.firstSeason
-                            data['lastSeason'] = tvShow.lastSeason
-                            data['lastEpisode'] = tvShow.lastEpisode
-                data['type'] = typeList
-                data['season'] = 0
-                data['episode'] = 0
-
-            # start to create strm files
-            if typeList == 'MOVIE' and data['type'] == 'MOVIE' and data['episode'] == 0 and data[
-                'ID'] is not None and not existInKodiLibrary(data['ID']):
-                cont += 1
-                # Try to create the directory if it doesn't exist
-                directory = path.join(folder, info['folder'])
-                try:
-                    os.makedirs(directory)
-                except:
-                    pass
-                data['path'] = directory  # To be able to erase the folder
-
-                if settings.value["detailedLog"] == 'true':
-                    settings.log('Code %s=%s' % (typeList, data['ID']))
-
-                link = 'plugin://plugin.video.pulsar/movie/%s/%s' % (data['ID'], settings.value["action"])
-
-                # start to create the strm file
-                filename = path.join(directory, item + ".strm")
-                with open(filename, "w") as text_file:  # create .strm MOVIE
-                    text_file.write(link)
-                with open(filename.replace(".strm", ".nfo"), "w") as text_file:  # create .nfo MOVIE
-                    text_file.write("http://www.imdb.com/title/%s/" % data['ID'])
-                data['episode'] = 1
-                if not silence: settings.pDialog.update(int(float(cm) / total * 100), settings.string(32036)
-                                                        % (directory, item))
-                if cont % 100 == 0: settings.notification(settings.string(32037)
-                                                          % (cont, messageType[typeList], message))
-                settings.log(settings.string(32038) % filename)
-            elif typeList == 'SHOW' and data['type'] == 'SHOW' and data['ID'] is not None:  # add shows
-                if settings.value["specials"] == 'false' and data['firstSeason'] == 0:
-                    data['firstSeason'] = 1
-                directory = folder + item + folder[-1]
-                # Try to create the directory if it doesn't exist
-                directory = path.join(folder, info['folder'])
-                try:
-                    os.makedirs(directory)
-                except:
-                    pass
-                data['path'] = directory  # To be able to erase the folder
-                if settings.value["detailedLog"] == 'true':
-                    settings.log(settings.string(32035) % (typeList, data['ID']))
-                    settings.log(
-                        '%s %s-%s: %s' % (item, data['firstSeason'], data['lastSeason'], data['lastEpisode']))
-                with open(path.join(directory, "tvshow.nfo"), "w") as text_file:  # create .nfo SHOW
-                    text_file.write("http://thetvdb.com/?tab=series&id=%s" % data['ID'])
-                for season in range(max(data['season'], data['firstSeason']), data['lastSeason'] + 1):
-                    for episode in range(data['episode'] + 1, data['lastEpisode'][season] + 1):
-                        if not existInKodiLibrary(data['ID'], str(season), str(episode)):
-                            cont += 1
-                            link = 'plugin://plugin.video.pulsar/show/%s/season/%s/episode/%s/%s' % (
-                                data['ID'], season, episode, settings.value["action"])
-                            if not silence: settings.pDialog.update(int(float(cm) / total * 100),
-                                                                    "%s%s S%02dE%02d.strm" % (
-                                                                        directory, item, season, episode))
-                            if cont % 100 == 0: settings.notification(
-                                settings.string(32037) % (cont, messageType[typeList], message))
-                            filename = path.join(directory, item + " S%02dE%02d.strm" % (season, episode))
-                            with open(filename, "w") as text_file:  # create .strm
-                                text_file.write(link)
-                                settings.log(settings.string(32038) % filename)
-                            if not silence and settings.pDialog.iscanceled(): break
-                    data['episode'] = 0  # change to new season and reset the episode to 1
-                if not silence and settings.pDialog.iscanceled(): break
-                data['season'] = data['lastSeason']
-                if data['lastEpisode'].has_key(data['lastSeason']):
-                    data['episode'] = data['lastEpisode'][data['lastSeason']]
-                if not silence: settings.pDialog.update(int(float(cm) / total * 100),
-                                                        settings.string(32036) % (directory, item))
-                settings.log(settings.string(32039) % (directory, item))
-            # update database
-            if data['ID'] is not None:
-                storage.database[item] = data
-            if not silence and settings.pDialog.iscanceled(): break
-        # confirmation and close database
-        storage.save()
-        if cont > 0:
-            if not xbmc.getCondVisibility('Library.IsScanningVideo'):
-                xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
-            settings.log(settings.string(32040) % (cont, messageType[typeList], message))
-            if not silence:
-                settings.dialog.ok(settings.name, settings.string(32040) % (cont, messageType[typeList], message))
-            else:
-                settings.notification(settings.string(32040) % (cont, messageType[typeList], message))
-
-        else:
-            settings.log(settings.string(32041) % (messageType[typeList], message))
-            if not silence:
-                settings.dialog.ok(settings.name, settings.string(32042) % (messageType[typeList], message))
-            else:
-                settings.notification(settings.string(32042) % (messageType[typeList], message))
-        del storage
+# coding: utf-8
+# library to access URL, translation title and filtering
+# using the great jobs of ElDorado for scrobbling
+__author__ = 'mancuniancol'
+
+import os
+import bs4
+import requests
+import re
+import xbmcaddon
+import xbmc
+import xbmcgui
+from os import path
+from urllib import quote_plus
+from time import sleep
+from ast import literal_eval
+import xbmcplugin
+
+
+################################
+#### SCRAPER TITLES ############
+################################
+def normalize(name, onlyDecode=False):
+    from unicodedata import normalize
+    import types
+    if type(name) == types.StringType:
+        unicode_name = name.decode('unicode-escape')
+    else:
+        try:
+            unicode_name = name.encode('latin-1').decode('utf-8')  # to latin-1
+        except:
+            unicode_name = name
+    normalize_name = unicode_name if onlyDecode else normalize('NFKD', unicode_name)
+    return normalize_name.encode('ascii', 'ignore')
+
+
+def uncodeName(name):  # Convert all the &# codes to char, remove extra-space and normalize
+    from HTMLParser import HTMLParser
+    name = name.replace('<![CDATA[', '').replace(']]', '')
+    name = HTMLParser().unescape(name)
+    return name
+
+
+def unquoteName(name):  # Convert all %symbols to char
+    from urllib import unquote
+    return unquote(name).decode("utf-8")
+
+
+def safeName(value):  # Make the name directory and filename safe
+    value = normalize(value)  # First normalization
+    value = unquoteName(value)
+    value = uncodeName(value)
+    value = normalize(value)  # Last normalization, because some unicode char could appear from the previous steps
+    value = value.lower().title().replace('_', ' ')
+    # erase keyword
+    value = re.sub('^\[.*?\]', '', value)  # erase [HorribleSub] for ex.
+    # check for anime
+    value = re.sub('- ([0-9][0-9][0-9][0-9]) ', ' \g<1>', value + " ")
+    value = re.sub('- ([0-9]+) ', '- EP\g<1>', value + " ")
+    if 'season' not in value.lower():
+        value = value.lower().replace(" episode ", " - EP")
+    # check for qualities
+    value = value.replace("1920x1080", "1080p")
+    value = value.replace("1280x720", "720p")
+    value = value.replace("853x480", "480p")
+    value = value.replace("848x480", "480p")
+    value = value.replace("704x480", "480p")
+    value = value.replace("640x480", "480p")
+    value = value.replace("microhd", " microhd")  # sometimes comes with the year
+    value = value.replace("dvdrip", " dvdrip")  # sometimes comes with the year
+    keys = {'"': ' ', '*': ' ', '/': ' ', ':': ' ', '<': ' ', '>': ' ', '?': ' ', '|': ' ', '~': ' ',
+            "'": '', 'Of': 'of', 'De': 'de', '.': ' ', ')': ' ', '(': ' ', '[': ' ', ']': ' ', '-': ' '}
+    for key in keys.keys():
+        value = value.replace(key, keys[key])
+    value = ' '.join(value.split())
+    return value.replace('s h i e l d', 'SHIELD').replace('c s i', 'CSI')
+
+
+def checkQuality(text=""):
+    # quality
+    keyWords = {"Cam": ["camrip", "cam"],
+                "Telesync": ["ts", "telesync", "pdvd"],
+                "Workprint": ["wp", "workprint"],
+                "Telecine": ["tc", "telecine"],
+                "Pay-Per-View Rip": ["ppv", "ppvrip"],
+                "Screener": ["scr", "screener", "screeener", "dvdscr", "dvdscreener", "bdscr"],
+                "DDC": ["ddc"],
+                "R5": ["r5", "r5.line", "r5 ac3 5 1 hq"],
+                "DVD-Rip": ["dvdrip", "dvd-rip"],
+                "DVD-R": ["dvdr", "dvd-full", "full-rip", "iso rip", "lossless rip", "untouched rip", "dvd-5 dvd-9"],
+                "HDTV": ["dsr", "dsrip", "dthrip", "dvbrip", "hdtv", "pdtv", "tvrip", "hdtvrip", "hdrip", "hdit",
+                         "high definition"],
+                "VODRip": ["vodrip", "vodr"],
+                "WEB-DL": ["webdl", "web dl", "web-dl"],
+                "WEBRip": ["web-rip", "webrip", "web rip"],
+                "WEBCap": ["web-cap", "webcap", "web cap"],
+                "BD/BRRip": ["bdrip", "brrip", "blu-ray", "bluray", "bdr", "bd5", "bd", "blurip"],
+                "MicroHD": ["microhd"],
+                "FullHD": ["fullhd"],
+                "BR-Line": ["br line"],
+                # video formats
+                "x264": ["x264", "x 264"],
+                "x265 HEVC": ["x265 hevc", "x265", "x 265", "hevc"],
+                # audio
+                "DD5.1": ["dd5 1", "dd51", "dual audio 5"],
+                "AC3 5.1": ["ac3"],
+                "ACC": ["acc"],
+                "DUAL AUDIO": ["dual", "dual audio"],
+                }
+    color = {"Cam": "FFF4AE00",
+             "Telesync": "FFF4AE00",
+             "Workprint": "FFF4AE00",
+             "Telecine": "FFF4AE00",
+             "Pay-Per-View Rip": "FFD35400",
+             "Screener": "FFD35400",
+             "DDC": "FFD35400",
+             "R5": "FFD35400",
+             "DVD-Rip": "FFD35400",
+             "DVD-R": "FFD35400",
+             "HDTV": "FFD35400",
+             "VODRip": "FFD35400",
+             "WEB-DL": "FFD35400",
+             "WEBRip": "FFD35400",
+             "WEBCap": "FFD35400",
+             "BD/BRRip": "FFD35400",
+             "MicroHD": "FFD35400",
+             "FullHD": "FFD35400",
+             "BR-Line": "FFD35400",
+             # video formats
+             "x264": "FFFB0C06",
+             "x265 HEVC": "FFFB0C06",
+             # audio
+             "DD5.1": "FF089DE3",
+             "AC3 5.1": "FF089DE3",
+             "ACC": "FF089DE3",
+             "DUAL AUDIO": "FF089DE3",
+             }
+    quality = "480p"
+    textQuality = ""
+    for key in keyWords:
+        for keyWord in keyWords[key]:
+            if ' ' + keyWord + ' ' in ' ' + text + ' ':
+                quality = "480p"
+                textQuality += " [COLOR %s][%s][/COLOR]" % (color[key], key)
+
+    if "480p" in text:
+        quality = "480p"
+        textQuality += " [COLOR FF2980B9][480p][/COLOR]"
+    if "720p" in text:
+        quality = "720p"
+        textQuality += " [COLOR FF5CD102][720p][/COLOR]"
+    if "1080p" in text:
+        quality = "1080p"
+        textQuality += " [COLOR FFF4AE00][1080p][/COLOR]"
+    if "3d" in text:
+        quality = "1080p"
+        textQuality += " [COLOR FFD61515][3D][/COLOR]"
+    if "4k" in text:
+        quality = "2160p"
+        textQuality += " [COLOR FF16A085][4K][/COLOR]"
+    return quality, textQuality
+
+
+def width(quality="480p"):
+    result = 720
+    if '480p' in quality:
+        result = 720
+    elif '720p' in quality:
+        result = 1280
+    elif '1080p' in quality:
+        result = 1920
+    elif '2160p' in quality:
+        result = 2160
+    return result
+
+
+def height(quality="480p"):
+    result = 480
+    if '480p' in quality:
+        result = 480
+    elif '720p' in quality:
+        result = 720
+    elif '1080p' in quality:
+        result = 1080
+    elif '2160p' in quality:
+        result = 3840
+    return result
+
+
+def findLanguage(value=""):
+    language = ""  # It is english or unknown
+    if "spa" in value or "spanish" in value or "espanol" in value:
+        language = " Español "
+    if "hindi" in value:
+        language = "Hindi"
+    if "castellano" in value:
+        language = "Castellano"
+    if "french" in value or 'francais' in value:
+        language = "French"
+    if "german" in value:
+        language = "German"
+    return language
+
+
+def exceptionsTitle(title=""):
+    value = title + " "
+    if "csi " in value and "ny" not in value and "miami" not in value and "cyber" not in value:
+        title = title.replace("csi", "CSI Crime Scene Investigation")
+    if "juego de tronos" in value:
+        title = title.replace("juego de tronos", "Game of Thrones")
+    if "mentes criminales" in value:
+        title = title.replace("mentes criminales", "criminal minds")
+    if "les revenants" in value:
+        title = title.replace("les revenants", "The returned")
+    return title
+
+
+def _cleanTitle(value=''):
+    keywordsCleanTitle = ['version', 'extendida', 'extended', 'edition', 'hd', 'unrated', 'version', 'vose',
+                          'special', 'edtion', 'uncensored', 'fixed', 'censurada', 'episode', 'ova', 'complete',
+                          'swesub'
+                          ]
+    for keyword in keywordsCleanTitle:  # checking keywords
+        value = (value + ' ').replace(' ' + keyword.title() + ' ', ' ')
+    return value.strip()
+
+
+def formatTitle(value='', fileName='', typeVideo="MOVIE"):
+    if fileName.startswith('magnet'):
+        fileName = ''
+    if fileName == '':
+        fileName = value
+    pos = value.rfind("/")
+    value = value if pos < 0 else value[pos:]
+    value = safeName(value).lower() + ' '
+    fileName = safeName(fileName).lower() + ' '
+    quality, textQuality = checkQuality(value + ' ' + fileName)  # find quality
+    language = findLanguage(value)  # find language
+    formats = [' ep[0-9]+', ' s[0-9]+e[0-9]+', ' s[0-9]+ e[0-9]+', ' [0-9]+x[0-9]+',
+               ' [0-9][0-9][0-9][0-9] [0-9][0-9] [0-9][0-9]',
+               ' [0-9][0-9] [0-9][0-9] [0-9][0-9]', ' season [0-9]+ episode [0-9]+',
+               ' season [0-9]+', ' season[0-9]+', ' s[0-9][0-9]',
+               ' temporada [0-9]+ capitulo [0-9]+', ' temporada[0-9]+', ' temporada [0-9]+',
+               ' seizoen [0-9]+ afl [0-9]+', ' saison[0-9]+', ' saison [0-9]+',
+               ' temp [0-9]+ cap [0-9]+', ' temp[0-9]+ cap[0-9]+',
+               ]
+    keywords = ['en 1080p', 'en 720p', 'en dvd', 'en dvdrip', 'en hdtv', 'en bluray', 'en blurayrip',
+                'en web', 'en rip', 'en ts screener', 'en screener', 'en cam', 'en camrip', 'pcdvd', 'bdremux',
+                'en ts-screener', 'en hdrip', 'en microhd', '1080p', '720p', 'dvd', 'dvdrip', 'hdtv', 'bluray',
+                'blurayrip', 'web', 'rip', 'ts screener', 'screener', 'cam', 'camrip', 'ts-screener', 'hdrip',
+                'brrip', 'blu', 'webrip', 'hdrip', 'bdrip', 'microhd', 'ita', 'eng', 'esp', "spanish espanol",
+                'castellano', '480p', 'bd', 'bdrip', 'hi10p', 'sub', 'x264', 'sbs', '3d', 'br', 'hdts', 'dts',
+                'dual audio', 'hevc', 'aac', 'batch', 'h264', 'gratis', 'descargar', 'hd', 'html', 'hdit',
+                'blurip', 'high definition', 'german', 'french', 'truefrench', 'vostfr', 'dvdscr', 'swesub',
+                '4k', 'uhd',
+                ]
+    sshow = None
+    for format in formats:  # search if it is a show
+        sshow = re.search(format, value)  # format shows
+        if sshow is not None:
+            break
+    if sshow is None and typeVideo != "MOVIE":
+        if typeVideo == 'SHOW':
+            value += ' s00e00'
+        if typeVideo == 'ANIME':
+            value += ' ep00'
+        for format in formats:  # search if it is a show
+            sshow = re.search(format, value)  # format shows
+            if sshow is not None:
+                break
+    if sshow is None:
+        # it is a movie
+        value += ' 0000 '  # checking year
+        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
+        year = syear.group(0).strip()
+        pos = value.find(year)
+        if pos > 0:
+            title = value[:pos].strip()
+            rest = value[pos + 5:].strip().replace('0000', '')
+        else:
+            title = value.replace('0000', '')
+            rest = ''
+
+        while pos != -1:  # loop until doesn't have any keyword in the title
+            value = title + ' '
+            for keyword in keywords:  # checking keywords
+                pos = value.find(' ' + keyword + ' ')
+                if pos > 0:
+                    title = value[:pos]
+                    rest = value[pos:].strip() + ' ' + rest
+                    break
+
+        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
+        cleanTitle = _cleanTitle(title)
+        # finishing cleanTitle
+        if '0000' not in year:
+            title += ' (' + year.strip() + ')'
+        year = year.replace('0000', '')
+        folder = title
+        result = {'title': title, 'folder': folder, 'rest': rest.strip(), 'type': 'MOVIE', 'cleanTitle': cleanTitle,
+                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
+                  "width": width(quality), 'language': language, 'folderPath': settings.movieFolder
+                  }
+        return result
+    else:
+        # it is a show
+        rest = value.strip()  # original name
+        seasonEpisode = sshow.group(0)
+        # clean title
+        for keyword in keywords:  # checking keywords
+            value = value.replace(' ' + keyword + ' ', ' ')
+        title = value[:value.find(seasonEpisode)].strip()
+        title = title.strip()
+        seasonEpisode = seasonEpisode.replace('temporada ', 's').replace(' capitulo ', 'e')
+        seasonEpisode = seasonEpisode.replace('season ', 's').replace(' episode ', 'e')
+        seasonEpisode = seasonEpisode.replace('temp ', 's').replace(' cap ', 'e')
+        seasonEpisode = seasonEpisode.replace('seizoen ', 's').replace(' afl ', 'e')
+
+        if 'x' in seasonEpisode:
+            seasonEpisode = 's' + seasonEpisode.replace('x', 'e')
+
+        if 's' in seasonEpisode and 'e' in seasonEpisode and 'season' not in seasonEpisode:  # force S00E00 instead S0E0
+            temp_episode = seasonEpisode.replace('s', '').split('e')
+            seasonEpisode = 's%02de%02d' % (int(temp_episode[0]), int(temp_episode[1]))
+
+        if 's' not in seasonEpisode and 'e' not in seasonEpisode:  # date format
+            date = seasonEpisode.split()
+            if len(date[0]) == 4:  # yyyy-mm-dd format
+                seasonEpisode = seasonEpisode.replace(' ', '-')  # date style episode talk shows
+            else:  # dd mm yy format
+                if int(date[2]) > 50:
+                    date[2] = '19' + date[2]
+                else:
+                    date[2] = '20' + date[2]
+                seasonEpisode = date[2] + '-' + date[1] + '-' + date[0]
+
+        seasonEpisode = seasonEpisode.replace(' ', '')  # remove spaces in the episode format
+        title = exceptionsTitle(title)
+        # finding year
+        value = title + ' 0000 '
+        syear = re.search(' [0-9][0-9][0-9][0-9] ', value)
+        year = syear.group(0).strip()
+        pos = value.find(year)
+        if pos > 0:
+            title = value[:pos].strip()
+        title = value.replace('0000', '')
+        year = year.replace('0000', '')
+        # the rest
+        title = title.title().strip().replace('Of ', 'of ').replace('De ', 'de ')
+        folder = title  # with year
+        cleanTitle = _cleanTitle(title.replace(year, '').strip())  # without year
+        title = folder + ' ' + seasonEpisode.upper()
+        title = title.replace('S00E00', '').replace('EP00', '')
+        ttype = "SHOW"
+        result = {'title': title, 'folder': folder, 'rest': rest, 'type': ttype, 'cleanTitle': cleanTitle,
+                  'year': year, 'quality': quality, 'textQuality': textQuality, 'height': height(quality),
+                  "width": width(quality), "language": language, 'folderPath': settings.showFolder
+                  }
+        if bool(re.search("EP[0-9]+", title)):
+            result['type'] = "ANIME"
+            result['folderPath'] = settings.animeFolder
+            result['season'] = 1
+            result['episode'] = int(seasonEpisode.replace('ep', ''))
+        else:
+            temp = (seasonEpisode.replace('s', '')).split('e')
+            result['season'] = 0
+            result['episode'] = 0
+            try:
+                result['season'] = int(temp[0])
+                result['episode'] = int(temp[1])
+            except:
+                pass
+        return result
+
+
+class UnTaggle():
+    infoTitle = {}
+    infoLabels = {}
+    infoStream = {}
+    title = ""
+    fileName = ""
+    typeVideo = ""
+    label = ""
+    id = ""
+    info = {}
+    cover = ""
+    fanart = ""
+    season = ""
+    episode = ""
+    imdb_id = ""
+    titleEpisode = ""
+
+    def __init__(self, value='', fileName='', typeVideo="MOVIE", useUrl=True):
+        self.title = normalize(value)
+        self.fileName = fileName
+        if useUrl:
+            self.infoTitle = formatTitle(value, fileName, typeVideo)  # organize the title information
+        else:
+            self.infoTitle = formatTitle(value, '', typeVideo)  # organize the title information
+        self.typeVideo = self.infoTitle["type"]
+        if settings.value["infoLabels"] == "true":
+            self.infoLabels = getInfoLabels(self.infoTitle)  # using script.module.metahandlers to the the infoLabels
+            self.infoStream = getInfoStream(self.infoTitle, self.infoLabels)
+        settings.debug(self.infoTitle)
+        settings.debug(self.infoLabels)
+        settings.debug(self.infoStream)
+        self.info = self.infoLabels
+        self.label = self.infoTitle["title"] + self.infoTitle.get("textQuality", "") + " " + self.infoTitle["language"]
+        self.id = self.infoLabels.get("imdb_id", "")
+        self.imdb_id = self.id
+        if self.infoTitle["type"] == 'SHOW' and settings.value[
+            "infoLabels"] == "true":  # difference with show and anime
+            self.info = getInfoEpisode(self.infoLabels)
+            self.id = self.infoLabels.get("tvdb_id", "")
+            self.titleEpisode = ' - ' + normalize(self.info.get('title', "")) if self.info.get('title', "") != "" else ""
+            self.label += self.titleEpisode
+            self.season = self.infoTitle.get("season", "")
+            self.episode = self.infoTitle.get("episode", "")
+        self.cover = self.info.get('cover_url', settings.icon)
+        self.fanart = self.info.get("backdrop_url", settings.fanart)
+
+
+################################
+#### CLASS #####################
+################################
+class Storage():
+    def __init__(self, fileName="", type="list", eval=False):
+        from ast import literal_eval
+        self.path = os.path.join(xbmc.translatePath('special://temp'), fileName)
+        self.type = type
+        if type == "list":
+            # get the list
+            self.database = []
+            try:
+                with open(self.path, 'r') as fp:
+                    for line in fp:
+                        self.database.append(line.strip())
+            except:
+                pass
+        elif type == "dict":
+            # get the Dictionary
+            self.database = {}
+            try:
+                with open(self.path, 'r') as fp:
+                    for line in fp:
+                        listedline = line.strip().split('::')  # split around the :: sign
+                        if len(listedline) > 1:  # we have the : sign in there
+                            settings.debug(listedline[0] + ' : ' + listedline[1])
+                            self.database[listedline[0]] = listedline[1] if not eval else literal_eval(listedline[1])
+            except:
+                pass
+
+    def destroy(self):  # Erase the database from the HD
+        try:
+            os.remove(self.path)
+        except OSError:
+            pass
+
+    def add(self, key="", info="", safe=True):  # add element
+        if self.type == "list" and key not in self.database:
+            self.database.append(key)
+        elif self.type == "dict":
+            if safe:
+                keySafe = formatTitle(key)
+                self.database[keySafe['folder']] = info
+            else:
+                self.database[key] = info
+
+    def remove(self, key="", safe=True):  # remove element
+        if self.type == "list":
+            self.database.remove(key)
+        elif self.type == "dict":
+            if safe:
+                keySafe = formatTitle(key)
+                del self.database[keySafe['folder']]
+            else:
+                del self.database[key]
+
+    def save(self):  # save the database
+        if self.type == "list":
+            # save the list
+            with open(self.path, 'w') as fp:
+                for p in self.database:
+                    fp.write("%s\n" % p)
+        elif self.type == "dict":
+            # save the dictionary
+            with open(self.path, 'w') as fp:
+                for p in self.database.items():
+                    fp.write("%s::%s\n" % p)
+
+
+class Settings:  # Read Configuration's Addon
+    def __init__(self, anime=False):
+        # Objects
+        self.dialog = xbmcgui.Dialog()
+        self.pDialog = xbmcgui.DialogProgress()
+        self.settings = xbmcaddon.Addon()
+
+        # General information
+        self.idAddon = self.settings.getAddonInfo('ID')  # gets name
+        self.icon = self.settings.getAddonInfo('icon')
+        self.fanart = self.settings.getAddonInfo('fanart')
+        self.path = self.settings.getAddonInfo('path')
+        self.name = self.settings.getAddonInfo('name')  # gets name
+        self.cleanName = re.sub('.COLOR (.*?)]', '', self.name.replace('[/COLOR]', ''))
+        self.storageName = self.cleanName + ".txt"  # Name Database
+
+        # Everything else
+        self.value = {}  # it contains all the settings from xml file
+        self.value["movieFolder"] = ""
+        self.value["showFolder"] = ""
+        self.value["animeFolder"] = ""
+
+        with open(path.join(self.path, "resources", "settings.xml"), 'r') as fp:
+            data = fp.read()
+        soup = bs4.BeautifulSoup(data)
+        settings = soup.select("setting")
+        for setting in settings:
+            id = setting.attrs.get("id")
+            if id is not None:
+                self.value[id] = self.settings.getSetting(id)
+
+        # Set-up Output folder
+        self.movieFolder = self.__folder__(self.value["movieFolder"], "movies")
+        self.showFolder = self.__folder__(self.value["showFolder"], "shows")
+        self.animeFolder = self.__folder__(self.value["animeFolder"], "animes")
+
+        # subscription
+        if "subscription" in self.cleanName.lower(): self.__subscription__()
+
+    def __folder__(self, folder, default=""):  # Change to OS friendly names
+        if folder == '':  # define default folder
+            folder = 'special://temp/%s/' % default
+        folder = folder.replace('special://temp/', xbmc.translatePath('special://temp'))
+        return folder.replace('smb:', '')  # network compatibility
+
+    def __subscription__(self):  # Additional Code for Subscription List Scripts
+        # remove .strm
+        self.debug("removeStrm= " + self.value["removeStrm"])
+        if self.value["removeStrm"] == 'true':
+            self.notification('Removing .strm files...')
+            if self.value["typeLibrary"] == "Global":
+                self.storageName = "quasar global subscription.txt"
+            storage = Storage(self.storageName, type="dict")
+            from shutil import rmtree
+            for item in storage.database:
+                data = literal_eval(storage.database[item])
+                rmtree(data['path'])
+                settings.log('path: ' + data['path'] + ' removed!!')
+            self.log('All .strm files removed!')
+            self.notification('All .strm files removed!', force=True)
+            self.settings.setSetting('removeStrm', 'false')
+        # clear the database
+        self.debug("clearDatabase= " + self.value["clearDatabase"])
+        if self.value["clearDatabase"] == 'true':
+            self.notification('Erasing Database...', force=True)
+            storage = Storage(self.storageName, type="dict")
+            storage.destroy()
+            self.settings.setSetting('clearDatabase', 'false')
+
+    def log(self, message="", level=xbmc.LOGNOTICE):  # to write in the Kodi's log
+        try:
+            if message is not str:
+                message = str(message)
+            try:
+                xbmc.log('[' + self.cleanName + '] ' + message, level=level)
+            except:
+                xbmc.log('[' + self.cleanName + '] ' + safeName(message), level=level)
+        except:
+            xbmc.log("Error with the message", level=xbmc.LOGERROR)
+
+    def debug(self, message=""):  # to write in the Kodi's log
+        self.log(message, xbmc.LOGDEBUG)
+
+    def notification(self, message="", force=False, time=1000):  # to display a message in Kodi
+        if float(self.value["timeNotification"]) > 0 or force:
+            xbmcgui.Dialog().notification(self.name, "%s" % message, self.icon,
+                                          time if force else int(float(self.value["timeNotification"]) * 1000))
+
+    def string(self, id):
+        return self.settings.getLocalizedString(id)
+
+
+#############################################
+##############Browser HTTPS support##########
+#############################################
+
+class Response:
+    def __init__(self, text, status_code):
+        self.text = text
+        self.status_code = int(status_code)
+
+
+class Browser:
+    headers = {}
+    cookies = {}
+
+    def __init__(self):
+        self.headers[
+            'User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
+
+    def get(self, url='', cookies={}):
+        import httplib2
+        from urllib import urlencode
+        h = httplib2.Http(disable_ssl_certificate_validation=True)
+        resp, content = h.request(url, method="GET", headers=self.headers, body=urlencode(cookies))
+        self.headers['Cookie'] = resp['set-cookie']
+        return Response(content, resp['status'])
+
+    def post(self, url='', data={}):
+        from urllib import urlencode
+        import httplib2
+        h = httplib2.Http(disable_ssl_certificate_validation=True)
+        resp, content = h.request(url, method="POST", headers=self.headers, body=urlencode(data))
+        self.headers['Cookie'] = resp['set-cookie']
+        return Response(content, resp['status'])
+
+
+# Create settings object and browser to be used in the other tool's functions
+settings = Settings()
+browser = requests.Session()
+browser2 = Browser()
+browser.headers[
+    'User-agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36'
+browser.headers['Accept-Language'] = 'en'
+
+
+class TextViewer_Dialog(xbmcgui.WindowXMLDialog):  # taking from script.toolbox
+    ACTION_PREVIOUS_MENU = [9, 92, 10]
+
+    def __init__(self, *args, **kwargs):
+        xbmcgui.WindowXMLDialog.__init__(self)
+
+        self.text = kwargs.get('text')
+        self.header = kwargs.get('header')
+
+    def onInit(self):
+        self.getControl(1).setLabel(self.header)
+        self.getControl(5).setText(self.text)
+
+    def onAction(self, action):
+        if action in self.ACTION_PREVIOUS_MENU:
+            self.close()
+
+    def onClick(self, controlID):
+        pass
+
+    def onFocus(self, controlID):
+        pass
+
+
+class Filtering:
+    def __init__(self):
+        self.reason = ''
+        self.title = ''
+        self.quality_allow = ['*']
+        self.quality_deny = []
+        self.title = ''
+        self.maxSize = 10.00  # 10 it is not limit
+        self.minSize = 0.00
+
+        # size
+        if settings.value.has_key('movieMinSize'):  # there is size restrictions
+            settings.value['movieMinSize'] = float(settings.value['movieMinSize'])
+        else:
+            settings.value['movieMinSize'] = 0.0
+        self.movieMinSize = settings.value['movieMinSize']
+
+        if settings.value.has_key('movieMaxSize'):  # there is size restrictions
+            settings.value['movieMaxSize'] = float(settings.value['movieMaxSize'])
+        else:
+            settings.value['movieMaxSize'] = 10.0
+        self.movieMaxSize = settings.value['movieMaxSize']
+
+        if settings.value.has_key('tvMinSize'):  # there is size restrictions
+            settings.value['tvMinSize'] = float(settings.value['movieMinSize'])
+        else:
+            settings.value['tvMinSize'] = 0.0
+        self.tvMinSize = settings.value['tvMinSize']
+
+        if settings.value.has_key('tvMaxSize'):  # there is size restrictions
+            settings.value['tvMaxSize'] = float(settings.value['movieMaxSize'])
+        else:
+            settings.value['tvMaxSize'] = 10.0
+        self.tvMaxSize = settings.value['tvMaxSize']
+
+        # movie
+        movieAllow = []
+        if settings.value.has_key('movieKeyAllow') and settings.value['movieKeyAllow'] <> "":
+            movieAllow = re.split(',', settings.value['movieKeyAllow'].replace(', ', ',').replace(' ,', ','))
+        if settings.value.has_key('movieQua1') and settings.value['movieQua1'] == 'Accept File':
+            movieAllow.append('480p')  # 480p
+        if settings.value.has_key('movieQua2') and settings.value['movieQua2'] == 'Accept File':
+            movieAllow.append('HDTV')  # HDTV
+        if settings.value.has_key('movieQua3') and settings.value['movieQua3'] == 'Accept File':
+            movieAllow.append('720p')  # 720p
+        if settings.value.has_key('movieQua4') and settings.value['movieQua4'] == 'Accept File':
+            movieAllow.append('1080p')  # 1080p
+        if settings.value.has_key('movieQua5') and settings.value['movieQua5'] == 'Accept File':
+            movieAllow.append('3D')  # 3D
+        if settings.value.has_key('movieQua6') and settings.value['movieQua6'] == 'Accept File':
+            movieAllow.append('CAM')  # CAM
+        if settings.value.has_key('movieQua7') and settings.value['movieQua7'] == 'Accept File':
+            movieAllow.extend(['TeleSync', ' TS '])  # TeleSync
+        if settings.value.has_key('movieQua8') and settings.value['movieQua8'] == 'Accept File':
+            movieAllow.append('Trailer')  # Trailer
+
+        # Block File
+        movieDeny = []
+        if settings.value.has_key('movieKeyDenied') and settings.value['movieKeyDenied'] <> "":
+            movieDeny = re.split(',', settings.value['movieKeyDenied'].replace(', ', ',').replace(' ,', ','))
+        if settings.value.has_key('movieQua1') and settings.value['movieQua1'] == 'Block File':
+            movieDeny.append('480p')  # 480p
+        if settings.value.has_key('movieQua2') and settings.value['movieQua2'] == 'Block File':
+            movieDeny.append('HDTV')  # HDTV
+        if settings.value.has_key('movieQua3') and settings.value['movieQua3'] == 'Block File':
+            movieDeny.append('720p')  # 720p
+        if settings.value.has_key('movieQua4') and settings.value['movieQua4'] == 'Block File':
+            movieDeny.append('1080p')  # 1080p
+        if settings.value.has_key('movieQua5') and settings.value['movieQua5'] == 'Block File':
+            movieDeny.append('3D')  # 3D
+        if settings.value.has_key('movieQua6') and settings.value['movieQua6'] == 'Block File':
+            movieDeny.append('CAM')  # CAM
+        if settings.value.has_key('movieQua7') and settings.value['movieQua7'] == 'Block File':
+            movieDeny.extend(['TeleSync', ' TS '])  # TeleSync
+        if settings.value.has_key('movieQua8') and settings.value['movieQua8'] == 'Block File':
+            movieDeny.append('Trailer')  # Trailer
+
+        if '' in movieAllow: movieAllow.remove('')
+        if '' in movieDeny: movieDeny.remove('')
+        if len(movieAllow) == 0: movieAllow = ['*']
+        self.movieAllow = movieAllow
+        self.movieDeny = movieDeny
+
+        # TV
+        tvAllow = []
+        if settings.value.has_key('tvKeyAllow'):
+            tvAllow.append(re.split(',', settings.value['tvKeyAllow'].replace(', ', ',').replace(' ,', ',')))
+        if settings.value.has_key('tvQua1') and settings.value['tvQua1'] == 'Accept File':
+            tvAllow.append('480p')  # 480p
+        if settings.value.has_key('tvQua2') and settings.value['tvQua2'] == 'Accept File':
+            tvAllow.append('HDTV')  # HDTV
+        if settings.value.has_key('tvQua3') and settings.value['tvQua3'] == 'Accept File':
+            tvAllow.append('720p')  # 720p
+        if settings.value.has_key('tvQua4') and settings.value['tvQua4'] == 'Accept File':
+            tvAllow.append('1080p')  # 1080p
+
+        # Block File
+        tvDeny = []
+        if settings.value.has_key('tvKeyDeny'):
+            tvDeny.append(re.split(',', settings.value['tvKeyDeny'].replace(', ', ',').replace(' ,', ',')))
+        if settings.value.has_key('tvQua1') and settings.value['tvQua1'] == 'Block File':
+            tvDeny.append('480p')  # 480p
+        if settings.value.has_key('tvQua2') and settings.value['tvQua2'] == 'Block File':
+            tvDeny.append('HDTV')  # HDTV
+        if settings.value.has_key('tvQua3') and settings.value['tvQua3'] == 'Block File':
+            tvDeny.append('720p')  # 720p
+        if settings.value.has_key('tvQua4') and settings.value['tvQua4'] == 'Block File':
+            tvDeny.append('1080p')  # 1080p
+
+        if '' in tvAllow: tvAllow.remove('')
+        if '' in tvDeny: tvDeny.remove('')
+        if len(tvAllow) == 0: tvAllow = ['*']
+        self.tvAllow = tvAllow
+        self.tvDeny = tvDeny
+
+    def useMovie(self):
+        self.qualityAllow = self.movieAllow
+        self.qualityDeny = self.movieDeny
+        self.minSize = self.movieMinSize
+        self.maxSize = self.movieMaxSize
+
+    def useTv(self):
+        self.qualityAllow = self.tvAllow
+        self.qualityDeny = self.tvDeny
+        self.minSize = self.tvMinSize
+        self.maxSize = self.tvMaxSize
+
+    def information(self):
+        settings.log('Accepted Keywords: %s' % str(self.qualityAllow))
+        settings.log('Blocked Keywords: %s' % str(self.qualityDeny))
+        settings.log('min Size: %s' % str(self.minSize) + ' GB')
+        settings.log('max Size: %s' % str(self.maxSize) + ' GB') if self.maxSize != 10 else 'MAX'
+
+    # validate keywords
+    def included(self, value, keys, strict=False):
+        value = ' ' + normalize(value) + ' '
+        res = False
+        if '*' in keys:
+            res = True
+        else:
+            res1 = []
+            for key in keys:
+                res2 = []
+                for item in re.split('\s', key):
+                    item = normalize(item)
+                    item = item.replace('?', ' ')
+                    if strict: item = ' ' + item + ' '  # it makes that strict the comparation
+                    if item.upper() in value.upper():
+                        res2.append(True)
+                    else:
+                        res2.append(False)
+                res1.append(all(res2))
+            res = any(res1)
+        return res
+
+    # validate size
+    def size_clearance(self, size):
+        max_size1 = 100 if self.maxSize == 10 else self.maxSize
+        res = False
+        value = float(re.split('\s', size.replace(',', ''))[0])
+        value *= 0.001 if 'M' in size else 1
+        if self.minSize <= value <= max_size1:
+            res = True
+        return res
+
+    # verify
+    def verify(self, name, size):  # modify to just check quality and size, not name
+        self.reason = name.replace(' - ' + settings.cleanName, '') + ' ***Blocked File by'
+        result = True
+        if name != None:
+            if not self.included(name, self.qualityAllow) or self.included(name, self.qualityDeny):
+                self.reason += ", Keyword"
+                result = False
+        if size != None:
+            if not self.size_clearance(size):
+                result = False
+                self.reason += ", Size"
+        self.reason = self.reason.replace('by,', 'by') + '***'
+        return result
+
+
+#######################################
+######## CLASS FOR SUBSCRIPTION #######
+#######################################
+class TvShow():
+    def __init__(self, name):
+        import urllib
+
+        browser.get('http://localhost:65251/shows/search?q=%s' % urllib.quote(name))
+        sleep(0.2)
+        response = browser.get('http://localhost:65251/shows/search?q=%s' % urllib.quote(name))
+        if response.status_code == requests.codes.ok:
+            data = response.json()
+            dataShow = None
+            if len(data['items']) > 0:  # To find the right Tv Show
+                dataShow = data['items'][0]
+                for item in data['items']:
+                    if item['label'].lower() == name.lower():
+                        dataShow = item
+                        break
+            if dataShow is not None:
+                self.code = dataShow['path'].replace('plugin://plugin.video.quasar/show/', '').replace(
+                    '/seasons', '')
+                sleep(0.2)
+                response = browser.get('http://localhost:65251/show/%s/seasons' % self.code)
+                data = {}
+                try:
+                    data = response.json()
+                except:
+                    data['items'] = []
+                seasons = []
+                for item in data['items']:
+                    seasons.append(int(item['label'].replace('Season ', '').replace('Specials', '0')))
+                seasons.sort()
+                episodes = {}
+                for season in seasons:
+                    sleep(0.2)
+                    response = browser.get('http://localhost:65251/show/%s/season/%s/episodes' % (self.code, season))
+                    data = response.json()
+                    episodes[season] = len(data['items'])
+                if len(seasons) > 0:
+                    self.firstSeason = seasons[0]
+                    self.lastSeason = seasons[-1]
+                else:
+                    self.firstSeason = 0
+                    self.lastSeason = 0
+                self.lastEpisode = episodes
+            else:
+                self.code = None
+        else:
+            self.code = None
+
+
+class TvShowCode():
+    def __init__(self, code, episodes={}, lastSeason=0):
+        self.code = code
+        response = browser.get('http://localhost:65251/show/%s/seasons' % self.code)
+        data = {}
+        try:
+            data = response.json()
+        except:
+            data['items'] = []
+        seasons = []
+        for item in data['items']:
+            seasons.append(int(item['label'].replace('Season ', '').replace('Specials', '0')))
+        seasons.sort()
+        if episodes.has_key(0):
+            del episodes[0]
+        if lastSeason is not 0:
+            del episodes[lastSeason]
+        for season in seasons:
+            if not episodes.has_key(season):
+                sleep(0.2)
+                response = browser.get('http://localhost:65251/show/%s/season/%s/episodes' % (self.code, season))
+                data = response.json()
+                episodes[season] = len(data['items'])
+        if len(seasons) > 0:
+            self.firstSeason = seasons[0]
+            self.lastSeason = seasons[-1]
+        else:
+            self.firstSeason = 0
+            self.lastSeason = 0
+        self.lastEpisode = episodes
+
+
+class Movie():
+    def __init__(self, name):
+        import urllib
+
+        if ')' in name and '(' in name:
+            try:
+                yearMovie = int(name[name.find("(") + 1:name.find(")")])
+                name = name.replace('(%s)' % yearMovie, '').rstrip()
+            except:
+                yearMovie = None
+        else:
+            yearMovie = None
+        browser.get('http://localhost:65251/movies/search?q=%s' % urllib.quote(name))  # avoid not info
+        sleep(1.0)
+        response = browser.get('http://localhost:65251/movies/search?q=%s' % urllib.quote(name))
+        if response.status_code == requests.codes.ok:
+            data = response.json()
+            if len(data['items']) > 0:
+                if yearMovie is not None:
+                    for movie in data['items']:
+                        label = movie['label']
+                        path = movie['path']
+                        if movie['info'].has_key('year'):
+                            year = movie['info']['year']
+                        else:
+                            year = 0000
+                        if year == yearMovie:
+                            break
+                else:
+                    label = data['items'][0]['label']
+                    path = data['items'][0]['path']
+                    year = data['items'][0]['info']['year']
+                self.code = path.replace('plugin://plugin.video.quasar/movie/', '').replace('/play', '')
+                self.label = label
+                self.year = year
+            else:
+                self.code = None
+                self.label = name
+        else:
+            self.code = None
+            self.label = name
+
+
+class Magnet():
+    def __init__(self, magnet):
+        self.magnet = magnet + '&'
+        # hash
+        hash = re.search('urn:btih:(.*?)&', self.magnet)
+        result = ''
+        if hash is not None:
+            result = hash.group(1)
+        self.hash = result
+        # name
+        name = re.search('dn=(.*?)&', self.magnet)
+        result = ''
+        if name is not None:
+            result = name.group(1).replace('+', ' ')
+        self.name = safeName(result)
+        # trackers
+        self.trackers = re.findall('tr=(.*?)&', self.magnet)
+
+
+################################
+#### FUNCTIONS #################
+################################
+def printer(message=""):
+    print '****************************'
+    print message
+    print '*-**************************'
+
+
+def find_nth(string="", substring="", nth=1, start=0):
+    start = string.find(substring, start)
+    if nth == 1 or start == -1:
+        return start
+    else:
+        return find_nth(string, substring, nth - 1, start + len(substring))
+
+
+def textViewer(text="", once=False):
+    if not once or (once and settings.settings.getSetting("firstOpen") != "NO"):
+        settings.settings.setSetting("firstOpen", "NO")
+        w = TextViewer_Dialog('DialogTextViewer.xml', settings.path, header=settings.name, text=text)
+        w.doModal()
+
+
+def getMagnet(text=""):
+    pos = text.rfind('/')
+    magnet = text[pos + 1:]
+    return unquoteName(magnet)
+
+
+def goodSpider():
+    from time import sleep
+    import random
+    sleep(random.randrange(100, 1000, 1) / 1000)
+
+
+def dirImages(value):
+    imageFile = os.path.join(settings.path, 'resources', 'images', value)
+    if not os.path.isfile(imageFile):
+        imageFile = settings.icon
+    return imageFile
+
+
+def removeDirectory(folder):
+    from os import listdir
+    from xbmc import translatePath
+
+    folder = folder.replace('special://temp/', translatePath('special://temp'))
+    folder = folder.replace('smb:', '')  # network compatibility
+    listFolders = listdir(folder)
+    rep = settings.dialog.select('Select the Folder to erase:', listFolders + ['-CANCEL'])
+    if rep < len(listFolders):
+        if settings.dialog.yesno("Attention!", "Are you sure to erase?", nolabel="No", yeslabel="Yes"):
+            __removeDirectory__(folder=folder, title=listFolders[rep])
+
+
+def __removeDirectory__(folder="", title=""):
+    info = formatTitle(title)
+    directory = os.path.join(folder, info['folder'])
+    if os.path.exists(directory):
+        import shutil
+        shutil.rmtree(directory, ignore_errors=True)
+    if not xbmc.getCondVisibility('Library.IsScanningVideo'):
+        xbmc.executebuiltin('XBMC.CleanLibrary(video)')  # clean the library
+
+
+def getPlayableLink(page):
+    exceptionsList = Storage(settings.storageName.replace(".txt", "-exceptions.txt"))
+    result = page
+    settings.debug(result)
+    if 'divxatope' in page:
+        page = page.replace('/descargar/', '/torrent/')
+        result = page
+    isLink = True
+    settings.debug(exceptionsList.database)
+    for exception in exceptionsList.database:
+        if exception in page:
+            isLink = False
+            break
+    if page.startswith("http") and isLink:
+        # exceptions
+        settings.debug(result)
+        # download page
+        try:
+            response = browser.get(page, verify=False)
+            data = normalize(response.text)
+            settings.debug(response.headers)
+            if 'text/html' in response.headers.get("content-type", ""):
+                content = re.findall('magnet:\?[^\'"\s<>\[\]]+', data)
+                if content != None and len(content) > 0:
+                    result = content[0]
+                else:
+                    content = re.findall('/download\?token=[A-Za-z0-9%]+', data)
+                    if content != None and len(content) > 0:
+                        result = settings.value["urlAddress"] + content[0]
+                    else:
+                        content = re.findall('/telechargement/[a-z0-9-_.]+', data)  #cpasbien
+                        if content != None and len(content) > 0:
+                            result = settings.value["urlAddress"] + content[0]
+                        else:
+                            content = re.findall('https?:[^\'"\s<>\[\]]+torrent', data)
+                            if content != None and len(content) > 0:
+                                result = content[0]
+            else:
+                exceptionsList.add(re.search("^https?:\/\/(.*?)/", page).group(1))
+                exceptionsList.save()
+        except:
+            pass
+    settings.log(result)
+    return result
+
+
+def getInfoLabels(infoTitle):
+    from metahandler import metahandlers
+    metaget = metahandlers.MetaData()
+    infoLabels = {}
+    try:
+        if infoTitle is str:  # if it is a string get the FormatTitle dict structure
+            infoTitle = formatTitle(infoTitle)
+        settings.debug(infoTitle)
+        cleanTitle = infoTitle["cleanTitle"]
+        year = infoTitle["year"]
+        if infoTitle["type"] == "MOVIE":
+            infoLabels = metaget.get_meta('movie', cleanTitle, year=year)
+        else:  # it is a TV Show or Anime
+            infoLabels = metaget.get_meta('tvshow', cleanTitle, year=year)
+        # cast and castandrole
+        castList = []
+        castAndRoleList = []
+        for item in infoLabels.get("cast", []):
+            if item is not None and item is str:
+                castList.append(item)
+                castAndRoleList.append((item, ""))
+            else:
+                castList.append(item[0])
+                castAndRoleList.append(item)
+        infoLabels["cast"] = castList
+        infoLabels["castandrole"] = castAndRoleList
+        # add episode and season
+        infoLabels['season'] = infoTitle['season']
+        infoLabels['episode'] = infoTitle['episode']
+    except:
+        pass
+    duration = 0
+    if infoLabels.has_key("duration") and infoLabels["duration"] != '' and infoLabels["duration"] != 'None':
+        duration = int(infoLabels["duration"])
+    infoLabels['duration'] = duration
+    # force creation
+    infoLabels['imdb_id'] = infoLabels.get('imdb_id', "")
+    infoLabels['cover_url'] = infoLabels.get("cover_url", settings.icon)
+    infoLabels['backdrop_url'] = infoLabels.get("backdrop_url", settings.fanart)
+    # add label
+    infoLabels['label'] = infoTitle["title"] + infoTitle.get("textQuality", "") + " " + infoTitle["language"]
+    settings.debug(infoLabels)
+    return infoLabels
+
+
+def getInfoStream(infoTitle={}, infoLabels={}):
+    infoStream = {'width': infoTitle["width"],
+                  'height': infoTitle["height"],
+                  'aspect': infoTitle["width"] / infoTitle["height"],
+                  'duration': infoLabels["duration"],
+                  }
+    return infoStream
+
+
+def getInfoSeason(infoLabels, seasons=[]):
+    from metahandler import metahandlers
+    metaget = metahandlers.MetaData()
+    images = metaget.get_seasons(tvshowtitle=infoLabels["title"], imdb_id=infoLabels["imdb_id"],
+                                 seasons=seasons, overlay=6)
+    seasons = []
+    for image in images:
+        if image["cover_url"] == "":
+            image["cover_url"] = infoLabels["cover_url"]
+        if image["backdrop_url"] == "":
+            image["backdrop_url"] = infoLabels["backdrop_url"]
+        seasons.append(image)
+    return seasons
+
+
+def getInfoEpisode(infoLabels):
+    from metahandler import metahandlers
+    metaget = metahandlers.MetaData()
+    result = infoLabels
+    try:
+        if infoLabels["episode"] != 0:
+            result = metaget.get_episode_meta(tvshowtitle=infoLabels["title"], imdb_id=infoLabels["imdb_id"],
+                                              season=infoLabels["season"], episode=infoLabels["episode"])
+    except:
+        pass
+    return result
+
+
+#  Search if a video is already in Kodi Database
+def existInKodiLibrary(id, season="1", episode="1"):
+    import json
+
+    result = False
+    if 'tt' in id:
+        # Movies
+        query = {
+            'jsonrpc': '2.0',
+            'id': 0,
+            'method': 'VideoLibrary.GetMovies',
+            'params': {
+                'properties': ['imdbnumber', 'file']
+            }
+        }
+        response = json.loads(xbmc.executeJSONRPC(json.dumps(query)))
+        movieDict = dict(
+            (movie['imdbnumber'], movie['file'])
+            for movie in response.get('result', {}).get('movies', [])
+        )
+        if movieDict.has_key(id):
+            result = True
+    else:
+        # TV Shows
+        query = {
+            'jsonrpc': '2.0',
+            'id': 0,
+            'method': 'VideoLibrary.GetTVShows',
+            'params': {
+                'properties': ['imdbnumber', 'file', 'season', 'episode']
+            }
+        }
+        response = json.loads(xbmc.executeJSONRPC(json.dumps(query)))
+        showDict = dict(
+            (show['imdbnumber'] + "-" + str(show['season']) + "-" + str(show['episode']), show['file'])
+            for show in response.get('result', {}).get('tvshows', [])
+        )
+        if showDict.has_key(id + "-" + str(season) + "-" + str(episode)):
+            result = True
+    return result
+
+
+############  INTEGRATION   ###########################
+def integration(titles=[], id=[], magnets=[], typeList='', folder='', typeVideo=[],
+                silence=False, message='', channel=""):
+    messageType = {'MOVIE': settings.string(32031), 'SHOW': settings.string(32032), 'ANIME': settings.string(32043),
+                   '': 'Videos'}
+    filters = Filtering()  # start filtering
+
+    total = len(titles)
+    answer = True
+    if not silence:
+        answer = settings.dialog.yesno(settings.string(32033) %
+                                       (normalize(settings.name), total), '%s' % titles)
+    if answer:  # it will integrate the filename list to the local library
+        if not silence:
+            settings.pDialog.create(settings.name, settings.string(32034) % (messageType[typeList], message))
+        else:
+            settings.notification(settings.string(32034) % (messageType[typeList], message))
+
+        cont = 0
+        for cm, title in enumerate(titles):
+            # typeVideo or typeList
+            if typeList == "":
+                typeListItem = typeVideo[cm]
+            else:
+                typeListItem = typeList
+            # folder
+            if folder == '':
+                if typeListItem == 'MOVIE':
+                    folder = settings.movieFolder
+                if typeListItem == 'SHOW':
+                    folder = settings.showFolder
+                if typeListItem == 'ANIME':
+                    folder = settings.animeFolder
+            # filters
+            if typeListItem == 'MOVIE':
+                filters.useMovie()
+            else:
+                filters.useTv()  # TV SHOWS and Anime
+            filters.information()
+            # formatTitle
+            info = formatTitle(title, typeVideo=typeListItem)
+            info['folder'] = info['folder'][:100].strip()  # to limit the length of directory name
+            check = True
+            detailsTitle = ''
+
+            if len(info['rest']) > 0:  # check for quality filtering
+                filters.title = info['title'] + ' ' + info['rest']
+                if filters.verify(filters.title, None):  # just check the quality no more
+                    check = True
+                    if settings.value.get("duplicated", "false") == "true":
+                        detailsTitle = ' ' + info['rest']
+                else:
+                    check = False
+            if check:  # the file has passed the filtering
+                name = info['title'] + detailsTitle
+                name = name[:99].strip()  # to limit the length of name
+
+                # Try to create the directory if it doesn't exist
+                directory = path.join(folder, info['folder'])
+                try:
+                    os.makedirs(directory)
+                except:
+                    pass
+                # Set-up the plugin
+                goodSpider()  # to be a smart spider
+                if channel == "":
+                    uri_string = quote_plus(getPlayableLink(uncodeName(normalize(magnets[cm]))))
+                    if settings.value["plugin"] == 'Quasar':
+                        link = 'plugin://plugin.video.quasar/play?uri=%s' % uri_string
+                    elif settings.value["plugin"] == 'Pulsar':
+                        link = 'plugin://plugin.video.pulsar/play?uri=%s' % uri_string
+                    elif settings.value["plugin"] == 'KmediaTorrent':
+                        link = 'plugin://plugin.video.kmediatorrent/play/%s' % uri_string
+                    elif settings.value["plugin"] == "Torrenter":
+                        link = 'plugin://plugin.video.torrenter/?action=playSTRM&url=' + uri_string + \
+                               '&not_download_only=True'
+                    elif settings.value["plugin"] == "YATP":
+                        link = 'plugin://plugin.video.yatp/?action=play&torrent=' + uri_string
+                    else:
+                        link = 'plugin://plugin.video.xbmctorrent/play/%s' % uri_string
+                else:
+                    link = "plugin://plugin.video.pelisalacarta/?channel=%s&action=play_from_library&url=%s" % (
+                        channel, quote_plus(magnets[cm]))
+                settings.debug(link)
+                # start to create the strm file
+                filename = path.join(directory, name + ".strm")
+                # Find the code for the video
+                codeMovie = ""
+                codeShow = ""
+                infoLabels = getInfoLabels(info)
+                if len(id) > 0 and id[cm] != "":
+                    codeMovie = codeShow = id[cm]
+                else:
+                    codeMovie = infoLabels.get("imdb_id", "")  # it tries to retrieve the IMDB number from title
+                    codeShow = infoLabels.get("tvdb_id", "")  # it tries to retrieve the TVDB number from title
+                # Write the strm file
+                isAlreadyAdded = False
+                if typeListItem == "MOVIE":
+                    isAlreadyAdded = existInKodiLibrary(codeMovie)
+                else:
+                    isAlreadyAdded = existInKodiLibrary(codeShow, infoLabels['season'], infoLabels['episode'])
+                if (not os.path.isfile(filename) and not isAlreadyAdded) or settings.value["overwrite"] == 'true':
+                    cont += 1  # add new file's count
+                    with open(filename, "w") as text_file:  # create .strm
+                        text_file.write(link)
+                    if os.path.isfile("*.nfo"):
+                        settings.debug(".nfo existe!!!")
+                    if codeMovie != "" and codeShow != "":  # Only it creates the nfo file if it is a IMDB number
+                        if typeListItem == "MOVIE":
+                            with open(filename.replace(".strm", ".nfo"), "w") as text_file:  # create .nfo MOVIE
+                                text_file.write("http://www.imdb.com/title/%s/" % codeMovie)
+                            settings.debug("imdb= " + codeMovie)
+                        else:
+                            with open(path.join(directory, "tvshow.nfo"), "w") as text_file:  # create .nfo SHOW
+                                text_file.write("http://thetvdb.com/?tab=series&id=%s" % codeShow)
+                            settings.debug("tvdb= " + codeShow)
+
+                    if not silence: settings.pDialog.update(int(float(cm) / total * 100), settings.string(32036)
+                                                            % (directory, name))
+                    if not silence and settings.pDialog.iscanceled(): break
+                    if cont % 100 == 0: settings.notification(
+                        settings.string(32037) % (cont, messageType[typeListItem], message))
+                    settings.log(settings.string(32038) % filename)
+                elif isAlreadyAdded:
+                    settings.log("%s is already in the library" % name)
+                if not silence and settings.pDialog.iscanceled(): break
+        if not silence: settings.pDialog.close()
+
+        if cont > 0:  # There are files added
+            if not xbmc.getCondVisibility('Library.IsScanningVideo'):
+                xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
+            settings.log(settings.string(32040) % (cont, messageType[typeListItem], message))
+            if not silence:
+                settings.dialog.ok(settings.name, settings.string(32040) % (cont, messageType[typeListItem], message))
+            else:
+                settings.notification(settings.string(32040) % (cont, messageType[typeListItem], message))
+        else:
+            settings.log(settings.string(32041) % (messageType[typeListItem], message))
+            if not silence:
+                settings.dialog.ok(settings.name, settings.string(32042) % (messageType[typeListItem], message))
+            else:
+                settings.notification(settings.string(32042) % (messageType[typeListItem], message))
+                # del filters
+
+
+############  SUBSCRIPTION   ###########################
+def subscription(titles=[], id=[], typeList='', folder='', silence=False, message=''):
+    from types import StringType
+    messageType = {'MOVIE': settings.string(32031), 'SHOW': settings.string(32032)}
+    total = len(titles)
+    answer = True
+    if not silence:
+        answer = settings.dialog.yesno(settings.string(32033) %
+                                       (settings.name, total), '%s' % titles)
+
+    if answer:  # it will integrate the filename list to the local library
+        if not silence:
+            settings.pDialog.create(settings.name, settings.string(32034) % (messageType[typeList], message))
+        else:
+            settings.notification(settings.string(32034) % (messageType[typeList], message))
+        # Open Database
+        storage = Storage(settings.storageName, type="dict")
+        cont = 0
+        for cm, itemList in enumerate(titles):
+            info = formatTitle(itemList if typeList == 'MOVIE' else itemList + ' S00E00')
+            item = info['title'] if typeList == 'MOVIE' else info['cleanTitle']
+            if storage.database.has_key(item):
+                data = storage.database[item]
+                data = literal_eval(data) if type(data) == StringType else data
+                settings.debug('item(' + str(cm) + '): ' + str(data))
+                settings.debug('type item(' + str(cm) + '): ' + str(type(data)))
+                if typeList == 'SHOW':  # update the database to find new episodes
+                    tvShow = TvShowCode(data['ID'], data['lastEpisode'], data['lastSeason'])
+                    data['firstSeason'] = tvShow.firstSeason
+                    data['lastSeason'] = tvShow.lastSeason
+                    data['lastEpisode'] = tvShow.lastEpisode
+            else:
+                # create the item
+                data = {}
+                if len(id) > 0:
+                    data['ID'] = id[cm]
+                    if typeList == 'SHOW':
+                        tvShow = TvShowCode(id[cm])
+                        data['firstSeason'] = tvShow.firstSeason
+                        data['lastSeason'] = tvShow.lastSeason
+                        data['lastEpisode'] = tvShow.lastEpisode
+                else:
+                    if typeList == 'MOVIE':
+                        movie = Movie(item)  # name of the movie with (year) format: Frozen (2013)
+                        data['ID'] = movie.code  # search the IMDB id
+                    elif typeList == 'SHOW':
+                        tvShow = TvShow(info['cleanTitle'])  # search the name without year
+                        data['ID'] = tvShow.code
+                        if data['ID'] is not None:
+                            data['firstSeason'] = tvShow.firstSeason
+                            data['lastSeason'] = tvShow.lastSeason
+                            data['lastEpisode'] = tvShow.lastEpisode
+                data['type'] = typeList
+                data['season'] = 0
+                data['episode'] = 0
+
+            # start to create strm files
+            if typeList == 'MOVIE' and data['type'] == 'MOVIE' and data['episode'] == 0 and data[
+                'ID'] is not None and not existInKodiLibrary(data['ID']):
+                cont += 1
+                # Try to create the directory if it doesn't exist
+                directory = path.join(folder, info['folder'])
+                try:
+                    os.makedirs(directory)
+                except:
+                    pass
+                data['path'] = directory  # To be able to erase the folder
+
+                if settings.value["detailedLog"] == 'true':
+                    settings.log('Code %s=%s' % (typeList, data['ID']))
+
+                link = 'plugin://plugin.video.quasar/movie/%s/%s' % (data['ID'], settings.value["action"])
+
+                # start to create the strm file
+                filename = path.join(directory, item + ".strm")
+                with open(filename, "w") as text_file:  # create .strm MOVIE
+                    text_file.write(link)
+                with open(filename.replace(".strm", ".nfo"), "w") as text_file:  # create .nfo MOVIE
+                    text_file.write("http://www.imdb.com/title/%s/" % data['ID'])
+                data['episode'] = 1
+                if not silence: settings.pDialog.update(int(float(cm) / total * 100), settings.string(32036)
+                                                        % (directory, item))
+                if cont % 100 == 0: settings.notification(settings.string(32037)
+                                                          % (cont, messageType[typeList], message))
+                settings.log(settings.string(32038) % filename)
+            elif typeList == 'SHOW' and data['type'] == 'SHOW' and data['ID'] is not None:  # add shows
+                if settings.value["specials"] == 'false' and data['firstSeason'] == 0:
+                    data['firstSeason'] = 1
+                directory = folder + item + folder[-1]
+                # Try to create the directory if it doesn't exist
+                directory = path.join(folder, info['folder'])
+                try:
+                    os.makedirs(directory)
+                except:
+                    pass
+                data['path'] = directory  # To be able to erase the folder
+                if settings.value["detailedLog"] == 'true':
+                    settings.log(settings.string(32035) % (typeList, data['ID']))
+                    settings.log(
+                        '%s %s-%s: %s' % (item, data['firstSeason'], data['lastSeason'], data['lastEpisode']))
+                with open(path.join(directory, "tvshow.nfo"), "w") as text_file:  # create .nfo SHOW
+                    text_file.write("http://thetvdb.com/?tab=series&id=%s" % data['ID'])
+                for season in range(max(data['season'], data['firstSeason']), data['lastSeason'] + 1):
+                    if data['lastEpisode'].has_key(season):
+                        for episode in range(data['episode'] + 1, data['lastEpisode'][season] + 1):
+                            if not existInKodiLibrary(data['ID'], str(season), str(episode)):
+                                cont += 1
+                                link = 'plugin://plugin.video.quasar/show/%s/season/%s/episode/%s/%s' % (
+                                    data['ID'], season, episode, settings.value["action"])
+                                if not silence: settings.pDialog.update(int(float(cm) / total * 100),
+                                                                        "%s%s S%02dE%02d.strm" % (
+                                                                            directory, item, season, episode))
+                                if cont % 100 == 0: settings.notification(
+                                    settings.string(32037) % (cont, messageType[typeList], message))
+                                filename = path.join(directory, item + " S%02dE%02d.strm" % (season, episode))
+                                with open(filename, "w") as text_file:  # create .strm
+                                    text_file.write(link)
+                                    settings.log(settings.string(32038) % filename)
+                                if not silence and settings.pDialog.iscanceled(): break
+                        data['episode'] = 0  # change to new season and reset the episode to 1
+                if not silence and settings.pDialog.iscanceled(): break
+                data['season'] = data['lastSeason']
+                if data['lastEpisode'].has_key(data['lastSeason']):
+                    data['episode'] = data['lastEpisode'][data['lastSeason']]
+                if not silence: settings.pDialog.update(int(float(cm) / total * 100),
+                                                        settings.string(32036) % (directory, item))
+                settings.log(settings.string(32039) % (directory, item))
+            # update database
+            if data['ID'] is not None:
+                storage.database[item] = data
+            if not silence and settings.pDialog.iscanceled(): break
+        # confirmation and close database
+        storage.save()
+        if cont > 0:
+            if not xbmc.getCondVisibility('Library.IsScanningVideo'):
+                xbmc.executebuiltin('XBMC.UpdateLibrary(video)')  # update the library with the new information
+            settings.log(settings.string(32040) % (cont, messageType[typeList], message))
+            if not silence:
+                settings.dialog.ok(settings.name, settings.string(32040) % (cont, messageType[typeList], message))
+            else:
+                settings.notification(settings.string(32040) % (cont, messageType[typeList], message))
+
+        else:
+            settings.log(settings.string(32041) % (messageType[typeList], message))
+            if not silence:
+                settings.dialog.ok(settings.name, settings.string(32042) % (messageType[typeList], message))
+            else:
+                settings.notification(settings.string(32042) % (messageType[typeList], message))
+        del storage
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools2.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools2.pyo
deleted file mode 100644
index 7126aeb5ad5c563138d1defd883466743593d784..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.mctools/lib/tools2.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/__init__.pyo
deleted file mode 100644
index 7a0c45014e2d7732ebc1043ebd10ae91d46b4764..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/exceptions.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/exceptions.pyo
deleted file mode 100644
index d837b52258c636e5af03a595f2da02ed75ecd55c..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/exceptions.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/lazy.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/lazy.pyo
deleted file mode 100644
index 27d407ccaf435b256edbe6ceb09fdc7433804862..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/lazy.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/tzfile.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/tzfile.pyo
deleted file mode 100644
index 9497dc17c1ee7b2bf55aa1e80233ba71779d01c2..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/tzfile.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/tzinfo.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/tzinfo.pyo
deleted file mode 100644
index 2910accbd9c9980385736d6d9d761c04d07a34ec..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.pytz/lib/pytz/tzinfo.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/__init__.pyo
deleted file mode 100644
index b6c43c6a61e566163a7199643d4d934ae9903339..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/adapters.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/adapters.pyo
deleted file mode 100644
index 2e09cfdc855787d14ee1aec183029ce568674f16..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/adapters.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/api.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/api.pyo
deleted file mode 100644
index 0e4d21ad9133bf551113caa0b2c9f9b1e5b888f1..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/api.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/auth.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/auth.pyo
deleted file mode 100644
index a9554f63b8d727919d9786f8ba1a99d7256f8a50..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/auth.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/certs.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/certs.pyo
deleted file mode 100644
index aad807cddff65059756646183a88e561b53e7909..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/certs.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/compat.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/compat.pyo
deleted file mode 100644
index 0ff9a07ff1f8af5b683cd64637fc0d9cca3d28af..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/compat.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/cookies.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/cookies.pyo
deleted file mode 100644
index b870cb3ceafc32124c2577d5de1e5071421b15e7..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/cookies.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/exceptions.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/exceptions.pyo
deleted file mode 100644
index d5a5b7197405023d266009a4cdfb55330f06ef0b..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/exceptions.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/hooks.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/hooks.pyo
deleted file mode 100644
index a5ca42c81b366cbe8e9a6b183c551f9f2e21dc6e..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/hooks.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/models.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/models.pyo
deleted file mode 100644
index 01666747f253e92e93092a27845f70d7b52f8725..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/models.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/__init__.pyo
deleted file mode 100644
index 261e89b50c28e7a288d2f189bb9685dec89a2d4f..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/chardet/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/chardet/__init__.pyo
deleted file mode 100644
index 50a17a4d5c5fa0054b51a96fb93ca6535cdae729..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/chardet/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/__init__.pyo
deleted file mode 100644
index 19f7242346d83212a06747474ba47d77073d35ed..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/_collections.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/_collections.pyo
deleted file mode 100644
index 858868a035578789d8eb905fb77f265b056cf660..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/_collections.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/connection.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/connection.pyo
deleted file mode 100644
index 931d65dfc7e8c90b97875580a9f3ac0e191cabc8..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/connection.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/connectionpool.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/connectionpool.pyo
deleted file mode 100644
index 7ff0b4f05700035d179ff58411a25d59da59d772..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/connectionpool.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/contrib/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/contrib/__init__.pyo
deleted file mode 100644
index 5b09ae3a28fc2bcbf5fe2c8e07df05ff828873ce..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/contrib/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/contrib/pyopenssl.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/contrib/pyopenssl.pyo
deleted file mode 100644
index b4d89961b5d4490a777259a27363225236b62955..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/contrib/pyopenssl.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/exceptions.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/exceptions.pyo
deleted file mode 100644
index e0c8fd8cac3cbb11d7412bd65e89f14242af3fe6..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/exceptions.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/fields.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/fields.pyo
deleted file mode 100644
index ae88bab2b442fe35c589a55e59fa7ca149262361..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/fields.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/filepost.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/filepost.pyo
deleted file mode 100644
index b7e8cdf9bd8d78823208b34282921d36bb91acb5..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/filepost.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/__init__.pyo
deleted file mode 100644
index 6e26b19f535e37226f1c7484e3be14215ee588c4..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ordered_dict.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ordered_dict.pyo
deleted file mode 100644
index 1d669e098342bcba66560503ac1205385eadbe2e..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ordered_dict.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/six.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/six.pyo
deleted file mode 100644
index 56594a5c11e29c7bbe0131a44d9a13c21ba55700..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/six.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyo
deleted file mode 100644
index 19e884d7c5e3b4079973e85812389cb32336c5de..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyo
deleted file mode 100644
index d463b811a5cd05b478725265503f3a8930898a9f..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/poolmanager.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/poolmanager.pyo
deleted file mode 100644
index 926117fcb38b94c4b97c67982600f13ce854f34a..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/poolmanager.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/request.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/request.pyo
deleted file mode 100644
index 9b202d149d05193e08329d1a9b9a8963aafc77cf..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/request.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/response.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/response.pyo
deleted file mode 100644
index a0675992db68ee20d028fb6b5796f949eb941758..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/response.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/__init__.pyo
deleted file mode 100644
index 39ceca85e37fa4ff4be8abc5b3c9af9a25a162e8..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/connection.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/connection.pyo
deleted file mode 100644
index 3f2c10649217c6f96c76f0eb8a23fca082c17069..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/connection.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/request.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/request.pyo
deleted file mode 100644
index 6933de990f9281b59f6ec81da7a13484ee6c603c..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/request.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/response.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/response.pyo
deleted file mode 100644
index ba3a0ed6376371c09509c51a75e170a834743480..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/response.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/retry.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/retry.pyo
deleted file mode 100644
index e604c6ea040288ed4fa80d00d3ceddff55c714d8..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/retry.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/ssl_.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/ssl_.pyo
deleted file mode 100644
index 77bb8d2612be2065c148828b87ab72c401b09e56..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/ssl_.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/timeout.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/timeout.pyo
deleted file mode 100644
index f3a97db88e8e6ac4b1b4a717ac0534e083d8a992..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/timeout.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/url.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/url.pyo
deleted file mode 100644
index 23a1fef4de73d3c2f94536210772d3465e510ea8..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/packages/urllib3/util/url.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/sessions.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/sessions.pyo
deleted file mode 100644
index 28854180ec5d681e0a47ade544c6e9d6eac7ef93..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/sessions.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/status_codes.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/status_codes.pyo
deleted file mode 100644
index 8de6605261a382cfec70466b267b24a74cb7a4df..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/status_codes.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/structures.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/structures.pyo
deleted file mode 100644
index 88c1e76bc669e6e3d0b7677bedae065d2eb4830d..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/structures.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/utils.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/utils.pyo
deleted file mode 100644
index 4be7c8c4d524a6a945baa3a0747722e48521ca58..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.requests/lib/requests/utils.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/Thumbs.db b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..d2e0e5fac8ba5fbe4fb5923460442fe389ea3dcd
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/Thumbs.db differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/__init__.pyo
index da45ec112b2c71943595130e792c5d7aaa6f4c16..6e48f7d573f9b817a7e42ad96b70759e3f8f8cba 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/__init__.pyo and b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/__init__.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/compat.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/compat.pyo
index d893479362505e3df5c5608a4e6fc47824415fd5..ffa3edc1456d8b3e5127764af73edb4f2a48967a 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/compat.pyo and b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/compat.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/decoder.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/decoder.pyo
index 1fcc507590aaec9ee611a12820807ff81e925843..72f9c4fae25ee42e2e3b304375c0ea725d3b9bc5 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/decoder.pyo and b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/decoder.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/encoder.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/encoder.pyo
index bb7dd7ac7c56defa0d1d0a0971fddd3435ce02d4..48e663019816b121f1c09433769c3a6589f742c2 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/encoder.pyo and b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/encoder.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/scanner.pyo b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/scanner.pyo
index 6c22323550a8c1d35cf34a883a02b3d28b743632..c7c2e83a487ed83dbcbb9b71544cddb7b78108c0 100644
Binary files a/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/scanner.pyo and b/packages/mediacenter/kodi/config/base-addons/script.module.simplejson/lib/simplejson/scanner.pyo differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/addon.xml b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/addon.xml
index 953257f2cceda168fb45797597d70d0c76827094..709b385698624b9cd7f90e3c94cb874160be2e47 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/addon.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.module.urlresolver" 
      name="URLResolver" 
-     version="2.10.10" 
+     version="2.10.12" 
      provider-name="Eldorado">
   <requires>
     <import addon="xbmc.python" version="2.1.0" />
     <import addon="script.module.t0mm0.common" version="2.0.0"/>
-    <import addon="script.module.simplejson" version="3.3.0"/>
   </requires>
   <extension point="xbmc.python.module" library="lib" />
   <extension point="xbmc.addon.metadata">
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/__init__.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/__init__.py
index 4d611bc2a5cff958427055655dbc42213b216e2e..8d7757af163e3dfd9175f0099255b76fedab5da4 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/__init__.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/__init__.py
@@ -190,6 +190,7 @@ def _update_settings_xml():
     new_xml += '<settings>\n'
     new_xml += '<category label="URLResolver">\n'
     new_xml += '\t<setting default="true" id="allow_universal" label="Enable Universal Resolvers" type="bool"/>\n'
+    new_xml += '\t<setting id="personal_nid" label="Your NID" type="text" visible="false"/>\n'
     new_xml += '</category>\n'
     new_xml += '<category label="Universal Resolvers">\n'
 
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/common.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/common.py
index 7b55f69340c358fdcb9ab3dffb473c3ead5001a7..78a46ccc48fe76aa7ad48374ed527077675665c9 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/common.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/common.py
@@ -23,14 +23,16 @@ import xbmcaddon
 import xbmcgui
 import xbmcplugin
 
-IE_USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; AS; rv:11.0) like Gecko'
-FF_USER_AGENT = 'Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0'
-IOS_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'
-ANDROID_USER_AGENT = 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36'
-
 addon = Addon('script.module.urlresolver')
 addon_path = addon.get_path()
 plugins_path = os.path.join(addon_path, 'lib', 'urlresolver', 'plugins')
 profile_path = addon.get_profile()
 settings_file = os.path.join(addon_path, 'resources', 'settings.xml')
 addon_version = addon.get_version()
+
+IE_USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; AS; rv:11.0) like Gecko'
+FF_USER_AGENT = 'Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0'
+OPERA_USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.111 Safari/537.36 OPR/34.0.2036.50'
+IOS_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'
+ANDROID_USER_AGENT = 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36'
+SMU_USER_AGENT = 'URLResolver for Kodi/%s' % (addon_version)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/180upload.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/180upload.py
deleted file mode 100644
index ba6408cf87f802edbf92b803dc73aec5ae4c264b..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/180upload.py
+++ /dev/null
@@ -1,113 +0,0 @@
-'''
-180upload urlresolver plugin
-Copyright (C) 2011 anilkuj
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
-from lib import captcha_lib
-
-class OneeightyuploadResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "180upload"
-    domains = ["180upload.com"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        # try embedded link first to avoid captcha, try direct link if it doesn't work
-        stream_url = self.__get_link('http://180upload.com/embed-%s.html' % media_id)
-        if not stream_url:
-            stream_url = self.__get_link(self.get_url(host, media_id))
-        return stream_url
-
-    def __get_link(self, url):
-        headers = {
-                   'User-Agent': common.IE_USER_AGENT
-                   }
-        common.addon.log_debug('180upload: get_link: %s' % (url))
-        html = self.net.http_GET(url, headers).content
-        
-        #Re-grab data values
-        data = {}
-        r = re.findall(r'type="hidden" name="(.+?)" value="(.+?)"', html)
-        
-        if r:
-            for name, value in r:
-                data[name] = value
-        else:
-            raise UrlResolver.ResolverError('Unable to resolve link')
-        
-        # ignore captchas in embedded pages
-        if 'embed' not in url:
-            data.update(captcha_lib.do_captcha(html))
-        
-        common.addon.log_debug('180Upload - Requesting POST URL: %s with data: %s' % (url, data))
-        data['referer'] = url
-        html = self.net.http_POST(url, data, headers).content
-        
-        # try download link
-        link = re.search('id="lnk_download[^"]*" href="([^"]+)', html)
-        stream_url = None
-        if link:
-            common.addon.log_debug('180Upload Download Found: %s' % link.group(1))
-            stream_url = link.group(1)
-        else:
-            # try flash player link
-            packed = re.search('id="player_code".*?(eval.*?)</script>', html, re.DOTALL)
-            if packed:
-                js = jsunpack.unpack(packed.group(1))
-                link = re.search('name="src"\s*value="([^"]+)', js.replace('\\', ''))
-                if link:
-                    common.addon.log_debug('180Upload Src Found: %s' % link.group(1))
-                    stream_url = link.group(1)
-                else:
-                    link = re.search("'file'\s*,\s*'([^']+)", js.replace('\\', ''))
-                    if link:
-                        common.addon.log_debug('180Upload Link Found: %s' % link.group(1))
-                        stream_url = link.group(1)
-        
-        if stream_url:
-            return stream_url + '|User-Agent=%s&Referer=%s' % (common.IE_USER_AGENT, url)
-        else:
-            raise UrlResolver.ResolverError('Unable to resolve link')
-
-    def get_url(self, host, media_id):
-        return 'http://www.180upload.com/%s' % media_id
-
-    def get_host_and_id(self, url):
-        r = re.search('http://(.+?)/embed-([\w]+)-', url)
-        if r:
-            return r.groups()
-        else:
-            r = re.search('//(.+?)/([\w]+)', url)
-            if r:
-                return r.groups()
-            else:
-                return False
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?180upload.com/' +
-                         '[0-9A-Za-z]+', url) or
-                         '180upload' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/24uploading.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/24uploading.py
index 6076537d44fb574559bfd00103367b039a273411..8637e344dacd9911c3cb140665079b22ebc688f2 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/24uploading.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/24uploading.py
@@ -16,13 +16,12 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+from lib import jsunpack
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import captcha_lib
-import re
 
 MAX_TRIES = 3
 
@@ -30,12 +29,12 @@ class TwentyFourUploadingResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "24uploading"
     domains = ["24uploading.com"]
+    pattern = '(?://|\.)(24uploading\.com)/([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?24uploading\.com)/([0-9a-zA-Z/]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -44,16 +43,22 @@ class TwentyFourUploadingResolver(Plugin, UrlResolver, PluginSettings):
         tries = 0
         while tries < MAX_TRIES:
             data = {}
-            for match in re.finditer('input type="hidden" name="([^"]+)" value="([^"]+)', html):
+            for match in re.finditer(r'type="hidden"\s+name="(.+?)"\s+value="(.*?)"', html):
                 key, value = match.groups()
                 data[key] = value
             data['method_free'] = 'Free Download'
-            data.update(captcha_lib.do_captcha(html))
             
             html = self.net.http_POST(web_url, form_data=data).content
-            match = re.search('class="btn_down.*?href="([^"]+)', html, re.DOTALL)
-            if match:
-                return match.group(1)
+
+            for match in re.finditer('(eval\(function.*?)</script>', html, re.DOTALL):
+                js_data = jsunpack.unpack(match.group(1))
+                js_data = js_data.replace('\\\'', '\'')
+
+                match2 = re.search("\"html5\".*?file\s*:\s*'([^']+)", js_data)
+                if match2:
+                    stream_url = match2.group(1)
+                    return stream_url
+
             tries += 1
 
         raise UrlResolver.ResolverError('Unable to resolve 24uploading link. Filelink not found.')
@@ -69,4 +74,4 @@ class TwentyFourUploadingResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or self.name  in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/__init__.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/alldebrid.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/alldebrid.py
index bfaa84f7f12df64104baa8cb78472a85246f5cb2..31778313d5210c59d7b5cfe6d7edc93acbc81ea7 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/alldebrid.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/alldebrid.py
@@ -16,23 +16,18 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import os, sys
-import random
+import os
+import sys
 import re
-import urllib, urllib2
-
+import urllib
+import json
+from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import SiteAuth
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import simplejson as json
-import xbmc,xbmcplugin,xbmcgui,xbmcaddon, datetime
-import cookielib
-from t0mm0.common.net import Net
-
-#SET ERROR_LOGO# THANKS TO VOINAGE, BSTRDMKR, ELDORADO
-error_logo = os.path.join(common.addon_path, 'resources', 'images', 'redx.png')
+import xbmcgui
 
 class AllDebridResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
     implements = [UrlResolver, SiteAuth, PluginSettings]
@@ -99,7 +94,6 @@ class AllDebridResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
             return finallink
         #false/errors
         elif 'Invalid link' in source :
-            common.addon.show_small_popup(title='[B][COLOR white]ALLDEBRID[/COLOR][/B]', msg='[COLOR red]INVALID LINK[/COLOR]', delay=15000, image=error_logo)
             return self.unresolvable(1,'Invalid link')
         else :
             return self.unresolvable(0,'No generated_link')
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/allmyvideos.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/allmyvideos.py
index 598d189eb75b8c6d4edb624a09fb373a81b4b473..cf7cc8a9561355916188333561b85f756943fc46 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/allmyvideos.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/allmyvideos.py
@@ -16,18 +16,22 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
+import json
+import urllib
+import urlparse
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re, os, xbmc, json
-from urlresolver import common
+import xbmc
 
 class AllmyvideosResolver(Plugin,UrlResolver,PluginSettings):
     implements=[UrlResolver,PluginSettings]
     name="allmyvideos"
     domains=[ "allmyvideos.net" ]
-
+    pattern = '(?://|\.)(allmyvideos\.net)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p=self.get_setting('priority') or 100
@@ -47,7 +51,7 @@ class AllmyvideosResolver(Plugin,UrlResolver,PluginSettings):
         headers={'User-Agent':common.IE_USER_AGENT,'Referer':url}
         html=self.net.http_GET(url,headers=headers).content
         
-        data={}; r=re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">',html)
+        data={}; r=re.findall(r'type="hidden"\s+name="(.+?)"\s+value="(.*?)"',html)
         for name,value in r: data[name]=value
         html=self.net.http_POST(url,data,headers=headers).content
         
@@ -65,10 +69,12 @@ class AllmyvideosResolver(Plugin,UrlResolver,PluginSettings):
             max_label = 0
             stream_url = ''
             for source in sources:
-                if 'label' in source and int(source['label'])>max_label:
+                if 'label' in source and int(re.sub('[^0-9]', '', source['label']))>max_label:
                     stream_url = source['file']
-                    max_label = int(source['label'])
-            if stream_url: return stream_url+'|User-Agent=%s'%(common.IE_USER_AGENT)
+                    max_label = int(re.sub('[^0-9]', '', source['label']))
+            if stream_url:
+                stream_url = '%s?%s&direct=false&ua=false' % (stream_url.split('?')[0], urlparse.urlparse(stream_url).query)
+                return stream_url + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
         
     def get_url(self,host,media_id):
         return 'http://allmyvideos.net/%s'%media_id 
@@ -77,10 +83,11 @@ class AllmyvideosResolver(Plugin,UrlResolver,PluginSettings):
         return 'http://allmyvideos.net/embed-%s.html'%media_id
      
     def get_host_and_id(self, url):
-        r=re.search('//(?:www.)?(allmyvideos.net)/(?:embed-)?([0-9a-zA-Z]+)',url)
-        if r: return r.groups()
-        else: return False
-        return('host','media_id')
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
     
-    def valid_url(self,url,host):
-        return (re.match('http://(?:www.)?(allmyvideos.net)/(?:embed-)?([0-9A-Za-z]+)',url) or re.match('http://(www.)?(allmyvideos.net)/embed-([0-9A-Za-z]+)[\-]*\d*[x]*\d*.*[html]*',url) or 'allmyvideos' in host)
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/allvid.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/allvid.py
index 165c376d2ced77618e6d47a641db75c8cf660244..15012bf34b75f86e83587f45fee9fe1985734937 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/allvid.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/allvid.py
@@ -16,47 +16,53 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
+import re
+from lib import jsunpack
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import urllib
-import re
-
 
 class AllVidResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "allvid"
     domains = ["allvid.ch"]
+    pattern = '(?://|\.)(allvid\.ch)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://(allvid\.ch)/(?:embed-)(.+?)(?:-|/|\.|$)'
         self.user_agent = common.IE_USER_AGENT
         self.net.set_user_agent(self.user_agent)
         self.headers = {'User-Agent': self.user_agent}
 
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+        self.headers['Referer'] = web_url
+        html = self.net.http_GET(web_url, headers=self.headers).content
+
+        for match in re.finditer('(eval\(function.*?)</script>', html, re.DOTALL):
+            js_data = jsunpack.unpack(match.group(1))
+            js_data = js_data.replace('\\\'', '\'')
+
+            r = re.search('sources\s*:\s*\[\s*\{\s*file\s*:\s*["\'](.+?)["\']', js_data)
+
+            if r:
+                return r.group(1)
+        else:
+            raise UrlResolver.ResolverError('File not found')
+
     def get_url(self, host, media_id):
         return 'http://%s/embed-%s.html' % (host, media_id)
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or host in self.domains
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        self.headers['Referer'] = web_url
-        html = self.net.http_GET(web_url, headers=self.headers).content
-        r = re.search('sources\s*:\s*\[\s*\{\s*file\s*:\s*["\'](.+?)["\']', html)
         if r:
-            return r.group(1)
+            return r.groups()
         else:
-            raise UrlResolver.ResolverError('File not found')
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/auengine.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/auengine.py
index 48aafb7bbaed45553007010399b246ba465edc43..3628b3c36566cdaf0150622a3ddb4d879f8009be 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/auengine.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/auengine.py
@@ -16,39 +16,26 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import urllib,urllib2
-from urlresolver import common
-import re
 
 class AuEngineResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "auengine.com"
     domains = [ "auengine.com" ]
+    pattern = '(?://|\.)(auengine\.com)/embed.php\?file=([0-9a-zA-Z\-_]+)[&]*'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:www.)?auengine.com)/embed.php\?file=([0-9a-zA-Z\-_]+)[&]*'
-
-    def get_url(self, host, media_id):
-            return 'http://www.auengine.com/embed.php?file=%s' % (media_id) #&w=800&h=600
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        common.addon.log(web_url)
         resp = self.net.http_GET(web_url)
         html = resp.content
         r = re.search("video_link\s=\s'(.+?)';", html)
@@ -56,3 +43,16 @@ class AuEngineResolver(Plugin, UrlResolver, PluginSettings):
             return urllib.unquote_plus(r.group(1))
         else:
             raise UrlResolver.ResolverError('no file located')
+
+    def get_url(self, host, media_id):
+            return 'http://www.auengine.com/embed.php?file=%s' % (media_id)
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/bayfiles.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/bayfiles.py
deleted file mode 100644
index c357e591e6d1df4d8f62fc065d51586072bae9d8..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/bayfiles.py
+++ /dev/null
@@ -1,62 +0,0 @@
-'''
-Bayfiles urlresolver plugin
-Copyright (C) 2013 voinage
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import re,urllib2,os,json,time,sys
-from urlresolver import common
-from time import time as wait
-
-class BayfilesResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "bayfiles"
-    domains = [ "bayfiles.com" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-                                
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        found = re.search(r'var vfid = (\d+);\s*var delay = (\d+);', html)
-        vfid, delay = found.groups()
-        response = json.loads(self.net.http_POST('http://bayfiles.com/ajax_download', {"_": wait() * 1000, "action": "startTimer", "vfid": vfid}).content)
-        common.addon.show_countdown(int(delay), '[B][COLOR orange]BAYFILES[/COLOR][/B]', '')
-        html = self.net.http_POST('http://bayfiles.com/ajax_download', {"token": response['token'], "action": "getLink", "vfid": vfid}).content
-        final_link = re.search(r"javascript:window.location.href = '([^']+)';", html)
-        if final_link:
-            return final_link.group(1)
-        else:
-            raise UrlResolver.ResolverError('Unable to resolve link')
-       
-    def get_url(self, host, media_id):
-        return 'http://%s.com/file/uMXL/%s'%(host,media_id)
-        
-    def get_host_and_id(self, url):
-        r = re.match(r'http://(bayfiles).com/file/uMXL/([a-zA-Z0-9._/]+)',url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return (re.match(r'http://(bayfiles).com/file/uMXL/([a-zA-Z0-9._/]+)', url) or 'bayfiles' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/bestreams.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/bestreams.py
index 5c4d93ac0fef6b1daa2d7d13900004e977e03529..f3a4bfd0a8d5ef0b8a1a9bef194d0f323ac9f831 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/bestreams.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/bestreams.py
@@ -15,19 +15,19 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-import urllib
+
 import re
-import xbmc
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class BestreamsResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "bestreams"
     domains = ["bestreams.net"]
+    pattern = '(?://|\.)(bestreams\.net)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -36,50 +36,27 @@ class BestreamsResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        headers = {
-            'Referer': web_url
-        }
 
-        data = {}
-        for r in re.finditer(r'type="hidden"\s*name="([^"]+)"\s*value="([^"]+)', html):
-            data[r.group(1)] = r.group(2)
-        data.update({'referer': web_url})
-        data.update({'imhuman': 'Proceed to video'})
+        headers = { 'User-Agent': common.IOS_USER_AGENT }
 
-        # parse cookies from file as they are only useful for this interaction
-        cookies = ['lang=1']
-        for match in re.finditer("\$\.cookie\('([^']+)',\s*'([^']+)", html):
-            key, value = match.groups()
-            cookies.append('%s=%s' % (key, urllib.quote_plus(value)))
-        headers['Cookie'] = '; '.join(cookies)
+        html = self.net.http_GET(web_url, headers=headers).content
 
-        xbmc.sleep(2000)  # POST seems to fail is submitted too soon after GET. Page Timeout?
-        #sleep(2)
+        r = re.search('file\s*:\s*"(http.+?)"', html)
 
-        html = self.net.http_POST(web_url, data, headers=headers).content
-        r = re.search('file\s*:\s*"(http://.+?)"', html)  # Incase they start using this again.
         if r:
             return r.group(1)
-
-        r = re.search('streamer\s*:\s*"(\D+://.+?)"', html)
-        r2 = re.search('file\s*:\s*"([^"]+)', html)
-        if r and r2:
-            return r.group(1) + " Playpath=" + r2.group(1) + " swfUrl=http://bestreams.net/player/player.swf pageUrl=http://bestreams.net swfVfy=1"  # live=false timeout=30
-        if r:
-            return r.group(1)
-
-        raise UrlResolver.ResolverError("File Link Not Found")
+        else:
+            raise UrlResolver.ResolverError("File Link Not Found")
 
     def get_url(self, host, media_id):
-        return 'http://bestreams.net/%s' % media_id
+        return 'http://bestreams.net/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([A-Za-z0-9]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match('http://(www.)?bestreams.net/(embed-)?[A-Za-z0-9]+', url) or "bestreams.net" in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/castamp.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/castamp.py
index 386242dd64d40da9061af5dbd781b669018e8abb..1de143657d719091311c0b03f696d713fc6fedd8 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/castamp.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/castamp.py
@@ -29,12 +29,12 @@ class CastampResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "castamp"
     domains = [ "castamp.com" ]
+    pattern = '(?://|\.)(castamp\.com)/embed\.php\?c=(.*?)&'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern =  r"""(http://(?:www\.|)castamp\.com)/embed\.php\?c=(.*?)&"""
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -83,6 +83,6 @@ class CastampResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/clicknupload.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/clicknupload.py
index 7d6deab7d4c7f1efc4dc43b37a5c56672ffbee7f..f5b27ae041810b6f7f00c21154b97b3b18cf32e7 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/clicknupload.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/clicknupload.py
@@ -16,14 +16,15 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
+import urllib
 from t0mm0.common.net import Net
+from lib import captcha_lib
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
 import xbmc
-from urlresolver import common
-from lib import captcha_lib
 
 MAX_TRIES = 3
 
@@ -31,6 +32,7 @@ class ClickNUploadResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "clicknupload"
     domains = ["clicknupload.com", "clicknupload.me"]
+    pattern = '(?://|\.)(clicknupload\.(?:com|me))/(?:f/)?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -58,7 +60,7 @@ class ClickNUploadResolver(Plugin, UrlResolver, PluginSettings):
             if '>File Download Link Generated<' in html:
                 r = re.search("onClick\s*=\s*\"window\.open\('([^']+)", html)
                 if r:
-                    return r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
+                    return r.group(1) + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
             
             tries = tries + 1
             
@@ -68,11 +70,11 @@ class ClickNUploadResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://%s/%s' % (host, media_id)
         
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z/]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match('http://((?:www.)?clicknupload.(?:com|me))/(?:f/)?([0-9A-Za-z]+)', url) or 'clicknupload' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudy.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudy.py
index 4df7747407953bba4ca4eb1fb1456329d820de61..babec0777cbafc1e6a9e91323fcbf4e387f87630 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudy.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudy.py
@@ -17,18 +17,19 @@
 """
 
 import re
+import urllib
 from t0mm0.common.net import Net
+from lib import unwise
 from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from lib import unwise
-import urllib
 
 class CloudyResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "cloudy.ec"
     domains = [ "cloudy.ec", "cloudy.eu", "cloudy.sx", "cloudy.ch", "cloudy.com" ]
+    pattern = '(?://|\.)(cloudy\.(?:ec|eu|sx|ch|com))/(?:video/|v/|embed\.php\?id=)([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -112,11 +113,11 @@ class CloudyResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://www.cloudy.ec/embed.php?id=%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('(https?://(?:www\.|embed\.)cloudy\.(?:ec|eu|sx|ch|com))/(?:video/|embed\.php\?id=)([0-9a-z]+)', url)        
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match('https?://(?:www\.|embed\.)cloudy\.(?:ec|eu|sx|ch|com)/(?:video/|embed\.php\?id=)([0-9a-z]+)', url) or 'cloudy.' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudyvideos.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudyvideos.py
index 650e4a57170ef537a83062bd152d9e112b6b5909..546768bc5ea235314336b9871e8c9948cbe92fef 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudyvideos.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudyvideos.py
@@ -16,19 +16,20 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
 import xbmc
-from urlresolver import common
-from lib import jsunpack
-import re
 
 class CloudyVideosResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "cloudyvideos"
     domains = ["cloudyvideos.com"]
+    pattern = '(?://|\.)(cloudyvideos\.com)/([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -62,7 +63,7 @@ class CloudyVideosResolver(Plugin, UrlResolver, PluginSettings):
                     stream_url = match2.group(1)
             
         if stream_url:
-            return stream_url + '|User-Agent=%s&Referer=%s' % (common.IE_USER_AGENT, web_url)
+            return stream_url + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT, 'Referer': web_url })
 
         raise UrlResolver.ResolverError('Unable to resolve cloudyvideos link. Filelink not found.')
 
@@ -70,15 +71,11 @@ class CloudyVideosResolver(Plugin, UrlResolver, PluginSettings):
             return 'http://cloudyvideos.com/%s' % (media_id)
 
     def get_host_and_id(self, url):
-        r = re.search('http://(?:www.)?(.+?)/(?:embed-)?([\w]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
-            r = re.search('//(.+?)/([\w]+)', url)
-            if r:
-                return r.groups()
-            else:
-                return False
-
+            return False
+    
     def valid_url(self, url, host):
-        return re.match('http://(www.)?cloudyvideos.com/[0-9A-Za-z]+', url) or 'cloudyvideos' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudzilla.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudzilla.py
index 57fc09405f22de8ebf0c866ba6d1d5bd45df397a..9d3d4dee608bd0d8f525bb176226009f8364535f 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudzilla.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cloudzilla.py
@@ -16,18 +16,17 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import re
 
 class CloudZillaResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "cloudzilla"
     domains = ['cloudzilla.to', 'neodrive.co']
-    pattern = '//(?:www.)?(cloudzilla.to|neodrive.co)/(?:share/file|embed)/([A-Za-z0-9]+)'
+    pattern = '(?://|\.)(cloudzilla.to|neodrive.co)/(?:share/file|embed)/([A-Za-z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -52,6 +51,6 @@ class CloudZillaResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'cloudzilla' in host or 'neodrive' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/crunchyroll.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/crunchyroll.py
index 4d4cd593d917cd43ca1ea1581799fa43cb950e0b..0f7aa99328ee0d901f9afd4e096f320c6c47952c 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/crunchyroll.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/crunchyroll.py
@@ -16,31 +16,26 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-import urllib2
-from urlresolver import common
-import os
 
 class CrunchyRollResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "crunchyroll"
     domains = [ "crunchyroll.com" ]
-
+    pattern = '(?://|\.)(crunchyroll\.com)/.+?/.+?([^a-zA-Z-+]{6})'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        #http://www.crunchyroll.co.uk/07-ghost/episode-2-nostalgic-memories-accompany-pain-573286
-        #http://www.crunchyroll.com/07-ghost/episode-2-nostalgic-memories-accompany-pain-573286
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        html=self.net.http_GET('http://www.crunchyroll.com/android_rpc/?req=RpcApiAndroid_GetVideoWithAcl&media_id=%s'%media_id,{'Host':'www.crunchyroll.com',
+        html=self.net.http_GET('http://www.crunchyroll.com/android_rpc/?req=RpcApiAndroid_GetVideoWithAcl&media_id=%s'% media_id,{'Host':'www.crunchyroll.com',
              'X-Device-Uniqueidentifier':'ffffffff-931d-1f73-ffff-ffffaf02fc5f',
              'X-Device-Manufacturer':'HTC',
              'X-Device-Model':'HTC Desire',
@@ -54,11 +49,11 @@ class CrunchyRollResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://www.crunchyroll.com/android_rpc/?req=RpcApiAndroid_GetVideoWithAcl&media_id=%s' % media_id
         
     def get_host_and_id(self, url):
-        r = re.match(r'http://www.(crunchyroll).+?/.+?/.+?([^a-zA-Z-+]{6})', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return (re.match(r'http://www.(crunchyroll).+?/.+?/.+?([^a-zA-Z-+]{6})', url) or 'crunchyroll' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cyberlocker.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cyberlocker.py
deleted file mode 100644
index d3e4cff50bc66eead071300586f7e20bf957405c..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/cyberlocker.py
+++ /dev/null
@@ -1,86 +0,0 @@
-'''
-Cyberlocker urlresolver plugin
-Copyright (C) 2013 Vinnydude
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
-
-class CyberlockerResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "cyberlocker"
-    domains = ["cyberlocker.ch"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        url = self.get_url(host, media_id)
-        html = self.net.http_GET(url).content
-        r = re.findall('<center><h3>File Not Found</h3></center><br>', html, re.I)
-        if r:
-            raise UrlResolver.ResolverError('File Not Found or removed')
-        if not r:
-            data = {}
-            r = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', html)
-            for name, value in r:
-                data[name] = value
-                data['method_free'] = 'Wait for 0 seconds'
-            
-        html = self.net.http_POST(url, data).content
-        
-        sPattern = '<script type=(?:"|\')text/javascript(?:"|\')>(eval\('
-        sPattern += 'function\(p,a,c,k,e,d\)(?!.+player_ads.+).+np_vid.+?)'
-        sPattern += '\s+?</script>'
-        r = re.search(sPattern, html, re.DOTALL + re.IGNORECASE)
-        if r:
-            sJavascript = r.group(1)
-            sUnpacked = jsunpack.unpack(sJavascript)
-            sPattern = '<embed id="np_vid"type="video/divx"src="(.+?)'
-            sPattern += '"custommode='
-            r = re.search(sPattern, sUnpacked)
-            if r:
-                return r.group(1)
-        else:
-            num = re.compile('cyberlocker\|(.+?)\|http').findall(html)
-            pre = 'http://'+num[0]+'.cyberlocker.ch:182/d/'
-            preb = re.compile('image\|(.+?)\|video\|(.+?)\|').findall(html)
-            for ext, link in preb:
-                r = pre+link+'/video.'+ext
-                return r
-
-    def get_url(self, host, media_id):
-        return 'http://cyberlocker.ch/%s' % media_id 
-
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z]+)',url)
-        if r:
-            return r.groups()
-        else:
-            return False
-        return('host', 'media_id')
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?cyberlocker.ch/' +
-                         '[0-9A-Za-z]+', url) or
-                         'cyberlocker' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/daclips.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/daclips.py
index 1b18f53561b7b7a50a508c35752b13f89d5951e4..5a2e4115fd34e59a589933064d894d4692693a88 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/daclips.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/daclips.py
@@ -21,20 +21,17 @@ from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class DaclipsResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "daclips"
     domains = [ "daclips.in", "daclips.com" ]
+    pattern = '(?://|\.)(daclips\.(?:in|com))/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        #e.g. http://daclips.com/vb80o1esx2eb
-        self.pattern = 'http://((?:www.)?daclips.(?:in|com))/([0-9a-zA-Z]+)'
-
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -56,7 +53,6 @@ class DaclipsResolver(Plugin, UrlResolver, PluginSettings):
             raise UrlResolver.ResolverError('Unable to resolve Daclips link')
         
     def get_url(self, host, media_id):
-        #return 'http://(daclips|daclips).(in|com)/%s' % (media_id)
         return 'http://daclips.in/%s' % (media_id)
 
     def get_host_and_id(self, url):
@@ -65,7 +61,6 @@ class DaclipsResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/dailymotion.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/dailymotion.py
index d1b4d524cd6330ea185ebdc10e888eca6696f003..d69864d831d93aebebedb713af33b1d8fbeb4dd4 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/dailymotion.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/dailymotion.py
@@ -15,19 +15,20 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
-import xbmc
+
+import re
+import json
+import urllib2
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-import urllib2, urllib
-from urlresolver import common
 
 class DailymotionResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "dailymotion"
     domains = [ "dailymotion.com" ]
+    pattern = '(?://|\.)(dailymotion\.com)/(?:video|embed|sequence|swf)(?:/video)?/([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -36,46 +37,39 @@ class DailymotionResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        link = self.net.http_GET(web_url).content
-        try:
-            if link.find('"error":') >= 0:
-                err_title = re.compile('"title":"(.+?)"').findall(link)[0]
-                if not err_title:
-                    err_title = 'Content not available.'
-                
-                err_message = re.compile('"message":"(.+?)"').findall(link)[0]
-                if not err_message:
-                    err_message = 'No such video or the video has been removed due to copyright infringement issues.'
-                
-                raise UrlResolver.ResolverError(err_message)
-        except:pass
-                
-        dm_live = re.compile('live_rtsp_url":"(.+?)"', re.DOTALL).findall(link)
-        dm_1080p = re.compile('"1080":.+?"url":"(.+?)"', re.DOTALL).findall(link)
-        dm_720p = re.compile('"720":.+?"url":"(.+?)"', re.DOTALL).findall(link)
-        dm_high = re.compile('"480":.+?"url":"(.+?)"', re.DOTALL).findall(link)
-        dm_low = re.compile('"380":.+?"url":"(.+?)"', re.DOTALL).findall(link)
-        dm_low2 = re.compile('"240":.+?"url":"(.+?)"', re.DOTALL).findall(link)
-                
+        html = self.net.http_GET(web_url).content
+
+        html = re.search('({"context".+?)\);\n',html, re.DOTALL)
+        if html:
+            html = json.loads(html.group(1))
+            if 'metadata' in html: html = html['metadata']
+            else: return
+
+        if 'error' in html:
+            err_title = html['error']
+            if 'title' in err_title:
+                err_title = err_title['title']
+            else:
+                err_title = 'Content not available.'
+            raise UrlResolver.ResolverError(err_title)
+
+        if 'qualities' in html:
+            html = html['qualities']
+
         videoUrl = []
-        
-        if dm_live:
-            liveVideoUrl = urllib.unquote_plus(dm_live[0]).replace("\\/", "/")
-            liveVideoUrl = liveVideoUrl.replace("protocol=rtsp", "protocol=rtmp")
-            liveVideoUrl = self.net.http_GET(liveVideoUrl).content
-            videoUrl.append(liveVideoUrl)
-        else:
-            if dm_1080p:
-                videoUrl.append(urllib.unquote_plus(dm_1080p[0]).replace("\\/", "/"))
-            if dm_720p:
-                videoUrl.append(urllib.unquote_plus(dm_720p[0]).replace("\\/", "/"))
-            if dm_high:
-                videoUrl.append(urllib.unquote_plus(dm_high[0]).replace("\\/", "/"))
-            if dm_low:
-                videoUrl.append(urllib.unquote_plus(dm_low[0]).replace("\\/", "/"))
-            if dm_low2:
-                videoUrl.append(urllib.unquote_plus(dm_low2[0]).replace("\\/", "/"))
-        
+        try: videoUrl.append(html['1080'][0]['url'])
+        except: pass
+        try: videoUrl.append(html['720'][0]['url'])
+        except: pass
+        try: videoUrl.append(html['480'][0]['url'])
+        except: pass
+        try: videoUrl.append(html['380'][0]['url'])
+        except: pass
+        try: videoUrl.append(html['240'][0]['url'])
+        except: pass
+        try: videoUrl.append(html['auto'][0]['url'])
+        except: pass
+
         vUrl = ''
         vUrlsCount = len(videoUrl)
         if vUrlsCount > 0:
@@ -89,45 +83,23 @@ class DailymotionResolver(Plugin, UrlResolver, PluginSettings):
             elif q == '2':
                 # Lowest Quality
                 vUrl = videoUrl[vUrlsCount - 1]
-        
-        common.addon.log('url:' + vUrl)
+
+        vUrl = urllib2.urlopen(urllib2.Request(vUrl)).geturl()
         return vUrl
 
     def get_url(self, host, media_id):
         return 'http://www.dailymotion.com/embed/video/%s' % media_id
-        
+
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/embed/video/([0-9A-Za-z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
-            r = re.search('//(.+?)/swf/video/([0-9A-Za-z]+)', url)
-            if r:
-                return r.groups()
-            else:
-                r = re.search('//(.+?)/video/([0-9A-Za-z]+)', url)
-                if r:
-                    return r.groups()
-                else:
-                    r = re.search('//(.+?)/swf/([0-9A-Za-z]+)', url)
-                    if r:
-                        return r.groups()
-                    else:
-                        r = re.search('//(.+?)/sequence/([0-9A-Za-z]+)', url)
-                        if r:
-                            return r.groups()
-                        else:
-                            return False
-
-
+            return False
+    
     def valid_url(self, url, host):
-        return re.match('http://(www.)?dailymotion.com/sequence/[0-9A-Za-z]+', url) or \
-                re.match('http://(www.)?dailymotion.com/video/[0-9A-Za-z]+', url) or \
-                re.match('http://(www.)?dailymotion.com/swf/[0-9A-Za-z]+', url) or \
-                re.match('http://(www.)?dailymotion.com/embed/[0-9A-Za-z]+', url) or \
-                self.name in host
+        return re.search(self.pattern, url) or self.name in host
 
-    #PluginSettings methods
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
         xml += '<setting label="Video Quality" id="%s_quality" ' % self.__class__.__name__
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/divxstage.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/divxstage.py
index ec9179adbe3fce5fae84cc351b22f199db1d378f..59517d9e24d3e7e15094f942df97a59fe78b730d 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/divxstage.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/divxstage.py
@@ -21,13 +21,12 @@ from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import unwise
 
 class DivxstageResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
-    name = "divxstage"
-    domains = ["divxstage.eu", "divxstage.net", "divxstage.to", "cloudtime.to"]
+    name = 'divxstage'
+    domains = ['divxstage.eu', 'divxstage.net', 'divxstage.to', 'cloudtime.to']
+    pattern = '(?://|\.)(divxstage.eu|divxstage.net|divxstage.to|cloudtime.to)/(?:video/|embed/\?v=)([A-Za-z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -36,37 +35,38 @@ class DivxstageResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
+
         html = self.net.http_GET(web_url).content
-        r = re.search('<param name="src" value="(.+?)"', html)
+
+        r = re.search('flashvars.filekey=(.+?);', html)
         if r:
-            stream_url = r.group(1)
-        else:
-            html = unwise.unwise_process(html)
-            filekey = unwise.resolve_var(html, "flashvars.filekey")
-            
-            player_url = 'http://www.cloudtime.to/api/player.api.php?user=undefined&key=' + filekey + '&pass=undefined&codes=1&file=' + media_id
+            r = r.group(1)
+
+            try: filekey = re.compile('\s+%s="(.+?)"' % r).findall(html)[-1]
+            except: filekey = r
+
+            player_url = 'http://www.cloudtime.to/api/player.api.php?key=%s&file=%s' % (filekey, media_id)
+
             html = self.net.http_GET(player_url).content
+
             r = re.search('url=(.+?)&', html)
+
             if r:
                 stream_url = r.group(1)
             else:
                 raise UrlResolver.ResolverError('File Not Found or removed')
-            
+
         return stream_url
 
     def get_url(self, host, media_id):
-        return 'http://www.cloudtime.to/video/%s' % media_id
+        return 'http://embed.cloudtime.to/embed.php?v=%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:video/([0-9a-z]+)|embed.php\?v=([^\?&]+))', url)
+        r = re.search(self.pattern, url)
         if r:
-            if 'embed' in r.group(1):
-                return r.group(1),r.group(3)
-            else:
-                return r.group(1),r.group(2)
+            return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        #http://embed.divxstage.eu/embed.php?v=8da26363e05fd&width=746&height=388&c=000
-        return (re.match('http://(?:www.|embed.)?(?:divxstage\.(?:eu|net|to)|cloudtime\.to)/', url) or 'divxstage' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/donevideo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/donevideo.py
deleted file mode 100644
index 7634f36e0ef01e0af30a2edd39639cdc167506f4..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/donevideo.py
+++ /dev/null
@@ -1,93 +0,0 @@
-'''
-Donevideo urlresolver plugin
-Copyright (C) 2013 Vinnydude
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import re
-from urlresolver import common
-from lib import jsunpack
-from lib import captcha_lib
-
-class DonevideoResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "donevideo"
-    domains = [ "donevideo.com" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        url = self.get_url(host, media_id)
-        html = self.net.http_GET(url).content
-
-        data = {}
-        r = re.findall(r'type="(?:hidden|submit)?" name="(.+?)"\s* value="?(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-            
-        html = self.net.http_POST(url, data).content
-
-        r = re.findall(r'type="hidden" name="(.+?)" value="(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-        data.update(captcha_lib.do_captcha(html))
-        
-        html = self.net.http_POST(url, data).content
-
-        sPattern =  '<script type=(?:"|\')text/javascript(?:"|\')>(eval\('
-        sPattern += 'function\(p,a,c,k,e,d\)(?!.+player_ads.+).+np_vid.+?)'
-        sPattern += '\s+?</script>'
-        r = re.search(sPattern, html, re.DOTALL + re.IGNORECASE)
-        if r:
-            sJavascript = r.group(1)
-            sUnpacked = jsunpack.unpack(sJavascript)
-            sPattern  = '<embed id="np_vid"type="video/divx"src="(.+?)'
-            sPattern += '"custommode='
-            r = re.search(sPattern, sUnpacked)
-            if r:
-                return r.group(1)
-
-        else:
-                num = re.compile('donevideo\|(.+?)\|http').findall(html)
-                pre = 'http://'+num[0]+'.donevideo.com:182/d/'
-                preb = re.compile('image\|(.+?)\|video\|(.+?)\|').findall(html)
-                for ext, link in preb:
-                    r = pre+link+'/video.'+ext
-                    return r
-        
-    def get_url(self, host, media_id):
-        return 'http://www.donevideo.com/%s' % media_id 
-        
-
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z]+)',url)
-        if r:
-            return r.groups()
-        else:
-            return False
-        return('host', 'media_id')
-
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?donevideo.com/' +
-                         '[0-9A-Za-z]+', url) or
-                         'donevideo' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ecostream.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ecostream.py
index ee7dfddf9ea3a29f5eb925a66210c09f21b2ed47..92477f4e3fd62f1ba410f8ba773c836aeed6b056 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ecostream.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ecostream.py
@@ -18,33 +18,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import re
 import urllib2
-import os
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 
 class EcostreamResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "ecostream"
     domains = [ "ecostream.tv" ]
-    profile_path = common.profile_path
-    cookie_file = os.path.join(profile_path, 'ecostream.cookies')
+    pattern = '(?://|\.)(ecostream.tv)/(?:stream|embed)?/([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:www.)?ecostream.tv)/(?:stream|embed)?/([0-9a-zA-Z]+).html'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         html = self.net.http_GET(web_url).content
         if re.search('>File not found!<', html):
             raise UrlResolver.ResolverError('File Not Found or removed')
-        self.net.save_cookies(self.cookie_file)
         
         web_url = 'http://www.ecostream.tv/js/ecoss.js'
         js = self.net.http_GET(web_url).content
@@ -66,26 +62,28 @@ class EcostreamResolver(Plugin, UrlResolver, PluginSettings):
             found_parts.append(r.group(1))
         tpm = ''.join(found_parts)
         # emulate click on button "Start Stream"
-        postHeader = ({'Referer': web_url, 'X-Requested-With': 'XMLHttpRequest'})
+        headers = ({'Referer': web_url, 'X-Requested-With': 'XMLHttpRequest', 'User-Agent': common.IE_USER_AGENT})
         web_url = 'http://www.ecostream.tv' + post_url
-        self.net.set_cookies(self.cookie_file)
-        html = self.net.http_POST(web_url, {'id': media_id, 'tpm': tpm}, headers=postHeader).content
+        html = self.net.http_POST(web_url, {'id': media_id, 'tpm': tpm}, headers=headers).content
         sPattern = '"url":"([^"]+)"'
         r = re.search(sPattern, html)
         if not r:
             raise UrlResolver.ResolverError('Unable to resolve Ecostream link. Filelink not found.')
-        sLinkToFile = 'http://www.ecostream.tv' + r.group(1)
-        return urllib2.unquote(sLinkToFile)
+        stream_url = 'http://www.ecostream.tv' + r.group(1)
+        stream_url = urllib2.unquote(stream_url)
+        stream_url = urllib2.urlopen(urllib2.Request(stream_url, headers=headers)).geturl()
+
+        return stream_url
 
     def get_url(self, host, media_id):
             return 'http://www.ecostream.tv/stream/%s.html' % (media_id)
 
     def get_host_and_id(self, url):
-        r = re.search(self.pattern, url.replace('embed','stream'))
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/exashare.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/exashare.py
index 7dafb4da5598c402acbd98adec9ac1859ccd30f0..615b3adb29a7f4647cd9da6bb756b1df9b37bad1 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/exashare.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/exashare.py
@@ -16,115 +16,58 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
-import urllib,urllib2,os,re,xbmc
+import re
+import urlparse
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import SiteAuth
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class ExashareResolver(Plugin,UrlResolver,PluginSettings):
-    implements   = [UrlResolver,SiteAuth,PluginSettings]
-    name         = "exashare"
-    domains      = [ "exashare.com" ]
-    profile_path = common.profile_path    
-    cookie_file  = os.path.join(profile_path,'%s.cookies'%name)
-    
+
+class ExashareResolver(Plugin, UrlResolver, PluginSettings):
+    implements = [UrlResolver, PluginSettings]
+    name = "exashare"
+    domains = [ "exashare.com" ]
+    pattern = '(?://|\.)(exashare\.com)/(?:embed-)?([0-9a-zA-Z]+)'
+
     def __init__(self):
         p=self.get_setting('priority') or 100
         self.priority=int(p)
         self.net=Net()
-        
-    #UrlResolver methods
+
     def get_media_url(self, host, media_id):
-        base_url = 'http://www.' + host + '.com/' + media_id
-        headers = {'User-Agent': common.IE_USER_AGENT, 'Referer': 'http://www.' + host + '.com/'}
-        try: html = self.net.http_GET(base_url).content
-        except: html = self.net.http_GET(base_url, headers=headers).content
-        if re.search("""File Not Found""", html):
-            raise UrlResolver.ResolverError('File not found or removed')
-        POST_Url               = re.findall('form method="POST" action=\'(.*)\'',html)[0]
-        POST_Selected          = re.findall('form method="POST" action=(.*)</Form>',html,re.DOTALL)[0]
-        POST_Data              = {}
-        POST_Data['op']        = re.findall('input type="hidden" name="op" value="(.*)"',POST_Selected)[0]
-        POST_Data['usr_login'] = re.findall('input type="hidden" name="usr_login" value="(.*)"',POST_Selected)[0]
-        POST_Data['id']        = re.findall('input type="hidden" name="id" value="(.*)"',POST_Selected)[0]
-        POST_Data['fname']     = re.findall('input type="hidden" name="fname" value="(.*)"',POST_Selected)[0]
-        POST_Data['referer']   = re.findall('input type="hidden" name="referer" value="(.*)"',POST_Selected)[0]
-        POST_Data['hash']      = re.findall('input type="hidden" name="hash" value="(.*)"',POST_Selected)[0]
-        POST_Data['imhuman']   = 'Proceed to video'
-        try : html2 = self.net.http_POST(POST_Url,POST_Data).content
-        except : html2 = self.net.http_POST(POST_Url,POST_Data,headers=headers).content
-        stream_url = re.findall('file:\s*"([^"]+)"', html2)[0]
-        if self.get_setting('login') == 'true':
-            cookies = {}
-            for cookie in self.net._cj:
-                cookies[cookie.name] = cookie.value
-            if len(cookies) > 0:
-                stream_url = stream_url + '|' + urllib.urlencode({'Cookie': urllib.urlencode(cookies)})
-        common.addon.log('stream_url : ' + stream_url)
-        xbmc.sleep(7000)
-        return stream_url
+
+        web_url = self.get_url('exashare.com', media_id)
+
+        html = self.net.http_GET(web_url).content
+
+        try: r = re.search('src="([^"]+)', html).group(1)
+        except: return
+
+        web_url = urlparse.urlparse(r).netloc
+        web_url = self.get_url(web_url, media_id)
+
+        referer = '%s://%s/' % (urlparse.urlparse(r).scheme, urlparse.urlparse(r).netloc)
+
+        headers = { 'Referer': referer }
+
+        html = self.net.http_GET(web_url, headers=headers).content
+
+        stream_url = re.search('file\s*:\s*"(http.+?)"', html)
+
+        if stream_url:
+            return stream_url.group(1)
+        else:
+            raise UrlResolver.ResolverError('Unable to locate link')
 
     def get_url(self,host,media_id):
-        return 'http://www.exashare.com/%s' % media_id
+        return 'http://%s/embed-%s.html' % (host,media_id)
 
-    def get_host_and_id(self,url):
-        r=re.search('http://(?:www.)?(.+?).com/(?:embed\-)?([0-9A-Za-z_]+)(?:\-[0-9]+x[0-9]+.html)?',url)
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
         if r:
-            ls=r.groups()
-            return ls
+            return r.groups()
         else:
             return False
-
-    def valid_url(self, url, host):
-        if self.get_setting('login')=='false': return False
-        return re.match('http://(?:www.)?exashare.com/(?:embed\-)?[0-9A-Za-z]+(?:\-[0-9]+x[0-9]+.html)?',url) or 'exashare.com' in host
-
-    #SiteAuth methods
-    def needLogin(self):
-        url='http://www.exashare.com/?op=my_account'
-        if not os.path.exists(self.cookie_file):
-            common.addon.log_debug('needLogin returning True')
-            return True
-        self.net.set_cookies(self.cookie_file)
-        source=self.net.http_GET(url).content
-        if re.search("""Your username is for logging in and cannot be changed""",source):
-            common.addon.log_debug('needLogin returning False')
-            return False
-        else:
-            common.addon.log_debug('needLogin returning True')
-            return True
     
-    def login(self):
-        if (self.get_setting('login')=='true'):
-            if self.needLogin():
-                common.addon.log('logging in exashare')
-                url='http://www.exashare.com/'
-                data={'login':self.get_setting('username'),'password':self.get_setting('password'),'op':'login','redirect':'/login.html'}
-                headers={'User-Agent':common.IE_USER_AGENT,'Referer':url}
-                try: source=self.net.http_POST(url,data).content
-                except: source=self.net.http_POST(url,data,headers=headers).content
-                if re.search('Your username is for logging in and cannot be changed',source):
-                    common.addon.log('logged in exashare')
-                    self.net.save_cookies(self.cookie_file)
-                    self.net.set_cookies(self.cookie_file)
-                    return True
-                else:
-                    common.addon.log('error logging in exashare')
-                    return False
-        else:
-            if os.path.exists(self.cookie_file): os.remove(self.cookie_file)
-            return False
-                    
-    #PluginSettings methods
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        xml += '<setting id="ExashareResolver_login" '        
-        xml += 'type="bool" label="Login" default="false"/>\n'
-        xml += '<setting id="ExashareResolver_username" enable="eq(-1,true)" '
-        xml += 'type="text" label="     username" default=""/>\n'
-        xml += '<setting id="ExashareResolver_password" enable="eq(-2,true)" '
-        xml += 'type="text" label="     password" option="hidden" default=""/>\n'
-        return xml
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/facebook.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/facebook.py
index dfc5bca6ce85e4ae4f3baccfc5be7b666c0694c9..a4079dd824c0a7e6588d466277297262a3aea654 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/facebook.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/facebook.py
@@ -22,12 +22,12 @@ from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class FacebookResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "facebook"
     domains = [ "facebook.com" ]
+    pattern = '(?://|\.)(facebook\.com)/.+?video_id=([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -68,14 +68,15 @@ class FacebookResolver(Plugin, UrlResolver, PluginSettings):
         return 'https://www.facebook.com/video/embed?video_id=%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/video/embed?video_id=(\w+)', url)
-        return r.groups()
-
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
     def valid_url(self, url, host):
-        return re.match('https?://(www\.)?facebook.com/video/embed?video_id=(\w+)', url) or \
-               self.name in host
+        return re.search(self.pattern, url) or self.name in host
 
-    #PluginSettings methods
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
         xml += '<setting label="Video Quality" id="%s_quality" ' % self.__class__.__name__
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filehoot.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filehoot.py
index 415192440f70ff687e1e0b2b1ece93eb28da3463..c0a0d81629122267b27e7b4fd26ad4170a8bdaf6 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filehoot.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filehoot.py
@@ -17,7 +17,6 @@
 """
 import re
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
@@ -26,7 +25,7 @@ class FilehootResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "filehoot"
     domains = ['filehoot.com']
-    pattern = '//((?:www.)?filehoot.com)/(?:embed-)?([0-9a-z]+)'
+    pattern = '(?://|\.)(filehoot\.com)/(?:embed-)?([0-9a-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -55,6 +54,6 @@ class FilehootResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'filehoot' in host
\ No newline at end of file
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filenuke.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filenuke.py
index 2d7101b523ac2bd3f6c37e8e77eaba45f7ab4084..985db7eef92edc9b1732bcc03954386f61ffe8b2 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filenuke.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filenuke.py
@@ -16,18 +16,20 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
+import urllib
+import urllib2
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-import urllib2
-from urlresolver import common
 
 class FilenukeResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "filenuke"
     domains = ["filenuke.com"]
+    pattern = '(?://|\.)(filenuke\.com)/(?:f/)?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -51,20 +53,22 @@ class FilenukeResolver(Plugin, UrlResolver, PluginSettings):
         
         r = re.search("var\s+lnk\d+\s*=\s*'(.*?)'", html)
         if r:
-            stream_url = r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
+            stream_url = r.group(1)
+            stream_url = urllib2.urlopen(urllib2.Request(stream_url, headers=headers)).geturl()
+            stream_url = stream_url + '|' + urllib.urlencode(headers)
             return stream_url
         else:
             raise UrlResolver.ResolverError('Unable to locate link')
 
     def get_url(self, host, media_id):
-        return 'http://%s/%s' % (host, media_id)
+        return 'http://filenuke.com/%s' % media_id
         
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z/]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match('http://((?:www.)?filenuke.com)/(?:f/)?([0-9A-Za-z]+)', url) or 'filenuke' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filepup.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filepup.py
index 8b990c43d1e359a4e4ca495d03872a4728f73c66..2d1d21359bb98c93e6ce7759f52d013df7b21d69 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filepup.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/filepup.py
@@ -16,53 +16,82 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-import urllib2
-import urllib
-from urlresolver import common
-
-class NoRedirection(urllib2.HTTPErrorProcessor):
-    def http_response(self, request, response):
-        return response
-
-    https_response = http_response
-
+import xbmcgui
 
 class FilePupResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "filepup"
     domains = ["filepup.net"]
+    pattern = '(?://|\.)(filepup.(?:net))/(?:play|files)/([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:www.)?filepup.(?:net))/(?:play|files)/([0-9a-zA-Z]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        headers = {
-                   'User-Agent': common.IE_USER_AGENT
-        }
+        headers = {'User-Agent': common.SMU_USER_AGENT}
         html = self.net.http_GET(web_url, headers=headers).content
-        match = re.search("document.location='([^']+).*?DOWNLOAD AS A FREE USER", html, re.I)
-        if match:
-            data = urllib.urlencode({'task': 'download'})
-            req = urllib2.Request(match.group(1))
-            req.add_header('User-Agent', common.IE_USER_AGENT)
-            opener = urllib2.build_opener(NoRedirection)
-            urllib2.install_opener(opener)
-            res = urllib2.urlopen(req, data=data)
-            return res.info().getheader('location') + '|Referer=%s' % (web_url)
+        default_url = self.__get_def_source(html)
+        if default_url:
+            qualities = self.__get_qualities(html)
+            def_quality = self.__get_default(html)
+            if len(qualities) <= 1:
+                pick_quality = def_quality
+            elif self.get_setting('auto_pick') == 'true':
+                pick_quality = ''
+                best_height = 0
+                for quality in qualities:
+                    height = int(quality[:-1])
+                    if height > best_height:
+                        pick_quality = quality
+            else:
+                result = xbmcgui.Dialog().select('Choose the link', qualities)
+                if result == -1:
+                    raise UrlResolver.ResolverError('No link selected')
+                else:
+                    pick_quality = qualities[result]
+                    
+            if not def_quality or pick_quality == def_quality:
+                return default_url
+            else:
+                return default_url.replace('.mp4?', '-%s.mp4?' % (pick_quality))
         else:
             raise UrlResolver.ResolverError('Unable to location download link')
 
+    def __get_def_source(self, html):
+        default_url = ''
+        match = re.search('sources\s*:\s*\[(.*?)\]', html, re.DOTALL)
+        if match:
+            match = re.search('src\s*:\s*"([^"]+)', match.group(1))
+            if match:
+                default_url = match.group(1) + '|' + urllib.urlencode({'User-Agent': common.SMU_USER_AGENT})
+        return default_url
+        
+    def __get_default(self, html):
+        match = re.search('defaultQuality\s*:\s*"([^"]+)', html)
+        if match:
+            return match.group(1)
+        else:
+            return ''
+    
+    def __get_qualities(self, html):
+        qualities = []
+        match = re.search('qualities\s*:\s*\[(.*?)\]', html)
+        if match:
+            qualities = re.findall('"([^"]+)"', match.group(1))
+        return qualities
+    
     def get_url(self, host, media_id):
-        return 'http://www.filepup.net/files/%s' % (media_id)
+        return 'http://www.filepup.net/play/%s' % (media_id)
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -70,6 +99,11 @@ class FilePupResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
+
+    def get_settings_xml(self):
+        xml = PluginSettings.get_settings_xml(self)
+        xml += '<setting id="%s_auto_pick" type="bool" label="Automatically pick best quality" default="false" visible="true"/>' % (self.__class__.__name__)
+        return xml
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/flashx.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/flashx.py
index 6734452fb417f1620190939f768c63cbe1c80d54..4f95c589d08983998e3d6b34510849b701411891 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/flashx.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/flashx.py
@@ -16,55 +16,40 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
 from t0mm0.common.net import Net
-from urlresolver import common
+from lib import jsunpack
 from urlresolver.plugnplay import Plugin
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
-import re
-import xbmc
-from lib import jsunpack
 
 class FlashxResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "flashx"
     domains = ["flashx.tv"]
+    pattern = '(?://|\.)(flashx\.tv)/(?:embed-|dl\?)?([0-9a-zA-Z/-]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.|play.)?flashx.tv)/(?:embed-|dl\?)?([0-9a-zA-Z/-]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        headers = {'Referer': web_url}
-        stream_url = self.__get_link(web_url, media_id, headers)
-        if stream_url is None:
-            headers['User-Agent'] = common.IOS_USER_AGENT
-            stream_url = self.__get_link(web_url, media_id, headers)
-        
-        if stream_url is not None:
-            return stream_url + '|User-Agent=%s' % (common.IE_USER_AGENT)
+        html = self.net.http_GET(web_url).content
 
-        raise UrlResolver.ResolverError('File not found')
+        r = re.search('href="([^"]+)', html)
+        if r:
+            web_url = r.group(1)
+            html = self.net.http_GET(web_url).content
 
-    def __get_link(self, web_url, media_id, headers):
-        html = self.net.http_GET(web_url, headers=headers).content
-        data = {}
-        r = re.findall(r'type="hidden"\s*name="([^"]+)"\s*value="([^"]+)', html)
-        for name, value in r:
-            data[name] = value
-        data['imhuman'] = 'Proceed+to+video'
-        url = 'http://www.flashx.tv/dl?%s' % (media_id)
-        xbmc.sleep(6000)
-        html = self.net.http_POST(url, form_data=data, headers=headers).content
-        
-        best = 0
-        best_link = ''
-        for packed in re.findall("<script[^>]*>(eval\(function.*?)</script>", html, re.DOTALL):
-            unpacked = jsunpack.unpack(packed)
-            for stream in re.findall('file\s*:\s*"(http.*?)"\s*,\s*label\s*:\s*"(\d+)', unpacked, re.DOTALL):
+            try: html = jsunpack.unpack(re.search('(eval\(function.*?)</script>', html, re.DOTALL).group(1))
+            except: pass
+
+            best = 0
+            best_link = ''
+
+            for stream in re.findall('file\s*:\s*"(http.*?)"\s*,\s*label\s*:\s*"(\d+)', html, re.DOTALL):
                 if int(stream[1]) > best:
                     best = int(stream[1])
                     best_link = stream[0]
@@ -75,13 +60,15 @@ class FlashxResolver(Plugin, UrlResolver, PluginSettings):
             raise UrlResolver.ResolverError('Unable to resolve Flashx link. Filelink not found.')
         
     def get_url(self, host, media_id):
-        return 'http://www.flashx.tv/%s.html' % media_id
+        return 'http://www.flashx.tv/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
+        if r:
+            return r.groups()
+        else:
+            return False
+    
     def valid_url(self, url, host):
         return re.search(self.pattern, url) or self.name in host
 
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/googlevideo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/googlevideo.py
index 3fd44b451c5d4cbb8e83045b31339d20d3819fbe..5eea82ffc0e11df861bf27623481807f0e32a26c 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/googlevideo.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/googlevideo.py
@@ -31,23 +31,12 @@ class GoogleResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "googlevideo"
     domains = ["googlevideo.com", "picasaweb.google.com", "googleusercontent.com", "plus.google.com", "googledrive.com"]
+    pattern = 'http[s]*://(.*?(?:\.googlevideo|(?:picasaweb|plus)\.google|google(?:usercontent|drive))\.com)/(.*?(?:videoplayback\?|\?authkey|host/)*.+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http[s]*://(.*?(?:\.googlevideo|(?:picasaweb|plus)\.google|google(?:usercontent|drive))\.com)/(.*?(?:videoplayback\?|\?authkey|host/)*.+)'
-
-    def get_url(self, host, media_id):
-        return 'https://%s/%s' % (host, media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url)
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -107,6 +96,19 @@ class GoogleResolver(Plugin, UrlResolver, PluginSettings):
 
         raise UrlResolver.ResolverError('File not found')
 
+    def get_url(self, host, media_id):
+        return 'https://%s/%s' % (host, media_id)
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
+
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
         xml += '<setting id="%s_auto_pick" type="bool" label="Automatically pick best quality" default="false" visible="true"/>' % (self.__class__.__name__)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/gorillavid.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/gorillavid.py
index 87a2c6cf1174bf656823c77f493fb01fdb11bad3..d14c6fc981286fb4f64aac71a7d08cbaeb28f535 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/gorillavid.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/gorillavid.py
@@ -16,24 +16,22 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import urllib2, re, os
-from urlresolver import common
 
 class GorillavidResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "gorillavid"
     domains = ["gorillavid.in", "gorillavid.com"]
+    pattern = '(?://|\.)(gorillavid\.(?:in|com))/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        #e.g. http://gorillavid.com/vb80o1esx2eb
-        self.pattern = 'http://((?:www.)?gorillavid.(?:in|com))/(?:embed-)?([0-9a-zA-Z]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -63,6 +61,6 @@ class GorillavidResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/grifthost.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/grifthost.py
index f7e6ef747d26d2d65840c0dc4472c66073e39d3a..dfc29a385c274be15393545555aa3a3fa28481d4 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/grifthost.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/grifthost.py
@@ -16,25 +16,25 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import xbmc
-from urlresolver import common
-from lib import jsunpack
-import re
 
 class GrifthostResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "grifthost"
     domains = ["grifthost.com"]
+    pattern = '(?://|\.)(grifthost\.com)/(?:embed-)?([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?grifthost\.com)/(?:embed-)?([0-9a-zA-Z/]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -60,7 +60,7 @@ class GrifthostResolver(Plugin, UrlResolver, PluginSettings):
                     stream_url = match2.group(1)
             
         if stream_url:
-            return stream_url + '|User-Agent=%s&Referer=%s' % (common.IE_USER_AGENT, web_url)
+            return stream_url + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT, 'Referer': web_url })
 
         raise UrlResolver.ResolverError('Unable to resolve grifthost link. Filelink not found.')
 
@@ -73,6 +73,6 @@ class GrifthostResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or self.name  in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/hostingbulk.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/hostingbulk.py
deleted file mode 100644
index 971410238dd945020c17b822e54e0f2abcc88c72..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/hostingbulk.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 anilkuj
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import xbmc
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import re
-import urllib2, urllib
-from urlresolver import common
-from lib import jsunpack
-
-class HostingBulkResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "hostingbulk"
-    domains = [ "hostingbulk.com" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        link = self.net.http_GET(web_url).content
-
-        if link.find('File Not Found') >= 0:
-            raise UrlResolver.ResolverError('The requested video was not found.')
-
-        videoUrl = re.compile("\'file\'\s?:\s?\'([\w\/\.\:\-\=\?]+)\'").findall(link)
-
-        if len(videoUrl) > 0:
-            return videoUrl[0]
-        else:
-            # search for packed function
-            sPattern = "<script type='text/javascript'>(eval\(function\(p,a,c,k,e,d\)\{while.+?(hostingbulk|np_vid|player_ads).+?)</script>"
-            r = re.search(sPattern, link, re.DOTALL)
-            if r:
-                sUnpacked = jsunpack.unpack(r.group(1))
-                r = re.search('file:"(.+?)",', sUnpacked)
-            if r:
-                return r.group(1)
-            else:
-                raise UrlResolver.ResolverError('No playable video found.')
-
-    def get_url(self, host, media_id):
-        #return 'http://hostingbulk.com/%s' % media_id
-        return '%s/%s' % (host,media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search('(http://(?:www.|)(?:.+?))/(.+)', url)
-        if r:
-            return r.groups()
-        else:
-            r = None
-
-    def valid_url(self, url, host):
-        return re.match('http://(?:www.|)hostingbulk.com/(.+)', url) or 'hostingbulk' in host
-
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        return xml
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/hugefiles.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/hugefiles.py
index c648298bc170a79cb4a6a4adcdd97dbc591e69af..0ccb5a83172b62dfbafa6531e1d6335312652ac5 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/hugefiles.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/hugefiles.py
@@ -16,19 +16,21 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
+import urllib
+import urllib2
 from t0mm0.common.net import Net
+from lib import captcha_lib
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-from lib import jsunpack
-from urlresolver import common
-from lib import captcha_lib
 
 class HugefilesResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "hugefiles"
     domains = ["hugefiles.net"]
+    pattern = '(?://|\.)(hugefiles\.net)/([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -36,68 +38,63 @@ class HugefilesResolver(Plugin, UrlResolver, PluginSettings):
         self.net = Net()
 
     def get_media_url(self, host, media_id):
-        return self.__get_link(self.get_url(host, media_id))
-
-    def __get_link(self, url):
-        headers = {
-            'User-Agent': common.IE_USER_AGENT
-        }
-        common.addon.log_debug('HugeFiles: get_link: %s' % (url))
-        html = self.net.http_GET(url, headers).content
-        
-        # Re-grab data values
+        web_url = self.get_url(host, media_id)
+
+        common.addon.log_debug('HugeFiles: get_link: %s' % (web_url))
+        html = self.net.http_GET(web_url).content
+
+        r = re.findall('File Not Found', html)
+        if r:
+            raise UrlResolver.ResolverError('File Not Found or removed')
+
+        # Grab data values
         data = {}
-        r = re.findall(r'type="hidden" name="(.+?)" value="(.+?)"', html)
+        r = re.findall(r'type="hidden"\s+name="(.+?)"\s+value="(.*?)"', html)
         
         if r:
             for name, value in r:
                 data[name] = value
         else:
             raise UrlResolver.ResolverError('Unable to resolve link')
-        
+
+        data['method_free'] = 'Free Download'
         data.update(captcha_lib.do_captcha(html))
+
+        common.addon.log_debug('HugeFiles - Requesting POST URL: %s with data: %s' % (web_url, data))
+        html = self.net.http_POST(web_url, data).content
+
+        # Re-grab data values
+        data = {}
+        r = re.findall(r'type="hidden"\s+name="(.+?)"\s+value="(.*?)"', html)
         
-        common.addon.log_debug('HugeFiles - Requesting POST URL: %s with data: %s' % (url, data))
-        data['referer'] = url
-        html = self.net.http_POST(url, data, headers).content
-        
-        # try download link
-        link = re.search('id="lnk_download[^"]*" href="([^"]+)', html)
-        stream_url = None
-        if link:
-            common.addon.log_debug('HugeFiles Download Found: %s' % link.group(1))
-            stream_url = link.group(1)
-        else:
-            # try flash player link
-            packed = re.search('id="player_code".*?(eval.*?)</script>', html, re.DOTALL)
-            if packed:
-                js = jsunpack.unpack(packed.group(1))
-                js = js.replace('\\', '')
-                patterns = ["name=[\"']src[\"']\s*value=['\"]([^'\"]+)", "['\"]file['\"]\s*,\s*['\"]([^'\"]+)", "<source[^>]+src=['\"]([^'\"]+)"]
-                for pattern in patterns:
-                    link = re.search(pattern, js)
-                    if link:
-                        common.addon.log_debug('Hugefiles Src Found: %s' % link.group(1))
-                        stream_url = link.group(1)
-                        break
-                        
-        if stream_url:
-            return stream_url + '|User-Agent=%s&Referer=%s' % (common.IE_USER_AGENT, url)
+        if r:
+            for name, value in r:
+                data[name] = value
         else:
             raise UrlResolver.ResolverError('Unable to resolve link')
-        
+
+        data['referer'] = web_url
+
+        headers = { 'User-Agent': common.IE_USER_AGENT }
+
+        common.addon.log_debug('HugeFiles - Requesting POST URL: %s with data: %s' % (web_url, data))
+        request = urllib2.Request(web_url, data=urllib.urlencode(data), headers=headers)
+
+        try: stream_url = urllib2.urlopen(request).geturl()
+        except: return
+
+        common.addon.log_debug('Hugefiles stream Found: %s' % stream_url)
+        return stream_url
+ 
     def get_url(self, host, media_id):
-        return 'http://hugefiles.net/embed-%s.html' % media_id
+        return 'http://hugefiles.net/%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-        return('host', 'media_id')
-
+    
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?hugefiles.net/' +
-                         '[0-9A-Za-z]+', url) or
-                         'hugefiles' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidstream.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ipithos.py
similarity index 57%
rename from packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidstream.py
rename to packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ipithos.py
index bfedc777dfd453048fca5853acd10ef183c05839..796dad1aa10513770d6352735e4bc39ab8a86250 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidstream.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ipithos.py
@@ -1,67 +1,69 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class VidstreamResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "vidstream"
-    domains = ["vidstream.in"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        #e.g. http://vidstream.in/xdfaay6ccwqj
-        self.pattern = 'http://((?:www.)?vidstream.in)/(.*)'
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        post_url = resp.get_url()
-        form_values = {}
-        for i in re.finditer('<input.*?name="(.*?)".*?value="(.*?)">', html):
-            form_values[i.group(1)] = i.group(2)
-        html = self.net.http_POST(post_url, form_data=form_values).content
-
-        # get stream url
-        pattern = 'file:\s*"([^"]+)",'
-        r = re.search(pattern, html)
-        if r:
-            return r.group(1)
-        else:
-            raise UrlResolver.ResolverError('File Not Found or removed')
-
-    def get_url(self, host, media_id):
-            return 'http://vidstream.in/%s' % (media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+"""
+    urlresolver XBMC Addon
+    Copyright (C) 2016 lambda
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+
+import re
+from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
+from urlresolver.plugnplay.interfaces import UrlResolver
+from urlresolver.plugnplay.interfaces import PluginSettings
+from urlresolver.plugnplay import Plugin
+
+class IpithosResolver(Plugin, UrlResolver, PluginSettings):
+    implements = [UrlResolver, PluginSettings]
+    name = 'ipithos.to'
+    domains = [ 'ipithos.to' ]
+    pattern = '(?://|\.)(ipithos\.to)/(?:embed-)?([0-9a-zA-Z]+)'
+
+    def __init__(self):
+        p = self.get_setting('priority') or 100
+        self.priority = int(p)
+        self.net = Net()
+
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+
+        headers = { 'User-Agent': common.IOS_USER_AGENT }
+
+        html = self.net.http_GET(web_url, headers=headers).content
+
+        for match in re.finditer('(eval.*?\)\)\))', html, re.DOTALL):
+            js_data = jsunpack.unpack(match.group(1))
+
+            stream_url = re.findall('<param\s+name="src"\s*value="([^"]+)', js_data)
+            stream_url += re.findall('file\s*:\s*[\'|\"](.+?)[\'|\"]', js_data)
+            stream_url = [i for i in stream_url if not i.endswith('.srt')]
+
+            if stream_url:
+                return stream_url[0]
+            
+        raise UrlResolver.ResolverError('File Not Found or removed')
+
+    def get_url(self, host, media_id):
+        return 'http://ipithos.to/embed-%s.html' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/xfileload.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ishared.py
similarity index 54%
rename from packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/xfileload.py
rename to packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ishared.py
index 8b3c355f63f28d71282ffe1ca5ba1b3830fbcae7..40a91aba1882fa2a84e327889ff4e33519faca2e 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/xfileload.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ishared.py
@@ -1,67 +1,70 @@
-'''
-xfileload urlresolver plugin
-Copyright (C) 2015 tknorris
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import re
-from urlresolver import common
-from lib import captcha_lib
-
-class XFileLoadResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "xfileload"
-    domains = ["xfileload.com"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        data = {}
-        r = re.findall(r'type="hidden"\s*name="([^"]+)"\s*value="([^"]+)', html)
-        for name, value in r:
-            data[name] = value
-        data.update(captcha_lib.do_captcha(html))
-
-        html = self.net.http_POST(web_url, data).content
-            
-        if '>File Download Link Generated<' in html:
-            # find the href on the same line as the download button image
-            r = re.search('href="([^"]+).*?downdown\.png', html)
-            if r:
-                return  r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
-                        
-        raise UrlResolver.ResolverError('Unable to locate link')
-
-    def get_url(self, host, media_id):
-        return 'http://%s/%s' % (host, media_id)
-        
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z/]+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return re.match('http://((?:www.)?xfileload.com)/(?:f/)?([0-9A-Za-z]+)', url) or 'xfileload' in host
+"""
+urlresolver XBMC Addon
+Copyright (C) 2016 lambda
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+"""
+
+import re
+from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver.plugnplay.interfaces import UrlResolver
+from urlresolver.plugnplay.interfaces import PluginSettings
+from urlresolver.plugnplay import Plugin
+
+class IsharedResolver(Plugin, UrlResolver, PluginSettings):
+    implements = [UrlResolver, PluginSettings]
+    name = 'ishared.eu'
+    domains = [ 'ishared.eu' ]
+    pattern = '(?://|\.)(ishared\.eu)/(?:video|embed)/(.*?)(?:/|$)'
+
+    def __init__(self):
+        p = self.get_setting('priority') or 100
+        self.priority = int(p)
+        self.net = Net()
+
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+
+        html = self.net.http_GET(web_url).content
+
+        unpacked = ''
+        packed = html.split('\n')
+        for i in packed: 
+            try: unpacked += jsunpack.unpack(i).replace('\\\'', '\'')
+            except: pass
+        html += unpacked
+        html = html
+
+        match = re.findall('sources\s*:\s*\[.+?file\s*:\s*(.+?)\s*\,', html)
+
+        if match:
+            stream_url = re.findall('var\s+%s\s*=\s*\'(.+?)\'' % match[0], html)
+            if stream_url:
+                return stream_url[0]
+            
+        raise UrlResolver.ResolverError('File Not Found or removed')
+
+    def get_url(self, host, media_id):
+        return 'http://ishared.eu/embed/%s' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/jumbofiles.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/jumbofiles.py
deleted file mode 100644
index b00859fc720b6cf01c6492cf0be19b50a8b7b369..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/jumbofiles.py
+++ /dev/null
@@ -1,70 +0,0 @@
-'''
-jumbofiles urlresolver plugin
-Copyright (C) 2011 anilkuj
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class JumbofilesResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "jumbofiles"
-    domains = [ "jumbofiles.com" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        common.addon.log_debug('jumbofiles: in get_media_url %s %s' % (host, media_id))
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-
-        if 'file has been removed' in html:
-            raise UrlResolver.ResolverError('File has been removed.')
-
-        form_values = {}
-        for i in re.finditer('<input type="hidden" name="(.+?)" value="(.+?)">', html):
-            form_values[i.group(1)] = i.group(2)
-
-        html = self.net.http_POST(web_url, form_data=form_values).content
-        match = re.search('ACTION="(.+?)"', html)
-        if match:
-            return match.group(1)
-        else:
-            raise UrlResolver.ResolverError('failed to parse link')
-
-    def get_url(self, host, media_id):
-        common.addon.log('jumbofiles: in get_url %s %s' % (host, media_id))
-        return 'http://www.jumbofiles.com/%s' % media_id
-        
-    def get_host_and_id(self, url):
-        common.addon.log('jumbofiles: in get_host_and_id %s' % (url))
-        r = re.search('//(.+?)/([0-9a-zA-Z/]+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?jumbofiles.com/' +
-                         '[0-9A-Za-z]+', url) or
-                         'jumbofiles' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/justmp4.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/justmp4.py
deleted file mode 100644
index 28a64089d76ea9e12233354c868007320d04ace2..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/justmp4.py
+++ /dev/null
@@ -1,75 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2014 TheHighway
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-import re
-import xbmc
-import xbmcgui
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class Justmp4Resolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "justmp4.com"
-    hostname2 = "justmp4"
-    domains = ["justmp4.com"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = 'http://((?:www.)?' + self.name + ')/\D+-embed/([0-9a-zA-Z\-_]+)*'
-
-    def get_url(self, host, media_id):
-        return 'http://%s/%s%s' % (self.name, 'kvp-embed/', media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host or self.hostname2 in host
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        post_url = web_url
-        common.addon.log_debug(web_url)
-        headers = {'Referer': web_url}
-        html = self.net.http_GET(web_url).content
-        data = {}
-        r = re.findall(r'<input type="hidden"\s*value="(.*?)"\s*name="(.+?)"', html)
-        if r:
-            for value, name in r: data[name] = value;
-            xbmc.sleep(4000)
-            html = self.net.http_POST(post_url, data, headers=headers).content
-        try: r = re.compile('<source src="(.+?)" data-res="(\d+)" type="video/([0-9A-Za-z]+)">').findall(html)
-        except: r = []
-        ResList = []
-        UrlList = []
-        if len(r) > 0:
-            for (aUrl, aRes, aFrmt) in r:
-                ResList.append(aRes + ' ' + aFrmt)
-                UrlList.append([aRes + ' ' + aFrmt, aUrl])
-        dialogSelect = xbmcgui.Dialog()
-        index = dialogSelect.select('Select Resolution', ResList)
-        try:
-            return UrlList[index][1]
-        except:
-            raise UrlResolver.ResolverError('no file located')
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/kingfiles.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/kingfiles.py
index 42f30c73150c810928f6691cf9eacaa8ccd84fbc..dd9953d5b19a12fc5bb283113d4a537b8a075851 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/kingfiles.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/kingfiles.py
@@ -31,12 +31,12 @@ class KingFilesResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "KingFiles"
     domains = ["kingfiles.net"]
+    pattern = '(?://|\.)(kingfiles\.net)/([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?kingfiles\.net)/([0-9a-zA-Z/]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -77,6 +77,6 @@ class KingFilesResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
         return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/letwatch.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/letwatch.py
index 1ac7ba8d5539d616cbab3f3c09552ff5bc95b6f0..6a91ed56effed45f6bb79155c84ca73a54243fbf 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/letwatch.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/letwatch.py
@@ -15,16 +15,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import re
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
 
 class LetwatchResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "letwatch.us"
     domains = ["letwatch.us"]
+    pattern = '(?://|\.)(letwatch\.us)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -58,8 +59,11 @@ class LetwatchResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://letwatch.us/embed-%s-640x400.html' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(letwatch.us)/(?:embed-)?(\w+)', url)
-        return r.groups()
-
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
     def valid_url(self, url, host):
-        return re.match('http://letwatch.us/(?:embed-)?\w+', url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/lib/captcha_lib.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/lib/captcha_lib.py
index b0d65caba67c0f8d502d99b5ab6f8f86efd099cd..2ba19457659ab2c57ea1f195926698c036fa7ac8 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/lib/captcha_lib.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/lib/captcha_lib.py
@@ -23,37 +23,11 @@ import re
 import xbmcgui
 import xbmc
 import os
-import random
+import recaptcha_v2
 
 net = Net()
 IMG_FILE = 'captcha_img.png'
 
-google_nid = [
-    '67=mwocoU0FoMG_dewxiEO3zDc7LLQtKVabiaezQsipcVb-020jysQ9qfngMTyIYNGsub8G7eQBqQPuTXUAO3GJVFZZWjF4tawOwj0KGaRTbw27z0ZEuZtSN-98hX1KedvpY_rzoHyd-InVhDtoG9dqONDS88RmP8JxgZAz7GhtH_QWpTk1WUIY4WTMb6AQ5f58oYUlgQ',
-    '67=pLb98eXX7XshplSC25O1hUrM6VPe1bG9epaYJREF4EBGoV-TPIQ0MynwuZdb1ra4i_j8jfzeKgHyJRL917tqVvJ1drL2BTn2QE4HaRblzxd0lpITPiswWjYNWO3YMn8g0aV7bw3zFqdW9HrdT3h2iJxykpn7QTCJm7fFHZoSYVRR1zWL_jNpSHvs7u912M5K1skdqY-lGtU',
-    '67=OxBGxDxcR3S52tk-887HgVRyFu9krkOitMKqvUrTaPH_R4ugfYUiCL0lqR2Rxm4aESGXngTHsAppfZb5Qdkf_e0v7RCu0Oq4d8z65ZJ9KMRrCXEfVBP0-iMOQxPeCWfY',
-    '67=pKWLKXjRlCT2pQqthlZjlo2_mbcU2HYox1ApF-RwFLz6MCvuMsBSGOGh7yka3gcvrwx8aYta0Yvq_fPJor_nJT0gOO5vSPvDVIg__dZZoZ9DQXHO8VHqcd1aZPSXDS5v',
-    '67=vbE1-owJvPDeppE4EZJC-8Z-_BvsBleEcsL7lTnrvwxeG4CczVK-fcH0Wx8O-ODFuB6lm4EKQ1TZ_3YXGtd3kWPGLmjdVjmCgAhp5gAmTxSOVXvVVOCGzKR8eL_TPeL_',
-    '67=FaE2a-AnkczIWt5jMDccNY4V_PxBf966Z77a70AyS0aueqyp9T_rysO4G2npXwJbvOaoEOZzz9tWqHtA2883hFkuYuw4DkkNLnKFRm_XlS_CgnpMkCLTuqKj7b9vxI7U',
-    '67=T3PTCfatBsA-IZ8VEBbAllJVn6JUuuwtpbJCTXb7lRS9eQ-VArRF4pJsmGhGOCMpUsbTaTfWhqS5e2DgCER6NnBU6FDAU7eT-TrkokJhhOReEMM7jU-540KtVEml6ILg',
-    '67=Sg6vIy8i48EwAzU9XoN_-jbgt7Fmo2QHck9I_FlUlSDgwlRF2uTaxVpt6AQ5TNMsB9wQICFhS62NjV8A6vp3XNaqlPfflr5pfFtEQP92B5vjz9J6BFcjFzXQPdzEYjzf',
-    '67=gmwkHvz9DPD4aAkvWASWLckCXt-Bk3I050ok3RJClKDauzHvsgdLPrIeeLWK641RII82H42Ft5FECeKESQhscza18dzAKP0MJXQW6KDOQ6YGs5RA6kJrQrxPcGmyFvYy',
-    '67=ZAQc_dn0FqYZ1d94-kUyiuy2z8wbPFzBps0JQ5uvezEdZEXpDKorCAGwLtS-byDcuO4rH2fLSjgjDEb9g8uBD4uteRfFbIBE8KwmrJWnhAjvW6wAun4He9sWvQREyTcJ',
-    '67=ZAlxN3yhjTrFufC58FtofKUgd1EpBDH5V5KhdNoim_yGDDTMyyhvLdhYEevm84-Wg66zeHwGdnaFMzr_og0yJgjsNTpFeKo872exiCknsH4Nd1PRbm33Aa9W8oK-WBDa',
-    '67=ZAlxN3yhjTrFufC58FtofKUgd1EpBDH5V5KhdNoim_yGDDTMyyhvLdhYEevm84-Wg66zeHwGdnaFMzr_og0yJgjsNTpFeKo872exiCknsH4Nd1PRbm33Aa9W8oK-WBDa',
-    '67=s5Du4EheeC4qgE8wCp1UpOV-qVFHLeRblrMBRtbsvSf_FJzu5HF6ukgcUx4l_g74TcqLJtS40PNxLB_qyxnCAoMw5VJ2A6pdYyZeco1cYfP35EjWDjCIpk0DdlQCkuhB',
-    '67=KhPqWmMY01FJyf4kUyk5DhP8RMb9rh3qCjIOu2AGlOrrGB6QqPHpAkcWj3W9um0nNVx2EMzw2RFjbWtZMAI1PajDJUvoM0fnq_OdqdR7NziPOuq6ofWcmjTMFr0mouW3',
-    '67=EodF-df4x5VWS1nN4U9P9tVy3UZ-h7_P4098hgcal9Hggmou_FqN-0NW2u0IeP28k6xal-Wr4VNtGGn4PJqEHCTUDmMiCbeSDJiJPhnIi9wcjk8yMUQ9muf3JcS_5Aqz',
-    '67=m9-42qMKY6sRGB-KSRsiFYfjsijMBZqa_w5DJnXmT3x2c2IOBVv6IezuvZ-CX9wqAvyeFJ_VXkF9FDMuC1bDSYlt0rnxiYbIWQJsfMTG1cGLoFKfK-QYhPkLgAo0Ybxi',
-    '67=AbA52z04VG54UFjWoUiGTCSSH1dmRdBH5l84_ZtGEEwqPOH0AmZuqZMIlgzI8JyhBdDVrd8Hu5sanWxre-JnGkARQEBq9h0E3OblL_ZArLQWXJcYy8Ui6ETUkRZxTiOK',
-    '67=Tom5nqBLRUGu4hO74mEMmLVjKfCebyXSuQYH3CbmRViCm8nKZVBWzs0_r94SRwh-hTUqXfnnCSFVg2fqG2N9X6HOncsDjOLIek4Bo0PxCvXiuVsGuP_XmJvdumr8jAmM',
-    '67=QjGKq3LTgjo1vC0W-aTz0Nor4Jm3X_ecn7VGszvQH7hY-XqFK6wflSJHLcUPY0kDc12XNEW_CrHAcXM0W36xICEpUBrVFH6DtHIcKS1O5aeXt-jA-T8BnZoI34c2BhVa',
-    '67=DFIOnS1Nr3N6y0YE3Qx-CaaHYVlWyV10GIJTtIFQ-6_iZGNjtrimgPWlWPX5-zMLf9R76-Xyi5m4kZ0_9KMGChnZKTYTmEAZqHwAV-Q1p5Bc9PyVf-Lt5kO0EuxEAq5x',
-    '67=hW7zo2M6vOcFnwq4vvUloeE8NxM5n6L_jbJocYSA0yirrh4QTviVmvqcLOW2WM4KjJGLi01xIa9O0PrhWaPqKBtP_hz1wINF2nW7trMfR0T2aXyEDoNuDNeUUXAAjIhB',
-    '67=qAT-ji1lswEweR4BMbdLhdZHczj54O6s-OSFgH_rcjXLpOtjej9OR8ADiptMVjARY1hTWPadfixc3lZkfX41XuLFKK_B2J-hsEFHEdxkiL2IAW_AUyZ1MDYUs-Z8_l8q',
-    '67=pjyblxE4achNlGvw7LXzPoBVuEBq-VekSZSnd8isuMSgCEvV52szci3mISZH1vxvwFIFFoJQhNROOfwP7HhfLSXaPcIRBC44c19BNcxQn1bNTNTKRCNK8US9LQ1ksMPH',
-    '67=ZI_Eq9CM_PwpYyXE4x__N50BT1lySFyYw62MgeJorqhs7QYHw2X4kJVi2C5QocansHBQGXIEBIAxFxS9qlTLQp2KIYoVd4SBBYT6lE0CNtPZdA5EnrPoTev6pwqu06n4']
-
 def get_response(img):
     try:
         img = xbmcgui.ControlImage(450, 0, 400, 130, img)
@@ -75,14 +49,17 @@ def get_response(img):
         wdlg.close()
 
 def do_captcha(html):
-    solvemedia = re.search('<iframe src="((?:https?:)?//api.solvemedia.com[^"]+)', html)
+    solvemedia = re.search('<iframe[^>]+src="((?:https?:)?//api.solvemedia.com[^"]+)', html)
     recaptcha = re.search('<script\s+type="text/javascript"\s+src="(http://www.google.com[^"]+)', html)
+    recaptcha_v2 = re.search('data-sitekey="([^"]+)', html)
     xfilecaptcha = re.search('<img\s+src="([^"]+/captchas/[^"]+)', html)
     
     if solvemedia:
         return do_solvemedia_captcha(solvemedia.group(1))
     elif recaptcha:
         return do_recaptcha(recaptcha.group(1))
+    elif recaptcha_v2:
+        return do_recaptcha_v2(recaptcha_v2.group(1))
     elif xfilecaptcha:
         return do_xfilecaptcha(xfilecaptcha.group(1))
     else:
@@ -99,7 +76,7 @@ def do_solvemedia_captcha(captcha_url):
     if captcha_url.startswith('//'): captcha_url = 'http:' + captcha_url
     html = net.http_GET(captcha_url).content
     data = {
-            'adcopy_challenge': ''  # set to blank just in case not found; avoids exception on return
+        'adcopy_challenge': ''  # set to blank just in case not found; avoids exception on return
     }
     for match in re.finditer(r'type=hidden.*?name="([^"]+)".*?value="([^"]+)', html):
         name, value = match.groups()
@@ -109,7 +86,7 @@ def do_solvemedia_captcha(captcha_url):
     try: os.remove(captcha_img)
     except: pass
     
-    #Check for alternate puzzle type - stored in a div
+    # Check for alternate puzzle type - stored in a div
     alt_frame = re.search('<div><iframe src="(/papi/media[^"]+)', html)
     if alt_frame:
         html = net.http_GET("http://api.solvemedia.com%s" % alt_frame.group(1)).content
@@ -127,14 +104,23 @@ def do_solvemedia_captcha(captcha_url):
 def do_recaptcha(captcha_url):
     common.addon.log_debug('Google ReCaptcha: %s' % (captcha_url))
     if captcha_url.startswith('//'): captcha_url = 'http:' + captcha_url
-    captcha_nid = 'NID=' + random.choice(google_nid)
-    headers = {'Cookie': captcha_nid}
+    personal_nid = common.addon.get_setting('personal_nid')
+    if personal_nid:
+        headers = {'Cookie': 'NID=' + personal_nid}
+    else:
+        headers = {}
     html = net.http_GET(captcha_url, headers=headers).content
     part = re.search("challenge \: \\'(.+?)\\'", html)
     captcha_img = 'http://www.google.com/recaptcha/api/image?c=' + part.group(1)
     solution = get_response(captcha_img)
     return {'recaptcha_challenge_field': part.group(1), 'recaptcha_response_field': solution}
 
+def do_recaptcha_v2(sitekey):
+    token = recaptcha_v2.UnCaptchaReCaptcha().processCaptcha(sitekey, lang='en')
+    if token:
+        return {'g-recaptcha-response': token}
+
+    return {}
 def do_xfilecaptcha(captcha_url):
     common.addon.log_debug('XFileLoad ReCaptcha: %s' % (captcha_url))
     if captcha_url.startswith('//'): captcha_url = 'http:' + captcha_url
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/lib/recaptcha_v2.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/lib/recaptcha_v2.py
new file mode 100644
index 0000000000000000000000000000000000000000..1c4818fed7c0ba28e4dc627d641580c9b93f0b5e
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/lib/recaptcha_v2.py
@@ -0,0 +1,181 @@
+# -*- coding: utf-8 -*-
+"""
+    urlresolver XBMC Addon
+    Copyright (C) 2016 tknorris
+    Derived from Shani's LPro Code (https://github.com/Shani-08/ShaniXBMCWork2/blob/master/plugin.video.live.streamspro/unCaptcha.py)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    reusable captcha methods
+"""
+import re
+import urllib
+import urllib2
+import os
+import xbmcgui
+from urlresolver import common
+
+class cInputWindow(xbmcgui.WindowDialog):
+    def __init__(self, *args, **kwargs):
+        bg_image = os.path.join(common.addon_path, 'resources', 'images', 'DialogBack2.png')
+        check_image = os.path.join(common.addon_path, 'resources', 'images', 'checked.png')
+        self.cancelled = False
+        self.chk = [0] * 9
+        self.chkbutton = [0] * 9
+        self.chkstate = [False] * 9
+
+        imgX, imgY, imgw, imgh = 436, 210, 408, 300
+        ph, pw = imgh / 3, imgw / 3
+        x_gap = 70
+        y_gap = 70
+        button_gap = 40
+        button_h = 40
+        button_y = imgY + imgh + button_gap
+        middle = imgX + (imgw / 2)
+        win_x = imgX - x_gap
+        win_y = imgY - y_gap
+        win_h = imgh + 2 * y_gap + button_h + button_gap
+        win_w = imgw + 2 * x_gap
+
+        ctrlBackgound = xbmcgui.ControlImage(win_x, win_y, win_w, win_h, bg_image)
+        self.addControl(ctrlBackgound)
+        self.msg = '[COLOR red]%s[/COLOR]' % (kwargs.get('msg'))
+        self.strActionInfo = xbmcgui.ControlLabel(imgX, imgY - 30, imgw, 20, self.msg, 'font13')
+        self.addControl(self.strActionInfo)
+        img = xbmcgui.ControlImage(imgX, imgY, imgw, imgh, kwargs.get('captcha'))
+        self.addControl(img)
+        self.iteration = kwargs.get('iteration')
+        self.strActionInfo = xbmcgui.ControlLabel(imgX, imgY + imgh, imgw, 20, 'Captcha Round: %s [I](2 Rounds is typical)[/I]' % (str(self.iteration)), 'font40')
+        self.addControl(self.strActionInfo)
+        self.cancelbutton = xbmcgui.ControlButton(middle - 110, button_y, 100, button_h, 'Cancel', alignment=2)
+        self.okbutton = xbmcgui.ControlButton(middle + 10, button_y, 100, button_h, 'OK', alignment=2)
+        self.addControl(self.okbutton)
+        self.addControl(self.cancelbutton)
+
+        for i in xrange(9):
+            row = i / 3
+            col = i % 3
+            x_pos = imgX + (pw * col)
+            y_pos = imgY + (ph * row)
+            self.chk[i] = xbmcgui.ControlImage(x_pos, y_pos, pw, ph, check_image)
+            self.addControl(self.chk[i])
+            self.chk[i].setVisible(False)
+            self.chkbutton[i] = xbmcgui.ControlButton(x_pos, y_pos, pw, ph, str(i + 1), font='font1')
+            self.addControl(self.chkbutton[i])
+
+        for i in xrange(9):
+            row_start = (i / 3) * 3
+            right = row_start + (i + 1) % 3
+            left = row_start + (i - 1) % 3
+            up = (i - 3) % 9
+            down = (i + 3) % 9
+            self.chkbutton[i].controlRight(self.chkbutton[right])
+            self.chkbutton[i].controlLeft(self.chkbutton[left])
+            if i <= 2:
+                self.chkbutton[i].controlUp(self.okbutton)
+            else:
+                self.chkbutton[i].controlUp(self.chkbutton[up])
+
+            if i >= 6:
+                self.chkbutton[i].controlDown(self.okbutton)
+            else:
+                self.chkbutton[i].controlDown(self.chkbutton[down])
+
+        self.okbutton.controlLeft(self.cancelbutton)
+        self.okbutton.controlRight(self.cancelbutton)
+        self.cancelbutton.controlLeft(self.okbutton)
+        self.cancelbutton.controlRight(self.okbutton)
+        self.okbutton.controlDown(self.chkbutton[2])
+        self.okbutton.controlUp(self.chkbutton[8])
+        self.cancelbutton.controlDown(self.chkbutton[0])
+        self.cancelbutton.controlUp(self.chkbutton[6])
+        self.setFocus(self.okbutton)
+
+    def get(self):
+        self.doModal()
+        self.close()
+        if not self.cancelled:
+            return [i for i in xrange(9) if self.chkstate[i]]
+
+    def onControl(self, control):
+        if control == self.okbutton and any(self.chkstate):
+            self.close()
+
+        elif control == self.cancelbutton:
+            self.cancelled = True
+            self.close()
+        else:
+            label = control.getLabel()
+            if label.isnumeric():
+                index = int(label) - 1
+                self.chkstate[index] = not self.chkstate[index]
+                self.chk[index].setVisible(self.chkstate[index])
+
+    def onAction(self, action):
+        if action == 10:
+            self.cancelled = True
+            self.close()
+
+class UnCaptchaReCaptcha:
+    def processCaptcha(self, key, lang):
+        headers = {'Referer': 'https://www.google.com/recaptcha/api2/demo', 'Accept-Language': lang}
+        html = get_url('http://www.google.com/recaptcha/api/fallback?k=%s' % (key), headers=headers)
+        token = ''
+        iteration = 0
+        while True:
+            payload = re.findall('"(/recaptcha/api2/payload[^"]+)', html)
+            iteration += 1
+            message = re.findall('<label[^>]+class="fbc-imageselect-message-text"[^>]*>(.*?)</label>', html)
+            if not message:
+                message = re.findall('<div[^>]+class="fbc-imageselect-message-error">(.*?)</div>', html)
+            if not message:
+                token = re.findall('"this\.select\(\)">(.*?)</textarea>', html)[0]
+                if token:
+                    common.addon.log_debug('Captcha Success: %s' % (token))
+                else:
+                    common.addon.log_debug('Captcha Failed: %s')
+                break
+            else:
+                message = message[0]
+                payload = payload[0]
+
+            cval = re.findall('name="c"\s+value="([^"]+)', html)[0]
+            captcha_imgurl = 'https://www.google.com%s' % (payload.replace('&amp;', '&'))
+            message = re.sub('</?strong>', '', message)
+            oSolver = cInputWindow(captcha=captcha_imgurl, msg=message, iteration=iteration)
+            captcha_response = oSolver.get()
+            if not captcha_response:
+                break
+
+            data = {'c': cval, 'response': captcha_response}
+            html = get_url("http://www.google.com/recaptcha/api/fallback?k=%s" % (key), data=data, headers=headers)
+        return token
+
+# TODO: Replace with Net() when urlencode is fixed in _fetch
+def get_url(url, data=None, timeout=20, headers=None):
+    if headers is None: headers = {}
+    if data is None: data = {}
+    post_data = urllib.urlencode(data, doseq=True)
+    if 'User-Agent' not in headers:
+        headers['User-Agent'] = common.FF_USER_AGENT
+    common.addon.log_debug('URL: |%s| Data: |%s| Headers: |%s|' % (url, post_data, headers))
+
+    req = urllib2.Request(url)
+    for key in headers:
+        req.add_header(key, headers[key])
+
+    response = urllib2.urlopen(req, data=post_data, timeout=timeout)
+    result = response.read()
+    response.close()
+    return result
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/limevideo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/limevideo.py
deleted file mode 100644
index 05a04c3216ce32a3fd56489646152840e600c250..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/limevideo.py
+++ /dev/null
@@ -1,92 +0,0 @@
-'''
-Limevideo urlresolver plugin
-Copyright (C) 2013 Vinnydude
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
-from lib import captcha_lib
-
-class LimevideoResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "limevideo"
-    domains = [ "limevideo.net" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        url = self.get_url(host, media_id)
-        html = self.net.http_GET(url).content
-
-        data = {}
-        r = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-        data.update({'method_free': 'Continue to Video'})
-
-        html = self.net.http_POST(url, data).content
-
-        r = re.findall(r'type="hidden" name="(.+?)" value="(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-        data.update(captcha_lib.do_captcha(html))
-
-        html = self.net.http_POST(url, data).content
-        sPattern = '<script type=(?:"|\')text/javascript(?:"|\')>(eval\('
-        sPattern += 'function\(p,a,c,k,e,d\)(?!.+player_ads.+).+np_vid.+?)'
-        sPattern += '\s+?</script>'
-        r = re.search(sPattern, html, re.DOTALL + re.IGNORECASE)
-        if r:
-            sJavascript = r.group(1)
-            sUnpacked = jsunpack.unpack(sJavascript)
-            sPattern = '<embed id="np_vid"type="video/divx"src="(.+?)'
-            sPattern += '"custommode='
-            r = re.search(sPattern, sUnpacked)
-            if r:
-                return r.group(1)
-        else:
-            num = re.compile('false\|(.+?)\|(.+?)\|(.+?)\|(.+?)\|divx').findall(html)
-            for u1, u2, u3, u4 in num:
-                urlz = u4 + '.' + u3 + '.' + u2 + '.' + u1
-            pre = 'http://' + urlz + ':182/d/'
-            preb = re.compile('custommode\|(.+?)\|(.+?)\|182').findall(html)
-            for ext, link in preb:
-                r = pre + link + '/video.' + ext
-                return r
-
-    def get_url(self, host, media_id):
-        return 'http://www.limevideo.net/%s' % media_id
-
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z]+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-        return('host', 'media_id')
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?limevideo.net/' +
-                         '[0-9A-Za-z]+', url) or
-                         'limevideo' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mailru.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mailru.py
index 791207f13b1517f4d7b23a810f19a650ede45dc7..f59004b626716534a1c796499b47ed8df0703d72 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mailru.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mailru.py
@@ -21,8 +21,8 @@
 
 import re
 import json
+import urllib
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
@@ -30,8 +30,8 @@ from urlresolver.plugnplay import Plugin
 class MailRuResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "mail.ru"
-    domains = ["mail.ru"]
-    pattern = '//((?:videoapi.)?my\.mail\.ru)/(?:videos/embed/)?mail/([^/]+)/(?:video/)?(?:st|tv|archi)/([a-zA-Z0-9]+)'
+    domains = ['mail.ru', 'my.mail.ru', 'videoapi.my.mail.ru', 'api.video.mail.ru']
+    pattern = '(?://|\.)(mail\.ru)/.+?/mail/(.+?)/.+?/(\d*)\.html'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -40,41 +40,40 @@ class MailRuResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        match = re.search('"metadataUrl"\s*:\s*"([^"]+)', html)
-        if match:
-            json_url = match.group(1)
-            response = self.net.http_GET(json_url)
-            html = response.content
-            if html:
-                js_data = json.loads(html)
-                headers = dict(response._response.info().items())
-                stream_url = ''
-                best_quality = 0
-                for video in js_data['videos']:
-                    if int(video['key'][:-1]) > best_quality:
-                        stream_url = video['url']
-                        best_quality = int(video['key'][:-1])
-                    
-                    if 'set-cookie' in headers:
-                        stream_url += '|Cookie=%s' % (headers['set-cookie'])
-                    
-                if stream_url:
-                    return stream_url
+
+        response = self.net.http_GET(web_url)
+
+        html = response.content
+
+        if html:
+            js_data = json.loads(html)
+            headers = dict(response._response.info().items())
+
+            stream_url = ''
+            best_quality = 0
+            for video in js_data['videos']:
+                if int(video['key'][:-1]) > best_quality:
+                    stream_url = video['url']
+                    best_quality = int(video['key'][:-1])
+
+                if 'set-cookie' in headers:
+                    stream_url += '|' + urllib.urlencode({ 'Cookie': headers['set-cookie'] })
+
+            if stream_url:
+                return stream_url
 
         raise UrlResolver.ResolverError('No playable video found.')
 
     def get_url(self, host, media_id):
         user, media_id = media_id.split('|')
-        return 'http://videoapi.my.mail.ru/videos/embed/mail/%s/st/%s.html' % (user, media_id)
+        return 'http://videoapi.my.mail.ru/videos/mail/%s/_myvideo/%s.json?ver=0.2.60' % (user, media_id)
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
         if r:
-            host, user, media_id = r.groups()
-            return host, '%s|%s' % (user, media_id)
+            return (r.groups()[0], '%s|%s' % (r.groups()[1], r.groups()[2]))
         else:
             return False
 
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'mail.ru' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mediaplaybox.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mediaplaybox.py
index 9b8ca1d79abb19bc27f43e2511a4647786f5bac1..f603ca88db41d140f4159c25a562c18bb0f06cd0 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mediaplaybox.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mediaplaybox.py
@@ -16,39 +16,27 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
+import re
+import xml.etree.ElementTree as ET
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import xml.etree.ElementTree as ET
-import re
 
 class MediaPlayBoxResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver]
     name = "MediaPlayBox"
     domains = ["mediaplaybox.com"]
+    pattern = '(?://|\.)(mediaplaybox\.com)/video/(.*)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http[s]*://((?:www\.)?mediaplaybox.com)/video/(.*)'
         self.net.set_user_agent(common.IE_USER_AGENT)
         self.headers = {'User-Agent': common.IE_USER_AGENT}
 
-    def get_url(self, host, media_id):
-        return 'http://mediaplaybox.com/video/%s' % media_id
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or host in self.domains
-
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         html = self.net.http_GET(web_url).content
@@ -67,3 +55,16 @@ class MediaPlayBoxResolver(Plugin, UrlResolver, PluginSettings):
                     return result.text
         
         raise UrlResolver.ResolverError('Unable to find mediaplaybox video')
+
+    def get_url(self, host, media_id):
+        return 'http://mediaplaybox.com/video/%s' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/megavids.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/megavids.py
deleted file mode 100644
index 81fb055bd78855478d81850c8c719b2e1e70aa07..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/megavids.py
+++ /dev/null
@@ -1,65 +0,0 @@
-'''
-Allmyvideos urlresolver plugin
-Copyright (C) 2013 Vinnydude
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class MegaVidsResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "mega-vids"
-    domains = [ "mega-vids.com" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        url = self.get_url(host, media_id)
-        html = self.net.http_GET(url).content
-
-        data = {}
-        r = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-            
-        html = self.net.http_POST(url, data).content
-        
-        r = re.search("file\s*:\s*'(.+?)'", html)
-        if r:
-            return r.group(1)
-        else:
-            raise UrlResolver.ResolverError('could not find video')
-        
-    def get_url(self, host, media_id):
-        return 'http://mega-vids.com/%s' % media_id
-        
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([0-9a-zA-Z]+)',url)
-        if r:
-            return r.groups()
-        else:
-            return False
-        return('host', 'media_id')
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?mega-vids.com/[0-9A-Za-z]+', url) or re.match('http://(www.)?mega-vids.com/embed-[0-9A-Za-z]+[\-]*\d*[x]*\d*.*[html]*', url) or 'mega-vids' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mightyupload.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mightyupload.py
index 66bce473c388c714ff66b2732015b6ef25b32e17..0625fc0ca9e47ec23eb62498f2700d94bc8bfb4c 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mightyupload.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mightyupload.py
@@ -16,18 +16,20 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
-import re
 
 class MightyuploadResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "mightyupload"
     domains = ["mightyupload.com"]
+    pattern = '(?://|\.)(mightyupload\.com)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -63,7 +65,7 @@ class MightyuploadResolver(Plugin, UrlResolver, PluginSettings):
             stream_url = r.group(1)
 
         if stream_url:
-            return stream_url + '|User-Agent=%s' % (common.IE_USER_AGENT)
+            return stream_url + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
         else:
             raise UrlResolver.ResolverError('Unable to resolve link')
 
@@ -71,16 +73,11 @@ class MightyuploadResolver(Plugin, UrlResolver, PluginSettings):
             return 'http://www.mightyupload.com/embed-%s.html' % (media_id)
 
     def get_host_and_id(self, url):
-        r = re.search('http://(?:www.)?(.+?)/embed-([\w]+)-', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
-            r = re.search('//(.+?)/([\w]+)', url)
-            if r:
-                return r.groups()
-            else:
-                return False
-
-
+            return False
+    
     def valid_url(self, url, host):
-        return re.match('http://(www.)?mightyupload.com/[0-9A-Za-z]+', url) or 'mightyupload' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mooshare_biz.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mooshare_biz.py
index 5ed31fd02495f25a873a6d5025cee017ffe2c366..a9045744cb87222162dc492e434664a90be0b2c6 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mooshare_biz.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mooshare_biz.py
@@ -17,17 +17,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import re
-import xbmc
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
+import xbmc
 
 class MooShareResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "mooshare"
     domains = [ "mooshare.biz" ]
+    pattern = '(?://|\.)(mooshare\.biz)/(?:embed-|iframe/)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -57,12 +57,11 @@ class MooShareResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://mooshare.biz/%s' % media_id 
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([0-9a-zA-Z]+)',url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-        return('host', 'media_id')
-
+    
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?mooshare.biz/[0-9A-Za-z]+', url) or re.match('http://(www.)?mooshare.biz/embed-[0-9A-Za-z]+[\-]*\d*[x]*\d*.*[html]*', url) or 'mooshare' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movdivx.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movdivx.py
index 761e5b4b107a39eff725543cb88538f589e89033..5279105c717b41033b3a5988c16a3f2de9b3c61f 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movdivx.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movdivx.py
@@ -17,26 +17,22 @@
 """
 
 import re
-import urllib2
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
-
 
 class MovDivxResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "movdivx"
     domains = ["movdivx.com"]
+    pattern = '(?://|\.)(movdivx\.com)/([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        #e.g. http://movdivx.com/trrrw4r6bjqu/American_Dad__s_1_e_3_p1-1.flv.html
-        self.pattern = 'http://(?:www.)?(movdivx.com)/(.+?).html'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -74,7 +70,6 @@ class MovDivxResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
-
+    
     def valid_url(self, url, host):
         return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movpod.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movpod.py
index cf23fdb964a31a47765cca34b23e529c389c72c9..f6ff79913952d248abfad73b86887ac8345b61f9 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movpod.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movpod.py
@@ -16,24 +16,22 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-from urlresolver import common
 
 class MovpodResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "movpod"
     domains = ["movpod.net", "movpod.in"]
+    pattern = '(?://|\.)(movpod\.(?:net|in))/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        #e.g. http://movpod.com/vb80o1esx2eb
-        self.pattern = 'http://((?:www.)?movpod.(?:net|in))/([0-9a-zA-Z]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -53,7 +51,6 @@ class MovpodResolver(Plugin, UrlResolver, PluginSettings):
             raise UrlResolver.ResolverError('Unable to resolve Movpod Link')
 
     def get_url(self, host, media_id):
-        #return 'http://(movpod|movpod).(in|com)/%s' % (media_id)
         return 'http://movpod.in/%s' % (media_id)
 
     def get_host_and_id(self, url):
@@ -62,6 +59,6 @@ class MovpodResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movshare.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movshare.py
index 8cf330120e9bbf083c03dfe0939dc30d40a0de91..92f351e344cc806f337062b62d469778d8f6bbb0 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movshare.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movshare.py
@@ -16,24 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-"""
-RogerThis - 14/8/2011
-Site: http://www.movshare.net
-movshare hosts both avi and flv videos
-"""
-
 import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class MovshareResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "movshare"
-    domains = ["movshare.net"]
-    pattern = '//((?:www\.|embed\.)?movshare\.net)/(?:mobile/video\.php\?id=|video/|embed\.php\?v=)([0-9a-z]+)'
+    domains = ["movshare.net", 'wholecloud.net']
+    pattern = '(?://|\.)(movshare.net|wholecloud.net)/(?:video/|embed/\?v=)([A-Za-z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -42,32 +35,31 @@ class MovshareResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        self.net.http_HEAD(web_url)
+
         html = self.net.http_GET(web_url).content
-        """movshare can do both flv and avi. There is no way I know before hand
-        if the url going to be a flv or avi. So the first regex tries to find
-        the avi file, if nothing is present, it will check for the flv file.
-        "param name="src" is for avi
-        "flashvars.file=" is for flv
-        """
-        r = re.search('<param name="src" value="(.+?)"', html)
-        if not r:
-            match = re.search('flashvars.filekey="(.+?)";', html)
-            if match:
-                #get stream url from api
-                filekey = match.group(0)
-                api = 'http://www.movshare.net/api/player.api.php?key=%s&file=%s' % (filekey, media_id)
-                html = self.net.http_GET(api).content
-                r = re.search('url=(.+?)&title', html)
+
+        r = re.search('flashvars.filekey=(.+?);', html)
         if r:
-            stream_url = r.group(1)
-        else:
-            raise UrlResolver.ResolverError('File Not Found or removed')
-        
+            r = r.group(1)
+
+            try: filekey = re.compile('\s+%s="(.+?)"' % r).findall(html)[-1]
+            except: filekey = r
+
+            player_url = 'http://www.wholecloud.net/api/player.api.php?key=%s&file=%s' % (filekey, media_id)
+
+            html = self.net.http_GET(player_url).content
+
+            r = re.search('url=(.+?)&', html)
+
+            if r:
+                stream_url = r.group(1)
+            else:
+                raise UrlResolver.ResolverError('File Not Found or removed')
+
         return stream_url
 
     def get_url(self, host, media_id):
-        return 'http://www.movshare.net/video/%s' % media_id
+        return 'http://embed.wholecloud.net/embed.php?v=%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -75,6 +67,6 @@ class MovshareResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'movshare' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movzap.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movzap.py
deleted file mode 100644
index e1450ff399e2347d9ee920e432ecc579b5d10c8a..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/movzap.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""
-movzap|zuzvideo urlresolver plugin
-Copyright (C) 2012 Lynx187
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
-
-class MovzapZuzVideoResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "movzap|zuzvideo"
-    domains = ["movzap.com", "zuzvideo.com"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-
-        # search for packed function
-        sPattern = "<script type='text/javascript'>(eval\(function\(p,a,c,k,e,d\)\{while.+?movzap.+?)</script>"
-        r = re.search(sPattern, html, re.DOTALL)
-        if r:
-            sUnpacked = jsunpack.unpack(r.group(1))
-            r = re.search('file:"(.+?)",', sUnpacked)
-            if r:
-                return r.group(1)
-        else:
-            # search for file reference if present
-            r = re.search('file: "(.+?)",', html)
-            if r:
-                return r.group(1)
-
-        raise UrlResolver.ResolverError('movzap|zuzvideo: could not obtain video url')
-        
-    def get_url(self, host, media_id):
-            return '%s/%s' % (host,media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search('(http://(?:www.|)(?:.+?))/([0-9A-Za-z]+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return re.match('http://(?:www.|)(?:movzap|zuzvideo).com/[0-9A-Za-z]+', url) or 'movzap' in host or 'zuzvideo' in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4edge.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4edge.py
index a515e48d823a0c129416314902543bcb2436b498..31d9eeb20f61f26555ed17246fa6309a449e5704 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4edge.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4edge.py
@@ -16,40 +16,26 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
+import re
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import urllib
-import re
-
 
 class Mp4EdgeResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "mp4edge.com"
     domains = ["mp4edge.com"]
-    
+    pattern = '(?://|\.)(mp4edge\.com)/stream/([0-9a-zA-Z]+)'
+
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:.*?)mp4edge\.com)/stream/([0-9a-zA-Z]+)'
         self.user_agent = common.IE_USER_AGENT
         self.net.set_user_agent(self.user_agent)
         self.headers = {'User-Agent': self.user_agent}
-
-    def get_url(self, host, media_id):
-        return 'http://%s/stream/%s' % (host, media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or host in self.domains
     
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -60,3 +46,16 @@ class Mp4EdgeResolver(Plugin, UrlResolver, PluginSettings):
             return r.group(1)
         else:
             raise UrlResolver.ResolverError('File not found')
+
+    def get_url(self, host, media_id):
+        return 'http://%s/stream/%s' % (host, media_id)
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4star.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4star.py
deleted file mode 100644
index 944b87e25bd725f09a031e0c6b0094766e8b344c..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4star.py
+++ /dev/null
@@ -1,72 +0,0 @@
-"""
-    urlresolver Host Plugin for mp4star.com
-    Copyright (C) 2014-2015 TheHighway
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import urllib
-import re
-import xbmc
-
-class MP4StarResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "mp4star"
-    domains = ["mp4star.com"]
-    domain = "http://mp4star.com"
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = 'http://((?:www.)?mp4star.com)/\D+/(\d+)'
-
-    def get_url(self, host, media_id):
-        return self.domain + '/vid/' + media_id
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        post_url = web_url
-        common.addon.log(web_url)
-        headers = {'Referer': web_url}
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        data = {}
-        r = re.findall(r'<input type="hidden"\s*value="(.*?)"\s*name="(.+?)"', html)
-        if r:
-            for value, name in r: data[name] = value
-            # data.update({'referer': web_url})
-            # headers={'Referer':web_url}
-            xbmc.sleep(4000)
-            html = self.net.http_POST(post_url, data, headers=headers).content
-        r = re.search('<source src="(\D+://.+?)" type="video', html)
-        if r:
-            xbmc.sleep(4000)
-            stream_url = urllib.unquote_plus(r.group(1))
-        else:
-            raise UrlResolver.ResolverError('no file located')
-        return stream_url
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4stream.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4stream.py
index 9ee4e2169d2dd271a7afd42e3c54423cb848c70c..7b83edd8fd8deb85b477b406c49b09f9ad0dc689 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4stream.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4stream.py
@@ -18,8 +18,8 @@
 
 
 import re
+import urllib
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
@@ -28,6 +28,7 @@ class Mp4streamResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "mp4stream"
     domains = ["mp4stream.com"]
+    pattern = '(?://|\.)(mp4stream\.com)/embed/([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -36,31 +37,30 @@ class Mp4streamResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        link = self.net.http_GET(web_url).content
-        link = ''.join(link.splitlines()).replace('\t', '')
-        videoUrl = 'nope'
 
-        sPlayer = re.compile('show_player\((.+?)\)').findall(link)
-        for sPlayer_param in sPlayer:
-            param = re.compile('\'(.+?)\'').findall(sPlayer_param)
-            if len(param) > 2 and 'hd_button' in param[2]:
-                break
+        response = self.net.http_GET(web_url)
+        html = response.content
+        headers = dict(response._response.info().items())
 
-        match = re.compile('file\':(.+?),').findall(link)[0]
-        if len(match) > 5:
-            videoUrl = match.replace("'http:", 'http:').replace("'+cc+'", param[0]).replace("'+videourl+'", param[1]).replace("'+token", param[3]).strip()
+        r = re.search('sources\s*:\s*(\[.*?\])',html, re.DOTALL)
 
-        return videoUrl
+        if r:
+            html = r.group(1)
+            r = re.search("'file'\s*:\s*'(.+?)'",html)
+            if r:
+                return r.group(1) + '|' + urllib.urlencode({ 'Cookie': headers['set-cookie'] })
+            else:
+                raise UrlResolver.ResolverError('File Not Found or removed')
 
     def get_url(self, host, media_id):
-        return 'http://%s/embed/%s' % (host, media_id)
+        return 'http://mp4stream.com/embed/%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/embed/(.+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return 'mp4stream' in url or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4upload.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4upload.py
index a039bb09d35c7dc56becdc0e1503e5c3a519e820..4ccf7880bf92c95593f184304ed8339cbdd46bbf 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4upload.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mp4upload.py
@@ -19,7 +19,6 @@
 
 import re
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
@@ -28,6 +27,7 @@ class Mp4uploadResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "mp4upload"
     domains = ["mp4upload.com"]
+    pattern = '(?://|\.)(mp4upload\.com)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -45,11 +45,11 @@ class Mp4uploadResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://www.mp4upload.com/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/embed-(.+?)\.', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return 'mp4upload.com' in url or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mrfile.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mrfile.py
deleted file mode 100644
index 0453cf0269dde940da94880a0cb560ab4615482d..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/mrfile.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""
-mrfile urlresolver plugin
-Copyright (C) 2014 Lynx187
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import re
-
-class MrFileResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "mrfile"
-    domains = ["mrfile.me"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        headers = {
-                   'User-Agent': common.IE_USER_AGENT}
-        html = self.net.http_GET(web_url, headers=headers).content
-        if re.search('File was deleted', html):
-            raise UrlResolver.ResolverError('File Not Found or removed')
-        r = re.search("file: '([^']+)'", html)
-        if not r:
-            raise UrlResolver.ResolverError('Unable to resolve mrfile link. Filelink not found.')
-        return r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
-
-    def get_url(self, host, media_id):
-            return 'http://www.mrfile.me/embed-%s.html' % (media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search('http://(?:www.)?(.+?)/embed-([\w]+)-', url)
-        if r:
-            return r.groups()
-        else:
-            r = re.search('//(.+?)/([\w]+)', url)
-            if r:
-                return r.groups()
-            else:
-                return False
-
-    def valid_url(self, url, host):
-        return re.match('http://(www.)?mrfile.me/[0-9A-Za-z]+', url) or 'mrfile' in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/muchshare.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/muchshare.py
deleted file mode 100644
index d0f16a21c25964cf9804cd035b70fc726ffa898f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/muchshare.py
+++ /dev/null
@@ -1,70 +0,0 @@
-'''
-Muchshare urlresolver plugin
-Copyright (C) 2013 Vinnydude
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import re, urllib2
-from urlresolver import common
-
-class MuchshareResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "muchshare"
-    domains = ["muchshare.net"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        url = self.get_url(host, media_id)
-        html = self.net.http_GET(url).content
-
-        err = re.compile('<p class="err">(.+?)<br>').findall(html)
-        if err:
-            raise UrlResolver.ResolverError(str(err))
-
-        data = {}
-        r = re.findall(r'type="(?:hidden|submit)?" name="(.+?)"\s* value="?(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-        data.update({'down_direct': 1})
-        
-        common.addon.show_countdown(45, title='Muchshare', text='Loading Video...')
-        html = self.net.http_POST(url, data).content
-        r = re.search("(?:.+var file_link = \'|.+\<a id=\"lnk_download\" href=\")(.+?)(?:\'|\"\>)", html).group(1)
-        r = urllib2.unquote(r)
-        return r
- 
-    def get_url(self, host, media_id):
-        return 'http://muchshare.net/%s' % media_id
-        
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z]+)',url)
-        if r:
-            return r.groups()
-        else:
-            return False
-        return('host', 'media_id')
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?muchshare.net/' +
-                         '[0-9A-Za-z]+', url) or
-                         'muchshare' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/nosvideo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/nosvideo.py
index 351be25c400ba4ab310ec0e65e9a67874406c977..cc7694bf4dba16bb43a8c5c359dfd1b91bedc510 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/nosvideo.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/nosvideo.py
@@ -16,18 +16,20 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
+import base64
+import urllib
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-from urlresolver import common
-from lib import jsunpack
 
 class NosvideoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "nosvideo"
     domains = ["nosvideo.com", "noslocker.com"]
+    pattern = '(?://|\.)(nosvideo.com|noslocker.com)/(?:\?v\=|embed/|.+?\u=)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -35,71 +37,47 @@ class NosvideoResolver(Plugin, UrlResolver, PluginSettings):
         self.net = Net()
 
     def get_media_url(self, host, media_id):
-        url = self.get_url(host, media_id)
-        html = self.net.http_GET(url).content
+        web_url = self.get_url(host, media_id)
+
+        html = self.net.http_GET(web_url).content
+
         if 'File Not Found' in html:
             raise UrlResolver.ResolverError('File Not Found')
 
-        headers = {
-            'Referer': url
-        }
+        r = re.search('class\s*=\s*[\'|\"]btn.+?[\'|\"]\s+href\s*=\s*[\'|\"](.+?)[\'|\"]', html)
+        if not r:
+            raise UrlResolver.ResolverError('File Not Found')
 
-        data = {}
-        r = re.findall(r'type="hidden" name="(.+?)"\s* value="(.+?)"', html)
-        for name, value in r:
-            data[name] = value
-        data.update({'method_free': 'Continue to Video'})
+        headers = { 'Referer': r.group(1) }
 
-        html = self.net.http_POST(url, data, headers=headers).content
+        web_url = 'http://nosvideo.com/vj/video.php?u=%s&w=&h=530' % media_id
 
-        r = re.search('(eval\(function\(p,a,c,k,e,[dr].*)', html)
-        if r:
-            js = jsunpack.unpack(r.group(1))
-            js = js.replace('\\', '')
-            html = js
-        else:
-            r = re.search("src='([^']+/videojs/[^']+)", html)
-            if r:
-                html = self.net.http_GET(r.group(1)).content
-            else:
-                r = re.search('<iframe\s+src="([^"]+)', html)
-                if r:
-                    html = self.net.http_GET(r.group(1)).content
-        
-        return self.__find_links(html)
-
-    def __find_links(self, html):
-        r = re.search('playlist=([^&]+)', html)
-        if r:
-            html = self.net.http_GET(r.group(1)).content
-            r = re.search('<file>\s*(.*)\s*</file>', html)
-            if r:
-                return r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
-            else:
-                raise UrlResolver.ResolverError('Unable to locate video file')
+        html = self.net.http_GET(web_url, headers=headers).content
+
+        stream_url = re.compile('var\stracker\s*=\s*[\'|\"](.+?)[\'|\"]').findall(html)
+        stream_url += re.compile("tracker *: *[\'|\"](.+?)[\'|\"]").findall(html)
+
+        if len(stream_url) > 0:
+            stream_url = stream_url[0]
         else:
-            r = re.search("file\s*:\s*'([^']+)", html)
-            if r:
-                return r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
-            else:
-                r = re.search('<source\s+src="([^"]+)', html)
-                if r:
-                    return r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
-                else:
-                    raise UrlResolver.ResolverError('Unable to locate playlist')
-        
+            raise UrlResolver.ResolverError('Unable to locate video file')
+
+        try: stream_url = base64.b64decode(stream_url)
+        except: pass
+
+        stream_url += '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
+
+        return stream_url
+ 
     def get_url(self, host, media_id):
-        return 'http://nosvideo.com/?v=%s' % media_id
+        return 'http://nosvideo.com/%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:\?v\=|embed/)?([0-9a-zA-Z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-        return('host', 'media_id')
-
+    
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?(nosvideo|noslocker).com/' +
-                         '(?:\?v\=|embed/)?[0-9A-Za-z]+', url) or
-                         'nosvideo' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/novamov.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/novamov.py
index 26b213975bc1c79c1f20505da226ff5dc71444d4..7a55ed1f7e8362c328f363f34bd63c4b50a8b9e2 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/novamov.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/novamov.py
@@ -16,19 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import re, urllib
+import re
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from lib import unwise
 
 class NovamovResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "novamov"
-    domains = [ "novamov.com" ]
-    pattern = '//((?:www\.|embed\.)?novamov\.com)/(?:mobile/video\.php\?id=|video/|embed\.php\?v\=)(\w+)'
+    domains = [ 'novamov.com', 'auroravid.to' ]
+    pattern = '(?://|\.)(novamov.com|auroravid.to)/(?:video/|embed/\?v=)([A-Za-z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -37,26 +35,31 @@ class NovamovResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
+
         html = self.net.http_GET(web_url).content
-        html = unwise.unwise_process(html)
-        filekey = unwise.resolve_var(html, "flashvars.filekey")
-        
-        #get stream url from api
-        api = 'http://www.novamov.com/api/player.api.php?key=%s&file=%s' % (filekey, media_id)
-        html = self.net.http_GET(api).content
-        r = re.search('url=(.+?)&title', html)
+
+        r = re.search('flashvars.filekey=(.+?);', html)
         if r:
-            stream_url = urllib.unquote(r.group(1))
-        else:
-            r = re.search('file no longer exists', html)
+            r = r.group(1)
+
+            try: filekey = re.compile('\s+%s="(.+?)"' % r).findall(html)[-1]
+            except: filekey = r
+
+            player_url = 'http://www.auroravid.to/api/player.api.php?key=%s&file=%s' % (filekey, media_id)
+
+            html = self.net.http_GET(player_url).content
+
+            r = re.search('url=(.+?)&', html)
+
             if r:
+                stream_url = r.group(1)
+            else:
                 raise UrlResolver.ResolverError('File Not Found or removed')
-            raise UrlResolver.ResolverError('Failed to parse url')
-        
+
         return stream_url
 
     def get_url(self, host, media_id):
-        return 'http://www.novamov.com/video/%s' % media_id
+        return 'http://www.auroravid.to/embed/?v=%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -64,6 +67,6 @@ class NovamovResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'novamov' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/nowvideo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/nowvideo.py
index fe687918eb3eceb1e5b41ea9ae912437136fc6c7..b0a1f97016eef1166f5a34aeb87b53d5916d08d4 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/nowvideo.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/nowvideo.py
@@ -16,19 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import re, urllib, urllib2, os
+import re
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from lib import unwise
 
 class NowvideoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "nowvideo"
-    domains = ["nowvideo.eu", "nowvideo.ch", "nowvideo.sx", "nowvideo.co", "nowvideo.li"]
-    pattern = '((?:http://|www.|embed.)?nowvideo.(?:eu|sx|ch|co|li))/(?:mobile/video\.php\?id=|video/|embed\.php\?.*?v=)([0-9a-z]+)'
+    domains = ['nowvideo.eu', 'nowvideo.ch', 'nowvideo.sx', 'nowvideo.co', 'nowvideo.li']
+    pattern = '(?://|\.)(nowvideo\.(?:eu|ch|sx|co|li))/(?:video/|embed\.php\?v=)([A-Za-z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -37,22 +35,29 @@ class NowvideoResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
+
         html = self.net.http_GET(web_url).content
-        match1 = re.search('flashvars\.file[_]*key\s*=\s*([^;]+)', html)
-        match2 = re.search('flashvars\.file\s*=\s*"([^"]+)', html)
-        
-        #get stream url from api
-        if match1 and match2:
-            match = re.search('var\s+%s\s*=\s*"([^"]+)' % (match1.group(1)), html)
-            if match:
-                api = 'http://www.nowvideo.sx/api/player.api.php?key=%s&file=%s' % (match.group(1), match2.group(1))
-                html = self.net.http_GET(api).content
-                r = re.search('url=([^&]+)', html)
-                if r:
-                    return urllib.unquote(r.group(1))
-                else:
-                    raise UrlResolver.ResolverError('File Not Found or removed')
-                
+
+        r = re.search('flashvars.filekey=(.+?);', html)
+        if r:
+            r = r.group(1)
+
+            try: filekey = re.compile('\s+%s="(.+?)"' % r).findall(html)[-1]
+            except: filekey = r
+
+            player_url = 'http://www.nowvideo.sx/api/player.api.php?key=%s&file=%s' % (filekey, media_id)
+
+            html = self.net.http_GET(player_url).content
+
+            r = re.search('url=(.+?)&', html)
+
+            if r:
+                stream_url = r.group(1)
+            else:
+                raise UrlResolver.ResolverError('File Not Found or removed')
+
+        return stream_url
+
     def get_url(self, host, media_id):
         return 'http://embed.nowvideo.sx/embed.php?v=%s' % media_id
 
@@ -62,6 +67,6 @@ class NowvideoResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'nowvideo' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ok.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ok.py
index 7f054f3482b8a7e7f765b4e312d1fddadf45386c..b581444940c0e15a88b6b24e810c71ec80e02119 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ok.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/ok.py
@@ -19,34 +19,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 import re
 import json
-import os
-import time
-import xbmcgui
+import urllib
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
+import xbmcgui
 
 class OKResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "ok.ru"
-    domains = ["ok.ru", "www.ok.ru"]
-    profile_path = common.profile_path
-    cookie_file = os.path.join(profile_path, '%s.cookies' % name)
-    id_file = os.path.join(profile_path, '%s.id' % name)
-    useragent = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0"
-    header = {"User-Agent":useragent}
+    domains = ['ok.ru', 'odnoklassniki.ru']
+    pattern = '(?://|\.)(ok.ru|odnoklassniki.ru)/(?:videoembed|video)/(.+)'
+    header = {"User-Agent": common.OPERA_USER_AGENT}
+    qual_map = {'full': '1080', 'hd': '720', 'sd': '480', 'low': '360', 'lowest': '240', 'mobile': '144'}
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www\.)?ok\.ru)/(?:videoembed|video)/(.+)'
-        try:
-            os.makedirs(os.path.dirname(self.cookie_file))
-        except OSError:
-            pass
 
     def get_media_url(self, host, media_id):
         vids = self.__get_Metadata(media_id)
@@ -58,16 +50,9 @@ class OKResolver(Plugin, UrlResolver, PluginSettings):
         for entry in vids['urls']:
             quality = self.__replaceQuality(entry['name'])
             lines.append(quality)
-            if vids['vdtkn'] is not None:
-                purged_jsonvars[quality] = entry['url'] + "&vdsig=" + vids['vtkn'] + "|User-Agent=" + self.useragent + "&Cookie=vdtkn%3D" + vids['vdtkn']
-            else:
-                purged_jsonvars[quality] = entry['url'] + "&vdsig=" + vids['vtkn'] + "|User-Agent=" + self.useragent
+            purged_jsonvars[quality] = entry['url'] + '|' + urllib.urlencode(self.header)
             if int(quality) > int(best): best = quality
 
-        if vids['vdtkn'] is not None:
-            if vids['vdtkn'][0] == '^':
-                vids['vdtkn'] = vids['vdtkn'][1:]
-
         if len(lines) == 1:
             return purged_jsonvars[lines[0]].encode('utf-8')
         else:
@@ -84,77 +69,18 @@ class OKResolver(Plugin, UrlResolver, PluginSettings):
         raise UrlResolver.ResolverError('No video found')
 
     def __replaceQuality(self, qual):
-        if qual == "full":
-            return "1080"
-        if qual == "hd":
-            return "720"
-        if qual == "sd":
-            return "480"
-        if qual == "low":
-            return "360"
-        if qual == "lowest":
-            return "240"
-        if qual == "mobile":
-            return "144"
-        common.addon.log_debug('Unknown quality: %s' % (qual))
-        return "000"
+        return self.qual_map.get(qual.lower(), '000')
 
     def __get_Metadata(self, media_id):
         url = "http://www.ok.ru/dk?cmd=videoPlayerMetadata&mid=" + media_id
         html = self.net.http_GET(url, headers=self.header).content
         json_data = json.loads(html)
-        info = self.__get_vdsig(json_data['security']['url'])
+        info = dict()
         info['urls'] = []
         for entry in json_data['videos']:
             info['urls'].append(entry)
         return info
 
-    def __get_vdsig(self, url):
-        info = dict()
-
-        vdsig = self.__loadSig()
-
-        if vdsig is not None:
-            info['vtkn'] = vdsig
-            info['vdtkn'] = None
-        else:
-            params = dict()
-            params[''] = ""
-            response = self.net.http_POST(url, params, headers=self.header)
-            cookies = self.net.get_cookies()
-            html = response.content
-            json_data = json.loads(html)
-            self.__saveSig(json_data['vtkn'], cookies['.mycdn.me']['/']['vdtkn'].expires)
-            info['vtkn'] = json_data['vtkn']
-            info['vdtkn'] = cookies['.mycdn.me']['/']['vdtkn'].value
-
-        return info
-
-    def __loadSig(self):
-        try:
-            f = open(self.id_file, 'r')
-            data = f.read()
-            f.close()
-
-            info = data.split(";")
-
-            if (float(info[1]) <= time.time()):
-                return
-            else:
-                return info[0]
-        except:
-            return
-
-    def __saveSig(self, vdsig, expires):
-        try:
-            data = vdsig + ";" + str(expires)
-            f = open(self.id_file, 'w')
-            f.write(data)
-            f.close()
-            return True
-        except:
-            return False
-
     def get_url(self, host, media_id):
         return 'http://%s/videoembed/%s' % (host, media_id)
 
@@ -164,11 +90,9 @@ class OKResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        if self.get_setting('enabled') == 'false':
-            return False
-        return re.search(self.pattern, url)
+        return re.search(self.pattern, url) or self.name in host
 
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/openload.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/openload.py
index 0e3c555dfbf40f73882c716119c93fff05c1ad64..21ff23057602f374f5209f82f73f46579a44e877 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/openload.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/openload.py
@@ -16,27 +16,27 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import json
+import urllib
 from t0mm0.common.net import Net
+from lib import captcha_lib
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
 from urlresolver import common
-import json
-import re
 import xbmc
-import urllib
-from lib import captcha_lib
 
 class OpenLoadResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "openload"
     domains = ["openload.io", "openload.co"]
+    pattern = '(?://|\.)(openload\.(?:io|co))/(?:embed|f)/([0-9a-zA-Z-_]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?openload\.(?:io|co))/(?:embed|f)/([0-9a-zA-Z-_]+)'
 
     def get_media_url(self, host, media_id):
         try:
@@ -72,6 +72,6 @@ class OpenLoadResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or self.name  in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/play44_net.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/play44_net.py
index 310c41a825ce2582771881e313ec42466415f05d..7ecf14bcb551caba7f55ef46e6e66839e8cde589 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/play44_net.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/play44_net.py
@@ -16,38 +16,24 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import urllib
-from urlresolver import common
-import re
 
 class Play44Resolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "play44.net"
     domains = ["play44.net"]
-    
+    pattern = '(?://|\.)(play44\.net)/embed\.php?.*?vid=([0-9a-zA-Z_\-\./]+)[\?&]*'
+
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        # http://play44.net/embed.php?w=718&h=438&vid=og/saint_seiya_omega_-_69.mp4
-        self.pattern = 'http://((?:www.)?play44.net)/embed\.php?.*?vid=([0-9a-zA-Z_\-\./]+)[\?&]*'
-        #self.pattern = 'http://((?:www.)?videofun.me)/embed/(.+?)'
-    
-    def get_url(self, host, media_id):
-            return 'http://play44.net/embed.php?&vid=%s' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
+
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         resp = self.net.http_GET(web_url)
@@ -58,3 +44,16 @@ class Play44Resolver(Plugin, UrlResolver, PluginSettings):
         else:
             raise UrlResolver.ResolverError('no file located')
         return stream_url
+
+    def get_url(self, host, media_id):
+        return 'http://play44.net/embed.php?&vid=%s' % (media_id)
+    
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/playwire.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/playwire.py
index 2d5acda21b9ad6d38ae9d63bdeaea73205971c13..b2869bc84a9fe2eae07148fe0b6291d2e8b30b73 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/playwire.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/playwire.py
@@ -17,17 +17,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import re
+import xml.etree.ElementTree as ET
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import xml.etree.ElementTree as ET
 
 class PlaywireResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "playwire"
     domains = ["playwire.com"]
+    pattern = '(?://|\.)(cdn\.playwire\.com.+?\d+)/(?:config|embed)/(\d+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -36,12 +36,16 @@ class PlaywireResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        link = self.net.http_GET(web_url).content
+        html = self.net.http_GET(web_url).content
         if web_url.endswith('xml'):  # xml source
-            root = ET.fromstring(link)
+            root = ET.fromstring(html)
             stream = root.find('src')
             if stream is not None:
-                return stream.text
+                stream = stream.text
+                if stream.endswith('.f4m'):
+                    html = self.net.http_GET(stream).content
+                    try: return re.findall('<baseURL>(.+?)</baseURL>', html)[0] + '/' + re.findall('<media url="(.+?)"', html)[0]
+                    except: pass
             else:
                 accessdenied = root.find('Message')
                 if accessdenied is not None:
@@ -49,7 +53,7 @@ class PlaywireResolver(Plugin, UrlResolver, PluginSettings):
 
                 raise UrlResolver.ResolverError('No playable video found.')
         else:  # json source
-            r = re.search('"src":"(.+?)"', link)
+            r = re.search('"src":"(.+?)"', html)
             if r:
                 return r.group(1)
             else:
@@ -62,17 +66,11 @@ class PlaywireResolver(Plugin, UrlResolver, PluginSettings):
             return 'http://%s/config/%s.json' % (host, media_id)
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?/\d+)/embed/(\d+)\.html', url)
-        if not r:
-            r = re.search('//(.+?/\d+)/config/(\d+)\.json', url)
-        return r.groups()
-
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
     def valid_url(self, url, host):
-        return re.match('http://(www\.)?cdn.playwire.com/\d+/embed/\d+\.html', url) or \
-               re.match('http://(www\.)?cdn.playwire.com/v2/\d+/config/\d+\.json', url) or \
-               self.name in host
-
-    #PluginSettings methods
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        return xml
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/premiumize_me.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/premiumize_me.py
index 32c87636605b024629a5da35cf754222b8f4913f..678e73830d62eb4843a0dc1bb15b6926e93a1e59 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/premiumize_me.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/premiumize_me.py
@@ -25,10 +25,7 @@ from t0mm0.common.net import Net
 
 import re
 import urllib
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 
 class PremiumizeMeResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
     implements = [UrlResolver, PluginSettings]
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/primeshare.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/primeshare.py
index 246222af91fa1cb91df6a8418f9b57dff08e8f0f..c4dda8fa7caf99aca607a6c032b4f898ecd519a2 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/primeshare.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/primeshare.py
@@ -17,20 +17,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
 import re
-import os
+import urllib2
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
 
 class PrimeshareResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "primeshare"
     domains = ["primeshare.tv"]
-    profile_path = common.profile_path
-    cookie_file = os.path.join(profile_path, 'primeshare.cookies')
+    pattern = '(?://|\.)(primeshare\.tv)/download/([0-9a-zA-Z-_]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -39,37 +37,41 @@ class PrimeshareResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        if re.search('>File not exist<', html):
-            raise UrlResolver.ResolverError('File Not Found or removed')
-        self.net.save_cookies(self.cookie_file)
-        headers = {'Referer': web_url}
-        # wait required
-        common.addon.show_countdown(8)
-        self.net.set_cookies(self.cookie_file)
-        html = self.net.http_POST(web_url, form_data={'hash': media_id}, headers=headers).content
-        r = re.compile("clip:.*?url: '([^']+)'", re.DOTALL).findall(html)
+
+        headers = { 'User-Agent': common.IOS_USER_AGENT }
+
+        html = self.net.http_GET(web_url, headers=headers).content
+
+        r = re.search('<video (.+?)</video>', html, re.DOTALL)
         if not r:
-            r = re.compile("download\('([^']+)'", re.DOTALL).findall(html)
+            raise UrlResolver.ResolverError('File Not Found or removed')
+
+        r = re.search('src\s*=\s*"(.+?)"', r.group(1), re.DOTALL)
         if not r:
             raise UrlResolver.ResolverError('Unable to resolve Primeshare link. Filelink not found.')
-        return r[0]
+        else:
+            stream_url = r.group(1)
+
+        r = urllib2.Request(stream_url, headers=headers)
+        r = urllib2.urlopen(r, timeout=15)
+        r = int(r.headers['Content-Length'])
+
+        if r < 1024:
+            raise UrlResolver.ResolverError('File removed.')
+        else:
+            return stream_url
 
     def get_url(self, host, media_id):
             return 'http://primeshare.tv/download/%s' % (media_id)
 
     def get_host_and_id(self, url):
-        r = re.search('http://(?:www.)(.+?)/download/([0-9A-Za-z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
-            return r.groups()       
+            return r.groups()
         else:
-            r = re.search('//(.+?)/download/([0-9A-Za-z]+)', url)
-            if r:
-                return r.groups()
-            else:
-                return False
-
+            return False
+    
     def valid_url(self, url, host):
-        return re.match('http://(www.)?primeshare.tv/download/[0-9A-Za-z]+', url) or 'primeshare' in host
+        return re.search(self.pattern, url) or self.name in host
 
 
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/promptfile.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/promptfile.py
index 8a0b3df15a111c7594dee9fb2c1610d373192eb1..103dd68862f5e02abcf3a9a2120b9078158acd34 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/promptfile.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/promptfile.py
@@ -16,22 +16,22 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 import re
+import urllib2
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class PromptfileResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "promptfile"
     domains = ["promptfile.com"]
+    pattern = '(?://|\.)(promptfile\.com)/(?:l|e)/([0-9A-Za-z\-]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?promptfile.com)/(?:l|e)/([0-9A-Za-z\-]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -45,6 +45,7 @@ class PromptfileResolver(Plugin, UrlResolver, PluginSettings):
         if not html:
             raise UrlResolver.ResolverError('File Not Found or removed')
         stream_url = html.group(1)
+        stream_url = urllib2.urlopen(urllib2.Request(stream_url)).geturl()
         return stream_url
 
     def get_url(self, host, media_id):
@@ -56,6 +57,6 @@ class PromptfileResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'promptfile' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/purevid.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/purevid.py
index b564d58f7e75905c731e7b637579bc8db88d9c05..d3bad727e91ba2734c234022d888a1294540a231 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/purevid.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/purevid.py
@@ -32,9 +32,11 @@ class PurevidResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
     implements = [UrlResolver, SiteAuth, PluginSettings]
     name = "purevid"
     domains = ["purevid.com"]
+    pattern = '(?://|\.)(purevid\.com)/v/([0-9A-Za-z]+)'
+
     profile_path = common.profile_path
     pv_cookie_file = os.path.join(profile_path, '%s.cookies' % name)
-    
+
     def __init__(self):
         p = self.get_setting('priority') or 1
         self.priority = int(p)
@@ -44,7 +46,6 @@ class PurevidResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
         except OSError:
             pass
 
-    #UrlResolver methods
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         html = self.net.http_GET(web_url).content
@@ -67,18 +68,16 @@ class PurevidResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
     def get_url(self, host, media_id):
         return 'http://www.purevid.com/?m=video_info_embed_flv&id=%s' % media_id
                         
-    def get_host_and_id(self, url):     
-        r = re.search('//(.+?)/v/([0-9A-Za-z]+)', url)
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
 
-    def valid_url(self, url, host):                 
-        if self.get_setting('login') == 'false': return False
-        return 'purevid' in url
-
-    #SiteAuth methods
     def needLogin(self):
         url = 'http://www.purevid.com/?m=main'
         if not os.path.exists(self.pv_cookie_file):
@@ -107,8 +106,7 @@ class PurevidResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
                 return False
         else :
             return True
-                    
-    #PluginSettings methods
+
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
         xml += '<setting id="PurevidResolver_login" '        
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/rapidvideo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/rapidvideo.py
index 3580d60a3c9434625274769a2c72549b61778538..3c47f54fb49b04095dd555ee9ad9cc36b5ff7d17 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/rapidvideo.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/rapidvideo.py
@@ -1,49 +1,59 @@
 """
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
+urlresolver XBMC Addon
+Copyright (C) 2011 t0mm0
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
 import re
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class RapidVideoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
-    name = "rapidvideo"
-    domains = [ "rapidvideo.com" ]
+    name = "rapidvideo.ws"
+    domains = ["rapidvideo.ws"]
+    pattern ='(?://|\.)(rapidvideo\.ws)/(?:embed-|)?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        #e.g. http://rapidvideo.com/view/hwksai28
-        self.pattern = 'http://((?:www.)?rapidvideo.com)/view/([0-9a-zA-Z]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
+
         html = self.net.http_GET(web_url).content
-        # get stream url
-        sPattern = "so.addVariable\(\s*'file'\s*,\s*'([^']+)'\s*\)"
-        return re.search(sPattern, html).group(1)
+
+        for match in re.finditer('(eval.*?\)\)\))', html, re.DOTALL):
+            js_data = jsunpack.unpack(match.group(1))
+            js_data = js_data.replace('\\\'', '\'')
+
+            stream_url = re.findall('<param\s+name="src"\s*value="([^"]+)', js_data)
+            stream_url += re.findall('file\s*:\s*[\'|\"](.+?)[\'|\"]', js_data)
+            stream_url = [i for i in stream_url if not i.endswith('.srt')]
+
+            if stream_url:
+                return stream_url[0]
+            
+        raise UrlResolver.ResolverError('File Not Found or removed')
 
     def get_url(self, host, media_id):
-            return 'http://rapidvideo.com/view/%s' % (media_id)
+            return 'http://rapidvideo.ws/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -51,6 +61,6 @@ class RapidVideoResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/realvid.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/realvid.py
deleted file mode 100644
index 913215d37eea8df3d9094c46e86cc03bb9304055..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/realvid.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-realvid urlresolver plugin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import re
-from urlresolver import common
-
-class RealvidResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "Realvid"
-    domains = ["realvid.net"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = 'http://((?:www.)?realvid.net)/(?:embed-)?([0-9a-zA-Z]+)(?:-\d+x\d+.html)?'
-    
-    def get_url(self,host,media_id): 
-        return 'http://realvid.net/embed-%s-640x400.html' % (media_id)
-
-    def get_host_and_id(self,url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self,url,host):
-        return re.match(self.pattern, url) or self.name in host
-
-    def get_media_url(self,host,media_id):
-        web_url = self.get_url(host, media_id)
-        link = self.net.http_GET(web_url).content
-        if link.find('404 Not Found') >= 0:
-            raise UrlResolver.ResolverError('The requested video was not found.')
-
-        video_link = str(re.compile('file[: ]*"(.+?)"').findall(link)[0])
-        if len(video_link) > 0:
-            return video_link
-        else:
-            raise UrlResolver.ResolverError('No playable video found.')
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/royalvids.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/royalvids.py
deleted file mode 100644
index 2d7eba47184b084b42b2c49e42c20d1f358d5746..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/royalvids.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import re
-from urlresolver import common
-
-class RoyalvidsResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = 'royalvids'
-    domains = ['royalvids.eu']
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = 'http://(?:www\.)?(royalvids\.eu)/(?:tt\/|e\.php\?.*id=)([0-9a-zA-Z]+)'
-
-    def get_url(self, host, media_id):
-        return 'http://www.royalvids.eu/e.php?id=%s&width=640&height=400' % (media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        link = self.net.http_GET(web_url).content
-        if link.find('File was deleted') >= 0:
-            raise UrlResolver.ResolverError('The requested video was not found.')
-
-        video_link = str(re.compile('file[: ]*"(.+?)"').findall(link)[0])
-        if len(video_link) > 0:
-            return video_link
-        else:
-            raise UrlResolver.ResolverError('No playable video found.')
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/rpnet.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/rpnet.py
index 3a13b6a6b9fda6c5a6477a0f0b5813c0314d63cd..b1bfe62a6304675c34ce18235c919ded9f4ffa30 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/rpnet.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/rpnet.py
@@ -24,11 +24,7 @@ from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
 from urlresolver import common
 from t0mm0.common.net import Net
-
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 
 class RPnetResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
     implements = [UrlResolver, PluginSettings]
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/thefile.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/shared2me.py
similarity index 67%
rename from packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/thefile.py
rename to packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/shared2me.py
index 25973b63a2eb92f9476ac01c8cd3403a086d9bb3..fa9fa565b06ad90837c74dd380f63764ce4f19fd 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/thefile.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/shared2me.py
@@ -1,56 +1,57 @@
-"""
-TheFile.me urlresolver plugin
-Copyright (C) 2013 voinage
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import re
-
-class TheFileResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "thefile"
-    domains = ["thefile.me"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        match = re.search('file: "([^"]+)', html)
-        if match:
-            return match.group(1)
-        else:
-            raise UrlResolver.ResolverError('Unable to resolve thefile link. Filelink not found.')
-        
-    def get_url(self, host, media_id):
-            return 'http://thefile.me/plugins/mediaplayer/site/_embed.php?u=%s' % (media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(r'//(.+?)/(.+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return re.match(r'http://(www.)?thefile.me/.+', url) or 'thefile' in host
+"""
+urlresolver XBMC Addon
+Copyright (C) 2016 lambda
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+"""
+
+import re
+from t0mm0.common.net import Net
+from urlresolver.plugnplay.interfaces import UrlResolver
+from urlresolver.plugnplay.interfaces import PluginSettings
+from urlresolver.plugnplay import Plugin
+
+class Shared2meResolver(Plugin, UrlResolver, PluginSettings):
+    implements = [UrlResolver, PluginSettings]
+    name = 'shared2.me'
+    domains = [ 'shared2.me' ]
+    pattern = '(?://|\.)(shared2\.me)/(?:play|frame)/([0-9a-zA-Z]+)'
+
+    def __init__(self):
+        p = self.get_setting('priority') or 100
+        self.priority = int(p)
+        self.net = Net()
+
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+
+        html = self.net.http_GET(web_url).content
+
+        stream_url = re.compile('path *: *"(http.+?)"').findall(html)[-1]
+        return stream_url
+            
+        raise UrlResolver.ResolverError('File Not Found or removed')
+
+    def get_url(self, host, media_id):
+        return 'http://shared2.me/frame/%s' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharedsx.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharedsx.py
index ad5067357460ee12465de3064f450e24f468baff..665b9d5ba2c4db31e0591eda746dc03160d97ae9 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharedsx.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharedsx.py
@@ -17,17 +17,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import re
+import urllib
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class SharedsxResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "sharedsx"
     domains = ["shared.sx"]
-    
+    pattern = '(?://|\.)(shared\.sx)/([0-9a-zA-Z]+)'
+
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
@@ -35,50 +37,34 @@ class SharedsxResolver(Plugin, UrlResolver, PluginSettings):
     
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        # get landing page
+
         html = self.net.http_GET(web_url, headers={'Referer': web_url}).content
         
-        # read POST variables into data
         data = {}
-        r = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)"', html)
+        r = re.findall(r'type="hidden"\s+name="(.+?)"\s+value="(.*?)"', html)
         if not r: raise UrlResolver.ResolverError('page structure changed')
         for name, value in r: data[name] = value
-        
-        # get delay from hoster; actually this is not needed, but we are polite
-        delay = 5
-        r = re.search(r'var RequestWaiting = (\d+);', html)
-        if r: delay = r.groups(1)[0]
-        
-        # run countdown and check whether it was canceld or not
-        cnt = common.addon.show_countdown(int(delay), title='shared.sx', text='Please wait for hoster...')
-        if not cnt: raise UrlResolver.ResolverError('countdown was canceld by user')
-        
-        # get video page using POST variables
+
         html = self.net.http_POST(web_url, data, headers=({'Referer': web_url, 'X-Requested-With': 'XMLHttpRequest'})).content
-        
-        # search for content tag
+
         r = re.search(r'class="stream-content" data-url', html)
         if not r: raise UrlResolver.ResolverError('page structure changed')
-        
-        # read the data-url
+
         r = re.findall(r'data-url="?(.+?)"', html)
-        if not r: raise UrlResolver.ResolverError('video not found')
-        
-        # return media URL
-        return r[0]
+
+        stream_url = r[0] + '|' + urllib.urlencode({'User-Agent': common.IE_USER_AGENT})
+
+        return stream_url
     
     def get_url(self, host, media_id):
         return 'http://shared.sx/%s' % media_id
     
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-        return('host', 'media_id')
     
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?shared.sx/' +
-                         '[0-9A-Za-z]+', url) or
-                         'shared.sx' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharerepo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharerepo.py
index d7acc45f9c3e362e88d6e3cebc4d88c25d9d053d..29dbba55b3b3d1a04c1fdaf7d764169ec29cd310 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharerepo.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharerepo.py
@@ -17,17 +17,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import re
+import urllib
 import urllib2
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class SharerepoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "sharerepo"
     domains = ["sharerepo.com"]
+    pattern = '(?://|\.)(sharerepo\.com)(?:/f)?/([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -45,8 +47,6 @@ class SharerepoResolver(Plugin, UrlResolver, PluginSettings):
             html = self.net.http_GET(web_url, headers=headers).content
         except urllib2.HTTPError as e:
             if e.code == 404:
-                # sharerepo supports two different styles of links/media_ids
-                # if the first fails, try the second kind
                 web_url = 'http://sharerepo.com/%s' % media_id
                 html = self.net.http_GET(web_url, headers=headers).content
             else:
@@ -55,7 +55,7 @@ class SharerepoResolver(Plugin, UrlResolver, PluginSettings):
         link = re.search("file\s*:\s*'([^']+)", html)
         if link:
             common.addon.log_debug('ShareRepo Link Found: %s' % link.group(1))
-            return link.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
+            return link.group(1) + '|' + urllib.urlencode({'User-Agent': common.IE_USER_AGENT})
         else:
             raise UrlResolver.ResolverError('Unable to resolve ShareRepo Link')
 
@@ -63,14 +63,11 @@ class SharerepoResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://sharerepo.com/f/%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)(?:/f)?/([0-9a-zA-Z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-        return('host', 'media_id')
-
+    
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?sharerepo.com/(f/)?' +
-                         '[0-9A-Za-z]+', url) or
-                         'sharerepo' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharesix.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharesix.py
index 8baf8352f231a7c96326fc5ca72fbd4fbf5179a0..2e1082b40786210abfa0c545dd8389752954d77c 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharesix.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharesix.py
@@ -17,17 +17,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import re
+import urllib
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class SharesixResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "sharesix"
     domains = ["sharesix.com"]
-    pattern = '//((?:www.)?sharesix.com)/f/([0-9A-Za-z]+)'
+    pattern = '(?://|\.)(sharesix\.com)(?:/f)?/([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -51,13 +52,13 @@ class SharesixResolver(Plugin, UrlResolver, PluginSettings):
         
         r = re.search("var\s+lnk\d+\s*=\s*'(.*?)'", html)
         if r:
-            stream_url = r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
+            stream_url = r.group(1) + '|' + urllib.urlencode(headers)
             return stream_url
         else:
             raise UrlResolver.ResolverError('Unable to locate link')
 
     def get_url(self, host, media_id):
-        return 'http://%s/f/%s' % (host, media_id)
+        return 'http://sharesix.com/f/%s' % media_id
         
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -65,6 +66,6 @@ class SharesixResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'sharesix' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharevid.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharevid.py
deleted file mode 100644
index 20fee7a8b0396531d2954e666ce5066a61a144b4..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sharevid.py
+++ /dev/null
@@ -1,64 +0,0 @@
-'''
-Allmyvideos urlresolver plugin
-Copyright (C) 2013 Vinnydude
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class ShareVidResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "sharevid"
-    domains = ["sharevid.org"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        url = self.get_url(host, media_id)
-        html = self.net.http_GET(url).content
-
-        data = {}
-        r = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-            
-        html = self.net.http_POST(url, data).content
-        r = re.search("file\s*:\s*'(.+?)'", html)
-        if r:
-            return r.group(1)
-        else:
-            raise UrlResolver.ResolverError('could not find video')
-                
-    def get_url(self, host, media_id):
-        return 'http://sharevid.org/%s' % media_id
-        
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([0-9a-zA-Z]+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-        return('host', 'media_id')
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?sharevid.org/[0-9A-Za-z]+', url) or re.match('http://(www.)?sharevid.org/embed-[0-9A-Za-z]+[\-]*\d*[x]*\d*.*[html]*', url) or 'sharevid' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/simplydebrid.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/simplydebrid.py
new file mode 100644
index 0000000000000000000000000000000000000000..00693d1ad5ee69d6761eac77bc29fe7ecf42cf5c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/simplydebrid.py
@@ -0,0 +1,114 @@
+"""
+    urlresolver XBMC Addon
+    Copyright (C) 2013 Bstrdsmkr
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+from urlresolver.plugnplay.interfaces import UrlResolver
+from urlresolver.plugnplay.interfaces import SiteAuth
+from urlresolver.plugnplay.interfaces import PluginSettings
+from urlresolver.plugnplay import Plugin
+from urlresolver import common
+from t0mm0.common.net import Net
+import urlparse
+import urllib
+import time
+
+class SimplyDebridResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
+    implements = [UrlResolver, SiteAuth, PluginSettings]
+    name = "Simply-Debrid"
+    domains = ["*"]
+    base_url = 'https://simply-debrid.com/api.php?'
+
+    def __init__(self):
+        p = self.get_setting('priority') or 100
+        self.hosts = []
+        self.patterns = []
+        self.priority = int(p)
+        self.net = Net()
+        self.username = self.get_setting('username')
+        self.password = self.get_setting('password')
+
+    def get_media_url(self, host, media_id):
+        query = urllib.urlencode({'dl': media_id})
+        url = self.base_url + query
+        try:
+            response = self.net.http_GET(url).content
+            if response:
+                common.addon.log_debug('Simply-Debrid: Resolved to %s' % (response))
+                if response.startswith('http'):
+                    return response
+                else:
+                    raise UrlResolver.ResolverError('Unusable Response from SD')
+            else:
+                raise UrlResolver.ResolverError('Null Response from SD')
+        except Exception as e:
+            raise UrlResolver.ResolverError('Link Not Found: Exception: %s' % (e))
+
+    def login(self):
+        try: last_login = int(self.get_setting('last_login'))
+        except: last_login = 0
+        now = time.time()
+        if last_login < (now - (24 * 60 * 60)):
+            query = urllib.urlencode({'login': 1, 'u': self.username, 'p': self.password})
+            url = self.base_url + query
+            response = self.net.http_GET(url).content
+            if not response.startswith('02'):
+                raise UrlResolver.ResolverError('Simply-Debrid Login Failed: %s' % (response))
+            else:
+                common.addon.log_debug('SD Login - Success: %s' % (now))
+                self.set_setting('last_login', str(int(now)))
+        else:
+            common.addon.log_debug('Skipping Login - logged in age: %ds' % (now - last_login))
+    
+    def get_url(self, host, media_id):
+        return media_id
+
+    def get_host_and_id(self, url):
+        return 'simply-debrid.com', url
+
+    def get_all_hosters(self):
+        try:
+            if not self.hosts:
+                query = urllib.urlencode({'list': 1})
+                url = self.base_url + query
+                response = self.net.http_GET(url).content
+                self.hosts = [host for host in response.split(';') if host]
+                common.addon.log_debug('SD Hosts: %s' % (self.hosts))
+        except Exception as e:
+            common.addon.log_error('Error getting Simply-Debrid hosts: %s' % (e))
+
+    def valid_url(self, url, host):
+        if self.get_setting('login') == 'false': return False
+        self.get_all_hosters()
+        if url:
+            try: host = urlparse.urlparse(url).hostname
+            except: host = 'unknown'
+        if host.startswith('www.'): host = host.replace('www.', '')
+        if any(host in item for item in self.hosts):
+            return True
+
+        return False
+
+    def get_settings_xml(self):
+        xml = PluginSettings.get_settings_xml(self)
+        xml += '<setting id="%s_last_login" type="number" visible="false" default="0"/>\n' % (self.__class__.__name__)
+        xml += '<setting id="%s_login" type="bool" label="login" default="false"/>\n' % (self.__class__.__name__)
+        xml += '<setting id="%s_username" enable="eq(-1,true)" type="text" label="Username" default=""/>\n' % (self.__class__.__name__)
+        xml += '<setting id="%s_password" enable="eq(-2,true)" type="text" label="Password" option="hidden" default=""/>\n' % (self.__class__.__name__)
+        return xml
+
+    def isUniversal(self):
+        return True
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sockshare.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sockshare.py
deleted file mode 100644
index 55f57d0e9b0d78eec81553cc9112d12fe972490a..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/sockshare.py
+++ /dev/null
@@ -1,198 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import re
-import os
-import xbmcgui
-import xbmc
-from t0mm0.common.net import Net
-from urlresolver import common
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import time
-
-class SockshareResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "sockshare"
-    domains = ["sockshare.com"]
-    profile_path = common.profile_path
-    cookie_file = os.path.join(profile_path, 'sockshare.cookies')
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        if self.get_setting('login') == 'true':
-            if self.login_stale():
-                self.login()
-        self.net.set_cookies(self.cookie_file)
-        web_url = self.get_url(host, media_id)
-
-        html = self.net.http_GET(web_url).content
-
-        if ">This file doesn't exist, or has been removed.<" in html: raise UrlResolver.ResolverError (host+": This file doesn't exist, or has been removed.")
-        elif "This file might have been moved, replaced or deleted.<" in html: raise UrlResolver.ResolverError (host+": 404: This file might have been moved, replaced or deleted.")
-        
-        #Shortcut for logged in users
-        pattern = '<a href="(/.+?)" class="download_file_link" style="margin:0px 0px;">Download File</a>'
-        link = re.search(pattern, html)
-        if link:
-            common.addon.log_debug('Direct link found: %s' % link.group(1))
-            return 'http://www.sockshare.com%s' % link.group(1)
-
-        r = re.search('value="([0-9a-f]+?)" name="hash"', html)
-        if r:
-            session_hash = r.group(1)
-        else:
-            raise UrlResolver.ResolverError('sockshare: session hash not found')
-
-        #post session_hash
-        html = self.net.http_POST(web_url, form_data={'hash': session_hash, 
-                                                       'confirm': 'Continue as Free User'}).content
-    
-        #find playlist code  
-        r = re.search('\?stream=(.+?)\'', html)
-        if r:
-            playlist_code = r.group(1)
-        else:
-            r = re.search('key=(.+?)&',html)
-            playlist_code = r.group(1)
-    
-        #find download link
-        q = self.get_setting('quality')
-    
-        #Try to grab highest quality link available
-        if q == '1':
-            #download & return link.
-            if 'sockshare' in host:
-                Avi = "http://sockshare.com/get_file.php?stream=%s&original=1"%playlist_code
-                html = self.net.http_GET(Avi).content
-                final=re.compile('url="(.+?)"').findall(html)[0].replace('&amp;','&')
-                return "%s|User-Agent=%s"%(final,'Mozilla%2F5.0%20(Windows%20NT%206.1%3B%20rv%3A11.0)%20Gecko%2F20100101%20Firefox%2F11.0')
-
-        #Else grab standard flv link
-        else:
-            xml_url = re.sub('/(file|embed)/.+', '/get_file.php?stream=', web_url)
-            xml_url += playlist_code
-            html = self.net.http_GET(xml_url).content
-
-            r = re.search('url="(.+?)"', html)
-            if r:
-                flv_url = r.group(1)
-            else:
-                raise UrlResolver.ResolverError('sockshare: stream url not found')
-
-            return "%s|User-Agent=%s"%(flv_url.replace('&amp;','&'),'Mozilla%2F5.0%20(Windows%20NT%206.1%3B%20rv%3A11.0)%20Gecko%2F20100101%20Firefox%2F11.0')
-
-    def get_url(self, host, media_id):
-            if 'sockshare' in host:
-                host = 'www.sockshare.com'
-            return 'http://%s/file/%s' % (host, media_id)
-            
-            
-    def get_host_and_id(self, url):
-            r = re.search('//(.+?)/(?:file|embed)/([0-9A-Z]+)', url)
-            if r:
-                return r.groups()
-            else:
-                return False
-            
-    def valid_url(self, url, host):
-            return (re.match('http://(www.)?(sockshare).com/' +  '(file|embed)/[0-9A-Z]+', url) or 'sockshare' in host)
-
-    def login_stale(self):
-            url = 'http://www.sockshare.com/cp.php'
-            if not os.path.exists(self.cookie_file):
-                return True
-            self.net.set_cookies(self.cookie_file)
-            source =  self.net.http_GET(url).content
-            if re.search('(?:<span class=pro_user>\( Pro \)</span>|<span class="free_user">\( Free \)</span>)', source):
-                common.addon.log('Putlocker account appears to be logged in.')
-                return False
-            else:
-                return True
-
-    #SiteAuth methods
-    def login(self):
-        if self.login_stale():
-            url = 'http://www.sockshare.com/authenticate.php?login'
-            source = self.net.http_GET(url).content
-            self.net.save_cookies(self.cookie_file)
-            self.net.set_cookies(self.cookie_file)
-            captcha_img = re.search('<td>CAPTCHA</td>.+?<td><img src="(.+?)"\s*/><br>', source, re.DOTALL).group(1)
-            captcha_img = 'http://www.sockshare.com%s' %re.sub('&amp;','&',captcha_img)
-            local_captcha = os.path.join(common.profile_path, "captcha.img" )
-            localFile = open(local_captcha, "wb")
-            localFile.write(self.net.http_GET(captcha_img).content)
-            localFile.close()
-            solver = InputWindow(captcha=local_captcha)
-            solution = solver.get()
-            if solution:
-                common.addon.log('Solution provided: %s' %solution)
-                data = {'user':self.get_setting('username'), 'pass':self.get_setting('password'), 'captcha_code':solution, 'remember':1, 'login_submit':'Login'}
-                response = self.net.http_POST(url, form_data=data)
-                self.net.save_cookies(self.cookie_file)
-                self.net.set_cookies(self.cookie_file)
-            else:
-                common.addon.log('Dialog was canceled')
-                return False
-
-
-            if re.search('OK', source):
-                self.net.save_cookies(self.cookie_file)
-                self.net.set_cookies(self.cookie_file)
-                xbmc.executebuiltin("Notification(' sockshare Pro ', ' Login successful')")  
-                return True
-            else: return False
-        else: return True
-
-    #PluginSettings methods
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        xml += '<setting label="Highest Quality" id="%s_quality" ' % self.__class__.__name__
-        xml += 'type="enum" values="FLV|Maximum" default="0" />\n'
-        xml += '<setting id="%s_login" ' % self.__class__.__name__
-        xml += 'type="bool" label="login" default="false"/>\n'
-        xml += '<setting id="%s_username" enable="eq(-1,true)" ' % self.__class__.__name__
-        xml += 'type="text" label="username" default=""/>\n'
-        xml += '<setting id="%s_password" enable="eq(-2,true)" ' % self.__class__.__name__
-        xml += 'type="text" label="password" option="hidden" default=""/>\n'
-        xml += '<setting id="%s_notify" ' % self.__class__.__name__
-        xml += 'type="bool" label="Notify on login" default="false"/>\n'
-        return xml
-
-class InputWindow(xbmcgui.WindowDialog):
-    def __init__(self, *args, **kwargs):
-        self.cptloc = kwargs.get('captcha')
-        self.img = xbmcgui.ControlImage(335,30,624,60,self.cptloc)
-        self.addControl(self.img)
-        self.kbd = xbmc.Keyboard()
-
-    def get(self):
-        self.show()
-        time.sleep(5)        
-        self.kbd.doModal()
-        if (self.kbd.isConfirmed()):
-            text = self.kbd.getText()
-            self.close()
-            return text
-        self.close()
-        return False
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/speedvideo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/speedvideo.py
index 102d526801c2099e9c46ee275cfb3bfda2602e76..75c18994b4c34a97449246b21023487b5f11a510 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/speedvideo.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/speedvideo.py
@@ -17,55 +17,47 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import re
-import xbmc
+import base64
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
 
-# from base64 import b64decode
-import base64
-
 class SpeedVideoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "speedvideo"
     domains = ["speedvideo.net"]
     domain = "speedvideo.net"
+    pattern = '(?://|\.)(speedvideo\.net)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
 
-    def valid_url(self, url, host):
-        return re.match('http://(?:www.)?%s/(?:embed\-)?[0-9A-Za-z_]+(?:\-[0-9]+x[0-9]+.html)?' % self.domain, url) or 'speedvideo' in host
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+
+        html = self.net.http_GET(web_url).content
+
+        a = re.compile('var\s+linkfile *= *"(.+?)"').findall(html)[0]
+        b = re.compile('var\s+linkfile *= *base64_decode\(.+?\s+(.+?)\)').findall(html)[0]
+        c = re.compile('var\s+%s *= *(\d*)' % b).findall(html)[0]
+
+        stream_url = a[:int(c)] + a[(int(c) + 10):]
+        stream_url = base64.b64decode(stream_url)
+
+        return stream_url
 
     def get_url(self, host, media_id):
-        return 'http://%s/embed-%s-640x400.html' % (self.domain, media_id)
+        return 'http://speedvideo.net/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('http://(?:www\.)?(%s)\.net/(?:embed-)?([0-9A-Za-z_]+)(?:-\d+x\d+.html)?' % self.name, url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
-    def get_media_url(self, host, media_id):
-        base_url = self.get_url(host, media_id)
-        headers = {'User-Agent':common.IE_USER_AGENT, 'Referer':'http://%s/' % self.domain}
-        html = self.net.http_GET(base_url, headers=headers).content
-        linkfile = re.compile('var linkfile\s*=\s*"([A-Za-z0-9]+)"').findall(html)[0]
-        common.addon.log_debug(linkfile)
-        linkfileb = re.compile('var linkfile\s*=\s*base64_decode\(linkfile,\s*([A-Za-z0-9]+)\);').findall(html)[0]
-        common.addon.log(linkfileb)
-        linkfilec = re.compile('var ' + linkfileb + '\s*=\s*(\d+);').findall(html)[0]
-        common.addon.log_debug(linkfilec)
-        linkfilec = int(linkfilec)
-        linkfilez = linkfile[:linkfilec] + linkfile[(linkfilec + 10):]
-        common.addon.log_debug(linkfilez)
-        stream_url = base64.b64decode(linkfilez)
-        common.addon.log_debug(stream_url)
-        xbmc.sleep(4000)
-        return stream_url
-
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/stagevu.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/stagevu.py
index 21f8678f3739fc7a64f2d8da915c7d64b0020300..906fc11cade5cdc7788a252c53372f7c3e42b6b5 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/stagevu.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/stagevu.py
@@ -21,12 +21,12 @@ from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class StagevuResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "stagevu"
     domains = [ "stagevu.com" ]
+    pattern = '(?://|\.)(stagevu\.com)/(?:video/|embed.+?uid=)?([A-Za-z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -36,7 +36,7 @@ class StagevuResolver(Plugin, UrlResolver, PluginSettings):
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         link = self.net.http_GET(web_url).content
-        p = re.compile('<embed type="video/divx" src="(.+?)"')
+        p = re.compile('type="video/.+?"\s+src="(.+?)"')
         match = p.findall(link)
         if match:
             return match[0]
@@ -47,13 +47,11 @@ class StagevuResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://www.stagevu.com/video/%s' % media_id 
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/video/([0-9a-zA-Z/]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?stagevu.com/video/' +
-                         '[0-9A-Za-z]+', url) or
-                         'stagevu' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/stream2k.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/stream2k.py
deleted file mode 100644
index ed591f561a7df8a7d022f55a87e0ce411b6fefa5..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/stream2k.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Stream2k urlresolver XBMC Addon based on VKResolver
-Copyright (C) 2015 Seberoth
-Version 0.0.1 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-"""
-import re
-import xbmcgui
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import simplejson as json
-
-class Stream2kResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "stream2k.tv"
-    domains = ["stream2k.tv"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = '//((?:www.)?stream2k.tv)/player/framer\.php\?i=(.+)'
-
-    def get_media_url(self, host, media_id):
-        base_url = self.get_url(host, media_id)
-        soup = self.net.http_GET(base_url).content
-        html = soup.decode('cp1251')
-        sources = re.compile("sources: \[(.*?)\]", flags=re.S).findall(html)
-
-        if sources:
-            cSources = sources[0].strip()
-            cSources = cSources[:-1]
-            cSources = '{"sources": [' + cSources + ']}'
-
-            jsonvars = json.loads(cSources)
-
-            purged_jsonvars = {}
-            for item in jsonvars['sources']:
-                quality = re.sub("[^0-9]", "", item['label'])
-                purged_jsonvars[quality] = item['file']
-
-            lines = []
-            best = '0'
-
-            for item in purged_jsonvars:
-                lines.append(str(item))
-                if int(str(item)) > int(best): best = str(item)
-
-            lines = sorted(lines, key=int)
-
-            if len(lines) == 1:
-                return purged_jsonvars[lines[0]].encode('utf-8')
-            else:
-                if self.get_setting('auto_pick') == 'true':
-                    return purged_jsonvars[(str(best))].encode('utf-8') + '|User-Agent=%s' % (common.IE_USER_AGENT)
-                else:
-                    result = xbmcgui.Dialog().select('Choose the link', lines)
-            if result != -1:
-                return purged_jsonvars[lines[result]].encode('utf-8') + '|User-Agent=%s' % (common.IE_USER_AGENT)
-            else:
-                raise UrlResolver.ResolverError('No link selected')
-        else:
-            raise UrlResolver.ResolverError('No sources found')
-
-    def get_url(self, host, media_id):
-        return 'http://%s/player/framer.php?i=%s' % (host, media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'stream2k' in host
-
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        xml += '<setting id="%s_auto_pick" type="bool" label="Automatically pick best quality" default="false" visible="true"/>' % (self.__class__.__name__)
-        return xml
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/streamcloud.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/streamcloud.py
index 93fc5674ae0702d6f54d3a1c3c6305e6ec408804..55939c6aea8e7a3a9592b50fe7ded4aadeec0c8d 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/streamcloud.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/streamcloud.py
@@ -16,17 +16,17 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import re
 
 class StreamcloudResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "streamcloud"
     domains = [ "streamcloud.eu" ]
+    pattern = '(?://|\.)(streamcloud\.eu)/([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -56,11 +56,11 @@ class StreamcloudResolver(Plugin, UrlResolver, PluginSettings):
             return 'http://streamcloud.eu/%s' % (media_id)
 
     def get_host_and_id(self, url):
-        r = re.search('http://(?:www.)?(.+?)/([0-9A-Za-z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match('http://(www.)?streamcloud.eu/[0-9A-Za-z]+', url) or 'streamcloud' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/streaminto.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/streaminto.py
index 0ceb2a4a2fa814c3d02f7f78441ed5672cfbbb13..bc8909c21c5168c194c64f67e8b19a2718dd13d2 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/streaminto.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/streaminto.py
@@ -17,49 +17,48 @@
 """
 
 import re
-import xbmc
+import urllib2
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class StreamintoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "streaminto"
     domains = ["streamin.to"]
+    pattern ='(?://|\.)(streamin\.to)/(?:embed-|)?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        #e.g. http://streamin.to/20xk6r5vpkch
-        self.pattern = 'http://((?:www.)?streamin.to)/(.*)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        post_url = web_url
 
-        # get post vars
-        form_values = {}
-        for i in re.finditer('<input.*?name="(.*?)".*?value="(.*?)">', html):
-            form_values[i.group(1)] = i.group(2)
-        xbmc.sleep(5000)
-        html = self.net.http_POST(post_url, form_data=form_values).content
+        html = self.net.http_GET(web_url).content
+
+        try:
+            stream_url = re.compile("file\s*:\s*[\'|\"](http.+?)[\'|\"]").findall(html)[0]
+            r = urllib2.Request(stream_url, headers={ 'User-Agent': common.IE_USER_AGENT })
+            r = urllib2.urlopen(r, timeout=15).headers['Content-Length']
+            return stream_url
+        except:
+            pass
+
+        try:
+            streamer = re.search('streamer:\s*"([^"]+)",', html).group(1).replace(':1935', '')
+            playpath = re.search('file:\s*"([^"]+)",', html).group(1).replace('.flv', '')
+            return '%s playpath=%s' % (streamer, playpath)
+        except:
+            pass
 
-        # get stream url
-        pattern = 'streamer:\s*"([^"]+)",'  # streamer: "
-        file = 'file:\s*"([^"]+)",'  # streamer: "
-        r = re.search(pattern, html)
-        rr = re.search(file, html)
-        if r:
-            return r.group(1).replace(':1935', '') + ' swfUrl=http://streamin.to/player/player.swf live=false swfVfy=1 playpath=' + rr.group(1).replace('.flv', '')
         raise UrlResolver.ResolverError('File Not Found or removed')
 
     def get_url(self, host, media_id):
-            return 'http://streamin.to/%s' % (media_id)
+            return 'http://streamin.to/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -67,6 +66,6 @@ class StreamintoResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/teramixer.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/teramixer.py
index 8b087d557a6e6a0e96fe5b40b5181baad9c97c7d..7b9334fef9aed9fa125526b1b84c522e96af8ba0 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/teramixer.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/teramixer.py
@@ -20,18 +20,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import re
 import base64
+import urllib
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class TeramixerResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
-    name       = "teramixer"
-    domains    = [ 'teramixer.com' ]
-    useragent  = 'Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:30.0) Gecko/20100101 Firefox/30.0'    
-
+    name = "teramixer"
+    domains = [ 'teramixer.com' ]
+    pattern ='(?://|\.)(teramixer\.com)/(?:embed/|)?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -39,14 +39,17 @@ class TeramixerResolver(Plugin, UrlResolver, PluginSettings):
         self.net = Net()
 
     def get_media_url(self, host, media_id):
-        base_url = 'http://www.' + host + '.com/' + media_id
         try:
-            html = self.net.http_GET(base_url).content
-            encodedUrl = re.findall("""filepath = '(.*)';""", html)[0]
-            encodedUrl = encodedUrl[9:]
-            encodedUrl = base64.b64decode(encodedUrl)
-            if not encodedUrl.startswith('aws'): encodedUrl = encodedUrl[1:]
-            stream_url = 'http://%s|User-Agent=%s' %(encodedUrl,self.useragent)
+            web_url = self.get_url(host, media_id)
+
+            html = self.net.http_GET(web_url).content
+
+            url = re.findall("""filepath = '(.*)';""", html)[0]
+            url = url[9:]
+            url = base64.b64decode(url)
+            if not url.startswith('aws'): url = url[1:]
+
+            stream_url = 'http://%s' % url + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
             return stream_url
         except IndexError as e:
             if re.search("""<title>File not found or deleted - Teramixer</title>""", html) :
@@ -58,17 +61,11 @@ class TeramixerResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://www.teramixer.com/%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('http://(www.)?(.+?).com/(embed/)?(.+)', url)
-        if r :
-            ls = r.groups()
-            ls = (ls[1], ls[3])
-            return ls
-        else :
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match('http://(www.)?teramixer.com/(embed/)?[0-9A-Za-z]+', url) or 'teramixer.com' in host
-
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        return xml
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/thevideo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/thevideo.py
index 40e4bcb7be73b70533ec4decd5911af9890facf7..3d2bf6bb18df75319ad8448980475ab7d54a2384 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/thevideo.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/thevideo.py
@@ -16,13 +16,11 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re, urllib
-from urlresolver import common
-from lib import jsunpack
 
 MAX_TRIES=3
 
@@ -30,6 +28,7 @@ class TheVideoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "thevideo"
     domains = ["thevideo.me"]
+    pattern = '(?://|\.)(thevideo\.me)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -54,13 +53,11 @@ class TheVideoResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://%s/embed-%s.html' % (host, media_id)
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([0-9a-zA-Z/]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return (re.match('http://(www\.|embed-)?thevideo.me/' +
-                         '[0-9A-Za-z]+', url) or
-                         'thevideo' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/trollvid.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/trollvid.py
index 9e8a4075d5ac96abae77cfec26a432a79c1cc828..e19fa6d4ef64e7d8219f00ef6e03913bf32af57b 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/trollvid.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/trollvid.py
@@ -16,58 +16,53 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import urllib
 import re
+import base64
+import urllib
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class TrollVidResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "trollvid.net"
     domains = ["trollvid.net"]
-    
+    pattern = '(?://|\.)(trollvid\.net)/embed\.php.file=([0-9a-zA-Z]+)'
+
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:sv\d*\.)?trollvid\.net)/embed\.php.file=([0-9a-zA-Z]+)' # http://sv3.trollvid.net/embed.php?file=([0-9a-zA-Z]+)&
-    
+
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+
+        html = self.net.http_GET(web_url).content
+
+        try: stream_url = re.search('url\s*:\s*"(http.+?)"', html).group(1)
+        except: pass
+
+        try: stream_url = re.search('atob\(\'(.+?)\'', html).group(1)
+        except: pass
+
+        try: stream_url = base64.b64decode(stream_url)
+        except: pass
+
+        try: stream_url = urllib.unquote_plus(stream_url)
+        except: pass
+
+        return stream_url
+
     def get_url(self, host, media_id):
-            return 'http://sv3.trollvid.net/embed.php?file=%s&w=800&h=600&bg=' % (media_id)
-    
+            return 'http://trollvid.net/embed.php?file=%s' % media_id
+
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        self.headers['Referer'] = web_url
-        stream_url = None
-        html = self.net.http_GET(web_url, headers=self.headers).content
-        r = re.search('clip\s*:\s*\n*\s*\{\s*\n*\s*\n*\s*\n*\s*url\s*:\s*"(http.+?)"', html)
         if r:
-            stream_url = urllib.unquote_plus(r.group(1))
-        else:
-            r = re.search('unescape\(atob\(\'(.+?)\'', html)
-            if r:
-                try:
-                    stream_url = urllib.unquote_plus(self._decode_base64(r.group(1)))
-                except:
-                    stream_url = None
-        if stream_url:
-            return stream_url
+            return r.groups()
         else:
-            raise UrlResolver.ResolverError('File not found')
-
-    def _decode_base64(self, data):
-        missing_padding = 4 - len(data) % 4
-        if missing_padding:
-            data += b'='* missing_padding
-        return data.decode('base64')
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tubeplus.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tubeplus.py
deleted file mode 100644
index 2bd229a9e600e85df0ad2be4e697b5b88a172247..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tubeplus.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import re
-import urlresolver
-from t0mm0.common.net import Net
-from urlresolver import common
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-
-class TubeplusResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver]
-    name = "tubeplus.me"
-    domains = ["tubeplus.me"]
-    
-    def __init__(self):
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        r = '"none" href="(.+?)"'
-        sources = []
-        regex = re.finditer(r, html, re.DOTALL)
-        for s in regex:
-            sources.append(urlresolver.HostedMediaFile(url=s.group(1)))
-
-        source = urlresolver.choose_source(sources)
-        return source.resolve()
-
-    def get_url(self, host, media_id):
-        return 'http://tubeplus.me/player/%s/' % media_id
-        
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/player/(\d+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        return xml
-
-    def valid_url(self, url, host):
-        return re.match('http://(www.)?tubeplus.me/player/\d+', 
-                        url) or 'tubeplus' in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tunepk.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tunepk.py
index 46cb507f4070cd400f89c5833609beaa8e375f5c..fd3f7f4d5c3fc29aa447c437b7023c05d65b83af 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tunepk.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tunepk.py
@@ -21,18 +21,17 @@ from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class TunePkResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "tune.pk"
     domains = ["tune.pk"]
+    pattern = '(?://|\.)(tune\.pk)/(?:player|video|play)/(?:[\w\.\?]+=)?(\d+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '(.+tune.pk)/(?:player|video|play)/(?:[\w\.\?]+=)?(\d+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -71,12 +70,14 @@ class TunePkResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
-        return r.groups()
+        if r:
+            return r.groups()
+        else:
+            return False
 
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
 
-    #PluginSettings methods
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
         xml += '<setting label="Video Quality" id="%s_quality" ' % self.__class__.__name__
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tusfiles.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tusfiles.py
index e1a42931e4035c11271a6a1d535338c549f90a9a..ddc5c8f2842d85894e26bcb327e91656dd86164d 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tusfiles.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/tusfiles.py
@@ -17,16 +17,17 @@
 """
 import re
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from lib import jsunpack
 
 class TusfilesResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "tusfiles"
     domains = ['tusfiles.net']
+    pattern = '(?://|\.)(tusfiles\.net)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -39,9 +40,13 @@ class TusfilesResolver(Plugin, UrlResolver, PluginSettings):
             html = self.net.http_GET(web_url).content
             for match in re.finditer('(eval\(function.*?)</script>', html, re.DOTALL):
                 js_data = jsunpack.unpack(match.group(1))
-                match2 = re.search('<param\s+name="src"\s*value="([^"]+)', js_data)
-                if match2:
-                    return match2.group(1)
+
+                stream_url = re.findall('<param\s+name="src"\s*value="([^"]+)', js_data)
+                stream_url += re.findall('file\s*:\s*[\'|\"](.+?)[\'|\"]', js_data)
+                stream_url = [i for i in stream_url if not i.endswith('.srt')]
+
+                if stream_url:
+                    return stream_url[0]
 
         raise UrlResolver.ResolverError('Unable to locate link')
 
@@ -49,11 +54,11 @@ class TusfilesResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://%s/embed-%s.html' % (host, media_id)
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([0-9a-z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search('//(?:www.)?tusfiles.net/(embed-)?[0-9a-z]+', url) or 'tusfiles' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/up2stream.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/up2stream.py
index f44efa3de9e5c1a90e0a4ac53fe75d69b23b799d..8d1e5ce69a8943b96ccbb9b40501f033a6c626d6 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/up2stream.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/up2stream.py
@@ -16,13 +16,15 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
+import urllib2
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import re
-import urllib2
 
 class NoRedirection(urllib2.HTTPErrorProcessor):
     def http_response(self, request, response):
@@ -33,8 +35,8 @@ class NoRedirection(urllib2.HTTPErrorProcessor):
 class Up2StreamResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "up2stream"
-    domains = ["www.up2stream.com"]
-    pattern = '//((?:www\.)?up2stream.com)/view.php\?ref=([0-9]+)'
+    domains = ["up2stream.com"]
+    pattern = '(?://|\.)(up2stream\.com)/view\.php.+?ref=([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -43,22 +45,31 @@ class Up2StreamResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
+
         headers = {
-                   'User-Agent': common.IE_USER_AGENT
+                   'User-Agent': common.IOS_USER_AGENT,
+                   'Referer': web_url
         }
-        opener = urllib2.build_opener(NoRedirection)
-        urllib2.install_opener(opener)
+
         html = self.net.http_GET(web_url, headers=headers).content
-        match = re.search('<iframe[^>]*src="([^"]+)', html, re.I)
-        if match:
-            ad_url = 'http://up2stream.com' + match.group(1)
-            _html = self.net.http_GET(ad_url, headers=headers).content
-        
-        match = re.search('<source[^>]*src="([^"]+)', html, re.I)
-        if match:
-            return match.group(1) + '|User-Agent=%s&Referer=%s' % (common.IE_USER_AGENT, web_url)
-        
-        raise UrlResolver.ResolverError("File Not Found or removed")
+
+        for match in re.finditer('(eval\(function.*?)</script>', html, re.DOTALL):
+            html += jsunpack.unpack(match.group(1))
+
+        match = re.findall('<source[^>]*src="([^"]+)', html)
+        match += re.findall('"src","([^"]+)', html)
+
+        try:
+            stream_url = match[-1]
+
+            r = urllib2.Request(stream_url, headers=headers)
+            r = int(urllib2.urlopen(r, timeout=15).headers['Content-Length'])
+
+            if r > 1048576:
+                stream_url += '|' + urllib.urlencode(headers)
+                return stream_url
+        except:
+            UrlResolver.ResolverError("File Not Playable")
 
     def get_url(self, host, media_id):
         return 'http://up2stream.com/view.php?ref=%s' % media_id
@@ -69,6 +80,6 @@ class Up2StreamResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'up2stream' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadaf.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadaf.py
index 3f1f56b9266547c5189e042914d8cbcf68cb708d..cf4bb610775bd7ca460c06154e24515bbfdca1d6 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadaf.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadaf.py
@@ -16,13 +16,12 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
 from t0mm0.common.net import Net
+from lib import captcha_lib
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import captcha_lib
-import re
 
 MAX_TRIES = 3
 
@@ -30,12 +29,12 @@ class UploadAfResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "upload.af"
     domains = ["upload.af"]
+    pattern = '(?://|\.)(upload\.af)/([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?upload.af)/([0-9a-zA-Z/]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -44,7 +43,7 @@ class UploadAfResolver(Plugin, UrlResolver, PluginSettings):
         tries = 0
         while tries < MAX_TRIES:
             data = {}
-            for match in re.finditer('input type="hidden" name="([^"]+)" value="([^"]+)', html):
+            for match in re.finditer(r'type="hidden"\s+name="(.+?)"\s+value="(.*?)"', html):
                 key, value = match.groups()
                 data[key] = value
             data['method_free'] = 'Free Download >>'
@@ -67,6 +66,6 @@ class UploadAfResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
         return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadc.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadc.py
index 4a2a0379820357810907e251a8704cc68bc66b0b..71b4726f177a592f9aa6278009d7d0188e19708f 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadc.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadc.py
@@ -16,23 +16,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 import re
+import urllib
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
 
 class UploadcResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
-    name = "uploadc"
-    domains = ["uploadc.com"]
+    name = 'uploadc'
+    domains = ['uploadc.com', 'uploadc.ch', 'zalaa.com']
+    pattern = '(?://|\.)(uploadc.com|uploadc.ch|zalaa.com)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:www.)?uploadc.com)/([0-9a-zA-Z]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -41,17 +41,20 @@ class UploadcResolver(Plugin, UrlResolver, PluginSettings):
             js_data = jsunpack.unpack(match.group(1))
             r = re.search('src="([^"]+)', js_data)
             if r:
-                stream_url = r.group(1) + '|referer=' + web_url
+                stream_url = r.group(1).replace(' ', '%20')
+                stream_url += '|' + urllib.urlencode({ 'Referer': web_url })
                 return stream_url
         
         match = re.search("'file'\s*,\s*'([^']+)", html)
         if match:
-            return match.group(1).replace(' ', '%20') + '|Referer=%s' % (web_url)
+            stream_url = match.group(1).replace(' ', '%20')
+            stream_url += '|' + urllib.urlencode({ 'Referer': web_url })
+            return stream_url
                 
         raise UrlResolver.ResolverError('File Not Found or removed')
 
     def get_url(self, host, media_id):
-        return 'http://www.uploadc.com/embed-%s.html' % (media_id)
+        return 'http://uploadc.com/embed-%s.html' % (media_id)
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -59,6 +62,6 @@ class UploadcResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadcrazynet.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadcrazynet.py
deleted file mode 100644
index 3b9b8acecf92615049f96cdc5d45e83dded993c5..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadcrazynet.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import urllib
-from urlresolver import common
-import re
-
-class UploadCrazyResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "uploadcrazy.net"
-    domains = ["uploadcrazy.net"]
-    
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = 'http://((?:embeds.)?uploadcrazy.net)/(\D+.php\?file=[0-9a-zA-Z\-_]+)[&]*'
-    
-    def get_url(self, host, media_id):
-            return 'http://embeds.uploadcrazy.net/%s' % (media_id)
-            #return 'http://embeds.uploadcrazy.net/embed.php?file=%s' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        common.addon.log(web_url)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        r = re.search("'file'\s*:\s*'(.+?)'", html)
-        if r:
-            stream_url = urllib.unquote_plus(r.group(1))
-        else:
-            raise UrlResolver.ResolverError('no file located')
-        return stream_url
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadx.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadx.py
index 3404562f240b1f937e55477feaa73a62a46c1dfc..ccf94521f5e00b6aaf30ebc2c1a16089f981ec71 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadx.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uploadx.py
@@ -16,14 +16,15 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
+import urllib
 from t0mm0.common.net import Net
+from lib import captcha_lib
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-import xbmc
 from urlresolver import common
-from lib import captcha_lib
+import xbmc
 
 MAX_TRIES = 3
 
@@ -31,12 +32,12 @@ class UploadXResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "uploadx"
     domains = ["uploadx.org"]
+    pattern = '(?://|\.)(uploadx\.org)/([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?uploadx.org)/([0-9a-zA-Z/]+)'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -44,7 +45,7 @@ class UploadXResolver(Plugin, UrlResolver, PluginSettings):
         tries = 0
         while tries < MAX_TRIES:
             data = {}
-            r = re.findall(r'type="hidden"\s*name="([^"]+)"\s*value="([^"]+)', html)
+            r = re.findall(r'type="hidden"\s+name="(.+?)"\s+value="(.*?)"', html)
             for name, value in r:
                 data[name] = value
             data['method_free'] = 'Free Download+>>'
@@ -60,14 +61,14 @@ class UploadXResolver(Plugin, UrlResolver, PluginSettings):
             if 'File Download Link Generated' in html:
                 r = re.search('href="([^"]+)[^>]+id="downloadbtn"', html)
                 if r:
-                    return r.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
-            
+                    return r.group(1) + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
+
             tries = tries + 1
             
         raise UrlResolver.ResolverError('Unable to locate link')
 
     def get_url(self, host, media_id):
-        return 'http://%s/%s' % (host, media_id)
+        return 'http://uploadx.org/%s' % media_id
         
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -75,6 +76,6 @@ class UploadXResolver(Plugin, UrlResolver, PluginSettings):
             return r.groups()
         else:
             return False
-
+    
     def valid_url(self, url, host):
         return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uptobox.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uptobox.py
index 01f09bcefab5de699f0cfaa34453547795e879fd..7838335d457bb8a88823fb6f9ad61e3f19428191 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uptobox.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/uptobox.py
@@ -16,106 +16,107 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
+import re
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import urllib
-import re
-import xbmcgui
-
+import xbmc
 
 class UpToBoxResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "uptobox"
     domains = ["uptobox.com", "uptostream.com"]
+    pattern = '(?://|\.)(uptobox.com|uptostream.com)/(?:iframe/)?([0-9A-Za-z_]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http[s]*://(upto(?:box|stream)\.com)/([a-zA-Z0-9]+)'
         self.user_agent = common.IE_USER_AGENT
         self.net.set_user_agent(self.user_agent)
         self.headers = {'User-Agent': self.user_agent}
 
-    def get_url(self, host, media_id):
-        """
-        return url for uptostream, less country restrictions and no time limit on link generation
-            (90%+ of random links tested had streaming links)
-        check if file has not been made available for streaming in get_media_url and fail-back to uptobox if necessary
-        """
-        return 'http://uptostream.com/%s' % media_id
+    def get_media_url(self, host, media_id):
 
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
+        try:
+            web_url = self.get_url(host, media_id)
+            self.headers['Referer'] = web_url
 
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or host in self.domains
+            html = self.net.http_GET(web_url, headers=self.headers).content
+            if isinstance(html, unicode):
+                html = html.encode('utf-8', 'ignore')
 
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        stream_url = None
-        self.headers['Referer'] = web_url
-        html = self.net.http_GET(web_url, headers=self.headers).content
-        if isinstance(html, unicode):
-            html = html.encode('utf-8', 'ignore')
-        if 'This file is not available to stream yet' in html:
-            web_url = 'http://uptobox.com/%s' % media_id
+            if 'Uptobox.com is not available in your country' in html:
+                raise Exception()
+
+            r = re.search('(You have to wait (?:[0-9]+ minute[s]*, )*[0-9]+ second[s]*)', html)
+            if r:
+                raise Exception()
+
+            r = re.search('<form\sname\s*=[\'"]F1[\'"].+?>(.+?)<br\s*/*>', html, re.DOTALL).group(1)
+
+            data = {}
+            for match in re.finditer(r'type="hidden"\s+name="(.+?)"\s+value="(.*?)"', html):
+                key, value = match.groups()
+                data[key] = value
+
+            for i in range(0, 3):
+                try:
+                    html = self.net.http_POST(web_url, data, headers=self.headers).content
+                    if isinstance(html, unicode):
+                        html = html.encode('utf-8', 'ignore')
+
+                    stream_url = re.search('<a\shref\s*=[\'"](.+?)[\'"]\s*>\s*<span\sclass\s*=\s*[\'"]button_upload green[\'"]\s*>', html).group(1)
+                    return stream_url
+                except:
+                    xbmc.sleep(1000)
+        except:
+            pass
+
+        try:
+            web_url = self.get_stream_url(host, media_id)
             self.headers['Referer'] = web_url
+
             html = self.net.http_GET(web_url, headers=self.headers).content
             if isinstance(html, unicode):
                 html = html.encode('utf-8', 'ignore')
+
             if 'Uptobox.com is not available in your country' in html:
-                raise UrlResolver.ResolverError('Uptobox.com is not available in your country')
-            else:
-                r = re.search('(You have to wait (?:[0-9]+ minute[s]*, )*[0-9]+ second[s]*)', html)
-                if r:
-                    raise UrlResolver.ResolverError(r.group(1))
-            r = re.search('<form\sname\s*=[\'"]F1[\'"].+?>(.+?)<br\s*/*>', html, re.DOTALL)
+                raise Exception()
+            '''
+            r = re.search('(You have reached the limit of *[0-9]+ minute[s]*)', html)
             if r:
-                r = r.group(1)
-                form_data = {}
-                form_inputs = re.compile('input\stype\s*=\s*[\'"]hidden[\'"]\sname\s*=\s*[\'"](.+?)[\'"]\svalue\s*=\s*[\'"](.+?)[\'"]\s*>').findall(r)
-                if form_inputs:
-                    for key, value in form_inputs:
-                        form_data[key] = value
-                html = self.net.http_POST(web_url, form_data=form_data, headers=self.headers).content
-                if isinstance(html, unicode):
-                    html = html.encode('utf-8', 'ignore')
-                r = re.search('<a\shref\s*=[\'"](.+?)[\'"]\s*>\s*<span\sclass\s*=\s*[\'"]button_upload green[\'"]\s*>', html)
-                if r:
-                    stream_url = r.group(1)
-        else:
-            r = re.search('<video\sid.+?>(.+?)</video>', html, re.DOTALL)
-            if r:
-                r = r.group(1)
-                sources = re.compile('<source.+?src\s*=\s*[\'"](.+?)[\'"].+?data-res\s*=\s*[\'"](.+?)[\'"].*?/>').findall(r)
-                if sources:
-                    if len(sources) == 1:
-                        stream_url = sources[0][0]
-                    elif len(sources) > 1:
-                        vid_list = []
-                        for source, quality in sources:
-                            vid_list.extend(['Uptobox - %s' % quality])
-                        if self.get_setting('auto_pick') == 'true':
-                            stream_url = sources[-1][0]
-                        else:
-                            result = xbmcgui.Dialog().select('Choose Quality', vid_list)
-                            if result != -1:
-                                stream_url = sources[result][0]
-                            else:
-                                raise UrlResolver.ResolverError('No quality selected')
-        if stream_url:
+                raise Exception()
+            '''
+
+            sources = re.compile('<source.+?src\s*=\s*[\'"](.+?)[\'"].+?data-res\s*=\s*[\'"](.+?)[\'"].*?/>').findall(html)
+            sources = [(i[0], int(re.sub('[^0-9]', '', i[1]))) for i in sources]
+            sources = sorted(sources, key=lambda k: k[1])
+
+            stream_url = sources[-1][0]
+            if stream_url.startswith('//'):
+                stream_url = 'http:' + stream_url
+
             return stream_url
-        else:
-            raise UrlResolver.ResolverError('File not found')
+        except:
+            pass
+
+        raise UrlResolver.ResolverError('File not found')
+
+    def get_url(self, host, media_id):
+        return 'http://uptobox.com/%s' % media_id
+
+    def get_stream_url(self, host, media_id):
+        return 'http://uptostream.com/%s' % media_id
 
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        xml += '<setting id="%s_auto_pick" type="bool" label="Automatically pick best quality" default="false" visible="true"/>' % (self.__class__.__name__)
-        return xml
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+    
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/userscloud.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/userscloud.py
index de2b28083eda2aa8a0c2f92fdffbfc675d77d8f2..bc597c789eb1d3cdb04ae6733d209463ff936cbc 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/userscloud.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/userscloud.py
@@ -16,42 +16,28 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
+import re
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
-import urllib
-import re
-
 
 class UsersCloudResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "userscloud"
     domains = ["userscloud.com"]
+    pattern = '(?://|\.)(userscloud\.com)/(?:embed-)?([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'https://(userscloud\.com)/(?:embed-)*([a-zA-Z0-9]+)[/|-|$]*'
         self.user_agent = common.IE_USER_AGENT
         self.net.set_user_agent(self.user_agent)
         self.headers = {'User-Agent': self.user_agent}
 
-    def get_url(self, host, media_id):
-        return 'https://%s/%s' % (host, media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or host in self.domains
-
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         stream_url = None
@@ -59,11 +45,26 @@ class UsersCloudResolver(Plugin, UrlResolver, PluginSettings):
         html = self.net.http_GET(web_url, headers=self.headers).content
         r = re.search('>(eval\(function\(p,a,c,k,e,d\).+?)</script>', html, re.DOTALL)
         if r:
-            r = jsunpack.unpack(r.group(1))
-            r = re.search('param\sname\s*=\s*[\'"]src[\'"]\s*value\s*=\s*[\'"](.+?)[\'"]', r)
-            if r:
-                stream_url = r.group(1)
-        if stream_url:
-            return stream_url
+            js_data = jsunpack.unpack(r.group(1))
+
+            stream_url = re.findall('<param\s+name="src"\s*value="([^"]+)', js_data)
+            stream_url += re.findall('file\s*:\s*[\'|\"](.+?)[\'|\"]', js_data)
+            stream_url = [i for i in stream_url if not i.endswith('.srt')]
+
+            if stream_url:
+                return stream_url[0]
+
+        raise UrlResolver.ResolverError('File not found')
+
+    def get_url(self, host, media_id):
+        return 'https://%s/%s' % (host, media_id)
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
         else:
-            raise UrlResolver.ResolverError('File not found')
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/usersfiles.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/usersfiles.py
index b8636ba3a740110087c4538e6087b8cf61c626c9..3b17e4374726e980ffafdaf073f38dd69256e7c0 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/usersfiles.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/usersfiles.py
@@ -16,48 +16,52 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-
+import re
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import re
-from lib import jsunpack
 
 class UsersFilesResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver]
     name = "UsersFiles"
     domains = ["usersfiles.com"]
+    pattern = '(?://|\.)(usersfiles\.com)/(?:embed-)?([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http[s]*://((?:www\.)?usersfiles.com)/(.*)'
         self.net.set_user_agent(common.IE_USER_AGENT)
         self.headers = {'User-Agent': common.IE_USER_AGENT}
 
-    def get_url(self, host, media_id):
-        return 'http://usersfiles.com/%s' % media_id
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or host in self.domains
-
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         html = self.net.http_GET(web_url).content
         match = re.search('<script[^>]*>(eval.*?)</script>', html, re.DOTALL)
         if match:
             js_data = jsunpack.unpack(match.group(1))
-            print js_data
-            match = re.search('<param\s+name="src"\s*value="([^"]+)', js_data)
-            if match:
-                return match.group(1)
-        
+
+            stream_url = re.findall('<param\s+name="src"\s*value="([^"]+)', js_data)
+            stream_url += re.findall('file\s*:\s*[\'|\"](.+?)[\'|\"]', js_data)
+            stream_url = [i for i in stream_url if not i.endswith('.srt')]
+
+            if stream_url:
+                return stream_url[0]
+
         raise UrlResolver.ResolverError('Unable to find userfiles video')
+
+    def get_url(self, host, media_id):
+        return 'http://usersfiles.com/%s' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/veeHD.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/veeHD.py
index b275e811dc956c1b3a2bf4a084cdafbd83c36fb1..3140f5ff942e82f3f8b376a0d9f59189f712de71 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/veeHD.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/veeHD.py
@@ -28,9 +28,11 @@ class VeeHDResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
     implements = [UrlResolver, SiteAuth, PluginSettings]
     name = "VeeHD"
     domains = ["veehd.com"]
+    pattern = '(?://|\.)(veehd\.com)/video/([0-9A-Za-z]+)'
+
     profile_path = common.profile_path
     cookie_file = os.path.join(profile_path, '%s.cookies' % name)
-    
+
     def __init__(self):
         p = self.get_setting('priority') or 1
         self.priority = int(p)
@@ -73,16 +75,14 @@ class VeeHDResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
         return 'http://veehd.com/video/%s' % media_id
         
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/video/([0-9A-Za-z]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
 
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?veehd.com/' +
-                         '[0-9A-Za-z]+', url) or
-                         'veehd' in host)
+        return re.search(self.pattern, url) or self.name in host
        
     #SiteAuth methods
     def login(self):
@@ -100,7 +100,7 @@ class VeeHDResolver(Plugin, UrlResolver, SiteAuth, PluginSettings):
             return True
         else:
             return False
-        
+
     #PluginSettings methods
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/veoh.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/veoh.py
index 68e3e205f69223d7b0f0c014ec966baf0b1eb83f..f09cf8f4a703a6fe3448a633c8cd7aa5f3035942 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/veoh.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/veoh.py
@@ -27,6 +27,7 @@ class VeohResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "veoh"
     domains = ["veoh.com"]
+    pattern = '(?://|\.)(veoh\.com)/(?:watch/|.+?permalinkId=)?([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -53,26 +54,11 @@ class VeohResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://veoh.com/watch/%s' % media_id
 
     def get_host_and_id(self, url):
-        r = None
-        video_id = None
-        if re.search('permalinkId=', url):
-            r = re.compile('veoh.com.+?permalinkId=(\w+)&*.*$').findall(url)
-        elif re.search('watch/', url):
-            r = re.compile('watch/(.+)').findall(url)
-            
-        if r is not None and len(r) > 0:
-            video_id = r[0]
-        if video_id:
-            return ('veoh.com', video_id)
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
         else:
-            common.addon.log_error('veoh: video id not found')
             return False
 
     def valid_url(self, url, host):
-        return re.search('www.veoh.com/watch/.+',url) or re.search('www.veoh.com/.+?permalinkId=.+',url) or 'veoh' in host
-
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        xml += '<setting label="This plugin calls the veoh addon - '
-        xml += 'change settings there." type="lsep" />\n'
-        return xml
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidag.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidag.py
index 9bce068eaa680caa2c28273d23759af7ae6da9b9..2a9294d8dc9de53cfcce050b6743e04efbcd4f5a 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidag.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidag.py
@@ -16,19 +16,18 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-from urlresolver import common
-from lib import jsunpack
 
 class VidAgResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vid.ag"
     domains = ["vid.ag"]
-    pattern = '//((?:www\.)?vid\.ag)/(?:embed-)?([0-9A-Za-z]+)'
+    pattern = '(?://|\.)(vid\.ag)/(?:embed-)?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -51,7 +50,7 @@ class VidAgResolver(Plugin, UrlResolver, PluginSettings):
         raise UrlResolver.ResolverError('File Not Found or removed')
 
     def get_url(self, host, media_id):
-        return 'http://%s/embed-%s.html' % (host, media_id)
+        return 'http://vid.ag/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -61,4 +60,4 @@ class VidAgResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return (re.search(self.pattern, url) or 'vid.ag' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidbull.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidbull.py
index 88212cdd2f375eac1d4980a2ca9b95399d45c9c4..9da26dc100a4884afba565aa050e2d9223f8e453 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidbull.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidbull.py
@@ -18,16 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import re
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class VidbullResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vidbull"
     domains = ["vidbull.com"]
-    pattern = '//((?:www.)?vidbull.com)/(?:embed-)?([0-9a-zA-Z]+)'
+    pattern = '(?://|\.)(vidbull\.com)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -51,12 +51,11 @@ class VidbullResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://www.vidbull.com/%s' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search(self.pattern,url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-        return('host', 'media_id')
 
     def valid_url(self, url, host):
-        return (re.search(self.pattern, url) or 'vidbull' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidcrazynet.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidcrazynet.py
index c12789f0b6fb4046ff506c25126f40bb3ba10298..4f04c7644a1565ee0d0cb13c43195e553afd4103 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidcrazynet.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidcrazynet.py
@@ -16,44 +16,43 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import urllib
-from urlresolver import common
-import re
 
 class VidCrazyResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
-    name = "vidcrazy.net"
-    domains = ["vidcrazy.net"]
-    
+    name = 'vidcrazy.net'
+    domains = ['vidcrazy.net', 'uploadcrazy.net']
+    pattern = '(?://|\.)(vidcrazy.net|uploadcrazy.net)/\D+.php\?file=([0-9a-zA-Z\-_]+)'
+
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:video.)?vidcrazy.net)/(\D+.php\?file=[0-9a-zA-Z\-_]+)[&]*'
-    
-    def get_url(self, host, media_id):
-        return 'http://video.vidcrazy.net/%s' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
+
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        common.addon.log(web_url)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
+        html = self.net.http_GET(web_url).content
         r = re.search("'file'\s*:\s*'(.+?)'", html)
         if r:
             stream_url = urllib.unquote_plus(r.group(1))
         else:
             raise UrlResolver.ResolverError('no file located')
         return stream_url
+
+    def get_url(self, host, media_id):
+        return 'http://vidcrazy.net/embed.php?file=%s' % (media_id)
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videobb.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videobb.py
deleted file mode 100644
index f90b1b74ebc3a54791cfdc9ee55cf401d4c72751..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videobb.py
+++ /dev/null
@@ -1,166 +0,0 @@
-import re
-from t0mm0.common.net import Net
-import urllib2
-from urlresolver import common
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-
-# Custom imports
-from base64 import b64decode
-from binascii import unhexlify
-try:
-    from json import loads
-except ImportError:
-    from simplejson import loads
-
-class VideobbResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "videobb"
-    domains = [ "videobb.com" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        #grab json info for this video
-        json_url = 'http://videobb.com/player_control/settings.php?v=%s' % media_id
-        json = self.net.http_GET(json_url).content
-
-        #find highest quality URL
-        max_res = [240, 480, 99999][int(self.get_setting('q'))]
-        chosen_res = 0
-        r = re.finditer('"l".*?:.*?"(.+?)".+?"u".*?:.*?"(.+?)"', json)
-        if r:
-            for match in r:
-                res, url = match.groups()
-                res = int(res.strip('p'))
-                if res > chosen_res and res <= max_res:
-                    stream_url_part1 = url.decode('base-64')
-                    chosen_res = res
-        else:
-            raise UrlResolver.ResolverError('videobb: stream url part1 not found')
-
-        # Try to load the datas from json.
-        aData = loads(json)
-
-        # Decode the link from the json data settings
-        spn_ik = unhexlify(self.__decrypt(aData["settings"]["login_status"]["spen"], aData["settings"]["login_status"]["salt"], 950569)).split(';')
-        spn = spn_ik[0].split('&')
-        ik = spn_ik[1]
-
-        for item in ik.split('&') :
-            temp = item.split('=')
-            if temp[0] == 'ik' :
-                key = self.__get_key(temp[1])
-
-        sLink = ""
-        for item in spn :
-            item = item.split('=')
-            if(int(item[1])==1):
-                sLink = sLink + item[0]+ '=' + self.__decrypt(aData["settings"]["info"]["sece2"], aData["settings"]["config"]["rkts"], key) + '&' #decrypt32byte
-            elif(int(item[1]==2)):
-                sLink = sLink + item[0]+ '=' + self.__decrypt(aData["settings"]["banner"]["g_ads"]["url"],aData["settings"]["config"]["rkts"], key) + '&'
-            elif(int(item[1])==3):
-                sLink = sLink + item[0]+ '=' + self.__decrypt(aData["settings"]["banner"]["g_ads"]["type"],aData["settings"]["config"]["rkts"], key,26,25431,56989,93,32589,784152) + '&'
-            elif(int(item[1])==4):
-                sLink = sLink + item[0]+ '=' + self.__decrypt(aData["settings"]["banner"]["g_ads"]["time"],aData["settings"]["config"]["rkts"], key,82,84669,48779,32,65598,115498) + '&'
-            elif(int(item[1])==5):
-                sLink = sLink + item[0]+ '=' + self.__decrypt(aData["settings"]["login_status"]["euno"],aData["settings"]["login_status"]["pepper"], key,10,12254,95369,39,21544,545555) + '&'
-            elif(int(item[1])==6):
-                sLink = sLink + item[0]+ '=' + self.__decrypt(aData["settings"]["login_status"]["sugar"],aData["settings"]["banner"]["lightbox2"]["time"], key,22,66595,17447,52,66852,400595) + '&'
-    
-        sLink = sLink + "start=0"
-        stream_url = stream_url_part1 + '&' + sLink
-        return stream_url
-
-    def get_url(self, host, media_id):
-        return 'http://www.videobb.com/video/%s' % media_id
-
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:e/|video/|watch_video.php\?v=)([0-9a-zA-Z]+)',
-                        url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return re.match('http://(www.)?videobb.com/' +
-                        '(e/|video/|watch_video.php\?v=)' +
-                        '[0-9A-Za-z]+', url) or 'videobb' in host
-
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        xml += '<setting label="Highest Quality" id="%s_q" ' % (self.__class__.__name__)
-        xml += 'type="enum" values="240p|480p|Maximum" default="2" />\n'
-        return xml
-
-    def __decrypt(self, str, k1, k2, p4 = 11, p5 = 77213, p6 = 81371, p7 = 17, p8 = 92717, p9 = 192811):
-        tobin = self.hex2bin(str,len(str)*4)
-        tobin_lenght = len(tobin)
-        keys = []
-        index = 0
-
-        while (index < tobin_lenght*3):
-            k1 = ((int(k1) * p4) + p5) % p6
-            k2 = ((int(k2) * p7) + p8) % p9
-            keys.append((int(k1) + int(k2)) % tobin_lenght)
-            index += 1
-
-        index = tobin_lenght*2
-
-        while (index >= 0):
-            val1 = keys[index]
-            mod = index%tobin_lenght
-            val2 = tobin[val1]
-            tobin[val1] = tobin[mod]
-            tobin[mod] = val2
-            index -= 1
-
-        index = 0
-        while(index < tobin_lenght):
-            tobin[index] = int(tobin[index]) ^ int(keys[index+(tobin_lenght*2)]) & 1
-            index += 1
-            decrypted = self.bin2hex(tobin)
-        return decrypted
-
-    def hex2bin(self,val,fill):
-        bin_array = []
-        string = self.bin(int(val, 16))[2:].zfill(fill)
-        for value in string:
-            bin_array.append(value)
-        return bin_array
-
-    def bin2hex(self,val):
-        string = str("")
-        for char in val:
-            string+=str(char)
-        return "%x" % int(string, 2)
-
-    def bin(self, x):
-        '''
-        bin(number) -> string
-
-        Stringifies an int or long in base 2.
-        '''
-        if x < 0: return '-' + bin(-x)
-        out = []
-        if x == 0: out.append('0')
-        while x > 0:
-            out.append('01'[x & 1])
-            x >>= 1
-            pass
-        try: return '0b' + ''.join(reversed(out))
-        except NameError, ne2: out.reverse()
-        return '0b' + ''.join(out)
-
-    def __get_key(self, nbr):
-        if nbr == '1': return 226593
-        elif nbr == '2': return 441252
-        elif nbr == '3': return 301517
-        elif nbr == '4': return 596338
-        elif nbr == '5': return 852084
-        else: return False
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videofun.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videofun.py
deleted file mode 100644
index cb63f32c531687bf904a8ee3a9143a98a57fe608..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videofun.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import urllib
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class VideoFunResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "videofun.me"
-    domains = ["videofun.me"]
-    
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        # http://videofun.me/embed/d39d7848c33919c1c86fdc9a16603d28?w=718&h=438
-        self.pattern = 'http://((?:www.)?videofun.me)/embed/([0-9a-zA-Z]+)[\?]*'
-        #self.pattern = 'http://((?:www.)?videofun.me)/embed/(.+?)'
-    
-    def get_url(self, host, media_id):
-            return 'http://videofun.me/embed/%s' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        common.addon.log(media_id)
-        common.addon.log(web_url)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        r = re.search('url\s*:\s*"(.+?)",\s*autoPlay:\s*false', html)
-        if r:
-            stream_url = urllib.unquote_plus(r.group(1))
-        else:
-            raise UrlResolver.ResolverError('no file located')
-        return stream_url
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videohut.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videohut.py
index 51ad00ce28fdf3d7f0568ecb390078787a839927..e7a36e707ddb7ee50f9f94e93cff8d4f2b130704 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videohut.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videohut.py
@@ -17,105 +17,58 @@
 """
 
 import re
+import urllib
 from t0mm0.common.net import Net
-import urllib2, os
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import xbmcgui
-from lib import unwise
-import urllib
-
-#SET ERROR_LOGO# THANKS TO VOINAGE, BSTRDMKR, ELDORADO
-error_logo = os.path.join(common.addon_path, 'resources', 'images', 'redx.png')
 
 class VideoHutResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "videohut.to"
     domains = [ "videohut.to" ]
-    
+    pattern = '(?://|\.)(videohut\.to)/(?:v\/|embed.php\?id=)([0-9a-z]+)'
+
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://www.(videohut.to)/(?:v\/|embed.php\?id=)([0-9a-z]+)'
-    
-    def get_url(self, host, media_id):
-            return 'http://www.videohut.to/embed.php?id=%s' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
-    def __get_stream_url(self, media_id, filekey, error_num=0, error_url=None):
-        '''
-        Get stream url. 
-
-        If previously found stream url is a dead link, add error params and try again
-        '''
-
-        if error_num > 0 and error_url:
-            _error_params = '&numOfErrors={0}&errorCode=404&errorUrl={1}'.format(
-                                error_num, 
-                                urllib.quote_plus(error_url).replace('.', '%2E')
-                            )
-        else:
-            _error_params = ''
 
-        #use api to find stream address
-        api_call = 'http://www.videohut.to/api/player.api.php?{0}&file={1}&key={2}{3}'.format(
-                        'user=undefined&pass=undefined',
-                        media_id,
-                        urllib.quote_plus(filekey).replace('.', '%2E'),
-                        _error_params
-                    )
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+        html = self.net.http_GET(web_url).content
 
-        api_html = self.net.http_GET(api_call).content
-        rapi = re.search('url=(.+?)&title=', api_html)
-        if rapi:
-            return urllib.unquote(rapi.group(1))
+        key = re.compile('key\s*:\s*[\'"](.+?)[\'"]').findall(html)
+        if key:
+            key = urllib.quote_plus(key[0]).replace('.', '%2E').replace('-', '%2D')
 
-        return None
+        filekey = re.compile('file\s*:\s*[\'"](.+?)[\'"]').findall(html)
+        if filekey:
+            filekey = urllib.quote_plus(filekey[0]).replace('.', '%2E').replace('-', '%2D')
 
-    def __is_stream_url_active(self, web_url):
-        try:
-            header = self.net.http_HEAD(web_url)
-            if header.get_headers():
-                return True
+        for i in range(0, 3):
+            try:
+                player_url = 'http://www.videohut.to/api/player.api.php?key=%s&file=%s' % (key, filekey)
+                html = self.net.http_GET(player_url).content
 
-            return False
-        except:
-            return False
+                stream_url = re.search('url=(.+?)&', html).group(1)
+                stream_url = urllib.unquote(stream_url)
 
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        html = unwise.unwise_process(html)
-        filekey = unwise.resolve_var(html, "flashvars.filekey")
+                return stream_url
+            except:
+                pass
 
-        error_url = None
-        stream_url = None
-        # try to resolve 3 times then give up
-        for x in range(0, 2):
-            link = self.__get_stream_url(media_id, filekey, error_num=x, error_url=error_url)
-            if link:
-                active = self.__is_stream_url_active(link)
-                if active:
-                    stream_url = urllib.unquote(link)
-                    break
-                else:
-                    # link inactive
-                    error_url = link
-            else:
-                # no link found
-                raise UrlResolver.ResolverError('File Not Found or removed')
+        raise UrlResolver.ResolverError('File Not Found or removed')
 
-        if stream_url:
-            return stream_url
+    def get_url(self, host, media_id):
+            return 'http://www.videohut.to/embed.php?id=%s' % media_id
+    
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
         else:
-            raise UrlResolver.ResolverError('File Not Found or removed')
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videomega.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videomega.py
index 15c1ac24cc0f59a0c9eb0abe4ace42ebf2056c0d..b8ad16be59acfa445c9071f471f3c6d4cbb200bb 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videomega.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videomega.py
@@ -20,8 +20,10 @@
 """
 
 import re
-from lib import jsunpack
+import urllib
+import urllib2
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
@@ -31,7 +33,7 @@ class VideoMegaResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "videomega"
     domains = ["videomega.tv"]
-    pattern = '//((?:www.)?videomega.tv)/(?:(?:iframe|cdn|validatehash|view)\.php)?\?(?:ref|hashkey)=([a-zA-Z0-9]+)'
+    pattern = '(?://|\.)(videomega\.tv)/(?:(?:iframe|cdn|validatehash|view)\.php)?\?(?:ref|hashkey)=([a-zA-Z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -49,13 +51,23 @@ class VideoMegaResolver(Plugin, UrlResolver, PluginSettings):
         if jsunpack.detect(html):
             js_data = jsunpack.unpack(html)
             match = re.search('"src"\s*,\s*"([^"]+)', js_data)
-            if match:
-                return match.group(1) + '|User-Agent=%s' % (common.IOS_USER_AGENT)
+
+        try:
+            stream_url = match.group(1)
+
+            r = urllib2.Request(stream_url, headers=headers)
+            r = int(urllib2.urlopen(r, timeout=15).headers['Content-Length'])
+
+            if r > 1048576:
+                stream_url += '|' + urllib.urlencode(headers)
+                return stream_url
+        except:
+            UrlResolver.ResolverError("File Not Playable")
 
         raise UrlResolver.ResolverError('No playable video found.')
 
     def get_url(self, host, media_id):
-        return 'http://videomega.tv/cdn.php?ref=%s' % (media_id)
+        return 'http://videomega.tv/cdn.php?ref=%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -65,4 +77,4 @@ class VideoMegaResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'videomega' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoraj.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoraj.py
deleted file mode 100644
index 72d81f82a23ac59237c256f113f9de007ed30f6a..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoraj.py
+++ /dev/null
@@ -1,123 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import re
-from t0mm0.common.net import Net
-import urllib2, os
-from urlresolver import common
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import xbmcgui
-from lib import unwise
-import urllib
-
-class VideorajResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "videoraj.ch"
-    domains = [ "videoraj.ec", "videoraj.eu", "videoraj.sx", "videoraj.ch", "videoraj.com" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def __get_stream_url(self, media_id, filekey, error_num=0, error_url=None):
-        '''
-        Get stream url. 
-
-        If previously found stream url is a dead link, add error params and try again
-        '''
-
-        if error_num > 0 and error_url:
-            _error_params = '&numOfErrors={0}&errorCode=404&errorUrl={1}'.format(
-                                error_num, 
-                                urllib.quote_plus(error_url).replace('.', '%2E')
-                            )
-        else:
-            _error_params = ''
-
-        #use api to find stream address
-        api_call = 'http://www.videoraj.ch/api/player.api.php?{0}&file={1}&key={2}{3}'.format(
-                        'user=undefined&pass=undefined',
-                        media_id,
-                        urllib.quote_plus(filekey).replace('.', '%2E'),
-                        _error_params
-                    )
-
-        api_html = self.net.http_GET(api_call).content
-        rapi = re.search('url=(.+?)&title=', api_html)
-        if rapi:
-            return urllib.unquote(rapi.group(1))
-
-        return None
-
-    def __is_stream_url_active(self, web_url):
-        try:
-            header = self.net.http_HEAD(web_url)
-            if header.get_headers():
-                return True
-
-            return False
-        except:
-            return False
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        #grab stream details
-        html = self.net.http_GET(web_url).content
-        html = unwise.unwise_process(html)
-        filekey = unwise.resolve_var(html, "vars.key")
-        error_url = None
-        stream_url = None
-        # try to resolve 3 times then give up
-        for x in range(0, 2):
-            link = self.__get_stream_url(media_id, filekey, 
-                                    error_num=x,
-                                    error_url=error_url)
-
-            if link:
-                active = self.__is_stream_url_active(link)
-
-                if active:
-                    stream_url = urllib.unquote(link)
-                    break
-                else:
-                    # link inactive
-                    error_url = link
-            else:
-                # no link found
-                raise UrlResolver.ResolverError('File Not Found or removed')
-
-        if stream_url:
-            return stream_url
-        else:
-            raise UrlResolver.ResolverError('File Not Found or removed')
-
-    def get_url(self, host, media_id):
-        return 'http://www.videoraj.ch/embed.php?id=%s' % media_id
-
-    def get_host_and_id(self, url):
-        r = re.search('(https?://(?:www\.|embed\.)videoraj\.(?:ec|eu|sx|ch|com))/(?:v(?:ideo)*/|embed\.php\?id=)([0-9a-z]+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return re.match('https?://(?:www\.|embed\.)videoraj\.(?:ec|eu|sx|ch|com)/(?:v(?:ideo)*/|embed\.php\?id=)([0-9a-z]+)', url) or 'videoraj' in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videotanker.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videotanker.py
deleted file mode 100644
index ee8adefa1f9e90d6b77956e4e46eb9d23a75c6f6..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videotanker.py
+++ /dev/null
@@ -1,77 +0,0 @@
-'''
-videotanker urlresolver plugin
-Copyright (C) 2013 icharania
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class VideoTankerResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = 'videotanker'
-    domains = ['videotanker.co']
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        link = self.net.http_GET(web_url).content
-        if link.find('no video details found') >= 0:
-            raise UrlResolver.ResolverError('The requested video was not found.')
-
-        videoUrl = re.compile("(?:hq_video_file|normal_video_file|mobile_video_file)\s+\=\s+(?:\'|\")([\w\.\/\:\-\?\=]+)(?:\'|\")").findall(link)
-        vUrl = ''
-        vUrlsCount = len(videoUrl)
-        if vUrlsCount > 0:
-            q = self.get_setting('quality')
-            if q == '0':
-                # Highest Quality
-                vUrl = videoUrl[0]
-            elif q == '1':
-                # Medium Quality
-                vUrl = videoUrl[(int)(vUrlsCount / 2)]
-            elif q == '2':
-                # Lowest Quality
-                vUrl = videoUrl[vUrlsCount - 1]
-
-            return vUrl
-        else:
-            raise UrlResolver.ResolverError('No playable video found.')
-
-    def get_url(self, host, media_id):
-        return 'http://videotanker.co/player/embed_player.php?vid=%s' % media_id
-
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/player/embed_player\.php\?vid\=(\w+)', url)
-        return r.groups()
-
-    def valid_url(self, url, host):
-        return re.match('http://(www\.)?videotanker.co/player/embed_player\.php\?vid\=(\w+)', url) or \
-               self.name in host
-
-    #PluginSettings methods
-    def get_settings_xml(self):
-        xml = PluginSettings.get_settings_xml(self)
-        xml += '<setting label="Video Quality" id="%s_quality" ' % self.__class__.__name__
-        xml += 'type="enum" values="High|Medium|Low" default="1" />\n'
-        return xml
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videott.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videott.py
index 09853b0d7935389793654b2fd1f9e8fd4a1a909d..5cc0f2123926099fad4eff265801be38c3ae3d6c 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videott.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videott.py
@@ -17,38 +17,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import re
+import json
+import urlparse
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
-# Custom imports
-try:
-    from json import loads
-except ImportError:
-    from simplejson import loads
 
 class VideoTTResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "videott"
     domains = ["video.tt"]
+    pattern = '(?://|\.)(video\.tt)/(?:video\/|embed\/|watch_video\.php\?v=)(\w+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://(?:www\.)?(video\.tt)/(?:video\/|embed\/|watch_video\.php\?v=)(\w+)'
 
     def get_media_url(self, host, media_id):
         json_url = 'http://www.video.tt/player_control/settings.php?v=%s' % media_id
-        json = self.net.http_GET(json_url).content
-        data = loads(json)
+        data = self.net.http_GET(json_url).content
+        data = json.loads(data)
+
         vids = data['settings']['res']
-        if not vids:
-            raise UrlResolver.ResolverError('The requested video was not found.')
 
-        else:
+        if vids:
             vUrlsCount = len(vids)
 
             if (vUrlsCount > 0):
@@ -66,17 +61,31 @@ class VideoTTResolver(Plugin, UrlResolver, PluginSettings):
                 vUrl = vids[li]['u'].decode('base-64')
                 return vUrl
 
+        else:
+            vUrl = data['settings']['config']
+
+            vUrl = [i[1].decode('base-64') for i in vUrl.items() if i[0].startswith('token')]
+            vUrl = [(urlparse.parse_qsl(urlparse.urlparse(i).query), i) for i in vUrl]
+            vUrl = [([x[1] for x in i[0] if x[0] == 'r'], i[1]) for i in vUrl]
+            vUrl = [(i[0][0], i[1]) for i in vUrl if i[0]]
+            vUrl = vUrl[0][1]
+            return vUrl
+
+        raise UrlResolver.ResolverError('The requested video was not found.')
+
     def get_url(self, host, media_id):
         return 'http://www.video.tt/watch_video.php?v=%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
-        return r.groups()
+        if r:
+            return r.groups()
+        else:
+            return False
 
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
 
-    #PluginSettings methods
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
         xml += '<setting label="Video Quality" id="%s_quality" ' % self.__class__.__name__
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videovalley.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videovalley.py
deleted file mode 100644
index 6ccd60dbe9100bef38a7ff7e77e73b682cc9d2df..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videovalley.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import urllib
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class VideoValleyResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "videovalley.net"
-    domains = ["videovalley.net"]
-    
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = 'http://((?:video.)?videovalley.net)/vidvalley/(\D+.php\?file=[0-9a-zA-Z\-_]+)[&]*'
-    
-    def get_url(self, host, media_id):
-            return 'http://videovalley.net/vidvalley/%s&w=640&h=360' % (media_id)
-            #return 'http://videovalley.net/vidvalley/ancv.php?file=%s&w=640&h=360' % (media_id)
-            #return 'http://videovalley.net/vidvalley/nvs.php?file=%s&w=640&h=360' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        common.addon.log(web_url)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        r = re.search("'file'\s*:\s*'(.+?)'", html)
-        if r:
-            stream_url = urllib.unquote_plus(r.group(1))
-        else:
-            raise UrlResolver.ResolverError('no file located')
-        return stream_url
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoweed.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoweed.py
index acab49aa429db9c6a8066163724644daa0cac084..08f7d36f60803ab2d626d8353ef7ca7c68d48507 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoweed.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoweed.py
@@ -22,13 +22,12 @@ from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from lib import unwise
 
 class VideoweedResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
-    name = "videoweed.es"
-    domains = ["videoweed.es"]
-    pattern = '//((?:www\.|embed\.)?videoweed\.(?:es|com))/(?:mobile/video\.php\?id=|video/|embed\.php\?v=|file/)([0-9a-z]+)'
+    name = 'videoweed.es'
+    domains = ['bitvid.sx', 'videoweed.es', 'videoweed.com']
+    pattern = '(?://|\.)(bitvid.sx|videoweed.es|videoweed.com)/(?:mobile/video\.php\?id=|video/|embed/\?v=|embed\.php\?v=|file/)([0-9a-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -37,26 +36,31 @@ class VideoweedResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
+
         html = self.net.http_GET(web_url).content
-        form_values = {}
-        for i in re.finditer('<input type="hidden" name="([^"]+)" value="([^"]+)', html):
-            form_values[i.group(1)] = i.group(2)
-        html = self.net.http_POST(web_url, form_data=form_values).content
-        match = re.search('flashvars.filekey\s*=\s*"([^"]+)', html)
-        if match:
-            filekey = match.group(1)
-            
-            # use api to find stream address
-            api_call = ('http://www.videoweed.es/api/player.api.php?user=undefined&codes=1&file=%s&pass=undefined&key=%s') % (media_id, filekey)
-            api_html = self.net.http_GET(api_call).content
-            rapi = re.search('url=(.+?)&title=', api_html)
-            if rapi:
-                return rapi.group(1)
-        
-        raise UrlResolver.ResolverError('File Not Found or removed')
+
+        r = re.search('flashvars.filekey=(.+?);', html)
+        if r:
+            r = r.group(1)
+
+            try: filekey = re.compile('\s+%s="(.+?)"' % r).findall(html)[-1]
+            except: filekey = r
+
+            player_url = 'http://www.bitvid.sx/api/player.api.php?key=%s&file=%s' % (filekey, media_id)
+
+            html = self.net.http_GET(player_url).content
+
+            r = re.search('url=(.+?)&', html)
+
+            if r:
+                stream_url = r.group(1)
+            else:
+                raise UrlResolver.ResolverError('File Not Found or removed')
+
+        return stream_url
 
     def get_url(self, host, media_id):
-        return 'http://www.videoweed.es/file/%s' % media_id
+        return 'http://embed.bitvid.sx/embed.php?v=%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -66,4 +70,4 @@ class VideoweedResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'videoweed' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videowood.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videowood.py
index 7782f5c5cba38714fdbd9fae9c9bdd8c20bd4536..8a656cd5f284b4ec01bb89501a801907acb3fe32 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videowood.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videowood.py
@@ -18,18 +18,16 @@
 
 import re
 from t0mm0.common.net import Net
-from urlresolver import common
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from lib import jsunpack
-
 
 class VideowoodResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "videowood"
     domains = ['videowood.tv']
-    pattern = '//((?:www.)?videowood.tv)/(?:embed/|video/)([0-9a-z]+)'
+    pattern = '(?://|\.)(videowood\.tv)/(?:embed/|video/)([0-9a-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -59,7 +57,7 @@ class VideowoodResolver(Plugin, UrlResolver, PluginSettings):
             raise UrlResolver.ResolverError('File not found')
 
     def get_url(self, host, media_id):
-        return 'http://%s/embed/%s' % (host, media_id)
+        return 'http://videowood.tv/embed/%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videozed.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videozed.py
deleted file mode 100644
index ce309851fe5cd4a840bffb218f9057ac0e7f6a55..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videozed.py
+++ /dev/null
@@ -1,90 +0,0 @@
-'''
-Videozed urlresolver plugin
-Copyright (C) 2013 Vinnydude
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
-from lib import captcha_lib
-
-class VideozedResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "videozed"
-    domains = [ "videozed.net" ]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        url = self.get_url(host, media_id)
-        html = self.net.http_GET(url).content
-
-        data = {}
-        r = re.findall(r'type="(?:hidden|submit)?" name="(.+?)"\s* value="?(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-            
-        html = self.net.http_POST(url, data).content
-
-        r = re.findall(r'type="hidden" name="(.+?)" value="(.+?)">', html)
-        for name, value in r:
-            data[name] = value
-        data.update(captcha_lib.do_captcha(html))
-        
-        html = self.net.http_POST(url, data).content
-        sPattern =  '<script type=(?:"|\')text/javascript(?:"|\')>(eval\('
-        sPattern += 'function\(p,a,c,k,e,d\)(?!.+player_ads.+).+np_vid.+?)'
-        sPattern += '\s+?</script>'
-        r = re.search(sPattern, html, re.DOTALL + re.IGNORECASE)
-        if r:
-            sJavascript = r.group(1)
-            sUnpacked = jsunpack.unpack(sJavascript)
-            sPattern  = '<embed id="np_vid"type="video/divx"src="(.+?)'
-            sPattern += '"custommode='
-            r = re.search(sPattern, sUnpacked)
-            if r:
-                return r.group(1)
-
-        else:
-                num = re.compile('videozed\|(.+?)\|http').findall(html)
-                pre = 'http://'+num[0]+'.videozed.com:182/d/'
-                preb = re.compile('image\|(.+?)\|video\|(.+?)\|').findall(html)
-                for ext, link in preb:
-                    r = pre+link+'/video.'+ext
-                    return r
-        
-    def get_url(self, host, media_id):
-        return 'http://www.videozed.net/%s' % media_id 
-
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z]+)',url)
-        if r:
-            return r.groups()
-        else:
-            return False
-        return('host', 'media_id')
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?videozed.net/' +
-                         '[0-9A-Za-z]+', url) or
-                         'videozed' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidgg.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidgg.py
index a6bbb18201883275a5049b2b2b3034d67c9dcc68..c367b8c1513ba42d50c5e2a33a678e6ce328224d 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidgg.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidgg.py
@@ -16,19 +16,18 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import re
-import urllib
 
 class VidggResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
-    name = "vid.gg"
-    domains = ["www.vid.gg", "vidgg.to"]
-    pattern = 'http://((?:www\.)?vid(?:\.gg|gg\.to))/(?:embed/\?id=|video/)([0-9a-z]+)'
+    name = 'vid.gg'
+    domains = ['vidgg.to']
+    pattern = '(?://|\.)(vid.gg|vidgg.to)/(?:embed/\?id=|video/)([0-9a-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -69,4 +68,4 @@ class VidggResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'vid.gg' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidlockers.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidlockers.py
index 12f458f812e074a75743d73b1e7484098144670b..7bafce22a1f37c69e1cde035a717fdcc47732eaa 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidlockers.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidlockers.py
@@ -16,25 +16,25 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import xbmc
-from urlresolver import common
-from lib import jsunpack
-import re
 
 class VidlockersResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vidlockers"
     domains = ["vidlockers.ag"]
+    pattern = '(?://|\.)(vidlockers\.ag)/([A-Za-z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:www.)?vidlockers.ag)/([A-Za-z0-9]+)/.*?'
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -44,7 +44,6 @@ class VidlockersResolver(Plugin, UrlResolver, PluginSettings):
         for i in re.finditer('<input type="hidden" name="([^"]+)" value="([^"]+)', html):
             form_values[i.group(1)] = i.group(2)
 
-        xbmc.sleep(2000)
         html = self.net.http_POST(web_url, form_data=form_values).content
         
         r = re.search('file\s*:\s*"([^"]+)', html)
@@ -62,12 +61,13 @@ class VidlockersResolver(Plugin, UrlResolver, PluginSettings):
                     stream_url = match2.group(1)
             
         if stream_url:
-            return stream_url + '|User-Agent=%s&Referer=%s' % (common.IE_USER_AGENT, web_url)
+            stream_url += '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT, 'Referer': web_url })
+            return stream_url
 
         raise UrlResolver.ResolverError('Unable to resolve vidlockers link. Filelink not found.')
 
     def get_url(self, host, media_id):
-            return 'http://vidlockers.ag/%s' % (media_id)
+            return 'http://vidlockers.ag/%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -77,4 +77,4 @@ class VidlockersResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'vidlockers' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidme.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidme.py
index 0391f4c86d71e538779ae876c555299f385553a6..9c0a06b4bb5ada53b03c0235780d9b5b3c82ba8a 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidme.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidme.py
@@ -16,17 +16,17 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
 
 class VidMeResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vid.me"
     domains = ["vid.me"]
-    pattern = '//((?:www\.)?vid\.me)/(?:e/)?([0-9A-Za-z]+)'
+    pattern = '(?://|\.)(vid\.me)/(?:e/)?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -44,7 +44,7 @@ class VidMeResolver(Plugin, UrlResolver, PluginSettings):
         raise UrlResolver.ResolverError('File Not Found or removed')
 
     def get_url(self, host, media_id):
-        return 'http://%s/e/%s' % (host, media_id)
+        return 'http://vid.me/e/%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -54,4 +54,4 @@ class VidMeResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return (re.search(self.pattern, url) or 'vid.me' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidplay.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidplay.py
deleted file mode 100644
index a3bb5744e09d38373f89a8be57ffe7704a366a1f..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidplay.py
+++ /dev/null
@@ -1,93 +0,0 @@
-'''
-vidplay urlresolver plugin
-Copyright (C) 2013 Lynx187
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-import urllib2
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import captcha_lib
-
-class VidplayResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "vidplay"
-    domains = ["vidplay.net"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        embed_url = 'http://vidplay.net/vidembed-%s' % (media_id)
-        response = urllib2.urlopen(embed_url)
-        if response.getcode() == 200 and response.geturl() != embed_url and response.geturl()[-3:].lower() in ['mp4', 'avi', 'mkv']:
-            return response.geturl() + '|User-Agent=%s' % (common.IE_USER_AGENT)
-
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-        if re.search('File Not Found ', html):
-            raise UrlResolver.ResolverError('File Not Found or removed')
-
-        data = {}
-        r = re.findall(r'type="hidden".*?name="([^"]+)".*?value="([^"]+)', html)
-        if r:
-            for name, value in r:
-                data[name] = value
-        else:
-            raise UrlResolver.ResolverError('Unable to resolve vidplay Link')
-
-        data.update(captcha_lib.do_captcha(html))
-
-        common.addon.log_debug('VIDPLAY - Requesting POST URL: %s with data: %s' % (web_url, data))
-        html = self.net.http_POST(web_url, data).content
-        r = re.search('id="downloadbutton".*?href="([^"]+)', html)
-        if r:
-            stream_url = r.group(1)
-        else:
-            r = re.search("file\s*:\s*'([^']+)", html)
-            if r:
-                stream_url = r.group(1)
-            else:
-                raise UrlResolver.ResolverError('Unable to resolve VidPlay Link')
-
-        if stream_url:
-            return stream_url + '|User-Agent=%s' % (common.IE_USER_AGENT)
-        else:
-            raise UrlResolver.ResolverError('Unable to resolve link')
-
-    def get_url(self, host, media_id):
-        return 'http://vidplay.net/%s' % media_id
-
-    def get_host_and_id(self, url):
-        r = re.search('http://(.+?)/embed-([\w]+)-', url)
-        if r:
-            return r.groups()
-        else:
-            r = re.search('//(.+?)/([\w]+)', url)
-            if r:
-                return r.groups()
-            else:
-                return False
-
-    def valid_url(self, url, host):
-        return (re.match('http://(www.)?vidplay.net/' +
-                         '[0-9A-Za-z]+', url) or
-                         'vidplay' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidspot.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidspot.py
index 247a63dd9f8ee3246a531420585c7f4eb66adbcc..dde124a7feb9b5a45d867a3a6026ff82f19fb695 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidspot.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidspot.py
@@ -17,16 +17,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
 import re
+import urllib
+import urlparse
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class VidSpotResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vidspot"
     domains = ["vidspot.net"]
+    pattern = '(?://|\.)(vidspot\.net)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -52,7 +55,8 @@ class VidSpotResolver(Plugin, UrlResolver, PluginSettings):
                 stream_url = match.group(1)
             
             if stream_url:
-                return stream_url
+                stream_url = '%s?%s&direct=false' % (stream_url.split('?')[0], urlparse.urlparse(stream_url).query)
+                return stream_url + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
             else:
                 raise UrlResolver.ResolverError('could not find file')
         else:
@@ -62,11 +66,11 @@ class VidSpotResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://vidspot.net/%s' % media_id 
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([0-9a-zA-Z]+)',url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
 
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?vidspot.net/[0-9A-Za-z]+', url) or re.match('http://(www.)?vidspot.net/embed-[0-9A-Za-z]+[\-]*\d*[x]*\d*.*[html]*', url) or 'vidspot' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidto.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidto.py
index 3ba31b81461dd2cb505e0b6ca5ce419b8b2619c4..44847ababbc949ac00a52d88102815d378d97e87 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidto.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidto.py
@@ -17,17 +17,16 @@
 
 import re
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-import xbmc
-from lib import jsunpack
 
 class VidtoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vidto"
     domains = ["vidto.me"]
+    pattern = '(?://|\.)(vidto\.me)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -36,25 +35,12 @@ class VidtoResolver(Plugin, UrlResolver, PluginSettings):
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
-        headers = {
-            'Referer': web_url,
-            'User-Agent': common.IE_USER_AGENT
-        }
 
         html = self.net.http_GET(web_url).content
-        data = {}
-        r = re.findall(r'type="hidden" name="(.+?)" value="(.+?)"', html)
-        if r:
-            for name, value in r:
-                data[name] = value
-            data['referer'] = web_url
-        data['imhuman'] = 'Proceed to video'
-        xbmc.sleep(6000)  # don't replace with countdown, crashes on linux
-        html = self.net.http_POST(web_url, data, headers=headers).content
-        match = re.search('(eval\(function.*)\s*</script>', html, re.DOTALL)
-        if match:
-            packed_data = match.group(1)
-            js_data = jsunpack.unpack(packed_data)
+
+        if jsunpack.detect(html):
+            js_data = jsunpack.unpack(html)
+
             max_label = 0
             stream_url = ''
             for match in re.finditer('label:\s*"(\d+)p"\s*,\s*file:\s*"([^"]+)', js_data):
@@ -66,19 +52,16 @@ class VidtoResolver(Plugin, UrlResolver, PluginSettings):
                 return stream_url
             else:
                 raise UrlResolver.ResolverError("File Link Not Found")
-        else:
-            raise UrlResolver.ResolverError("Packed Data Not Found")
         
     def get_url(self, host, media_id):
-        return 'http://vidto.me/%s.html' % media_id
+        return 'http://vidto.me/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([0-9A-Za-z]+)',url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
 
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?vidto.me/' +
-                        '[0-9A-Za-z]+', url) or 'vidto.me' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidup_org.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidup_org.py
index 01f650788308f0a20cfc33ff242f8338093e7543..328b6671e5587760ff153552134439b4982ec56e 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidup_org.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidup_org.py
@@ -18,23 +18,22 @@
 
 import re
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
 
 class VidUpResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vidup"
     domains = ["vidup.org", "vidup.me"]
-    
+    pattern = '(?://|\.)(vidup.(?:me|org))/(?:embed-)?([0-9a-zA-Z]+)'
+
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www\.|beta\.)?vidup.(?:me|org))/(?:embed-)?([0-9a-zA-Z]+)'
-    
+
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         html = self.net.http_GET(web_url).content
@@ -56,12 +55,14 @@ class VidUpResolver(Plugin, UrlResolver, PluginSettings):
             raise UrlResolver.ResolverError('File Not Found or removed')
 
     def get_url(self, host, media_id):
-            return 'http://vidup.me/embed-%s.html' % (media_id)
+            return 'http://vidup.me/embed-%s.html' % media_id
     
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
+        if r:
+            return r.groups()
+        else:
+            return False
+
     def valid_url(self, url, host):
         return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidxden.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidxden.py
deleted file mode 100644
index 7a4da60e9ce7bc41e3de68a7903ac5f7d9b84fb5..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidxden.py
+++ /dev/null
@@ -1,100 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-"""
-RogerThis - 16/8/2011
-Site: http://www.vidxden.com , http://www.divxden.com & http://www.vidbux.com
-vidxden hosts both avi and flv videos
-In testing there seems to be a timing issue with files coming up as not playable.
-This happens on both the addon and in a browser.
-"""
-import socket
-import re
-from t0mm0.common.net import Net
-from urlresolver import common
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from lib import captcha_lib
-from lib import jsunpack
-
-# SET DEFAULT TIMEOUT FOR SLOW SERVERS:
-socket.setdefaulttimeout(30)
-
-class VidxdenResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "vidxden"
-    domains = ['vidxden.com', 'vidxden.to', 'divxden.com', 'vidbux.com', 'vidbux.to']
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        if "No such file or the file has been removed due to copyright infringement issues." in html:
-            raise UrlResolver.ResolverError('File Not Found or removed')
-
-        filename = re.compile('<input name="fname" type="hidden" value="(.+?)">').findall(html)[0]
-        data = {'op': 'download1', 'method_free': '1', 'usr_login': '', 'id': media_id, 'fname': filename}
-        data.update(captcha_lib.do_captcha(html))
-        html = self.net.http_POST(resp.get_url(), data).content
-
-        # find packed javascript embed code
-        r = re.search('(eval.*?)\s*</script>', html, re.DOTALL)
-        if r:
-            packed_data = r.group(1)
-        else:
-            raise UrlResolver.ResolverError('packed javascript embed code not found')
-
-        try: decrypted_data = jsunpack.unpack(packed_data)
-        except: pass
-        decrypted_data = decrypted_data.replace('\\', '')
-        # First checks for a flv url, then the if statement is for the avi url
-        r = re.search('[\'"]file[\'"]\s*,\s*[\'"]([^\'"]+)', decrypted_data)
-        if not r:
-            r = re.search('src="(.+?)"', decrypted_data)
-        if r:
-            stream_url = r.group(1)
-        else:
-            raise UrlResolver.ResolverError('stream url not found')
-
-        return stream_url
-
-    def get_url(self, host, media_id):
-        if 'vidbux' in host:
-            host = 'www.vidbux.com'
-        else:
-            host = 'www.vidxden.com'
-        return 'http://%s/%s' % (host, media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search('//(.+?)/(?:embed-)?([0-9a-z]+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return (re.match('http://(?:www.)?(vidxden|divxden|vidbux).(com|to)/' +
-                         '(embed-)?[0-9a-z]+', url) or
-                'vidxden' in host or 'divxden' in host or
-                'vidbux' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidzi.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidzi.py
index 133224f352a492e0de8c9e28a85d78df66b1c367..be6ffb7655fa3df6dfec151cbf87328193f0b5f0 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidzi.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidzi.py
@@ -16,18 +16,19 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
+import urllib
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import re
-from lib import jsunpack
-from urlresolver import common
 
 class VidziResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vidzi"
     domains = ["vidzi.tv"]
+    pattern = '(?://|\.)(vidzi\.tv)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
@@ -43,7 +44,7 @@ class VidziResolver(Plugin, UrlResolver, PluginSettings):
 
         r = re.search('file\s*:\s*"([^"]+)', html)
         if r:
-            return r.group(1) + '|Referer=http://vidzi.tv/nplayer/jwplayer.flash.swf'
+            return r.group(1) + '|' + urllib.urlencode({ 'Referer': 'http://vidzi.tv/nplayer/jwplayer.flash.swf' })
         else:
             for match in re.finditer('(eval\(function.*?)</script>', html, re.DOTALL):
                 js_data = jsunpack.unpack(match.group(1))
@@ -57,11 +58,11 @@ class VidziResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://%s/embed-%s.html' % (host, media_id)
 
     def get_host_and_id(self, url):
-        r = re.search('http://(?:www\.|embed-)?(.+?)/(?:embed-)?([0-9a-zA-Z/]+)', url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
 
     def valid_url(self, url, host):
-        return (re.match('http://(www\.|embed-)?vidzi.tv/(?:embed-)?[0-9A-Za-z]+', url) or 'vidzi' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidzur.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidzur.py
deleted file mode 100644
index a5f6ce30541682450aee457612b8b0ac1643461e..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vidzur.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import urllib,urllib2
-from urlresolver import common
-import re
-
-class VidzurResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "vidzur.com"
-    domains = ["vidzur.com"]
-    
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        # http://vidzur.com/embed.php?w=718&h=438&vid=og1/zetsuen_no_tempest_-_24.flv
-        self.pattern = 'http://.*?(vidzur.com)/embed\.php\?.*?vid=([0-9a-zA-Z/_\-\.]*)[\?&]*'
-        #self.pattern = 'http://((?:www.)?videofun.me)/embed/(.+?)'
-    
-    def get_url(self, host, media_id):
-            return 'http://vidzur.com/embed.php?vid=%s' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        common.addon.log(media_id)
-        common.addon.log(web_url)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        r = re.search("playlist\s*:\s*\n*\s*\[\s*\n*\s*\{\s*\n*\s*\n*\s*url:\s*'(.+?)'", html)
-        if r:
-            stream_url = urllib.unquote_plus(r.group(1))
-        else:
-            raise UrlResolver.ResolverError('no file located')
-        return stream_url
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vimeo.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vimeo.py
index 3fd0151cd068fce54fdb1ab2e9d25e5fb9194670..cb6f77f569a9ca978eb180a8df7de4b64ac25fe2 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vimeo.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vimeo.py
@@ -17,8 +17,8 @@
 """
 
 import re
+import json
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
@@ -27,35 +27,56 @@ class VimeoResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vimeo"
     domains = ["vimeo.com"]
+    pattern = '(?://|\.)(vimeo\.com)/(?:video/)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
+        self.net = Net()
 
     def get_media_url(self, host, media_id):
-        #just call vimeo addon
-        plugin = 'plugin://plugin.video.vimeo/?action=play_video&videoid=' + media_id
-        return plugin
+        web_url = self.get_url(host, media_id)
+
+        data = self.net.http_GET(web_url).content
+        data = json.loads(data)
+
+        vids = data['request']['files']['progressive']
+        vids = [i['url'] for i in vids if 'url' in i]
+
+        if vids:
+            vUrlsCount = len(vids)
+
+            if (vUrlsCount > 0):
+                q = self.get_setting('quality')
+                # Lowest Quality
+                i = 0
+
+                if q == '1':
+                    # Medium Quality
+                    i = (int)(vUrlsCount / 2)
+                elif q == '2':
+                    # Highest Quality
+                    i = vUrlsCount - 1
+
+                vUrl = vids[i]
+                return vUrl
 
     def get_url(self, host, media_id):
-        return 'http://vimeo.com/%s' % media_id
+        return 'http://player.vimeo.com/video/%s/config' % media_id
 
     def get_host_and_id(self, url):
-        r = re.findall('/([0-9]+)', url)
+        r = re.search(self.pattern, url)
         if r:
-            video_id = r[-1]
-        if video_id:
-            return ('vimeo.com', video_id)
+            return r.groups()
         else:
-            common.addon.log_error('vimeo: video id not found')
             return False
 
     def valid_url(self, url, host):
-        return re.match('http://(.+)?vimeo.com/(video\/)?[0-9]+',
-                        url) or 'vimeo' in host
+        return re.search(self.pattern, url) or self.name in host
 
+    #PluginSettings methods
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
-        xml += '<setting label="This plugin calls the vimeo addon - '
-        xml += 'change settings there." type="lsep" />\n'
-        return xml
+        xml += '<setting label="Video Quality" id="%s_quality" ' % self.__class__.__name__
+        xml += 'type="enum" values="Low|Medium|High" default="2" />\n'
+        return xml
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vivosx.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vivosx.py
index a3f2066778a27f4adc159ace4296e633d7c28bfd..0c257237a50b151b1011ae085d8106c25cd2c2c7 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vivosx.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vivosx.py
@@ -16,20 +16,18 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 '''
 
+import re
 from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from time import sleep
-import re
-import os
 
 class VivosxResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vivosx"
     domains = [ "vivo.sx" ]
-    
+    pattern = '(?://|\.)(vivo\.sx)/([0-9a-zA-Z]+)'
+
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
@@ -70,14 +68,11 @@ class VivosxResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://vivo.sx/%s' % media_id 
     
     def get_host_and_id(self, url):
-        r = re.search('//(.+?)/([0-9a-zA-Z]+)',url)
+        r = re.search(self.pattern, url)
         if r:
             return r.groups()
         else:
             return False
-        return('host', 'media_id')
-    
+
     def valid_url(self, url, host):
-        return (re.match('http://(www.)?vivo.sx/' +
-                         '[0-9A-Za-z]+', url) or
-                         'vivo.sx' in host)
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vk.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vk.py
index a43219fbd303cd5ccc99490a38ccbdbbf59458e8..7896408c33e256c4b1b30e394fb8d76d9de00c0f 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vk.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vk.py
@@ -18,37 +18,48 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 import re
-import urlparse
 import json
-import xbmcgui
+import urllib
+import urlparse
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
+import xbmcgui
 
 class VKResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "VK.com"
     domains = ["vk.com"]
+    pattern = '(?://|\.)(vk\.com)/(?:video_ext\.php\?|video)(.+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www\.)?vk\.com)/video_ext\.php\?(.+)'
 
     def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        query = web_url.split('?', 1)[-1]
-        query = urlparse.parse_qs(query)
-        api_url = 'http://api.vk.com/method/video.getEmbed?oid=%s&video_id=%s&embed_hash=%s' % (query['oid'][0], query['id'][0], query['hash'][0])
+        headers = {
+            'User-Agent': common.IE_USER_AGENT
+        }
+
+        query = urlparse.parse_qs(media_id)
+
+        try: oid, video_id = query['oid'][0] , query['id'][0]
+        except: oid, video_id = re.findall('(.*)_(.*)', media_id)[0]
+
+        try: hash = query['hash'][0]
+        except: hash = self.__get_hash(oid, video_id)
+
+        api_url = 'http://api.vk.com/method/video.getEmbed?oid=%s&video_id=%s&embed_hash=%s' % (oid, video_id, hash)
+
         html = self.net.http_GET(api_url).content
         html = re.sub(r'[^\x00-\x7F]+', ' ', html)
-        
+
         try: result = json.loads(html)['response']
-        except: result = self.__get_private(query['oid'][0], query['id'][0])
-        
+        except: result = self.__get_private(oid, video_id)
+
         quality_list = []
         link_list = []
         best_link = ''
@@ -59,7 +70,7 @@ class VKResolver(Plugin, UrlResolver, PluginSettings):
                 best_link = result[quality]
         
         if self.get_setting('auto_pick') == 'true' and best_link:
-            return best_link + '|User-Agent=%s' % (common.IE_USER_AGENT)
+            return best_link + '|' + urllib.urlencode(headers)
         else:
             if quality_list:
                 if len(quality_list) > 1:
@@ -67,9 +78,9 @@ class VKResolver(Plugin, UrlResolver, PluginSettings):
                     if result == -1:
                         raise UrlResolver.ResolverError('No link selected')
                     else:
-                        return link_list[result] + '|User-Agent=%s' % (common.IE_USER_AGENT)
+                        return link_list[result] + '|' + urllib.urlencode(headers)
                 else:
-                    return link_list[0] + '|User-Agent=%s' % (common.IE_USER_AGENT)
+                    return link_list[0] + '|' + urllib.urlencode(headers)
         
         raise UrlResolver.ResolverError('No video found')
 
@@ -81,9 +92,20 @@ class VKResolver(Plugin, UrlResolver, PluginSettings):
         try: return json.loads(match.group(1))
         except: return {}
         return {}
+
+    def __get_hash(self, oid, video_id):
+        hash_url = 'http://vk.com/al_video.php?act=show_inline&al=1&video=%s_%s' % (oid, video_id)
+        html = self.net.http_GET(hash_url).content
+        html = html.replace('\'', '"').replace(' ', '')
+        html = re.sub(r'[^\x00-\x7F]+', ' ', html)
+        match = re.search('"hash2"\s*:\s*"(.+?)"', html)
+        if match: return match.group(1)
+        match = re.search('"hash"\s*:\s*"(.+?)"', html)
+        if match: return match.group(1)
+        return ''
     
     def get_url(self, host, media_id):
-        return 'http://%s.com/video_ext.php?%s' % (host, media_id)
+        return 'http://vk.com/video_ext.php?%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -93,7 +115,7 @@ class VKResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'vk' in host
+        return re.search(self.pattern, url) or self.name in host
 
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vkpass.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vkpass.py
index b920dce9feaa708b2f825a7677c255dde9160355..b92b96360133a0d3e405005c18220877c27f89dd 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vkpass.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vkpass.py
@@ -27,12 +27,12 @@ class VKPassResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "VKPass.com"
     domains = ["vkpass.com"]
+    pattern = '(?://|\.)(vkpass\.com)/token/(.+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?vkpass.com)/token/(.+)'
 
     def get_media_url(self, host, media_id):
         base_url = self.get_url(host, media_id)
@@ -111,7 +111,7 @@ class VKPassResolver(Plugin, UrlResolver, PluginSettings):
         return data
 
     def get_url(self, host, media_id):
-        return 'http://%s/token/%s' % (host, media_id)
+        return 'http://vkpass.com/token/%s' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -121,9 +121,7 @@ class VKPassResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        if self.get_setting('enabled') == 'false':
-            return False
-        return re.search(self.pattern, url) or 'vkpass' in host
+        return re.search(self.pattern, url) or self.name in host
 
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vodlocker.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vodlocker.py
index 18f470724ca7770c3bfc078902fe26ae256f235d..65f685a0a22abfdbaab89d137d517f295ef1d57f 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vodlocker.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vodlocker.py
@@ -21,29 +21,17 @@ from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class VodlockerResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vodlocker.com"
     domains = ["vodlocker.com"]
+    pattern = '(?://|\.)(vodlocker\.com)/(?:embed-)?([0-9a-zA-Z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:www.)?vodlocker.com)/(?:embed-)?([0-9a-zA-Z]+)(?:-\d+x\d+.html)?'
-
-    def get_url(self, host, media_id):
-        return 'http://vodlocker.com/embed-%s-640x400.html' % (media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -57,3 +45,17 @@ class VodlockerResolver(Plugin, UrlResolver, PluginSettings):
             return video_link
         else:
             raise UrlResolver.ResolverError('No playable video found.')
+
+    def get_url(self, host, media_id):
+        return 'http://vodlocker.com/embed-%s-640x400.html' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
+
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vshare.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vshare.py
index 9bd0f97b1dd3eea771342619f058f7f175aedd11..abe164ef0c5884a4ef115566dfcdec34747cbe5e 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vshare.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vshare.py
@@ -21,29 +21,17 @@ from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class VshareResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vshare"
     domains = ['vshare.io']
+    pattern = '(?://|\.)(vshare\.io)/\w?/(\w+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://((?:www.)?vshare.io)/\w?/(\w+)(?:\/width-\d+/height-\d+/)?'
-
-    def get_url(self, host, media_id):
-        return 'http://vshare.io/v/%s/width-620/height-280/' % (media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -56,3 +44,16 @@ class VshareResolver(Plugin, UrlResolver, PluginSettings):
             return video_link
         else:
             raise UrlResolver.ResolverError('No playable video found.')
+
+    def get_url(self, host, media_id):
+        return 'http://vshare.io/v/%s/width-620/height-280/' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vshareeu.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vshareeu.py
index a9567a78160f0232303f95ad8314bc7b98ba0899..fbe5a835d75777276d9cff67d510a6c6ade5c743 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vshareeu.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/vshareeu.py
@@ -21,29 +21,17 @@ from t0mm0.common.net import Net
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
 
 class VshareEuResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "vshare.eu"
     domains = ['vshare.eu']
+    pattern = '(?://|\.)(vshare\.eu)/(?:embed-|)?([0-9a-zA-Z/]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?vshare.eu)/(?:embed-|)?([0-9a-zA-Z/]+)'
-
-    def get_url(self, host, media_id):
-        return 'http://vshare.eu/embed-%s-720x400.html' % (media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.search(self.pattern, url) or self.name in host
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
@@ -56,3 +44,16 @@ class VshareEuResolver(Plugin, UrlResolver, PluginSettings):
             return match.group(1)
         
         raise UrlResolver.ResolverError('No playable video found.')
+
+    def get_url(self, host, media_id):
+        return 'http://vshare.eu/embed-%s.html' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/watchfreeinhd.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/watchfreeinhd.py
deleted file mode 100644
index 90b610db15877a62ac4c10fab03202008265aa7d..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/watchfreeinhd.py
+++ /dev/null
@@ -1,56 +0,0 @@
-'''
-watchfreeinhd urlresolver plugin
-Copyright (C) 2013 voinage
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class WatchFreeResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "watchfreeinhd"
-    domains = ["watchfreeinhd.com"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_POST(web_url, {'agree': 'Yes, let me watch'}).content
-        link = re.findall('<a href="(.+?)" id="player" name="player">', html)
-        if link:
-            return link[0]
-        else:
-            raise UrlResolver.ResolverError('File Not Found or removed')
-
-    def get_url(self, host, media_id):
-        return 'http://www.%s.com/%s' % (host, media_id)
-
-    def get_host_and_id(self, url):
-        r = re.match(r'http://www.(watchfreeinhd).com/([0-9A-Za-z]+)', url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return (re.match(r'http://www.(watchfreeinhd).com/([0-9A-Za-z]+)', url) or 'watchfree' in host)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/xvidstage.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/xvidstage.py
index baad611822ce42758f19c8b94d4e22149ba4689c..1b0b9f551957395bb0f42e26f09fe19e461d084a 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/xvidstage.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/xvidstage.py
@@ -18,41 +18,42 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import re
 from t0mm0.common.net import Net
+from lib import jsunpack
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
 
 class XvidstageResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "xvidstage"
     domains = ["xvidstage.com"]
+    pattern ='(?://|\.)(xvidstage\.com)/(?:embed-|)?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern ='http://((?:www.)?xvidstage.com)/([0-9A-Za-z]+)'
-        # http://xvidstage.com/59reflvbp02z
 
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
+
         html = self.net.http_GET(web_url).content
-               
-        result = re.compile('(eval.*?\)\)\))').findall(html)[-1]
-        if result:
-            sJavascript = result
-            sUnpacked = jsunpack.unpack(sJavascript)
-            sPattern = "'file','(.+?)'"#modded
-            r = re.search(sPattern, sUnpacked)
-            if r:
-                return r.group(1)
+
+        for match in re.finditer('(eval.*?\)\)\))', html, re.DOTALL):
+            js_data = jsunpack.unpack(match.group(1))
+            js_data = js_data.replace('\\\'', '\'')
+
+            stream_url = re.findall('<param\s+name="src"\s*value="([^"]+)', js_data)
+            stream_url += re.findall("'file'\s*,\s*'(.+?)'", js_data)
+            stream_url = [i for i in stream_url if not i.endswith('.srt')]
+
+            if stream_url:
+                return stream_url[0]
             
         raise UrlResolver.ResolverError('File Not Found or removed')
 
     def get_url(self, host, media_id):
-            return 'http://www.xvidstage.com/embed-%s.html' % (media_id)
+            return 'http://www.xvidstage.com/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -62,4 +63,4 @@ class XvidstageResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/yourupload.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/yourupload.py
index 723bdfdca57c3baa3f59b3802660eae16488098d..9a4b06b0ba5b691e80eadbd0a882830e2470c510 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/yourupload.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/yourupload.py
@@ -16,90 +16,53 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+import re
+import urllib2
 from t0mm0.common.net import Net
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-import urllib, urllib2
-from urlresolver import common
-import re
 
 class YourUploadResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "yourupload.com"
     domains = [ "yourupload.com" ]
+    pattern = '(?://|\.)(yourupload\.com)/(?:watch|embed)/?([0-9A-Za-z]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        # http://yourupload.com/embed/a67563063236469c65a94a1dfbbb129b&width=718&height=438
-        # http://yourupload.com/embed_ext/videoweed/4f4d574ed3266&width=718&height=438
-        # http://embed.yourupload.com/2o6B1y?client_file_id=380101&width=600&height=438
-        self.pattern = 'http://((?:www.)?yourupload.com)/embed/([0-9a-zA-Z]+)[\?&]*'
-        self.pattern2 = 'http://((?:www.)?yourupload.com)/embed_ext/[0-9A-Za-z]+/([0-9a-zA-Z]+)[\?&]*'
-        # self.pattern3 = 'http://embed.(yourupload.com)/([0-9a-zA-Z]+\?.*?client_file_id=[0-9a-zA-Z]+)[&]*'
-        # self.pattern3 = 'http://((?:embed.)?yourupload.com)/(.+?client_file_id.+?)'
-        self.pattern3 = 'http://embed.(yourupload.com)/(.+?)'
-        # self.pattern = 'http://((?:www.)?yourupload.com)/embed/(.+?)'
+
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+
+        headers = {
+            'User-Agent': common.IE_USER_AGENT,
+            'Referer': web_url
+        }
+
+        html = self.net.http_GET(web_url, headers=headers).content
+
+        r = re.search("file\s*:\s*'(.+?)'", html)
+        if r:
+            stream_url = r.group(1)
+            stream_url = urllib2.urlopen(urllib2.Request(stream_url, headers=headers)).geturl()
+
+            return stream_url 
+        else:
+            raise UrlResolver.ResolverError('no file located')
 
     def get_url(self, host, media_id):
-            common.addon.log(host + ' - media_id: %s' % media_id)
-            if len(media_id) > 5: common.addon.log_notice('1st 4 digits:  ' + media_id[:4])
-            if media_id[:4] == 'ext_':
-                common.addon.log_notice(media_id[4:] + ':  media_id is for an external video source')
-                return 'http://yourupload.com/embed_ext/videoweed/%s' % (media_id[4:])
-            elif ('___' in media_id):
-                r = media_id.split('___')[0]
-                s = media_id.split('___')[1]
-                common.addon.log_notice(media_id + ':  media_id is for 2 ID types')
-                return 'http://embed.yourupload.com/%s?client_file_id=%s' % (r, s)
-            elif ('client_file_id' in media_id):
-                common.addon.log_notice(media_id + ':  media_id is for 2 ID types')
-                return 'http://embed.yourupload.com/%s' % (media_id)
-            elif ('=' in media_id) or ('&' in media_id) or ('?' in media_id) or ('client' in media_id):
-                common.addon.log_notice(media_id + ':  media_id is for 2 ID types')
-                return 'http://embed.yourupload.com/%s' % (media_id)
-            else: return 'http://yourupload.com/embed/%s' % (media_id)
+            return 'http://www.yourupload.com/embed/%s' % media_id
 
     def get_host_and_id(self, url):
-        common.addon.log_notice('get host and id from: %s' % url)
-        if 'yourupload.com/embed_ext' in url: r = re.search(self.pattern2, url); s = 'ext_'
-        elif ('embed.yourupload.com' in url):
-            r = re.search('/([0-9a-zA-Z]+)\?', url).group(1)
-            s = re.search('client_file_id=([0-9a-zA-Z]+)', url).group(1)
-            return [r + '___' + s, 'embed.yourupload.com']
-        elif ('embed.yourupload.com/' in url):
-            r = url.split('yourupload.com/')[1]; s = ''
-            return [r, 'embed.yourupload.com']
-        elif ('embed.yourupload.com' in url): r = re.search(self.pattern3, url); s = ''
-        else: r = re.search(self.pattern, url); s = ''
-        # if r: return s+r.groups()
-        if r: return [r.group(1), s + r.group(2)]
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
         else:
-            common.addon.log_notice('failed to get host and id: %s' % url)
-            # return 'failed to get host and id: %s'
             return False
 
     def valid_url(self, url, host):
-        if ('yourupload.com' in url) or ('yourupload.com' in host): return True
-        elif ('yourupload.com' in url) and ('embed' in url): return True
-        elif 'yourupload.com/embed' in url: return True
-        elif 'embed.yourupload.com' in url: return True
-        elif 'yourupload.com/embed_ext/' in url: return re.match(self.pattern2, url) or self.name in host
-        elif ('http://embed.yourupload.com/' in url) and ('client_file_id' in url): return re.match(self.pattern3, url) or self.name in host
-        else: return re.match(self.pattern, url) or self.name in host
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        r = re.search('<meta property="og:video" content="(.+?)"', html)
-        if not r:
-            r = re.search('<source src="(.+?)"', html)
-            if not r:
-                r = re.search("'file'\s*:\s*'(.+?)'", html)
-        if r:
-            return r.group(1)
-        else:
-            raise UrlResolver.ResolverError('no file located')
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/youtube.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/youtube.py
index 191a48ad168c23790153a6f6cf7ca5bb049eff7e..47e3c2cc0bb2e5f739d82b1e465269617a3a595c 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/youtube.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/youtube.py
@@ -18,7 +18,6 @@
 
 import re
 from t0mm0.common.net import Net
-from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
@@ -27,13 +26,13 @@ class YoutubeResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "youtube"
     domains = [ 'youtube.com', 'youtu.be' ]
+    pattern = '(?://|\.)(youtube.com|youtu.be)/(?:embed/|.+?\?v=|.+?\&v=)([0-9A-Za-z_\-]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
 
     def get_media_url(self, host, media_id):
-        #just call youtube addon
         plugin = 'plugin://plugin.video.youtube/?action=play_video&videoid=' + media_id
         return plugin
 
@@ -41,22 +40,14 @@ class YoutubeResolver(Plugin, UrlResolver, PluginSettings):
         return 'http://youtube.com/watch?v=%s' % media_id
 
     def get_host_and_id(self, url):
-        if url.find('?') > -1:
-            queries = common.addon.parse_query(url.split('?')[1])
-            video_id = queries.get('v', None)
-        else:
-            r = re.findall('/([0-9A-Za-z_\-]+)', url)
-            if r:
-                video_id = r[-1]
-        if video_id:
-            return ('youtube.com', video_id)
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
         else:
             return False
 
     def valid_url(self, url, host):
-        return re.match('http[s]*://(((www.|m.)?youtube.+?(v|embed)(=|/))|' +
-                        'youtu.be/)[0-9A-Za-z_\-]+', 
-                        url) or 'youtube' in host or 'youtu.be' in host
+        return re.search(self.pattern, url) or self.name in host
 
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/youwatch.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/youwatch.py
index b252af95f817ab9da34205e53ed58e2bdf89f35f..20d52956c24cb88a8fc0c5e6499db169d2f6adfe 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/youwatch.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/youwatch.py
@@ -16,52 +16,60 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 import re
+import urllib
 from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
 from urlresolver.plugnplay.interfaces import UrlResolver
 from urlresolver.plugnplay.interfaces import PluginSettings
 from urlresolver.plugnplay import Plugin
-from urlresolver import common
-from lib import jsunpack
 
 MAX_TRIES = 5
     
 class YouWatchResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
-    name = "youwatch"
+    name = "youwatch.org"
     domains = ["youwatch.org"]
+    pattern = '(?://|\.)(youwatch\.org)/(?:embed-)?([A-Za-z0-9]+)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = '//((?:www.)?youwatch.org)/(?:embed-)?([A-Za-z0-9]+)(?:-\d+x\d+\.html)?'
-            
+
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
+
         headers = {
                    'Referer': web_url
         }
+
         tries = 0
         while tries < MAX_TRIES:
             html = self.net.http_GET(web_url, headers=headers).content
-            r = re.search('<iframe[^>]*src="([^"]+/embed[^"]+)', html)
+            html = html.replace('\n', '')
+            r = re.search('<iframe\s+src\s*=\s*"([^"]+)', html)
             if r:
                 headers['Referer'] = web_url
                 web_url = r.group(1)
             else:
                 break
             tries += 1
-        
+
+        r = re.search('file\s*:\s*"([^"]+)', html)
+        if r:
+            return r.group(1) + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
+
         for match in re.finditer('(eval\(function.*?)</script>', html, re.DOTALL):
             js_data = jsunpack.unpack(match.group(1))
             match2 = re.search('file\s*:\s*"([^"]+)', js_data)
             if match2:
-                return match2.group(1) + '|User-Agent=%s' % (common.IE_USER_AGENT)
+                return match2.group(1) + '|' + urllib.urlencode({ 'User-Agent': common.IE_USER_AGENT })
     
         raise UrlResolver.ResolverError('Unable to resolve youwatch link. Filelink not found.')
 
     def get_url(self, host, media_id):
-        return 'http://youwatch.org/embed-%s-640x360.html' % media_id
+        return 'http://youwatch.org/embed-%s.html' % media_id
 
     def get_host_and_id(self, url):
         r = re.search(self.pattern, url)
@@ -71,4 +79,4 @@ class YouWatchResolver(Plugin, UrlResolver, PluginSettings):
             return False
 
     def valid_url(self, url, host):
-        return re.search(self.pattern, url) or 'youwatch' in host
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zalaa.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zalaa.py
deleted file mode 100644
index 1196ab2e92035e11251c33395df085f6a46ec74b..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zalaa.py
+++ /dev/null
@@ -1,75 +0,0 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2012 Bstrdsmkr
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class ZalaaResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "zalaa"
-    domains = ["zalaa.com"]
-
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        #e.g.  http://www.zalaa.com/hj0eyq4jg0io
-        #FIXME: http://www.zalaa.com/npwp1cr4uys7/Nikita.S02E14.HDTV.XviD-LOL.avi.htm
-        self.pattern = 'http://www.(zalaa.com)/([a-zA-Z0-9]+)(?:/.+?\.htm)?'
-
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        html = self.net.http_GET(web_url).content
-
-        #send all form values
-        sPattern = '<input.*?name="([^"]+)".*?value=([^>]+)>'
-        r = re.findall(sPattern, html)
-        data = {}
-        if r:
-            for match in r:
-                name = match[0]
-                value = match[1].replace('"', '')
-                data[name] = value
-
-            html = self.net.http_POST(web_url, data).content
-        else:
-            raise UrlResolver.ResolverError('File Not Found or removed')
-
-        # modified by mscreations. get the file url from the returned javascript
-        match = re.search("addVariable[(]'file','(.+?)'[)]", html, re.DOTALL + re.IGNORECASE)
-        if match:
-            return match.group(1) + '|Referer=http%3A%2F%2Fwww.zalaa.com%2Fplayer%2Fplayer-embed.swf'
-        else:
-            raise UrlResolver.ResolverError('File Not Found or removed')
-
-    def get_url(self, host, media_id):
-            return 'http://www.zalaa.com/%s' % (media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r:
-            return r.groups()
-        else:
-            return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zerocast.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zerocast.py
index 02463897643b45112197ff5ed26131447935c9a2..548ea194058e0e485b9613a1d196d0153ff3de74 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zerocast.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zerocast.py
@@ -30,27 +30,16 @@ class ZeroCastResolver(Plugin, UrlResolver, PluginSettings):
     implements = [UrlResolver, PluginSettings]
     name = "zerocast"
     domains = ["zerocast.tv"]
+    pattern = '(?://|\.)(zerocast\.tv)/((?:embed|(?:channels/)*chan(?:nel)*)\.php\?.*(?:a=[0-9]+|chan=[a-zA-Z0-9]+).*)'
 
     def __init__(self):
         p = self.get_setting('priority') or 100
         self.priority = int(p)
         self.net = Net()
-        self.pattern = 'http://.*?(zerocast\.tv)/((?:embed|(?:channels/)*chan(?:nel)*)\.php\?.*(?:a=[0-9]+|chan=[a-zA-Z0-9]+).*)'
         self.user_agent = common.IE_USER_AGENT
         self.net.set_user_agent(self.user_agent)
         self.headers = {'User-Agent': self.user_agent}
 
-    def get_url(self, host, media_id):
-        return 'http://%s/%s' % (host, media_id)
-
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or host in self.domains
-
     def get_media_url(self, host, media_id):
         web_url = self.get_url(host, media_id)
         self.headers['Referer'] = web_url
@@ -78,3 +67,16 @@ class ZeroCastResolver(Plugin, UrlResolver, PluginSettings):
             return stream_url
         else:
             raise UrlResolver.ResolverError('File not found')
+
+    def get_url(self, host, media_id):
+        return 'http://zerocast.tv/%s' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/video44.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zettahost.py
similarity index 54%
rename from packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/video44.py
rename to packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zettahost.py
index 172274f98535e75094b54c3131f3e3b230e8e69f..24075128d3b67b96ef296bfc22f46b6456e0d122 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/video44.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zettahost.py
@@ -1,59 +1,69 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import re
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-from urlresolver import common
-
-class Video44Resolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "video44.net"
-    domains = ["video44.net"]
-    
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = 'http://((?:www.)?video44.net)/gogo/.*?file=([0-9a-zA-Z\-_\.]+).*?'
-    
-    def get_url(self, host, media_id):
-            return 'http://www.video44.net/gogo/?sv=1&file=%s' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        common.addon.log(media_id)
-        common.addon.log(web_url)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        r = re.search('file\s*:\s*"(.+?)"', html)
-        if r:
-            stream_url = r.group(1)
-        else:
-            raise UrlResolver.ResolverError('no file located')
-        return stream_url
+"""
+    urlresolver XBMC Addon
+    Copyright (C) 2016 lambda
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+
+import re
+from t0mm0.common.net import Net
+from lib import jsunpack
+from urlresolver import common
+from urlresolver.plugnplay.interfaces import UrlResolver
+from urlresolver.plugnplay.interfaces import PluginSettings
+from urlresolver.plugnplay import Plugin
+
+class ZettahostResolver(Plugin, UrlResolver, PluginSettings):
+    implements = [UrlResolver, PluginSettings]
+    name = 'zettahost.tv'
+    domains = [ 'zettahost.tv' ]
+    pattern = '(?://|\.)(zettahost\.tv)/(?:embed-)?([0-9a-zA-Z]+)'
+
+    def __init__(self):
+        p = self.get_setting('priority') or 100
+        self.priority = int(p)
+        self.net = Net()
+
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+
+        headers = { 'User-Agent': common.IOS_USER_AGENT }
+
+        html = self.net.http_GET(web_url, headers=headers).content
+
+        for match in re.finditer('(eval.*?\)\)\))', html, re.DOTALL):
+            js_data = jsunpack.unpack(match.group(1))
+
+            stream_url = re.findall('<param\s+name="src"\s*value="([^"]+)', js_data)
+            stream_url += re.findall('file\s*:\s*[\'|\"](.+?)[\'|\"]', js_data)
+            stream_url = [i for i in stream_url if not i.endswith('.srt')]
+
+            if stream_url:
+                return stream_url[0]
+            
+        raise UrlResolver.ResolverError('File Not Found or removed')
+
+    def get_url(self, host, media_id):
+        return 'http://zettahost.tv/embed-%s.html' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoboxone.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zstream.py
similarity index 62%
rename from packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoboxone.py
rename to packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zstream.py
index d8282f7bd3cab64c48bab22b3ba2a8fa89cb65a1..180e6b11c4a69ebdba1d7c9803f81f50d75795a7 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/videoboxone.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/plugins/zstream.py
@@ -1,59 +1,61 @@
-"""
-    urlresolver XBMC Addon
-    Copyright (C) 2011 t0mm0
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-from t0mm0.common.net import Net
-from urlresolver.plugnplay.interfaces import UrlResolver
-from urlresolver.plugnplay.interfaces import PluginSettings
-from urlresolver.plugnplay import Plugin
-import urllib
-from urlresolver import common
-import re
-
-class VideoBoxOneResolver(Plugin, UrlResolver, PluginSettings):
-    implements = [UrlResolver, PluginSettings]
-    name = "videoboxone.com"
-    domains = ["videoboxone.com"]
-    
-    def __init__(self):
-        p = self.get_setting('priority') or 100
-        self.priority = int(p)
-        self.net = Net()
-        self.pattern = 'http://((?:www.)?videoboxone.com)/(\D+.php\?file=[0-9a-zA-Z\-_]+)[&]*'
-    
-    def get_url(self, host, media_id):
-        return 'http://videoboxone.com/%s' % (media_id)
-    
-    def get_host_and_id(self, url):
-        r = re.search(self.pattern, url)
-        if r: return r.groups()
-        else: return False
-    
-    def valid_url(self, url, host):
-        return re.match(self.pattern, url) or self.name in host
-    
-    def get_media_url(self, host, media_id):
-        web_url = self.get_url(host, media_id)
-        common.addon.log(web_url)
-        resp = self.net.http_GET(web_url)
-        html = resp.content
-        r = re.search("'file'\s*:\s*'(.+?)'", html)
-        if r:
-            stream_url = urllib.unquote_plus(r.group(1))
-        else:
-            raise UrlResolver.ResolverError('no file located')
-        return stream_url
+"""
+    urlresolver XBMC Addon
+    Copyright (C) 2016 lambda
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+
+import re
+from t0mm0.common.net import Net
+from urlresolver.plugnplay.interfaces import UrlResolver
+from urlresolver.plugnplay.interfaces import PluginSettings
+from urlresolver.plugnplay import Plugin
+
+class ZstreamResolver(Plugin, UrlResolver, PluginSettings):
+    implements = [UrlResolver, PluginSettings]
+    name = 'zstream.to'
+    domains = [ 'zstream.to' ]
+    pattern = '(?://|\.)(zstream\.to)/(?:embed-)?([0-9a-zA-Z]+)'
+
+    def __init__(self):
+        p = self.get_setting('priority') or 100
+        self.priority = int(p)
+        self.net = Net()
+
+    def get_media_url(self, host, media_id):
+        web_url = self.get_url(host, media_id)
+
+        html = self.net.http_GET(web_url).content
+
+        stream_url = re.compile('file *: *"(http.+?)"').findall(html)
+        stream_url = [i for i in stream_url if not i.endswith('.srt')]
+
+        if stream_url:
+            return stream_url[-1]
+            
+        raise UrlResolver.ResolverError('File Not Found or removed')
+
+    def get_url(self, host, media_id):
+        return 'http://zstream.to/embed-%s.html' % media_id
+
+    def get_host_and_id(self, url):
+        r = re.search(self.pattern, url)
+        if r:
+            return r.groups()
+        else:
+            return False
+
+    def valid_url(self, url, host):
+        return re.search(self.pattern, url) or self.name in host
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/types.py b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/types.py
index 16079da230c994db95619273741ce3f6b1204340..b3f52d30108bff1ad8b55b87bed4c0a623106bd4 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/types.py
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/lib/urlresolver/types.py
@@ -20,7 +20,9 @@ from urlparse import urlparse
 from urlresolver import common
 from plugnplay.interfaces import UrlResolver
 from plugnplay.interfaces import SiteAuth
-import re, sys
+import re
+import sys
+import urllib
 import traceback
 
 class HostedMediaFile:
@@ -162,17 +164,20 @@ class HostedMediaFile:
                             self._valid_url = True
                             return stream_url
                     except UrlResolver.ResolverError as e:
-                        common.addon.log_error('Resolver Error: %s - %s - %s' % (e, resolver.name, self._url))
-                        common.addon.log_debug(traceback.format_exc())
-                        return UrlResolver.unresolvable(code=0, msg=e)
+                        common.addon.log_error('Resolver Error - From: %s Link: %s: %s' % (resolver.name, self._url, e))
+                        if resolver == self.__resolvers[-1]:
+                            common.addon.log_debug(traceback.format_exc())
+                            return UrlResolver.unresolvable(code=0, msg=e)
                     except urllib2.HTTPError as e:
-                        common.addon.log_error('HTTP Error: %s - %s - %s' % (e.code, resolver.name, self._url))
-                        common.addon.log_debug(traceback.format_exc())
-                        return UrlResolver.unresolvable(code=3, msg=e)
+                        common.addon.log_error('HTTP Error - From: %s Link: %s: %s' % (resolver.name, self._url, e))
+                        if resolver == self.__resolvers[-1]:
+                            common.addon.log_debug(traceback.format_exc())
+                            return UrlResolver.unresolvable(code=3, msg=e)
                     except Exception as e:
-                        common.addon.log_error('Unknown Error: %s - %s - %s' % (e, resolver.name, self._url))
-                        common.addon.log_error(traceback.format_exc())
-                        return UrlResolver.unresolvable(code=0, msg=e)
+                        common.addon.log_error('Unknown Error - From: %s Link: %s: %s' % (resolver.name, self._url, e))
+                        if resolver == self.__resolvers[-1]:
+                            common.addon.log_error(traceback.format_exc())
+                            return UrlResolver.unresolvable(code=0, msg=e)
             except Exception as e:
                 common.addon.log_notice("Resolver '%s' crashed: %s. Ignoring" % (resolver.name, e))
                 common.addon.log_debug(traceback.format_exc())
@@ -213,11 +218,13 @@ class HostedMediaFile:
         Returns True if the stream_url gets a non-failure http status (i.e. <400) back from the server
         otherwise return False
         
-        Intended to catch stream urls returned by resolvers that would fail to playback 
+        Intended to catch stream urls returned by resolvers that would fail to playback
         '''
         # parse_qsl doesn't work because it splits elements by ';' which can be in a non-quoted UA
         try: headers = dict([item.split('=') for item in (stream_url.split('|')[1]).split('&')])
         except: headers = {}
+        for header in headers:
+            headers[header] = urllib.unquote(headers[header])
         common.addon.log_debug('Setting Headers on UrlOpen: %s' % (headers))
     
         request = urllib2.Request(stream_url.split('|')[0], headers=headers)
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/images/DialogBack2.png b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/images/DialogBack2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f599269b4bdb83c1a3b91a782dfb9a9812a586a
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/images/DialogBack2.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/images/checked.png b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/images/checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a3ba00689635ebfef68d2703e11021f93a80764
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/images/checked.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/settings.xml
index 3a19c87dad8464019fbc02b822b2f533d3ea662a..b555404b754fade15789f58e84cda5ce5a4d8310 100644
--- a/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/settings.xml
+++ b/packages/mediacenter/kodi/config/base-addons/script.module.urlresolver/resources/settings.xml
@@ -2,6 +2,7 @@
 <settings>
 <category label="URLResolver">
 	<setting default="true" id="allow_universal" label="Enable Universal Resolvers" type="bool"/>
+	<setting id="personal_nid" label="Your NID" type="text" visible="false"/>
 </category>
 <category label="Universal Resolvers">
 	<setting label="AllDebrid" type="lsep"/>
@@ -33,11 +34,15 @@
 	<setting default="false" id="RPnetResolver_login" label="Login" type="bool"/>
 	<setting default="" enable="eq(-1,true)" id="RPnetResolver_username" label="username" type="text"/>
 	<setting default="" enable="eq(-2,true)" id="RPnetResolver_password" label="password" option="hidden" type="text"/>
+	<setting label="Simply-Debrid" type="lsep"/>
+	<setting default="100" id="SimplyDebridResolver_priority" label="Priority" type="number"/>
+	<setting default="true" id="SimplyDebridResolver_enabled" label="Enabled" type="bool"/>
+	<setting default="0" id="SimplyDebridResolver_last_login" type="number" visible="false"/>
+	<setting default="false" id="SimplyDebridResolver_login" label="login" type="bool"/>
+	<setting default="" enable="eq(-1,true)" id="SimplyDebridResolver_username" label="Username" type="text"/>
+	<setting default="" enable="eq(-2,true)" id="SimplyDebridResolver_password" label="Password" option="hidden" type="text"/>
 </category>
 <category label="Resolvers 1">
-	<setting label="180upload" type="lsep"/>
-	<setting default="100" id="OneeightyuploadResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="OneeightyuploadResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="24uploading" type="lsep"/>
 	<setting default="100" id="TwentyFourUploadingResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="TwentyFourUploadingResolver_enabled" label="Enabled" type="bool"/>
@@ -50,9 +55,6 @@
 	<setting label="auengine.com" type="lsep"/>
 	<setting default="100" id="AuEngineResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="AuEngineResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="bayfiles" type="lsep"/>
-	<setting default="100" id="BayfilesResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="BayfilesResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="bestreams" type="lsep"/>
 	<setting default="100" id="BestreamsResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="BestreamsResolver_enabled" label="Enabled" type="bool"/>
@@ -74,9 +76,6 @@
 	<setting label="crunchyroll" type="lsep"/>
 	<setting default="100" id="CrunchyRollResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="CrunchyRollResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="cyberlocker" type="lsep"/>
-	<setting default="100" id="CyberlockerResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="CyberlockerResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="daclips" type="lsep"/>
 	<setting default="100" id="DaclipsResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="DaclipsResolver_enabled" label="Enabled" type="bool"/>
@@ -87,18 +86,12 @@
 	<setting label="divxstage" type="lsep"/>
 	<setting default="100" id="DivxstageResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="DivxstageResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="donevideo" type="lsep"/>
-	<setting default="100" id="DonevideoResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="DonevideoResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="ecostream" type="lsep"/>
 	<setting default="100" id="EcostreamResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="EcostreamResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="exashare" type="lsep"/>
 	<setting default="100" id="ExashareResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="ExashareResolver_enabled" label="Enabled" type="bool"/>
-	<setting default="false" id="ExashareResolver_login" label="Login" type="bool"/>
-	<setting default="" enable="eq(-1,true)" id="ExashareResolver_username" label="     username" type="text"/>
-	<setting default="" enable="eq(-2,true)" id="ExashareResolver_password" label="     password" option="hidden" type="text"/>
 	<setting label="facebook" type="lsep"/>
 	<setting default="100" id="FacebookResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="FacebookResolver_enabled" label="Enabled" type="bool"/>
@@ -112,8 +105,7 @@
 	<setting label="filepup" type="lsep"/>
 	<setting default="100" id="FilePupResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="FilePupResolver_enabled" label="Enabled" type="bool"/>
-</category>
-<category label="Resolvers 2">
+	<setting default="false" id="FilePupResolver_auto_pick" label="Automatically pick best quality" type="bool" visible="true"/>
 	<setting label="flashx" type="lsep"/>
 	<setting default="100" id="FlashxResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="FlashxResolver_enabled" label="Enabled" type="bool"/>
@@ -128,33 +120,26 @@
 	<setting label="grifthost" type="lsep"/>
 	<setting default="100" id="GrifthostResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="GrifthostResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="hostingbulk" type="lsep"/>
-	<setting default="100" id="HostingBulkResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="HostingBulkResolver_enabled" label="Enabled" type="bool"/>
+</category>
+<category label="Resolvers 2">
 	<setting label="hugefiles" type="lsep"/>
 	<setting default="100" id="HugefilesResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="HugefilesResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="jumbofiles" type="lsep"/>
-	<setting default="100" id="JumbofilesResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="JumbofilesResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="justmp4.com" type="lsep"/>
-	<setting default="100" id="Justmp4Resolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="Justmp4Resolver_enabled" label="Enabled" type="bool"/>
+	<setting label="ipithos.to" type="lsep"/>
+	<setting default="100" id="IpithosResolver_priority" label="Priority" type="number"/>
+	<setting default="true" id="IpithosResolver_enabled" label="Enabled" type="bool"/>
+	<setting label="ishared.eu" type="lsep"/>
+	<setting default="100" id="IsharedResolver_priority" label="Priority" type="number"/>
+	<setting default="true" id="IsharedResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="KingFiles" type="lsep"/>
 	<setting default="100" id="KingFilesResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="KingFilesResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="letwatch.us" type="lsep"/>
 	<setting default="100" id="LetwatchResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="LetwatchResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="limevideo" type="lsep"/>
-	<setting default="100" id="LimevideoResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="LimevideoResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="mail.ru" type="lsep"/>
 	<setting default="100" id="MailRuResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="MailRuResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="mega-vids" type="lsep"/>
-	<setting default="100" id="MegaVidsResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="MegaVidsResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="mightyupload" type="lsep"/>
 	<setting default="100" id="MightyuploadResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="MightyuploadResolver_enabled" label="Enabled" type="bool"/>
@@ -170,29 +155,15 @@
 	<setting label="movshare" type="lsep"/>
 	<setting default="100" id="MovshareResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="MovshareResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="movzap|zuzvideo" type="lsep"/>
-	<setting default="100" id="MovzapZuzVideoResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="MovzapZuzVideoResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="mp4edge.com" type="lsep"/>
 	<setting default="100" id="Mp4EdgeResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="Mp4EdgeResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="mp4star" type="lsep"/>
-	<setting default="100" id="MP4StarResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="MP4StarResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="mp4stream" type="lsep"/>
 	<setting default="100" id="Mp4streamResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="Mp4streamResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="mp4upload" type="lsep"/>
 	<setting default="100" id="Mp4uploadResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="Mp4uploadResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="mrfile" type="lsep"/>
-	<setting default="100" id="MrFileResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="MrFileResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="muchshare" type="lsep"/>
-	<setting default="100" id="MuchshareResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="MuchshareResolver_enabled" label="Enabled" type="bool"/>
-</category>
-<category label="Resolvers 3">
 	<setting label="nosvideo" type="lsep"/>
 	<setting default="100" id="NosvideoResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="NosvideoResolver_enabled" label="Enabled" type="bool"/>
@@ -202,6 +173,10 @@
 	<setting label="nowvideo" type="lsep"/>
 	<setting default="100" id="NowvideoResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="NowvideoResolver_enabled" label="Enabled" type="bool"/>
+	<setting label="ok.ru" type="lsep"/>
+	<setting default="100" id="OKResolver_priority" label="Priority" type="number"/>
+	<setting default="true" id="OKResolver_enabled" label="Enabled" type="bool"/>
+	<setting default="false" id="OKResolver_auto_pick" label="Automatically pick best quality" type="bool" visible="true"/>
 	<setting label="openload" type="lsep"/>
 	<setting default="100" id="OpenLoadResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="OpenLoadResolver_enabled" label="Enabled" type="bool"/>
@@ -224,16 +199,15 @@
 	<setting default="" enable="eq(-1,true)" id="PurevidResolver_username" label="     username" type="text"/>
 	<setting default="" enable="eq(-2,true)" id="PurevidResolver_password" label="     password" option="hidden" type="text"/>
 	<setting default="Maximum" id="PurevidResolver_quality" label="Video quality" type="labelenum" values="FLV|Maximum"/>
+</category>
+<category label="Resolvers 3">
 	<setting label="This plugin calls the Purevid urlresolver - change settings there." type="lsep"/>
-	<setting label="rapidvideo" type="lsep"/>
+	<setting label="rapidvideo.ws" type="lsep"/>
 	<setting default="100" id="RapidVideoResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="RapidVideoResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="Realvid" type="lsep"/>
-	<setting default="100" id="RealvidResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="RealvidResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="royalvids" type="lsep"/>
-	<setting default="100" id="RoyalvidsResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="RoyalvidsResolver_enabled" label="Enabled" type="bool"/>
+	<setting label="shared2.me" type="lsep"/>
+	<setting default="100" id="Shared2meResolver_priority" label="Priority" type="number"/>
+	<setting default="true" id="Shared2meResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="sharedsx" type="lsep"/>
 	<setting default="100" id="SharedsxResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="SharedsxResolver_enabled" label="Enabled" type="bool"/>
@@ -243,41 +217,21 @@
 	<setting label="sharesix" type="lsep"/>
 	<setting default="100" id="SharesixResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="SharesixResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="sharevid" type="lsep"/>
-	<setting default="100" id="ShareVidResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="ShareVidResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="sockshare" type="lsep"/>
-	<setting default="100" id="SockshareResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="SockshareResolver_enabled" label="Enabled" type="bool"/>
-	<setting default="0" id="SockshareResolver_quality" label="Highest Quality" type="enum" values="FLV|Maximum"/>
-	<setting default="false" id="SockshareResolver_login" label="login" type="bool"/>
-	<setting default="" enable="eq(-1,true)" id="SockshareResolver_username" label="username" type="text"/>
-	<setting default="" enable="eq(-2,true)" id="SockshareResolver_password" label="password" option="hidden" type="text"/>
-	<setting default="false" id="SockshareResolver_notify" label="Notify on login" type="bool"/>
 	<setting label="speedvideo" type="lsep"/>
 	<setting default="100" id="SpeedVideoResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="SpeedVideoResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="stagevu" type="lsep"/>
 	<setting default="100" id="StagevuResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="StagevuResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="stream2k.tv" type="lsep"/>
-	<setting default="100" id="Stream2kResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="Stream2kResolver_enabled" label="Enabled" type="bool"/>
-	<setting default="false" id="Stream2kResolver_auto_pick" label="Automatically pick best quality" type="bool" visible="true"/>
 	<setting label="streamcloud" type="lsep"/>
 	<setting default="100" id="StreamcloudResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="StreamcloudResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="streaminto" type="lsep"/>
 	<setting default="100" id="StreamintoResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="StreamintoResolver_enabled" label="Enabled" type="bool"/>
-</category>
-<category label="Resolvers 4">
 	<setting label="teramixer" type="lsep"/>
 	<setting default="100" id="TeramixerResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="TeramixerResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="thefile" type="lsep"/>
-	<setting default="100" id="TheFileResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="TheFileResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="thevideo" type="lsep"/>
 	<setting default="100" id="TheVideoResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="TheVideoResolver_enabled" label="Enabled" type="bool"/>
@@ -300,16 +254,12 @@
 	<setting label="uploadc" type="lsep"/>
 	<setting default="100" id="UploadcResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="UploadcResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="uploadcrazy.net" type="lsep"/>
-	<setting default="100" id="UploadCrazyResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="UploadCrazyResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="uploadx" type="lsep"/>
 	<setting default="100" id="UploadXResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="UploadXResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="uptobox" type="lsep"/>
 	<setting default="100" id="UpToBoxResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="UpToBoxResolver_enabled" label="Enabled" type="bool"/>
-	<setting default="false" id="UpToBoxResolver_auto_pick" label="Automatically pick best quality" type="bool" visible="true"/>
 	<setting label="userscloud" type="lsep"/>
 	<setting default="100" id="UsersCloudResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="UsersCloudResolver_enabled" label="Enabled" type="bool"/>
@@ -322,13 +272,14 @@
 	<setting label="veoh" type="lsep"/>
 	<setting default="100" id="VeohResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VeohResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="This plugin calls the veoh addon - change settings there." type="lsep"/>
 	<setting label="vid.ag" type="lsep"/>
 	<setting default="100" id="VidAgResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidAgResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="vid.gg" type="lsep"/>
 	<setting default="100" id="VidggResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidggResolver_enabled" label="Enabled" type="bool"/>
+</category>
+<category label="Resolvers 4">
 	<setting label="vid.me" type="lsep"/>
 	<setting default="100" id="VidMeResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidMeResolver_enabled" label="Enabled" type="bool"/>
@@ -338,81 +289,41 @@
 	<setting label="vidcrazy.net" type="lsep"/>
 	<setting default="100" id="VidCrazyResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidCrazyResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="video44.net" type="lsep"/>
-	<setting default="100" id="Video44Resolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="Video44Resolver_enabled" label="Enabled" type="bool"/>
-	<setting label="videobb" type="lsep"/>
-	<setting default="100" id="VideobbResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VideobbResolver_enabled" label="Enabled" type="bool"/>
-	<setting default="2" id="VideobbResolver_q" label="Highest Quality" type="enum" values="240p|480p|Maximum"/>
-	<setting label="videoboxone.com" type="lsep"/>
-	<setting default="100" id="VideoBoxOneResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VideoBoxOneResolver_enabled" label="Enabled" type="bool"/>
-</category>
-<category label="Resolvers 5">
-	<setting label="videofun.me" type="lsep"/>
-	<setting default="100" id="VideoFunResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VideoFunResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="videohut.to" type="lsep"/>
 	<setting default="100" id="VideoHutResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VideoHutResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="videomega" type="lsep"/>
 	<setting default="100" id="VideoMegaResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VideoMegaResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="videoraj.ch" type="lsep"/>
-	<setting default="100" id="VideorajResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VideorajResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="videotanker" type="lsep"/>
-	<setting default="100" id="VideoTankerResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VideoTankerResolver_enabled" label="Enabled" type="bool"/>
-	<setting default="1" id="VideoTankerResolver_quality" label="Video Quality" type="enum" values="High|Medium|Low"/>
 	<setting label="videott" type="lsep"/>
 	<setting default="100" id="VideoTTResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VideoTTResolver_enabled" label="Enabled" type="bool"/>
 	<setting default="2" id="VideoTTResolver_quality" label="Video Quality" type="enum" values="Low|Medium|High"/>
-	<setting label="videovalley.net" type="lsep"/>
-	<setting default="100" id="VideoValleyResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VideoValleyResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="videoweed.es" type="lsep"/>
 	<setting default="100" id="VideoweedResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VideoweedResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="videowood" type="lsep"/>
 	<setting default="100" id="VideowoodResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VideowoodResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="videozed" type="lsep"/>
-	<setting default="100" id="VideozedResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VideozedResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="vidlockers" type="lsep"/>
 	<setting default="100" id="VidlockersResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidlockersResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="vidplay" type="lsep"/>
-	<setting default="100" id="VidplayResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VidplayResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="vidspot" type="lsep"/>
 	<setting default="100" id="VidSpotResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidSpotResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="vidstream" type="lsep"/>
-	<setting default="100" id="VidstreamResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VidstreamResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="vidto" type="lsep"/>
 	<setting default="100" id="VidtoResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidtoResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="vidup" type="lsep"/>
 	<setting default="100" id="VidUpResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidUpResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="vidxden" type="lsep"/>
-	<setting default="100" id="VidxdenResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VidxdenResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="vidzi" type="lsep"/>
 	<setting default="100" id="VidziResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VidziResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="vidzur.com" type="lsep"/>
-	<setting default="100" id="VidzurResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="VidzurResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="vimeo" type="lsep"/>
 	<setting default="100" id="VimeoResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VimeoResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="This plugin calls the vimeo addon - change settings there." type="lsep"/>
+	<setting default="2" id="VimeoResolver_quality" label="Video Quality" type="enum" values="Low|Medium|High"/>
 	<setting label="vivosx" type="lsep"/>
 	<setting default="100" id="VivosxResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VivosxResolver_enabled" label="Enabled" type="bool"/>
@@ -427,20 +338,12 @@
 	<setting label="vodlocker.com" type="lsep"/>
 	<setting default="100" id="VodlockerResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VodlockerResolver_enabled" label="Enabled" type="bool"/>
-</category>
-<category label="Resolvers 6">
 	<setting label="vshare" type="lsep"/>
 	<setting default="100" id="VshareResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VshareResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="vshare.eu" type="lsep"/>
 	<setting default="100" id="VshareEuResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="VshareEuResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="watchfreeinhd" type="lsep"/>
-	<setting default="100" id="WatchFreeResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="WatchFreeResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="xfileload" type="lsep"/>
-	<setting default="100" id="XFileLoadResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="XFileLoadResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="xvidstage" type="lsep"/>
 	<setting default="100" id="XvidstageResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="XvidstageResolver_enabled" label="Enabled" type="bool"/>
@@ -451,14 +354,19 @@
 	<setting default="100" id="YoutubeResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="YoutubeResolver_enabled" label="Enabled" type="bool"/>
 	<setting label="This plugin calls the youtube addon - change settings there." type="lsep"/>
-	<setting label="youwatch" type="lsep"/>
+	<setting label="youwatch.org" type="lsep"/>
 	<setting default="100" id="YouWatchResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="YouWatchResolver_enabled" label="Enabled" type="bool"/>
-	<setting label="zalaa" type="lsep"/>
-	<setting default="100" id="ZalaaResolver_priority" label="Priority" type="number"/>
-	<setting default="true" id="ZalaaResolver_enabled" label="Enabled" type="bool"/>
+</category>
+<category label="Resolvers 5">
 	<setting label="zerocast" type="lsep"/>
 	<setting default="100" id="ZeroCastResolver_priority" label="Priority" type="number"/>
 	<setting default="true" id="ZeroCastResolver_enabled" label="Enabled" type="bool"/>
+	<setting label="zettahost.tv" type="lsep"/>
+	<setting default="100" id="ZettahostResolver_priority" label="Priority" type="number"/>
+	<setting default="true" id="ZettahostResolver_enabled" label="Enabled" type="bool"/>
+	<setting label="zstream.to" type="lsep"/>
+	<setting default="100" id="ZstreamResolver_priority" label="Priority" type="number"/>
+	<setting default="true" id="ZstreamResolver_enabled" label="Enabled" type="bool"/>
 </category>
 </settings>
diff --git a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/dateutil/__init__.pyo b/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/dateutil/__init__.pyo
deleted file mode 100644
index 152f1e7e91656d93eeee9753fcb939ede6646732..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/dateutil/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/dateutil/tz.pyo b/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/dateutil/tz.pyo
deleted file mode 100644
index ecbc92469c8697dd2cc0999169b227091fb74dba..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/dateutil/tz.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/default.pyo b/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/default.pyo
deleted file mode 100644
index a7aea3aaaa6b874e290a513ffc78a945b4d9dc76..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/default.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/country_lookup.pyo b/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/country_lookup.pyo
deleted file mode 100644
index 4c3d3ac022978e0a1ed9e6752e2be0912290e293..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/country_lookup.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/fanarttv.pyo b/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/fanarttv.pyo
deleted file mode 100644
index 0c75157ab6fb39ce5eee4d324147a08066d94ff3..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/fanarttv.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/thetvdbapi.pyo b/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/thetvdbapi.pyo
deleted file mode 100644
index b24a1af48a8fc56a06c4e909676359ce26c8b469..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/script.tv.show.next.aired/resources/lib/thetvdbapi.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/addon.xml b/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/addon.xml
index 094807e54a15745a6bff0dc4c1add0dbcb165aa7..31758864fdf19ede0ec95a9974f2c9b81fe97fca 100644
--- a/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/addon.xml
+++ b/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/addon.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<addon id="service.library.data.provider" name="Library Data Provider" provider-name="BigNoid, Martijn" version="0.1.3">
+<addon id="service.library.data.provider" name="Library Data Provider" provider-name="BigNoid, Martijn" version="0.1.4">
 	<requires>
 		<import addon="xbmc.addon" version="12.0.0"/>
 		<import addon="xbmc.json" version="6.0.0"/>
diff --git a/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/changelog.txt b/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/changelog.txt
index e76c34bb558ffbc2736fee669916d870b703fa7a..1e09cb61615e66af419959a4759c1a3c3959fd71 100644
--- a/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/changelog.txt
+++ b/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/changelog.txt
@@ -1,3 +1,6 @@
+[B]0.1.3[/B]
+- Added missing 'director" property for recommended episodes.
+
 [B]0.1.3[/B]
 - Fixed bug in recommended episodes.
 
diff --git a/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/library.py b/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/library.py
index e31a8b58110a6e7fdc9c855fff9a38921a37b2a6..c337495634fb98113ade05dbe60b9662f28b106c 100644
--- a/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/library.py
+++ b/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/library.py
@@ -117,6 +117,7 @@ class LibraryFunctions():
                             "streamdetails",
                             "firstaired",
                             "runtime",
+                            "director",
                             "writer",
                             "cast",
                             "dateadded",
diff --git a/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/library.pyo b/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/library.pyo
deleted file mode 100644
index 59926e3e020bba22b926716febf2e090e7cb7c95..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/base-addons/service.library.data.provider/library.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/LICENSE.txt b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ab123ffca1d65a0109e078340fc761a22cd3279c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/LICENSE.txt
@@ -0,0 +1,282 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+-------------------------------------------------------------------------
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/README.md b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..1442d6f532aa06d6624bcdf151cf89558fb51d1b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/README.md
@@ -0,0 +1,6 @@
+XBMC Versioncheck
+=========================
+
+This service checks the installed XBMC version against the next available one and notifies you if there is a new version available.
+When a new version comes out the versions.txt should be updated to reflect the latest version available.
+When updating the version.txt always put latest release at the top since the list is read in chronilogical order.
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/addon.xml b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0765ddcac1ed30af2bb98bf06a10d9f18427f641
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/addon.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="service.xbmc.versioncheck"
+       name="Version Check"
+      version="0.3.16"
+      provider-name="Team Kodi">
+    <requires>
+        <import addon="xbmc.python" version="2.1.0"/>
+    </requires>
+    <extension point="xbmc.service" library="service.py" start="login"/>
+    <extension point="xbmc.addon.metadata">
+        <summary lang="be">Kodi Version Check checks if you are running latest released version.</summary>
+        <summary lang="bg">Проверява дали ползвате най-новата версия на Kodi.</summary>
+        <summary lang="ca">Kodi Version Check comprova si està utilitzant la última versió publicada.</summary>
+        <summary lang="cs">Kontrola verze Kodi, zkontroluje, zda používáte nejnovější vydanou verzi.</summary>
+        <summary lang="da">Kodi undersøger om du benytter den nyeste version.</summary>
+        <summary lang="de">Kodi Versionsprüfung prüft, ob die neuste Version von Kodi installiert ist.</summary>
+        <summary lang="el">Ο Έλεγχος Έκδοσης Kodi εξετάζει αν έχετε την πιο πρόσφατη έκδοση του προγράμματος.</summary>
+        <summary lang="en">Kodi Version Check checks if you are running latest released version.</summary>
+        <summary lang="en_NZ">Kodi Version Check checks if you are running latest released version.</summary>
+        <summary lang="en_US">Kodi Version Check checks if you are running latest released version.</summary>
+        <summary lang="es">Kodi Version Check comprueba si está ejecutando la última versión de Kodi.</summary>
+        <summary lang="es_MX">Comprobador de Version de Kodi  comprueba si se esta ejecutando ultima version publicada.</summary>
+        <summary lang="fi">Kodi Version Check tarkistaa onko käyttämäsi uusin versio.</summary>
+        <summary lang="fr">Le contrôle de version de Kodi vérifie si la dernière version sortie est utilisée.</summary>
+        <summary lang="fr_CA">Le contrôleur de version Kodi vérifie si vous utilisez la dernière version parue.</summary>
+        <summary lang="gl">Kodi Version Check verifica se está a executar a última versión.</summary>
+        <summary lang="he">בודק גרסת Kodi מוודא אם אתה מריץ את הגרסה הרשמית האחרונה.</summary>
+        <summary lang="hr">Kodi provjeritelj inačice provjerava imate li posljednju inačicu izdanja.</summary>
+        <summary lang="hu">Az Kodi verzió ellenőrző megvizsgálja, hogy a legújabb kiadást futtatja-e.</summary>
+        <summary lang="id">Kodi Version Check mengecek apakah Anda menggunakan versi rilis terbaru.</summary>
+        <summary lang="is">Kodi Version Check athugar hvort þú sért að keyra nýjustu viðurkennda útgáfu.</summary>
+        <summary lang="it">Kodi Version Check verifica se hai l'ultima versione rilasciata</summary>
+        <summary lang="ko">Kodi Version Checks는 최신 정식 릴리즈 버전을 사용중인지 검사해줍니다.</summary>
+        <summary lang="lt">Kodi Version Check patikrina ar naudojate naujausią versiją.</summary>
+        <summary lang="nl">Kodi versie-check controleert of je de laatst beschikbare versie hebt.</summary>
+        <summary lang="no">Kodi Versjonsettersyn sjekker om du kjører den sist utgitte versjonen.</summary>
+        <summary lang="pl">Dodatek Version Check sprawdza czy używasz najnowszej wersji Kodi.</summary>
+        <summary lang="pt">O Kodi Version Check verifica se a sua versão de lançamento do Kodi está actualizada.</summary>
+        <summary lang="pt_BR">Kodi Version Check verifica se você está executando a versão mais recente.</summary>
+        <summary lang="ro">Verificare versiune Kodi verifică dacă folosiți ultima versiune lansată.</summary>
+        <summary lang="ru">Kodi Version Check проверяет если вы используете последнюю версию</summary>
+        <summary lang="sk">Kodi Kontrola verzií overuje, či používate najnovšiu vydanú verziu.</summary>
+        <summary lang="sl">Preverjanje različice Kodi preveri, če imate nameščeno nazadnje izdano različico.</summary>
+        <summary lang="sv">Kodi Version Check kontrollerar om du använder den senaste versionen.</summary>
+        <summary lang="tr">Kodi Sürüm Kontrol yayınlanmış son sürümü kullanıp kullanmadığınızı kontrol eder.</summary>
+        <summary lang="zh">Kodi 版本检查检查你使用的是否为最新发布的版本。</summary>
+        <description lang="be">Kodi Version Check only supports a number of platforms/distros as releases may differ between them. For more information visit the kodi.tv website.</description>
+        <description lang="bg">Kodi Version Check поддържа няколко платформи/дистрибуции. За повече информация посетете страницата www.kodi.tv</description>
+        <description lang="ca">Kodi Version Check només és compatible amb una sèrie de plataformes / distribucions ja que les ultimes versions poden ser diferents entre elles. Per obtenir més informació, visiteu el lloc web kodi.tv.</description>
+        <description lang="cs">Kontrola verze Kodi podporuje pouze několik platforem/distribucí a verze mezi nimi se můžou lišit. Pro více informací navštivte webové stránky kodi.tv.</description>
+        <description lang="da">Kodi kan kun undersøge for opdateringer for visse platforme/udgaver, da der kan være forskel. For mere information, besøg kodi.tv.</description>
+        <description lang="de">Kodi Versionsprüfung unterstützt nur ein paar Plattformen/Distributionen, da sich die jeweiligen Veröffentlichungen unterscheiden können. Für weitere Informationen besuchen Sie die kodi.tv-Webseite.</description>
+        <description lang="el">Ο Έλεγχος Έκδοσης Kodi υποστηρίζει μόνο ορισμένα λειτουργικά συστήματα/διανομές, καθώς οι εκδόσεις διαφέρουν για το καθένα. Για περισσότερες πληροφορίες επισκεφθείτε το kodi.tv</description>
+        <description lang="en">Kodi Version Check only supports a number of platforms/distros as releases may differ between them. For more information visit the kodi.tv website.</description>
+        <description lang="en_NZ">Kodi Version Check only supports a number of platforms/distros as releases may differ between them. For more information visit the kodi.tv website.</description>
+        <description lang="en_US">Kodi Version Check only supports a number of platforms/distros as releases may differ between them. For more information visit the kodi.tv website.</description>
+        <description lang="es">Kodi Version Check solo soporta un número limitado de plataformas/distribuciones, ya que los lanzamientos pueden diferir entre ellos. Para más información, visite la web de kodi.tv.</description>
+        <description lang="fi">Kodi Version Check tukee vain joitain alustoja/distroja koska julkaisut saattavat poiketa toisistaan. Saadaksesi lisätietoa, vieraile kodi.tv:ssä.</description>
+        <description lang="fr">Le contrôle de version de Kodi ne prend en charge qu'un certain nombre de plate-formes/distributions car les versions peuvent varier entre elles. Pour plus d'informations, consulter le site Web kodi.tv.</description>
+        <description lang="fr_CA">Le contrôleur de version Kodi ne prend en charge qu'un certain nombre de plate-formes/distributions car les versions peuvent varier entre elles. Pour plus d'informations, visitez le site Web kodi.tv.</description>
+        <description lang="gl">Kodi Version Check só soporta un número limitado de plataformas/distribucións, xa que os lanzamentos poden diferir entre eles. Para máis información visitar o sitio web de kodi.tv.</description>
+        <description lang="he">בודק גרסת Kodi תומך רק במספר פלטפורמות/הפצות מאחר שסימון הגרסאות שונה בין אחת לשניה. למידע נוסף בקר באתר kodi.tv.</description>
+        <description lang="hr">Kodi provjeritelj inačice samo podržava broj platformi/distribucija koliko to dopuštaju pojedina izdanja. Za više informacija posjetite kodi.tv web stranicu.</description>
+        <description lang="hu">Az Kodi verzió-ellenőrző csak néhány platformot / disztribúciót támogat, mert a kiadások között különbségek lehetnek. További információkért keresse fel az kodi.tv oldalt.</description>
+        <description lang="id">Kodi Version Check hanya mendukung beberapa platform/distro karena rilisnya mungkin berbeda-beda. Untuk informasi lebih lanjut kunjungi situs kodi.tv.</description>
+        <description lang="it">Kodi Version Check supporta un numero di piattaforme e distribuzioni diverse tra loro. Per più informazioni visita il sito kodi.tv</description>
+        <description lang="ko">Kodi Versio Check는 일부 플랫폼/배포본만을 지원합니다. 자세한 정보는 kodi.tv 웹사이트에서 확인하세요</description>
+        <description lang="lt">Kodi Version Check palaiko tik kelias platformas/distribucijas, nes leidimai tarp jų gali skirtis. Norėdami gauti daugiau informacijos, apsilankykite Kodi.tv puslapyje.</description>
+        <description lang="nl">Kodi versie check ondersteunt alleen een aantal platforms/distro`s omdat uitgaven verschillen tussen hen. Voor meer informatie bezoek de kodi.tv website.</description>
+        <description lang="no">Kodi Versjonsettersyn støtter kun noen plattformer/distribusjoner fordi utgivelser kan være forskjellige mellom dem. Besøk kodi.tv for mer informasjon.</description>
+        <description lang="pl">Dodatek Version Check wspiera tylko część platform i dystrybucji. Więcej informacji na stronie kodi.tv</description>
+        <description lang="pt">O Kodi Version Check suporta apenas algumas plataformas/distribuições, porque os lançamentos podem não ser sempre idênticos. Para mais informação, visite o site kodi.tv.</description>
+        <description lang="pt_BR">Verificador de versões do Kodi somente suporta algumas plataformas/distros em que os lançamentos podem diferenciar entre si. Para maiores informações visite o website kodi.tv.</description>
+        <description lang="ru">Проверка новых версий Kodi поддерживается только на ряде платформ/дистрибутивов и они могут различаться между собой. Для получения доп. информации посетите сайт kodi.tv</description>
+        <description lang="sl">Preverjanje različice Kodi podpira le nekatere platforme/distribucije, saj se izdaje med njimi lahko zelo razlikujejo. Za več informacij obiščite spletišče kodi.tv</description>
+        <description lang="sv">Kodi Version Check stöder endeast ett antal plattformar/distributioner eftersom utgivningar kan skilja mellan dessa. För mer information besök kodi.tv webplatsen.</description>
+        <description lang="tr">Kodi Sürüm Kontrol sürümler arasında değişiklik olduğu için sadece birkaç platform/dağıtım destekler. Daha fazla bilgi için kodi.tv web sitesini ziyaret edin.</description>
+        <description lang="zh">Kodi 版本检查只支持部分平台/发行版，它们之间的版本可能会有所不同。欲了解更多信息，请访问 kodi.tv 网站。</description>
+        <disclaimer lang="be">Feel free to use this script. For information visit kodi.tv</disclaimer>
+        <disclaimer lang="bg">Ползвайте скрипта свободно. За повече информация посетете www.kodi.tv</disclaimer>
+        <disclaimer lang="ca">Sigues lliure d'utilitzar aquest script. Per més informació visita kodi.tv</disclaimer>
+        <disclaimer lang="cs">Neváhejte použít tento skript. Pro více informací navštivte kodi.tv</disclaimer>
+        <disclaimer lang="da">Du er velkommen til at bruge dette script. For information, besøg kodi.tv</disclaimer>
+        <disclaimer lang="de">Zögern Sie nicht, dieses Skript zu verwenden. Für Informationen besuchen Sie kodi.tv</disclaimer>
+        <disclaimer lang="el">Χρησιμοποιήστε αυτό το script ελεύθερα. Για πληροφορίες επισκεφθείτε το kodi.tv</disclaimer>
+        <disclaimer lang="en">Feel free to use this script. For information visit kodi.tv</disclaimer>
+        <disclaimer lang="en_NZ">Feel free to use this script. For information visit kodi.tv</disclaimer>
+        <disclaimer lang="en_US">Feel free to use this script. For information visit kodi.tv</disclaimer>
+        <disclaimer lang="es">Puede usar libremente este programa. Para más información, visite kodi.tv</disclaimer>
+        <disclaimer lang="es_MX">Sientase libre de utilizar este script. Para mas información visita kodi.tv</disclaimer>
+        <disclaimer lang="fr">Utiliser ce script si désiré. Pour plus d'informations, consulter le site kodi.tv</disclaimer>
+        <disclaimer lang="fr_CA">N'hésitez pas à utiliser ce script. Pour plus d'informations visitez kodi.tv</disclaimer>
+        <disclaimer lang="gl">Síntase libre de usar este script, para máis información visitar kodi.tv.</disclaimer>
+        <disclaimer lang="he">תרגיש חופשי להשתמש בסקריפט זה. למידע נוסף בקר ב-kodi.tv</disclaimer>
+        <disclaimer lang="hr">Slobodno koristite ovu skriptu. Za više informacija posjetite kodi.tv</disclaimer>
+        <disclaimer lang="hu">Használja bátran ezt a szkriptet! Információkért keresse fel az kodi.tv oldalt!</disclaimer>
+        <disclaimer lang="id">Jangan sungkan menggunakan script ini. Untuk informasi hubungi kodi.tv</disclaimer>
+        <disclaimer lang="it">Usa liberamente lo script. Per informazioni visita kodi.tv</disclaimer>
+        <disclaimer lang="ko">이 스크립트를 자유롭게 사용하세요. 관련 정보는 kodi.tv를 방문하세요.</disclaimer>
+        <disclaimer lang="lt">Galite laisvai naudoti šį scenarijų. Apsilankykite kodi.tv, norėdami gauti daugiau informacijos.</disclaimer>
+        <disclaimer lang="nl">Gebruik dit script vrijblijvend. Voor meer informatie bezoek kodi.tv</disclaimer>
+        <disclaimer lang="no">Du har fri tillatelse til å benytte dette skriptet. Besøk kodi.tv for informasjon</disclaimer>
+        <disclaimer lang="pl">Zapraszamy do używania tego dodatku. Więcej informacji na stronie kodi.tv</disclaimer>
+        <disclaimer lang="pt">Esteja à vontade para usar este script. Para mais informação, visite kodi.tv.</disclaimer>
+        <disclaimer lang="pt_BR">Sinta-se livre para usar este script. Para maiores informações visite kodi.tv</disclaimer>
+        <disclaimer lang="ro">Simțiți-vă liberi să folosiți acest script. Pentru informații vizitați kodi.tv</disclaimer>
+        <disclaimer lang="ru">Используйте этот скрипт на свое усмотрение. Для информации посетите kodi.tv</disclaimer>
+        <disclaimer lang="sl">Izvolite uporabiti ta skript. Za dodatne informacije obiščite kodi.tv</disclaimer>
+        <disclaimer lang="sv">Använd gärna detta skript. För information, besök kodi.tv</disclaimer>
+        <disclaimer lang="tr">Bu betiği kullanmaktan çekinmeyin. Daha fazla bilgi için kodi.tv adresini ziyaret edin</disclaimer>
+        <disclaimer lang="zh">可放心使用此脚本，更多信息访问 kodi.tv</disclaimer>
+        <platform>all</platform>
+        <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+        <forum>http://forum.xbmc.org/showthread.php?tid=160228</forum>
+        <website>http://xbmc.org</website>
+        <email></email>
+        <source>https://github.com/XBMC-Addons/service.xbmc.versioncheck</source>
+    </extension>
+</addon>
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/changelog.txt b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/changelog.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3ef14973bcc0c2da900c97c5ab83ea82617f3285
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/changelog.txt
@@ -0,0 +1,147 @@
+v0.3.16
+- Update version list
+
+v0.3.15
+- Update version list
+
+v0.3.14
+- Updated language files from Transifex
+- Cosmetics
+- Update version list
+
+v0.3.12 to 0.3.4
+- Update version list
+
+v0.3.3
+- Updated language files from Transifex
+- Update version list
+
+v0.3.2
+- Don't notify on newer unreleased builds
+
+v0.3.1
+- Don't notify on newer unreleased builds
+
+v0.3.0
+- Update with 14.0 Helix
+
+v0.2.7
+- Fix popup on Kodi 15.0 builds
+
+v0.2.6
+- Update with 14.0 Helix rc 3
+
+v0.2.5
+- Update with 14.0 Helix rc 2
+
+v0.2.4
+- Fix error or unicode
+
+v0.2.3
+- Updated language files from Transifex
+- Update with 14.0 Helix rc 1
+
+v0.2.2
+- New Kodi logo as icon
+- Update with 14.0 Helix beta 4
+- Update with 14.0 Helix beta 5
+
+v0.2.1
+- Updated language files from Transifex
+- Don't exclude OpenELEC any more for version check
+- Update with 14.0 Helix beta 3
+
+v0.2.0
+- Only notify when the available version of Kodi changes, not when add-on is updated
+- Update with 14.0 Helix alpha3
+- Update with 14.0 Helix alpha4
+- Update with 14.0 Helix beta 1
+- Update with 14.0 Helix beta 2
+
+v0.1.24
+- Reworked notification logic
+- Updated with recent builds
+
+v0.1.23
+- Update with 13.2 Gotham
+- Update with 13.2 Gotham rc1
+- Update with 13.2 Gotham beta3
+- Update with 13.2 Gotham beta2
+- Update with 13.2 Gotham beta1
+- Update with 14.0 Helix alpha2
+
+v0.1.22
+- Updated language files from Transifex
+- Update with 13.1 Gotham rc1
+- Update with 13.1 Gotham beta2
+- Update with 13.1 Gotham beta1
+- Update with 13.0 Gotham
+
+v0.1.21
+- Update with 13.0 Gotham rc1
+- Update with 13.0 Gotham beta4
+
+v0.1.20
+- Fix missing apt option for Linux
+- Update with 13.0 Gotham beta3
+- Update with 13.0 Gotham beta2
+- Update with 13.0 Gotham beta1
+
+v0.1.19
+- Added Gotham alpha user notice
+
+v0.1.17
+- Update with 13.0 Gotham alpha11
+
+v0.1.16
+- Update with 12.3 Frodo stable
+
+v0.1.15
+- Add option for linux to disable check through "apt"
+
+v0.1.14
+- Update with 13.0 Gotham alpha10
+
+v0.1.13
+- Update with 13.0 Gotham alpha9
+
+v0.1.12
+- Fix encoding text encoding error for some languages
+- Update language files
+
+v0.1.11
+- Updated language files from Transifex
+- Fix problems with python2.7.5
+- Update with 13.0 Gotham alpha8
+
+v0.1.11
+- Update with 13.0 Gotham alpha7
+
+v0.1.9
+- Update with 13.0 Gotham alpha6
+- Updated language files from Transifex
+
+v0.1.7
+- Update with 13.0 Gotham alpha5
+
+v0.1.7
+- Update with 13.0 Gotham alpha4
+
+v0.1.6
+- Update with 12.2 Frodo stable
+- Added Linux full system upgrade
+
+v0.1.5
+- Update with 13.0 Gotham alpha3
+
+v0.1.4
+- We can now upgrade xbmc on Linux. This works either via polkit or shell wrapper as fallback
+
+v0.1.3
+- Update with 13.0 Gotham alpha2
+
+v0.1.2
+- Add notification for Ubuntu users checking through apt command
+
+v0.1.1
+- Initial version
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/icon.png b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..02476a62b6a66f1ee98ed2771f44e667fc90c786
Binary files /dev/null and b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/icon.png differ
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/__init__.py b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..4b0dc39c7f8b8f3235271296a72ed46a8baf0ae2
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/__init__.py
@@ -0,0 +1 @@
+from common import *
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/aptdeamonhandler.py b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/aptdeamonhandler.py
new file mode 100644
index 0000000000000000000000000000000000000000..012312758c7017aa0b91e9efa38090ca857c9777
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/aptdeamonhandler.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+#
+#     Copyright (C) 2013 Team-XBMC
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+import xbmc
+from common import *
+
+try:
+    #import apt
+    import apt
+    from aptdaemon import client
+    from aptdaemon import errors
+except:
+    log('python apt import error')
+
+class AptdeamonHandler:
+
+    def __init__(self):
+        self.aptclient = client.AptClient()
+
+    def _check_versions(self, package):
+        if not self._update_cache():
+            return False, False
+        try:
+            trans = self.aptclient.upgrade_packages([package])
+            #trans = self.aptclient.upgrade_packages("bla")
+            trans.simulate(reply_handler=self._apttransstarted, error_handler=self._apterrorhandler)
+            pkg = trans.packages[4][0]
+            if pkg == package:
+               cache=apt.Cache()
+               cache.open(None)
+               cache.upgrade()
+               if cache[pkg].installed:
+                   return cache[pkg].installed.version, cache[pkg].candidate.version
+
+            return False, False
+
+        except Exception as error:
+            log("Exception while checking versions: %s" %error)
+            return False, False
+
+    def _update_cache(self):
+        try:
+            if self.aptclient.update_cache(wait=True) == "exit-success":
+                return True
+            else:
+                return False
+        except errors.NotAuthorizedError:
+            log("You are not allowed to update the cache")
+            return False
+
+    def check_upgrade_available(self, package):
+        '''returns True if newer package is available in the repositories'''
+        installed, candidate = self._check_versions(package)
+        if installed and candidate:
+            if installed != candidate:
+                log("Version installed  %s" %installed)
+                log("Version available  %s" %candidate)
+                return True
+            else:
+                log("Already on newest version")
+        elif not installed:
+                log("No installed package found")
+                return False
+        else:
+            return False
+
+    def upgrade_package(self, package):
+        try:
+            log("Installing new version")
+            if self.aptclient.upgrade_packages([package], wait=True) == "exit-success":
+                log("Upgrade successful")
+                return True
+        except Exception as error:
+            log("Exception during upgrade: %s" %error)
+        return False
+
+    def upgrade_system(self):
+        try:
+            log("Upgrading system")
+            if self.aptclient.upgrade_system(wait=True) == "exit-success":
+                return True
+        except Exception as error:
+            log("Exception during system upgrade: %s" %error)
+        return False
+
+    def _getpassword(self):
+        if len(self._pwd) == 0:
+            self._pwd = get_password_from_user()
+        return self._pwd
+
+    def _apttransstarted(self):
+        pass
+    
+    def _apterrorhandler(self, error):
+        log("Apt Error %s" %error)
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/common.py b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/common.py
new file mode 100644
index 0000000000000000000000000000000000000000..902e27ed26661401404d956a53175fc233bd67a7
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/common.py
@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+#
+#     Copyright (C) 2013 Team-XBMC
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+import xbmc
+import xbmcaddon
+import xbmcgui
+import xbmcvfs
+
+ADDON        = xbmcaddon.Addon()
+ADDONVERSION = ADDON.getAddonInfo('version')
+ADDONNAME    = ADDON.getAddonInfo('name')
+ADDONPATH    = ADDON.getAddonInfo('path').decode('utf-8')
+ADDONPROFILE = xbmc.translatePath( ADDON.getAddonInfo('profile') ).decode('utf-8')
+ICON         = ADDON.getAddonInfo('icon')
+
+# Fixes unicode problems
+def string_unicode(text, encoding='utf-8'):
+    try:
+        text = unicode( text, encoding )
+    except:
+        pass
+    return text
+
+def normalize_string(text):
+    try:
+        text = unicodedata.normalize('NFKD', string_unicode(text)).encode('ascii', 'ignore')
+    except:
+        pass
+    return text
+
+def localise(id):
+    string = normalize_string(ADDON.getLocalizedString(id))
+    return string
+
+def log(txt):
+    if isinstance (txt,str):
+        txt = txt.decode("utf-8")
+    message = u'%s: %s' % ("Version Check", txt)
+    xbmc.log(msg=message.encode("utf-8"), level=xbmc.LOGDEBUG)
+
+def get_password_from_user():
+    keyboard = xbmc.Keyboard("", ADDONNAME + "," +localise(32022), True)
+    keyboard.doModal()
+    if (keyboard.isConfirmed()):
+        pwd = keyboard.getText()
+    return pwd
+
+def message_upgrade_success():
+    xbmc.executebuiltin("XBMC.Notification(%s, %s, %d, %s)" %(ADDONNAME,
+                                                              localise(32013),
+                                                              15000,
+                                                              ICON))
+
+def message_restart():
+    if dialog_yesno(32014):
+        xbmc.executebuiltin("RestartApp")
+
+def dialog_yesno(line1 = 0, line2 = 0):
+    return xbmcgui.Dialog().yesno(ADDONNAME,
+                                  localise(line1),
+                                  localise(line2))
+
+def upgrade_message(msg, oldversion, upgrade, msg_current, msg_available):
+    # Don't show while watching a video
+    while(xbmc.Player().isPlayingVideo() and not xbmc.abortRequested):
+        xbmc.sleep(1000)
+    i = 0
+    while(i < 5 and not xbmc.abortRequested):
+        xbmc.sleep(1000)
+        i += 1
+    if ADDON.getSetting("lastnotified_version") < ADDONVERSION:
+        xbmcgui.Dialog().ok(ADDONNAME,
+                    localise(msg),
+                    localise(32001),
+                    localise(32002))
+        #ADDON.setSetting("lastnotified_version", ADDONVERSION)
+    else:
+        log("Already notified one time for upgrading.")
+        
+def upgrade_message2( version_installed, version_available, version_stable, oldversion, upgrade,):
+    # shorten releasecandidate to rc
+    if version_installed['tag'] == 'releasecandidate':
+        version_installed['tag'] = 'rc'
+    if version_available['tag'] == 'releasecandidate':
+        version_available['tag'] = 'rc'
+    # convert json-rpc result to strings for usage
+    msg_current = '%i.%i %s%s' %(version_installed['major'],
+                                   version_installed['minor'],
+                                   version_installed['tag'],
+                                   version_installed.get('tagversion',''))
+    msg_available = version_available['major'] + '.' + version_available['minor'] + ' ' + version_available['tag'] + version_available.get('tagversion','')
+    msg_stable = version_stable['major'] + '.' + version_stable['minor'] + ' ' + version_stable['tag'] + version_stable.get('tagversion','')
+    msg = localise(32034) %(msg_current, msg_available)
+
+    # Don't show notify while watching a video
+    while(xbmc.Player().isPlayingVideo() and not xbmc.abortRequested):
+        xbmc.sleep(1000)
+    i = 0
+    while(i < 10 and not xbmc.abortRequested):
+        xbmc.sleep(1000)
+        i += 1
+
+    # hack: convert current version number to stable string
+    # so users don't get notified again. remove in future
+    if ADDON.getSetting("lastnotified_version") == '0.1.24':
+        ADDON.setSetting("lastnotified_stable", msg_stable)
+
+    # Show different dialogs depending if there's a newer stable available.
+    # Also split them between xbmc and kodi notifications to reduce possible confusion.
+    # People will find out once they visit the website.
+    # For stable only notify once and when there's a newer stable available.
+    # Ignore any add-on updates as those only count for != stable
+    if oldversion == 'stable' and ADDON.getSetting("lastnotified_stable") != msg_stable: 
+        if xbmcaddon.Addon('xbmc.addon').getAddonInfo('version') < "13.9.0":
+            xbmcgui.Dialog().ok(ADDONNAME,
+                                msg,
+                                localise(32030),
+                                localise(32031))
+        else:
+            xbmcgui.Dialog().ok(ADDONNAME,
+                                msg,
+                                localise(32032),
+                                localise(32033))
+        ADDON.setSetting("lastnotified_stable", msg_stable)
+    
+    elif oldversion != 'stable' and ADDON.getSetting("lastnotified_version") != msg_available:
+        if xbmcaddon.Addon('xbmc.addon').getAddonInfo('version') < "13.9.0":
+            # point them to xbmc.org
+            xbmcgui.Dialog().ok(ADDONNAME,
+                                msg,
+                                localise(32035),
+                                localise(32031))
+        else:
+            #use kodi.tv
+            xbmcgui.Dialog().ok(ADDONNAME,
+                                msg,
+                                localise(32035),
+                                localise(32033))
+
+        # older skins don't support a text field in the OK dialog.
+        # let's use split lines for now. see code above.
+        '''
+        msg = localise(32034) %(msg_current, msg_available)
+        if oldversion == 'stable':
+            msg = msg + ' ' + localise(32030)
+        else:
+            msg = msg + ' ' + localise(32035)
+        msg = msg + ' ' + localise(32031)
+        xbmcgui.Dialog().ok(ADDONNAME, msg)
+        #ADDON.setSetting("lastnotified_version", ADDONVERSION)
+        '''
+        ADDON.setSetting("lastnotified_version", msg_available)
+        
+    else:
+        log("Already notified one time for upgrading.")
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/jsoninterface.py b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/jsoninterface.py
new file mode 100644
index 0000000000000000000000000000000000000000..32395e890bde1e74bd18b4359a5fd1753d190ce7
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/jsoninterface.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+#
+#     Copyright (C) 2013 Team-XBMC
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+import sys
+import xbmc
+import xbmcaddon
+import xbmcvfs
+import lib.common
+from lib.common import log
+
+ADDONPATH    = lib.common.ADDONPATH
+
+import json as jsoninterface
+
+def get_installedversion():
+    # retrieve current installed version
+    json_query = xbmc.executeJSONRPC('{ "jsonrpc": "2.0", "method": "Application.GetProperties", "params": {"properties": ["version", "name"]}, "id": 1 }')
+    json_query = unicode(json_query, 'utf-8', errors='ignore')
+    json_query = jsoninterface.loads(json_query)
+    version_installed = []
+    if json_query.has_key('result') and json_query['result'].has_key('version'):
+        version_installed  = json_query['result']['version']
+    return version_installed
+    
+def get_versionfilelist():
+    # retrieve versionlists from supplied version file
+    version_file = os.path.join(ADDONPATH, 'resources/versions.txt')
+    # Eden didn't have xbmcvfs.File()
+    if xbmcaddon.Addon('xbmc.addon').getAddonInfo('version') < "11.9.3":
+        file = open(version_file, 'r')
+    else:
+        file = xbmcvfs.File(version_file)
+    data = file.read()
+    file.close()
+    version_query = unicode(data, 'utf-8', errors='ignore')
+    version_query = jsoninterface.loads(version_query)
+    return version_query
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/shellhandlerapt.py b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/shellhandlerapt.py
new file mode 100644
index 0000000000000000000000000000000000000000..f539feeb5a9deba4877250ec7a3830a7ad32366d
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/shellhandlerapt.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+#
+#     Copyright (C) 2013 Team-XBMC
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+import xbmc
+from common import *
+
+try:
+    from subprocess import check_output
+    from subprocess import call
+except:
+    log('subprocess import error')
+
+
+class ShellHandlerApt:
+
+    _pwd = ""
+
+    def __init__(self, usesudo=False):
+        self.sudo = usesudo
+        installed, candidate = self._check_versions("xbmc", False)
+        if not installed:
+            # there is no package installed via repo, so we exit here
+            log("No installed package found, exiting")
+            import sys
+            sys.exit(0)
+
+    def _check_versions(self, package, update=True):
+        _cmd = "apt-cache policy " + package
+
+        if update and not self._update_cache():
+            return False, False
+
+        try:
+            result = check_output([_cmd], shell=True).split("\n")
+        except Exception as error:
+            log("ShellHandlerApt: exception while executing shell command %s: %s" %(_cmd, error))
+            return False, False
+
+        if result[0].replace(":", "") == package:
+            installed = result[1].split()[1]
+            candidate = result[2].split()[1]
+            if installed == "(none)":
+                installed = False
+            if candidate == "(none)":
+                candiate = False
+            return installed, candidate
+        else:
+            log("ShellHandlerApt: error during version check")
+            return False, False
+
+    def _update_cache(self):
+        _cmd = 'apt-get update'
+        try:
+            if self.sudo:
+                x = check_output('echo \'%s\' | sudo -S %s' %(self._getpassword(), _cmd), shell=True)
+            else:
+                x = check_output(_cmd.split())
+        except Exception as error:
+            log("Exception while executing shell command %s: %s" %(_cmd, error))
+            return False
+
+        return True
+
+    def check_upgrade_available(self, package):
+        '''returns True if newer package is available in the repositories'''
+        installed, candidate = self._check_versions(package)
+        if installed and candidate:
+            if installed != candidate:
+                log("Version installed  %s" %installed)
+                log("Version available  %s" %candidate)
+                return True
+            else:
+                log("Already on newest version")
+        elif not installed:
+                log("No installed package found")
+                return False
+        else:
+            return False
+
+    def upgrade_package(self, package):
+        _cmd = "apt-get install -y " + package
+        try:
+            if self.sudo:
+                x = check_output('echo \'%s\' | sudo -S %s' %(self._getpassword(), _cmd), shell=True)
+            else:
+                x = check_output(_cmd.split())
+            log("Upgrade successful")
+        except Exception as error:
+            log("Exception while executing shell command %s: %s" %(_cmd, error))
+            return False
+
+        return True
+
+    def upgrade_system(self):
+        _cmd = "apt-get upgrade -y"
+        try:
+            log("Upgrading system")
+            if self.sudo:
+                x = check_output('echo \'%s\' | sudo -S %s' %(self._getpassword(), _cmd), shell=True)
+            else:
+                x = check_output(_cmd.split())
+        except Exception as error:
+            log("Exception while executing shell command %s: %s" %(_cmd, error))
+            return False
+
+        return True
+
+    def _getpassword(self):
+        if len(self._pwd) == 0:
+            self._pwd = get_password_from_user()
+        return self._pwd
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/versions.py b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/versions.py
new file mode 100644
index 0000000000000000000000000000000000000000..5ee95d505ff6f97b6e9c9379590e79d5ba588ae4
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/versions.py
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+#
+#     Copyright (C) 2013 Team-XBMC
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+from lib.common import log
+
+def compare_version(version_installed, versionlist):
+    # Create seperate version lists
+    versionlist_stable = versionlist['releases']['stable']
+    versionlist_rc = versionlist['releases']['releasecandidate']
+    versionlist_beta = versionlist['releases']['beta']
+    versionlist_alpha = versionlist['releases']['alpha']
+    versionlist_prealpha = versionlist['releases']['prealpha'] 
+    log('Version installed %s' %version_installed)
+    ### Check to upgrade to newest available stable version
+    # check on smaller major version. Smaller version than available always notify
+    oldversion = False
+    version_available = ''
+    # check if installed major version is smaller than available major stable
+    # here we don't care if running non stable
+    if version_installed['major'] < int(versionlist_stable[0]['major']):
+        version_available = versionlist_stable[0]
+        oldversion = 'stable'
+        log('Version available  %s' %versionlist_stable[0])
+        log('You are running an older version')
+
+
+    # check if installed major version is equal than available major stable
+    # however also check on minor version and still don't care about non stable
+    elif version_installed['major'] == int(versionlist_stable[0]['major']):
+        if version_installed['minor'] < int(versionlist_stable[0]['minor']):
+            version_available = versionlist_stable[0]
+            oldversion = 'stable'
+            log('Version available  %s' %versionlist_stable[0])
+            log('You are running an older minor version')
+        # check for <= minor !stable
+        elif version_installed['tag'] != 'stable' and version_installed['minor'] <= int(versionlist_stable[0]['minor']):
+            version_available = versionlist_stable[0]
+            oldversion = True
+            log('Version available  %s' %versionlist_stable[0])
+            log('You are running an older non stable minor version')
+        else:
+            log('Version available  %s' %versionlist_stable[0])
+            log('There is no newer stable available')
+    
+    # Already skipped a possible newer stable build. Let's continue with non stable builds.
+    # Check also 'oldversion' hasn't been set to 'stable' or true by previous checks because if so,
+    # those part need to be skipped
+    
+    #check for RC builds
+    if not oldversion and version_installed['tag'] in ['releasecandidate']:
+        # check if you are using a RC build lower than current available RC
+        # then check if you are using a beta/alpha lower than current available RC
+        # 14.0rc3 is newer than:  14.0rc1, 14.0b9, 14.0a15
+        if version_installed['major'] <= int(versionlist_rc[0]['major']):
+            if version_installed['minor'] <= int(versionlist_rc[0]['minor']):
+                if version_installed.get('tagversion','') < versionlist_rc[0]['tagversion']:
+                    version_available = versionlist_rc[0]
+                    oldversion = True
+                    log('Version available  %s' %versionlist_rc[0])
+                    log('You are running an older RC version')
+    # now check if installed !=rc
+    elif not oldversion and version_installed['tag'] in ['beta','alpha','prealpha']:
+        if version_installed['major'] <= int(versionlist_rc[0]['major']):
+            if version_installed['minor'] <= int(versionlist_beta[0]['minor']):
+                version_available = versionlist_rc[0]
+                oldversion = True
+                log('Version available  %s' %versionlist_rc[0])
+                log('You are running an older non RC version')
+
+    #check for beta builds
+    if not oldversion and version_installed['tag'] == 'beta':
+        # check if you are using a RC build lower than current available RC
+        # then check if you are using a beta/alpha lower than current available RC
+        # 14.0b3 is newer than:  14.0b1, 14.0a15
+        if version_installed['major'] <= int(versionlist_beta[0]['major']):
+            if version_installed['minor'] <= int(versionlist_beta[0]['minor']):
+                if version_installed.get('tagversion','') < versionlist_beta[0]['tagversion']:
+                    version_available = versionlist_beta[0]
+                    oldversion = True
+                    log('Version available  %s' %versionlist_beta[0])
+                    log('You are running an older beta version')
+    # now check if installed !=beta
+    elif not oldversion and version_installed['tag'] in ['alpha','prealpha']:
+        if version_installed['major'] <= int(versionlist_beta[0]['major']):
+            if version_installed['minor'] <= int(versionlist_beta[0]['minor']):
+                version_available = versionlist_beta[0]
+                oldversion = True
+                log('Version available  %s' %versionlist_beta[0])
+                log('You are running an older non beta version')
+
+    #check for alpha builds and older
+    if not oldversion and version_installed['tag'] == 'alpha':
+        # check if you are using a RC build lower than current available RC
+        # then check if you are using a beta/alpha lower than current available RC
+        # 14.0a3 is newer than: 14.0a1 or pre-alpha
+        if version_installed['major'] <= int(versionlist_alpha[0]['major']):
+            if version_installed['minor'] <= int(versionlist_alpha[0]['minor']):
+                if version_installed.get('tagversion','') < versionlist_alpha[0]['tagversion']:
+                    version_available = versionlist_alpha[0]
+                    oldversion = True
+                    log('Version available  %s' %versionlist_alpha[0])
+                    log('You are running an older alpha version')
+    # now check if installed !=alpha
+    elif not oldversion and version_installed['tag'] in ['prealpha']:
+        if version_installed['major'] <= int(versionlist_alpha[0]['major']):
+            if version_installed['minor'] <= int(versionlist_alpha[0]['minor']):
+                version_available = versionlist_alpha[0]
+                oldversion = True
+                log('Version available  %s' %versionlist_alpha[0])
+                log('You are running an older non alpah version')     
+    version_stable = versionlist_stable[0]
+    return oldversion, version_installed, version_available, version_stable
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/viewer.py b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/viewer.py
new file mode 100644
index 0000000000000000000000000000000000000000..58a3f379b3b67595baae68c70fac6cab5e267b38
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/lib/viewer.py
@@ -0,0 +1,99 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+#     Copyright (C) 2011-2013 Martijn Kaijser
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+#import modules
+import os
+import sys
+import xbmc
+import xbmcgui
+import xbmcaddon
+
+### get addon info
+ADDON        = xbmcaddon.Addon('service.xbmc.versioncheck')
+ADDONVERSION = ADDON.getAddonInfo('version')
+ADDONNAME    = ADDON.getAddonInfo('name')
+ADDONPATH    = ADDON.getAddonInfo('path').decode('utf-8')
+ADDONPROFILE = xbmc.translatePath( ADDON.getAddonInfo('profile') ).decode('utf-8')
+ICON         = ADDON.getAddonInfo('icon')
+
+class Viewer:
+    # constants
+    WINDOW = 10147
+    CONTROL_LABEL = 1
+    CONTROL_TEXTBOX = 5
+
+    def __init__(self, *args, **kwargs):
+        # activate the text viewer window
+        xbmc.executebuiltin("ActivateWindow(%d)" % (self.WINDOW,))
+        # get window
+        self.window = xbmcgui.Window(self.WINDOW)
+        # give window time to initialize
+        xbmc.sleep(100)
+        # set controls
+        self.setControls()
+
+    def setControls(self):
+        #get header, text
+        heading, text = self.getText()
+        # set heading
+        self.window.getControl(self.CONTROL_LABEL).setLabel("%s : %s" % (ADDONNAME, heading, ))
+        # set text
+        self.window.getControl(self.CONTROL_TEXTBOX).setText(text)
+        xbmc.sleep(2000)
+
+    def getText(self):
+        try:
+            if sys.argv[ 1 ] == "gotham-alpha_notice":
+                return "Call to Gotham alpha users", self.readFile(os.path.join(ADDONPATH , "resources/gotham-alpha_notice.txt"))
+        except Exception, e:
+            xbmc.log(ADDONNAME + ': ' + str(e), xbmc.LOGERROR)
+        return "", ""
+
+    def readFile(self, filename):
+        return open(filename).read()
+
+class WebBrowser:
+    """ Display url using the default browser. """
+
+    def __init__(self, *args, **kwargs):
+        try:
+            url = sys.argv[2]
+            # notify user
+            notification(ADDONNAME, url)
+            xbmc.sleep(100)
+            # launch url
+            self.launchUrl(url)
+        except Exception, e:
+            xbmc.log(ADDONNAME + ': ' + str(e), xbmc.LOGERROR)
+
+    def launchUrl(self, url):
+        import webbrowser
+        webbrowser.open(url)
+
+def Main():
+    try:
+        if sys.argv[ 1 ] == "webbrowser":
+            WebBrowser()
+        else:
+            Viewer()
+    except Exception, e:
+        xbmc.log(ADDONNAME + ': ' + str(e), xbmc.LOGERROR)
+
+if (__name__ == "__main__"):
+    Main()
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/gotham-alpha_notice.txt b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/gotham-alpha_notice.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b905baaae482ee2ea4ce9e818b89a0f59c296280
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/gotham-alpha_notice.txt
@@ -0,0 +1,7 @@
+[B]Call to Gotham alpha users[/B]
+[I]For more information visit http://xbmc.org [/I]
+
+In the last blog post which you can read at http://xbmc.org we already told you we are working hard towards a Beta release. There are still some things that need to be improved before we are confident on releasing a Beta. We will of course keep you posted when that time comes. Work continues by the developers to iron out the know remaining issues as much as possible. Thanks to the users who install our latest development builds, the remaining problems become known and we try to address these. Do note we may not be able to address all issues reported, as time and available developers are limited. We all try our best but we hope all of you will understand this and we need to accept that some issues will remain.
+If you are a developer and you are confident enough to dive into our source code and fix it, we would appreciate it very much if you would create a so called pull-request on our github page for code review so it might be included.
+
+As it stands now it’s highly unlikely there will be another monthly release before Beta release as there isn’t a merge window any more like we had in the previous months. The monthly builds were done at the end of the month to mark the most stable Gotham version. However now we only do bug fixing, each build we create daily should become better and better. This also means you can download and install the most recent nightly build quite safely to have the most up to date version running. Because of this we would like to ask if possible to upgrade to the last available “nightly build” (the links can be found at the end). As I just mentioned these builds should be considered more stable than any previous monthly Gotham release. There should be no reason to keep using any older monthly build. This would also help to identify any remaining issues left and helps us make the upcoming Gotham release a great one.
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Afrikaans/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Afrikaans/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..95f99d4405b601c854f311c08dbeb831e2a2d09f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Afrikaans/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/xbmc-addons/language/af/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Algemeen"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Albanian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Albanian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..08f3c9cdf111649b435b5f25f0002c459c4571b4
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Albanian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/xbmc-addons/language/sq/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Të përgjithshëm"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Amharic/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Amharic/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..192cddf5df3d7c47c233eea8f707bada27ac26fc
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Amharic/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Amharic (http://www.transifex.com/projects/p/xbmc-addons/language/am/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "ባጠቃላይ"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Arabic/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Arabic/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ad8cf641d37c67698cf8304776a02b9e5ec7d77e
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Arabic/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/xbmc-addons/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "عام"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Armenian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Armenian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..178f62f063eca972ccfce8373a77984d5e60ef35
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Armenian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/xbmc-addons/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Գլխավոր"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Asturian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Asturian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..0c00a68df064592a0f3299cdc919c8b21c47639c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Asturian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/xbmc-addons/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Xeneral"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Basque/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Basque/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..b38edba1fba87044fc2636bda07b9c494c99bdb5
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Basque/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/xbmc-addons/language/eu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Orokorra"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Belarusian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Belarusian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..8fae033bca4ce1a346ebcbe33967fce4207f52b4
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Belarusian/strings.po
@@ -0,0 +1,65 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/xbmc-addons/language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "We would like to recommend you to upgrade."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visit Kodi.tv for more information."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Would you like to remove this reminder?"
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Use your package manager(apt) to upgrade."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "A new version is available, do you want to upgrade now?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Upgrade successful"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Do you want to restart Kodi to finish the upgrade?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Do you want to check the repository for a new version?"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Enable Kodi version check?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Please enter your password"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Upgrade complete system"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Bosnian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Bosnian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..a3e9d425a197b93f2432ffa0a9a6e35e6b698a9e
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Bosnian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/xbmc-addons/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Opšte"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Bulgarian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Bulgarian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..13ae10ddc2984a61fdacc7e6b220498e4d5f8b82
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Bulgarian/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/xbmc-addons/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Препоръчваме Ви да актуализирате."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "За повече информация посетете www.kodi.tv"
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Желаете ли напомнянето да бъде изключено?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Можете да включите/изключите напомнянето от настройките на добавката."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Актуализирайте чрез вашия диспечер на пакети  (apt)."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Налична е нова версия. Желаете ли да актуализирате сега?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Актуализирането е успешно"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Желаете ли да рестартирате Kodi, за да приключи актуализирането?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Желаете ли хранилището да бъде проверено за нова версия?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Налична е по-нова, стабилна, версия на Kodi."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Основни"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Да се включи ли проверката за нови версии на Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Моля, въведете паролата си"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Линукс: Актуализиране на цялата система"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Линукс: Актуализиране чрез apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Налична е нова стабилна версия на Kodi."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "За повече информация посетете www.kodi.tv"
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Налична е нова стабилна версия на Kodi."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "За повече информация посетете www.kodi.tv"
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "В момента ползвате версия %s, при налична %s."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Препоръчително е да актуализирате до по-нова версия."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Burmese/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Burmese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..b2d650117d30776baeb0be1d8715562cea04394a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Burmese/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/xbmc-addons/language/my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "ယေဘုယျ"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Catalan/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Catalan/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ddae20e81da9d6f4837556354ffb6452de586aa7
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Catalan/strings.po
@@ -0,0 +1,65 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/xbmc-addons/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "En agradaria recomanar-te actualitzar."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visita Kodi.tv per més informació."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Vols eliminar aquest recordatori?"
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Utilitza el gestor de paquets (apt) per actualitzar."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Una nova versió esta disponible, vol actualitzar ara?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Actualització realitzada correctament."
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Vols reiniciar Kodi per finalitzar la actualització?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Vols comprovar el repositori per buscar una versió nova?"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Habilitar comprovació de versió Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Si us plau indtroduïu la contrasenya"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Actualitzar tot el sistema"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Chinese (Simple)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Chinese (Simple)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..29109b4bbe78567d6d1ac5df33da35020c47ecc8
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Chinese (Simple)/strings.po	
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Chinese (Simple) (http://www.transifex.com/projects/p/xbmc-addons/language/zh/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "我们建议你升级。"
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "更多信息访问 Kodi.tv。"
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "你想移除此提醒吗？"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "你可以通过插件设置来启用/禁用它。"
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "使用你的软件包管理器（apt）升级。"
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "新版可用，你现在要升级吗？"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "成功升级"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "你要重启 Kodi 来完成升级吗？"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "你要检查库中的新版本吗？"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "有新的稳定版 Kodi 可用。"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "常规"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "启用 Kodi 版本检查？"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "请输入你的密码"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux：升级完整的系统"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux：使用 apt 来升级"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "有新的稳定版 Kodi 可用。"
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "更多信息访问 http://kodi.tv。"
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "有新的稳定版 Kodi 可用。"
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "更多信息访问 http://kodi.tv。"
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "使用 %s 当 %s 可用。"
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "建议升级到新版本。"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Chinese (Traditional)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Chinese (Traditional)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..1094ebda6f1ca9598f33813a061d4860f515c1a4
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Chinese (Traditional)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Chinese (Traditional) (http://www.transifex.com/projects/p/xbmc-addons/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "一般設定"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Croatian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Croatian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..d169766f2f97e7017a668573788b6a685db48ed8
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Croatian/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/xbmc-addons/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Želimo vam preproučiti nadogradnju."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Posjetite Kodi.tv za više informacija."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Želite li ukloniti ovog podsjetnika?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Možete ga omogućiti/onemogućiti u postavakama dodataka."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Koristite svoj upravitelj paketa (apt) za nadogradnju."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Nova inačica je dostupna, želite li ju odmah nadograditi?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Nadogradnja uspješna"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Želite li ponovno pokrenuti Kodi za dovršetak nadogradnje?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Želite li provjeriti repozitorij za novu inačicu?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Dostupna je novija stabilna inačica Kodija."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Općenito"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Omogući Kodi provjeritelja inačice?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Upišite svoju lozinku"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: nadogradi cjelokupan sustav"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: ažurirajte koristeći 'apt'"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Dostupna je novija stabilna inačica Kodija."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Posjetite http://kodi.tv za više informacija."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Dostupna je novija stabilna inačica Kodija."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Posjetite http://kodi.tv za više informacija."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Koristite %s dok je %s dostupna."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Preporučljivo je da nadogradite na noviju inačicu."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Czech/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Czech/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..3486f1414e7a668df0ce5539fb98896335aa795b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Czech/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/xbmc-addons/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Rádi bychom vám doporučili upgrade."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Navštivte Kodi.tv pro více informací."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Chtěli byste odstranit tuto připomínku?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Je možno povolit/zakázat v nastavení doplňku"
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Použijte správce balíčků (APT) k upgradu."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Nová verze je k dispozici, chcete upgradovat nyní?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Aktualizace úspěšná"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Chcete restartovat Kodi pro dokončení aktualizace?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Chcete zjistit, jestli je v repositáři nová verze?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Je k dispozici nová verze Kodi."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Obecné"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Povolit kontrolu verze Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Prosím, zadejte své heslo"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Aktualizace celého systému"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Aktualizace za použití apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Je k dispozici nová stabilní verze Kodi."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Navštivte http://kodi.tv pro více informací."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Je k dispozici nová stabilní verze Kodi."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Navštivte http://kodi.tv pro více informací."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Používáte %s zatímco je %s k dispozici."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Je doporučeno upgradovat na novější verzi."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Danish/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Danish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ed58344e6d6403e3771745c212acd5234a358e8c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Danish/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/xbmc-addons/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Opdatering anbefales!"
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Besøg Kodi.tv for mere information."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Ønsker du at fjerne denne advarsel?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Du kan slå den til/fra i tilføjelses indstillingerne."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Benyt til pakke manager(apt) til at opgradere."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Ny version tilgængelig. Ønsker du at opdatere?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Opdatering lykkedes"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Ønsker du at genstarte Kodi for at afslutte opgraderingen?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Ønsker du at undersøge om repositoriet for ny version?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Der er en nyere stabil version af Kodi tilgængelig."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Generelt"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Tjek for Kodi-opdateringer?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Indtast dit password"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Opgrader hele systemet"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Opgrader ved brug af apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Der er en ny stabil version af Kodi tilgængelig."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Besøg http://kodi.tv for mere information."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Der er en ny stabil version af Kodi tilgængelig."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Besøg http://kodi.tv for mere information."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Du benytter %s, mens %s er tilgængelig."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Det anbefales at du opdaterer til en nyere version."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Dutch/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Dutch/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..2d7cd506f0ff0f51b72659d4338e9c886b975361
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Dutch/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/xbmc-addons/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "We bevelen je aan om te upgraden."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Bezoek Kodi.tv voor meer informatie."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Will je deze herinneren verwijderen?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Deze kan je aan/uitzetten in add-on instellingen."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Gebruik pakket manager(apt) voor upgraden."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Er is een nieuwe versie beschikbaar, wil je nu upgraden?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Upgrade succesvol"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Wil je Kodi herstarten om de upgrade te voltooien?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Wil je de repository controleren op een nieuwe versie?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Er is een nieuwere stabiele Kodi versie beschikbaar."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Algemeen"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Kodi versiecontrole inschakelen?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Vul uw wachtwoord in"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Upgrade compleet systeem"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Upgrade gebruikt apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Een nieuwe stabiele versie van Kodi is beschikbaar."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Bezoek http://kodi.tv voor meer informatie."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Een nieuwe stabiele versie van Kodi is beschikbaar."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Bezoek Http://kodi.tv voor meer informatie."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "In gebruik %s terwijl %s beschikbaar is."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Het is aanbevolen dat je upgrade naar een nieuwere versie."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (Australia)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (Australia)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..f5c64dae1455d4cde17103a63c767c58e053236a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (Australia)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xbmc-addons/language/en_AU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_AU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (New Zealand)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (New Zealand)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..f5eedbc97ca0d0b6fd610782516b60269796b802
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (New Zealand)/strings.po	
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/xbmc-addons/language/en_NZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_NZ\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "We would like to recommend you to upgrade."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visit Kodi.tv for more information."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Would you like to remove this reminder?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "You can enable/disable it through add-on settings."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Use your package manager(apt) to upgrade."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "A new version is available, do you want to upgrade now?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Upgrade successful"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Do you want to restart Kodi to finish the upgrade?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Do you want to check the repository for a new version?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "There is a newer stable Kodi version available."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Enable Kodi version check?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Please enter your password"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Upgrade complete system"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Upgrade using apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "A new stable version of Kodi is available."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visit http://kodi.tv for more information."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "A new stable version of Kodi is available."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visit http://kodi.tv for more information."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Using %s while %s is available."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "It is recommended that you to upgrade to a newer version."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (US)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (US)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..63f4a600d92b4c862027962c47c6d11145a94ebf
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English (US)/strings.po	
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (US) (http://www.transifex.com/projects/p/xbmc-addons/language/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "We would like to recommend you to upgrade."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visit Kodi.tv for more information."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Would you like to remove this reminder?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "You can enable/disable it through add-on settings."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Use your package manager(apt) to upgrade."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "A new version is available, do you want to upgrade now?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Upgrade successful"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Do you want to restart Kodi to finish the upgrade?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Do you want to check the repository for a new version?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "There is a newer stable Kodi version available."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Enable Kodi version check?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Please enter your password"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Upgrade complete system"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Upgrade using apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "A new stable version of Kodi is available."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visit http://kodi.tv for more information."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "A new stable version of Kodi is available."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visit http://kodi.tv for more information."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Using %s while %s is available."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "It is recommended that you to upgrade to a newer version."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..c8710afdd63b4ad2cc582bd078b9bd325a74a41a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/English/strings.po
@@ -0,0 +1,113 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr ""
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr ""
+
+#empty strings from id 32003 to 32008
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr ""
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr ""
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr ""
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr ""
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr ""
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr ""
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr ""
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr ""
+
+#empty strings from id 32017 to 32019
+
+msgctxt "#32020"
+msgid "General"
+msgstr ""
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr ""
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr ""
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr ""
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr ""
+
+#empty strings from id 32025 to 32029
+
+#. Used in OK dialog
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr ""
+
+#. Direct people to the website. Used in OK dialog
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr ""
+
+#. Used in OK dialog
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr ""
+
+#. Direct people to the website. Used in OK dialog
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr ""
+
+#. For example: "You are using 13.1 prealpha while 13.2 stable is available"
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr ""
+
+#. Used in OK dialog
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr ""
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Esperanto/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Esperanto/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..aa40076f7c283e448e0bf5e3336377ff1596f3fd
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Esperanto/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/xbmc-addons/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Generalo"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Estonian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Estonian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..fc6ef2c854f2c3cc6d344dbca20221064db81fb3
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Estonian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/xbmc-addons/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Üldine"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Faroese/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Faroese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..04d7e9c4c56bd1206bbefda26fa922649ba37163
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Faroese/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Faroese (http://www.transifex.com/projects/p/xbmc-addons/language/fo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Vanligt"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Finnish/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Finnish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..b44b2db9163d301b2d2c3741285f0f6de80582d7
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Finnish/strings.po
@@ -0,0 +1,65 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/xbmc-addons/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Päivitys onnistui"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Haluatko käynnistää Kodin viimeistellääksesi päivityksen?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Kodista on saatavilla uudempi stable-versio."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Yleinen"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Kytke Kodin version tarkistus?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Ole hyvä ja syötä salasanasi"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Uusi stable-versio on saatavilla Kodista."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Käy http://kodi.tv saadaksesi lisätietoa"
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Uusi stable-versio on saatavilla Kodista."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Käy http://kodi.tv saadaksesi lisätietoa"
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Käytät %s , mutta %s on saatavilla."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "On suositeltavaa, että päivität uudempaan versioon."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/French (Canada)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/French (Canada)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..cd676c4c62cc59d79e073e8d428ca8cffc5eea53
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/French (Canada)/strings.po	
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: French (Canada) (http://www.transifex.com/projects/p/xbmc-addons/language/fr_CA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CA\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Nous aimerions vous recommander de faire une mise à niveau."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visitez Kodi.tv pour plus d'information."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Voulez-vous supprimer ce rappel?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Vous pouvez l'activer/le désactiver dans les paramètres des addiciels."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Utilisez votre gestionnaire de paquets (apt) pour mettre à niveau."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Une nouvelle version est proposée, voulez-vous mettre à niveau maintenant?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Mise à niveau réussie"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Voulez-vous redémarrer Kodi pour finir la mise à niveau?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Voulez-vous vérifier si une nouvelle version est proposée dans le dépôt?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Une nouvelle version stable de Kodi est proposée."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Général"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Activer le contrôle de version Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Veuillez saisir votre mot de passe"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux : mettre à niveau le système entier"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux : mettre à niveau en utilisant apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Une nouvelle version stable de Kodi est proposée."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visitez http://kodi.tv pour plus d'informations."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Une nouvelle version de Kodi est proposée."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visitez http://kodi.tv pour plus d'informations."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "%s est utilisée alors que %s est proposée."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Il vous est recommandé de mettre à niveau vers une nouvelle version."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/French/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/French/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..51c48d466277f8ea643c36a6676cb573916442d9
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/French/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: French (http://www.transifex.com/projects/p/xbmc-addons/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Il est recommandé de mettre à jour Kodi."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Consulter kodi.tv pour plus d'informations."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Faut-il retirer ce rappel ?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Il est possible de l'activer / le désactiver depuis les paramètres de l'extension."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Utiliser votre gestionnaire de paquets (apt) pour mettre à niveau."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Une nouvelle version est disponible, faut-il mettre à niveau maintenant ?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Mise à niveau réussie"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Faut-il redémarrer Kodi pour terminer la mise à niveau ?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Faut-il vérifier sur le dépôt s’il existe une nouvelle version?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Une nouvelle version stable de Kodi est disponible."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Général"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Activer le contrôle de version de Kodi"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Saisir le mot de passe"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux : mettre à niveau le système complet"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux : mettre à niveau en utilisant apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Une nouvelle version stable de Kodi est disponible."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Consulter http://kodi.tv pour plus d'informations."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Une nouvelle version stable de Kodi est disponible."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Consulter http://kodi.tv pour plus d'informations."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "%s est utilisée alors que %s est disponible."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Il est recommandé de mettre à niveau vers une nouvelle version."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Galician/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Galician/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..4a47329e07499684687a9244d503855eed2e06e3
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Galician/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/xbmc-addons/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Gustaríanos recomendarlle actualizar."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visitar Kodi.tv para máis información."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Quere eliminar este aviso?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Pode des/activalo a través dos axustes do complemento."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Use o xestor de paquetes(apt) para actualizar."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Hai unha nova versión dispoñíbel, quere actualizar agora?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Actualización correcta"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Quere reiniciar agora o Kodi para rematar a actualización?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Quere buscar no repositorio unha nova versión?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Hai dispoñíbel unha nova versión estábel do Kodi."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Xeral"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Activar a verificación de versión do Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Por favor introduza o seu contrasinal"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Actualizar o sistema completo"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Actualizar empregando apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Está dispoñible unha versión estable nova de Kodi. "
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Ir a http://kodi.tv para máis información."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Está dispoñíbel unha nova versión estábel de Kodi. "
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Ir a http://kodi.tv para máis información."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Está a empregar a versión %s mentres que a %s está dispoñíbel."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "É recomendábel actualizar á nova versión."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Georgian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Georgian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..89e4e828b1d8900ec125573639e21c873a1ad364
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Georgian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/xbmc-addons/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "მთავარი"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/German/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/German/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..dfff922145b3a9cbeb65b3e83c7c0aaf55fbb00d
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/German/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: German (http://www.transifex.com/projects/p/xbmc-addons/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Wir empfehlen Ihnen eine Aktualisierung."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Besuchen Sie Kodi.tv für mehr Informationen."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Möchten Sie diese Erinnerung löschen?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Sie können es in den Addoneinstellungen aktivieren/deaktivieren."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Bitte verwenden Sie den Packetmanager (apt) für eine Aktualisierung."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Eine neue Version ist verfügbar, möchten Sie jetzt aktualisieren?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Aktualisierung erfolgreich"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Möchten sie Kodi neu starten, um die Aktualisierung abzuschließen?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Möchten Sie das Repositorium auf eine neue Version überprüfen?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Eine neuere stabile Kodi-Version ist verfügbar."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Allgemein"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Kodi Versionsprüfung aktivieren?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Bitte geben Sie ihr Passwort ein"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Komplettes System aktualisieren"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Aktualisierung durch apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Eine neue stabile Kodi-Version ist verfügbar."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Besuchen Sie http://kodi.tv für mehr Informationen."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Eine neue stabile Kodi-Version ist verfügbar."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Besuchen Sie http://kodi.tv für mehr Informationen."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "%s wird verwendet, obwohl %s verfügbar ist."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Es wird empfohlen, dass Sie auf eine neuere Version aktualisieren."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Greek/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Greek/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..0b90fc5dbf1d4702f8bc263d931033c4a21e18b2
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Greek/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/xbmc-addons/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Θα σας προτείναμε να κάνετε αναβάθμιση."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Επισκεφθείτε το Kodi.tv για περισσότερες πληροφορίες."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Να αφαιρεθεί αυτή η υπενθύμιση;"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Μπορείτε να την (απ)ενεργοποιήσετε από τις ρυθμίσεις του πρόσθετου."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Χρησιμοποιήστε τη διαχείριση πακέτων (apt) για αναβάθμιση."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Μια νέα έκδοση είναι διαθέσιμη, να γίνει αναβάθμιση τώρα;"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Επιτυχής Αναβάθμιση"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Να γίνει επανεκκίνηση του Kodi για να ολοκληρωθεί η αναβάθμιση;"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Να γίνει έλεγχος του αποθετηρίου για νέα έκδοση;"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Είναι διαθέσιμη νεώτερη σταθερή έκδοση του Kodi."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Γενικά"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Ενεργοποίηση ελέγχου έκδοσης Kodi;"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Παρακαλώ εισάγετε τον κωδικό σας"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Αναβάθμιση όλου του συστήματος"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Αναβάθμιση με χρήση apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Είναι διαθέσιμη νεώτερη σταθερή έκδοση του Kodi."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Επισκεφθείτε το http://kodi.tv για περισσότερες πληροφορίες."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Είναι διαθέσιμη νεώτερη σταθερή έκδοση του Kodi."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Επισκεφθείτε το http://kodi.tv για περισσότερες πληροφορίες."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Χρησιμοποιείτε την έκδοση %s ενώ είναι διαθέσιμη η %s."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Προτείνεται η αναβάθμιση σε νεώτερη έκδοση."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hebrew/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hebrew/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..a32554a939a208ff7aece839a307882a68253c97
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hebrew/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/xbmc-addons/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "אנו ממליצים לך לשדרג."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "בקר ב-Kodi.tv למידע נוסף."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "התרצה להסיר תזכורת זאת?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "אתה יכול להפעיל/לנטרל זאת בהגדרות ההרחבה."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "השתמש במנהל החבילות (apt) לשידרוג."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "גרסה חדשה זמינה, התרצה לשדרג כעת?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "השדרוג הצליח"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "התרצה להפעיל מחדש את Kodi לשם סיום השדרוג?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "התרצה לבדוק האם זמינה גרסה חדשה במאגר?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "קיימת גרסה יציבה חדשה של קודי זמינה להורדה "
+
+msgctxt "#32020"
+msgid "General"
+msgstr "כללי"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "להפעיל את בודק גרסת Kodi ?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "אנא הזן סיסמתך"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "לינוקס: שדרוג מערכת מלא"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "לינוקס: שדרוג באמצעות apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "גרסה יציבה חדשה של קודי זמינה."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "בקר ב-http://kodi.tv למידע נוסף."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "גרסה יציבה חדשה של קודי זמינה."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "בקר ב-http://kodi.tv למידע נוסף."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "שימוש בs% בעוד s% זמין."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "מומלץ לך לשדרג לגרסה חדשה יותר."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hindi (Devanagiri)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hindi (Devanagiri)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..8b3a6e111411802b04e36e50afc9d28e58943f80
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hindi (Devanagiri)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Hindi (Devanagiri) (http://www.transifex.com/projects/p/xbmc-addons/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "सामान्य"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hungarian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hungarian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..66ee97bb44a7b90d0f226a94c97933dd65da1985
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Hungarian/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/xbmc-addons/language/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Azt ajánljuk Önnek, hogy frissítse a rendszerét."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "További információkért keresse fel az kodi.tv oldalt!"
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Szeretné eltávolítani ezt az emlékeztetőt?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Engedélyezheti / letilthatja a kiegészítő beállításaiban."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Használja a csomagkezelőt (apt) a frissítéshez."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Egy új verzió érhető el, szeretne erre frissíteni?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "A frissítés sikerült."
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Kívánja újraindítani az Kodi-t a frissítés befejezéséhez?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Kívánja, hogy új változatot keressünk a frissítési csatornában?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Újabb stabil Kodi kiadás elérhető."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Általános"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Engedélyezi az Kodi verzió ellenőrzését?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Kérjük, adja meg jelszavát"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Teljes rendszer frissítése"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Frissítés apt segítségével"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Újabb stabil Kodi kiadás elérhető."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "További információkért keresse fel az http://kodi.tv oldalt!"
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Újabb stabil Kodi kiadás elérhető."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "További információkért keresse fel az http://kodi.tv."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "%s használata mialatt %s elérhető."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Javasolt a hogy frissítsen az újabb változatra."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Icelandic/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Icelandic/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..fa9388742dc510e243cce3a2ca562fa5fe4c2d2c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Icelandic/strings.po
@@ -0,0 +1,73 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/xbmc-addons/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Við mælum með að þú uppfærir."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Farðu inn á Kodi.tv til að fá fleiri upplýsingar."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Viltu fjarlægja þessa áminningu ?"
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Notaðu pakkastjórann (apt) til að uppfæra."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Ný útgáfa er fáanleg, viltu uppfæra núna ?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Uppfærsla heppnaðist"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Viltu endurræsa  Kodi til að ljúka uppfærslu ?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Viltu athuga hvort að skráaveitan er með nýrri útgáfu?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Það er nýrri stöðug útgáfa af Kodi tiltæk."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Almennt"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Virkja athugun á Útgáfu Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Vinsamlegast settu inn lykilorð"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Uppfærðu allt kerfið"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Uppfærðu með apt"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Indonesian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Indonesian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..8f8292c3465d6fc236a9ac66f250548a0a6deeaf
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Indonesian/strings.po
@@ -0,0 +1,73 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/xbmc-addons/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Kami merekomendasikan Anda untuk upgrade."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Kunjungi Kodi.tv untuk informasi lebih lanjut."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Apakah anda ingin menghapus pengingat ini?"
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Gunakan manajer paket (apt) untuk upgrade."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Versi yang baru sudah tersedia, apakah Anda ingin upgrade sekarang?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Upgrade sukses"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Apakah Anda ingin memulai ulang Kodi untuk menuntaskan proses upgrade?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Apakah Anda ingin memeriksa repositori untuk versi yang baru?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Telah tersedia Kodi stabil versi lebih baru."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Umum"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Aktifkan pengecekan versi Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Silakan masukkan kata sandi Anda"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Upgrade sistem seluruhnya"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Perbarui menggunakan apt"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Italian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Italian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ea87a62e22f628793d0a2e966410f882d112928f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Italian/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/xbmc-addons/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Ti raccomandiamo di aggiornare."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visita Kodi.tv per più informazioni."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Vuoi eliminare questo promemoria?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Puoi abilitare/disabilitare attraverso le impostazione dell'addon"
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Usa il tuo gestore pacchetti (apt) per aggiornare."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Una nuova versione è disponibile, vuoi aggiornare ora?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Aggiornamento effettuato con successo"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Vuoi riavviare l'Kodi per finire l'aggiornamento?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Vuoi verificare la presenza di un nuovo aggiornamento?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "E' disponibile una versione stabile di Kodi più recente."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Generale"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Abilita Kodi version check?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Inserisci la tua Password"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Aggiornamento completo del sistema"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Aggiorna utilizzando apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Una nuova versione stabile di di Kodi è disponibile "
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visita http://kodi.tv per più informazioni."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Una nuova versione stabile di di Kodi è disponibile."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visita http://kodi.tv per più informazioni."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Usa %s mentre %s è disponibile."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "E' raccomandato che tu aggiorni ad una nuova versione."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Japanese/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Japanese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..e2f677002145e5c3913c2288f2d442de3a95f01d
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Japanese/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/xbmc-addons/language/ja/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "一般"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Korean/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Korean/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..bc32baf5a55fdfebfa519f70903e5acb1ea1b6fd
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Korean/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/xbmc-addons/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "업그레이드를 권장합니다."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "자세한 정보는 Kodi.tv를 방문하세요."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "이 미리 알림을 삭제하겠습니까?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "애드온 설정에서 사용/사용하지 않음을 선택할 수 있습니다."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "패키지 관리자(apt)로 업그레이드 하세요."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "새 버전이 사용 가능합니다. 지금 업그레이드 하겠습니까?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "업그레이드 성공"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "업그레이드를 완료하기 위해 Kodi를 다시 시작 하겠습니까?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "저장소에서 새 버전을 확인하겠습니까?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "안정적인 Kodi 최신 버전이 있습니다."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "일반"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Kodi 버전을 검사하겠습니까?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "패스워드를 입력하세요"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "리눅스: 전체 시스템 업그레이드"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "리눅스: apt를 사용하여 업그레이드"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "안정적인 Kodi 새 버전을 사용할 수 있습니다."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "자세한 정보는 http://kodi.tv를 방문하세요."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "안정적인 Kodi 새 버전을 사용할 수 있습니다."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "자세한 정보는 http://kodi.tv를 방문하세요."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "현재 사용 중인 버전은 %s 이며 최신 버전 % 을(를) 사용할 수 있습니다"
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "새 버전으로 업그레이드 하기를 권장합니다."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Latvian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Latvian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ca52f5180734c96c99aa94d1b177dd562588d5e4
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Latvian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/xbmc-addons/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Vispārīgi"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Lithuanian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Lithuanian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..7fa3579d433d81c6f134f94542495585260ea561
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Lithuanian/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/xbmc-addons/language/lt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Norėtume pasiūlyti jums atsinaujinti."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Apsilankykite Kodi.tv, norėdami gauti daugiau informacijos."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Ar norite paašalinti šį priminimą?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Tai galima išjungti/įjungti priedo nustatymuose."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Naudokite paketo tvarkyklę (apt), norėdami atnaujinti."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Pasiekiama nauja versija, ar norite atnaujinti dabar?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Atnaujinimas sėkmingas"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Ar norite iš naujo paleisti Kodi, kad užbaigti atnaujinimą?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Ar norite patikrinti saugykloje, ar yra nauja versija?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Galima naujesnė stabili Kodi versija."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Pagrindinis"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Įjungti Kodi versijos tikrinimą?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Įveskite slaptažodį"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: atnaujinti visą sistemą"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: atnaujinti naudojant apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Galima nauja Kodi versija."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Apsilankykite http://kodi.tv, norėdami gauti daugiau informacijos."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Galima nauja stabili Kodi versija."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Apsilankykite http://kodi.tv, norėdami gauti daugiau informacijos."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Naudojama %s, kai yra prieinama %s."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Rekomenduojama atnaujinti į naujesnę versiją."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Macedonian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Macedonian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..439a43314928ae3fc1423e8ce58d6f77f2b10a07
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Macedonian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/xbmc-addons/language/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Општо"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Malay/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Malay/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..0ea477661681c794b2f34603a7b5ae2e6a29ed81
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Malay/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Malay (http://www.transifex.com/projects/p/xbmc-addons/language/ms/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ms\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Am"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Malayalam/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Malayalam/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..cc00a0289c75437b4195fb0a8b9b5c8993aa770d
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Malayalam/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/xbmc-addons/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "പോതുവായത്"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Maltese/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Maltese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..d4cdc60f4efdb9d89da67befdecdb7597d4047bb
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Maltese/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Maltese (http://www.transifex.com/projects/p/xbmc-addons/language/mt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mt\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Ġenerali"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Mongolian (Mongolia)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Mongolian (Mongolia)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..51c68ec3d6ea97356d2be3ac625d13fe98f518a8
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Mongolian (Mongolia)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Mongolian (Mongolia) (http://www.transifex.com/projects/p/xbmc-addons/language/mn_MN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn_MN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Ерөнхий"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Norwegian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Norwegian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..cefb39d6520387d6ec9ca441a2531f4ff4421362
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Norwegian/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Norwegian (http://www.transifex.com/projects/p/xbmc-addons/language/no/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: no\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Vi ønsker å anbefale at du oppgraderer."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Besøk Kodi.tv for mer informasjon"
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Ønsker du å fjerne denne påminnelsen?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Du kan aktivere/deaktivere det gjennom utvidelsesinnstillingene."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Bruk pakkebehandleren (apt) din for å oppgradere."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "En ny versjon er tilgjengelig, ønsker du å oppgradere nå?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Vellykket oppgradering"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Ønsker du å starte Kodi på nytt for å fullføre oppgraderingen?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Ønsker du å sjekke pakkebrønnen etter en ny versjon?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Det er en nyere stabil Kodi versjon tilgjengelig."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Generelt"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Aktiver Kodi versjonsettersyn"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Vennlingst skriv inn ditt passord"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Oppgrader hele systemet"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Oppgrader med apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "En ny stabil versjon av Kodi er tilgjengelig."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Se http://kodi.tv for mer informasjon."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "En ny stabil versjon av Kodi er tilgjengelig."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Se http://kodi.tv for mer informasjon."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Bruker %s mens %s er tilgjengelig."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Det er anbefalt å oppgradere til en nyere versjon."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Persian (Iran)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Persian (Iran)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..31075a0c5a2136255f973311fb905b284309dac5
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Persian (Iran)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/xbmc-addons/language/fa_IR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa_IR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "عمومی"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Persian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Persian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..eed149539dbedf4173dad55ddf67a2bfbbbe60e0
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Persian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/xbmc-addons/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "عمومی"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Polish/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Polish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..3fc994317fe717c86f7f0431f047530dab618d6e
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Polish/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/xbmc-addons/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Zaleca się uaktualnienie do nowszej wersji."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Odwiedź stronę Kodi.tv po więcej informacji."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Usunąć to przypomnienie?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Można to włączyć/wyłączyć w ustawieniach wtyczki."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Używaj własnego menedżera pakietów (apt) do aktualizacji."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Dostępna jest nowa wersja, chcesz teraz aktualizować?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Aktualizacja powiodła się"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Chcesz zrestartować Kodi, aby dokończyć aktualizację?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Czy chcesz sprawdzić repozytorium czy jest nowa wersja?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Dostępna jest nowa stabilna wersja Kodi"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Ogólne"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Sprawdzać wersję Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Wprowadź hasło"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: aktualizacja systemu kompletna"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Aktualizuj za pomocą menadżera pakietów (apt)"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Dostępna jest nowa, stabilna wersja Kodi."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Odwiedź stronę http://kodi.tv po więcej informacji."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Dostępna jest nowa, stabilna wersja Kodi."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Odwiedź stronę http://kodi.tv po więcej informacji."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Korzystasz z %s a dostępna jest już wersja %s."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Zaleca się uaktualnienie do nowszej wersji."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Portuguese (Brazil)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Portuguese (Brazil)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..296ee05939f9d47c161aa685957f61b63a312598
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Portuguese (Brazil)/strings.po	
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xbmc-addons/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Gostaríamos de recomendar-lhe que atualize."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visite Kodi.tv para maiores informações."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Gostaria de remover este lembrete?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Podes ativar/desativar através dos ajustes do add-on."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Use seu gerenciador de pacotes(apt) para atualizar."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Uma nova versão está disponível, você quer atualizara agora?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Atualização efetuada com sucesso"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Você deseja reiniciar o Kodi após atualização finalizar?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Deseja verificar se há uma nova versão no repositório?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Existe uma nova versão estável do Kodi disponível."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Geral"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Habilitar verificação de versão do Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Por favor entre sua senha"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Atualizar o sistema completamente"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Atualizar usando apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Uma nova versão estável do Kodi se encontra disponível."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "visite http://kodi.tv para maiores informações."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Uma nova versão estável do Kodi se encontra disponível."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visite http://kodi.tv para maiores informações."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Usando %s enquanto %s está disponível."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Recomendável que você atualize para versão mais recente."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Portuguese/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Portuguese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..b9a2a4b890de146619e446e0284d257517c0e057
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Portuguese/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/xbmc-addons/language/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Gostaríamos de lhe recomendar que actualizasse o Kodi."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visite kodi.tv para mais informação."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Gostaria de anular este lembrete?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Pode activá-lo/desactivá-lo através das definições de addon."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Use o gestor de pacotes(apt) para actualizar."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Uma nova versão está disponível, deseja actualizar agora?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "A actualização foi concluída"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Deseja reiniciar o Kodi para concluir a actualização?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Deseja procurar por uma nova versão no repositório?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Está disponível uma versão mais recente do Kodi."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Geral"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Activar verificação de versão do Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Por favor, introduza a sua palavra-passe"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Actualização completa do sistema"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Actualizar com apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Está disponível uma nova versão do Kodi."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visite http://kodi.tv para mais informação."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Está disponível uma nova versão do Kodi."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visite http://kodi.tv para mais informação."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Possuis a %s embora esteja disponível a %s."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Recomenda-se que actualize para uma versão mais recente."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Romanian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Romanian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..d7363d30a533a36bf3300e7805754b3f71169f61
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Romanian/strings.po
@@ -0,0 +1,73 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/xbmc-addons/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Vizitați Kodi.tv pentru mai multe informații"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Doriți să reporniți Kodi pentru a finaliza actualizarea?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Doriți să verificați dacă în depozit este o versiune mai nouă?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Este disponibilă o nouă versiune stabilă pentru Kodi."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Activați Verificare versiune Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Introduceți parola dumneavoastră"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Actualizare folosind apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Este disponibilă o versiune stabilă mai nouă pentru Kodi."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Vizitați http://kodi.tv pentru mai multe informații."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Este disponibilă o versiune stabilă mai nouă pentru Kodi."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Vizitați http://kodi.tv pentru mai multe informații."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Folosiți versiunea %s în timp ce versiunea %s este disponibilă."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Este recomandat să treceți la o versiune mai nouă."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Russian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Russian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..efc608edf2fa9c09e7687d4779a844bb9716aade
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Russian/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/xbmc-addons/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Мы рекомендуем Вам обновиться."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Для более полной информации посетите Kodi.tv."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Вы хотите убрать это напоминание?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Вы можете включить/выключить это в разделе настроек дополнений."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Используйте Ваш менеджер пакетов (apt) чтобы обновиться."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Доступна новая версия, хотите ли Вы обновить её сейчас?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Обновление завершено"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Перезагрузить Kodi, чтобы завершить обновление ?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Вы хотите проверить репозиторий на наличие новой версии?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Доступна новая стабильная версия Kodi ."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Основные"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Включить проверку выхода новых версий Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Пожалуйста, введите Ваш пароль"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Полное обновление системы"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Обновление с помощью apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Доступна новая стабильная версия Kodi."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Для более полной информации посетите http://kodi.tv"
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Доступна новая стабильная версия Kodi."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Для более полной информации посетите http://kodi.tv"
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Вы используете %s, но обновленная версия %s уже доступна."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Рекомендуется обновление до новой версии."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Serbian (Cyrillic)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Serbian (Cyrillic)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..de861fec96aefd00f994ebf323510e0679aa0a92
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Serbian (Cyrillic)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Serbian (Cyrillic) (http://www.transifex.com/projects/p/xbmc-addons/language/sr_RS/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr_RS\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Опште"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Serbian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Serbian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..922d46f94d55ab87cf62add75300be4d24b4a18c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Serbian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/xbmc-addons/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Opšte"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Slovak/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Slovak/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..b4f7825ff91c950b7cc52b1ed96c1218e1bdd347
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Slovak/strings.po
@@ -0,0 +1,89 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/xbmc-addons/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Radi by sme vám odporučili aktualizáciu."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Pre viac informácií navštívte Kodi.tv"
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Chcete túto pripomienku odstrániť?"
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Pre aktualizáciu použite správcu balíkov(apt)."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Je k dispozícii nová verzia, chcete teraz spustiť aktualizáciu?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Aktualizácia bola úspešná"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Chcete opätovne spustiť Kodi pre dokončenie aktualizácie?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Chcete kontrolovať repozitár ohľadom novej verzie?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Je k dispozícii novšia stabilná verzia Kodi."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Všeobecné"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Zapnúť kontrolu verzií Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Zadajte, prosím, vaše heslo"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Aktualizovať kompletný systém"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Aktualizovať pomocou apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Nová stabilná verzia Kodi je k dipozícii."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Pre viac informácií navštívte http://kodi.tv."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Nová stabilná verzia Kodi je k dipozícii."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Pre viac informácií navštívte http://kodi.tv."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Slovenian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Slovenian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..051b85fe35c9865431b47720a84ff41f1973a67a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Slovenian/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/xbmc-addons/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Predlagamo vam nadgradnjo."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Za dodatne informacije obiščite Kodi.tv."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Želite odstraniti ta opomnik?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Omogočite/onemogočite ga lahko prek nastavitev dodatkov."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Za nadgradnjo uporabite upravitelja paketov (apt)."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Na voljo je nova različica, želite zdaj izvesti nadgradnjo?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Nadgradnja je uspela."
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Želite ponovno zagnati Kodi, da zaključite z nadgradnjo?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Želite preveriti, če je v skladišču na voljo novejša različica?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Na voljo je novejša stabilna različica Kodija."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Splošno"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Želite omogočiti preverjanje različice Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Vnesite svoje geslo"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "GNU/Linux: nadgradite celoten sistem"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "GNU/Linux: nadgradite z apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Na voljo je nova stabilna različica Kodija."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Za dodatne informacije obiščite http://kodi.tv"
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Na voljo je nova stabilna različica Kodija."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Za dodatne informacije obiščite Kodi.tv."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Uporabljate %s, ko je na voljo že %s."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Priporočamo, da nadgradite sistem na novejšo različico."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish (Argentina)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish (Argentina)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..c0d26db1d587803f3b5589c2fe4aef829e7c1bc9
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish (Argentina)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/xbmc-addons/language/es_AR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish (Mexico)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish (Mexico)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..a737594b5801bff513caa00256379158bb7a0ba8
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish (Mexico)/strings.po	
@@ -0,0 +1,33 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/xbmc-addons/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Nos gustaria recomendarle actualizar."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visita Kodi.tv para mas informacion."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Usted quiere remover este recordatorio?"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..596578e9a03b86596a3ad8198a47fd9969ab2695
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Spanish/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/xbmc-addons/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Le recomendamos que actualice."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Visite Kodi.tv para más información."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "¿Desea eliminar este recordatorio?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Puede activarlo/desactivarlo a través de los ajustes del add-on ."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Use su administrador de paquetes (apt) para actualizar."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Está disponible una nueva versión, ¿deseas actualizar ahora?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Actualización correcta"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "¿Deseas reiniciar Kodi para terminar la actualización?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "¿Quieres comprobar el repositorio para una nueva versión?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Hay una versión de Kodi estable más reciente disponible."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "General"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "¿Activar la comprobación de versión de Kodi?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Por favor introduce tu contraseña"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Actualizar sistema completo"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Actualizar usado apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Una nueva versión estable de Kodi está disponible."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visite http://kodi.tv para más información."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Una nueva versión estable de Kodi está disponible."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Visite http://kodi.tv para más información."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Usando %s mientras que %s está disponible."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Se recomienda que actualice a una nueva versión."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Swedish/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Swedish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..3e52d1c1bca18183e52e0124ac5ce615d9997811
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Swedish/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/xbmc-addons/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Vi rekommenderar dig att uppgradera."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Besök Kodi.tv för mer information."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Vill du radera denna påminnelse?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Du kan aktivera/inaktivera detta i tilläggsinställningarna."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Använd din pakethanterare (apt) för att uppgradera."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "En ny version är tillgänglig, vill du uppgradera nu?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Uppgradering lyckades"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Vill du starta om Kodi för att slutföra uppgraderingen?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Vill du kontrollera förrådet efter en ny version?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Det finns en nyare stabil Kodi-version tillgänglig."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Allmänna"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Aktivera Kodi versionskontroll?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Var god ange ditt lösenord"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Uppdatera hela systemet"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: Uppgradera med apt"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "En ny stabil Kodi-version finns tillgänglig."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Besök Kodi.tv för mer information."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "En ny stabil Kodi-version finns tillgänglig."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Besök Kodi.tv för mer information."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "Använder %s medan %s är tillgänglig."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Vi rekommenderar att du uppgraderar till en nyare version."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Tamil (India)/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Tamil (India)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..8a7007685c770217bde13dadd5cc6dc756be5060
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Tamil (India)/strings.po	
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/xbmc-addons/language/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "பொதுவானது"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Thai/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Thai/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..c76bc3bdc7458f0be31ad5135f8b386887fcba49
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Thai/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/xbmc-addons/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "ทั่วไป"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Turkish/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Turkish/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..a6ee608f3272656541593e30a83d8c08321a8f3d
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Turkish/strings.po
@@ -0,0 +1,101 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/xbmc-addons/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32001"
+msgid "We would like to recommend you to upgrade."
+msgstr "Sürüm güncellemenizi tavsiye ederiz."
+
+msgctxt "#32002"
+msgid "Visit Kodi.tv for more information."
+msgstr "Daha fazla bilgi için Kodi.tv adresini ziyaret edin."
+
+msgctxt "#32009"
+msgid "Would you like to remove this reminder?"
+msgstr "Bu hatırlatmayı kaldırmak ister misiniz?"
+
+msgctxt "#32010"
+msgid "You can enable/disable it through add-on settings."
+msgstr "Eklenti ayarlarından etkinleştirip veya devre dışı bırakabilirsiniz."
+
+msgctxt "#32011"
+msgid "Use your package manager(apt) to upgrade."
+msgstr "Güncelleme için paket yöneticinizi(apt) kullanın."
+
+msgctxt "#32012"
+msgid "A new version is available, do you want to upgrade now?"
+msgstr "Yeni bir sürüm mevcut, şimdi güncellemek ister misiniz?"
+
+msgctxt "#32013"
+msgid "Upgrade successful"
+msgstr "Güncelleme başarılı"
+
+msgctxt "#32014"
+msgid "Do you want to restart Kodi to finish the upgrade?"
+msgstr "Güncellemeyi tamamlamak için Kodi'yi yeniden başlatmak ister misiniz?"
+
+msgctxt "#32015"
+msgid "Do you want to check the repository for a new version?"
+msgstr "Yeni bir sürüm için depoyu kontrol etmek ister misiniz?"
+
+msgctxt "#32016"
+msgid "There is a newer stable Kodi version available."
+msgstr "Daha yeni kararlı bir Kodi sürümü mevcut."
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Genel"
+
+msgctxt "#32021"
+msgid "Enable Kodi version check?"
+msgstr "Kodi sürüm kontrolünü etkinleştirmek ister misiniz?"
+
+msgctxt "#32022"
+msgid "Please enter your password"
+msgstr "Lütfen parolanızı girin"
+
+msgctxt "#32023"
+msgid "Linux: Upgrade complete system"
+msgstr "Linux: Tüm sistemi güncelle"
+
+msgctxt "#32024"
+msgid "Linux: Upgrade using apt"
+msgstr "Linux: apt kullanarak güncelle"
+
+msgctxt "#32030"
+msgid "A new stable version of Kodi is available."
+msgstr "Yeni kararlı bir Kodi sürümü mevcut."
+
+msgctxt "#32031"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Daha fazla bilgi için http://kodi.tv adresini ziyaret edin."
+
+msgctxt "#32032"
+msgid "A new stable version of Kodi is available."
+msgstr "Yeni kararlı bir Kodi sürümü mevcut."
+
+msgctxt "#32033"
+msgid "Visit http://kodi.tv for more information."
+msgstr "Daha fazla bilgi için http://kodi.tv adresini ziyaret edin."
+
+msgctxt "#32034"
+msgid "Using %s while %s is available."
+msgstr "%s kullanırken %s mevcut."
+
+msgctxt "#32035"
+msgid "It is recommended that you to upgrade to a newer version."
+msgstr "Daha yeni bir sürüme güncellemeniz önerilir."
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Ukrainian/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Ukrainian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..7031ed8949ddbc02fe6ba5d144ae8a27ddbe11a4
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Ukrainian/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xbmc-addons/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Загальні"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Uzbek/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Uzbek/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ef286dc13dd58ab12fedcc01d4efb4590d58c3e0
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Uzbek/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Uzbek (http://www.transifex.com/projects/p/xbmc-addons/language/uz/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uz\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Umumiy"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Vietnamese/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Vietnamese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..03a22cfcd9229b1f71a64607f0818cfaede3f6e3
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Vietnamese/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/xbmc-addons/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Chung"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Welsh/strings.po b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Welsh/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..a7ba85f2093b2465fd5e0813f51664fa364a5bfd
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/language/Welsh/strings.po
@@ -0,0 +1,21 @@
+# Kodi Media Center language file
+# Addon Name: Version Check
+# Addon id: service.xbmc.versioncheck
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/xbmc-addons/language/cy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+
+msgctxt "#32020"
+msgid "General"
+msgstr "Cyffredinol"
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/polkit/10-allow-update.pkla b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/polkit/10-allow-update.pkla
new file mode 100644
index 0000000000000000000000000000000000000000..a5135348ef9cf863b3a818176a77e439b11ef032
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/polkit/10-allow-update.pkla
@@ -0,0 +1,6 @@
+[Untrusted Upgrade]
+Identity=unix-user:xbmc
+Action=org.debian.apt.upgrade-packages;org.debian.apt.update-cache
+ResultAny=no
+ResultInactive=yes
+ResultActive=yes
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/polkit/README b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/polkit/README
new file mode 100644
index 0000000000000000000000000000000000000000..c3a1a451341e81449eb0afe695efdbad50bd9f21
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/polkit/README
@@ -0,0 +1,10 @@
+If you run xbmc standalone and/or do want to have password less upgrades, copy the file 10-allow-update.conf to /etc/polkit-1/localauthority/50-local.d/
+
+Make sure to adjust the username if it is different from "xbmc"
+
+For this to work, you must have python-apt and  python-aptdaemon installed:
+sudo apt-get install python-apt python-aptdaemon
+
+
+If those packages are not installed, this script will fallback to calling apt directly and ask you for your password.
+
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/settings.xml b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad7824ccfb3b840a3a494862aa1bbdb11e704dc2
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/settings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<settings>
+    <category label="32020">
+        <setting label="32021" type="bool" id="versioncheck_enable" default="true"/>
+        <setting label="32023" type="bool" id="upgrade_system" default="false"/>
+        <setting label="32024" type="bool" id="upgrade_apt" default="false"/>
+    </category>
+</settings>
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/versions.txt b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/versions.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f8c82a1100898c0f3ab2435e4fa0ccd9f27f6b3b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/resources/versions.txt
@@ -0,0 +1,789 @@
+{
+    "jsonrpc": "2.0",
+    "releases": {
+        "stable": [
+            {
+                "major": "15",
+                "minor": "2",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20151019-02e7013",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "1",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20150816-f4dda26",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20150721-2f34a0c",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "2",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20150326-7cc53a9",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "1",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20150129-38e4046",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20141223-ad747d9",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "2",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20140817-0f3db05",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "1",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20140604-84725b0",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20140505-f42f5b5",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "12",
+                "minor": "3",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20131212-9ed3e58",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "12",
+                "minor": "2",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20130502-32b1a5e",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "12",
+                "minor": "1",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20130317-0d373cc",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20130127-fb595f2",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
+                "major": "11",
+                "minor": "0",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20120321-14feb09",
+                "extrainfo": "final",
+                "addon_support": "no"
+            },
+            {
+                "major": "10",
+                "minor": "1",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "",
+                "extrainfo": "final",
+                "addon_support": "no"
+            },
+            {
+                "major": "10",
+                "minor": "0",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "",
+                "extrainfo": "final",
+                "addon_support": "no"
+            }
+        ],
+        "releasecandidate": [
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20160120-981b7dd",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "2",
+                "tag": "releasecandidate",
+                "tagversion":"2",
+                "revision": "20150920-4ed3eb6",
+                "extrainfo": "RC2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "2",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20150828-59716ca",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "1",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20150810-31c22e4",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"2",
+                "revision": "20150711-0aa930b",
+                "extrainfo": "RC2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20150702-9ff25f8",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"3",
+                "revision": "20141208-bdf56d0",
+                "extrainfo": "RC3",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"2",
+                "revision": "20141203-35b4f38",
+                "extrainfo": "RC2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20141130-ea20b83",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "2",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20140808-e4a47cc",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "1",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20140525-4410736",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20140427-2372235",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"3",
+                "revision": "20130127-fb595f2",
+                "extrainfo": "RC3",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"2",
+                "revision": "20121219-74b907c",
+                "extrainfo": "RC2",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20121210-baaa51c",
+                "extrainfo": "RC1",
+                "addon_support": "no"
+            },
+            {
+                "major": "11",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"2",
+                "revision": "20120229-f38655f",
+                "extrainfo": "RC2",
+                "addon_support": "no"
+            },
+            {
+                "major": "11",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20120226-30312f1",
+                "extrainfo": "RC1",
+                "addon_support": "no"
+            }
+        ],
+        "beta": [
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"5",
+                "revision": "20160110-9d9a153",
+                "addon_support": "yes"
+            },
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"4",
+                "revision": "20151213-a724f29",
+                "addon_support": "yes"
+            },
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"3",
+                "revision": "20151205-85a0a13",
+                "addon_support": "yes"
+            },
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20151121-98e0275",
+                "addon_support": "yes"
+            },
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20151113-9c7322e",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20150614-daedd5f",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20150501-d1a2c33",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"5",
+                "revision": "20141125-4465fbf",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"4",
+                "revision": "20141124-ec361ca",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"3",
+                "revision": "20141116-88a9a44",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20141108-2d88a9a",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20141103-d6947be",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "2",
+                "tag": "beta",
+                "tagversion":"3",
+                "revision": "20140802-6066a54",
+                "extrainfo": "beta3",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "2",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20140719-6d3bb09",
+                "extrainfo": "beta2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "2",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20140711-450924a",
+                "extrainfo": "beta1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "1",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20140518-a6a2713",
+                "extrainfo": "beta2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "1",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20140511-692cfba",
+                "extrainfo": "beta1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"4",
+                "revision": "20140418-482ccd3",
+                "extrainfo": "beta4",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"3",
+                "revision": "20140328-2dcc855",
+                "extrainfo": "beta3",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20140315-a1cab7a",
+                "extrainfo": "beta2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20140303-128426f",
+                "extrainfo": "beta1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"3",
+                "revision": "20121210-baaa51c",
+                "extrainfo": "beta3",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20121201-192701b",
+                "extrainfo": "beta2",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20121116-f7dc858",
+                "extrainfo": "beta1-repack",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20121114-25bb46a",
+                "extrainfo": "beta1",
+                "addon_support": "no"
+            },
+            {
+                "major": "11",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"3",
+                "revision": "20120207-1fef727",
+                "extrainfo": "beta3",
+                "addon_support": "no"
+            }            ,
+            {
+                "major": "11",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20120120-f76c547",
+                "extrainfo": "beta2",
+                "addon_support": "no"
+            },
+            {
+                "major": "11",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"1",
+                "revision": "20111222-22ad8e4",
+                "extrainfo": "beta1",
+                "addon_support": "no"
+            }
+        ],
+        "alpha": [
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "alpha",
+                "tagversion":"3",
+                "revision": "20151001-ca8d08c",
+                "addon_support": "yes"
+            },
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "alpha",
+                "tagversion":"2",
+                "revision": "20150831-b4afc20",
+                "addon_support": "yes"
+            },
+            {
+                "major": "16",
+                "minor": "0",
+                "tag": "alpha",
+                "tagversion":"1",
+                "revision": "20150801-c5f806e",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "alpha",
+                "tagversion":"2",
+                "revision": "20150331-32c1f53",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "alpha",
+                "tagversion":"1",
+                "revision": "20150228-5dc1a55",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "alpha",
+                "tagversion":"5",
+                "revision": "20141002-d2a4ee9",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "alpha",
+                "tagversion":"4",
+                "revision": "20141002-d2a4ee9",
+                "extrainfo": "alpha4",
+                "addon_support": "yes"
+            },
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "alpha",
+                "tagversion":"3",
+                "revision": "20140831-d6c3ef3",
+                "extrainfo": "alpha3",
+                "addon_support": "yes"
+            }
+        ],
+        "prealpha": [
+            {
+                "major": "14",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"2",
+                "revision": "20140801-62d01f6",
+                "extrainfo": "alpha2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"11",
+                "revision": "20131231-8eb49b3",
+                "extrainfo": "alpha11",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"10",
+                "revision": "20131201-91e5be5",
+                "extrainfo": "alpha10",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"9",
+                "revision": "20131031-26b92f4",
+                "extrainfo": "alpha9",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"8",
+                "revision": "20130929-494c67a",
+                "extrainfo": "alpha8",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"7",
+                "revision": "20130831-2da9c97",
+                "extrainfo": "alpha7",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"6",
+                "revision": "20130630-30f4a79",
+                "extrainfo": "alpha6",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"5",
+                "revision": "20130630-9188e6a",
+                "extrainfo": "alpha5",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"4",
+                "revision": "20130531-0ccc594",
+                "extrainfo": "alpha4",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"3",
+                "revision": "20130430-e8fe5cf",
+                "extrainfo": "alpha3",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"2",
+                "revision": "20130331-194c408",
+                "extrainfo": "alpha2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "13",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"1",
+                "revision": "20130227-8d2e0fe",
+                "extrainfo": "alpha1",
+                "addon_support": "yes"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"7",
+                "revision": "20121102-e292b11",
+                "extrainfo": "alpha7",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"6",
+                "revision": "20121001-f4d8117",
+                "extrainfo": "alpha6",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"5",
+                "revision": "20120831-12840c2",
+                "extrainfo": "alpha5",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"4",
+                "revision": "20120801-e4443f2",
+                "extrainfo": "alpha4",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"3",
+                "revision": "20120701-37fc72c",
+                "extrainfo": "alpha3",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tag": "prealpha",
+                "tagversion":"2",
+                "revision": "20120531-1495cbe",
+                "extrainfo": "alpha2",
+                "addon_support": "no"
+            },
+            {
+                "major": "12",
+                "minor": "0",
+                "tagversion":"1",
+                "tag": "prealpha",
+                "revision": "20120430-4505d08",
+                "extrainfo": "alpha1",
+                "addon_support": "no"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/service.py b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/service.py
new file mode 100644
index 0000000000000000000000000000000000000000..c4292dc7cea020c7c54bb4a9faf8dea8f2b0ef69
--- /dev/null
+++ b/packages/mediacenter/kodi/config/base-addons/service.xbmc.versioncheck/service.py
@@ -0,0 +1,104 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+#     Copyright (C) 2013 Team-XBMC
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import platform
+import xbmc
+import lib.common
+from lib.common import log, dialog_yesno
+from lib.common import upgrade_message as _upgrademessage
+from lib.common import upgrade_message2 as _upgrademessage2
+
+ADDON        = lib.common.ADDON
+ADDONVERSION = lib.common.ADDONVERSION
+ADDONNAME    = lib.common.ADDONNAME
+ADDONPATH    = lib.common.ADDONPATH
+ICON         = lib.common.ICON
+oldversion = False
+
+class Main:
+    def __init__(self):
+        linux = False
+        packages = []
+        xbmc.sleep(5000)
+        if xbmc.getCondVisibility('System.Platform.Linux') and ADDON.getSetting("upgrade_apt") == 'true':
+            packages = ['kodi']
+            _versionchecklinux(packages)
+        else:
+            oldversion, version_installed, version_available, version_stable = _versioncheck()
+            if oldversion:
+                _upgrademessage2( version_installed, version_available, version_stable, oldversion, False)
+                
+def _versioncheck():
+    # initial vars
+    from lib.jsoninterface import get_installedversion, get_versionfilelist
+    from lib.versions import compare_version
+    # retrieve versionlists from supplied version file
+    versionlist = get_versionfilelist()
+    # retrieve version installed
+    version_installed = get_installedversion()
+    # copmpare installed and available
+    oldversion, version_installed, version_available, version_stable = compare_version(version_installed, versionlist)
+    return oldversion, version_installed, version_available, version_stable
+
+
+def _versionchecklinux(packages):
+    if platform.dist()[0].lower() in ['ubuntu', 'debian', 'linuxmint']:
+        handler = False
+        result = False
+        try:
+            # try aptdeamon first
+            from lib.aptdeamonhandler import AptdeamonHandler
+            handler = AptdeamonHandler()
+        except:
+            # fallback to shell
+            # since we need the user password, ask to check for new version first
+            from lib.shellhandlerapt import ShellHandlerApt
+            sudo = True
+            handler = ShellHandlerApt(sudo)
+            if dialog_yesno(32015):
+                pass
+            elif dialog_yesno(32009, 32010):
+                log("disabling addon by user request")
+                ADDON.setSetting("versioncheck_enable", 'false')
+                return
+
+        if handler:
+            if handler.check_upgrade_available(packages[0]):
+                if _upgrademessage(32012, oldversion, True):
+                    if ADDON.getSetting("upgrade_system") == "false":
+                        result = handler.upgrade_package(packages[0])
+                    else:
+                        result = handler.upgrade_system()
+                    if result:
+                        from lib.common import message_upgrade_success, message_restart
+                        message_upgrade_success()
+                        message_restart()
+                    else:
+                        log("Error during upgrade")
+        else:
+            log("Error: no handler found")
+    else:
+        log("Unsupported platform %s" %platform.dist()[0])
+        sys.exit(0)
+
+
+
+if (__name__ == "__main__"):
+    log('Version %s started' % ADDONVERSION)
+    Main()
diff --git a/packages/mediacenter/kodi/config/guisettings.xml b/packages/mediacenter/kodi/config/guisettings.xml
index 30e36075233b05777fd213b858a9e0433ce7bbdc..caf87ebfb2b762f6e859ecb2d95c3e118ebf529c 100644
--- a/packages/mediacenter/kodi/config/guisettings.xml
+++ b/packages/mediacenter/kodi/config/guisettings.xml
@@ -2,7 +2,7 @@
     <accessibility>
         <audiohearing default="true">false</audiohearing>
         <audiovisual default="true">false</audiovisual>
-        <subhearing>true</subhearing>
+        <subhearing default="true">false</subhearing>
     </accessibility>
     <audiocds>
         <autoaction>2</autoaction>
@@ -68,8 +68,8 @@
     <epg>
         <daystodisplay>7</daystodisplay>
         <epgupdate default="true">120</epgupdate>
-        <hidenoinfoavailable>false</hidenoinfoavailable>
-        <ignoredbforclient default="true">true</ignoredbforclient>
+        <hidenoinfoavailable default="true">true</hidenoinfoavailable>
+        <ignoredbforclient>true</ignoredbforclient>
         <preventupdateswhileplayingtv>false</preventupdateswhileplayingtv>
         <selectaction>1</selectaction>
     </epg>
@@ -119,7 +119,7 @@
     </locale>
     <lookandfeel>
         <enablerssfeeds>false</enablerssfeeds>
-        <font default="true">Default</font>
+        <font>default</font>
         <rssedit default="true"></rssedit>
         <skin>skin.titan.beta</skin>
         <skincolors default="true">SKINDEFAULT</skincolors>
@@ -143,10 +143,10 @@
         <usetags default="true">true</usetags>
     </musicfiles>
     <musiclibrary>
-        <albumsscraper>metadata.albums.theaudiodb.com</albumsscraper>
-        <artistsscraper>metadata.artists.theaudiodb.com</artistsscraper>
+        <albumsscraper default="true">metadata.album.universal</albumsscraper>
+        <artistsscraper default="true">metadata.artists.universal</artistsscraper>
         <backgroundupdate default="true">false</backgroundupdate>
-        <downloadinfo default="true">false</downloadinfo>
+        <downloadinfo>true</downloadinfo>
         <overridetags>true</overridetags>
         <showallitems>false</showallitems>
         <showcompilationartists default="true">true</showcompilationartists>
@@ -237,7 +237,7 @@
         <fps>1</fps>
         <playminimized>false</playminimized>
         <scantime>5</scantime>
-        <signalquality default="true">false</signalquality>
+        <signalquality>false</signalquality>
         <startlast default="true">0</startlast>
     </pvrplayback>
     <pvrpowermanagement>
@@ -246,7 +246,7 @@
         <dailywakeuptime default="true">00:00:00</dailywakeuptime>
         <enabled default="true">false</enabled>
         <prewakeup default="true">15</prewakeup>
-        <setwakeupcmd default="true">/usr/bin/setwakeup.sh</setwakeupcmd>
+        <setwakeupcmd default="true"></setwakeupcmd>
     </pvrpowermanagement>
     <pvrrecord>
         <defaultlifetime default="true">99</defaultlifetime>
@@ -268,7 +268,7 @@
         <usemusicvisinstead default="true">true</usemusicvisinstead>
     </screensaver>
     <services>
-        <airplay>false</airplay>
+        <airplay default="true">false</airplay>
         <airplayios8compat default="true">true</airplayios8compat>
         <airplaypassword default="true"></airplaypassword>
         <airplayvolumecontrol default="true">true</airplayvolumecontrol>
@@ -286,7 +286,7 @@
         <upnprenderer>true</upnprenderer>
         <upnpserver>true</upnpserver>
         <useairplaypassword default="true">false</useairplaypassword>
-        <webserver default="true">true</webserver>
+        <webserver>true</webserver>
         <webserverpassword default="true"></webserverpassword>
         <webserverport default="true">8080</webserverport>
         <webserverusername></webserverusername>
@@ -310,12 +310,12 @@
         <downloadfirst default="true">false</downloadfirst>
         <font>Chalkboard.ttf</font>
         <height>26</height>
-        <languages>Basque,Catalan,English,Galician,Spanish</languages>
+        <languages>Basque,Catalan,English,Galician,Spanish,original,default</languages>
         <movie>service.subtitles.opensubtitles</movie>
         <overrideassfonts>true</overrideassfonts>
         <parsecaptions>true</parsecaptions>
         <pauseonsearch default="true">true</pauseonsearch>
-        <stereoscopicdepth>6</stereoscopicdepth>
+        <stereoscopicdepth default="true">0</stereoscopicdepth>
         <storagemode default="true">0</storagemode>
         <style>0</style>
         <tv>service.subtitles.opensubtitles</tv>
@@ -628,8 +628,8 @@
         <setting type="bool" name="skin.titan.beta.SkinHelper.EnablePVRThumbs">false</setting>
         <setting type="bool" name="skin.titan.beta.ShowFanartBackground">true</setting>
         <setting type="bool" name="skin.titan.beta.SkinHelper.EnableExtraFanart">false</setting>
-        <setting type="bool" name="skin.titan.beta.DisableHeader">true</setting>
-        <setting type="bool" name="skin.titan.beta.AlwaysShowWeather">false</setting>
+        <setting type="bool" name="skin.titan.beta.DisableHeader">false</setting>
+        <setting type="bool" name="skin.titan.beta.AlwaysShowWeather">true</setting>
         <setting type="bool" name="skin.titan.beta.DisableSideBladeIndicator">true</setting>
         <setting type="bool" name="skin.titan.beta.SkinHelper.View.Disabled.50">false</setting>
         <setting type="bool" name="skin.titan.beta.SkinHelper.View.Disabled.10">false</setting>
@@ -802,7 +802,7 @@
         <setting type="bool" name="skin.titan.beta.UseExtendedInfoDialog">false</setting>
         <setting type="bool" name="skin.titan.beta.SkinHelper.ForcedViews.Enabled">true</setting>
         <setting type="bool" name="skin.titan.beta.ShowEpgGenreColors">true</setting>
-        <setting type="bool" name="skin.titan.beta.UseAltEpgProgress">true</setting>
+        <setting type="bool" name="skin.titan.beta.UseAltEpgProgress">false</setting>
         <setting type="bool" name="skin.titan.beta.HideChannelNamesInGuide">false</setting>
         <setting type="bool" name="skin.titan.beta.VerticalHomeTiles">false</setting>
         <setting type="bool" name="skin.titan.beta.VerticalHomeInlineSubmenu">false</setting>
@@ -941,7 +941,7 @@
         <setting type="bool" name="skin.titan.beta.animateMusicWall">false</setting>
         <setting type="bool" name="skin.titan.beta.DisableNowPlayingDiscArt">false</setting>
         <setting type="bool" name="skin.titan.beta.HomeMenuUsePlexforPictures">false</setting>
-        <setting type="bool" name="skin.titan.beta.EnhancedHome_Circular">false</setting>
+        <setting type="bool" name="skin.titan.beta.EnhancedHome_Circular">true</setting>
         <setting type="bool" name="skin.titan.beta.Vertical_Home_Animation">false</setting>
         <setting type="bool" name="skin.titan.beta.Widgets_Animation">false</setting>
         <setting type="bool" name="skin.titan.beta.View_501_HorizontalNavigation">false</setting>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/addon.xml b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/addon.xml
index fb84e60afbac14e790b7ff867c88410d7587c1c6..8663590cff232b3efac9e8ee92a293bc1704910e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/addon.xml
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/addon.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="plugin.video.SportsDevil"
-  version="2016.01.12"
+  version="2016.02.01"
   name="SportsDevil"
-  provider-name="MaxMustermann">
+  provider-name="SportsDevil">
   <requires>
    <import addon="xbmc.python" version="2.14.0"/>
    <import addon="script.module.requests" />
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/parser.py b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/parser.py
index 96aa81392636d7483f0864b9dea4754be4a262de..890235bdbc69c907830d1f5f1b2faf1ee589482b 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/parser.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/parser.py
@@ -306,10 +306,10 @@ class Parser(object):
     def __findRedirect(self, page, referer='', demystify=False):
         data = common.getHTML(page, None, referer=referer, xml=False, mobile=False, demystify=demystify)
         
-        if findVideoFrameLink(page, data):
+        if findContentRefreshLink(page, data):
+            return findContentRefreshLink(page, data)
+        elif findVideoFrameLink(page, data):
             return findVideoFrameLink(page, data)
-        elif findContentRefreshLink(data):
-            return findContentRefreshLink(data)
         elif findEmbedPHPLink(data):
             return findEmbedPHPLink(data)
             
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/decryptionUtils.py b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/decryptionUtils.py
index dc5b71488b9a848c7bea1630193e7d3690dfa22a..bf5c61997f34b233075c4e95e34ebb458f863f44 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/decryptionUtils.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/decryptionUtils.py
@@ -3,7 +3,7 @@ import pyDes
 import urllib
 import re
 from regexUtils import parseTextToGroups
-from javascriptUtils import JsFunctions, JsUnpacker, JsUnpacker95High, JsUnwiser, JsUnIonCube, JsUnFunc, JsUnPP, JsUnPush
+from javascriptUtils import JsFunctions, JsUnpacker, JsUnpackerV2, JsUnpacker95High, JsUnwiser, JsUnIonCube, JsUnFunc, JsUnPP, JsUnPush
 
 def encryptDES_ECB(data, key):
     data = data.encode()
@@ -79,6 +79,7 @@ def doDemystify(data):
     #init jsFunctions and jsUnpacker
     jsF = JsFunctions()
     jsU = JsUnpacker()
+    jsU2 = JsUnpackerV2()
     jsUW = JsUnwiser()
     jsUI = JsUnIonCube()
     jsUF = JsUnFunc()
@@ -215,6 +216,10 @@ def doDemystify(data):
     if jsU95.containsPacked(data):
         data = jsU95.unpackAll(data)
         escape_again=True
+        
+    if jsU2.containsPacked(data):
+        data = jsU2.unpackAll(data)
+        escape_again=True
     
     if jsU.containsPacked(data):
         data = jsU.unpackAll(data)
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/javascriptUtils.py b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/javascriptUtils.py
index 25935ef7a5d62a5e40d7f881a9b4f5d34090ec13..db291adab674c1ce4654a152b0bb77db2c41aca9 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/javascriptUtils.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/javascriptUtils.py
@@ -101,6 +101,72 @@ class JsUnpacker:
         return 'p,a,c,k,e,d' in data or 'p,a,c,k,e,r' in data
 
 
+class JsUnpackerV2:
+
+    def unpackAll(self, data):
+        try:
+            in_data=data
+            sPattern = '(eval\\(function\\(p,a,c,k,e,d.*)'
+            enc_data=re.compile(sPattern).findall(in_data)
+            #print 'enc_data',enc_data, len(enc_data)
+            if len(enc_data)==0:
+                sPattern = '(eval\\(function\\(p,a,c,k,e,r.*)'
+                enc_data=re.compile(sPattern).findall(in_data)
+                #print 'enc_data packer...',enc_data
+
+            for enc_val in enc_data:
+                unpack_val=self.unpack(enc_val)
+                in_data=in_data.replace(enc_val,unpack_val)
+            return in_data
+        except: 
+            traceback.print_exc(file=sys.stdout)
+            return data
+        
+        
+    def containsPacked(self, data):
+        return 'String.fromCharCode(c+29)' in data
+        
+    def unpack(self,sJavascript,iteration=1, totaliterations=1  ):
+
+        aSplit = sJavascript.split("rn p}('")
+
+        p1,a1,c1,k1=('','0','0','')
+        ss="p1,a1,c1,k1=(\'"+aSplit[1].split(".spli")[0]+')' 
+        exec(ss)
+        
+        k1=k1.split('|')
+        aSplit = aSplit[1].split("))'")
+        e = ''
+        d = ''#32823
+        sUnpacked1 = str(self.__unpack(p1, a1, c1, k1, e, d,iteration))
+        if iteration>=totaliterations:
+            return sUnpacked1
+        else:
+            return self.unpack(sUnpacked1,iteration+1)
+
+    def __unpack(self,p, a, c, k, e, d, iteration,v=1):
+        while (c >= 1):
+            c = c -1
+            if (k[c]):
+                aa=str(self.__itoaNew(c, a))
+                p=re.sub('\\b' + aa +'\\b', k[c], p)# THIS IS Bloody slow!
+        return p
+
+    def __itoa(self,num, radix):
+
+        result = ""
+        if num==0: return '0'
+        while num > 0:
+            result = "0123456789abcdefghijklmnopqrstuvwxyz"[num % radix] + result
+            num /= radix
+        return result
+    
+    def __itoaNew(self,cc, a):
+        aa="" if cc < a else self.__itoaNew(int(cc / a),a) 
+        cc = (cc % a)
+        bb=chr(cc + 29) if cc> 35 else str(self.__itoa(cc,36))
+        return aa+bb
+
 class JsUnpacker95High:
     def unpackAll(self, data):
         try:
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/scrapingUtils.py b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/scrapingUtils.py
index 22d0ecdbc5f92c1bb9bf105c83ea4cddc87f972b..2e2d81ec62338768447faa73339845a8f86cbf04 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/scrapingUtils.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/scrapingUtils.py
@@ -134,7 +134,7 @@ def findFrames(data):
     return regexUtils.findall(data, "(frame[^>]*)>")
 
 
-def findContentRefreshLink(data):
+def findContentRefreshLink(page, data):
     
     regex = '0;\s*url=([^\'" ]+)'
     links = regexUtils.findall(data, regex)
@@ -151,11 +151,12 @@ def findContentRefreshLink(data):
     if links:
         return links[0]
     
-    regex = 'href=[\'"]([^\'"]+)[\'"]\s*target="_blank"><img class="alignnone"'
+    #hd**ee.fv/cr**hd.fv/sp**ts4u.tv
+    regex = '<a\s*href="([^"]+)"\s*target="_blank"><img\s*(?:src="[^"]+"\s*height="\d+"\s*width="\d+"\s*longdesc="[^"]+"|class="alignnone"\s*src="[^"]*"\s*alt="[^"]*"\s*width="\d\d\d"\s*height="\d\d\d")'
     links = regexUtils.findall(data, regex)
     if links:
-        return links[0]
-        
+        return urlparse.urljoin(urllib.unquote(page), links[0]).strip()
+
     return None
 
 
@@ -178,7 +179,7 @@ def findVideoFrameLink(page, data):
     if not frames:
         return None
     
-    iframes = regexUtils.findall(data, "(frame(?![^>]*cbox\.ws)(?![^>]*Publi)(?![^>]*dailymotion)(?![^>]*blacktvlive\.)(?![^>]*chat\d*\.\w+)(?![^>]*ad122m)(?![^>]*adshell)(?![^>]*capacanal)(?![^>]*blacktvlive\.com)[^>]*\sheight\s*=\s*[\"']*([\%\d]+)(?:px)?[\"']*[^>]*>)")
+    iframes = regexUtils.findall(data, "(frame(?![^>]*cbox\.ws)(?![^>]*Publi)(?![^>]*dailymotion)(?![^>]*blacktvlive\.)(?![^>]*chat\d*\.\w+)(?![^>]*ad122m)(?![^>]*adshell)(?![^>]*capacanal)(?![^>]*waframedia)(?![^>]*Beba.tv/embed)(?![^>]*maxtags)(?![^>]*s/a1\.php)(?![^>]*right-sidebar)[^>]*\sheight\s*=\s*[\"']*([\%\d]+)(?:px)?[\"']*[^>]*>)")
 
     if iframes:
         for iframe in iframes:
@@ -220,8 +221,8 @@ def findVideoFrameLink(page, data):
     if m:
         return urlparse.urljoin(urllib.unquote(page), m[0]).strip()
     
-    m = regexUtils.findall(data, '<a\s*href="([^"]+)"\s*target="_blank"><img\s*src="[^"]+"\s*height="\d+"\s*width="\d+"\s*longdesc="[^"]+"\s*/></a>')
+    m = regexUtils.findall(data, r'playStream\(\'iframe\', \'[^\']*(https*:[^\']+)\'\)')
     if m:
         return urlparse.urljoin(urllib.unquote(page), m[0]).strip()
-        
+
     return None
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/webUtils.py b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/webUtils.py
index a083032106094d62d96af5a6ec43aec7061656a6..8db9e8e012126fea377021480932bce84d3fe248 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/webUtils.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/lib/utils/webUtils.py
@@ -34,7 +34,7 @@ class BaseRequest(object):
         self.s = requests.Session()
         if fileExists(self.cookie_file):
             self.s.cookies = self.load_cookies_from_lwp(self.cookie_file)
-        self.s.headers.update({'User-Agent' : 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36'})
+        self.s.headers.update({'User-Agent' : 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36'})
         self.s.headers.update({'Accept-Language' : 'en'})
         self.s.keep_alive = False
         self.url = ''
@@ -88,6 +88,9 @@ class BaseRequest(object):
             headers['X-Forwarded-For'] = '178.162.222.121'
         if 'playerapp1.pw' in urlparse.urlsplit(url).netloc:
             headers['X-Forwarded-For'] = '178.162.222.122'
+            
+        if 'finecast.tv' in urlparse.urlsplit(url).netloc:
+            self.s.headers.update({'Cookie' : 'PHPSESSID=d08b73a2b7e0945b3b1bb700f01f7d72'})
         
         if form_data:
             #ca**on.tv/key.php
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/04stream.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/04stream.txt
index 8093454b3bcc3bf3f04cec0f9c81fdf17ec1f680..56a9c77d2b8fcbc9140f149bc7b773d91d9ec45d 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/04stream.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/04stream.txt
@@ -19,5 +19,5 @@ item_info_convert=rowbalance
 item_info_build=rtmp://%s/stream/
 
 item_info_name=url
-item_info_from=rtmp+' playPath='+file+' swfUrl=http://thecdn.04stream.com/p/ooolo1.swf flashver=WIN\2020,0,0,267 timeout=15 live=1 pageUrl='+pageUrl
+item_info_from=rtmp+' playPath='+file+' swfUrl=http://thecdn.04stream.com/p/ooolo1.swf flashver=WIN\2020,0,0,286 timeout=15 live=1 pageUrl='+pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/__streams.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/__streams.cfg
index 5066f9c75d549515a401ab158c8f48a33b0d57b8..0bb660c0b4d71afd9a3e16852d8ccef25806abec 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/__streams.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/__streams.cfg
@@ -206,6 +206,11 @@ item_infos=VaughnSoftPlayer.swf\?k1=live&k2=([^/'"?&\s]+)
 item_precheck=VaughnSoftPlayer
 item_order=video
 @CATCH(vaughnlive,video)@
+########################################################
+item_infos=fnplayer.swf.*?k1=live&k2=([^/'"?&\s]+)
+item_precheck=fnplayer.swf
+item_order=video
+@CATCH(vaughnlive,video)@
 
 
 ########################################################
@@ -353,7 +358,15 @@ item_order=url
 
 item_info_name=type
 item_info_build=video
-item_url_build=%s swfUrl=http://www.shadow-net.biz/javascript/videojs/flashls/video-js.swf flashver=WIN\2020,0,0,267 live=true timeout=18 swfVfy=1 pageUrl=http://www.shadow-net.biz/
+item_url_build=%s swfUrl=http://www.shadow-net.biz/javascript/videojs/flashls/video-js.swf flashver=WIN\2020,0,0,286 live=true timeout=18 swfVfy=1 pageUrl=http://www.shadow-net.biz/
+########################################################
+item_infos=["'](rtmp://[\w\.:\-]+/[^"'/]+/[^"']+)["']
+item_precheck=playStream
+item_order=url
+
+item_info_name=type
+item_info_build=video
+item_url_build=%s
 ########################################################
 item_infos=movie["'] value=["']([^"]+.swf).*?flashvars["'] value=["']src=(rtmp://[^&"']+)
 item_precheck=rtmp://
@@ -460,7 +473,7 @@ item_info_build=RTMP - %s
 item_info_name=url
 item_info_from=rtmp
 item_info_convert=decodeBase64
-item_info_build=%s|Referer=http://p.jwpcdn.com/6/12/jwplayer.flash.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_info_build=%s|Referer=http://p.jwpcdn.com/6/12/jwplayer.flash.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 item_info_name=type
 item_info_build=video
 item_url_build=%s
@@ -486,7 +499,7 @@ item_url_build=%s
 ########################################################
 # M3U8
 ########################################################
-item_infos=(http(?![^"']+oneplay)[^"']+\.m3u8[^"'\)]*)
+item_infos=(?![^"']+oneplay)(?![^"']+=https*:)(https*:[^"']+\.m3u8[^"'\)]*)
 item_precheck=.m3u8
 item_order=url.tmp
 
@@ -499,11 +512,12 @@ item_info_from=url.tmp
 item_info_convert=replace('%s','\','')
 item_info_convert=replace('%s','%26','%2526')
 item_info_convert=replace('%s','&autostart=true&controlbar=over','')
+item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=type
 item_info_build=video
-item_url_build=%s|User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_url_build=%s|User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 
 
 ########################################################
@@ -557,6 +571,11 @@ item_precheck=castamp.com
 item_order=video
 @CATCH(castamp,video)@
 
+########################################################
+item_infos=(http://shadow.go.ro[^"'\s]+)
+item_precheck=shadow.go.ro
+item_order=video
+@CATCH(sgr,video)@
 
 ########################################################
 # Ustream.tv - Videos
@@ -814,12 +833,7 @@ item_order=video
 item_infos=((?:www\.)?dinozap.info/redirect/channel.php\?id=[^"']+)
 item_precheck=dinozap.info/redirect
 item_order=video
-@CATCH(dinozap,video)@
-########################################################
-item_infos=((?:www\.)?dinozap.pw/redirect/channel.php\?id=[^"']+)
-item_precheck=dinozap.pw/redirect
-item_order=video
-@CATCH(dinozap,video)@
+@CATCH(dinohls,video)@
 ########################################################
 item_infos=((?:www\.)?playerhd1.pw/channel.php\?file=[^"']+)
 item_precheck=playerhd1.pw
@@ -849,7 +863,7 @@ item_order=video
 item_infos=((?:www\.)?dinostream.pw/channel.php\?file=[^"']+)
 item_precheck=dinostream.pw/channel
 item_order=video
-@CATCH(dinozap,video)@
+@CATCH(dinohls,video)@
 ########################################################
 item_infos=((?:www\.)?hdcastream.info/channel.php\?file=[^"']+)
 item_precheck=hdcastream.info
@@ -1176,10 +1190,20 @@ item_precheck=iguide.to
 ########################################################
 # iLive - Videos
 ########################################################
-item_infos=(http[^'"]+?streamlive.to/embed/[^'"]+)
+item_infos=channel=(\d+)
 item_precheck=streamlive.to/embed
 item_order=video
-@CATCH(ilive,video)@
+@CATCH(ilive,'http://www.streamlive.to/view-kodi-new/'+video+'/')@
+########################################################
+item_infos=streamlive.to/embed/(\d+)&
+item_precheck=streamlive.to/embed
+item_order=video
+@CATCH(ilive,'http://www.streamlive.to/view-kodi-new/'+video+'/')@
+########################################################
+item_infos=streamlive.to/snapshots/([^_]+)
+item_precheck=streamlive.to/snapshots
+item_order=video
+@CATCH(slplay,video)@
 
 
 ########################################################
@@ -1373,6 +1397,11 @@ item_infos=(http://www.laola1.tv[^"]+)
 item_precheck=laola1.tv
 item_order=video
 @CATCH(laola1,video)@
+########################################################
+item_infos=(http://www.ehftv.com[^"]+)
+item_precheck=ehftv.com
+item_order=video
+@CATCH(laola1,video)@
 
 ########################################################
 # PrivateStream - Videos
@@ -1602,8 +1631,8 @@ item_precheck=sportlive.ws
 item_order=video
 @CATCH(sportlive,video)@
 
-item_infos=streamking.co/player\?channel=(\w+)
-item_precheck=streamking.co
+item_infos=streamking.(?:co|cc)/player\?channel=(\w+)
+item_precheck=streamking
 item_order=video
 @CATCH(streamking,video)@
 
@@ -1620,7 +1649,7 @@ item_precheck=smartcdn.top
 item_precheck=yocast.tv
 @CATCH(yocast,video)@
 ########################################################
-item_infos=yocast.tv/embed.php\?live=(\w+)
+item_infos=yocast.tv/embed\w*.php\?live=(\w+)
 item_precheck=yocast.tv/embed
 item_order=video
 @CATCH(yocast,video)@
@@ -1629,6 +1658,11 @@ item_order=video
 @FIND('JS1','[^\"\']*sostart.org[^\"\']*','f*id','video')@
 item_precheck=sostart.org
 @CATCH(sostart,video)@
+########################################################
+item_infos=sos.html\?id=(\w+)
+item_precheck=sos.html
+item_order=video
+@CATCH(sostart,video)@
 
 ########################################################
 item_infos=gblackstreaming.com/channel.php\?file=(\w+)
@@ -1648,15 +1682,15 @@ item_precheck=tvope.com
 
 ########################################################
 @FIND('JS1','[^\"\']*pushpublish.tv/js/emb[^\"\']*','f*id','video')@
-item_precheck=pushpublish.tv/js/emb
+item_precheck=pushpublish.tvx/js/emb
 @CATCH(pushpublish,video)@
 ########################################################
 @FIND('JS1','[^\"\']*pushpublish.tv/js/vip[^\"\']*','f*id','video')@
-item_precheck=pushpublish.tv/js/vip
+item_precheck=pushpublish.tvx/js/vip
 @CATCH(pushpublish2,video)
 ########################################################
 item_infos=fid="([^"]+)".*?pushpublish.tv/js/cheap
-item_precheck=pushpublish.tv/js/cheap
+item_precheck=pushpublish.tvx/js/cheap
 item_order=video
 @CATCH(pushpublish3,video)@
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/abcast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/abcast.txt
index b4f3e49fb9f0233804e54dc9ef2e508863a33d91..559d67d5ec0de0d26d37b34d324db1fbe96ef04c 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/abcast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/abcast.txt
@@ -4,7 +4,7 @@ item_info_build=ABCast - %s
 
 item_info_name=pageUrl
 item_info_from=@PARAM1@
-item_info_build=http://abcast.net/embed.php?file=%s
+item_info_build=http://abcast.net/simple.php?file=%s&width=640&height=400
 
 item_info_name=flashvars
 item_info_from=pageUrl
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?['"]file=([^&\.]+).*?streamer=([^&]+).*','@RE
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://abcast.net/juva.swf live=1 timeout=15 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://abcast.net/player.swf live=1 timeout=15 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/aliez.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/aliez.txt
index c9c33c1e4c8f07226c7aa814c81ebaeeebfa9efd..127be14ef45606b30088d233b8728e58a8223de4 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/aliez.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/aliez.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*file["]*\s*:\s*["']([^"']+)','@REFERER@')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+' live=true swfVfy=1 swfUrl=http://i.aliez.me/swf/playernew.swf flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=file+' live=true swfVfy=1 swfUrl=http://i.aliez.me/swf/playernew.swf flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/biggestplayer.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/biggestplayer.txt
index c3ba4db49c5cbc7b337f8b8550c3d37ef7c82392..318a203fa1a8ea99833583a8aaa1fc4a90c7a79e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/biggestplayer.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/biggestplayer.txt
@@ -19,5 +19,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/byetv.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/byetv.txt
index 54c728fbb1852e7b10cd8be74fb70b6d00df7e79..2b5afbe3ec22f1668336b7858810898373310b4e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/byetv.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/byetv.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?['"]token['"][:,]\s*['"]([^'"]+)['"].*.*['"]f
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp+' playpath='+ file + ' swfUrl=http://www.byetv.org/player.swf flashver=WIN\2020,0,0,267 token='+ token +' live=1 timeout=25 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp+' playpath='+ file + ' swfUrl=http://www.byetv.org/player.swf flashver=WIN\2020,0,0,286 token='+ token +' live=1 timeout=25 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/cast4u.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/cast4u.txt
index eba918ee6e551a7570a4e7c280d395a4bb08ff4a..5973ce05ee5a137ed232cef00a92877c9c813c8c 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/cast4u.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/cast4u.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?['"]?file\w*['"]?\s*[:,=]\s*['"]([^'"]+)['"].
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' swfUrl=http://cast4u.tv/jwplayer/jwplayer.flash.swf flashver=WIN\2020,0,0,267 live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' swfUrl=http://cast4u.tv/jwplayer/jwplayer.flash.swf flashver=WIN\2020,0,0,286 live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castalba.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castalba.txt
index 00b0a212d5218393286829013350d32b6b7d2917..62409101b739811d200f214009d8ca8d0200a2c4 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castalba.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castalba.txt
@@ -13,16 +13,17 @@ item_info_build=%s
 
 item_info_name=rtmp.tmp
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*?['"]([^'"]+live).*','@REFERER@')
+item_info_convert=getInfo('%s','.*?['"]/*([^'"]+live).*','@REFERER@')
 item_info_build=rtmp://%s
 
 item_info_name=m3u8
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*(http[^"']+\.m3u8[^"']*).*','@REFERER@')
+item_info_convert=getInfo('%s','.*?var\s*\w+\s*=\s*unescape\('([^']+)','@REFERER@')
+item_info_convert=ifEmpty('%s','','http://%s.m3u8')
 item_info_build=%s
 
 item_info_name=rtmp
-item_info_from=rtmp.tmp + ' playpath=' + file + '?'+t+' swfUrl=http://static.castalba.tv/player5.9.swf flashver=WIN\2020,0,0,267 live=true timeout=15 swfVfy=true pageUrl=' + pageUrl
+item_info_from=rtmp.tmp + ' playpath=' + file + '?'+t+' swfUrl=http://static.castalba.tv/player5.9.swf flashver=WIN\2020,0,0,286 live=true timeout=15 swfVfy=true pageUrl=' + pageUrl
 item_info_build=%s
 
 item_info_name=url
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castflash.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castflash.txt
index b70cb02ccfb597ff217baf388647ad679064d1d6..389394ff74629970008588ee31c8561859302050 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castflash.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castflash.txt
@@ -30,4 +30,4 @@ item_info_build=%s
 
 item_info_name=url
 item_info_from=m3u8
-item_info_build=%s|Referer=http://cdn-b.streamshell.net/swf/uppod-hls.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
\ No newline at end of file
+item_info_build=%s|Referer=http://cdn-b.streamshell.net/swf/uppod-hls.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castfree.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castfree.txt
index 8253801b7ce5f93d596c1fba0d672124b2f42f9c..23d1e459391adc65d59075c841d20811869b2edb 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castfree.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castfree.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?['"]token['"][:,]\s*['"]([^'"]+)['"].*.*['"]f
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp+' playpath='+ file + ' swfUrl=http://www.castfree.me/player.swf flashver=WIN\2020,0,0,267 token='+ token +' live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp+' playpath='+ file + ' swfUrl=http://www.castfree.me/player.swf flashver=WIN\2020,0,0,286 token='+ token +' live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/caston.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/caston.txt
index 3989a234e0a57bb7d77885db514ff5ab2e8a2920..c3016098f310fd1abf64242fb479212b6d4a88d8 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/caston.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/caston.txt
@@ -38,5 +38,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+rtmp+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+rtmp+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castto.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castto.txt
index bbaf4e51334c2928e0bcac34a76cd561911d90c8..03e4fcacab5a8b00450f770022a2c1a6deac620a 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castto.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/castto.txt
@@ -13,14 +13,20 @@ item_info_convert=getInfo('%s','.*?src=([^"' ]+).*','@REFERER@')
 item_info_build=%s
 
 item_info_name=pageUrl
-item_info_from=tmp2 + fid + '&vw=640&vh=420&domain=streamson.me
+item_info_from=tmp2 + fid + '&vw=650&vh=500
 item_info_build=%s
 
-item_info_name=tmp3
+item_info_name=file
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*SWFObject\(\'([^\']+)\'.*?file\',\s*\'([^\']+)\'.*?streamer\',\s*\'([^\']+)\'.*','@REFERER@','swf|file|rtmp')
+item_info_convert=getInfo('%s','.*(http[^"']+\.m3u8[^"']*).*','@pageUrl@')
+item_info_build=%s
+
+item_info_name=ref
+item_info_from=pageUrl
+item_info_convert=quote(%s)
+item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + ' swfUrl=' + swf + ' live=true timeout=15 token=#ed%h0#w@1 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/deltatv.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/deltatv.txt
index bd4a64e5fe054a6c06e14a9740e594b5147728da..52e3a603ec4d4b68de122e45cc5164ef98c09d9b 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/deltatv.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/deltatv.txt
@@ -4,7 +4,7 @@ item_info_build=deltatv - %s
 
 item_info_name=pageUrl
 item_info_from=@PARAM1@
-item_info_build=http://deltatv.pw/stream.php?id=%s&width=640&height=480
+item_info_build=http://deltatv.co/stream.php?id=%s&width=655&height=405
 
 item_info_name=tmp
 item_info_from=pageUrl
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*"([^"]+\.swf)".*?['"]file=([^&]+).*?streamer=(
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + ' swfUrl=' + swf + ' live=1 token=Fo5_n0w?U.rA6l3-70w47ch flashver=WIN\2020,0,0,267 timeout=13 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playpath=' + file + ' swfUrl=' + swf + ' live=1 token=Fo5_n0w?U.rA6l3-70w47ch flashver=WIN\2020,0,0,286 timeout=13 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dinohls.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dinohls.txt
new file mode 100644
index 0000000000000000000000000000000000000000..67880b01915dd09ceb9e916c25ee12a477402f68
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dinohls.txt
@@ -0,0 +1,35 @@
+item_info_name=title
+item_info_from=@PARAM1@
+item_info_convert=parseText('%s','.*(?:id|file)=(\w+))
+item_info_build=DinoZap - %s
+
+item_info_name=pageUrl
+item_info_from=@PARAM1@
+item_info_convert=getInfo('http://%s','.*<iframe src="([^"]+)".*','@REFERER@')
+item_info_build=%s
+
+item_info_name=tmp
+item_info_from=pageUrl
+item_info_convert=getInfo('%s','.*?var\s*\w+\s*=\s*"([^'"]*)".*?var\s*\w+\s*=\s*"([^'"]+).*?var\s*\w+\s*=\s*"([^'"]+).*','@REFERER@','ssx1|ssx4|tk')
+item_info_build=%s
+
+item_info_name=alt_tmp
+item_info_from=pageUrl
+item_info_convert=getInfo('%s','.*?id="[^'"]+" value="([^'"]*)".*?id="[^'"]+" value="([^'"]+).*?id="[^'"]+" value="([^'"]+).*','@REFERER@','alt_ssx1|alt_ssx4|alt_tk')
+item_info_build=%s
+
+item_info_name=file
+item_info_from=tk || alt_tk
+item_info_convert=decodeBase64
+item_info_build=%s
+
+item_info_name=ref
+item_info_from=ssx4 || alt_ssx4
+item_info_convert=decodeBase64
+item_info_convert=quote('%s')
+item_info_convert=quote('%s')
+item_info_build=%s
+
+item_info_name=url
+item_info_from=file+'|Referer=http%253A'+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
+item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dinozap.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dinozap.txt
index 9aa4bd9f9255c98a77e53fe654d9a725ce108cb0..08bb5d17e73a6691358fadb23b35952b99000dd2 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dinozap.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dinozap.txt
@@ -93,5 +93,5 @@ item_info_from=file.tmp || alt_file
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.businessapp1.pw/jwplayer5/addplayer/jwplayer.flash.swf live=true flashver=WIN\2020,0,0,267 token=@@stop-stole@@ timeout=15 pageUrl=' + pageUrl
+item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.businessapp1.pw/jwplayer5/addplayer/jwplayer.flash.swf live=true flashver=WIN\2020,0,0,286 token=@@stop-stole@@ timeout=15 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/directstream.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/directstream.txt
index 781066ea54680a09059f7cfceeaf767684617911..0b761df7f4c5eeeac4ec14090b396d9470a7393a 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/directstream.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/directstream.txt
@@ -14,5 +14,5 @@ item_info_convert=replaceRegex('%s','\s','')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' swfUrl=http://direct-stream.biz/jwplayer/jwplayer.flash.swf flashver=WIN\2020,0,0,267 live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' swfUrl=http://direct-stream.biz/jwplayer/jwplayer.flash.swf flashver=WIN\2020,0,0,286 live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dittotv.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dittotv.txt
index 73fbe3bcdeb307bb900830fee5b3b2f2c5f1da05..975a9575d88bb91a61e469f8bf478ea307d74f86 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dittotv.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/dittotv.txt
@@ -14,4 +14,4 @@ item_info_build=%s
 item_info_name=url
 item_info_from=cTxt
 item_info_convert=aesDec(key)
-item_info_build=%s|Referer=http://www.dittotv.com/livetv/&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/18.0.0.233
\ No newline at end of file
+item_info_build=%s|Referer=http://www.dittotv.com/livetv/&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/18.0.0.233
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/espa.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/espa.txt
index 96c6b70b917faeeab9fee978e7d62782fad4eb50..0ac8e53983c183e078fc1fbe04836ef5e7b1a313 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/espa.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/espa.txt
@@ -16,5 +16,5 @@ item_info_convert=getInfo('%s','.*rtmp":"([^"]+)","streamname":"([^"]+)","token"
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath='+file+' swfUrl=http://p.jwpcdn.com/6/12/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,267 timeout=15 token=' + token + ' swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playpath='+file+' swfUrl=http://p.jwpcdn.com/6/12/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,286 timeout=15 token=' + token + ' swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ezcast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ezcast.txt
index 83e16719334a0554ab20b39153de044c8674f125..5578ca6a3c4be83780806d07d14a78fb44327831 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ezcast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ezcast.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('%s','.*redirect=([\.\d]+).*','http://www.embedezcast.
 item_info_build=rtmp://%s/live
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.embedezcast.com' + swf + '  flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.embedezcast.com' + swf + '  flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/fcst.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/fcst.txt
index 57ee41d2c8fd1351ab67dc9275bab6eb6dd7fd0f..1c0f18c7b759010e8fb2c97dc784f8fad2974db8 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/fcst.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/fcst.txt
@@ -19,17 +19,25 @@ item_info_build=%s
 
 item_info_name=f1
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*?file:\s.*?/['"\s\+]+(\w+).*?\1.*?return\(\[([^\]]+)\].join.*','http://livetvweb.net/','junk|file')
+item_info_convert=getInfo('%s','.*?file:\s.*?/['"\s\+]+(\w+).*?\1.*?return\(\[([^\]]+)\].join.*','http://livetvweb.net/','junk|file_1')
 item_info_build=%s
 
-item_info_name=rtmp
+item_info_name=rtmp_1
 item_info_from=part1+part2+part3+''
 item_info_convert=quote('%s')
 item_info_convert=replace('%s','%2C','')
 item_info_convert=replace('%s','%22','')
 item_info_convert=unquote('%s')
 item_info_convert=replace('%s','\','')
-item_info_convert=debug
+item_info_build=%s
+
+item_info_name=file
+item_info_from=file_1
+item_info_convert=quote('%s')
+item_info_convert=replace('%s','%2C','')
+item_info_convert=replace('%s','%22','')
+item_info_convert=unquote('%s')
+item_info_convert=replace('%s','\','')
 item_info_build=%s
 
 item_info_name=alt_1
@@ -37,10 +45,14 @@ item_info_from=pageUrl
 item_info_convert=getInfo('%s','.*?(c2Vydm[^'"\/]+).*?['"\/]([^'"\/]+?\.stream)['"\/].*?','http://livetvweb.net/','auth|file')
 item_info_build=%s
 
-item_info_name=rtmp
-item_info_from=auth+''
+item_info_name=rtmp_2
+item_info_from=auth
 item_info_build=rtmp://play.finecast.tv:1935/live?wmsAuthSign=%s
 
+item_info_name=rtmp
+item_info_from=rtmp_1 || rtmp_2
+item_info_build=%s
+
 item_info_name=url
-item_info_from=rtmp+' playpath='+file+' swfUrl=http://www.finecast.tv/player6/jwplayer.flash.swf flashver=WIN\2020,0,0,267 live=1 timeout=15 pageUrl=' + pageUrl
+item_info_from=rtmp+' playpath='+file+' swfUrl=http://www.finecast.tv/player6/jwplayer.flash.swf flashver=WIN\2020,0,0,286 live=1 timeout=15 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/goodgame.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/goodgame.txt
index 5f3b2922b2b728776c8e935f79d4028e74128c97..6dd1f65254fc1c43b9894d69def29918de7cc21d 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/goodgame.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/goodgame.txt
@@ -7,5 +7,5 @@ item_info_from=@PARAM1@
 item_info_build=%s
 
 item_info_name=url
-item_info_from=http://hls.goodgame.ru/hls/'+id+'.m3u8|Referer=http://goodgame.ru/cached/ggplayer.swf?rdtlwb&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_info_from=http://hls.goodgame.ru/hls/'+id+'.m3u8|Referer=http://goodgame.ru/cached/ggplayer.swf?rdtlwb&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/goodrtmp.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/goodrtmp.txt
index 973723d4c1603f9ae59949a73c1605e998e70e6f..3ea9cee928d648da95911ab97884a4d0a9384351 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/goodrtmp.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/goodrtmp.txt
@@ -30,5 +30,5 @@ item_info_convert=getInfo('%s','.','@pageUrl@')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp+'/'+file+' swfUrl=http://goodrtmp.com/player.swf flashver=WIN\2020,0,0,267 live=1 timeout=25 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp+'/'+file+' swfUrl=http://goodrtmp.com/player.swf flashver=WIN\2020,0,0,286 live=1 timeout=25 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/greatvideos.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/greatvideos.txt
index 06979bf884a457821e1b3e0dce4c50fa6366ccc7..589c64bd242e044a3b4b5fef37f962d4cd96e002 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/greatvideos.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/greatvideos.txt
@@ -37,5 +37,5 @@ item_info_convert=reverse
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp://185.82.215.45:3579/vod/'+file+'?e='+time+'&st='+token+' swfUrl=https://greatvideos.eu/flowplayer-3.2.16.swf flashver=WIN\2020,0,0,267 live=1 timeout=15 pageUrl='+pageUrl
+item_info_from=rtmp://185.82.215.45:3579/vod/'+file+'?e='+time+'&st='+token+' swfUrl=https://greatvideos.eu/flowplayer-3.2.16.swf flashver=WIN\2020,0,0,286 live=1 timeout=15 pageUrl='+pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/gtcaster.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/gtcaster.txt
index 2d77921988f60a7162185a802ebf92410608c46f..b5e1cfdeca06256a86a59426a275e1b3afb7a362 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/gtcaster.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/gtcaster.txt
@@ -23,5 +23,5 @@ item_info_convert=replace('%s','.0:','.com:')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + ' swfVfy=1 flashver=WIN\2020,0,0,267 swfUrl=http://live.gtcaster.com/' + swf + ' live=true pageUrl=' + pageUrl
+item_info_from=rtmp + ' playpath=' + file + ' swfVfy=1 flashver=WIN\2020,0,0,286 swfUrl=http://live.gtcaster.com/' + swf + ' live=true pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast.txt
index a7a83f4a3ac6bffe9c26b027dd17576176ccaf00..9be3c0ebc47705afb9c59a81deedc829a07e5daa 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast.txt
@@ -16,5 +16,5 @@ item_info_convert=getInfo('%s','.*(?:streamer|file|video)["']*\s*[:=]\s*["']([^'
 item_info_build=%s
 
 item_info_name=url
-item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,267 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
+item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,286 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast2.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast2.txt
index 5d099628cc846debd1e1be9222caac9164250095..05180594b69a50e8537b2bf30d4685687e533a18 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast2.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast2.txt
@@ -16,5 +16,5 @@ item_info_convert=getInfo('%s','.*(?:streamer|file|video)["']*\s*[:=]\s*["']([^'
 item_info_build=%s
 
 item_info_name=url
-item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,267 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
+item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,286 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast3.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast3.txt
index 65fb02d4946ce7d12457b4d6007ff3316d0f0c94..83aacc81770946ceee13c67eab928dfa8384bfe2 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast3.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast3.txt
@@ -16,5 +16,5 @@ item_info_convert=getInfo('%s','.*(?:streamer|file|video)["']*\s*[:=]\s*["']([^'
 item_info_build=%s
 
 item_info_name=url
-item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,267 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
+item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,286 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast4.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast4.txt
index b678a63295042b5423439c49cdead76565a41e57..c3d122bd80f299fbe1322b2dd7b12d21eed11602 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast4.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcast4.txt
@@ -16,5 +16,5 @@ item_info_convert=getInfo('%s','.*(?:streamer|file|video)["']*\s*[:=]\s*["']([^'
 item_info_build=%s
 
 item_info_name=url
-item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,267 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
+item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,286 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcastf.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcastf.txt
index a0ca5b65ea27a75db7c2b3498ce108cdda33f1f5..dc39420d034115a9388fc93284351fec7b9e7830 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcastf.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcastf.txt
@@ -16,5 +16,5 @@ item_info_convert=getInfo('%s','.*(?:streamer|file|video)["']*\s*[:=]\s*["']([^'
 item_info_build=%s
 
 item_info_name=url
-item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,267 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
+item_info_from=tmp + ' swfUrl=http://player.hdcast.org/jwplayer.flash.swf flashver=WIN\2020,0,0,286 token=SECURET0KEN#yw%.?()@W! timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcastme.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcastme.txt
index 100adf3b014d520998846977ff1d35211b086ef9..b762dfea1eae7166c1d65d1500025e1c21700a88 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcastme.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/hdcastme.txt
@@ -35,5 +35,5 @@ item_info_convert=parseText('%s','.*/(\w+_\w+)')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp://'+ip+'/liveedge/?wmsAuthSign='+auth+'/'+playpath+' swfUrl=http://otronivel.me/jw7/jwplayer.flash.swf flashver=WIN\2020,0,0,267 timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp://'+ip+'/liveedge/?wmsAuthSign='+auth+'/'+playpath+' swfUrl=http://otronivel.me/jw7/jwplayer.flash.swf flashver=WIN\2020,0,0,286 timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iguide.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iguide.txt
index 3938f9661978f0477e39507f75cf1bf07f33cac3..48467132f09954e338da614a3c56066132f3bfd4 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iguide.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iguide.txt
@@ -28,5 +28,5 @@ item_info_convert=getInfo('%s','.*?token":"([^'"]+).*','@pageUrl@')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://www.iguide.to/player/secure_player_iguide_embed_token.swf flashver=WIN\2020,0,0,267 live=1 token=' + token + ' timeout=15 swfVfy=1 pageUrl=' + pageUrl 
+item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://www.iguide.to/player/secure_player_iguide_embed_token.swf flashver=WIN\2020,0,0,286 live=1 token=' + token + ' timeout=15 swfVfy=1 pageUrl=' + pageUrl 
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iguide2.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iguide2.txt
index 3d1b8a83fef8fff3d206dd3f79381a1ade153e0d..4b25e7ccf4a62d59b196dc3e7d744b828406519f 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iguide2.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iguide2.txt
@@ -28,6 +28,6 @@ item_info_convert=getInfo('%s','.*?token":"([^'"]+).*','@pageUrl@')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://www.iguide.to/player/secure_player_iguide_embed_token.swf flashver=WIN\2020,0,0,267 live=1 token=' + token + ' timeout=15 swfVfy=1 pageUrl=' + pageUrl 
+item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://www.iguide.to/player/secure_player_iguide_embed_token.swf flashver=WIN\2020,0,0,286 live=1 token=' + token + ' timeout=15 swfVfy=1 pageUrl=' + pageUrl 
 item_info_build=%s
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ilive.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ilive.txt
index ebf97062bf38444ba78ba62732239ce26f189836..c6a1d3d2e01196e5b7db6a20725f858e6ed7b514 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ilive.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ilive.txt
@@ -4,22 +4,22 @@
 
 item_info_name=pageUrl
 item_info_from=@PARAM1@
-item_info_convert=getInfo('%s','.*?src=["']([^'"]+)['"].*','@REFERER@')
 item_info_build=%s
 
 item_info_name=req
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*getJSON\("([^'"]+)".*streamer[:,]\s*['"]([^'"]+)['"].*file[:,]\s*['"]([^'"]+).flv['"]','@REFERER@','server|rtmp.tmp|file')
+item_info_convert=getInfo('%s','.*streamer[:,]\s*['"]([^'"]+)['"].*file[:,]\s*['"]([^'"]+).flv['"]','@REFERER@','rtmp.tmp|file')
 item_info_build=%s
 
 item_info_name=token
-item_info_from=http:' + server
-item_info_convert=getInfo('%s','.*?token":"([^'"]+).*','http://www.streamlive.to/embedplayer.php')
+item_info_from=pageUrl
+item_info_convert=getInfo('%s','.*?token[:,]\s*['"]([^'"]+)['"].*','@REFERER@')
 item_info_build=%s
 
 item_info_name=rtmp
 item_info_from=rtmp.tmp
 item_info_convert=replace('%s','\','')
+item_info_convert=replace('%s','rtmp://:1935','rtmp://watch4.streamlive.to:1935')
 item_info_build=%s
 
 item_info_name=app
@@ -28,5 +28,5 @@ item_info_convert=parseText('%s','.*.*rtmp://[\.\w:]*/([^\s]+)')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.streamlive.to/ads/streamlive.swf flashver=WIN\2020,0,0,267 live=1 timeout=15 token=' + token + ' swfVfy=1 pageUrl='+pageUrl
+item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.streamlive.to/ads/streamlive.swf flashver=WIN\2020,0,0,286 live=1 timeout=15 token=' + token + ' swfVfy=1 pageUrl=http://www.streamlive.to/
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iptvhq.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iptvhq.txt
index 0e0af50456348fa8f6e6a02e38b140ac96d94fab..9a2160a7fbc2ba0af0757301d6ab41b9e9165e75 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iptvhq.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/iptvhq.txt
@@ -46,9 +46,9 @@ item_info_convert=parseText('%s','.*/(\w+_\w+)')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp://'+ip+'/liveedge/?wmsAuthSign='+auth+'/'+playpath+' swfUrl=http://otronivel.me/jw7/jwplayer.flash.swf flashver=WIN\2020,0,0,267 timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp://'+ip+'/liveedge/?wmsAuthSign='+auth+'/'+playpath+' swfUrl=http://otronivel.me/jw7/jwplayer.flash.swf flashver=WIN\2020,0,0,286 timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
 
 #item_info_name=url
-#item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+#item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 #item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/janjua.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/janjua.txt
index 370b73d3be7e5a6eebc9a762bdbfe951f9fa0e3a..6d348021bd26ac629e48b0bdaa4a151d6d7af7f9 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/janjua.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/janjua.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('%s','.*redirect=([\.\d]+).*','http://www.janjuaplayer
 item_info_build=rtmp://%s/live
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.janjuaplayer.com' + swf + ' flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.janjuaplayer.com' + swf + ' flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/justhd.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/justhd.txt
index 96c46025927ece3484b37d5af47968807f11ee8d..720146d08a120f4d263881fe7f5a1a36cc2437db 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/justhd.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/justhd.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?file['"]?[:,]\s*['"]([^'"]+)['"].*','@REFERER
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' swfUrl=http://p.jwpcdn.com/6/8/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,267 timeout=15 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' swfUrl=http://p.jwpcdn.com/6/8/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,286 timeout=15 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/laola1.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/laola1.txt
index 21fb81884da79fbf33f3d581eb46508167b3f173..d2cb9dfdb58a8c4b791abfd53f0dd7f04dd9a3c5 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/laola1.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/laola1.txt
@@ -4,15 +4,15 @@ item_info_build=Laola1 - %s
 
 item_info_name=pageUrl
 item_info_from=@PARAM1@
-item_info_convert=getInfo('%s','.*?url:\s['"](\/\/streamaccess\.unas\.tv[^'"]+\" \+ label \+ \"[^'"]+).*?','@REFERER@')
+item_info_convert=getInfo('%s','.*url:\s['"](\/\/streamaccess\.unas\.tv[^'"]+\" \+ label \+ \"[^'"]+).*?','@REFERER@')
 item_info_convert=replace('%s','" + label + "','laloa1tv')
 item_info_build=http:%s
 
 item_info_name=tmp2
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*?auth="([^'"]+)"\s*url="([^'"]+)".*?','http://www.laola1.tv/swf/videoplayer.swf?r=20150305','auth|url.tmp')
+item_info_convert=getInfo('%s','.*?auth="([^'"]+)"\s*url="([^'"]+)".*?','http://www.ehftv.com//assets/swf/videoplayer_14012016.swf?r=20160114','auth|url.tmp')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=url.tmp + '?hdnea='+ auth + '
+item_info_from=url.tmp + '?hdnea='+ auth + '|User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/letgo.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/letgo.txt
index 283a8888df021a5e59f07a6420e9f214a66331c1..ff728514c1d03e3d51e558a4570ce9e923c146d5 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/letgo.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/letgo.txt
@@ -16,5 +16,5 @@ item_info_convert=getInfo('%s','.*rtmp":"([^"]+)","streamname":"([^"]+)","token"
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath='+file+' swfUrl=http://p.jwpcdn.com/6/12/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,267 timeout=15 token=' + token + ' swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playpath='+file+' swfUrl=http://p.jwpcdn.com/6/12/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,286 timeout=15 token=' + token + ' swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/liveflash.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/liveflash.txt
index d7b3175b1157a043299fae3851eecba528fbb8a7..4794dc9615ef08818093f6fd538978e34aa82364 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/liveflash.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/liveflash.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('%s','.*redirect=([\.\d]+).*','http://www.liveflashpla
 item_info_build=rtmp://%s/stream
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=10 conn=S:OK live=true swfUrl=http://www.liveflashplayer.net' + swf + ' flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=10 conn=S:OK live=true swfUrl=http://www.liveflashplayer.net' + swf + ' flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/livestreamcast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/livestreamcast.txt
index 4b1d6b64011bdf094bf626f8997d29bcc68f3451..6d63e390cef57f11081785312fb72713c597f750 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/livestreamcast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/livestreamcast.txt
@@ -13,5 +13,5 @@ item_info_build=%s
 
 
 item_info_name=url
-item_info_from=rtmp://cdn-edge.livestreamcast.org app=liverepeat/' + file + ' playpath=' + file + ' swfUrl=http://livestreamcast.org/swfs/player.swf flashver=WIN\2020,0,0,267 live=1 timeout=15 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp://cdn-edge.livestreamcast.org app=liverepeat/' + file + ' playpath=' + file + ' swfUrl=http://livestreamcast.org/swfs/player.swf flashver=WIN\2020,0,0,286 live=1 timeout=15 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/livestreamnew.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/livestreamnew.txt
index e0c35367aecdaf74544f02def80a8fe5ae21528b..a4b8a429c04c828969cae203c0f46c2c6459f9af 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/livestreamnew.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/livestreamnew.txt
@@ -24,5 +24,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=m3u8 +'|Cookie=hdntl='+cookie+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_info_from=m3u8 +'|Cookie=hdntl='+cookie+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ls15.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ls15.txt
index c02afcfb3547e9e46889b83e23a52d81701f245a..1327ce0c469c00bfdfa85a62bbdb07c753d5e46a 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ls15.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ls15.txt
@@ -91,7 +91,7 @@ item_info_from=file.tmp || alt_file
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.businessapp1.pw/jwplayer5/addplayer/jwplayer.flash.swf live=true flashver=WIN\2020,0,0,267 token=@@stop-stole@@ timeout=15 pageUrl=' + pageUrl
+item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.businessapp1.pw/jwplayer5/addplayer/jwplayer.flash.swf live=true flashver=WIN\2020,0,0,286 token=@@stop-stole@@ timeout=15 pageUrl=' + pageUrl
 item_info_build=%s
 
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ls15w.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ls15w.txt
index dcbb823e60269d399fd07e6ffffd3bef463dc139..e6f82b6204d2f4ebde9e6b703ad47b23201ac3ea 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ls15w.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ls15w.txt
@@ -90,7 +90,7 @@ item_info_from=file.tmp || alt_file
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.businessapp1.pw/jwplayer5/addplayer/jwplayer.flash.swf live=true flashver=WIN\2020,0,0,267 token=@@stop-stole@@ timeout=15 pageUrl=' + pageUrl
+item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.businessapp1.pw/jwplayer5/addplayer/jwplayer.flash.swf live=true flashver=WIN\2020,0,0,286 token=@@stop-stole@@ timeout=15 pageUrl=' + pageUrl
 item_info_build=%s
 
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/lshstream.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/lshstream.txt
index 6a702e0464dd66f1c1bb7c4d8343658f28a87480..35dc93ea1ff398321a9ef3dd4677d06c85e29142 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/lshstream.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/lshstream.txt
@@ -4,7 +4,7 @@ item_info_build=LshStream - %s
 
 item_info_name=pageUrl
 item_info_from=@PARAM1@
-item_info_build=http://cdn.lshstream.com/embed.php?u=%s
+item_info_build=http://www.lshstream.com/embed.php?u=%s&vw=640&vh=360&domain=live.batmanstream.com
 
 item_info_name=tmp
 item_info_from=pageUrl
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?file[:,]\s*['"]([^'"]+).*','@REFERER@')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=tmp + ' swfUrl=http://www.lshstream.com/jw/jwplayer.flash.swf flashver=WIN\2020,0,0,267 live=1 token=SECURET0KEN#yw%.?()@W! timeout=14 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=tmp + ' swfUrl=http://www.lshstream.com/jw/jwplayer.flash.swf flashver=WIN\2020,0,0,286 live=1 token=SECURET0KEN#yw%.?()@W! timeout=14 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/mips.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/mips.txt
index e64fae11e3d61ed0b5ea1e5a2880396f7a4c626c..1970bc6937934a97546bdf830f981d232c391f64 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/mips.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/mips.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('%s','.*redirect=([\.\d]+).*','@pageUrl@')
 item_info_build=rtmp://%s/live
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 live=true conn=S:OK swfUrl=http://www.mipsplayer.com' + swf + ' flashver=WIN\2020,0,0,267 ccommand=false pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 live=true conn=S:OK swfUrl=http://www.mipsplayer.com' + swf + ' flashver=WIN\2020,0,0,286 ccommand=false pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/oneplay.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/oneplay.txt
index 11d6b5efcafbc9afab9023b50cf3b94e08e34a6c..fbe749c0a052446b0d8cb8dcc76df9ebbc31d2c1 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/oneplay.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/oneplay.txt
@@ -80,5 +80,5 @@ item_info_convert=getCookies(OPSESSID)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=m3u8+'|Referer=http://p.jwpcdn.com/6/12/jwplayer.flash.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&Cookie=OPSESSID='+cookie
+item_info_from=m3u8+'|Referer=http://p.jwpcdn.com/6/12/jwplayer.flash.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&Cookie=OPSESSID='+cookie
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/p2pcast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/p2pcast.txt
index 4efa79ce8bd616db2ffb361659a3a122358a8520..3b54871afae2f841005f43e95e318e266956c012 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/p2pcast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/p2pcast.txt
@@ -32,5 +32,5 @@ item_info_from=file.tmp
 item_info_build=%snSu7f94JRnF0xoCGAlzp1g
 
 item_info_name=url
-item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0%2520%2528X11%253B%2520Linux%2520x86_64%2529%2520AppleWebKit/537.36%2520%2528KHTML%252C%2520like%2520Gecko%2529%2520Chrome/47.0.2526.106%2520Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0%2520%2528X11%253B%2520Linux%2520x86_64%2529%2520AppleWebKit/537.36%2520%2528KHTML%252C%2520like%2520Gecko%2529%2520Chrome/47.0.2526.106%2520Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish.txt
index 78ef2d30eb8e79404972dea314042107fea9b6b1..efb8ae72666df02ad02a7bc63649ebdaa0431e36 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish.txt
@@ -18,5 +18,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish2.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish2.txt
index 23447151a1ac9a170273d8344d0eadb9ecd5b9f3..fc8dc92d7ab205e84f2b15476eb4daf9dc26580b 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish2.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish2.txt
@@ -18,5 +18,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish3.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish3.txt
index 96a85c659078bfd21c653afaf826fd7f53eb17fa..dc3dfc988cb63ec61d31613d9b7c8611ba1e53dd 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish3.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pushpublish3.txt
@@ -17,5 +17,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pxstream.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pxstream.txt
index 478fd6812a31f4db9d09de0845fcc33a75bc0a5f..b30cf3640b0525c5343a15bbec93d9bf850bdddd 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pxstream.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/pxstream.txt
@@ -19,5 +19,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sawlive.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sawlive.txt
index 2244ebb36664fe18a4c9bf3e7b28543038d2dbcc..522c344ebbdf4ba4e816f4f4b8785af27b58e46e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sawlive.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sawlive.txt
@@ -32,5 +32,5 @@ item_info_convert=getInfo('%s','.*?SWFObject\('([^']+)'.*?['"]file['"][:,]\s*(?:
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + '?'+t+' swfVfy=1 flashver=WIN\2020,0,0,267 timeout=15 swfUrl=' + swf + ' live=true pageUrl='+tmpUrl
+item_info_from=rtmp + ' playpath=' + file + '?'+t+' swfVfy=1 flashver=WIN\2020,0,0,286 timeout=15 swfUrl=' + swf + ' live=true pageUrl='+tmpUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sgr.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sgr.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6e2e79e9517cc2566e4fdb12788d12852d94e995
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sgr.txt
@@ -0,0 +1,22 @@
+item_info_name=title
+item_info_from=@PARAM1@
+item_info_build=sgr-m3u8
+
+item_info_name=pageUrl
+item_info_from=@PARAM1@
+item_info_build=%s
+ 
+item_info_name=file
+item_info_from=pageUrl
+item_info_convert=getInfo('%s','.*?(http[^"'\s]+\.m3u8[^"'\s]*).*','@REFERER@')
+item_info_build=%s
+
+item_info_name=ref
+item_info_from=pageUrl
+item_info_convert=quote(%s)
+item_info_convert=quote(%s)
+item_info_build=%s
+
+item_info_name=url
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
+item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/slplay.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/slplay.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d86eb60c1318e69ecf3419f86009bad60dced000
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/slplay.txt
@@ -0,0 +1,37 @@
+#item_info_name=title
+#item_info_from=@PARAM1@
+#item_info_build=iLive - %s
+
+item_info_name=file
+item_info_from=@PARAM1@
+item_info_build=%s
+
+item_info_name=req
+item_info_from=file
+item_info_convert=getInfo('http://www.streamlive.to/view-kodi-new/72742','.*streamer[:,]\s*['"]([^'"]+)['"].*file[:,]\s*['"]([^'"]+).flv['"]','http://www.streamlive.to/','rtmp.tmp|file2')
+item_info_build=%s
+
+item_info_name=token
+item_info_from=file
+item_info_convert=getInfo('http://www.streamlive.to/view-kodi-new/72742','.*?token[:,]\s*['"]([^'"]+)['"].*','http://www.streamlive.to/')
+item_info_build=%s
+
+item_info_name=rtmp
+item_info_from=rtmp.tmp
+item_info_convert=replace('%s','\','')
+item_info_convert=replace('%s','rtmp://:1935','rtmp://watch4.streamlive.to:1935')
+item_info_build=%s
+
+item_info_name=app
+item_info_from=rtmp
+item_info_convert=parseText('%s','.*.*rtmp://[\.\w:]*/([^\s]+)')
+item_info_build=%s
+
+item_info_name=clear
+item_info_from=file
+item_info_convert=getInfo('clear','.*?token[:,]\s*['"]([^'"]+)['"].*','http://www.streamlive.to/')
+item_info_build=%s
+
+item_info_name=url
+item_info_from=rtmp + ' app=' + app + ' playpath=' + file + ' swfUrl=http://www.streamlive.to/ads/streamlive.swf flashver=WIN\2020,0,0,286 live=1 timeout=15 token=' + token + ' swfVfy=1 pageUrl=http://www.streamlive.to/
+item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sostart.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sostart.txt
index 422dffe8d8f63be3a7c57b5079d7ce0faaabd668..63c746af50c7f5d2e266258d0d7cc8dcf6979e3a 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sostart.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sostart.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?['"]?file['"]?[:,]\s*['"]([^'"]+)['"].*','@RE
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp+' swfUrl=http://sostart.org/jw/jwplayer.flash.swf flashver=WIN\2020,0,0,267 token=SECURET0KEN#yw%.?()@W! live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp+' swfUrl=http://sostart.org/jw/jwplayer.flash.swf flashver=WIN\2020,0,0,286 token=SECURET0KEN#yw%.?()@W! live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sostart2.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sostart2.txt
index e8957592ba43bf2463297f4f135481c26539774a..bf3f2149f13397afa5c6da5b47e8d5a2a7a0def3 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sostart2.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sostart2.txt
@@ -9,8 +9,8 @@ item_info_build=%s
 
 item_info_name=rtmp
 item_info_from=file
-item_info_build=rtmp://195.154.199.244:1935/%s
+item_info_build=rtmp://195.154.189.208:1935/%s
 
 item_info_name=url
-item_info_from=rtmp +' swfUrl=http://62.210.88.4/StrobeMediaPlayback.swf flashver=WIN\2020,0,0,267 token=SECURET0KEN#yw%.?()@W! live=1 timeout=14 swfVfy=1 pageUrl=http://62.210.88.4/play.html#pub1#0001
+item_info_from=rtmp +' swfUrl=http://62.210.88.4/StrobeMediaPlayback.swf flashver=WIN\2020,0,0,286 token=SECURET0KEN#yw%.?()@W! live=1 timeout=14 swfVfy=1 pageUrl=http://62.210.88.4/play.html#pub1#0001
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sportlive.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sportlive.txt
index 2be101e9e49eb8a0bf079f5d5a7233ed2cc351c5..ca56087beddc5135a3c13e909ffc22826be45a26 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sportlive.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/sportlive.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*(http[^"']+\.m3u8[^"']*).*','@REFERER@')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer=http://sportlive.ws/assets/swf/player.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_info_from=file+'|Referer=http://sportlive.ws/assets/swf/player.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamcasttv.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamcasttv.txt
index 0a86f229e524175e17d1585ee7eb591d1787acff..287db8e14d7341b1bdf4ae8975c65af156da6b68 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamcasttv.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamcasttv.txt
@@ -13,5 +13,5 @@ item_info_convert=replaceRegex('%s','\s','')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' swfUrl=http://streamcasttv.biz/jwplayer/jwplayer.flash.swf flashver=WIN\2020,0,0,267 live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' swfUrl=http://streamcasttv.biz/jwplayer/jwplayer.flash.swf flashver=WIN\2020,0,0,286 live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamify.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamify.txt
index 7b523c9a39719e9f069c099097cccbd9db8a74bd..ed6a14c7afb1ceacb746a57c184f764ce6adf09e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamify.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamify.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('%s','.*redirect=([\.\d]+).*','@pageUrl@')
 item_info_build=rtmp://%s/live
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 live=true conn=S:OK swfUrl=http://www.streamifyplayer.com' + swf + ' flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 live=true conn=S:OK swfUrl=http://www.streamifyplayer.com' + swf + ' flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamking.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamking.txt
index ffe55a5092f732f6534af0caab0185059aae2213..fd7602c61efa90a034315b9ec74c80128f11ad7d 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamking.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamking.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*(http[^"']+\.m3u8[^"']*).*','@REFERER@')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer=http://api.peer5.com/clappr/assets/HLSPlayer.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_info_from=file+'|Referer=http://api.peer5.com/clappr/assets/HLSPlayer.swf&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamup.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamup.txt
index 2823af8b09232bbb62d0b45c61ee084225d92027..43504390723e0d2d0ff17297de9e580214822ed4 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamup.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/streamup.txt
@@ -2,26 +2,24 @@ item_info_name=title
 item_info_from=@PARAM1@
 item_info_build=Streamup - %s
 
-item_info_name=id
-item_info_from=@PARAM1@
-item_info_convert=lowercase
-item_info_convert=replace('%s','s-channel','')
-item_info_build=%ss-stream
-
 item_info_name=playUrl
 item_info_from=@PARAM1@
 item_info_convert=lowercase
-item_info_convert=replace('%s','s-channel','')
 item_info_build=https://streamup.com/%s/embeds/video?startMuted=true
 
+item_info_name=m3u8
+item_info_from=playUrl
+item_info_convert=getInfo('%s','.*(/app[^"']+\.m3u8[^"']*).*','@REFERER@')
+item_info_build=%s
+
 item_info_name=idurl
-item_info_from=@PARAM1@
-item_info_convert=lowercase
-item_info_build=http://lancer.streamup.com/api/redirect/%s
+item_info_from=m3u8
+item_info_convert=parseText('%s','.*app/([^/]+)/')
+item_info_build=https://lancer.streamup.com/api/redirect/%s
 
 item_info_name=server
 item_info_from=idurl
-item_info_convert=getInfo('%s','([\w\.]+)')
+item_info_convert=getInfo('%s','([\w\-\.]+)')
 item_info_build=%s
 
 item_info_name=ref
@@ -31,5 +29,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=https://video-cdn.streamup.com/app/'+id+'/playlist.m3u8|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=https://'+server+m3u8+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/theactionlive.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/theactionlive.txt
index 96ec985f64a23d62e555302bef8ed4eef4141af8..245c553a1ec717bc1b0aa6bcbd52d67fca1a7573 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/theactionlive.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/theactionlive.txt
@@ -42,5 +42,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/tutele.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/tutele.txt
index 334dad16f4e2d626a53e114663683a5c83536e4b..562a55e8dc9ce5b1669e87b1af8ee092aa0cd992 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/tutele.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/tutele.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?SWFObject\('([^']+)'.*?['"]file['"][:,]\s*['"
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://tutelehd.com' + swf + ' swfVfy=1 flashver=WIN\2020,0,0,267 live=true token=0fea41113b03061a pageUrl=' + pageUrl
+item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://tutelehd.com' + swf + ' swfVfy=1 flashver=WIN\2020,0,0,286 live=true token=0fea41113b03061a pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/tvmsn.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/tvmsn.txt
index e2497d744244b7842256c038c77be6236c8bf070..ee36c7aea3978c52e8fedd64ef92a94fb0cff0ea 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/tvmsn.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/tvmsn.txt
@@ -92,7 +92,7 @@ item_info_from=part1_1+part1_2+part2_1+part2_2+part3_1+part3_2+part4_1+part4_2+'
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp+' swfUrl=http://www.tv-msn.com/player/player.swf flashver=WIN\2020,0,0,267 token=voltamosaotrabal live=1 timeout=15 pageUrl=' + pageUrl
+item_info_from=rtmp+' swfUrl=http://www.tv-msn.com/player/player.swf flashver=WIN\2020,0,0,286 token=obsfucationtest live=1 timeout=15 pageUrl=' + pageUrl
 item_info_build=%s
 
 #item_info_name=url
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ucaster.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ucaster.txt
index 405396ce80ac8a7d2d82bef102f1bcc7eea52146..07205bc22111ffdfd3a9e396eb3dc1c79c983e0f 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ucaster.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ucaster.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('http://www.pubucaster.com:1935/loadbalancer','.*redir
 item_info_build=rtmp://%s/live/
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=10 conn=S:OK live=true swfUrl=http://www.embeducaster.com' + swf + ' flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=10 conn=S:OK live=true swfUrl=http://www.embeducaster.com' + swf + ' flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ultracast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ultracast.txt
index 97aa2ad025933c6119a914cb20cc84bfe19e5fd7..269666cde2e536e214b38997e7e07733db796e2e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ultracast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ultracast.txt
@@ -38,5 +38,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+rtmp+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+rtmp+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ustream3.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ustream3.txt
index 4a73f57717d54387a4e56934759aa4699c4abe40..906c39d0b56e9f8b1635b9806c81534ac82083f5 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ustream3.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/ustream3.txt
@@ -3,23 +3,22 @@ item_info_from=@PARAM1@
 item_info_convert=parseText('%s','.*/(\w+)')
 item_info_build=%s
 
-item_info_name=ps1
+item_info_name=get_ps1
 item_info_from=@PARAM1@
-item_info_convert=getInfo('%s','.*?chz='([^']+)'.*','@REFERER@')
-item_info_convert=unquote(%s)
+item_info_convert=getInfo('%s','var\s*\w+="(\w+)";var\s*\w+="(\w+)";var\s*\w+="(\w+)";var\s*\w+="([^"]*)"','@REFERER@','l1|l2|l3|l4')
 item_info_build=%s
 
-item_info_name=get_ps2
+item_info_name=ps2
 item_info_from=@PARAM1@
-item_info_convert=getInfo('%s','.*/(\w+)'\+\w+\('(\w+)'\).*','@REFERER@','l1|l2')
+item_info_convert=getInfo('%s','.*\W([\w_]{66})\W.*','@REFERER@')
 item_info_build=%s
 
 item_info_name=tmpUrl
-item_info_from=http://sawlive.tv/embed/watch/'+ps1+'/'+l1+l2
+item_info_from=http://sawlive.tv/embed/watch/'+l1+l2+l3+l4+'/'+ps2
 item_info_build=%s
 
 item_info_name=tmpUrl2
-item_info_from=http://www3.sawlive.tv/embed/watch/'+ps1+'/'+l1+l2
+item_info_from=http://www3.sawlive.tv/embed/watch/'+l1+l2+l3+l4+'/'+ps2
 item_info_build=%s
 
 item_info_name=tmp
@@ -33,5 +32,5 @@ item_info_convert=getInfo('%s','.*?SWFObject\('([^']+)'.*?['"]file['"][:,]\s*(?:
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + '?'+t+' swfVfy=1 flashver=WIN\2020,0,0,267 timeout=15 swfUrl=' + swf + ' live=true pageUrl='+tmpUrl
+item_info_from=rtmp + ' playpath=' + file + '?'+t+' swfVfy=1 flashver=WIN\2020,0,0,286 timeout=25 swfUrl=' + swf + ' live=true pageUrl='+tmpUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/uvlog.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/uvlog.txt
index 79bc576f165533b8cf244d7d27d9d389f90964df..70374bcdf621ad15613129ec0e86074314b68900 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/uvlog.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/uvlog.txt
@@ -7,6 +7,6 @@ item_info_from=@PARAM1@
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp://video.uvlog.com/uvlog_video/'+id+' app=uvlog_video/'+id+' playpath=stream swfUrl=http://uvlog.com/broadView.swf conn=S:'+id+' conn=S:N/A conn=S:Anonymous conn=S:viewer conn=S: conn=S:99999 conn=S:true conn=S: live=1 flashver=WIN\2020,0,0,267 timeout=15 swfVfy=1 pageUrl=http://uvlog.com/channel
+item_info_from=rtmp://video.uvlog.com/uvlog_video/'+id+' app=uvlog_video/'+id+' playpath=stream swfUrl=http://uvlog.com/broadView.swf conn=S:'+id+' conn=S:N/A conn=S:Anonymous conn=S:viewer conn=S: conn=S:99999 conn=S:true conn=S: live=1 flashver=WIN\2020,0,0,286 timeout=15 swfVfy=1 pageUrl=http://uvlog.com/channel
 item_info_build=%s
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/vipcast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/vipcast.txt
index 7e3737b58cd268b60383c46e779af020edc71fc8..77821f3cf7ffdda0a075acd83ada28086bfb0996 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/vipcast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/vipcast.txt
@@ -16,5 +16,5 @@ item_info_convert=getInfo('%s','.*rtmp":"([^"]+)","streamname":"([^"]+)","token"
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath='+file+' swfUrl=http://p.jwpcdn.com/6/12/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,267 timeout=15 token=' + token + ' swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playpath='+file+' swfUrl=http://p.jwpcdn.com/6/12/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,286 timeout=15 token=' + token + ' swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/xusca.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/xusca.txt
index 2ff78d92e1c335efabec11fa9ec387175419a631..ddbc404af33ff74c60ad642a17dc2f1d3562aa6e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/xusca.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/xusca.txt
@@ -13,5 +13,5 @@ item_info_convert=replace('%s','rtmpe://l.mybeststream.xyz/r/','')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmpe://l.mybeststream.xyz/r/'+rtmp + ' swfUrl=http://mybeststream.xyz/jwplayer.flash.swf swfsize=61916 swfhash=e54728508e787f43cd472ef9ba2e514e2eca3f0679b3782206a3808b8d89b164 token=c.r.e.a.t.e.S.t. flashver=WIN\2020,0,0,267 live=1 timeout=15 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmpe://l.mybeststream.xyz/r/'+rtmp + ' swfUrl=http://mybeststream.xyz/jwplayer.flash.swf swfsize=61916 swfhash=e54728508e787f43cd472ef9ba2e514e2eca3f0679b3782206a3808b8d89b164 token=c.r.e.a.t.e.S.t. flashver=WIN\2020,0,0,286 live=1 timeout=15 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/yocast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/yocast.txt
index d30a4027b43a5fe4d520084312987ddf9e5517df..79541241a0687c3fe1f6bc002c1a552b57b27137 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/yocast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/yocast.txt
@@ -17,5 +17,5 @@ item_info_convert=replace('%s','.flv','')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath='+file+' swfUrl=http://www.yocast.tv/myplayer/jwplayer.flash.swf flashver=WIN\2020,0,0,267 live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playpath='+file+' swfUrl=http://www.yocast.tv/myplayer/jwplayer.flash.swf flashver=WIN\2020,0,0,286 live=1 timeout=14 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/youtennis.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/youtennis.txt
index 73746369ac318e791a176521fb60e57222eedb0a..064f5f2e153048bf877f298c89ec8dbd00aea2fc 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/youtennis.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/youtennis.txt
@@ -17,6 +17,6 @@ item_info_convert=getInfo('%s','.*?url:\s*['"]([^'"]+).*?netConnectionUrl:\s*['"
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playPath='+file+' swfVfy=1 timeout=10 live=true swfUrl=http://54.228.204.225/flow/flowplayer-3.2.16.swf flashver=WIN\2020,0,0,267 pageUrl=' + frame1
+item_info_from=rtmp + ' playPath='+file+' swfVfy=1 timeout=10 live=true swfUrl=http://54.228.204.225/flow/flowplayer-3.2.16.swf flashver=WIN\2020,0,0,286 pageUrl=' + frame1
 item_info_convert=replace('%s','rtmpe','rtmp')
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/yukonsco.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/yukonsco.txt
index bc9f7940e3375fd41d4fb72aa180b705d2ab3da7..59ccd74e92e50337622404096319b2e7ab368672 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/yukonsco.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/yukonsco.txt
@@ -12,5 +12,5 @@ item_info_convert=getInfo('%s','.*?file['"]?[:,]\s*['"]([^'"]+)['"].*','@REFERER
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' swfUrl=http://p.jwpcdn.com/6/8/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,267 timeout=15 swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp + ' swfUrl=http://p.jwpcdn.com/6/8/jwplayer.flash.swf live=1 flashver=WIN\2020,0,0,286 timeout=15 swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zati.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zati.txt
index f1e6096686a588437311ac41c2f0a0ddde93c3b1..f66ee886a61e6f59e3f76ef33211454de62e0245 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zati.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zati.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('%s','.*redirect=([\.\d]+).*','http://www.zati.tv/reso
 item_info_build=rtmp://%s/live
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.zati.tv' + swf + ' flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.zati.tv' + swf + ' flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zenex.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zenex.txt
index 24ecd57fb50222186341ec736f25f12e10692b09..592a4cfab2898566c84cc00407e452cd6946d52b 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zenex.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zenex.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('%s','.*redirect=([\.\d]+).*','http://www.zenexplayer.
 item_info_build=rtmp://%s/zenex/
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.zenexplayer.com' + swf + ' flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.zenexplayer.com' + swf + ' flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zengatv.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zengatv.txt
index 30e427b20fe0c35fe8e7ed5b057a5bf8da99af49..266f83a77223ead0776b08afb7de325c2a94407f 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zengatv.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zengatv.txt
@@ -20,5 +20,5 @@ item_info_convert=quote(%s)
 item_info_build=%s
 
 item_info_name=url
-item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
+item_info_from=file+'|Referer='+ref+'&User-Agent=Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.286
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zerocast.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zerocast.txt
index 47cf1b95a40ecb097ac476e8432dcf75c4248e10..a0372849679babe532faa00702d74204f15821a1 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zerocast.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zerocast.txt
@@ -39,5 +39,5 @@ item_info_convert=parseText('%s','.*/([\w_]*)')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp://'+ip+'/liveedge/?wmsAuthSign='+auth+'/'+playpath+' swfUrl=http://p.jwpcdn.com/6/12/jwplayer.flash.swf flashver=WIN\2020,0,0,267 timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
+item_info_from=rtmp://'+ip+'/liveedge/?wmsAuthSign='+auth+'/'+playpath+' swfUrl=http://p.jwpcdn.com/6/12/jwplayer.flash.swf flashver=WIN\2020,0,0,286 timeout=15 live=true swfVfy=1 pageUrl=' + pageUrl
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zony.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zony.txt
index 86d2115afc0a5ae4a6050948f765ffe4f743c9ae..8722a88065032b0daa9860d90887c9c4e9ddd53d 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zony.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zony.txt
@@ -17,5 +17,5 @@ item_info_convert=getInfo('http://cdn.pubzony.com:1935/loadbalancer','.*redirect
 item_info_build=rtmp://%s/stream
 
 item_info_name=url
-item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.zony.tv' + swf + ' flashver=WIN\2020,0,0,267 pageUrl=' + pageUrl
+item_info_from=rtmp + ' playPath=' + channel + '?id=' + id + '&pk='+pk+' swfVfy=1 timeout=15 conn=S:OK live=true swfUrl=http://www.zony.tv' + swf + ' flashver=WIN\2020,0,0,286 pageUrl=' + pageUrl
 item_info_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zoomtv.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zoomtv.txt
index 5ea1bc6b51e3b855a1ba393534f15a3fe9e6d862..12b01e218d1a8b871029af13d7ccb9cafc4d4045 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zoomtv.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/catchers/zoomtv.txt
@@ -47,22 +47,22 @@ item_info_build=%s
 
 item_info_name=h3
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*?[^\w](\w+)\s*=.(1[0-9]+)\b.*ts["':\+]+(?:eval\(")?(?:[\s"'\+]+\d+[\s"'\+]+)?\1[\s\d"'\+]','@REFERER@','junk|ts')
+item_info_convert=getInfo('%s','.*?[^\w](\w+)\s*=.(1[0-9]+)\b.*ts["':\+]+(?:eval\(")?(?:[\s"'\+]+\d*[\s"'\+]+)?\1[\s\d"'\+]','@REFERER@','junk|ts')
 item_info_build=%s
 
 item_info_name=ts32
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*?[^\w](\w+)\s*=.([0-9]+)\b.*ts["':\+]+(?:eval\(")?(?:[\s"'\+]+\d+[\s"'\+]+)?\w+[\s"'\+]+\d+[\s"'\+]+\1[\s\d"'\+]','@REFERER@','junk|ts2')
+item_info_convert=getInfo('%s','.*?[^\w](\w+)\s*=.([0-9]+)\b.*ts["':\+]+(?:eval\(")?(?:[\s"'\+]+\d*[\s"'\+]+)?\w+[\s"'\+]+\d*[\s"'\+]+\1[\s\d"'\+]','@REFERER@','junk|ts2')
 item_info_build=%s
 
 item_info_name=ts33
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*?[^\w](\w+)\s*=.([0-9]+)\b.*ts["':\+]+(?:eval\(")?(?:[\s"'\+]+\d+[\s"'\+]+)?\w+[\s"'\+]+\d+[\s"'\+]+\w+[\s"'\+]+\d+[\s"'\+]+\1[\s\d"'\+]','@REFERER@','junk|ts3')
+item_info_convert=getInfo('%s','.*?[^\w](\w+)\s*=.([0-9]+)\b.*ts["':\+]+(?:eval\(")?(?:[\s"'\+]+\d*[\s"'\+]+)?\w+[\s"'\+]+\d*[\s"'\+]+\w+[\s"'\+]+\d*[\s"'\+]+\1[\s\d"'\+]','@REFERER@','junk|ts3')
 item_info_build=%s
 
 item_info_name=ts34
 item_info_from=pageUrl
-item_info_convert=getInfo('%s','.*?[^\w](\w+)\s*=.([0-9]+)\b.*ts["':\+]+(?:eval\(")?(?:[\s"'\+]+\d+[\s"'\+]+)?\w+[\s"'\+]+\d+[\s"'\+]+\w+[\s"'\+]+\d+[\s"'\+]+\w+[\s"'\+]+\d+[\s"'\+]+\1["':\+]','@REFERER@','junk|ts4')
+item_info_convert=getInfo('%s','.*?[^\w](\w+)\s*=.([0-9]+)\b.*ts["':\+]+(?:eval\(")?(?:[\s"'\+]+\d*[\s"'\+]+)?\w+[\s"'\+]+\d*[\s"'\+]+\w+[\s"'\+]+\d*[\s"'\+]+\w+[\s"'\+]+\d*[\s"'\+]+\1["':\+]','@REFERER@','junk|ts4')
 item_info_build=%s
 
 item_info_name=get_sg1
@@ -101,5 +101,5 @@ item_info_convert=getInfo('%s','.*['"](rtmp[^'"]+).*','@pageUrl2@')
 item_info_build=%s
 
 item_info_name=url
-item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://static.zoomtv.me/player/jwplayer.6.5.3.swf flashver=WIN\2020,0,0,267 conn=S:' + file + ' conn=S:'+ts+ts2+ts3+ts4+' conn=S:'+sg1+sg2+sg3+sg4+sg5+sg6+' conn=S:V&gt;JWhui^@2ESdu0?}&gt;AN live=1 timeout=15 token=Q!lrB@G1)ww(-dQ4J4 swfVfy=1 pageUrl=' + pageUrl2
+item_info_from=rtmp + ' playpath=' + file + ' swfUrl=http://static.zoomtv.me/player/jwplayer.6.5.3.swf flashver=WIN\2020,0,0,286 conn=S:' + file + ' conn=S:'+ts+ts2+ts3+ts4+' conn=S:'+sg1+sg2+sg3+sg4+sg5+sg6+' conn=S:V&gt;JWhui^@2ESdu0?}&gt;AN live=1 timeout=15 token=Q!lrB@G1)ww(-dQ4J4 swfVfy=1 pageUrl=' + pageUrl2
 item_info_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/dictionaries/chfix.txt b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/dictionaries/chfix.txt
index 020250615e0c67f1bc6f9765066fb6888259a70e..6ec7dc2b7871510b4a9041f85e149b15eb2c87ab 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/dictionaries/chfix.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/dictionaries/chfix.txt
@@ -75,7 +75,7 @@ Sky Sport 3 ITA
 Sportsnet World
 Sportsnet One
 Sportsnet Ontario
-ESPN USA
+ESPN
   Espn Usa
 BT Sport ESPN
   Espn
@@ -110,6 +110,8 @@ Star Sports 4
 Star Sports 1
 PTV Sports
   Ptv Sports
+PTV Sports 2
+  Ptv Sports 2
 Premier Sports
 MUTV
   Mutv
@@ -117,3 +119,9 @@ BBC One
   Bbc One
 BBC Two
   Bbc Two
+WWE Network
+  Wwe Network
+ITV1
+  Itv 1
+NBCSN
+  Nbc Sports
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/images/live.xml b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/images/live.xml
index d2e296727106d440da8ccbdfacc8ca7fd307d921..df585becc3d6931b1920d93b66b3d160829d5963 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/images/live.xml
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/images/live.xml
@@ -1,212 +1,196 @@
 <?xml version="1.0"?>
 <channels>
   <channel>
-    <name>Canal+ Liga HD</name>
-    <url>http://www.streamlive.to/view/72762</url>
-    <image>http://snapshots.streamlive.to/snapshots/azvw4v0ypw9rt64_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>Spanish</language>
-    <views>538624.5</views>
-  </channel>
-  <channel>
-    <name>Sky Sport F1 HD</name>
-    <url>http://www.streamlive.to/view/72968</url>
-    <image>http://snapshots.streamlive.to/snapshots/x4ml0p80kmz42ld_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>Italian</language>
-    <views>22484.0</views>
-  </channel>
-  <channel>
-    <name>ESPN 2 </name>
-    <url>http://www.streamlive.to/view/69028</url>
-    <image>http://snapshots.streamlive.to/snapshots/5hd19kwxef5b59o_snapshot.jpg</image>
+    <name>Euro Sports 1 (HD) -aaz</name>
+    <url>http://www.streamlive.to/view/73278</url>
+    <image>http://snapshots.streamlive.to/snapshots/q2cmvf4la4lpir7_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>2370524.0</views>
+    <views>10587.0</views>
   </channel>
   <channel>
-    <name>Sky Sport 1 </name>
-    <url>http://www.streamlive.to/view/72742</url>
-    <image>http://snapshots.streamlive.to/snapshots/x0pt269mv6n773v_snapshot.jpg</image>
+    <name>BT Sport 1 </name>
+    <url>http://www.streamlive.to/view/72735</url>
+    <image>http://snapshots.streamlive.to/snapshots/wtc25713j3u6ute_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>731171.0</views>
+    <views>445584.5</views>
   </channel>
   <channel>
-    <name>Canal+ France </name>
-    <url>http://www.streamlive.to/view/72737</url>
-    <image>http://snapshots.streamlive.to/snapshots/ntjsgbvsvngpkv7_snapshot.jpg</image>
+    <name>ESPN (HD) -AAZ</name>
+    <url>http://www.streamlive.to/view/73270</url>
+    <image>http://snapshots.streamlive.to/snapshots/5kkuu774nogpjv1_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>French</language>
-    <views>160940.5</views>
-  </channel>
-  <channel>
-    <name>Canal+ Sport France </name>
-    <url>http://www.streamlive.to/view/72738</url>
-    <image>http://snapshots.streamlive.to/snapshots/amk3q9tx3hnv3in_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>French</language>
-    <views>232010.0</views>
+    <language>English</language>
+    <views>4785.0</views>
   </channel>
   <channel>
-    <name>Sky Sports 2 UK HD</name>
-    <url>http://www.streamlive.to/view/71303</url>
-    <image>http://snapshots.streamlive.to/snapshots/tlt4pwwq38dbpdz_snapshot.jpg</image>
+    <name>Fox Sport 1 (HD) </name>
+    <url>http://www.streamlive.to/view/73260</url>
+    <image>http://snapshots.streamlive.to/snapshots/meretvdy5sg3m5m_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>28157.5</views>
+    <views>92440.5</views>
   </channel>
   <channel>
-    <name>NFL Network </name>
-    <url>http://www.streamlive.to/view/72886</url>
-    <image>http://snapshots.streamlive.to/snapshots/1c4z54w4tcvq6ue_snapshot.jpg</image>
+    <name>WWE Network (HD) -aaz</name>
+    <url>http://www.streamlive.to/view/73273</url>
+    <image>http://snapshots.streamlive.to/snapshots/99vnciitgecmk7k_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>355824.0</views>
+    <views>43128.0</views>
   </channel>
   <channel>
-    <name>NBA TV</name>
-    <url>http://www.streamlive.to/view/71562</url>
-    <image>http://snapshots.streamlive.to/snapshots/g6egcgeorgwtfnb_snapshot.jpg</image>
+    <name>ESPN:  SportsCenter -32U </name>
+    <url>http://www.streamlive.to/view/70558</url>
+    <image>http://snapshots.streamlive.to/snapshots/891rz1xpwzy8nfw_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>3109335.0</views>
+    <views>460573.0</views>
   </channel>
   <channel>
-    <name>BT Sport ESPN</name>
-    <url>http://www.streamlive.to/view/72462</url>
-    <image>http://snapshots.streamlive.to/snapshots/9g38yxwwqqwyn88_snapshot.jpg</image>
+    <name>Sky Sport 3 </name>
+    <url>http://www.streamlive.to/view/72744</url>
+    <image>http://snapshots.streamlive.to/snapshots/4fqgcqtjob7alpn_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>182586.5</views>
+    <views>228381.0</views>
   </channel>
   <channel>
-    <name>Sky Sport 1 </name>
-    <url>http://www.streamlive.to/view/71560</url>
-    <image>http://snapshots.streamlive.to/snapshots/uv2nqmvibdpd3uo_snapshot.jpg</image>
+    <name>Sky Sport 3 Sky Sports Uk Network Live</name>
+    <url>http://www.streamlive.to/view/72728</url>
+    <image>http://snapshots.streamlive.to/snapshots/1hlwdkqv72fglvm_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>445174.5</views>
+    <views>96909.0</views>
   </channel>
   <channel>
-    <name>Sky Bundesliga 1 (HD) </name>
-    <url>http://www.streamlive.to/view/70728</url>
-    <image>http://snapshots.streamlive.to/snapshots/txrq9hprksf28b9_snapshot.jpg</image>
+    <name>Bein Sport France 3 (HD) </name>
+    <url>http://www.streamlive.to/view/70729</url>
+    <image>http://snapshots.streamlive.to/snapshots/6frb74s5j99g6su_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>German</language>
-    <views>270602.0</views>
+    <language>French</language>
+    <views>316258.0</views>
   </channel>
   <channel>
-    <name>Bein Sport France 3 </name>
-    <url>http://www.streamlive.to/view/72733</url>
-    <image>http://snapshots.streamlive.to/snapshots/n5prtzw5a1lvu87_snapshot.jpg</image>
+    <name>Golf tv (HD) -aaz</name>
+    <url>http://www.streamlive.to/view/73269</url>
+    <image>http://snapshots.streamlive.to/snapshots/rui5qisk9pfsefl_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>French</language>
-    <views>227649.5</views>
+    <language>English</language>
+    <views>8255.5</views>
   </channel>
   <channel>
-    <name>Canal+ Sport France (HD) </name>
-    <url>http://www.streamlive.to/view/70467</url>
-    <image>http://snapshots.streamlive.to/snapshots/w9eddd62l9b1uxc_snapshot.jpg</image>
+    <name>ESPN UK </name>
+    <url>http://www.streamlive.to/view/72739</url>
+    <image>http://snapshots.streamlive.to/snapshots/bxp98rxrj3v4m9l_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>French</language>
-    <views>536120.5</views>
+    <language>English</language>
+    <views>77842.5</views>
   </channel>
   <channel>
-    <name>BT Sport 1 (HD) </name>
-    <url>http://www.streamlive.to/view/68720</url>
-    <image>http://snapshots.streamlive.to/snapshots/thj91224cuxnfr1_snapshot.jpg</image>
+    <name>Tennis Women's Final: Williams vs Kerbe -aaz</name>
+    <url>http://www.streamlive.to/view/73298</url>
+    <image>http://snapshots.streamlive.to/snapshots/4h7svxct1lytczk_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>2577351.5</views>
+    <views>2135.5</views>
   </channel>
   <channel>
-    <name>NBC Sport Networks (HD) </name>
-    <url>http://www.streamlive.to/view/64232</url>
-    <image>http://snapshots.streamlive.to/snapshots/0fm1lstybe4a0j4_snapshot.jpg</image>
+    <name>Sky Sport 5 (HD) </name>
+    <url>http://www.streamlive.to/view/68716</url>
+    <image>http://snapshots.streamlive.to/snapshots/2qjxgeic3x5rkdu_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>1327728.5</views>
+    <views>1118052.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 2 (HD) </name>
-    <url>http://www.streamlive.to/view/68424</url>
-    <image>http://snapshots.streamlive.to/snapshots/on39ol6in4f2ewp_snapshot.jpg</image>
+    <name>Sky Sports 1 (HD) -aaz</name>
+    <url>http://www.streamlive.to/view/73268</url>
+    <image>http://snapshots.streamlive.to/snapshots/0rny7ft50028arh_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>2105921.5</views>
+    <views>27812.5</views>
   </channel>
   <channel>
-    <name>Bein Sport France 2 </name>
-    <url>http://www.streamlive.to/view/72732</url>
-    <image>http://snapshots.streamlive.to/snapshots/b9ggjhqpcwx2mte_snapshot.jpg</image>
+    <name>Bein Sport France 3 </name>
+    <url>http://www.streamlive.to/view/72733</url>
+    <image>http://snapshots.streamlive.to/snapshots/n5prtzw5a1lvu87_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>French</language>
-    <views>245769.0</views>
+    <views>271304.5</views>
   </channel>
   <channel>
-    <name>ESPN 2 (HD) </name>
-    <url>http://www.streamlive.to/view/57977</url>
-    <image>http://snapshots.streamlive.to/snapshots/rgyus7ao2ullmbt_snapshot.jpg</image>
+    <name>Golf channel </name>
+    <url>http://www.streamlive.to/view/69026</url>
+    <image>http://snapshots.streamlive.to/snapshots/lw1kufim1kmit1h_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>60100.0</views>
+    <views>922951.5</views>
   </channel>
   <channel>
-    <name>Sportsli</name>
-    <url>http://www.streamlive.to/view/70506</url>
-    <image>http://snapshots.streamlive.to/snapshots/9qd6xcbgf677gm5_snapshot.jpg</image>
+    <name>Sky Sport 1 (HD) </name>
+    <url>http://www.streamlive.to/view/72553</url>
+    <image>http://snapshots.streamlive.to/snapshots/b6drm27002soegt_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>527793.5</views>
+    <views>15319.5</views>
   </channel>
   <channel>
-    <name>MaltaCapital</name>
-    <url>http://www.streamlive.to/view/73152</url>
-    <image>http://snapshots.streamlive.to/snapshots/tskq22z654wk0vc_snapshot.jpg</image>
+    <name>Sky Sport 3 (HD) </name>
+    <url>http://www.streamlive.to/view/68714</url>
+    <image>http://snapshots.streamlive.to/snapshots/pdqdnbyfwtzknat_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>11170.0</views>
+    <views>1080604.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 3 </name>
-    <url>http://www.streamlive.to/view/72728</url>
-    <image>http://snapshots.streamlive.to/snapshots/1hlwdkqv72fglvm_snapshot.jpg</image>
+    <name>EuroSport British Euro Sport  1</name>
+    <url>http://www.streamlive.to/view/72463</url>
+    <image>http://snapshots.streamlive.to/snapshots/0ho5ed4iw9efeuy_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>86204.5</views>
+    <views>76278.0</views>
   </channel>
   <channel>
-    <name>Vip5 HD</name>
-    <url>http://www.streamlive.to/view/71395</url>
-    <image>http://snapshots.streamlive.to/snapshots/q4sq4v7tu8ltbv1_snapshot.jpg</image>
+    <name>Sky Sport 4 (HD) </name>
+    <url>http://www.streamlive.to/view/68715</url>
+    <image>http://snapshots.streamlive.to/snapshots/21ajqprn56aebp3_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>French</language>
-    <views>838928.5</views>
+    <language>English</language>
+    <views>1002964.0</views>
   </channel>
   <channel>
-    <name>NBC Sport Network </name>
-    <url>http://www.streamlive.to/view/71137</url>
-    <image>http://snapshots.streamlive.to/snapshots/fwiiknwpnokjic9_snapshot.jpg</image>
+    <name>Sky Sport 2 Sky Sport Uk Live</name>
+    <url>http://www.streamlive.to/view/72459</url>
+    <image>http://snapshots.streamlive.to/snapshots/pyy7bth6eeukd4u_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>514923.5</views>
+    <views>281284.0</views>
   </channel>
   <channel>
-    <name>Bein Sport France 1 </name>
-    <url>http://www.streamlive.to/view/72731</url>
-    <image>http://snapshots.streamlive.to/snapshots/vbit21ed03hy2ua_snapshot.jpg</image>
+    <name>Australian Open Tennis (ESPN) -aaz</name>
+    <url>http://www.streamlive.to/view/73271</url>
+    <image>http://snapshots.streamlive.to/snapshots/xjynx47ottpxgyb_snapshot.jpg</image>
+    <category>Live Sport</category>
+    <language>English</language>
+    <views>9602.5</views>
+  </channel>
+  <channel>
+    <name>Canal+ Sport France </name>
+    <url>http://www.streamlive.to/view/72738</url>
+    <image>http://snapshots.streamlive.to/snapshots/amk3q9tx3hnv3in_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>French</language>
-    <views>262426.5</views>
+    <views>298949.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 1 (HD) </name>
-    <url>http://www.streamlive.to/view/68713</url>
-    <image>http://snapshots.streamlive.to/snapshots/9ddlpiijjci12o9_snapshot.jpg</image>
+    <name>Bein Sport France 1 (HD) </name>
+    <url>http://www.streamlive.to/view/69690</url>
+    <image>http://snapshots.streamlive.to/snapshots/xwe5kvju00vwvjv_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>6092373.0</views>
+    <language>French</language>
+    <views>647599.0</views>
   </channel>
   <channel>
     <name>Setenta Sport (HD) </name>
@@ -214,503 +198,463 @@
     <image>http://snapshots.streamlive.to/snapshots/6kyreuuugcp4jno_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>889674.5</views>
+    <views>903432.0</views>
   </channel>
   <channel>
-    <name>SPORT TV 4 </name>
-    <url>http://www.streamlive.to/view/68589</url>
-    <image>http://snapshots.streamlive.to/snapshots/7yvmvbk8iasstxs_snapshot.jpg</image>
+    <name>Bein Sport France 1 </name>
+    <url>http://www.streamlive.to/view/72731</url>
+    <image>http://snapshots.streamlive.to/snapshots/vbit21ed03hy2ua_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>Portuguese</language>
-    <views>124814.0</views>
+    <language>French</language>
+    <views>323427.5</views>
   </channel>
   <channel>
-    <name>BT Sport 2 </name>
-    <url>http://www.streamlive.to/view/72458</url>
-    <image>http://snapshots.streamlive.to/snapshots/qsem0rd0i6lwy2n_snapshot.jpg</image>
+    <name>ESPN USA Espn US Network Live</name>
+    <url>http://www.streamlive.to/view/71561</url>
+    <image>http://snapshots.streamlive.to/snapshots/ly11kxowritf0ts_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>508139.0</views>
+    <views>1475100.5</views>
   </channel>
   <channel>
-    <name>SPORT TV 3 </name>
-    <url>http://www.streamlive.to/view/69787</url>
-    <image>http://snapshots.streamlive.to/snapshots/4pthnyo7lqlzt80_snapshot.jpg</image>
+    <name>Euro Sport 1 (HD) </name>
+    <url>http://www.streamlive.to/view/68723</url>
+    <image>http://snapshots.streamlive.to/snapshots/futkxfuqj6tp9j9_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>Portuguese</language>
-    <views>131704.5</views>
+    <language>English</language>
+    <views>1058881.5</views>
   </channel>
   <channel>
-    <name>Sky Sport F1 (HD) </name>
-    <url>http://www.streamlive.to/view/68718</url>
-    <image>http://snapshots.streamlive.to/snapshots/udhfbfg0vfzjcds_snapshot.jpg</image>
+    <name>Vip8 HD - Colchester United vs Tottenham Hotspur </name>
+    <url>http://www.streamlive.to/view/72000</url>
+    <image>http://snapshots.streamlive.to/snapshots/oi3w6wa15r8oy2z_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>838934.5</views>
+    <language>Spanish</language>
+    <views>213792.5</views>
   </channel>
   <channel>
-    <name>ESPN UK (HD) </name>
-    <url>http://www.streamlive.to/view/70190</url>
-    <image>http://snapshots.streamlive.to/snapshots/v95pwzd4011ev3g_snapshot.jpg</image>
+    <name>Vip3 HD - NBA- Rockets-Thunders / Lakes-Clippers </name>
+    <url>http://www.streamlive.to/view/71391</url>
+    <image>http://snapshots.streamlive.to/snapshots/y3eik0l8ll47vpz_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>462820.5</views>
+    <views>2092676.5</views>
   </channel>
   <channel>
-    <name>StreetTv News/Sport </name>
-    <url>http://www.streamlive.to/view/73168</url>
-    <image>http://snapshots.streamlive.to/snapshots/9rzxy5lb1t6yb62_snapshot.jpg</image>
+    <name>Bellator 148 Daley vs Uhrich aaz</name>
+    <url>http://www.streamlive.to/view/73331</url>
+    <image>http://snapshots.streamlive.to/snapshots/ydbnlyg562fzup2_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>426.0</views>
+    <views>85.0</views>
   </channel>
   <channel>
-    <name>WWE Network </name>
+    <name>WWE Network WWE Network Live</name>
     <url>http://www.streamlive.to/view/72465</url>
     <image>http://snapshots.streamlive.to/snapshots/i9h78y5jdxifams_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>390337.0</views>
+    <views>575762.5</views>
   </channel>
   <channel>
-    <name>Bein Sport France 2 (HD) </name>
-    <url>http://www.streamlive.to/view/70466</url>
-    <image>http://snapshots.streamlive.to/snapshots/06927pgwezut1fd_snapshot.jpg</image>
+    <name>BT Sport 2 BT Sports Network Live</name>
+    <url>http://www.streamlive.to/view/72458</url>
+    <image>http://snapshots.streamlive.to/snapshots/qsem0rd0i6lwy2n_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>French</language>
-    <views>510329.5</views>
+    <language>English</language>
+    <views>528074.0</views>
   </channel>
   <channel>
-    <name>Golf channel </name>
-    <url>http://www.streamlive.to/view/69026</url>
-    <image>http://snapshots.streamlive.to/snapshots/lw1kufim1kmit1h_snapshot.jpg</image>
+    <name>BT Sport1 (HD) -aaz</name>
+    <url>http://www.streamlive.to/view/73294</url>
+    <image>http://snapshots.streamlive.to/snapshots/fdt7r0moql9z1aw_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>869964.0</views>
+    <views>1953.5</views>
   </channel>
   <channel>
-    <name>ESPN Australia</name>
-    <url>http://www.streamlive.to/view/70558</url>
-    <image>http://snapshots.streamlive.to/snapshots/891rz1xpwzy8nfw_snapshot.jpg</image>
+    <name>Versus (HD) </name>
+    <url>http://www.streamlive.to/view/73329</url>
+    <image>http://snapshots.streamlive.to/snapshots/mf1wygw5wpn8lhi_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>377999.0</views>
+    <views>202.5</views>
   </channel>
   <channel>
-    <name>MaltaCapital Ch2 </name>
-    <url>http://www.streamlive.to/view/72774</url>
-    <image>http://snapshots.streamlive.to/snapshots/ke6wlykh777s2cz_snapshot.jpg</image>
+    <name>Sky Bundesliga 1 (HD) </name>
+    <url>http://www.streamlive.to/view/70728</url>
+    <image>http://snapshots.streamlive.to/snapshots/txrq9hprksf28b9_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>35566.0</views>
+    <language>German</language>
+    <views>282933.5</views>
   </channel>
   <channel>
-    <name>PTV Sports</name>
+    <name>PTV Sports P TV Sport Cricket Live</name>
     <url>http://www.streamlive.to/view/71434</url>
     <image>http://snapshots.streamlive.to/snapshots/8i13d7qvhoqhzpg_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>Portuguese</language>
-    <views>134149.0</views>
+    <views>140198.5</views>
   </channel>
   <channel>
-    <name>Vip6 HD </name>
-    <url>http://www.streamlive.to/view/71396</url>
-    <image>http://snapshots.streamlive.to/snapshots/ukc3fbrfv4mumed_snapshot.jpg</image>
+    <name>24x7 WWE Network Live Stream [HQ] ENJOY!</name>
+    <url>http://www.streamlive.to/view/70407</url>
+    <image>http://snapshots.streamlive.to/snapshots/0zuk5i14piupgnd_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>French</language>
-    <views>792392.5</views>
+    <language>English</language>
+    <views>487766.0</views>
   </channel>
   <channel>
-    <name>Sky Sport F1 </name>
-    <url>http://www.streamlive.to/view/71583</url>
-    <image>http://snapshots.streamlive.to/snapshots/otulzwd7up4nuve_snapshot.jpg</image>
+    <name>Sport 1 USA (HD) </name>
+    <url>http://www.streamlive.to/view/72138</url>
+    <image>http://snapshots.streamlive.to/snapshots/2jry03vosgtzji9_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>227665.0</views>
+    <views>383930.5</views>
   </channel>
   <channel>
-    <name>FutBlogAndres012 </name>
-    <url>http://www.streamlive.to/view/72444</url>
-    <image>http://snapshots.streamlive.to/snapshots/d6tmpygpqn3kpum_snapshot.jpg</image>
+    <name>Sky Sport F1 </name>
+    <url>http://www.streamlive.to/view/72747</url>
+    <image>http://snapshots.streamlive.to/snapshots/pvarcpkyf360ck5_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>2035.0</views>
+    <views>199652.0</views>
   </channel>
   <channel>
-    <name>ZonamIxta </name>
-    <url>http://www.streamlive.to/view/73081</url>
-    <image>http://snapshots.streamlive.to/snapshots/x2mui3ms3rgupzu_snapshot.jpg</image>
+    <name>ESPN (HD) </name>
+    <url>http://www.streamlive.to/view/48051</url>
+    <image>http://snapshots.streamlive.to/snapshots/xoaaohmeuajfeyf_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>Spanish</language>
-    <views>3378.5</views>
+    <language>English</language>
+    <views>2067392.5</views>
   </channel>
   <channel>
-    <name>malaga65 canal 2 </name>
-    <url>http://www.streamlive.to/view/73236</url>
-    <image>http://snapshots.streamlive.to/snapshots/1tacpyxjl1h6arz_snapshot.jpg</image>
+    <name>Sky Sport News Sky Sports Uk Network Live</name>
+    <url>http://www.streamlive.to/view/70299</url>
+    <image>http://snapshots.streamlive.to/snapshots/4djv45vegmb6jqo_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>11.0</views>
+    <views>254467.5</views>
   </channel>
   <channel>
-    <name>Vip1 HD </name>
-    <url>http://www.streamlive.to/view/53681</url>
-    <image>http://snapshots.streamlive.to/snapshots/5cytpgd9iq4pmme_snapshot.jpg</image>
+    <name>Sky Sport F1 (HD) </name>
+    <url>http://www.streamlive.to/view/68718</url>
+    <image>http://snapshots.streamlive.to/snapshots/udhfbfg0vfzjcds_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>Spanish</language>
-    <views>1849507.0</views>
+    <language>English</language>
+    <views>839035.5</views>
   </channel>
   <channel>
-    <name>BT Sport 1 </name>
-    <url>http://www.streamlive.to/view/72735</url>
-    <image>http://snapshots.streamlive.to/snapshots/wtc25713j3u6ute_snapshot.jpg</image>
+    <name>Box Nation (HD) -aaz</name>
+    <url>http://www.streamlive.to/view/73279</url>
+    <image>http://snapshots.streamlive.to/snapshots/u3sjh0v954fwkqw_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>389005.5</views>
+    <views>1351.5</views>
   </channel>
   <channel>
-    <name>Box Nation (HD) </name>
-    <url>http://www.streamlive.to/view/68719</url>
-    <image>http://snapshots.streamlive.to/snapshots/5cnmiwezbpmbe3k_snapshot.jpg</image>
+    <name>EuroSport 2 British Euro Sport  2</name>
+    <url>http://www.streamlive.to/view/72464</url>
+    <image>http://snapshots.streamlive.to/snapshots/tk460i231b7gkh4_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>903887.0</views>
+    <views>63414.0</views>
   </channel>
   <channel>
-    <name>Ssportsli Ch2</name>
-    <url>http://www.streamlive.to/view/70507</url>
-    <image>http://snapshots.streamlive.to/snapshots/pksrfqlyqwlgwq8_snapshot.jpg</image>
+    <name>B TV 1 Btv1 Live Stream Btv 1</name>
+    <url>http://www.streamlive.to/view/68628</url>
+    <image>http://snapshots.streamlive.to/snapshots/3h3j84h39sxrlr2_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>Italian</language>
-    <views>459842.0</views>
+    <language>Portuguese</language>
+    <views>236452.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 4 (HD) </name>
-    <url>http://www.streamlive.to/view/68715</url>
-    <image>http://snapshots.streamlive.to/snapshots/21ajqprn56aebp3_snapshot.jpg</image>
+    <name>Sky Sports 2 (HD) -aaz</name>
+    <url>http://www.streamlive.to/view/73274</url>
+    <image>http://snapshots.streamlive.to/snapshots/2miet353da14h1u_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>1002609.5</views>
+    <views>2882.5</views>
   </channel>
   <channel>
-    <name>NFL Network </name>
-    <url>http://www.streamlive.to/view/70295</url>
-    <image>http://snapshots.streamlive.to/snapshots/n1dv2of13iqam3u_snapshot.jpg</image>
+    <name>BT Sport 2 (HD) </name>
+    <url>http://www.streamlive.to/view/68721</url>
+    <image>http://snapshots.streamlive.to/snapshots/z3ua1ed00znttfp_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>3362844.0</views>
+    <views>551135.5</views>
   </channel>
   <channel>
-    <name>Golf channel (HD) </name>
-    <url>http://www.streamlive.to/view/53912</url>
-    <image>http://snapshots.streamlive.to/snapshots/ts6w24dx29tcwi4_snapshot.jpg</image>
+    <name>SPORT TV 3 SPORT.TV 3 Live Sport Events</name>
+    <url>http://www.streamlive.to/view/69787</url>
+    <image>http://snapshots.streamlive.to/snapshots/4pthnyo7lqlzt80_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>90486.5</views>
+    <language>Portuguese</language>
+    <views>150042.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 2 </name>
-    <url>http://www.streamlive.to/view/72459</url>
-    <image>http://snapshots.streamlive.to/snapshots/pyy7bth6eeukd4u_snapshot.jpg</image>
+    <name>Canal+ France (HD) </name>
+    <url>http://www.streamlive.to/view/71831</url>
+    <image>http://snapshots.streamlive.to/snapshots/2h69qbxce4fsff3_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>265032.5</views>
+    <language>French</language>
+    <views>198389.5</views>
   </channel>
   <channel>
-    <name>MaltaCapital Ch3 </name>
-    <url>http://www.streamlive.to/view/70300</url>
-    <image>http://snapshots.streamlive.to/snapshots/45bvh7umowpmsu4_snapshot.jpg</image>
+    <name>ESPN UK (HD) </name>
+    <url>http://www.streamlive.to/view/70190</url>
+    <image>http://snapshots.streamlive.to/snapshots/v95pwzd4011ev3g_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>118677.5</views>
+    <views>463268.0</views>
   </channel>
   <channel>
-    <name>Box Nation </name>
-    <url>http://www.streamlive.to/view/72734</url>
-    <image>http://snapshots.streamlive.to/snapshots/ok8rauezc0vsvaz_snapshot.jpg</image>
+    <name>Sky Sport 1 </name>
+    <url>http://www.streamlive.to/view/72742</url>
+    <image>http://snapshots.streamlive.to/snapshots/x0pt269mv6n773v_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>486298.5</views>
-  </channel>
-  <channel>
-    <name>Vip8 HD</name>
-    <url>http://www.streamlive.to/view/72000</url>
-    <image>http://snapshots.streamlive.to/snapshots/oi3w6wa15r8oy2z_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>Spanish</language>
-    <views>162757.0</views>
+    <views>776442.0</views>
   </channel>
   <channel>
-    <name>BT Sport 2 </name>
-    <url>http://www.streamlive.to/view/72736</url>
-    <image>http://snapshots.streamlive.to/snapshots/r3t8xd8ss6pdequ_snapshot.jpg</image>
+    <name>Sky Sport 4 </name>
+    <url>http://www.streamlive.to/view/72745</url>
+    <image>http://snapshots.streamlive.to/snapshots/tino24bflekq5vc_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>455980.0</views>
+    <views>121873.5</views>
   </channel>
   <channel>
-    <name>Premier Sports</name>
-    <url>http://www.streamlive.to/view/70557</url>
-    <image>http://snapshots.streamlive.to/snapshots/ljr31v8sbs4l8b7_snapshot.jpg</image>
+    <name>BT Sport 1 (HD) </name>
+    <url>http://www.streamlive.to/view/68720</url>
+    <image>http://snapshots.streamlive.to/snapshots/thj91224cuxnfr1_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>143249.5</views>
-  </channel>
-  <channel>
-    <name>BTV1</name>
-    <url>http://www.streamlive.to/view/68628</url>
-    <image>http://snapshots.streamlive.to/snapshots/3h3j84h39sxrlr2_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>Portuguese</language>
-    <views>228000.5</views>
+    <views>2578525.5</views>
   </channel>
   <channel>
-    <name>SPORT TV 2</name>
-    <url>http://www.streamlive.to/view/69823</url>
-    <image>http://snapshots.streamlive.to/snapshots/1mnqje6lw57grow_snapshot.jpg</image>
+    <name>SPORT TV 4 SPORT.TV 4 Live Sport Events</name>
+    <url>http://www.streamlive.to/view/68589</url>
+    <image>http://snapshots.streamlive.to/snapshots/7yvmvbk8iasstxs_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>Portuguese</language>
-    <views>347473.0</views>
+    <views>144951.0</views>
   </channel>
   <channel>
-    <name>Euro Sport 1 (HD) </name>
-    <url>http://www.streamlive.to/view/68723</url>
-    <image>http://snapshots.streamlive.to/snapshots/futkxfuqj6tp9j9_snapshot.jpg</image>
+    <name>BT Sport 2 </name>
+    <url>http://www.streamlive.to/view/72736</url>
+    <image>http://snapshots.streamlive.to/snapshots/r3t8xd8ss6pdequ_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>1048537.0</views>
+    <views>483320.0</views>
   </channel>
   <channel>
-    <name>Bein Sport France 3 (HD) </name>
-    <url>http://www.streamlive.to/view/70729</url>
-    <image>http://snapshots.streamlive.to/snapshots/6frb74s5j99g6su_snapshot.jpg</image>
+    <name>NFL Network </name>
+    <url>http://www.streamlive.to/view/72886</url>
+    <image>http://snapshots.streamlive.to/snapshots/1c4z54w4tcvq6ue_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>French</language>
-    <views>316152.0</views>
+    <language>English</language>
+    <views>398000.0</views>
   </channel>
   <channel>
-    <name>ESPN</name>
-    <url>http://www.streamlive.to/view/71561</url>
-    <image>http://snapshots.streamlive.to/snapshots/ly11kxowritf0ts_snapshot.jpg</image>
+    <name>Sky Sport 1 (HD) </name>
+    <url>http://www.streamlive.to/view/68713</url>
+    <image>http://snapshots.streamlive.to/snapshots/9ddlpiijjci12o9_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>1398135.0</views>
+    <views>6093407.0</views>
   </channel>
   <channel>
-    <name>NBA TV</name>
-    <url>http://www.streamlive.to/view/69310</url>
-    <image>http://snapshots.streamlive.to/snapshots/w0h9i7m98x4hxhi_snapshot.jpg</image>
+    <name>Eurosport 1 - Tennis: Australian Open http://mystreans.com or http://sportp2p.in</name>
+    <url>http://www.streamlive.to/view/70506</url>
+    <image>http://snapshots.streamlive.to/snapshots/9qd6xcbgf677gm5_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>542069.5</views>
+    <language>French</language>
+    <views>594704.5</views>
   </channel>
   <channel>
-    <name>Sky Sport F1 </name>
-    <url>http://www.streamlive.to/view/72747</url>
-    <image>http://snapshots.streamlive.to/snapshots/pvarcpkyf360ck5_snapshot.jpg</image>
+    <name>Bellator 148: Daley vs. Uhrich courtesy of www.BallinSreamsLive.com</name>
+    <url>http://www.streamlive.to/view/72926</url>
+    <image>http://snapshots.streamlive.to/snapshots/d2v9jqw619vfxqh_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>189314.0</views>
+    <views>114876.5</views>
   </channel>
   <channel>
-    <name>Willow Cricket</name>
-    <url>http://www.streamlive.to/view/71573</url>
-    <image>http://snapshots.streamlive.to/snapshots/ij6520w5gq43mkg_snapshot.jpg</image>
+    <name>ESPN 2 </name>
+    <url>http://www.streamlive.to/view/69028</url>
+    <image>http://snapshots.streamlive.to/snapshots/5hd19kwxef5b59o_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>196271.5</views>
+    <views>2480034.0</views>
   </channel>
   <channel>
-    <name>24x7 Classic WWE PPV's Marathon</name>
-    <url>http://www.streamlive.to/view/67439</url>
-    <image>http://snapshots.streamlive.to/snapshots/0i6e1w2q4non031_snapshot.jpg</image>
+    <name>Premier Sports NRL NHL NASCAR GAA BOX FOOTBALL Live</name>
+    <url>http://www.streamlive.to/view/70557</url>
+    <image>http://snapshots.streamlive.to/snapshots/ljr31v8sbs4l8b7_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>1427082.5</views>
+    <views>157705.5</views>
   </channel>
   <channel>
-    <name>BT Sport 1</name>
-    <url>http://www.streamlive.to/view/72457</url>
-    <image>http://snapshots.streamlive.to/snapshots/znjvdsrj1gfv5k4_snapshot.jpg</image>
+    <name>Golf Channel Golf Channel Network Live</name>
+    <url>http://www.streamlive.to/view/68932</url>
+    <image>http://snapshots.streamlive.to/snapshots/a0dcji0vveiukh4_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>302951.0</views>
+    <views>49100.0</views>
   </channel>
   <channel>
-    <name>Sky Sport 5</name>
-    <url>http://www.streamlive.to/view/69649</url>
-    <image>http://snapshots.streamlive.to/snapshots/u8wfz71kltdyso3_snapshot.jpg</image>
+    <name>Eurosport 1 (germany) - http://mystreans.com or http://sportp2p.in</name>
+    <url>http://www.streamlive.to/view/70507</url>
+    <image>http://snapshots.streamlive.to/snapshots/pksrfqlyqwlgwq8_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>250266.0</views>
+    <language>German</language>
+    <views>516722.0</views>
   </channel>
   <channel>
-    <name>BT Sport Europe (HD) </name>
-    <url>http://www.streamlive.to/view/72137</url>
-    <image>http://snapshots.streamlive.to/snapshots/7viul0clm88iasc_snapshot.jpg</image>
+    <name>Canal+ Sport France (HD) </name>
+    <url>http://www.streamlive.to/view/70467</url>
+    <image>http://snapshots.streamlive.to/snapshots/w9eddd62l9b1uxc_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>227962.5</views>
+    <language>French</language>
+    <views>536334.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 5 (HD) </name>
-    <url>http://www.streamlive.to/view/68716</url>
-    <image>http://snapshots.streamlive.to/snapshots/2qjxgeic3x5rkdu_snapshot.jpg</image>
+    <name>NBA TV NBA TV Network Live</name>
+    <url>http://www.streamlive.to/view/71562</url>
+    <image>http://snapshots.streamlive.to/snapshots/g6egcgeorgwtfnb_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>1117680.0</views>
+    <views>3520887.0</views>
   </channel>
   <channel>
-    <name>NBA EPL -rockers</name>
-    <url>http://www.streamlive.to/view/72765</url>
-    <image>http://snapshots.streamlive.to/snapshots/l3j0cjms18iqryc_snapshot.jpg</image>
+    <name>Sky Sport 5 </name>
+    <url>http://www.streamlive.to/view/72746</url>
+    <image>http://snapshots.streamlive.to/snapshots/14s3ecng0ohg0lr_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>119314.0</views>
+    <views>110556.0</views>
   </channel>
   <channel>
-    <name>BT Sport 2 (HD) </name>
-    <url>http://www.streamlive.to/view/68721</url>
-    <image>http://snapshots.streamlive.to/snapshots/z3ua1ed00znttfp_snapshot.jpg</image>
+    <name>Box Nation (HD) </name>
+    <url>http://www.streamlive.to/view/68719</url>
+    <image>http://snapshots.streamlive.to/snapshots/5cnmiwezbpmbe3k_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>550555.5</views>
+    <views>904358.5</views>
   </channel>
   <channel>
-    <name>BT Sport 2 HD</name>
-    <url>http://www.streamlive.to/view/66542</url>
-    <image>http://snapshots.streamlive.to/snapshots/u9gtvaelcxqlzby_snapshot.jpg</image>
+    <name>SPORT TV 5 SPORT.TV 5 Live Sport Events</name>
+    <url>http://www.streamlive.to/view/69416</url>
+    <image>http://snapshots.streamlive.to/snapshots/mbcposqn4f5ixbt_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>55513.0</views>
+    <language>Portuguese</language>
+    <views>188586.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 4 </name>
-    <url>http://www.streamlive.to/view/72745</url>
-    <image>http://snapshots.streamlive.to/snapshots/tino24bflekq5vc_snapshot.jpg</image>
+    <name>NBA: Los Angeles Lakers v Los Angeles Clippers aaz</name>
+    <url>http://www.streamlive.to/view/73272</url>
+    <image>http://snapshots.streamlive.to/snapshots/3aeauyrykeq2cb7_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>109100.5</views>
+    <views>6664.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 5 </name>
-    <url>http://www.streamlive.to/view/72746</url>
-    <image>http://snapshots.streamlive.to/snapshots/14s3ecng0ohg0lr_snapshot.jpg</image>
+    <name>BT Sport ESPN BT Sports Network Live</name>
+    <url>http://www.streamlive.to/view/72462</url>
+    <image>http://snapshots.streamlive.to/snapshots/9g38yxwwqqwyn88_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>98370.5</views>
+    <views>198770.0</views>
   </channel>
   <channel>
-    <name>Sky Sport 3 </name>
-    <url>http://www.streamlive.to/view/72744</url>
-    <image>http://snapshots.streamlive.to/snapshots/4fqgcqtjob7alpn_snapshot.jpg</image>
+    <name>NFL Network(HD) </name>
+    <url>http://www.streamlive.to/view/68875</url>
+    <image>http://snapshots.streamlive.to/snapshots/zvwjh9ctt0vdlbe_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>208978.5</views>
+    <views>1989464.5</views>
   </channel>
   <channel>
-    <name>BT Sport EUROPE</name>
+    <name>BT Sport EUROPE BT Sports Network Live</name>
     <url>http://www.streamlive.to/view/72461</url>
     <image>http://snapshots.streamlive.to/snapshots/xdiq6od3jnkg0q8_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>257794.0</views>
+    <views>268677.0</views>
   </channel>
   <channel>
-    <name>BT Sport 1 HD</name>
-    <url>http://www.streamlive.to/view/66541</url>
-    <image>http://snapshots.streamlive.to/snapshots/swg2wpdq2ivwajh_snapshot.jpg</image>
+    <name>NBA: Minnesota Timberwolves v Utah Jazz -aaz</name>
+    <url>http://www.streamlive.to/view/73295</url>
+    <image>http://snapshots.streamlive.to/snapshots/lwerebu1dt5tc7h_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>59807.0</views>
+    <views>9097.0</views>
   </channel>
   <channel>
-    <name>Fbandres </name>
-    <url>http://www.streamlive.to/view/73111</url>
-    <image>http://snapshots.streamlive.to/snapshots/k4w4r62pg031hl8_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>Spanish</language>
-    <views>53834.0</views>
-  </channel>
-  <channel>
-    <name>Canal+ France (HD) </name>
-    <url>http://www.streamlive.to/view/71831</url>
-    <image>http://snapshots.streamlive.to/snapshots/2h69qbxce4fsff3_snapshot.jpg</image>
+    <name>SPORT TV 2 SPORT.TV 2 Live Sport Events</name>
+    <url>http://www.streamlive.to/view/69823</url>
+    <image>http://snapshots.streamlive.to/snapshots/1mnqje6lw57grow_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>French</language>
-    <views>198194.5</views>
+    <language>Portuguese</language>
+    <views>366980.0</views>
   </channel>
   <channel>
-    <name>Euro Sport 2 (HD) </name>
-    <url>http://www.streamlive.to/view/68724</url>
-    <image>http://snapshots.streamlive.to/snapshots/k3e344bj4qtke57_snapshot.jpg</image>
+    <name>BT Sport Europe (HD) </name>
+    <url>http://www.streamlive.to/view/72137</url>
+    <image>http://snapshots.streamlive.to/snapshots/7viul0clm88iasc_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>735552.0</views>
+    <views>247311.5</views>
   </channel>
   <channel>
-    <name>Sky Sport 3 (HD) </name>
-    <url>http://www.streamlive.to/view/68714</url>
-    <image>http://snapshots.streamlive.to/snapshots/pdqdnbyfwtzknat_snapshot.jpg</image>
+    <name>BT Sport 1 BT Sports Network Live</name>
+    <url>http://www.streamlive.to/view/72457</url>
+    <image>http://snapshots.streamlive.to/snapshots/znjvdsrj1gfv5k4_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>1080193.0</views>
+    <views>326595.5</views>
   </channel>
   <channel>
-    <name>Sport 1 USA (HD) </name>
-    <url>http://www.streamlive.to/view/72138</url>
-    <image>http://snapshots.streamlive.to/snapshots/2jry03vosgtzji9_snapshot.jpg</image>
+    <name>Sky Sport 5 Sky Sport Uk Network Live</name>
+    <url>http://www.streamlive.to/view/69649</url>
+    <image>http://snapshots.streamlive.to/snapshots/u8wfz71kltdyso3_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>372245.0</views>
+    <views>260165.0</views>
   </channel>
   <channel>
-    <name>SPORT TV 5</name>
-    <url>http://www.streamlive.to/view/69416</url>
-    <image>http://snapshots.streamlive.to/snapshots/mbcposqn4f5ixbt_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>Portuguese</language>
-    <views>169864.5</views>
-  </channel>
-  <channel>
-    <name>Vip - Bein Sport Espanol</name>
-    <url>http://www.streamlive.to/view/72400</url>
-    <image>http://snapshots.streamlive.to/snapshots/3kyblmy5vhjkp2i_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>Spanish</language>
-    <views>831053.5</views>
-  </channel>
-  <channel>
-    <name>24x7 WWE Network Live Stream [HQ]</name>
-    <url>http://www.streamlive.to/view/70407</url>
-    <image>http://snapshots.streamlive.to/snapshots/0zuk5i14piupgnd_snapshot.jpg</image>
+    <name>Box Nation </name>
+    <url>http://www.streamlive.to/view/72734</url>
+    <image>http://snapshots.streamlive.to/snapshots/ok8rauezc0vsvaz_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>397059.0</views>
+    <views>555994.5</views>
   </channel>
   <channel>
-    <name>EuroSport 1</name>
-    <url>http://www.streamlive.to/view/72463</url>
-    <image>http://snapshots.streamlive.to/snapshots/0ho5ed4iw9efeuy_snapshot.jpg</image>
+    <name>ESPN 2 (HD) </name>
+    <url>http://www.streamlive.to/view/57977</url>
+    <image>http://snapshots.streamlive.to/snapshots/rgyus7ao2ullmbt_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>60038.5</views>
+    <views>63009.5</views>
   </channel>
   <channel>
-    <name>Golf Channel</name>
-    <url>http://www.streamlive.to/view/68932</url>
-    <image>http://snapshots.streamlive.to/snapshots/a0dcji0vveiukh4_snapshot.jpg</image>
+    <name>NFL Network NFL TV Network Live</name>
+    <url>http://www.streamlive.to/view/70295</url>
+    <image>http://snapshots.streamlive.to/snapshots/n1dv2of13iqam3u_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>43520.5</views>
+    <views>4014010.5</views>
   </channel>
   <channel>
-    <name>Sky Sports 1 UK HD</name>
-    <url>http://www.streamlive.to/view/67609</url>
-    <image>http://snapshots.streamlive.to/snapshots/ah3sc89tj2hjulv_snapshot.jpg</image>
+    <name>Sky Sport 4 Sky Sport Uk Live</name>
+    <url>http://www.streamlive.to/view/71190</url>
+    <image>http://snapshots.streamlive.to/snapshots/l8omrwbiw2qe2uk_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>167840.5</views>
+    <views>82535.0</views>
   </channel>
   <channel>
     <name>Sky Sport 2 </name>
@@ -718,231 +662,207 @@
     <image>http://snapshots.streamlive.to/snapshots/uml86xglf5xul7f_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>346069.0</views>
+    <views>369724.5</views>
   </channel>
   <channel>
-    <name>Bein Sport France 1 (HD) </name>
-    <url>http://www.streamlive.to/view/69690</url>
-    <image>http://snapshots.streamlive.to/snapshots/xwe5kvju00vwvjv_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>French</language>
-    <views>647139.5</views>
-  </channel>
-  <channel>
-    <name>Super Canal Television Super Canal Television - Suena, Vive, Disfruta</name>
-    <url>http://www.streamlive.to/view/73174</url>
-    <image>http://snapshots.streamlive.to/snapshots/j785b72xrpeweiw_snapshot.jpg</image>
-    <category>Live Sport</category>
-    <language>Spanish</language>
-    <views>6580.0</views>
-  </channel>
-  <channel>
-    <name>Bein Sport Espana</name>
-    <url>http://www.streamlive.to/view/72851</url>
-    <image>http://snapshots.streamlive.to/snapshots/73vmwwzae45pvmj_snapshot.jpg</image>
+    <name>Sky Sport 2 (HD) </name>
+    <url>http://www.streamlive.to/view/68424</url>
+    <image>http://snapshots.streamlive.to/snapshots/on39ol6in4f2ewp_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>Spanish</language>
-    <views>602330.0</views>
+    <language>English</language>
+    <views>2106565.0</views>
   </channel>
   <channel>
-    <name>EuroSport 2</name>
-    <url>http://www.streamlive.to/view/72464</url>
-    <image>http://snapshots.streamlive.to/snapshots/tk460i231b7gkh4_snapshot.jpg</image>
+    <name>ESPN 2 Espn2 Network Live</name>
+    <url>http://www.streamlive.to/view/73070</url>
+    <image>http://snapshots.streamlive.to/snapshots/lclmw3k9o934118_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>52885.5</views>
+    <views>147704.0</views>
   </channel>
   <channel>
-    <name>Vip3 HD</name>
-    <url>http://www.streamlive.to/view/71391</url>
-    <image>http://snapshots.streamlive.to/snapshots/y3eik0l8ll47vpz_snapshot.jpg</image>
+    <name>Sky Sport F1 Formula 1 Sky Sports Uk Network Live</name>
+    <url>http://www.streamlive.to/view/71583</url>
+    <image>http://snapshots.streamlive.to/snapshots/otulzwd7up4nuve_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>1798974.0</views>
+    <views>233942.5</views>
   </channel>
   <channel>
-    <name>BT Sport ESPN</name>
-    <url>http://www.streamlive.to/view/72739</url>
-    <image>http://snapshots.streamlive.to/snapshots/bxp98rxrj3v4m9l_snapshot.jpg</image>
+    <name>Sky Sport 1 Sky Sports Uk Network Live</name>
+    <url>http://www.streamlive.to/view/71560</url>
+    <image>http://snapshots.streamlive.to/snapshots/uv2nqmvibdpd3uo_snapshot.jpg</image>
     <category>Live Sport</category>
     <language>English</language>
-    <views>66492.0</views>
+    <views>469260.0</views>
   </channel>
   <channel>
-    <name>Sky Sport 4</name>
-    <url>http://www.streamlive.to/view/71190</url>
-    <image>http://snapshots.streamlive.to/snapshots/l8omrwbiw2qe2uk_snapshot.jpg</image>
+    <name>Bein Sport France 2 </name>
+    <url>http://www.streamlive.to/view/72732</url>
+    <image>http://snapshots.streamlive.to/snapshots/b9ggjhqpcwx2mte_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>74022.5</views>
+    <language>French</language>
+    <views>304128.5</views>
   </channel>
   <channel>
-    <name>NFL Network (HD) </name>
-    <url>http://www.streamlive.to/view/68875</url>
-    <image>http://snapshots.streamlive.to/snapshots/zvwjh9ctt0vdlbe_snapshot.jpg</image>
+    <name>Bein Sport France 2 (HD) </name>
+    <url>http://www.streamlive.to/view/70466</url>
+    <image>http://snapshots.streamlive.to/snapshots/06927pgwezut1fd_snapshot.jpg</image>
     <category>Live Sport</category>
-    <language>English</language>
-    <views>1988016.0</views>
+    <language>French</language>
+    <views>510594.0</views>
   </channel>
   <channel>
-    <name>CBS </name>
-    <url>http://www.streamlive.to/view/69956</url>
-    <image>http://snapshots.streamlive.to/snapshots/dt0qvk6nmdhk8u6_snapshot.jpg</image>
-    <category>Entertainment</category>
+    <name>NBC Sport Networks (HD) </name>
+    <url>http://www.streamlive.to/view/64232</url>
+    <image>http://snapshots.streamlive.to/snapshots/0fm1lstybe4a0j4_snapshot.jpg</image>
+    <category>Live Sport</category>
     <language>English</language>
-    <views>4045743.5</views>
+    <views>1328958.5</views>
   </channel>
   <channel>
-    <name>CBS (HD) </name>
-    <url>http://www.streamlive.to/view/57976</url>
-    <image>http://snapshots.streamlive.to/snapshots/vp4q2gonwzh2dku_snapshot.jpg</image>
-    <category>Entertainment</category>
-    <language>English</language>
-    <views>383321.5</views>
+    <name>SPORT TV 1 SPORT.TV 1 Live Sport Events</name>
+    <url>http://www.streamlive.to/view/69785</url>
+    <image>http://snapshots.streamlive.to/snapshots/iscdxgtas788k2a_snapshot.jpg</image>
+    <category>Live Sport</category>
+    <language>Portuguese</language>
+    <views>428076.0</views>
   </channel>
   <channel>
-    <name>The Bugs Bunny Show </name>
-    <url>http://www.streamlive.to/view/72040</url>
-    <image>http://snapshots.streamlive.to/snapshots/6xvebt5vxqw0c35_snapshot.jpg</image>
+    <name>TF1 (HD) </name>
+    <url>http://www.streamlive.to/view/70468</url>
+    <image>http://snapshots.streamlive.to/snapshots/espx8gzpfi4l0sk_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>English</language>
-    <views>96083.5</views>
+    <language>French</language>
+    <views>262280.5</views>
   </channel>
   <channel>
-    <name>ABC </name>
-    <url>http://www.streamlive.to/view/68969</url>
-    <image>http://snapshots.streamlive.to/snapshots/371jluirljcsjen_snapshot.jpg</image>
+    <name>Spartacus: Gods of The Arena </name>
+    <url>http://www.streamlive.to/view/72694</url>
+    <image>http://snapshots.streamlive.to/snapshots/5nf232pb7z1xybn_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>5807672.0</views>
+    <views>102260.0</views>
   </channel>
   <channel>
-    <name>USA Network (HD) </name>
-    <url>http://www.streamlive.to/view/38768</url>
-    <image>http://snapshots.streamlive.to/snapshots/h5eovaj1jeegluq_snapshot.jpg</image>
+    <name>Syfy France (HD) </name>
+    <url>http://www.streamlive.to/view/70730</url>
+    <image>http://snapshots.streamlive.to/snapshots/yz6cc3lew1kid3j_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>English</language>
-    <views>2683828.0</views>
+    <language>French</language>
+    <views>182011.5</views>
   </channel>
   <channel>
-    <name>The Office (Show) </name>
-    <url>http://www.streamlive.to/view/40750</url>
-    <image>http://snapshots.streamlive.to/snapshots/mizolqp0th5uobk_snapshot.jpg</image>
+    <name>Channel 4 UK (HD) </name>
+    <url>http://www.streamlive.to/view/70211</url>
+    <image>http://snapshots.streamlive.to/snapshots/falndopgy2kripb_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>165531.5</views>
+    <views>204260.5</views>
   </channel>
   <channel>
-    <name>Batman Beyond (TV Series) </name>
-    <url>http://www.streamlive.to/view/72050</url>
-    <image>http://snapshots.streamlive.to/snapshots/7l4nabuaf8i3c5e_snapshot.jpg</image>
+    <name>Spartacus: Blood And Sands Complete first season Blood and Sands</name>
+    <url>http://www.streamlive.to/view/72690</url>
+    <image>http://snapshots.streamlive.to/snapshots/ixk74xh0ksg0o11_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>92655.0</views>
+    <views>121999.0</views>
   </channel>
   <channel>
-    <name>Japanese Cat 3 Movies (English sub) </name>
-    <url>http://www.streamlive.to/view/73068</url>
-    <image>http://snapshots.streamlive.to/snapshots/aeqyk2kkcxwfxnq_snapshot.jpg</image>
-    <category>Entertainment</category>
-    <language>Japanese</language>
-    <views>164951.0</views>
-  </channel>
-  <channel>
-    <name>Family Guy -32U </name>
-    <url>http://www.streamlive.to/view/69425</url>
-    <image>http://snapshots.streamlive.to/snapshots/fevxhivi00i42gh_snapshot.jpg</image>
+    <name>Sky Action (HD) </name>
+    <url>http://www.streamlive.to/view/71665</url>
+    <image>http://snapshots.streamlive.to/snapshots/qrnu46ekfskc3dx_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>764753.5</views>
+    <views>540504.0</views>
   </channel>
   <channel>
-    <name>NBC (HD) </name>
-    <url>http://www.streamlive.to/view/57956</url>
-    <image>http://snapshots.streamlive.to/snapshots/kjgkefh6la1di6g_snapshot.jpg</image>
+    <name>USA Network (HD) </name>
+    <url>http://www.streamlive.to/view/38768</url>
+    <image>http://snapshots.streamlive.to/snapshots/h5eovaj1jeegluq_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>392588.5</views>
+    <views>2688048.0</views>
   </channel>
   <channel>
-    <name>Bravo </name>
-    <url>http://www.streamlive.to/view/52480</url>
-    <image>http://snapshots.streamlive.to/snapshots/uw433ikqnrj501l_snapshot.jpg</image>
+    <name>CW USA Live HD </name>
+    <url>http://www.streamlive.to/view/73288</url>
+    <image>http://snapshots.streamlive.to/snapshots/2eln1cgyhbzhu5q_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>317602.0</views>
+    <views>4242.0</views>
   </channel>
   <channel>
-    <name>Spartacus: Gods of The Arena </name>
-    <url>http://www.streamlive.to/view/72694</url>
-    <image>http://snapshots.streamlive.to/snapshots/5nf232pb7z1xybn_snapshot.jpg</image>
+    <name>Zee TV </name>
+    <url>http://www.streamlive.to/view/71971</url>
+    <image>http://snapshots.streamlive.to/snapshots/svsgthhwl6djj5h_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>English</language>
-    <views>92399.0</views>
+    <language>Indian</language>
+    <views>118790.0</views>
   </channel>
   <channel>
-    <name>Canal+ Cinema France (HD) </name>
-    <url>http://www.streamlive.to/view/70731</url>
-    <image>http://snapshots.streamlive.to/snapshots/wk6o7bpcsveb0ne_snapshot.jpg</image>
+    <name>ABC (HD) </name>
+    <url>http://www.streamlive.to/view/46476</url>
+    <image>http://snapshots.streamlive.to/snapshots/nz7l9vc5nv1og7b_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>French</language>
-    <views>227487.5</views>
+    <language>English</language>
+    <views>423440.5</views>
   </channel>
   <channel>
-    <name>The Big Bang Theory -32U </name>
-    <url>http://www.streamlive.to/view/69536</url>
-    <image>http://snapshots.streamlive.to/snapshots/oi30kueyhpnue7t_snapshot.jpg</image>
+    <name>Sky Showcase (HD) </name>
+    <url>http://www.streamlive.to/view/71881</url>
+    <image>http://snapshots.streamlive.to/snapshots/83ivqnkpajokt1r_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>346990.5</views>
+    <views>226122.5</views>
   </channel>
   <channel>
-    <name>Appleseed XIII (TV Series) </name>
-    <url>http://www.streamlive.to/view/72051</url>
-    <image>http://snapshots.streamlive.to/snapshots/0umol8jh67ufexb_snapshot.jpg</image>
+    <name>Sky Atlantic (HD) </name>
+    <url>http://www.streamlive.to/view/72136</url>
+    <image>http://snapshots.streamlive.to/snapshots/dyt9hwb1y9arl10_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>39287.5</views>
+    <views>360792.0</views>
   </channel>
   <channel>
-    <name>Transformers: Beast Machines </name>
-    <url>http://www.streamlive.to/view/72046</url>
-    <image>http://snapshots.streamlive.to/snapshots/isov6ahjomxp28r_snapshot.jpg</image>
+    <name>Hallmark (HD) </name>
+    <url>http://www.streamlive.to/view/53856</url>
+    <image>http://snapshots.streamlive.to/snapshots/v4ynnryunsoxzbq_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>96465.5</views>
+    <views>372912.5</views>
   </channel>
   <channel>
-    <name>Oxygen </name>
-    <url>http://www.streamlive.to/view/38197</url>
-    <image>http://snapshots.streamlive.to/snapshots/zmt2swezlswh9nz_snapshot.jpg</image>
+    <name>NBC (HD) </name>
+    <url>http://www.streamlive.to/view/57956</url>
+    <image>http://snapshots.streamlive.to/snapshots/kjgkefh6la1di6g_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>262700.0</views>
+    <views>397857.0</views>
   </channel>
   <channel>
-    <name>House MD full all seasons</name>
-    <url>http://www.streamlive.to/view/40783</url>
-    <image>http://snapshots.streamlive.to/snapshots/vampcgkmpaun6at_snapshot.jpg</image>
+    <name>Two and a Half Men (HD) Season 1 </name>
+    <url>http://www.streamlive.to/view/73276</url>
+    <image>http://snapshots.streamlive.to/snapshots/o9kqushayp2688n_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>133820.0</views>
+    <views>14066.5</views>
   </channel>
   <channel>
-    <name>Channel 4 UK (HD) </name>
-    <url>http://www.streamlive.to/view/70211</url>
-    <image>http://snapshots.streamlive.to/snapshots/falndopgy2kripb_snapshot.jpg</image>
+    <name>CW </name>
+    <url>http://www.streamlive.to/view/52510</url>
+    <image>http://snapshots.streamlive.to/snapshots/fvksu1sp51ijtyd_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>203744.0</views>
+    <views>701382.5</views>
   </channel>
   <channel>
-    <name>HBO (HD) </name>
-    <url>http://www.streamlive.to/view/36674</url>
-    <image>http://snapshots.streamlive.to/snapshots/z28ie9oqoku4qoy_snapshot.jpg</image>
+    <name>AMC  (HD) </name>
+    <url>http://www.streamlive.to/view/46209</url>
+    <image>http://snapshots.streamlive.to/snapshots/z4cxm7zlfyqs65m_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>481705.0</views>
+    <views>110999.0</views>
   </channel>
   <channel>
     <name>Syfy </name>
@@ -950,39 +870,31 @@
     <image>http://snapshots.streamlive.to/snapshots/oepz9q5oivflbcw_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>2266873.0</views>
-  </channel>
-  <channel>
-    <name>Speedy Gonzalez </name>
-    <url>http://www.streamlive.to/view/72047</url>
-    <image>http://snapshots.streamlive.to/snapshots/4qhlu8kf6n4ysx6_snapshot.jpg</image>
-    <category>Entertainment</category>
-    <language>English</language>
-    <views>76100.5</views>
+    <views>2393104.5</views>
   </channel>
   <channel>
-    <name>American Dad -32U </name>
-    <url>http://www.streamlive.to/view/69426</url>
-    <image>http://snapshots.streamlive.to/snapshots/sq3u8imvr5jvegb_snapshot.jpg</image>
+    <name>CARACOL TELEVISION COLOMBIA </name>
+    <url>http://www.streamlive.to/view/52715</url>
+    <image>http://snapshots.streamlive.to/snapshots/5y6srbcmnqnsr3h_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>English</language>
-    <views>258946.5</views>
+    <language>Spanish</language>
+    <views>1408544.0</views>
   </channel>
   <channel>
-    <name>Donald Duck (TV Series) </name>
-    <url>http://www.streamlive.to/view/72042</url>
-    <image>http://snapshots.streamlive.to/snapshots/ulkpzwbfppgmhav_snapshot.jpg</image>
+    <name>Japanese Cat 3 Movies (English sub) </name>
+    <url>http://www.streamlive.to/view/73068</url>
+    <image>http://snapshots.streamlive.to/snapshots/aeqyk2kkcxwfxnq_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>English</language>
-    <views>67702.5</views>
+    <language>Japanese</language>
+    <views>269781.5</views>
   </channel>
   <channel>
-    <name>Spike TV (HD) </name>
-    <url>http://www.streamlive.to/view/52479</url>
-    <image>http://snapshots.streamlive.to/snapshots/sax2mq2alpirnww_snapshot.jpg</image>
+    <name>Showtime </name>
+    <url>http://www.streamlive.to/view/69036</url>
+    <image>http://snapshots.streamlive.to/snapshots/s53jbkmyldngbks_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>1617851.0</views>
+    <views>4898865.0</views>
   </channel>
   <channel>
     <name>HBO </name>
@@ -990,39 +902,47 @@
     <image>http://snapshots.streamlive.to/snapshots/qzbbu26gcvjxksz_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>5566078.5</views>
+    <views>6978016.5</views>
   </channel>
   <channel>
-    <name>Devil May Cry (TV Series) </name>
-    <url>http://www.streamlive.to/view/72041</url>
-    <image>http://snapshots.streamlive.to/snapshots/sv3grfdukxxmc7r_snapshot.jpg</image>
+    <name>Sky Drama (HD) </name>
+    <url>http://www.streamlive.to/view/71667</url>
+    <image>http://snapshots.streamlive.to/snapshots/dcetajgyieuricy_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>44159.0</views>
+    <views>175413.5</views>
   </channel>
   <channel>
-    <name>Syfy (HD) </name>
-    <url>http://www.streamlive.to/view/46454</url>
-    <image>http://snapshots.streamlive.to/snapshots/x7uii7mll2b7lh4_snapshot.jpg</image>
+    <name>Discovery Science (HD) </name>
+    <url>http://www.streamlive.to/view/73306</url>
+    <image>http://snapshots.streamlive.to/snapshots/n50jiwfw6a9a9jd_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>174071.0</views>
+    <views>4452.5</views>
   </channel>
   <channel>
-    <name>A and E </name>
-    <url>http://www.streamlive.to/view/68952</url>
-    <image>http://snapshots.streamlive.to/snapshots/tuc280rbycwnsvs_snapshot.jpg</image>
+    <name>American Dad -32U </name>
+    <url>http://www.streamlive.to/view/69426</url>
+    <image>http://snapshots.streamlive.to/snapshots/sq3u8imvr5jvegb_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>2686488.0</views>
+    <views>273920.0</views>
   </channel>
   <channel>
-    <name>Showtime (HD) </name>
-    <url>http://www.streamlive.to/view/44126</url>
-    <image>http://snapshots.streamlive.to/snapshots/bwbop58ixz281wv_snapshot.jpg</image>
+    <name>Hongkong Cat 3 Movies (English sub) </name>
+    <url>http://www.streamlive.to/view/73067</url>
+    <image>http://snapshots.streamlive.to/snapshots/1gq3w4e27hn8ajv_snapshot.jpg</image>
+    <category>Entertainment</category>
+    <language>Chinese</language>
+    <views>252761.5</views>
+  </channel>
+  <channel>
+    <name>The Big Bang Theory -32U </name>
+    <url>http://www.streamlive.to/view/69536</url>
+    <image>http://snapshots.streamlive.to/snapshots/oi30kueyhpnue7t_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>58942.0</views>
+    <views>378626.5</views>
   </channel>
   <channel>
     <name>TVLand watch TV Land live streaming online</name>
@@ -1030,223 +950,239 @@
     <image>http://snapshots.streamlive.to/snapshots/7yxirr4046nk5ca_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>182720.0</views>
+    <views>184273.0</views>
   </channel>
   <channel>
-    <name>Lifetime (HD) </name>
-    <url>http://www.streamlive.to/view/57846</url>
-    <image>http://snapshots.streamlive.to/snapshots/7b2gr554gyyth8e_snapshot.jpg</image>
+    <name>HBO (HD) </name>
+    <url>http://www.streamlive.to/view/36674</url>
+    <image>http://snapshots.streamlive.to/snapshots/z28ie9oqoku4qoy_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>502860.0</views>
+    <views>485026.0</views>
   </channel>
   <channel>
-    <name>Spartacus: Blood And Sands Complete first season Blood and Sands</name>
-    <url>http://www.streamlive.to/view/72690</url>
-    <image>http://snapshots.streamlive.to/snapshots/ixk74xh0ksg0o11_snapshot.jpg</image>
+    <name>Car Accident </name>
+    <url>http://www.streamlive.to/view/68169</url>
+    <image>http://snapshots.streamlive.to/snapshots/uwe8uhtbcf42xg2_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>109704.5</views>
+    <views>152299.5</views>
   </channel>
   <channel>
-    <name>TF1 (HD) </name>
-    <url>http://www.streamlive.to/view/70468</url>
-    <image>http://snapshots.streamlive.to/snapshots/espx8gzpfi4l0sk_snapshot.jpg</image>
+    <name>The Office (Show) </name>
+    <url>http://www.streamlive.to/view/40750</url>
+    <image>http://snapshots.streamlive.to/snapshots/mizolqp0th5uobk_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>French</language>
-    <views>262156.5</views>
+    <language>English</language>
+    <views>184528.5</views>
   </channel>
   <channel>
-    <name>Spartacus: Vengeance Complete season 2</name>
-    <url>http://www.streamlive.to/view/72696</url>
-    <image>http://snapshots.streamlive.to/snapshots/xk3kec7maanlnfa_snapshot.jpg</image>
+    <name>TNT (HD) </name>
+    <url>http://www.streamlive.to/view/57973</url>
+    <image>http://snapshots.streamlive.to/snapshots/7uz4als3nigi0j3_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>92857.5</views>
+    <views>510181.5</views>
   </channel>
   <channel>
-    <name>Tom  and  Jerry </name>
-    <url>http://www.streamlive.to/view/72038</url>
-    <image>http://snapshots.streamlive.to/snapshots/67wn5s0n65cjv32_snapshot.jpg</image>
+    <name>ABC </name>
+    <url>http://www.streamlive.to/view/68969</url>
+    <image>http://snapshots.streamlive.to/snapshots/371jluirljcsjen_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>246887.0</views>
+    <views>6333000.0</views>
   </channel>
   <channel>
-    <name>Beast Wars </name>
-    <url>http://www.streamlive.to/view/72039</url>
-    <image>http://snapshots.streamlive.to/snapshots/jp16fmbakqd9r0y_snapshot.jpg</image>
+    <name>That's 70 show </name>
+    <url>http://www.streamlive.to/view/38217</url>
+    <image>http://snapshots.streamlive.to/snapshots/t7ha4ghb4ilwaoo_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>56011.0</views>
+    <views>311115.0</views>
   </channel>
   <channel>
-    <name>The Looney Tunes </name>
-    <url>http://www.streamlive.to/view/72045</url>
-    <image>http://snapshots.streamlive.to/snapshots/6yewti4scflqdpz_snapshot.jpg</image>
+    <name>The Shannara Chronicles  (HD) 2016 </name>
+    <url>http://www.streamlive.to/view/73320</url>
+    <image>http://snapshots.streamlive.to/snapshots/3upp4gt2b7ooeze_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>145003.0</views>
+    <views>2159.0</views>
   </channel>
   <channel>
-    <name>Warner Bros Channel </name>
-    <url>http://www.streamlive.to/view/70317</url>
-    <image>http://snapshots.streamlive.to/snapshots/pgbt2gfuifeli72_snapshot.jpg</image>
+    <name>Sky Movie Premier (HD) </name>
+    <url>http://www.streamlive.to/view/71577</url>
+    <image>http://snapshots.streamlive.to/snapshots/l5e6413vae02nmw_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>1288456.5</views>
+    <views>246885.0</views>
   </channel>
   <channel>
-    <name>Justice League (TV Series) </name>
-    <url>http://www.streamlive.to/view/72044</url>
-    <image>http://snapshots.streamlive.to/snapshots/htmn43rx0ot22rl_snapshot.jpg</image>
+    <name>CBS (HD) </name>
+    <url>http://www.streamlive.to/view/57976</url>
+    <image>http://snapshots.streamlive.to/snapshots/vp4q2gonwzh2dku_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>168573.0</views>
+    <views>390970.0</views>
   </channel>
   <channel>
-    <name>B TV 2 Btv2 Live Stream Btv 2</name>
-    <url>http://www.streamlive.to/view/68625</url>
-    <image>http://snapshots.streamlive.to/snapshots/brvyfp5nwe8oxtr_snapshot.jpg</image>
+    <name>TLC </name>
+    <url>http://www.streamlive.to/view/69109</url>
+    <image>http://snapshots.streamlive.to/snapshots/iugceoy4o6ljhck_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>Portuguese</language>
-    <views>22027.0</views>
+    <language>English</language>
+    <views>229176.5</views>
   </channel>
   <channel>
-    <name>Rayo Vallecano vs Atletico Madrid </name>
-    <url>http://www.streamlive.to/view/68809</url>
-    <image>http://snapshots.streamlive.to/snapshots/t4w69m7avhx6qrk_snapshot.jpg</image>
+    <name>AXN (HD) </name>
+    <url>http://www.streamlive.to/view/73310</url>
+    <image>http://snapshots.streamlive.to/snapshots/j0rkqfuv9su21ft_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>218.5</views>
+    <views>2537.0</views>
   </channel>
   <channel>
-    <name>X-Men : Day of Reckoning (TV Series) </name>
-    <url>http://www.streamlive.to/view/72049</url>
-    <image>http://snapshots.streamlive.to/snapshots/ztsl38n8vp53voy_snapshot.jpg</image>
+    <name>Sky Comedy (HD) </name>
+    <url>http://www.streamlive.to/view/71664</url>
+    <image>http://snapshots.streamlive.to/snapshots/ngm5uxiqo6hjhk8_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>77577.5</views>
+    <views>310128.0</views>
   </channel>
   <channel>
-    <name>CW </name>
-    <url>http://www.streamlive.to/view/52510</url>
-    <image>http://snapshots.streamlive.to/snapshots/fvksu1sp51ijtyd_snapshot.jpg</image>
+    <name>Bravo </name>
+    <url>http://www.streamlive.to/view/52480</url>
+    <image>http://snapshots.streamlive.to/snapshots/uw433ikqnrj501l_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>557599.0</views>
+    <views>320839.0</views>
   </channel>
   <channel>
-    <name>TruTV (HD) </name>
-    <url>http://www.streamlive.to/view/52755</url>
-    <image>http://snapshots.streamlive.to/snapshots/uhnr4161ybioa5w_snapshot.jpg</image>
+    <name>A&E </name>
+    <url>http://www.streamlive.to/view/68952</url>
+    <image>http://snapshots.streamlive.to/snapshots/tuc280rbycwnsvs_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>881738.5</views>
+    <views>2690980.5</views>
   </channel>
   <channel>
-    <name>NBC </name>
-    <url>http://www.streamlive.to/view/69116</url>
-    <image>http://snapshots.streamlive.to/snapshots/s5whw37nl7weedp_snapshot.jpg</image>
+    <name>Fox Networks(HD) </name>
+    <url>http://www.streamlive.to/view/56002</url>
+    <image>http://snapshots.streamlive.to/snapshots/yuu6p5oaa1x4a1p_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>3751669.0</views>
+    <views>265989.5</views>
   </channel>
   <channel>
-    <name>Friends show </name>
-    <url>http://www.streamlive.to/view/36673</url>
-    <image>http://snapshots.streamlive.to/snapshots/wg2fmaake2sfjbr_snapshot.jpg</image>
+    <name>StarZ (HD) </name>
+    <url>http://www.streamlive.to/view/73259</url>
+    <image>http://snapshots.streamlive.to/snapshots/4jxbs85h6rakcny_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>575628.0</views>
+    <views>84029.0</views>
   </channel>
   <channel>
-    <name>Hallmark (HD) </name>
-    <url>http://www.streamlive.to/view/53856</url>
-    <image>http://snapshots.streamlive.to/snapshots/v4ynnryunsoxzbq_snapshot.jpg</image>
+    <name>Sky Scifi-Horror (HD) </name>
+    <url>http://www.streamlive.to/view/71731</url>
+    <image>http://snapshots.streamlive.to/snapshots/wk4658qcki1imla_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>370459.5</views>
+    <views>400259.0</views>
   </channel>
   <channel>
-    <name>ABC (HD) </name>
-    <url>http://www.streamlive.to/view/46476</url>
-    <image>http://snapshots.streamlive.to/snapshots/nz7l9vc5nv1og7b_snapshot.jpg</image>
+    <name>Lifetime (HD) </name>
+    <url>http://www.streamlive.to/view/57846</url>
+    <image>http://snapshots.streamlive.to/snapshots/7b2gr554gyyth8e_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>417701.5</views>
+    <views>505504.0</views>
   </channel>
   <channel>
-    <name>TNT (HD) </name>
-    <url>http://www.streamlive.to/view/57973</url>
-    <image>http://snapshots.streamlive.to/snapshots/7uz4als3nigi0j3_snapshot.jpg</image>
+    <name>Fox Network </name>
+    <url>http://www.streamlive.to/view/70048</url>
+    <image>http://snapshots.streamlive.to/snapshots/q49uyvij145wcky_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>505905.5</views>
+    <views>3511267.5</views>
   </channel>
   <channel>
-    <name>King of Queens </name>
-    <url>http://www.streamlive.to/view/38213</url>
-    <image>http://snapshots.streamlive.to/snapshots/yytqkp7711cd1ze_snapshot.jpg</image>
+    <name>Syfy (HD) </name>
+    <url>http://www.streamlive.to/view/46454</url>
+    <image>http://snapshots.streamlive.to/snapshots/x7uii7mll2b7lh4_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>608705.5</views>
+    <views>176688.0</views>
   </channel>
   <channel>
-    <name>AMC </name>
-    <url>http://www.streamlive.to/view/68963</url>
-    <image>http://snapshots.streamlive.to/snapshots/7pctmre0zfwsc24_snapshot.jpg</image>
+    <name>Family Guy -32U </name>
+    <url>http://www.streamlive.to/view/69425</url>
+    <image>http://snapshots.streamlive.to/snapshots/fevxhivi00i42gh_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>4794411.5</views>
+    <views>784123.0</views>
   </channel>
   <channel>
-    <name>AMC  (HD) </name>
-    <url>http://www.streamlive.to/view/46209</url>
-    <image>http://snapshots.streamlive.to/snapshots/z4cxm7zlfyqs65m_snapshot.jpg</image>
+    <name>Spartacus: Vengeance Complete season 2</name>
+    <url>http://www.streamlive.to/view/72696</url>
+    <image>http://snapshots.streamlive.to/snapshots/xk3kec7maanlnfa_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>107832.0</views>
+    <views>102251.5</views>
   </channel>
   <channel>
-    <name>South Park </name>
-    <url>http://www.streamlive.to/view/40155</url>
-    <image>http://snapshots.streamlive.to/snapshots/p519222iwkn2t2x_snapshot.jpg</image>
+    <name>House MD full all seasons</name>
+    <url>http://www.streamlive.to/view/40783</url>
+    <image>http://snapshots.streamlive.to/snapshots/vampcgkmpaun6at_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>69003.0</views>
+    <views>143992.5</views>
   </channel>
   <channel>
-    <name>Syfy France (HD) </name>
-    <url>http://www.streamlive.to/view/70730</url>
-    <image>http://snapshots.streamlive.to/snapshots/yz6cc3lew1kid3j_snapshot.jpg</image>
+    <name>Canal+ Cinema France (HD) </name>
+    <url>http://www.streamlive.to/view/70731</url>
+    <image>http://snapshots.streamlive.to/snapshots/wk6o7bpcsveb0ne_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>French</language>
-    <views>170225.0</views>
+    <views>227597.5</views>
   </channel>
   <channel>
-    <name>Fox Network </name>
-    <url>http://www.streamlive.to/view/70048</url>
-    <image>http://snapshots.streamlive.to/snapshots/q49uyvij145wcky_snapshot.jpg</image>
+    <name>The X-Files  (HD) 2016 </name>
+    <url>http://www.streamlive.to/view/73282</url>
+    <image>http://snapshots.streamlive.to/snapshots/6uqk9novciiw7c1_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>3214639.5</views>
+    <views>5517.0</views>
   </channel>
   <channel>
-    <name>TLC </name>
-    <url>http://www.streamlive.to/view/69109</url>
-    <image>http://snapshots.streamlive.to/snapshots/iugceoy4o6ljhck_snapshot.jpg</image>
+    <name>Spike TV (HD) </name>
+    <url>http://www.streamlive.to/view/52479</url>
+    <image>http://snapshots.streamlive.to/snapshots/sax2mq2alpirnww_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>226948.0</views>
+    <views>1620737.0</views>
   </channel>
   <channel>
-    <name>Hongkong Cat 3 Movies (English sub) </name>
-    <url>http://www.streamlive.to/view/73067</url>
-    <image>http://snapshots.streamlive.to/snapshots/1gq3w4e27hn8ajv_snapshot.jpg</image>
+    <name>B TV 2 Btv2 Live Stream Btv 2</name>
+    <url>http://www.streamlive.to/view/68625</url>
+    <image>http://snapshots.streamlive.to/snapshots/brvyfp5nwe8oxtr_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>Chinese</language>
-    <views>150913.5</views>
+    <language>Portuguese</language>
+    <views>35241.5</views>
+  </channel>
+  <channel>
+    <name>Friends show </name>
+    <url>http://www.streamlive.to/view/36673</url>
+    <image>http://snapshots.streamlive.to/snapshots/wg2fmaake2sfjbr_snapshot.jpg</image>
+    <category>Entertainment</category>
+    <language>English</language>
+    <views>612753.5</views>
+  </channel>
+  <channel>
+    <name>Oxygen </name>
+    <url>http://www.streamlive.to/view/38197</url>
+    <image>http://snapshots.streamlive.to/snapshots/zmt2swezlswh9nz_snapshot.jpg</image>
+    <category>Entertainment</category>
+    <language>English</language>
+    <views>264066.5</views>
   </channel>
   <channel>
     <name>Comedy Central </name>
@@ -1254,47 +1190,47 @@
     <image>http://snapshots.streamlive.to/snapshots/wyw9tfxexu68p0t_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>121320.0</views>
+    <views>123200.5</views>
   </channel>
   <channel>
-    <name>Kim Binh Mai tron bo 5 tap Kim Binh Mai</name>
-    <url>http://www.streamlive.to/view/38219</url>
-    <image>http://snapshots.streamlive.to/snapshots/6jxqdje7ancmghe_snapshot.jpg</image>
+    <name>Showtime (HD) </name>
+    <url>http://www.streamlive.to/view/44126</url>
+    <image>http://snapshots.streamlive.to/snapshots/bwbop58ixz281wv_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>Chinese</language>
-    <views>178380.0</views>
+    <language>English</language>
+    <views>61568.5</views>
   </channel>
   <channel>
-    <name>That's 70 show </name>
-    <url>http://www.streamlive.to/view/38217</url>
-    <image>http://snapshots.streamlive.to/snapshots/t7ha4ghb4ilwaoo_snapshot.jpg</image>
+    <name>Two And A Half Men -32U </name>
+    <url>http://www.streamlive.to/view/72622</url>
+    <image>http://snapshots.streamlive.to/snapshots/a3hrv3l3bj3lwyp_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>298276.5</views>
+    <views>143379.5</views>
   </channel>
   <channel>
-    <name>Gravity Falls </name>
-    <url>http://www.streamlive.to/view/72043</url>
-    <image>http://snapshots.streamlive.to/snapshots/3r76u51ybwb73ex_snapshot.jpg</image>
+    <name>Cinemax (HD) </name>
+    <url>http://www.streamlive.to/view/73303</url>
+    <image>http://snapshots.streamlive.to/snapshots/pnfqswzbs26jhly_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>64110.0</views>
+    <views>8288.0</views>
   </channel>
   <channel>
-    <name>Uptown Comedy Corner Premier Urban Comedy from Atlanta, Ga.</name>
-    <url>http://www.streamlive.to/view/71072</url>
-    <image>http://snapshots.streamlive.to/snapshots/qmqwrgez1sq6cme_snapshot.jpg</image>
+    <name>Kim Binh Mai tron bo 5 tap Kim Binh Mai</name>
+    <url>http://www.streamlive.to/view/38219</url>
+    <image>http://snapshots.streamlive.to/snapshots/6jxqdje7ancmghe_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>English</language>
-    <views>79337.0</views>
+    <language>Chinese</language>
+    <views>182438.0</views>
   </channel>
   <channel>
-    <name>Two And A Half Men -32U </name>
-    <url>http://www.streamlive.to/view/72622</url>
-    <image>http://snapshots.streamlive.to/snapshots/a3hrv3l3bj3lwyp_snapshot.jpg</image>
+    <name>King of Queens </name>
+    <url>http://www.streamlive.to/view/38213</url>
+    <image>http://snapshots.streamlive.to/snapshots/yytqkp7711cd1ze_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>131482.5</views>
+    <views>637716.0</views>
   </channel>
   <channel>
     <name>BET </name>
@@ -1302,39 +1238,47 @@
     <image>http://snapshots.streamlive.to/snapshots/kexkxje3nqi6dtl_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>986778.5</views>
+    <views>1039201.0</views>
   </channel>
   <channel>
-    <name>Sky Atlantic (HD) </name>
-    <url>http://www.streamlive.to/view/72136</url>
-    <image>http://snapshots.streamlive.to/snapshots/dyt9hwb1y9arl10_snapshot.jpg</image>
+    <name>Uptown Comedy Corner Premier Urban Comedy from Atlanta, Ga.</name>
+    <url>http://www.streamlive.to/view/71072</url>
+    <image>http://snapshots.streamlive.to/snapshots/qmqwrgez1sq6cme_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>338107.0</views>
+    <views>83362.0</views>
   </channel>
   <channel>
-    <name>Zee TV </name>
-    <url>http://www.streamlive.to/view/71971</url>
-    <image>http://snapshots.streamlive.to/snapshots/svsgthhwl6djj5h_snapshot.jpg</image>
+    <name>RCN TELEVISION COLOMBIA </name>
+    <url>http://www.streamlive.to/view/52714</url>
+    <image>http://snapshots.streamlive.to/snapshots/s4zznyjf3zoz0dc_snapshot.jpg</image>
     <category>Entertainment</category>
-    <language>Indian</language>
-    <views>118444.5</views>
+    <language>Spanish</language>
+    <views>1002812.0</views>
   </channel>
   <channel>
-    <name>Showtime </name>
-    <url>http://www.streamlive.to/view/69036</url>
-    <image>http://snapshots.streamlive.to/snapshots/s53jbkmyldngbks_snapshot.jpg</image>
+    <name>TruTV (HD) </name>
+    <url>http://www.streamlive.to/view/52755</url>
+    <image>http://snapshots.streamlive.to/snapshots/uhnr4161ybioa5w_snapshot.jpg</image>
+    <category>Entertainment</category>
+    <language>English</language>
+    <views>884045.0</views>
+  </channel>
+  <channel>
+    <name>Sky Family (HD) </name>
+    <url>http://www.streamlive.to/view/71666</url>
+    <image>http://snapshots.streamlive.to/snapshots/9lbeipbbj3tb2ik_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>4032072.0</views>
+    <views>192282.5</views>
   </channel>
   <channel>
-    <name>The Ultimate Spider-Man </name>
-    <url>http://www.streamlive.to/view/72048</url>
-    <image>http://snapshots.streamlive.to/snapshots/txwjjhvygrxhuan_snapshot.jpg</image>
+    <name>South Park </name>
+    <url>http://www.streamlive.to/view/40155</url>
+    <image>http://snapshots.streamlive.to/snapshots/p519222iwkn2t2x_snapshot.jpg</image>
     <category>Entertainment</category>
     <language>English</language>
-    <views>70097.5</views>
+    <views>76503.0</views>
   </channel>
   <channel>
     <name>Cartoon Network </name>
@@ -1342,15 +1286,15 @@
     <image>http://snapshots.streamlive.to/snapshots/9l41fcr1sgmclej_snapshot.jpg</image>
     <category>Animation</category>
     <language>English</language>
-    <views>1777998.0</views>
+    <views>2011231.5</views>
   </channel>
   <channel>
-    <name>Dragon Ball GT watch Dragon Ball GT live</name>
-    <url>http://www.streamlive.to/view/53105</url>
-    <image>http://snapshots.streamlive.to/snapshots/lj2q51wqhd7rpr0_snapshot.jpg</image>
+    <name>Dragon Ball full episodes</name>
+    <url>http://www.streamlive.to/view/37044</url>
+    <image>http://snapshots.streamlive.to/snapshots/15jvbu6lxtgwrcq_snapshot.jpg</image>
     <category>Animation</category>
     <language>English</language>
-    <views>246009.5</views>
+    <views>230701.5</views>
   </channel>
   <channel>
     <name>Naruto </name>
@@ -1358,15 +1302,7 @@
     <image>http://snapshots.streamlive.to/snapshots/9ft15bx7kc229en_snapshot.jpg</image>
     <category>Animation</category>
     <language>Japanese</language>
-    <views>176647.0</views>
-  </channel>
-  <channel>
-    <name>Bleach anime full </name>
-    <url>http://www.streamlive.to/view/36820</url>
-    <image>http://snapshots.streamlive.to/snapshots/cqq87pn1lkxra4k_snapshot.jpg</image>
-    <category>Animation</category>
-    <language>Japanese</language>
-    <views>153881.5</views>
+    <views>183405.5</views>
   </channel>
   <channel>
     <name>Detective Conan the movies </name>
@@ -1374,15 +1310,7 @@
     <image>http://snapshots.streamlive.to/snapshots/shserslj4yhr7ig_snapshot.jpg</image>
     <category>Animation</category>
     <language>Japanese</language>
-    <views>140894.5</views>
-  </channel>
-  <channel>
-    <name>Dragon Ball full episodes</name>
-    <url>http://www.streamlive.to/view/37044</url>
-    <image>http://snapshots.streamlive.to/snapshots/15jvbu6lxtgwrcq_snapshot.jpg</image>
-    <category>Animation</category>
-    <language>English</language>
-    <views>224660.0</views>
+    <views>147983.0</views>
   </channel>
   <channel>
     <name>Dragon Balll Z </name>
@@ -1390,47 +1318,47 @@
     <image>http://snapshots.streamlive.to/snapshots/y9f0p4tvi2hwoxy_snapshot.jpg</image>
     <category>Animation</category>
     <language>English</language>
-    <views>425431.0</views>
+    <views>442800.5</views>
   </channel>
   <channel>
-    <name>National Geographic Wild France (HD) </name>
-    <url>http://www.streamlive.to/view/70213</url>
-    <image>http://snapshots.streamlive.to/snapshots/65oufjbzfin48ho_snapshot.jpg</image>
-    <category>General</category>
-    <language>French</language>
-    <views>281436.0</views>
+    <name>Bleach anime full </name>
+    <url>http://www.streamlive.to/view/36820</url>
+    <image>http://snapshots.streamlive.to/snapshots/cqq87pn1lkxra4k_snapshot.jpg</image>
+    <category>Animation</category>
+    <language>Japanese</language>
+    <views>159940.5</views>
   </channel>
   <channel>
-    <name>Travel channel (HD) </name>
-    <url>http://www.streamlive.to/view/65833</url>
-    <image>http://snapshots.streamlive.to/snapshots/4aiufk0o430qt0d_snapshot.jpg</image>
+    <name>National Geographic (HD) </name>
+    <url>http://www.streamlive.to/view/68872</url>
+    <image>http://snapshots.streamlive.to/snapshots/qzsfigd1y3bgbhs_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>110931.5</views>
+    <views>65171.5</views>
   </channel>
   <channel>
-    <name>Discovery (HD) </name>
-    <url>http://www.streamlive.to/view/69112</url>
-    <image>http://snapshots.streamlive.to/snapshots/ishyd3sopok3p27_snapshot.jpg</image>
+    <name>Science (HD) </name>
+    <url>http://www.streamlive.to/view/68871</url>
+    <image>http://snapshots.streamlive.to/snapshots/00t250wv1d4ltib_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>100784.0</views>
+    <views>49158.5</views>
   </channel>
   <channel>
-    <name>HBO (HD) LIVE</name>
-    <url>http://www.streamlive.to/view/72625</url>
-    <image>http://snapshots.streamlive.to/snapshots/c6y744dblz5mm0n_snapshot.jpg</image>
+    <name>PCTV 7 </name>
+    <url>http://www.streamlive.to/view/72607</url>
+    <image>http://snapshots.streamlive.to/snapshots/cqz8m82z6926up8_snapshot.jpg</image>
     <category>General</category>
-    <language>Spanish</language>
-    <views>207320.0</views>
+    <language>English</language>
+    <views>8012.0</views>
   </channel>
   <channel>
-    <name>HGTV (HD) </name>
-    <url>http://www.streamlive.to/view/52053</url>
-    <image>http://snapshots.streamlive.to/snapshots/gj65q2rg18tpmut_snapshot.jpg</image>
+    <name>ABC Family - Mttvmario Refer To The T.V. Guide At The Bottom of the Page</name>
+    <url>http://www.streamlive.to/view/30303</url>
+    <image>http://snapshots.streamlive.to/snapshots/vx63a0c7mxk2jt8_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>283310.5</views>
+    <views>1802108.5</views>
   </channel>
   <channel>
     <name>VH1 </name>
@@ -1438,39 +1366,47 @@
     <image>http://snapshots.streamlive.to/snapshots/oeiigxxv1gbeqq9_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>1367051.0</views>
+    <views>1369469.0</views>
   </channel>
   <channel>
-    <name>Discovery Investigation  [HD] </name>
-    <url>http://www.streamlive.to/view/70632</url>
-    <image>http://snapshots.streamlive.to/snapshots/bmbahkumnsqcydw_snapshot.jpg</image>
+    <name>Discovery France (HD) </name>
+    <url>http://www.streamlive.to/view/70212</url>
+    <image>http://snapshots.streamlive.to/snapshots/zxmgjr0fyl6dxja_snapshot.jpg</image>
     <category>General</category>
-    <language>English</language>
-    <views>689871.5</views>
+    <language>French</language>
+    <views>177182.0</views>
   </channel>
   <channel>
-    <name>Street Fight TV </name>
-    <url>http://www.streamlive.to/view/65976</url>
-    <image>http://snapshots.streamlive.to/snapshots/urtl19to3rhcpo1_snapshot.jpg</image>
+    <name>NBC US Live HD </name>
+    <url>http://www.streamlive.to/view/73293</url>
+    <image>http://snapshots.streamlive.to/snapshots/8gntbwbch50mjjq_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>171723.5</views>
+    <views>5625.0</views>
   </channel>
   <channel>
-    <name>OWN - Oprah Winfrey Network (HD) </name>
-    <url>http://www.streamlive.to/view/53857</url>
-    <image>http://snapshots.streamlive.to/snapshots/uehgy5htiasffj3_snapshot.jpg</image>
+    <name>HGTV (HD) </name>
+    <url>http://www.streamlive.to/view/52053</url>
+    <image>http://snapshots.streamlive.to/snapshots/gj65q2rg18tpmut_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>1466858.5</views>
+    <views>288564.5</views>
   </channel>
   <channel>
-    <name>Truth Channel Kingz Court TV - Documentary Films</name>
-    <url>http://www.streamlive.to/view/71259</url>
-    <image>http://snapshots.streamlive.to/snapshots/t8pxhnkifqyflgz_snapshot.jpg</image>
+    <name>HBO (HD) LIVE</name>
+    <url>http://www.streamlive.to/view/72625</url>
+    <image>http://snapshots.streamlive.to/snapshots/c6y744dblz5mm0n_snapshot.jpg</image>
+    <category>General</category>
+    <language>Spanish</language>
+    <views>262100.0</views>
+  </channel>
+  <channel>
+    <name>ABC USA Live HD </name>
+    <url>http://www.streamlive.to/view/73290</url>
+    <image>http://snapshots.streamlive.to/snapshots/x75tw2w6u1x1e7y_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>41236.0</views>
+    <views>69364.0</views>
   </channel>
   <channel>
     <name>Food Network (HD) </name>
@@ -1478,103 +1414,111 @@
     <image>http://snapshots.streamlive.to/snapshots/ibnnu7537h3ax6e_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>182029.0</views>
+    <views>185208.5</views>
   </channel>
   <channel>
-    <name>Discovery France (HD) </name>
-    <url>http://www.streamlive.to/view/70212</url>
-    <image>http://snapshots.streamlive.to/snapshots/zxmgjr0fyl6dxja_snapshot.jpg</image>
+    <name>ID - Investigation Discovery (HD) </name>
+    <url>http://www.streamlive.to/view/69111</url>
+    <image>http://snapshots.streamlive.to/snapshots/yjma618cibkqxeo_snapshot.jpg</image>
     <category>General</category>
-    <language>French</language>
-    <views>177041.0</views>
+    <language>English</language>
+    <views>357483.0</views>
   </channel>
   <channel>
-    <name>History Channel Europe [HD] </name>
-    <url>http://www.streamlive.to/view/70633</url>
-    <image>http://snapshots.streamlive.to/snapshots/logojbjhar79pc8_snapshot.jpg</image>
+    <name>Discovery (HD) </name>
+    <url>http://www.streamlive.to/view/69112</url>
+    <image>http://snapshots.streamlive.to/snapshots/ishyd3sopok3p27_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>1676215.0</views>
+    <views>108122.0</views>
   </channel>
   <channel>
-    <name>PCTV 7 </name>
-    <url>http://www.streamlive.to/view/72607</url>
-    <image>http://snapshots.streamlive.to/snapshots/cqz8m82z6926up8_snapshot.jpg</image>
+    <name>History (HD) </name>
+    <url>http://www.streamlive.to/view/39949</url>
+    <image>http://snapshots.streamlive.to/snapshots/dhp0rpd116qyyj6_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>6143.0</views>
+    <views>1496345.5</views>
   </channel>
   <channel>
-    <name>History Channel HD LIVE</name>
-    <url>http://www.streamlive.to/view/72624</url>
-    <image>http://snapshots.streamlive.to/snapshots/6ad2l2cq5vgmthy_snapshot.jpg</image>
+    <name>History Channel Europe [HD] </name>
+    <url>http://www.streamlive.to/view/70633</url>
+    <image>http://snapshots.streamlive.to/snapshots/logojbjhar79pc8_snapshot.jpg</image>
     <category>General</category>
-    <language>Spanish</language>
-    <views>541669.5</views>
+    <language>English</language>
+    <views>1737523.0</views>
   </channel>
   <channel>
-    <name>National Geographic (HD) </name>
-    <url>http://www.streamlive.to/view/68872</url>
-    <image>http://snapshots.streamlive.to/snapshots/qzsfigd1y3bgbhs_snapshot.jpg</image>
+    <name>FOX 43 US Live HD </name>
+    <url>http://www.streamlive.to/view/73302</url>
+    <image>http://snapshots.streamlive.to/snapshots/wjpi4hkfv2fswrz_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>61881.0</views>
+    <views>3510.0</views>
   </channel>
   <channel>
-    <name>ID - Investigation Discovery (HD) </name>
-    <url>http://www.streamlive.to/view/69111</url>
-    <image>http://snapshots.streamlive.to/snapshots/yjma618cibkqxeo_snapshot.jpg</image>
+    <name>OWN - Oprah Winfrey Network (HD) </name>
+    <url>http://www.streamlive.to/view/53857</url>
+    <image>http://snapshots.streamlive.to/snapshots/uehgy5htiasffj3_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>348135.5</views>
+    <views>1469755.0</views>
   </channel>
   <channel>
-    <name>Science (HD) </name>
-    <url>http://www.streamlive.to/view/68871</url>
-    <image>http://snapshots.streamlive.to/snapshots/00t250wv1d4ltib_snapshot.jpg</image>
+    <name>H2 -History Channel 2- Europe [HD] </name>
+    <url>http://www.streamlive.to/view/70632</url>
+    <image>http://snapshots.streamlive.to/snapshots/bmbahkumnsqcydw_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>47066.5</views>
+    <views>733096.5</views>
   </channel>
   <channel>
-    <name>ABC Family - Mttvmario Refer To The T.V. Guide At The Bottom of the Page</name>
-    <url>http://www.streamlive.to/view/30303</url>
-    <image>http://snapshots.streamlive.to/snapshots/vx63a0c7mxk2jt8_snapshot.jpg</image>
+    <name>National Geographic Wild France (HD) </name>
+    <url>http://www.streamlive.to/view/70213</url>
+    <image>http://snapshots.streamlive.to/snapshots/65oufjbzfin48ho_snapshot.jpg</image>
+    <category>General</category>
+    <language>French</language>
+    <views>281679.0</views>
+  </channel>
+  <channel>
+    <name>CBS US TV Live HD </name>
+    <url>http://www.streamlive.to/view/73300</url>
+    <image>http://snapshots.streamlive.to/snapshots/0n2jr7p9wn6qzcx_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>1712807.5</views>
+    <views>3538.5</views>
   </channel>
   <channel>
-    <name>History (HD) </name>
-    <url>http://www.streamlive.to/view/39949</url>
-    <image>http://snapshots.streamlive.to/snapshots/dhp0rpd116qyyj6_snapshot.jpg</image>
+    <name>Travel channel (HD) </name>
+    <url>http://www.streamlive.to/view/65833</url>
+    <image>http://snapshots.streamlive.to/snapshots/4aiufk0o430qt0d_snapshot.jpg</image>
     <category>General</category>
     <language>English</language>
-    <views>1489868.5</views>
+    <views>114515.0</views>
   </channel>
   <channel>
-    <name>CNN International </name>
-    <url>http://www.streamlive.to/view/57804</url>
-    <image>http://snapshots.streamlive.to/snapshots/oj20abbw6epowt7_snapshot.jpg</image>
-    <category>News</category>
+    <name>Truth or Conspiracy Kingz Court TV</name>
+    <url>http://www.streamlive.to/view/71259</url>
+    <image>http://snapshots.streamlive.to/snapshots/t8pxhnkifqyflgz_snapshot.jpg</image>
+    <category>General</category>
     <language>English</language>
-    <views>1427421.0</views>
+    <views>46939.5</views>
   </channel>
   <channel>
-    <name>MSNBC (HD) </name>
-    <url>http://www.streamlive.to/view/52505</url>
-    <image>http://snapshots.streamlive.to/snapshots/1341ujtliqndod8_snapshot.jpg</image>
+    <name>CNN </name>
+    <url>http://www.streamlive.to/view/70785</url>
+    <image>http://snapshots.streamlive.to/snapshots/ykerm3p2gcj43qf_snapshot.jpg</image>
     <category>News</category>
     <language>English</language>
-    <views>354577.5</views>
+    <views>644958.0</views>
   </channel>
-  <channel>
-    <name>CNN</name>
-    <url>http://www.streamlive.to/view/68967</url>
-    <image>http://snapshots.streamlive.to/snapshots/1z3ps9vxnknuskb_snapshot.jpg</image>
+<!--   <channel> -->
+    <name>ABC NEWS (HD) </name>
+    <url>http://www.streamlive.to/view/73328</url>
+    <image>http://snapshots.streamlive.to/snapshots/dlrvilacwuwwf2t_snapshot.jpg</image>
     <category>News</category>
     <language>English</language>
-    <views>5731807.5</views>
+    <views>1003.0</views>
   </channel>
   <channel>
     <name>CNN (HD) </name>
@@ -1582,15 +1526,15 @@
     <image>http://snapshots.streamlive.to/snapshots/rjxo8hz17q9waiq_snapshot.jpg</image>
     <category>News</category>
     <language>English</language>
-    <views>308335.5</views>
+    <views>318071.5</views>
   </channel>
   <channel>
-    <name>CNBC (HD) </name>
-    <url>http://www.streamlive.to/view/71981</url>
-    <image>http://snapshots.streamlive.to/snapshots/xssrqbmovted7h6_snapshot.jpg</image>
+    <name>Fox News (HD) </name>
+    <url>http://www.streamlive.to/view/46465</url>
+    <image>http://snapshots.streamlive.to/snapshots/ohn58e97er36vjr_snapshot.jpg</image>
     <category>News</category>
     <language>English</language>
-    <views>125861.0</views>
+    <views>381816.0</views>
   </channel>
   <channel>
     <name>Fox News </name>
@@ -1598,23 +1542,31 @@
     <image>http://snapshots.streamlive.to/snapshots/w0mr10getvsikam_snapshot.jpg</image>
     <category>News</category>
     <language>English</language>
-    <views>4398903.5</views>
+    <views>4501783.0</views>
   </channel>
   <channel>
-    <name>MTV Music Television (HD) </name>
-    <url>http://www.streamlive.to/view/63376</url>
-    <image>http://snapshots.streamlive.to/snapshots/p0audpgrkvu6l1g_snapshot.jpg</image>
-    <category>Music</category>
+    <name>CNN Live CNN</name>
+    <url>http://www.streamlive.to/view/68967</url>
+    <image>http://snapshots.streamlive.to/snapshots/1z3ps9vxnknuskb_snapshot.jpg</image>
+    <category>News</category>
     <language>English</language>
-    <views>112110.0</views>
+    <views>5841132.5</views>
   </channel>
   <channel>
-    <name>Japanese Super Stars music </name>
-    <url>http://www.streamlive.to/view/38218</url>
-    <image>http://snapshots.streamlive.to/snapshots/bzh4mr1zt40hmw4_snapshot.jpg</image>
-    <category>Music</category>
-    <language>Japanese</language>
-    <views>119149.0</views>
+    <name>MSNBC </name>
+    <url>http://www.streamlive.to/view/52505</url>
+    <image>http://snapshots.streamlive.to/snapshots/1341ujtliqndod8_snapshot.jpg</image>
+    <category>News</category>
+    <language>English</language>
+    <views>360469.5</views>
+  </channel>
+  <channel>
+    <name>CNN International (HD) </name>
+    <url>http://www.streamlive.to/view/73316</url>
+    <image>http://snapshots.streamlive.to/snapshots/llpytqr4njicjmm_snapshot.jpg</image>
+    <category>News</category>
+    <language>English</language>
+    <views>7581.5</views>
   </channel>
   <channel>
     <name>Korean Music </name>
@@ -1622,7 +1574,15 @@
     <image>http://snapshots.streamlive.to/snapshots/q32r221dgpcok07_snapshot.jpg</image>
     <category>Music</category>
     <language>Korean</language>
-    <views>134636.0</views>
+    <views>137971.5</views>
+  </channel>
+  <channel>
+    <name>MTV Music Television (HD) </name>
+    <url>http://www.streamlive.to/view/63376</url>
+    <image>http://snapshots.streamlive.to/snapshots/p0audpgrkvu6l1g_snapshot.jpg</image>
+    <category>Music</category>
+    <language>English</language>
+    <views>113213.0</views>
   </channel>
   <channel>
     <name>Vietnamese Music hot girl </name>
@@ -1630,7 +1590,15 @@
     <image>http://snapshots.streamlive.to/snapshots/9r8266ecbqwd10s_snapshot.jpg</image>
     <category>Music</category>
     <language>Vietnamese</language>
-    <views>163995.5</views>
+    <views>168694.5</views>
+  </channel>
+  <channel>
+    <name>Japanese Super Stars music </name>
+    <url>http://www.streamlive.to/view/38218</url>
+    <image>http://snapshots.streamlive.to/snapshots/bzh4mr1zt40hmw4_snapshot.jpg</image>
+    <category>Music</category>
+    <language>Japanese</language>
+    <views>122256.0</views>
   </channel>
   <channel>
     <name>Nickelodeon </name>
@@ -1638,7 +1606,7 @@
     <image>http://snapshots.streamlive.to/snapshots/64jaber5pjqj2cr_snapshot.jpg</image>
     <category>Family</category>
     <language>English</language>
-    <views>1455711.0</views>
+    <views>1603121.0</views>
   </channel>
   <channel>
     <name>Disney (HD) </name>
@@ -1646,7 +1614,7 @@
     <image>http://snapshots.streamlive.to/snapshots/2tag4dzgwof5ma2_snapshot.jpg</image>
     <category>Family</category>
     <language>English</language>
-    <views>4106334.5</views>
+    <views>4377834.0</views>
   </channel>
   <channel>
     <name>Mad Max Fury Road (2015) </name>
@@ -1654,7 +1622,7 @@
     <image>http://snapshots.streamlive.to/snapshots/u1bbefoly78b2qr_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>158786.0</views>
+    <views>158942.5</views>
   </channel>
   <channel>
     <name>Safelight (2015) </name>
@@ -1662,7 +1630,7 @@
     <image>http://snapshots.streamlive.to/snapshots/bd7xeub3lhg82ut_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>43721.5</views>
+    <views>43774.5</views>
   </channel>
   <channel>
     <name>It follows (2014) </name>
@@ -1670,7 +1638,7 @@
     <image>http://snapshots.streamlive.to/snapshots/5gkpc1aceuj6tiw_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>4854.5</views>
+    <views>4932.0</views>
   </channel>
   <channel>
     <name>Gallow Road (2015) </name>
@@ -1678,7 +1646,7 @@
     <image>http://snapshots.streamlive.to/snapshots/uwlf17ew492ebrc_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>39970.5</views>
+    <views>40034.0</views>
   </channel>
   <channel>
     <name>Black Beauty (2015) </name>
@@ -1686,7 +1654,7 @@
     <image>http://snapshots.streamlive.to/snapshots/h9eb1byhulw7ohh_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>80316.5</views>
+    <views>80449.0</views>
   </channel>
   <channel>
     <name>Entourage (2015) </name>
@@ -1694,7 +1662,7 @@
     <image>http://snapshots.streamlive.to/snapshots/k1ask545j0h6xof_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>6695.5</views>
+    <views>6756.5</views>
   </channel>
   <channel>
     <name>The Longest Ride (2015) </name>
@@ -1702,7 +1670,7 @@
     <image>http://snapshots.streamlive.to/snapshots/vu3iocfc52p94ua_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>6066.0</views>
+    <views>6161.5</views>
   </channel>
   <channel>
     <name>The Hobbit An Unexpected Journey (2012) </name>
@@ -1710,7 +1678,7 @@
     <image>http://snapshots.streamlive.to/snapshots/ds0zo23ropoe6tb_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>6468.5</views>
+    <views>6523.5</views>
   </channel>
   <channel>
     <name>Furious 7 (2015) </name>
@@ -1718,7 +1686,7 @@
     <image>http://snapshots.streamlive.to/snapshots/kz8m5uyw3z56thx_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>31810.0</views>
+    <views>31977.5</views>
   </channel>
   <channel>
     <name>What We Do In The Shadows 2014 </name>
@@ -1726,7 +1694,7 @@
     <image>http://snapshots.streamlive.to/snapshots/8jrmz1jsnyq77ns_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>4247.5</views>
+    <views>4298.5</views>
   </channel>
   <channel>
     <name>Red Army (2014) </name>
@@ -1734,7 +1702,7 @@
     <image>http://snapshots.streamlive.to/snapshots/wb9sll951pdzg1i_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>6245.0</views>
+    <views>6313.0</views>
   </channel>
   <channel>
     <name>The Hobbit The Desolation of Smaug (2013) </name>
@@ -1742,7 +1710,7 @@
     <image>http://snapshots.streamlive.to/snapshots/a9iwm0961njp8p5_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>6210.0</views>
+    <views>6249.0</views>
   </channel>
   <channel>
     <name>Terminator Genisys (2015) </name>
@@ -1750,7 +1718,7 @@
     <image>http://snapshots.streamlive.to/snapshots/ma86cg9qjyenubb_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>14082.5</views>
+    <views>14202.0</views>
   </channel>
   <channel>
     <name>Paul Blart Mall Cop 2 (2015) </name>
@@ -1758,7 +1726,7 @@
     <image>http://snapshots.streamlive.to/snapshots/j9jdgdjtvnmghlo_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>76904.5</views>
+    <views>76989.0</views>
   </channel>
   <channel>
     <name>The Jokesters (2015) </name>
@@ -1766,7 +1734,7 @@
     <image>http://snapshots.streamlive.to/snapshots/zcg77gx75hsz5y7_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>35709.5</views>
+    <views>35769.0</views>
   </channel>
   <channel>
     <name>Paddington (2014) </name>
@@ -1774,7 +1742,7 @@
     <image>http://snapshots.streamlive.to/snapshots/3fplceunaduthiw_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>4417.0</views>
+    <views>4452.0</views>
   </channel>
   <channel>
     <name>The Good The Bad The Ugly (1966) </name>
@@ -1782,7 +1750,7 @@
     <image>http://snapshots.streamlive.to/snapshots/feewtsonj73qeu4_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>7397.5</views>
+    <views>7527.0</views>
   </channel>
   <channel>
     <name>The Girl Is In Trouble (2015) </name>
@@ -1790,7 +1758,7 @@
     <image>http://snapshots.streamlive.to/snapshots/eq52bo3zkaweniw_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>60569.5</views>
+    <views>60629.5</views>
   </channel>
   <channel>
     <name>Inception (2010) </name>
@@ -1798,7 +1766,7 @@
     <image>http://snapshots.streamlive.to/snapshots/pe1dt3fanftdh0o_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>5121.0</views>
+    <views>5176.0</views>
   </channel>
   <channel>
     <name>Paper Town (2015) </name>
@@ -1806,7 +1774,7 @@
     <image>http://snapshots.streamlive.to/snapshots/hrb0ptuds85252s_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>6002.5</views>
+    <views>6063.0</views>
   </channel>
   <channel>
     <name>Forest Gump (1994) </name>
@@ -1814,7 +1782,7 @@
     <image>http://snapshots.streamlive.to/snapshots/jq4vu9yopbp2au0_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>5994.5</views>
+    <views>6065.5</views>
   </channel>
   <channel>
     <name>Joe Dirt 2 (2015) </name>
@@ -1822,7 +1790,7 @@
     <image>http://snapshots.streamlive.to/snapshots/m3607iui5io25yy_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>78854.0</views>
+    <views>78956.0</views>
   </channel>
   <channel>
     <name>The Hobbit The Battle Of The Five Armies (2014) </name>
@@ -1830,7 +1798,7 @@
     <image>http://snapshots.streamlive.to/snapshots/wgfc4tdv02e007x_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>6591.5</views>
+    <views>6634.0</views>
   </channel>
   <channel>
     <name>Jurassic World (2015) </name>
@@ -1838,7 +1806,7 @@
     <image>http://snapshots.streamlive.to/snapshots/vr9frdz2i1wnazn_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>21957.0</views>
+    <views>22095.0</views>
   </channel>
   <channel>
     <name>Lila And Eve (2015) </name>
@@ -1846,7 +1814,7 @@
     <image>http://snapshots.streamlive.to/snapshots/b99ud2n5hi7sbru_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>54975.0</views>
+    <views>55062.0</views>
   </channel>
   <channel>
     <name>Batman: The Dark Knight (2008) </name>
@@ -1854,7 +1822,7 @@
     <image>http://snapshots.streamlive.to/snapshots/8mvmpkr81mwuckv_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>7944.5</views>
+    <views>8011.5</views>
   </channel>
   <channel>
     <name>Black Mask (2015) English Sub </name>
@@ -1862,7 +1830,7 @@
     <image>http://snapshots.streamlive.to/snapshots/0t4k4jnxeffgk1l_snapshot.jpg</image>
     <category>Movies</category>
     <language>Chinese</language>
-    <views>91464.5</views>
+    <views>109029.0</views>
   </channel>
   <channel>
     <name>Mission Impossible Rogue Nation (2015) </name>
@@ -1870,7 +1838,7 @@
     <image>http://snapshots.streamlive.to/snapshots/p05ng1l0ijjf5bc_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>11437.5</views>
+    <views>11591.0</views>
   </channel>
   <channel>
     <name>Fight Club (1999) </name>
@@ -1878,7 +1846,7 @@
     <image>http://snapshots.streamlive.to/snapshots/14ou2yl2pnw8o61_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>4515.5</views>
+    <views>4571.0</views>
   </channel>
   <channel>
     <name>Inside Out (2015) </name>
@@ -1886,7 +1854,7 @@
     <image>http://snapshots.streamlive.to/snapshots/0teklb2l6blguas_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>7567.0</views>
+    <views>7652.5</views>
   </channel>
   <channel>
     <name>The Shawshank Redemption (1994) </name>
@@ -1894,7 +1862,7 @@
     <image>http://snapshots.streamlive.to/snapshots/ww7u43ccfi7ks42_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>5223.0</views>
+    <views>5295.5</views>
   </channel>
   <channel>
     <name>Pixels (2015) </name>
@@ -1902,7 +1870,7 @@
     <image>http://snapshots.streamlive.to/snapshots/iyw9yz6l26up8di_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>7648.0</views>
+    <views>7749.0</views>
   </channel>
   <channel>
     <name>Bone Tomahawk (2015) </name>
@@ -1910,7 +1878,7 @@
     <image>http://snapshots.streamlive.to/snapshots/96inm4jy0lr7xie_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>29411.0</views>
+    <views>29514.0</views>
   </channel>
   <channel>
     <name>The Maze Runner (2014) </name>
@@ -1918,7 +1886,15 @@
     <image>http://snapshots.streamlive.to/snapshots/4ka1pqp4fc9kuxn_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>283.0</views>
+    <views>346.0</views>
+  </channel>
+  <channel>
+    <name>Jackie Chan Chan's movies from 1991-2008</name>
+    <url>http://www.streamlive.to/view/37002</url>
+    <image>http://snapshots.streamlive.to/snapshots/aq6ijlszct7wfl4_snapshot.jpg</image>
+    <category>Movies</category>
+    <language>English</language>
+    <views>350958.5</views>
   </channel>
   <channel>
     <name>Cooties (2014) </name>
@@ -1926,7 +1902,7 @@
     <image>http://snapshots.streamlive.to/snapshots/wn9h8wvth1raovk_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>318.0</views>
+    <views>370.5</views>
   </channel>
   <channel>
     <name>American Ultra (2015) </name>
@@ -1934,7 +1910,15 @@
     <image>http://snapshots.streamlive.to/snapshots/gb6586bpdhryni2_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>653.0</views>
+    <views>851.0</views>
+  </channel>
+  <channel>
+    <name>The Man in the High Castle </name>
+    <url>http://www.streamlive.to/view/73304</url>
+    <image>http://snapshots.streamlive.to/snapshots/pafplbpoxekmrfz_snapshot.jpg</image>
+    <category>Movies</category>
+    <language>English</language>
+    <views>3420.5</views>
   </channel>
   <channel>
     <name>Shelter (2015) </name>
@@ -1942,15 +1926,15 @@
     <image>http://snapshots.streamlive.to/snapshots/3y9mfkvb9idypna_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>431.5</views>
+    <views>506.5</views>
   </channel>
   <channel>
-    <name>HBO Comedy movie </name>
-    <url>http://www.streamlive.to/view/38214</url>
-    <image>http://snapshots.streamlive.to/snapshots/a1wn1j3ra1w0cv0_snapshot.jpg</image>
+    <name>The HD Movie Channel 1 </name>
+    <url>http://www.streamlive.to/view/68358</url>
+    <image>http://snapshots.streamlive.to/snapshots/asn0crzhq351g0w_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>1565002.0</views>
+    <views>1243368.5</views>
   </channel>
   <channel>
     <name>Everest (2015) </name>
@@ -1958,55 +1942,47 @@
     <image>http://snapshots.streamlive.to/snapshots/1ji7g2d5m7vewbk_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>37973.0</views>
-  </channel>
-  <channel>
-    <name>HBO HD (Official) Fox Movies | TNT | HBO (HD)</name>
-    <url>http://www.streamlive.to/view/73150</url>
-    <image>http://snapshots.streamlive.to/snapshots/10v92ymrmyn1gos_snapshot.jpg</image>
-    <category>Movies</category>
-    <language>English</language>
-    <views>57237.0</views>
+    <views>38057.5</views>
   </channel>
   <channel>
-    <name>Guardians Of The Galaxy (2014) </name>
-    <url>http://www.streamlive.to/view/72658</url>
-    <image>http://snapshots.streamlive.to/snapshots/z5wkmszpfiseqwc_snapshot.jpg</image>
+    <name>How I Met Your Mother - Season 1 </name>
+    <url>http://www.streamlive.to/view/73324</url>
+    <image>http://snapshots.streamlive.to/snapshots/cskhx01lj2qce59_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>443.0</views>
+    <views>634.0</views>
   </channel>
   <channel>
-    <name>The HD Movie Channel 2 </name>
-    <url>http://www.streamlive.to/view/68359</url>
-    <image>http://snapshots.streamlive.to/snapshots/3mu6xhoy4xa8l7w_snapshot.jpg</image>
+    <name>SuperHero movie channel </name>
+    <url>http://www.streamlive.to/view/38366</url>
+    <image>http://snapshots.streamlive.to/snapshots/8g7x80ozu6hz2ds_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>1054968.0</views>
+    <views>8817604.0</views>
   </channel>
   <channel>
-    <name>Avengers Age Of Ultron </name>
-    <url>http://www.streamlive.to/view/72718</url>
-    <image>http://snapshots.streamlive.to/snapshots/ds19mmln49mmcr0_snapshot.jpg</image>
+    <name>Fox Movie Channel </name>
+    <url>http://www.streamlive.to/view/38449</url>
+    <image>http://snapshots.streamlive.to/snapshots/hc992q7x7cz86t9_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>86835.0</views>
+    <views>1462544.0</views>
   </channel>
   <channel>
-    <name>Fox Movie Channel </name>
-    <url>http://www.streamlive.to/view/38449</url>
-    <image>http://snapshots.streamlive.to/snapshots/hc992q7x7cz86t9_snapshot.jpg</image>
+    <name>Guardians Of The Galaxy (2014) </name>
+    <url>http://www.streamlive.to/view/72658</url>
+    <image>http://snapshots.streamlive.to/snapshots/z5wkmszpfiseqwc_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>1405379.5</views>
+    <views>507.0</views>
   </channel>
   <channel>
-    <name>Jackie Chan Chan's movies from 1991-2008</name>
-    <url>http://www.streamlive.to/view/37002</url>
-    <image>http://snapshots.streamlive.to/snapshots/aq6ijlszct7wfl4_snapshot.jpg</image>
+    <name>Avengers Age Of Ultron </name>
+    <url>http://www.streamlive.to/view/72718</url>
+    <image>http://snapshots.streamlive.to/snapshots/ds19mmln49mmcr0_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>336684.0</views>
+    <views>107598.5</views>
   </channel>
   <channel>
     <name>Child 44 (2015) </name>
@@ -2014,7 +1990,7 @@
     <image>http://snapshots.streamlive.to/snapshots/ia6hwl2536inxri_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>372.0</views>
+    <views>460.0</views>
   </channel>
   <channel>
     <name>Spy (2015) </name>
@@ -2022,7 +1998,7 @@
     <image>http://snapshots.streamlive.to/snapshots/hzxcyk0zklw53ha_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>28924.0</views>
+    <views>28965.0</views>
   </channel>
   <channel>
     <name>Interstellar (2014) </name>
@@ -2030,7 +2006,7 @@
     <image>http://snapshots.streamlive.to/snapshots/bwilykq6e2ijdbx_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>370.5</views>
+    <views>444.5</views>
   </channel>
   <channel>
     <name>Kingsman The Secret Service (2014) </name>
@@ -2038,23 +2014,23 @@
     <image>http://snapshots.streamlive.to/snapshots/oqnmdvee3o5c4ix_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>490.5</views>
+    <views>561.0</views>
   </channel>
   <channel>
-    <name>Get Hard (2015) </name>
-    <url>http://www.streamlive.to/view/72720</url>
-    <image>http://snapshots.streamlive.to/snapshots/2kuhc090f1lz1qc_snapshot.jpg</image>
+    <name>HBO HD LIVE</name>
+    <url>http://www.streamlive.to/view/72496</url>
+    <image>http://snapshots.streamlive.to/snapshots/sv285zqmhz7431p_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>47589.0</views>
+    <views>215500.0</views>
   </channel>
   <channel>
-    <name>Jackie Chan movies showing Chan's movies from 1978 to 1990</name>
-    <url>http://www.streamlive.to/view/36983</url>
-    <image>http://snapshots.streamlive.to/snapshots/gby01m6h4xd3lag_snapshot.jpg</image>
+    <name>Get Hard (2015) </name>
+    <url>http://www.streamlive.to/view/72720</url>
+    <image>http://snapshots.streamlive.to/snapshots/2kuhc090f1lz1qc_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>501191.5</views>
+    <views>47747.5</views>
   </channel>
   <channel>
     <name>Hotel Transylvania 2 (2015) </name>
@@ -2062,7 +2038,7 @@
     <image>http://snapshots.streamlive.to/snapshots/1l8bmbn61d9jw3k_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>308.5</views>
+    <views>436.5</views>
   </channel>
   <channel>
     <name>Hitman Agent 47 (2015) </name>
@@ -2070,23 +2046,23 @@
     <image>http://snapshots.streamlive.to/snapshots/xoshn1rt6polw8h_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>735.0</views>
+    <views>869.0</views>
   </channel>
   <channel>
-    <name>PPV HD LIVE</name>
-    <url>http://www.streamlive.to/view/72496</url>
-    <image>http://snapshots.streamlive.to/snapshots/sv285zqmhz7431p_snapshot.jpg</image>
+    <name>Ant Man (2015) </name>
+    <url>http://www.streamlive.to/view/72831</url>
+    <image>http://snapshots.streamlive.to/snapshots/ass4h3a4di6uz9z_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>151754.5</views>
+    <views>1156.5</views>
   </channel>
   <channel>
-    <name>Ant Man (2015) </name>
-    <url>http://www.streamlive.to/view/72831</url>
-    <image>http://snapshots.streamlive.to/snapshots/ass4h3a4di6uz9z_snapshot.jpg</image>
+    <name>HBO Comedy movie </name>
+    <url>http://www.streamlive.to/view/38214</url>
+    <image>http://snapshots.streamlive.to/snapshots/a1wn1j3ra1w0cv0_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>944.5</views>
+    <views>1655393.0</views>
   </channel>
   <channel>
     <name>Heist (2015) </name>
@@ -2094,22 +2070,22 @@
     <image>http://snapshots.streamlive.to/snapshots/q8kd4d2fgosdd68_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>383.0</views>
+    <views>518.0</views>
   </channel>
   <channel>
-    <name>SuperHero movie channel </name>
-    <url>http://www.streamlive.to/view/38366</url>
-    <image>http://snapshots.streamlive.to/snapshots/8g7x80ozu6hz2ds_snapshot.jpg</image>
+    <name>The HD Movie Channel 2 </name>
+    <url>http://www.streamlive.to/view/68359</url>
+    <image>http://snapshots.streamlive.to/snapshots/3mu6xhoy4xa8l7w_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>8302436.0</views>
+    <views>1107006.0</views>
   </channel>
   <channel>
-    <name>The HD Movie Channel 1 </name>
-    <url>http://www.streamlive.to/view/68358</url>
-    <image>http://snapshots.streamlive.to/snapshots/asn0crzhq351g0w_snapshot.jpg</image>
+    <name>iMoViE Lethal.Weapon 1.2.3.4</name>
+    <url>http://www.streamlive.to/view/72901</url>
+    <image>http://snapshots.streamlive.to/snapshots/807xodc9na1mw02_snapshot.jpg</image>
     <category>Movies</category>
     <language>English</language>
-    <views>1193691.5</views>
+    <views>263.5</views>
   </channel>
 </channels>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs.cfg
index d85cb490e8eda2eda13a1b472f7f89d0544fab98..dcb4dba443e490d13ad7569e1495880beea61041 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs.cfg
@@ -29,7 +29,7 @@ url=customs/ilive.to.cfg
 ########################################################
 title=ShadowNet.ro (World TV)
 director=ShadowNet.ro
-icon=http://www.sdw-net.co/product_images/logon.png
+icon=http://www.sdw-net.co/product_images/logon.png|Referer=http://www.sdw-net.co/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 url=customs/shadownet.ro.cfg
 ########################################################
 title=Jagobd.com (Bangladesh TV)
@@ -80,4 +80,9 @@ url=customs/liveonlinetv247.net.cfg
 title=MCTV (Portuguese TV)
 director=mctv
 icon=
-url=customs/mctv.cfg
\ No newline at end of file
+url=customs/mctv.cfg
+########################################################
+title=S2
+director=S2
+icon=
+url=customs/s2.cfg
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/dittotv.com.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/dittotv.com.cfg
deleted file mode 100644
index 4c0043aab04aa87181aea1fe642b3f6959653ac5..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/dittotv.com.cfg
+++ /dev/null
@@ -1,79 +0,0 @@
-########################################################
-#http://dittotv.com
-########################################################
-@IF(@PARAM1@!=CATCH)@
-@IF(@PARAM1@!=Streams)@
-start=http://dittotv.com/livetv/all
-skill=videoTitle
-
-
-item_infos=<a href="([^"']+)" title="((?!Ditto|contact)[^"']+)">\s*<[^>]+>\s*<img src="([^"']+)
-item_order=link|title|icon
-item_skill=rss
-
-item_info_name=cfg
-item_info_from=link
-item_info_build=dittotv.com.cfg@Streams
-
-item_info_name=url
-item_info_from=link
-item_info_build=http://www.dittotv.com%s
-
-item_url_build=%s
-
-########################################################             
-# next Page
-########################################################             
-item_infos=<a href="([^"']+)" class="next-epg">
-item_order=url.tmp
-item_skill=rss
-
-item_info_name=title
-item_info_build=*Next*
-
-item_info_name=icon
-item_info_build=sports.devil.image|next.png
-
-item_info_name=cfg
-item_info_build=dittotv.com.cfg
-
-item_info_name=url
-item_info_from=url.tmp
-item_info_build=http://www.dittotv.com/%s
-
-item_url_build=%s
-
-@ENDIF@
-@ENDIF@
-
-
-@IF(@PARAM1@==Streams)@
-
-item_infos=value=["']([^"']+)["']\s*class="livetv-url-val".*?["']file["']\s*:\s*["']([^"']+)["']
-item_order=key|cTxt
-item_skill=rss
-
-item_info_name=url
-item_info_from=cTxt
-item_info_convert=aesDec(key)
-item_info_build=%s|Referer=http://www.dittotv.com/livetv/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.85 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
-
-item_info_name=type
-item_info_build=video
-
-item_url_build=%s
-
-item_infos=["']file["']\s*:\s*["']([^"']+)["'].*?value=["']([^"']+)["']\s*class="livetv-url-val"
-item_order=cTxt|key
-item_skill=rss
-
-item_info_name=url
-item_info_from=cTxt
-item_info_convert=aesDec(key)
-item_info_build=%s|Referer=http://www.dittotv.com/livetv/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.85 Safari/537.36&X-Requested-With=ShockwaveFlash/20.0.0.267
-
-item_info_name=type
-item_info_build=video
-
-item_url_build=%s
-@ENDIF@
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/ilive.to.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/ilive.to.cfg
index 989840d2f27499ef8df79872e1ace0505bc66430..5e5db0cab32a35b65d238551f4656c00c7b17810 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/ilive.to.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/ilive.to.cfg
@@ -53,15 +53,19 @@ skill=videoTitle
 catcher=streams
 sort=name
 
-item_infos=<name>(?![^<]+\s\(HD\))([^<]+)</name>\s*<url>http://www.streamlive.to/view/([^<]+)</url>\s*<image>([^<]+)</image>\s*<category>@PARAM2@
-item_order=title|url|icon.tmp
+item_infos=<name>([^<]+)</name>\s*<url>http://www.streamlive.to/view/([^<]+)</url>\s*<image>([^<]+)</image>\s*<category>@PARAM2@
+item_order=title|_url|icon.tmp
 item_skill=rss
 
 item_info_name=icon
 item_info_from=icon.tmp
-item_info_build=%s|Referer=http://www.streamlive.to/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_info_build=%s|Referer=http://www.streamlive.to/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 
-item_url_build=http://www.streamlive.to/embed/%s&width=640&height=480&autoplay=true
+item_info_name=url
+item_info_from=icon.tmp
+item_info_build=%s|Referer=http://www.streamlive.to/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
+
+item_url_build=%s
 ########################################################       
 
 @ENDIF@  
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/s2.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/s2.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..ee4ee41730ca37053c9b35c6ae847fa4f10db976
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/s2.cfg
@@ -0,0 +1,48 @@
+@IF(@PARAM1@!=Channels)@
+@IF(@PARAM1@!=Streams)@
+
+start=http://www.stream2watch.co/live-tv
+
+item_infos=<a\s*href="([^"]+)">\s*<img\s*src="([^"]+)"\s*alt="([^"]+)"\s*/>
+item_order=url|_icon|title
+item_skill=rss
+
+item_info_name=icon
+item_info_from=_icon
+item_info_build=%s|Referer=http://www.stream2watch.co/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
+
+item_info_name=cfg
+item_info_build=s2.cfg@Channels
+
+item_url_build=%s
+
+@ENDIF@
+@ENDIF@
+
+@IF(@PARAM1@==Channels)@
+skill=videoTitle
+
+item_infos=<a\s*class="front_channel_href"\s*href="([^"]+)"\s*title="[^"]+">\s*<img\s*class="front_channel_thumb"\s*src="([^"]+)"\s*alt="([^"]+)"/>
+item_order=url|_icon|title
+
+item_info_name=icon
+item_info_from=_icon
+item_info_build=%s|Referer=http://www.stream2watch.co/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
+
+item_info_name=cfg
+item_info_build=s2.cfg@Streams
+
+item_url_build=%s
+
+@ENDIF@
+
+@IF(@PARAM1@==Streams)@
+skill=autoselect
+catcher=streams
+
+item_infos=<a\s*id="[^"]+"\s*class="[^"]+"\s*data-f-href="([^"]+)"\s*data-code-embed="">([^"]+)</a>
+item_order=url|title
+
+item_url_build=%s
+
+@ENDIF@
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/shadownet.ro.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/shadownet.ro.cfg
index b640148480c33c81c4a3cc483c46a66fb686d5a3..6675626b3f80d3912e0d9aac841cb2f68cd9b718 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/shadownet.ro.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/shadownet.ro.cfg
@@ -4,7 +4,7 @@
 
 @IF(@PARAM1@!=Channels)@
 
-start=http://www.sdwnet.co/
+start=http://www.sdw-net.co/
 
 item_infos=<a\s*href="([^"]+)">\s*([^<]+Channels)\s*</a>
 item_order=url|title
@@ -42,7 +42,7 @@ item_order=url|icon.tmp|title
 
 item_info_name=icon
 item_info_from=icon.tmp
-item_info_build=%s|User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_info_build=%s|Referer=http://www.sdw-net.co/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 
 item_url_build=%s
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/tvone1.com.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/tvone1.com.cfg
index 7d2c117b48657730a6ce88093928c97c0bf8ea31..710f7b5619e43dbe8e1dd98e3fb73a7096f03db2 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/tvone1.com.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/customs/tvone1.com.cfg
@@ -1,5 +1,5 @@
 @IF(@PARAM1@!=Stream)@
-sort=name
+#sort=name
 skill=videoTitle
 catcher=streams
 
@@ -264,7 +264,7 @@ item_order=auth|file
 item_skill=rss
 
 item_info_name=url
-item_info_from=rtmp://play.finecast.tv:1935/live?wmsAuthSign=' + auth +' playpath='+file+' swfUrl=http://www.finecast.tv/player6/jwplayer.flash.swf flashver=WIN\2020,0,0,267 live=1 timeout=14 swfVfy=1 pageUrl=http://www.finecast.tv/
+item_info_from=rtmp://play.finecast.tv:1935/live?wmsAuthSign=' + auth +' playpath='+file+' swfUrl=http://www.finecast.tv/player6/jwplayer.flash.swf flashver=WIN\2020,0,0,286 live=1 timeout=14 swfVfy=1 pageUrl=http://www.finecast.tv/
 item_info_build=%s
 
 item_info_name=type
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports.cfg
index 9cc5ae1bdf4b6249eecb369c2ef6f7ee68c5c25b..3bf239d62bc03c62fabab9700f50e4555d196053 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports.cfg
@@ -20,7 +20,7 @@ url=livesports/livetv.ru.cfg
 title=LSHunter.tv
 director=LSHunter.tv
 icon=sports.devil.image|lshunter_tv.png
-url=livesports/lshunter.tv.cfg
+url=livesports/lshunter-new.cfg
 ########################################################
 title=RojaDirecta.me
 director=RojaDirecta.me
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/dimsports.eu.links.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/dimsports.eu.links.cfg
index 4f95e433206305ae1452364c6ae68fefdbd67935..ac58b1d51d07198e7a1187d071444f46c9858636 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/dimsports.eu.links.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/dimsports.eu.links.cfg
@@ -2,8 +2,7 @@
 # FirstRowSports.eu VideoPortal
 ########################################################
 @IF(@PARAM1@!=Events)@
-
-skill=allowDuplicates
+skill=allowDuplicates,videoTitle
 
 item_infos=<span>[^<]*?</span>\s*([^<]+) </a> </h3> <div>
 item_order=tv
@@ -23,7 +22,7 @@ item_url_build=%s
 
 ###################################################################
 
-item_infos=<span class="matchtime">([^<]+)</span> </span>\s*([^<]+)</a> </h3>
+item_infos=<span class="matchtime">\s*(\d+:\d+)\s*</span> </span>\s*([^<]+)</a> </h3>
 item_order=timeTmp|match
 item_skill=rss
 
@@ -49,8 +48,7 @@ item_url_build=%s
 
 
 @IF(@PARAM1@==Events)@
-
-skill=videoTitle
+skill=autoselect
 catcher=streams
 
 #section=</span>\s*@PARAM2@\s*</a>\s*</h3>.*?</div>\s*<(?:h3|/div)>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrow.org.links.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrow.org.links.cfg
index fe29b044b3b87fda6e581ed23992ebe356e5916e..9949d4f1abc54f3a381c77bef78e1b4089ef398f 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrow.org.links.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrow.org.links.cfg
@@ -2,8 +2,7 @@
 # ifirstrow.eu VideoPortal
 ########################################################
 @IF(@PARAM1@!=Events)@
-
-skill=allowDuplicates
+skill=allowDuplicates,videoTitle
 
 item_infos=<span>[^<]*?</span>\s*([^<]+) </a> </h3> <div>
 item_order=tv
@@ -23,7 +22,7 @@ item_url_build=%s
 
 ###################################################################
 
-item_infos=<span class="matchtime">([^<]+)</span> </span>\s*([^<]+)</a> </h3>
+item_infos=<span class="matchtime">\s*(\d+:\d+)\s*</span> </span>\s*([^<]+)</a> </h3>
 item_order=timeTmp|match
 item_skill=rss
 
@@ -49,10 +48,7 @@ item_url_build=%s
 
 
 @IF(@PARAM1@==Events)@
-skill=videoTitle
-catcher=streams
-
-skill=videoTitle
+skill=autoselect
 catcher=streams
 
 section=</span>\s*@PARAM2@\s*</a>\s*</h3>.*?</div>\s*<(?:h3|/div)>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrowsports.eu.links.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrowsports.eu.links.cfg
index fd3b162f755c71e148e8f76c0ff68dbc7ea1d76a..abb553ce078ce5edc25ec5048276a219ec93be1d 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrowsports.eu.links.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrowsports.eu.links.cfg
@@ -2,8 +2,7 @@
 # FirstRowSports.eu VideoPortal
 ########################################################
 @IF(@PARAM1@!=Events)@
-
-skill=allowDuplicates
+skill=allowDuplicates,videoTitle
 
 item_infos=<span>[^<]*?</span>\s*([^<]+) </a> </h3> <div>
 item_order=tv
@@ -23,7 +22,7 @@ item_url_build=%s
 
 ###################################################################
 
-item_infos=<span class="matchtime">([^<]+)</span> </span>\s*([^<]+)</a> </h3>
+item_infos=<span class="matchtime">\s*(\d+:\d+)\s*</span> </span>\s*([^<]+)</a> </h3>
 item_order=timeTmp|match
 item_skill=rss
 
@@ -49,7 +48,7 @@ item_url_build=%s
 
 
 @IF(@PARAM1@==Events)@
-skill=videoTitle
+skill=autoselect
 catcher=streams
 
 #section=</span>\s*@PARAM2@\s*</a>\s*</h3>.*?</div>\s*<(?:h3|/div)>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrowsports.ge.links.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrowsports.ge.links.cfg
index 46c5636c29f51c5acd07340bb044b0b4ce31474a..153514fe0e2e6e66ed6f816da936084a7b40d791 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrowsports.ge.links.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/firstrowsports.ge.links.cfg
@@ -2,8 +2,7 @@
 # FirstRowSports.ge VideoPortal
 ########################################################
 @IF(@PARAM1@!=Events)@
-
-skill=allowDuplicates
+skill=allowDuplicates,videoTitle
 
 item_infos=<span>\s*[^<]* </span>\s*([^<]+) </a> </h3> <div>
 item_order=tv
@@ -23,7 +22,7 @@ item_url_build=%s
 
 ###################################################################
 
-item_infos=<span class="matchtime">([^<]+)</span> </span>\s*([^<]+)</a> </h3>
+item_infos=<span class="matchtime">\s*(\d+:\d+)\s*</span> </span>\s*([^<]+)</a> </h3>
 item_order=timeTmp|match
 item_skill=rss
 
@@ -49,7 +48,7 @@ item_url_build=%s
 ###################################################################
 
 @IF(@PARAM1@==Events)@
-skill=videoTitle
+skill=autoselect
 catcher=streams
 
 #section=</span>\s*@PARAM2@\s*</a>\s*</h3>.*?</div>\s*<(?:h3|/div)>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.cfg
index 76cda1b5ee56041bb2422bceb51079e4ad30a20d..36210adbd38248a2f8e478a4758423b8d1546228 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.cfg
@@ -3,7 +3,7 @@
 ########################################################
 sort=name
 
-start=http://livetvx.net/@LANGUAGE@/allupcoming
+start=http://livetv102.net/@LANGUAGE@/allupcoming
 
 ########################################################
 # Categories
@@ -11,12 +11,12 @@ start=http://livetvx.net/@LANGUAGE@/allupcoming
 title=*Now Playing*
 director=Livetv.ru
 cfg=livetv.ru.videos.cfg@LIVE@all
-url=http://livetvx.net/@LANGUAGE@/allupcoming
+url=http://livetv102.net/@LANGUAGE@/allupcoming
 ########################################################
 title=*All*
 director=Livetv.ru
 cfg=livetv.ru.videos.cfg@ALL@all
-url=http://livetvx.net/@LANGUAGE@/allupcoming
+url=http://livetv102.net/@LANGUAGE@/allupcoming
 ########################################################
 item_infos=<tr>\s*<[^<]*<a class="main" href="([^"]*allupcomingsports/(\d+)/)"><img[^>]*src="([^"]+)"></a></td>\s*<td align="left">[^<]*<a[^<]*<b>([^<]*)</b></a>\s*</td>\s*<td width=\d+ align="center">\s*<a [^<]*<b>\+(\d+)</b></a>\s*</td>\s*</tr>
 item_order=url|id.tmp|ticon.tmp|title.tmp|count.tmp
@@ -40,4 +40,4 @@ item_info_name=cfg
 item_info_from=id.tmp
 item_info_build=livetv.ru.videos.cfg@CATEGORY@%s
 
-item_url_build=http://livetvx.net%s
\ No newline at end of file
+item_url_build=http://livetv102.net%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.streams.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.streams.cfg
index 716301533ca7ceb7f4c637395f59780409b8dc90..d4ecd4bf58df5627f74601ad1c6dc7189ccc572e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.streams.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.streams.cfg
@@ -21,7 +21,7 @@ item_info_from=streamer + ' - ' + sl + ' - ' + video
 item_info_build=%s
 
 item_info_name=url
-item_info_from=http://cdn.livetvx.net/webplayer2.php?t=' + streamer.tmp + '&c=' + video + '&lang=' + lang + '&eid=' + eid + '&lid=' + lid + '&ci=' + ci + '&si=' + si
+item_info_from=http://livetv102.net/webplayer2.php?t=' + streamer.tmp + '&c=' + video + '&lang=' + lang + '&eid=' + eid + '&lid=' + lid + '&ci=' + ci + '&si=' + si
 item_info_build=%s
 
 item_url_build=%s
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.videos.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.videos.cfg
index d881f4cc2503d8d6f640b5c2dd43b53445fd3188..31a81614478b09f74c7c1abbe492fae77af443ef 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.videos.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/livetv.ru.videos.cfg
@@ -55,7 +55,7 @@ item_info_name=cfg
 item_info_from=url
 item_info_build=livetv.ru.streams.cfg@%s
 
-item_url_build=http://livetvx.net%s
+item_url_build=http://livetv102.net%s
 @ENDIF@
 ########################################################
 
@@ -92,5 +92,5 @@ item_info_name=cfg
 item_info_from=url
 item_info_build=livetv.ru.streams.cfg@%s
 
-item_url_build=http://livetvx.net%s
+item_url_build=http://livetv102.net%s
 @ENDIF@
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter-new.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter-new.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..f716d5d4f8b55e1cd1f0ef564e4196c4498559ad
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter-new.cfg
@@ -0,0 +1,88 @@
+########################################################
+# LSHunter.tv VideoPortal
+########################################################
+@IF(@PARAM1@!=Events)@
+@IF(@PARAM1@!=Streams)@
+start=http://www.batmanstream.com/
+
+item_infos=href="([^"]+)">([^<]+)</a><div\s*class="header-menu-border"
+item_order=url|title
+
+item_info_name=cfg
+item_info_build=lshunter-new.cfg@Events
+
+item_url_build=http://www.batmanstream.com/%s
+
+
+@ENDIF@
+@ENDIF@
+
+########################################################
+@IF(@PARAM1@==Events)@
+skill=allowDuplicates,videoTitle
+
+item_infos=<span class="lshstart_time">([^<]+)</span></td>\s*<[^>]+><span class="lshevent">\s*([^<]+)</span>.*?class="cat[^"]+">([^<]+)</span>
+item_order=_time|event|sport
+
+item_info_name=time
+item_info_from=_time
+item_info_convert=offset('%s','+01:00')
+item_info_build=%s
+
+item_info_name=title
+item_info_from='(' + time + ') [COLOR=cyan]' + sport + '[/COLOR] ' + event
+item_info_convert=replace('%s','	','')
+item_info_build=%s
+
+item_info_name=cfg
+item_info_from=event
+item_info_convert=replace('%s','(','\(')
+item_info_convert=replace('%s',')','\)')
+item_info_build=lshunter-new.cfg@Streams@%s
+
+item_url_build=%s
+
+
+@ENDIF@
+
+########################################################
+@IF(@PARAM1@==Streams)@
+skill=autoselect
+catcher=streams
+
+section=@PARAM2@.*?</tr>\s*</table>\s*</div>
+
+item_infos=class="sectiontableheader"><td>((?!1XBET)[^<]+).*?href="([^"]+)">Link#1</a>
+item_order=title|url
+
+item_url_build=%s
+
+item_infos=<a>((?!LSHStream)(?!Castasap)(?!Livevshare)[^<]+)</a></td>\s*<td><a\s*target="_blank"\s*href="([^"]+)"\s*>([^<]+)</a>
+item_order=streamer|url|link
+
+item_info_name=title
+item_info_from=streamer+' '+link
+item_info_build=%s
+
+item_url_build=%s
+
+item_infos=<a>((?!LSHStream)(?!Castasap)(?!Livevshare)[^<]+)</a></td>\s*<td><a\s*target="_blank"\s*href="[^"]+"\s*>[^<]+</a>\s*<a\s*target="_blank"\s*href="([^"]+)"\s*>([^<]+)</a>
+item_order=streamer|url|link
+
+item_info_name=title
+item_info_from=streamer+' '+link
+item_info_build=%s
+
+item_url_build=%s
+
+item_infos=<a href="((?!https://wl1xbet)(?!http://www.livescorehu)[^"]+)" target="_blank">([^<]+)</a>
+item_order=url|link
+
+item_info_name=title
+item_info_from=Flash: '+link+' '+url
+item_info_build=%s
+
+item_url_build=%s
+
+
+@ENDIF@
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter.tv.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter.tv.cfg
index abc563570b3001af993281a7e656c0c0eadc8d68..e92cd5d9e00293581c2741e0635d11fd6bfe3bd0 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter.tv.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter.tv.cfg
@@ -1,7 +1,7 @@
 ########################################################
 # LSHunter.tv VideoPortal
 ########################################################
-start=http://www.3pmstream.com/#page
+start=http://live.shwidget.com/#page
 
 ########################################################
 # Search
@@ -11,7 +11,7 @@ type=search
 once=.*\.cfg
 icon=sports.devil.image|search.png
 cfg=lshunter.tv.search.cfg
-url=http://www.3pmstream.com/indexsearch.html?ordering=newest&searchword=%s
+url=http://live.shwidget.com/indexsearch.html?ordering=newest&searchword=%s
 ########################################################
 
 ########################################################
@@ -19,61 +19,61 @@ url=http://www.3pmstream.com/indexsearch.html?ordering=newest&searchword=%s
 ########################################################
 title=*Now Playing*
 icon=
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section0.html
-url=http://www.3pmstream.com/static/section0.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section0.html
+url=http://live.shwidget.com/static/section0.html
 ########################################################
 title=sports.devil.locale|30352
 icon=sports.devil.image|sports/Football.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section35.html
-url=http://www.3pmstream.com/static/section35.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section35.html
+url=http://live.shwidget.com/static/section35.html
 ########################################################
 title=NFL
 icon=sports.devil.image|sports/American Football.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/nfl-live-streaming-video.html
-url=http://www.3pmstream.com/nfl-live-streaming-video.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/nfl-live-streaming-video.html
+url=http://live.shwidget.com/nfl-live-streaming-video.html
 ########################################################
 title=sports.devil.locale|30353
 icon=sports.devil.image|sports/Basketball.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section36.html
-url=http://www.3pmstream.com/static/section36.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section36.html
+url=http://live.shwidget.com/static/section36.html
 ########################################################
 title=sports.devil.locale|30355
 icon=sports.devil.image|sports/Baseball.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section39.html
-url=http://www.3pmstream.com/static/section39.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section39.html
+url=http://live.shwidget.com/static/section39.html
 ########################################################
 title=Handball
 icon=sports.devil.image|sports/Handball.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section55.html
-url=http://www.3pmstream.com/static/section55.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section55.html
+url=http://live.shwidget.com/static/section55.html
 ########################################################
 title=Hockey
 icon=sports.devil.image|sports/Ice Hockey.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section37.html
-url=http://www.3pmstream.com/static/section37.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section37.html
+url=http://live.shwidget.com/static/section37.html
 ########################################################
 title=Motor Sports
 icon=sports.devil.image|sports/Racing.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section56.html
-url=http://www.3pmstream.com/static/section56.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section56.html
+url=http://live.shwidget.com/static/section56.html
 ########################################################
 title=Rugby
 icon=sports.devil.image|sports/Rugby.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section57.html
-url=http://www.3pmstream.com/static/section57.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section57.html
+url=http://live.shwidget.com/static/section57.html
 ########################################################
 title=sports.devil.locale|30356
 icon=sports.devil.image|sports/Tennis.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section38.html
-url=http://www.3pmstream.com/static/section38.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section38.html
+url=http://live.shwidget.com/static/section38.html
 ########################################################
 title=Volleyball
 icon=sports.devil.image|sports/Volleyball.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section40.html
-url=http://www.3pmstream.com/static/section40.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section40.html
+url=http://live.shwidget.com/static/section40.html
 ########################################################
 title=sports.devil.locale|30363
 icon=sports.devil.image|sports/Other.png
-cfg=lshunter.tv.days.cfg@http://www.3pmstream.com/static/section42.html
-url=http://www.3pmstream.com/static/section42.html
+cfg=lshunter.tv.days.cfg@http://live.shwidget.com/static/section42.html
+url=http://live.shwidget.com/static/section42.html
 ########################################################
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter.tv.streams.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter.tv.streams.cfg
index a7c0ca60d5c8ab113158d11a3d9bc177ab2d3482..cb9a6eb1c2db3b48882a0d666ce466e929185026 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter.tv.streams.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/lshunter.tv.streams.cfg
@@ -12,7 +12,7 @@ catcher=streams
 # example:
 # javascript:openWindow("index1.php?option=com_lsh&view=lsh&event_id=126687&tv_id=871&tid=31589&channel=0&tmpl=component&layout=popup&Itemid=322","735","665")
 
-item_infos=javascript:openwindow\("(http://live.3pmstream.com/index.*?&event_id=([^&]+)&tv_id=([^&]+)&tid=([^&]+)&channel=([^&]+)[^"]+)".*?>Link#([^<]+)</a>
+item_infos=javascript:openwindow\("(http://live.\w+.com/index.*?&event_id=([^&]+)&tv_id=([^&]+)&tid=([^&]+)&channel=([^&]+)[^"]+)".*?>Link#([^<]+)</a>
 item_order=url.tmp|eid|tvid|tid|channel|link
 item_skill=rss
 
@@ -44,7 +44,7 @@ item_info_from=eid + tvid + tid +  channel
 item_info_build=%s
 
 #item_url_build=http://lsh.lshunter.tv/static/popups/%s.html
-item_url_build=http://live.3pmstream.com/static/freepopups/%s.html
+item_url_build=http://live.shwidget.com/static/freepopups/%s.html
 
 
 ########################################################
@@ -88,7 +88,7 @@ item_info_build=%s
 
 item_info_name=url
 item_info_from='static/freepopups/' + evID + tvID + tID + channel
-item_info_build=http://live.3pmstream.com/%s.html
+item_info_build=http://live.shwidget.com/%s.html
 
 item_url_build=%s
 ########################################################
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/rojadirecta-uk.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/rojadirecta-uk.cfg
index a9a743197bf138b859b0c1ae7a05dac923487a1b..9bfbf9abe78f69e108cabdffe11f7dea403f76fb 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/rojadirecta-uk.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/rojadirecta-uk.cfg
@@ -4,7 +4,7 @@
 
 @IF(@PARAM1@!=Streams)@
 ####################################################
-start=http://siteup.tk/fetch.php/rojadirecta.me
+start=http://www.rojadirecta.me.hidingnet.com/
 skill=videoTitle
 
 item_infos=<span class="(\d+)".*?<div class="menutitle".*?<span class="t">([^<]+)</span>(.*?)</div>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/rojadirecta.me.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/rojadirecta.me.cfg
index 9cfbe51e805345838b4ab8a0a61731caf0ab64a1..ae5512bf77e1d1d810d1656e50bf9359961ff14e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/rojadirecta.me.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/rojadirecta.me.cfg
@@ -4,7 +4,7 @@
 
 @IF(@PARAM1@!=Streams)@
 ####################################################
-start=http://rojadirecta.eu
+start=http://www.rojadirecta.me/
 skill=videoTitle
 
 item_infos=<span class="(\d+)".*?<div class="menutitle".*?<span class="t">([^<]+)</span>(.*?)</div>
@@ -37,10 +37,35 @@ item_info_from=id
 item_info_build=rojadirecta.me.cfg@Streams@%s
 item_url_build=%s
 
-title=*UK Unblock*
+title=*Unblock-1*
 type=once
 cfg=rojadirecta-uk.cfg
-url=http://siteup.tk/fetch.php/rojadirecta.me
+url=http://www.webjia.tk/fetch.php/it.rojadirecta.eu
+
+title=*Unblock-2*
+type=once
+cfg=rojadirecta-uk.cfg
+url=http://www.rojadirecta.me.hidingnet.com/
+
+title=*Unblock-3*
+type=once
+cfg=rojadirecta-uk.cfg
+url=http://www.rinconrojadirecta.com/programacion.php
+
+title=*Unblock-4*
+type=once
+cfg=rojadirecta-uk.cfg
+url=http://rojadirecta.ga/
+
+title=*Unblock-5*
+type=once
+cfg=rojadirecta-uk.cfg
+url=http://af-proxy.appspot.com/www.rojadirecta.me
+
+title=*TLS Unblock*
+type=once
+cfg=rojadirecta-uk.cfg
+url=https://rojadirecta.unblocked.li/
 
 @ENDIF@
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/stopstream.com.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/stopstream.com.cfg
index 354f2028b626ae93d89ceb090c19e622e67f06af..bd90cfabf227e3df850e36eaeefb56e5508a3af2 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/stopstream.com.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/livesports/stopstream.com.cfg
@@ -5,51 +5,51 @@
 ########################################################
 title=*Now Playing*
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.com
+url=http://www.stopstream.me
 
 ########################################################
 title=sports.devil.locale|30352
 icon=sports.devil.image|sports/Football.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.com/1-football.html
+url=http://www.stopstream.me/1-football.html
 ########################################################
 title=sports.devil.locale|30354
 icon=sports.devil.image|sports/Ice Hockey.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.tv/3-hockey.html
+url=http://www.stopstream.me/3-hockey.html
 ########################################################
 title=sports.devil.locale|30356
 icon=sports.devil.image|sports/Tennis.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.tv/4-tennis.html
+url=http://www.stopstream.me/4-tennis.html
 ########################################################
 title=sports.devil.locale|30353
 icon=sports.devil.image|sports/Basketball.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.tv/6-basketball.html
+url=http://www.stopstream.me/6-basketball.html
 ########################################################
 title=sports.devil.locale|30355
 icon=sports.devil.image|sports/Baseball.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.tv/7-baseball.html
+url=http://www.stopstream.me/7-baseball.html
 ########################################################
 title=sports.devil.locale|30361
 icon=sports.devil.image|sports/Golf.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.tv/8-golf.html
+url=http://www.stopstream.me/8-golf.html
 ########################################################
 title=sports.devil.locale|30364
 icon=sports.devil.image|sports/Cycling.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.tv/9-cycling.html
+url=http://www.stopstream.me/9-cycling.html
 ########################################################
 title=sports.devil.locale|30357
 icon=sports.devil.image|sports/Racing.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.tv/10-motorsports.html
+url=http://www.stopstream.me/10-motorsports.html
 ########################################################
 title=sports.devil.locale|30363
 icon=sports.devil.image|sports/Other.png
 cfg=stopstream.com.events.cfg
-url=http://www.stopstream.tv/11-.html
+url=http://www.stopstream.me/11-.html
 ########################################################
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv.cfg
index d3956b32f8f7cf53682391583697c4017810e7af..9f115e5e7c89e904cfb90cbce0db1cf43a0a3a12 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv.cfg
@@ -22,11 +22,6 @@ title=CricHD.tv
 director=crichd.tv
 icon=http://crichd.tv/images/logo.png
 url=tv/crichd.tv.cfg
-########################################################
-title=StreamKing.org
-director=streamking.org
-icon=http://www.streamking.org/images/logo.png
-url=tv/streamking.org.cfg
 #######################################################
 title=MamaHD.com
 director=mamahd.com
@@ -52,11 +47,16 @@ title=HDFree.tv
 director=HDFree.tv
 icon=sports.devil.image|hdfree.png
 url=tv/hdfree.tv.cfg
+########################################################
+# title=StreamKing.org
+# director=streamking.org
+# icon=http://www.streamking.org/images/logo.png
+# url=tv/streamking.org.cfg
 #######################################################
-title=w-sp.tv
-director=w-sp.tv
-icon=sports.devil.image|w-sp.png
-url=tv/w-sp.tv.cfg
+# title=w-sp.tv
+# director=w-sp.tv
+# icon=sports.devil.image|w-sp.png
+# url=tv/w-sp.tv.cfg
 #######################################################
 # title=bein
 # director=bein
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/hdfree.tv.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/hdfree.tv.cfg
index 7fba2f980cfb17ad732442468c08ebe0d9fd2fbf..2751e4f20efbe5137f84b34fcb7fc76fd4c3e2c1 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/hdfree.tv.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/hdfree.tv.cfg
@@ -3,12 +3,12 @@ catcher=streams
 skill=videoTitle
 start=http://hdfree.tv/tvlogos.html
 
-item_infos=<a href="(?:http://hdfree.tv/)?((?![^"#]+category)[^"#]+)"
-item_order=link
+item_infos=<a href="(http://hdfree.tv/[^"#]+)".*?<img\s*src="([^"#]+)"
+item_order=url|_img
 item_skill=rss
 
 item_info_name=title
-item_info_from=link
+item_info_from=url
 item_info_convert=replace('%s','watch-','')
 item_info_convert=parseText('%s','.*?([\w-]+?)-*live.*')
 item_info_convert=replace('%s','-',' ')
@@ -16,13 +16,9 @@ item_info_convert=camelcase
 item_info_convert=replaceFromDict('chfix')
 item_info_build=%s
 
-item_info_name=url
-item_info_from=http://hdfree.tv/'+link
-item_info_build=%s
-
 item_info_name=icon
-item_info_from=title
-item_info_convert=replaceFromDict('logos')
-item_info_build=sports.devil.image|channels/%s
+item_info_from=_img
+item_info_build=http://hdfree.tv%s|Referer=http://hdfree.tv/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
+
 
 item_url_build=%s
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/ilive.to-sports.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/ilive.to-sports.cfg
index c83819f1454cfe99fca736a344cd5073e912e960..36775e7d7cc0f3734c592aaed10e40be9631257b 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/ilive.to-sports.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/ilive.to-sports.cfg
@@ -2,18 +2,48 @@
 # http://www.streamlive.to/channels
 ########################################################
 @IF(@PARAM1@!=Streams)@
-start=http://www.streamlive.to
+start=http://www.streamlive.to/Live%20Sport?q=
 skill=videoTitle
 catcher=streams
-sort=name
 
-item_infos=<name>(?![^<]+\s\(HD\))([^<]+)</name>\s*<url>http://www.streamlive.to/view/([^<]+)</url>\s*<image>([^<]+)</image>\s*<category>Live Sport
-item_order=title|url|icon.tmp
+item_infos=<noscript><img.*?src="([^"]+)".*?/></noscript>\s*</a>\s*<a href="[^"]+live\.to[^\d]+([\d]+)[^"]+"><strong>([^<\t\n]+)
+item_order=icon.tmp|url|title
 item_skill=rss
 
 item_info_name=icon
 item_info_from=icon.tmp
-item_info_build=%s|Referer=http://www.streamlive.to/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36
+item_info_build=http:%s|Referer=http://www.streamlive.to/&User-Agent=Mozilla/5.0 (Windows NT 6.3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36
 
 item_url_build=http://www.streamlive.to/embed/%s&width=640&height=480&autoplay=true
+
+
+########################################################             
+# next Page
+########################################################             
+item_infos=<p align="center" class="pages"><strong>Page: </strong><span style="font-size:13px">.*\s\d*\s<a href="([^"]+)">.*?</a></span></p>\s*</div>\s*<div class="rightcol">
+item_order=url.tmp
+item_skill=rss
+
+item_info_name=title
+item_info_build=*Next*
+
+item_info_name=icon
+item_info_build=sports.devil.image|next.png
+
+item_info_name=cfg
+item_info_build=ilive.to-sports.cfg
+
+item_info_name=url
+item_info_from=url.tmp
+item_info_convert=replace('%s','https','http')
+item_info_build=%s
+
+item_url_build=%s
+########################################################       
+
+@ENDIF@  
+
+@IF(@PARAM1@==Streams)@
+
+@ENDIF@
            
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/showsport-tv.com.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/showsport-tv.com.cfg
index a110fe3940a69ea5801e02da7f35c6394ae8408e..4982a2185c970cb21e56499a8c79131247ecc770 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/showsport-tv.com.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/showsport-tv.com.cfg
@@ -4,8 +4,8 @@
 @IF(@PARAM1@!=Streams)@
 
 start=http://showsport-tv.com
-skill=videoTitle
 catcher=streams
+skill=videoTitle
 
 item_infos=<a\s*href="([^"]+)"\s*title="([^"]+)"><img\ssrc="([^"]+)"
 item_order=url.tmp|title.tmp|icon.tmp
@@ -19,19 +19,15 @@ item_info_from=title.tmp
 item_info_convert=replace('%s',' live stream','')
 item_info_build=%s
 
-# item_info_name=cfg
-# item_info_build=showsport-tv.com.cfg@Streams
-
 item_info_name=url
 item_info_from=url.tmp
 item_info_build=http://showsport-tv.com%s
 item_url_build=%s
 
-
-
 @ENDIF@
 ########################################################
 @IF(@PARAM1@==Streams)@
+skill=autoselect
 catcher=streams
 
 item_infos=onclick="setURL\('([^"]+)'\)">([^<]+)</button>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/w-sp.tv.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/w-sp.tv.cfg
index 7163767bb982bda10ef5478828a5d39420e4ad4c..99555ef9a631e02be9b4f8933ab5ba065a27800d 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/w-sp.tv.cfg
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.SportsDevil/resources/modules/tv/w-sp.tv.cfg
@@ -15,8 +15,8 @@ item_order=url|title
 item_skill=rss
 
 #igude
-item_url_build=http://sport-s.org/2sw/%s.html
-#dinozap (geo-restricted/x-f-f needed)
-#item_url_build=http://livesports15.ucoz.com/pr/%s.html
+#item_url_build=http://sport-s.org/2sw/%s.html
+#sostart
+item_url_build=http://livesports15.ucoz.com/pr/%s.html
 #sawlive
 #item_url_build=http://livesports15.ucoz.com/wizi/%s.html
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/addon.xml b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/addon.xml
index 17a28c8b859d3dbfe9ebcd9311a32d8dc0de9cd9..358134494164e2b60c0bf64f89671cf6d91f49c0 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/addon.xml
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.plexus-streams"
        name="Plexus-Streams"
-       version="1.0.14d"
+       version="1.0.15"
        provider-name="D4FC">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/changelog.txt b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/changelog.txt
index 17f69444641ec65fe777d44cc42edba9ac09659d..300d5d3d517e8e67e503c7e82303f475b09cc3bb 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/changelog.txt
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/changelog.txt
@@ -1,4 +1,15 @@
 ===== Stable Versions ========
+[B]v1.0.15 (2016/02/07)[/B]
+- Add elgoles.net
+- Add tugoleada.com (only channel selection)
+- parse_and_resolv can get multiple streams and shows a dialog to select one
+
+[B]v1.0.14f (2016/01/30)[/B]
+- Fix rojadirecta + lfootballws
+
+[B]v1.0.14e (2015/12/26)[/B]
+- Add "no stream found" message in some parsers
+
 [B]v1.0.14d (2015/12/13)[/B]
 - Recover rojadirecta
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/__init__.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/__init__.pyo
deleted file mode 100644
index 7da928ae0a9186736fa61ac4f87bdfe6bcf08127..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/__init__.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/__init__.pyo
deleted file mode 100644
index 5d6d35938f20049b27e942c876605fdc5e33165b..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/acestream.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/acestream.py
index 99ea35532f65d06335be25421978f80b1d31705a..c6ddeeecb7731f10c288525dc31df0cda7eaf0fb 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/acestream.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/acestream.py
@@ -34,8 +34,11 @@ def acestreams(name, iconimage, chid):
 		try: add_to_history(name, chid, iconimage)
 		except: pass
 
-	plexusURI = 'plugin://program.plexus/?url=acestream://{CHID}&mode=1&name={CHNAME}'.format(
-				CHID   = urllib.quote(chid, safe = ''),
+	if not chid.startswith("acestream://"):
+		chid = "acestream://" + chid
+
+	plexusURI = 'plugin://program.plexus/?url={CHURL}&mode=1&name={CHNAME}'.format(
+				CHURL  = urllib.quote(chid, safe = ''),
 				CHNAME = urllib.quote(name, safe = ''))
 
 	if iconimage:
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/acestream.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/acestream.pyo
deleted file mode 100644
index 0aa2478ddf3cdeb215ea62bec02e99eb17f126c9..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/acestream.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/favourites.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/favourites.pyo
deleted file mode 100644
index 9d8bec3c05baf41fdfcdf91feedb52f298ddc7fd..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/favourites.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/history.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/history.pyo
deleted file mode 100644
index 0db06165939f241ee0dbf674d3a868cf7dc93c12..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/history.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/livestreams.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/livestreams.pyo
deleted file mode 100644
index 77c8966bc56cf19faabc28de854fa93b18d333d5..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/livestreams.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/__init__.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/__init__.pyo
deleted file mode 100644
index f76116bfd5798cae7853a81a0ffb7af8829ac11a..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/__init__.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/icon.png b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c12060379d27e3414d746d953b7a374064d00c
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/icon.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/main.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/main.py
new file mode 100644
index 0000000000000000000000000000000000000000..11561c1979610e1b6140cbf6a349a7a00ba0812d
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/main.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+"""
+This plugin is 3rd party and not part of plexus-streams addon
+
+ElGoles.net
+
+"""
+import sys,os,requests
+current_dir = os.path.dirname(os.path.realpath(__file__))
+basename = os.path.basename(current_dir)
+core_dir =  current_dir.replace(basename,'').replace('parsers','')
+sys.path.append(core_dir)
+from utils.webutils import *
+from utils.pluginxbmc import *
+from utils.directoryhandle import *
+from utils.parsers import parser_resolver
+
+parserName = "elgoles"
+base_url = "http://elgoles.net"
+
+def module_tree(name,url,iconimage,mode,parser,parserfunction):
+	if not parserfunction: menu()
+	elif parserfunction == "resolve_and_play": parser_resolver(name,url, os.path.join(current_dir,'icon.png'))
+
+
+def menu():
+	try:
+		source = get_page_source(base_url)
+	except:
+		xbmcgui.Dialog().ok(translate(40000),translate(40128))
+		return
+
+	for i in range(1, 24):
+		addDir("[B]Channel {0}[/B]".format(i), "{0}/canal-{1}/".format(base_url, i), 401, os.path.join(current_dir,"icon.png"), 1, False, parser=parserName, parserfunction="resolve_and_play")
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/module.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/module.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..e0c66096cc7c4d6d6d7bf24e5f3e16899038445e
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/elgoles/module.cfg
@@ -0,0 +1 @@
+{ 'name' : 'ElGoles.net'}
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/__init__.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/__init__.pyo
deleted file mode 100644
index 052366a4202a234f039e7d96097f1295554866be..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/main.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/main.py
index 5e0073baa3c3631a0fdd9fc6e358d3c955aea8b4..0ec9465473f1d03def9e08e76f03319ae549473e 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/main.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/main.py
@@ -59,8 +59,6 @@ def lfootballws_streams(url):
 		source = mechanize_browser(url)
 	except: source = ""; xbmcgui.Dialog().ok(translate(40000),translate(40128));sys.exit(0); return
 
-	print source
-
 	links = []
 	names = []
 	streams = re.findall('<tr>.*?<td>.+?<td>.+?>([^<]*).+?<td>.+?<td>([^<]*).+?<td>([^<]*).+?<td>.+?<td>([^<]*).*?href="([^"]+)".*?</tr>', source, re.DOTALL)
@@ -76,6 +74,7 @@ def lfootballws_streams(url):
 		if index>-1:
 			name=names[index]
 			url=links[index]
+			from utils.parsers import parser_resolver
 			parser_resolver(name, url, os.path.join(current_dir,'icon.png'))
 	else:
 		xbmcgui.Dialog().ok(translate(40000),translate(40022))
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/main.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/main.pyo
deleted file mode 100644
index 7b0468b4a4d764a6f0954ab4a5498475ea549652..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/lfootballws/main.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/onetorrenttv/__init__.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/onetorrenttv/__init__.pyo
deleted file mode 100644
index f4c4142c1484866d4a00245eefa08cd8b13c11d5..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/onetorrenttv/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/onetorrenttv/main.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/onetorrenttv/main.pyo
deleted file mode 100644
index b01096ea8c50d63db09b761493213035403eda49..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/onetorrenttv/main.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/parsers.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/parsers.py
index 63c0eebe2ee26c8eee46d6c883059c0a0e184916..4bce48f9a809f6c6c9d8ac1e3f565823d05e20b2 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/parsers.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/parsers.py
@@ -31,9 +31,9 @@ parser_packages_folder = os.path.join(pastaperfil,'parser-packages')
 
 
 def addon_parsers_menu():
-	if settings.getSetting('parser_disclaimer_three') == "true":
-		opcao= xbmcgui.Dialog().ok(translate(40000),translate(70004),translate(70005),translate(70006))
-		if opcao: settings.setSetting('parser_disclaimer_three',"false")
+	#if settings.getSetting('parser_disclaimer_three') == "true":
+	#	option= xbmcgui.Dialog().ok(translate(40000),translate(70004),translate(70005),translate(70006))
+	#	if option: settings.setSetting('parser_disclaimer_three',"false")
 	dirs,files = xbmcvfs.listdir(base_dir)
 	if not dirs:
 		dirpackages,filespackages = xbmcvfs.listdir(parser_packages_folder)
@@ -94,8 +94,8 @@ def addon_parsers_menu():
 
 def add_new_parser(url):
 	if not url:
-		opcao= xbmcgui.Dialog().yesno(translate(40000),translate(400012),"","",translate(40124),translate(40125))
-		if opcao:
+		option= xbmcgui.Dialog().yesno(translate(40000),translate(400012),"","",translate(40124),translate(40125))
+		if option:
 			dialog = xbmcgui.Dialog()
 			parser_tball = dialog.browse(int(1), translate(400013), 'myprograms','.tar.gz')
 			if '.tar.gz' in parser_tball:
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/parsers.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/parsers.pyo
deleted file mode 100644
index b46ae172e0509df8c847bd5979d9c12db99e84c8..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/parsers.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/rojadirecta/main.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/rojadirecta/main.py
index f9e32c6c7dd31d0b800ddee8728b4189029544b2..a3842b341829c6fc3abd09d766b817acf6ce89f8 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/rojadirecta/main.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/rojadirecta/main.py
@@ -14,7 +14,7 @@ from utils.pluginxbmc import *
 from utils.directoryhandle import *
 from utils.parsers import parser_resolver
 
-base_url = "http://rojadirectaes.me"
+base_url = "http://www.rinconrojadirecta.com/rd/rd.php"
 
 def module_tree(name,url,iconimage,mode,parser,parserfunction):
 	if not parserfunction: rojadirecta_events()
@@ -25,9 +25,9 @@ def rojadirecta_events():
 		source = get_page_source(base_url)
 	except Exception as e: source = "";xbmcgui.Dialog().ok(translate(40000),str(e))
 	if source:
-		print source
+		#print source
 		match = re.findall('<span class="(\d+)".*?<div class="menutitle".*?<span class="t">([^<]+)</span>(.*?)</div>',source,re.DOTALL)
-		print match
+		#print match
 		for id,time,eventtmp in match:
 			try:
 				import datetime
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/sport7/main.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/sport7/main.py
index 90beee75ca37b863079b1faa49606f47216b0795..5c3675a49a6a699ad621b6d9024203d78280c89c 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/sport7/main.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/sport7/main.py
@@ -38,7 +38,7 @@ def sport7_main():
 			match["links"].update([linkID for linkID in links])
 
 	if len(matchesOrder) == 0:
-		addLink('[B][COLOR white]No sopcast or acestream links found at this moment[/COLOR][/B]', '', os.path.join(current_dir,'icon.png'))
+		addLink('[B][COLOR white]{0}[/COLOR][/B]'.format(translate(40022)), '', os.path.join(current_dir,'icon.png'))
 	else:
 		for match in matchesOrder:
 			addDir('[B][COLOR orange]{0}[/COLOR][/B]'.format(russianTransliterate(match["teams"])), str(match), 401, match["img"], len(matchesOrder), False, parser="sport7",parserfunction="list_streams")
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/__init__.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/icon.png b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d72bc195355bbf7f89c47238a30a2aa7a168483
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/icon.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/main.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/main.py
new file mode 100644
index 0000000000000000000000000000000000000000..db1a18545df7934b29612191f447e0b46713cb9d
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/main.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+"""
+This plugin is 3rd party and not part of plexus-streams addon
+
+TuGoleada.com
+
+"""
+import sys,os,requests
+current_dir = os.path.dirname(os.path.realpath(__file__))
+basename = os.path.basename(current_dir)
+core_dir =  current_dir.replace(basename,'').replace('parsers','')
+sys.path.append(core_dir)
+from utils.webutils import *
+from utils.pluginxbmc import *
+from utils.directoryhandle import *
+from utils.parsers import parser_resolver
+
+parserName = "tugoleada"
+base_url = "http://tugoleada.com"
+
+def module_tree(name,url,iconimage,mode,parser,parserfunction):
+	if not parserfunction: menu()
+	elif parserfunction == "resolve_and_play": parser_resolver(name,url, os.path.join(current_dir,'icon.png'))
+
+
+def menu():
+	try:
+		source = get_page_source(base_url)
+	except:
+		xbmcgui.Dialog().ok(translate(40000),translate(40128))
+		return
+
+	for i in range(1, 8):
+		addDir("[B]Channel {0}[/B]".format(i), "http://tugoleada.com/canal{0}.php".format(i), 401, os.path.join(current_dir,"icon.png"), 1, False, parser=parserName, parserfunction="resolve_and_play")
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/module.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/module.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..dcf4ddcaa9ddf0d0370d04e4b6ed154348d6fac3
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/parsers/tugoleada/module.cfg
@@ -0,0 +1 @@
+{ 'name' : 'TuGoleada.com'}
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/resolver.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/resolver.pyo
deleted file mode 100644
index 64b986a8b8921550cef60b64102ad0b7529851bd..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/resolver.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/sopcast.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/sopcast.pyo
deleted file mode 100644
index 6339517c5d87248a1627848653eeb2d4e4f331fe..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/sopcast.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/__init__.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/__init__.pyo
deleted file mode 100644
index c954c29f84301ec7e9887ff539336afeb856110c..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/__init__.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/directoryhandle.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/directoryhandle.pyo
deleted file mode 100644
index e8f892e7ae6cffa52d3440114b4564b9f209b228..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/directoryhandle.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/iofile.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/iofile.pyo
deleted file mode 100644
index e91199a563f84b665ef5b28274aab44fc59a38a2..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/iofile.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/parsers.py b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/parsers.py
index 57543bf1363b092ba67278446e65a1d8729c7900..912674b79ed8172a877221d484b696bb2540d197 100644
--- a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/parsers.py
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/parsers.py
@@ -16,24 +16,26 @@ import sopcast as sop
 from utils.pluginxbmc import *
 from utils.webutils import *
 
+def play_stream_url(name, icon, url):
+    if "sop://" in url: sop.sopstreams(name,icon,url)
+    else: ace.acestreams(name,icon,url)
+
 def parser_resolver(name,url,icon,depth=0):
     if "sop://" not in url and "acestream://" not in url:
         if "http://" not in url:
-            url="http://"+url
-
-        if 'arenavision' in url:
-            headers = {
-                "Cookie" : "beget=begetok; has_js=1;"
-            }
-            try:
-                source = requests.get(url,headers=headers).text
-            except: source="";xbmcgui.Dialog().ok(translate(40000),translate(40128))
-        else:
-            try:
+            url = "http://" + url
+
+        try:
+            if 'arenavision' in url or 'elgoles.net' in url:
+                headers = { "Cookie" : "beget=begetok; has_js=1;" }
+                source = requests.get(url, headers = headers).text
+            else:
                 source = get_page_source(url)
-            except: source = "";xbmcgui.Dialog().ok(translate(40000),translate(40128))
+        except:
+            xbmcgui.Dialog().ok(translate(40000), translate(40128))
+            return None
 
-        patternList = ['(sop://[^ "\']+)',                   # Sopcast
+        patternList = ['(sop://[^ "\'<]+)',                   # Sopcast
                        '(?:acestream://|this.loadPlayer\(["\'])([^"\']+)["\']', # AceStream
                        '<i?frame[^>]+src=["\']([^>]+?)["\']' # iframes
                       ]
@@ -42,16 +44,32 @@ def parser_resolver(name,url,icon,depth=0):
 
         matchs = re.findall(allPatterns, source, re.IGNORECASE)
         iframes = []
+        streams = []
+        print "Streams len = {0}".format(len(streams))
         for match in matchs:
             if match[0]:
-                sop.sopstreams(name,icon,match[0])
-                return match[0]
+                if not match[0] in streams:
+                    streams.append(match[0])
             elif match[1]:
-                ace.acestreams(name,icon,match[1])
-                return match[1]
+                if not match[1] in streams:
+                    streams.append(match[1])
             else:
                 iframes.append(match[2])
 
+        if len(streams) > 0:
+            urlToPlay = None
+            if len(streams) > 1:
+                index = xbmcgui.Dialog().select(translate(40021), streams)
+                if index > -1: urlToPlay = streams[index]
+            else:
+                urlToPlay = streams[0]
+
+            if urlToPlay:
+                play_stream_url(name, icon, urlToPlay)
+
+            return urlToPlay
+
+
         for iframe in iframes:
             redirect_url = iframe if '/' in iframe else url + '/' + iframe
             if depth < 2:
@@ -63,8 +81,7 @@ def parser_resolver(name,url,icon,depth=0):
 
         return None
 
-    elif "sop://" in url: sop.sopstreams(name,icon,url)
-    else: ace.acestreams(name,icon,url)
+    else: play_stream_url(name,icon,url)
 
     return url
 
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/pluginxbmc.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/pluginxbmc.pyo
deleted file mode 100644
index c939ec8e2888f189ade0687508656aaabe176397..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/pluginxbmc.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/webutils.pyo b/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/webutils.pyo
deleted file mode 100644
index 0edf7316a3c8ecc13257898dc80e3dec61b7d126..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/plugin.video.plexus-streams/resources/core/utils/webutils.pyo and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/LICENSE b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/LICENSE
new file mode 120000
index 0000000000000000000000000000000000000000..1cf3ac0f3a4b8494625e0cb0b30f1f99dc7f73ed
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/LICENSE
@@ -0,0 +1 @@
+../plugin.video.quasar/LICENSE
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/Makefile b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/Makefile
new file mode 120000
index 0000000000000000000000000000000000000000..588c6a2de67e6f7b2495ec3b4479b71905314317
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/Makefile
@@ -0,0 +1 @@
+../plugin.video.quasar/Makefile
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/README.md b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/README.md
new file mode 120000
index 0000000000000000000000000000000000000000..aa5bd24e5247db44c323e979be503f2886c1737c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/README.md
@@ -0,0 +1 @@
+../plugin.video.quasar/README.md
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/addon.xml b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..83e5d052711d2d7c831e8d687830dde1cb41535a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/addon.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="plugin.video.pulsar" name="Pulsar" version="9.9.12" provider-name="scakemyer">
+    <requires>
+        <import addon="xbmc.python" version="2.1.0"/>
+    </requires>
+    <extension point="xbmc.python.pluginsource" library="navigation.py">
+        <provides>video</provides>
+    </extension>
+    <extension point="xbmc.service" library="service.py" start="startup"/>
+    <extension point="xbmc.python.module" library="resources/site-packages" />
+    <extension point="xbmc.subtitle.module" library="navigation.py" />
+    <extension point="xbmc.addon.metadata">
+        <platform>all</platform>
+        <language>en</language>
+        <summary><![CDATA[Quasar: Torrent streaming]]></summary>
+        <description><![CDATA[Stream torrent files]]></description>
+    </extension>
+</addon>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/fanart.jpg b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/fanart.jpg
new file mode 120000
index 0000000000000000000000000000000000000000..67c7dfb23db7c388027ac3d6950ba18c19a94de8
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/fanart.jpg
@@ -0,0 +1 @@
+../plugin.video.quasar/fanart.jpg
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/icon.png b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/icon.png
new file mode 120000
index 0000000000000000000000000000000000000000..45b4a80293134218b8d531ebba5f59a3184815ab
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/icon.png
@@ -0,0 +1 @@
+../plugin.video.quasar/icon.png
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/logo.png b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/logo.png
new file mode 120000
index 0000000000000000000000000000000000000000..66bdc3b8655803ae2b09a17fa446e247513840e9
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/logo.png
@@ -0,0 +1 @@
+../plugin.video.quasar/logo.png
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/navigation.py b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/navigation.py
new file mode 120000
index 0000000000000000000000000000000000000000..18e34ddfc1837702502782b98d92c769d0c498c6
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/navigation.py
@@ -0,0 +1 @@
+../plugin.video.quasar/navigation.py
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/requirements.txt b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/requirements.txt
new file mode 120000
index 0000000000000000000000000000000000000000..964f1c5170741f55b7cb53c8c8716385ec384dfa
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/requirements.txt
@@ -0,0 +1 @@
+../plugin.video.quasar/requirements.txt
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/resources b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/resources
new file mode 120000
index 0000000000000000000000000000000000000000..e8347f1b80e3b7b13ffb071939a2c2c071f3e741
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/resources
@@ -0,0 +1 @@
+../plugin.video.quasar/resources
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/scripts b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/scripts
new file mode 120000
index 0000000000000000000000000000000000000000..ed89c255b6261fae3624d24ba326eb2bb55d3b98
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/scripts
@@ -0,0 +1 @@
+../plugin.video.quasar/scripts
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/service.py b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/service.py
new file mode 120000
index 0000000000000000000000000000000000000000..54bdf6d16bbfd1408403d1f6947bba586c777cf2
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/service.py
@@ -0,0 +1 @@
+../plugin.video.quasar/service.py
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/setup.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/setup.cfg
new file mode 120000
index 0000000000000000000000000000000000000000..c3358ea212da3e13984a96d0a2bb5bdfeb89f764
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.pulsar/setup.cfg
@@ -0,0 +1 @@
+../plugin.video.quasar/setup.cfg
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.gitignore b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..0df53862e0e058e905733caa217d1143d56dcefe
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.gitignore
@@ -0,0 +1,55 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+*.zip
+# bin/
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Other
+# resources/bin
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.gitmodules b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..6710c815e7f4b5fa644f0e3463bf4bfcf6629c72
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "resources/bin"]
+	path = resources/bin
+	url = https://github.com/scakemyer/quasar-binaries
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.travis.yml b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ab4005d950229e2213db642b2b392d6b638e7d3a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/.travis.yml
@@ -0,0 +1,33 @@
+language: python
+python:
+  - 2.7
+
+install:
+  - pip install -r requirements.txt
+
+script:
+  - flake8
+  - ./scripts/xgettext.sh
+  - make
+  - |
+    if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ -n "${TRAVIS_TAG}" ]; then
+      make zipfiles
+    fi
+
+deploy:
+  provider: releases
+  api_key: $GH_TOKEN
+  file:
+    - plugin.video.quasar-${TRAVIS_TAG:1}.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.android_arm.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.android_x64.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.android_x86.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.darwin_x64.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.linux_arm.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.linux_x64.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.linux_x86.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.windows_x64.zip
+    - plugin.video.quasar-${TRAVIS_TAG:1}.windows_x86.zip
+  skip_cleanup: true
+  on:
+    tags: true
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/LICENSE b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..97b5d2915b6ac3fad7f64d0f492c0d84c2817d74
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2014, Steeve Morin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+    * Redistributions may not be sold, nor may they be used in a commercial
+      product or activity.
+    * Redistributions of source code and/or in binary form must reproduce the
+      above copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided with the
+      distribution.
+    * Neither the name of <organization> nor the names of its contributors may
+      be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY STEEVE MORIN "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/Makefile b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..74a47210ea954e6f36ac03e477dfb30bfaa1d4a1
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/Makefile
@@ -0,0 +1,50 @@
+NAME = plugin.video.quasar
+GIT = git
+GIT_VERSION = $(shell $(GIT) describe --always)
+VERSION = $(shell sed -ne "s/.*version=\"\([0-9a-z\.\-]*\)\"\sprovider.*/\1/p" addon.xml)
+ARCHS = \
+	android_arm \
+	android_x64 \
+	android_x86 \
+	darwin_x64 \
+	linux_arm \
+	linux_x64 \
+	linux_x86 \
+	windows_x64 \
+	windows_x86
+ZIP_SUFFIX = zip
+ZIP_FILE = $(NAME)-$(VERSION).$(ZIP_SUFFIX)
+
+all: clean zip
+
+.PHONY: $(ARCHS)
+
+$(ARCHS):
+	$(MAKE) clean_arch ZIP_SUFFIX=$@.zip
+	$(MAKE) zip ARCHS=$@ ZIP_SUFFIX=$@.zip
+
+$(ZIP_FILE):
+	git archive --format zip --prefix $(NAME)/ --output $(ZIP_FILE) HEAD
+	mkdir -p $(NAME)/resources/bin
+	for arch in $(ARCHS); do \
+		ln -s `pwd`/resources/bin$(DEV)/$$arch $(NAME)/resources/bin/$$arch; \
+		zip -9 -r -g $(ZIP_FILE) $(NAME)/resources/bin/$$arch; \
+	done
+	rm -rf $(NAME)
+
+zip: $(ZIP_FILE)
+
+zipfiles: addon.xml
+	for arch in $(ARCHS); do \
+		$(MAKE) $$arch; \
+	done
+
+clean_arch:
+	 rm -f $(ZIP_FILE)
+
+clean:
+	for arch in $(ARCHS); do \
+		$(MAKE) clean_arch ZIP_SUFFIX=$$arch.zip; \
+	done
+	rm -f $(ZIP_FILE)
+	rm -rf $(NAME)
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/README.md b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..6d652253f6e33ffae58de37642537efb5fb1e3dd
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/README.md
@@ -0,0 +1,124 @@
+![](http://i.imgur.com/4eQhijh.png)
+
+[![Build Status](https://travis-ci.org/scakemyer/plugin.video.quasar.svg?branch=master)](https://travis-ci.org/scakemyer/plugin.video.quasar)
+
+What it is
+----------
+Quasar is a torrent finding and streaming engine. It doesn't go on torrent websites for legal reasons. However, it calls specially crafted add-ons (called providers) that are installed separately. They are normal Kodi add-ons, and thus can be installed/updated/distributed just like any other add-on.
+
+This project is a fork of the well known, but no longer maintained Pulsar project from [steeve](https://github.com/steeve/plugin.video.pulsar).
+Big thanks for his great job.
+
+Supported platforms
+-------------------
+- Windows 32/64 bits
+- Linux 32/64 bits (starting Ubuntu 12.04)
+- Linux ARM (Raspberry Pi, Cubox i4Pro, etc)
+- OS X 64 bits
+- Android ARM (4.4.x, L and M), x86 and x64 (L and M)
+
+Download
+--------
+See the [Releases](https://github.com/scakemyer/plugin.video.quasar/releases) page. **Do NOT use the `Download ZIP` button on this page.**
+
+
+Installation
+------------
+- Install Quasar like any other add-on
+- Go to Settings > Services > Remote Control and **enable both options**
+- Restart Kodi
+
+Build
+-----
+The entire build process of Quasar is automated using Travis CI, and that's a
+good thing because it's quite a complicated one with many dependencies and
+repositories. Here's the stack from top to bottom:
+
+- [quasar](https://github.com/scakemyer/quasar) - The Quasar daemon itself, built on top of the cross-compiled libtorrent-go
+- [libtorrent-go](https://github.com/scakemyer/libtorrent-go) - The libtorrent library with Go bindings, built using cross-compiler
+- [cross-compiler](https://github.com/scakemyer/cross-compiler) - Builds the base images to, you guessed it, cross-compile Quasar
+
+#### Build status of each project
+| quasar daemon | libtorrent-go | cross-compiler |
+| ------------- | ------------- | -------------- |
+| [![Build Status](https://travis-ci.org/scakemyer/quasar.svg?branch=master)](https://travis-ci.org/scakemyer/quasar) | [![Build Status](https://travis-ci.org/scakemyer/libtorrent-go.svg?branch=master)](https://travis-ci.org/scakemyer/libtorrent-go) | [![Build Status](https://travis-ci.org/scakemyer/cross-compiler.svg?branch=master)](https://travis-ci.org/scakemyer/cross-compiler) |
+
+There are different ways to build the Quasar daemon. You can either pull the different Docker images or build it all yourself. If you want to go for the latter, start by building the cross-compiler images, then libtorrent-go, and come back to Quasar afterwards. There should be enough info in each of the projects to get you started, but you'll obviously have to dive into the code at some point.
+
+Since the whole build process is now automated, this repository is using [pre-built binaries](https://github.com/scakemyer/quasar-binaries) from the last Quasar daemon build as a submodule. Here's how you'd build this add-on using those:
+```
+git clone https://github.com/scakemyer/plugin.video.quasar
+cd plugin.video.quasar
+git submodule update --init
+make
+```
+
+How it works
+------------
+Quasar is a torrent finding and streaming engine. **It doesn't go on torrent websites for legal reasons**. It calls specially crafted add-ons (called **providers**) that are installed separately. They are normal Kodi add-ons, and thus can be installed/updated/distributed just like any other add-on.
+
+Quasar is centered around media: it browses media from [TheMovieDB](https://www.themoviedb.org/) and [TheTVDB](http://thetvdb.com/).
+And so, when you decide you want to watch a media (i.e. given an IMDB or TVDB Id), here's what Quasar does:
+
+- Enumerate the installed providers
+- Call each provider to find the media you want to watch (in parallel)
+- Each provider returns a list of BT links they found
+- Collects and de-duplicates all the links
+- Goes on the BitTorrent network to find out the number of seeds and peers in real time (i.e. not provided by the provider)
+- Finds out of which quality are the different links (thanks to their name)
+- Ranks the links by quality and availability (Quasar privileges quality over availability, but it's not dumb. However, you can get a full list to choose from manually it you want, or enable 'Choose stream by default' to always choose manually)
+- Sends the chosen link to the BitTorrent streaming engine (brand new, and completely rewritten)
+
+All of this is done in less than 1s. Quasar is around 95% Go, and thus, it's *fast*. Very fast, actually.
+
+The BitTorrent streaming engine is brand new and very resilient (or at least it's designed to be). It's built on top of the brand new libtorrent 1.0 (which had special patches for the streaming case). So it's very optimized, especially for low CPU machines. I have yet to find a media that doesn't play with the engine.
+
+
+Providers
+---------
+As said before, Quasar **relies on providers to find streams**. Providers are easy to write, and average ~20 lines of Python. As they are normal Kodi add-ons, which can have their own configuration (although it is not recommended because it complicates things).
+
+Sample Quasar provider: [https://github.com/scakemyer/script.quasar.dummy](https://github.com/scakemyer/script.quasar.dummy)
+
+Providers are given a max amount of time to run before Quasar considers them to be too slow. The timeouts are as follow:
+- 10 seconds on Intel CPUs
+- 20 seconds on multi-core ARM CPUs
+- 30 seconds on single core ARM CPUs (Raspberry Pi)
+
+Please note that for legal reasons, **I won't discuss, develop nor distribute any providers connecting to illegal sources**. So there is no need to ask me.
+While I can partake in general discussions regarding provider development, **I won't do so for illegal sources specific problems**.
+
+
+FAQ
+---
+##### I can't code. How can I help?
+Spread the word. Talk about it with your friends, show them, make videos, tutorials. Talk about it on social networks, blogs, etc...
+
+##### The plugin doesn't work, what can I do?
+Please search currently [open and closed issues](https://github.com/scakemyer/plugin.video.quasar/issues) to see if it has already been reported and/or fixed. If not then add a new issue with a short but descriptive title, a detailed description and of course a link to the logs. If you don't know how to do that, just follow the guide at: [http://kodi.wiki/view/Log_file/Easy](http://kodi.wiki/view/Log_file/Easy). If you actually went through the logs and know the relevant part, you can instead paste that, as long as it's shorter than a hundred lines or so, and please enclose it in triple back-quotes for readability.
+
+##### Can I seek in a video?
+Yes, but it can fail.
+
+##### What about seeding?
+When watching a torrent, **you will be seeding while you watch the stream**.
+
+##### Does it downloads the whole file? Do I need the space? Is it ever deleted?
+Yes, yes and yes.
+
+##### Can I keep the file after watching it?
+Yes, change it in the add-on settings.
+
+##### Can I set it to download directly to my NAS?
+Yes, but **you need to mount your NAS via the OS, not via Kodi**.
+
+##### Provider X is blocked in my country/ISP, how can I set another domain?
+Sorry, I won't comment of specific providers.
+
+
+Screenshots
+-----------
+![](http://i.imgur.com/uchej1p.png)
+![](http://i.imgur.com/0ybvekN.jpg)
+![](http://i.imgur.com/L103Xt1.jpg)
+![](http://i.imgur.com/8qSwVk1.jpg)
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/addon.xml b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b2106e17602aff981cdd161b87e2f3991f644224
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/addon.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="plugin.video.quasar" name="Quasar" version="0.9.12" provider-name="scakemyer">
+    <requires>
+        <import addon="xbmc.python" version="2.1.0"/>
+    </requires>
+    <extension point="xbmc.python.pluginsource" library="navigation.py">
+        <provides>video</provides>
+    </extension>
+    <extension point="xbmc.service" library="service.py" start="startup"/>
+    <extension point="xbmc.python.module" library="resources/site-packages" />
+    <extension point="xbmc.subtitle.module" library="navigation.py" />
+    <extension point="xbmc.addon.metadata">
+        <platform>all</platform>
+        <language>en</language>
+        <website><![CDATA[https://github.com/scakemyer/plugin.video.quasar]]></website>
+        <forum><![CDATA[http://forum.xbmc.org/showthread.php?tid=200957]]></forum>
+        <source><![CDATA[https://github.com/scakemyer/plugin.video.quasar]]></source>
+        <language>en</language>
+        <license><![CDATA[Non commercial. See https://github.com/scakemyer/plugin.video.quasar/blob/master/LICENSE]]></license>
+        <summary><![CDATA[Quasar: Torrent streaming]]></summary>
+        <description><![CDATA[Stream torrent files]]></description>
+    </extension>
+</addon>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/fanart.jpg b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/fanart.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5f57b288223bbc773f9ad193f14465bd60fe08c6
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/fanart.jpg differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/icon.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d0fb6f0854a2ee3690d47c68450dd59df6b91a
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/icon.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/logo.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..da28dfabe7069e247edf5118bb172dc8ce6d64f8
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/logo.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/navigation.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/navigation.py
new file mode 100644
index 0000000000000000000000000000000000000000..6dcc830f11958ce8f79fb7fbb5ec7c46d5bbd9c1
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/navigation.py
@@ -0,0 +1,6 @@
+import os
+import sys
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'resources', 'site-packages'))
+from quasar import navigation
+
+navigation.run()
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/requirements.txt b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..39304807fbc7bd47cb8a72ff873c076b694e4fbe
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/requirements.txt
@@ -0,0 +1 @@
+flake8
diff --git a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/bin/linux_arm/pulsar b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/bin/linux_arm/quasar
similarity index 56%
rename from packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/bin/linux_arm/pulsar
rename to packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/bin/linux_arm/quasar
index 62bb54d35ccdda2a1a586b810d7dbd7665ca1670..876ed17628cfc67a46a9a25d824149dda6eace01 100755
Binary files a/packages/mediacenter/kodi/config/base-addon_data/plugin.video.pulsar/bin/linux_arm/pulsar and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/bin/linux_arm/quasar differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/LICENSE b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..2a3959795be3fa4eb4558f93d67d599e629fbac4
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/LICENSE
@@ -0,0 +1,9 @@
+Icons made by:
+- Freepik http://www.flaticon.com/authors/freepik
+- Icons8 http://www.flaticon.com/authors/icons8
+- Scott de Jonge http://www.flaticon.com/authors/scott-de-jonge
+- Icomoon http://www.flaticon.com/authors/icomoon
+- Anton Saputro http://www.flaticon.com/authors/anton-saputro
+- Rami McMin http://www.flaticon.com/authors/rami-mcmin
+
+Icons from www.flaticon.com are licensed by CC BY 3.0 (http://creativecommons.org/licenses/by/3.0/)
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/black.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/black.png
new file mode 100644
index 0000000000000000000000000000000000000000..1914264c08781d1f30ee0b8482bccf44586f2dc1
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/black.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/clock.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..b77296437af7a9f4fd4c23061cca48e0a3bc6ac3
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/clock.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/faq8.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/faq8.png
new file mode 100644
index 0000000000000000000000000000000000000000..455c1c96ae290d37c0409e0d55b4883f63760ae9
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/faq8.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/favourites.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/favourites.png
new file mode 100644
index 0000000000000000000000000000000000000000..402081a6d93a75a4aa6a6c192b40166193d72baa
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/favourites.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/fresh.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/fresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..1108dab6c6714f11996b3c5d2929689a0cb29f00
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/fresh.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_action.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_action.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bc4407c560d77eb190c7256f507ffda1e82a0ab
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_action.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_adventure.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_adventure.png
new file mode 100644
index 0000000000000000000000000000000000000000..db57a9f8902401b1743a4b32b66864150b4a28bc
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_adventure.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_animation.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_animation.png
new file mode 100644
index 0000000000000000000000000000000000000000..8331863239ef874cb05abc9ea17e8d0097703151
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_animation.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_comedy.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_comedy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6992a4f3d1b4ec574296a2ae7a66a98d908a6b0f
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_comedy.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_crime.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_crime.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa9142ca7718963a40e2b7e1ca4e190c7d9f33f4
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_crime.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_documentary.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_documentary.png
new file mode 100644
index 0000000000000000000000000000000000000000..1379caf28d7d5e8cf3650586c6bf9f07b042ebf7
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_documentary.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_drama.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_drama.png
new file mode 100644
index 0000000000000000000000000000000000000000..30dfc4efa627ba142c705e26332de731b7d4ffe7
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_drama.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_education.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_education.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc068e8ba66048f08d2f11f0aaf0284c76be1bfe
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_education.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_family.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_family.png
new file mode 100644
index 0000000000000000000000000000000000000000..a29100b111854f10155ce4ec2bac8c25fa4dc788
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_family.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_fantasy.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_fantasy.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef06e7b6b6ffa5f1a5cabf916f64e1056a76f474
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_fantasy.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_foreign.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_foreign.png
new file mode 100644
index 0000000000000000000000000000000000000000..dafec0473326bd007028f6e3b58517b8f70fb5fd
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_foreign.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_history.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_history.png
new file mode 100644
index 0000000000000000000000000000000000000000..9888537b0d3a03b294f9f801c8ba52b87dc12d23
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_history.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_horror.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_horror.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa8049fff4def11be199a4f7033645b90927bd63
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_horror.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_kids.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_kids.png
new file mode 100644
index 0000000000000000000000000000000000000000..32b4874affad5c4252e18c94abf389ed71c7daa5
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_kids.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_music.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_music.png
new file mode 100644
index 0000000000000000000000000000000000000000..7786acf6a1c8e87557102df09bc607548884e064
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_music.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_mystery.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_mystery.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b921299dae9742e8b469532cb008a40b7587cfd
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_mystery.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_news.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_news.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf852fca6c1275bfd4bc1d2a090c09c4a38aac17
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_news.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_reality.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_reality.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b18322166a4123dcbb178d635eb31456fbbc11c
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_reality.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_romance.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_romance.png
new file mode 100644
index 0000000000000000000000000000000000000000..01a69c97707f8b98bb4f14d7688fdc9e57e18995
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_romance.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_scifi.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_scifi.png
new file mode 100644
index 0000000000000000000000000000000000000000..50ef462374dd4d305871a9ee5f201c65bafb2240
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_scifi.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_soap.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_soap.png
new file mode 100644
index 0000000000000000000000000000000000000000..40f55e709ab0f86e841e2cf1543fa8326f58a044
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_soap.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_talk.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_talk.png
new file mode 100644
index 0000000000000000000000000000000000000000..8de036a47b4b968f0e927620013a0a0d73a23e87
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_talk.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_thriller.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_thriller.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2a7c752c6e2b16eccf4eac03da9f48828fb2561
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_thriller.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_tv.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_tv.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d53d5f9ce3d4e0cc12a935478061e4eb2be5c0
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_tv.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_war.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_war.png
new file mode 100644
index 0000000000000000000000000000000000000000..df4ab22073f8ae395583406dd8c2c1c106aa205a
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_war.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_western.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_western.png
new file mode 100644
index 0000000000000000000000000000000000000000..708e32c914be229a0f110682370539b12827d0ef
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/genre_western.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/imdb.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/imdb.png
new file mode 100644
index 0000000000000000000000000000000000000000..f70ef35a51b9cffa19c9591550300eb16d20e489
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/imdb.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/magnet.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/magnet.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fccde8f169b0e16257f83c307938b289d4892ed
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/magnet.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/most_voted.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/most_voted.png
new file mode 100644
index 0000000000000000000000000000000000000000..33d708bd4a15c8ecf098c4c0e1a16aadd48de01e
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/most_voted.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/movies.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/movies.png
new file mode 100644
index 0000000000000000000000000000000000000000..05967f5084d00905add16feb4b388ad6c5f2f0f0
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/movies.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/nextpage.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/nextpage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddbcb7fd3b225d7fd556b168674bc90f3d53ef9e
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/nextpage.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/popular.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/popular.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9249195b861fa10d76181a622bb3367d4f55023
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/popular.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/search.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccf3d0b9eda56db72fe47183cb5afa256f6daf82
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/search.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/settings.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa1e7d5f76010172182c8402ec0f194094fd8efd
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/settings.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/top_rated.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/top_rated.png
new file mode 100644
index 0000000000000000000000000000000000000000..6131e7695cb08ff13e9f81ebb23ee74036dbda9c
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/top_rated.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/tv.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/tv.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b7e392a0ddc90540ef866a2a319c1754f48d568
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/img/tv.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Croatian/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Croatian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..1465551db4f37646f0622de939e94e00eb682aeb
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Croatian/strings.po
@@ -0,0 +1,315 @@
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-02-07 15:15+0100\n"
+"PO-Revision-Date: 2016-02-07 15:17+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: hr_HR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "Općenito"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Lokacija skidanja (ne FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Zadrži datoteke nakon gledanja/skidanja"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Velicina buffera (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Max brzina uploada (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Max brzina downloada (kB/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Slusaj port Min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Slusaj port Max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "SOCKS v5 konfiguracija"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Omogućeno"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Korisničko ime"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Šifra"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Napredno"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Proizvoljni timeout za providera"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Omogućeno (koristi na vlastiti rizik)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout u sekundama"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Održavanje"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Izbriši cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Omogući pagination"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Omogući statusni overlay"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Automatski izaberi stream"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Primi nadogradnje prije izdanja (pre-release)"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Ograniči brzinu nakon što se napuni buffer"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Lokacija library-a"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Limit konekcija"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Pozadinski rad torrenta"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Učestalost spremanja sesije (sekunde)"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasarse srušio, ponovno pokrećem..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Morate restartati Kodi prije korištenja Quasara"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Ovaj add-on se može pokrenuti jedino iz Quasara"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Ne može se naći Quasarov binary"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache očišćen"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Traži TV serije"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Izaberi Stream..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Informacije o seriji"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Ne mogu naći providere"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Nije pronađen niti jedan link"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Traži filmove"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Nema dovoljno mjesta na lokaciji skidanja."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar daemon je pokrenut"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Traži"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Najpopularnije"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Najbolje ocjenjeno"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Najviše glasano"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Filmovi"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "TV Serije"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Zalijepi URL (Paste)"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Zalijepi Magnet ili URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Slijedeća stranica"
+
+msgctxt "#30219"
+msgid "Add/Remove from library"
+msgstr "Dodaj/Ukloni iz library-a"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Lokacija library-a nije određena"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Uspješno dodano u library"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Uklonjeno iz library-a"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Datoteke"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Greška u provideru"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Greška u navigaciji"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Greška Daemona"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Greška prilikom updatea Quasar daemona"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Dostupni streamovi za"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrenti"
+
+msgctxt "#30230"
+msgid "Play/resume torrent"
+msgstr "Pokreni/nastavi torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pauziraj torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Izbriši torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pauziraj sesiju"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Nastavi sesiju"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Nastavi torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Nedavno objavljeno"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Aktualne Serije"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Posljednje epizode"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Dutch/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Dutch/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..88ab5ba42d4fadddd17025147494244da221d848
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Dutch/strings.po
@@ -0,0 +1,326 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-02-09 17:53+0100\n"
+"PO-Revision-Date: 2016-02-09 17:55+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: nl_NL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "Algemeen"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Download Pad (GEEN FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Behoud bestanden nadat het afspelen/downloaden gestopt is"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Buffer Grootte (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Max Upload Snelheid (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Max Download Snelheid (kB/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Luister Poort Min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Luister Poort Max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "SOCKS v5 Configuratie"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Ingeschakeld"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Poort"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Aanmelden als"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Wachtwoord"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Uitgebreid"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Aangepaste Provider Time-out"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Ingeschakeld (gebruik op eigen risico)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Time-out in secondes"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Onderhoud"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Cache Opschonen"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Pagineren Inschakelen"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Inschakelen Overlay Status Balk"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Kies Stream Automatisch"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Verkrijg Updates voor pre-releases"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Beperk snelheden na het bufferen"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Bibliotheek Pad"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Maximaal aantal verbindingen"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Op de achtergrond verwerken van torrents"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Frequency voor het opslaan van een sessie (seconden)"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar is gechrashed, restarting..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Je moet Kodi opnieuw opstarten voordat je Quasar gebruikt"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Deze addon kan alleen gebruikt worden door Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Quasar binary niet gevonden"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Invoeren file of URL"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "File"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Invoeren URL"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "File pad"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "OK"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Chache opgeschoond"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Zoeken van TV Shows"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Kies Stream..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Toon meer informatie"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Kan geen providers vinden"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Geen links gevonden"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Zoeken van Films"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Niet genoeg ruimte beschikbaar in de download pad."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar daemon is gestart"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Zoek"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Populairst"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Beste Cijfers"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Meeste Stemmen"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Films"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "TV Shows"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Plak URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Plak Magnet or URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Volgende Pagina"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Toevoegen/verwijderen van bibliotheek"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Bibliotheek Pad niet omschreven"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Item succesvol aan bibliotheek toegevoegd"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Item succesvol uit bibliotheek verwijderd"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Bestanden"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Provider fout"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Navigatie fout"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Daemon fout"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Fout tijdens updaten van Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Beschikbare streams voor"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Afspelen/resumeren torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pauzeren torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Verwijder torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pauzeer sessie"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Resumeer sessie"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Resumeer torrent"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/English/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/English/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..0500cb83a63254ef2e791678c20a0d74b02c5b67
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/English/strings.po
@@ -0,0 +1,335 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+
+msgctxt "#30000"
+msgid "General"
+msgstr "General"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Download path (not FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Keep files after playback/download stops"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Buffer size (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Max upload rate (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Max download rate (kB/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Listen port min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Listen port max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "SOCKS v5 Configuration"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Enabled"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Login"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Password"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Advanced"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Custom provider timeout"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Enabled (use at your own risk)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout in seconds"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Clear cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Enable pagination"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Enable overlay status"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Choose stream automatically"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Get updates for pre-releases"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Limit rates after buffering only"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Library path"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Connections limit"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Background handling of torrents"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Session saving frequency (seconds)"
+
+# Interface
+
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar has crashed, restarting..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "You must restart Kodi before using Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "This add-on can only be run from within Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Unable to find Quasar binary"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Insert file or URL"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "File"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Insert URL"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "File path"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "OK"
+
+# Quasar daemon
+
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache cleared"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Search TV Shows"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Choose stream..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Show information"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Unable to find any providers"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "No links were found"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Search Movies"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Not enough space available on the download path."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar daemon has started"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Search"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Most Popular"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Top Rated"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Most Voted"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Movies"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "TV Shows"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Add Torrent"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Paste Magnet or URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Next page"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Add / Remove from library"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Library path not set"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Item successfully added to library"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Item removed from library"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Files"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Provider error"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Navigation error"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Daemon error"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Error updating Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Available streams for"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Play / resume torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pause torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Delete torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pause session"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Resume session"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Resume torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Recently Released"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Recent Shows"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Recent Episodes"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/French/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/French/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..dc4b5723d8c7c8dd16daaf8d2a1ce8b339c42522
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/French/strings.po
@@ -0,0 +1,268 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2016-02-02 06:22-0500\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.6\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "Général"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Chemin de téléchargement (Pas de FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Conserver les fichiers après la fin de la lecture/du telechargement"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Taille du tampon (Mo)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Débit Montant Max (ko/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Débit Descendant Max (ko/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Port d'écoute Min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Port d'écoute Max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "Configuration SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Activé"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Hôte"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Identifiant"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Mot de Passe"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Avancé"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Timout Fournisseur Personnalisé"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Activé (à vos risques et périls)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout en secondes"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Nettoyer le Cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Activer la Pagination"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Activer la barre d'information en surimpression"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar s'est crashé, redémarrage..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Vous devez redémarrer Kodi pour pouvoir utiliser Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Ce plugin ne peut être utilisé que depuis Quasar"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache nettoyé"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Rechercher des Séries"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Choisir un Flux"
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Afficher les informations"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Aucun Fournisseur Trouvé"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Aucun Lien Trouvé"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Rechercher des Films"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Pas assez d'espace disponible dans le répertoire de téléchargement"
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Le service Quasar a démarré"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Rechercher"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Les plus populaires"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Les mieux classés"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Les plus notés"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "Top 250 IMDB"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Films"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "Séries"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Coller une URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Coller un Magnet ou une URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Page Suivante"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Ajouter / Supprimer de la bibliothèque"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Chemin vers la bibliothèque non spécifié"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Elément ajouté à la bibliothèque"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Elément supprimé de la bibliothèque"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Fichiers"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Erreur du Fournisseur"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Erreur de Navigation"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Erreur du processus Quasar"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Erreur lors de la mise à jour du processus Quasar"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Flux Disponibles pour"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Lire / Reprendre le Torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Mettre en Pause le Torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Supprimer le Torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Mettre en Pause la Session"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Reprendre la Lecture de la Session"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Reprendre la lecture du Torrent"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Greek/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Greek/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..db6636fa19ae36dee78649a1f6dcd516b773ff22
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Greek/strings.po
@@ -0,0 +1,336 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: scakemyer
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-27 19:53+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Filosofos <extraxoros@gmail.com>\n"
+"Report-Msgid-Bugs-To: Filosofos <extraxoros@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "Γενικές ρυθμίσεις"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Διαδρομή λήψης (ΟΧΙ FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Διατήρηση αρχείων όταν ολοκληρωθεί η αναπαραγωγή/λήψη"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Μέγεθος προσωρινής μνήμης (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Μέγιστος ρυθμός μεταφόρτωσης (Upload)(kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Μέγιστος ρυθμός λήψης (kB/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Θύρα επικοινωνίας (μικρότερη)"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Θύρα επικοινωνίας (μεγαλύτερη)"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Διακομιστής μεσολάβησης (proxy)"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "Ρυθμίσεις SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Ενεργοποιημένο"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Εξυπηρετητής"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Θύρα"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Σύνδεση"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Συνθηματικό"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Προχωρημένες ρυθμίσεις"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Προσαρμοσμένη διάρκεια λήξης παρόχων"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Ενεργοποιημένο (χρησιμοποιήστε το με δική σας ευθύνη)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Χρονικό όριο λήξης σε δευτερόλεπτα"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Συντήρηση"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Διαγραφή λανθάνουσας μνήμης"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Ενεργοποίηση σελιδοποίησης"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Ενεργοποίηση μπάρας κατάστασης"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Αυτόματη επιλογή ροής (stream)"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Ενεργοποίηση λήψης ανεπίσημων εκδόσεων"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Περιορισμός ρυθμού λήψης μετά την αποθήκευση στην ενδιάμεση μνήμη"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Διαδρομή ταινιοθήκης"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Όριο συνδέσεων"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Χειρισμός torrents στο υπόβαθρο"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Συχνότητα αποθήκευσης συνεδρίας (δευτερόλεπτα)"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Το Quasar έχει κλείσει αναπάντεχα, γίνεται επανεκκίνηση..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Απαιτείται η επανεκκίνηση του Kodi πριν από τη χρήση του Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Το συγκεκριμένο πρόσθετο μπορεί να χρησιμοποιηθεί μόνο μέσα από το Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Δεν βρέθηκε το Quasar binary"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Εισαγωγή αρχείου ή URL"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "Αρχείο"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Εισαγωγή URL"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "Διαδρομή αρχείου"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "OK"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Έγινε εκκαθάριση της προσωρινής μνήμης"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Αναζήτηση Τηλεοπτικών Σειρών"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Επιλέξτε ροή..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Εμφάνιση πληροφοριών"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Δεν βρέθηκαν πάροχοι (providers)"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Δε βρέθηκαν σύνδεσμοι"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Αναζήτηση ταινιών"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Δεν υπάρχει ελεύθερος διαθέσιμος χώρος στη διαδρομή λήψης"
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Έγινε εκκίνηση του Quasar"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Αναζήτηση"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Δημοφιλέστερες ταινίες"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Ταινίες με τις υψηλότερες βαθμολογίες"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Ταινίες με τις περισσότερες ψήφους"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "Καλύτερες 250 ταινίες του IMDB"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Ταινίες"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "Τηλεοπτικές Σειρές"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Επικόλληση URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Επικόλληση Magnet ή URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Επόμενη σελίδα"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Προσθήκη/Διαγραφή από την ταινιοθήκη"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Δεν έχει ορισθεί διαδρομή για τη ταινιοθήκη"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Το αντικείμενο προστέθηκε στη ταινιοθήκη"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Το αντικείμενο αφαιρέθηκε από τη ταινιοθήκη"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Αρχεία"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Σφάλμα παρόχου"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Σφάλμα πλοήγησης"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Σφάλμα Daemon"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Πρόβλημα ενημέρωσης Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Διαθέσιμες ροές για"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Αναπαραγωγή / συνέχιση torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Παύση torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Διαγραφή torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Παύση συνεδρίας"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Συνέχιση συνεδρίας"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Συνέχιση torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Πρόσφατες κυκλοφορίες"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Πρόσφατες τηλεοπτικές σειρές"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Πρόσφατα Επεισόδια"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Hebrew/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Hebrew/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..ac3a677147aa451f4c2f4e6c13ac5f8c316f95a9
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Hebrew/strings.po
@@ -0,0 +1,337 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-02-10 12:19+0200\n"
+"PO-Revision-Date: 2016-02-11 08:16+0200\n"
+"Last-Translator: Assaf Sapir <meijin007@gmail.com>\n"
+"Language-Team: \n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.7\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "כללי"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "נתיב הורדה (לא FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "שמירת הקבצים בסיום הניגון/ההורדה"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "גודל הבאפר (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "קצב העלאה מרבי (kbB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "קצב הורדה מרבי (kB/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "פורט האזנה מינימלי"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "פורט האזנה מקסימלי"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "פרוקסי"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "הגדרת SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "מופעל"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "הוסט"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "פורט"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "שם משתמש"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "ססמה"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "מתקדם"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Timeout מותאם אישית"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "הפעלה (שימוש רק באחריותך)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout בשניות"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "תחזוקה"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "ניקוי מטמון"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "הפעלת עימוד"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "הפעלת שורת מצב מרחפת"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "בחירת מקור אוטומטית"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "הפעלת עדכוני קדם-שחרור"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "הגבלת קצבים בזמן באפרינג בלבד"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "נתיב לספריה"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "הגבלת חיבורים"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "ניהול טיפול בטורנטים ברקע"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "תדירות שמירת ההפעלה (בשניות)"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar קרס, מופעל מחדש..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "יש להפעיל את Kodi מחדש לפני השימוש ב Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "הAddon יכול לפעול רק מתוך Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "אין אפשרות למצוא את קובץ ההרצה של Quasar"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "הכנסת נתיב לקובץ או לכתובת אינטרנט"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "כתובת אינטרנט"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "קובץ"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "הכנסת כתובת אינטרנט"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "נתיב לקובץ "
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "אישור"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "מטמון נוקה"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "חיפוש תוכנית טלוויזיה"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "בחירת מקור..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "הצגת מידע"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "לא נצא אף Provider"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "לא נמצאו קישורים"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "חיפוש סרט"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "אין מספיק מקום בנתיב ההורדה."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "שירות Quasar הופעל"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "חיפוש"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "הכי פופלאריים"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "מדורגים הכי גבוה"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "הכי הרבה הצבעות"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "סרטים"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "תוכניות טלוויזיה"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "הוספת טורנט"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "הדבקת קישור Magnet או כתובת אינטרנט"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "עמוד הבא"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "הוספה/הסרה מהספרייה"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "נתיב הספרייה לא מוגדר"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "פריט הוסף בהצלחה לספרייה"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "פריט הוסר בהצלחה מהספרייה"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "קבצים"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "שגיאת Provider"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "שגיאת ניווט"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "שגיאת שרת"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "שגיאה בעדכון של שרת Quasar"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "מקורות זמינים עבור"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "טורנטים"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "ניגון/המשך טורנט"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "השהיית טורנט"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "מחיקת טורנט"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "השהיית פעולה"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "המשך פעולה"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "המשך טורנט"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "שוחררו לאחרונה"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "תוכניות טלוויזיה אחרונות"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "פרקים אחרונים"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Italian/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Italian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..3738225fc53b93bf86855539dc7544f7551b0f31
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Italian/strings.po
@@ -0,0 +1,281 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2016-01-27 19:53+0200\n"
+"PO-Revision-Date: 2016-02-09 22:14+0200\n"
+"Last-Translator: greenbaburu <pigiard@gmail.com>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "Generale"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Percorso di archiviazione (non FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Archivia i file dopo la riproduzione / download"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Dimensione buffer (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Velocità massima di upload (kbB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Velocità massima di download (kB/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Porta in ascolto min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Porta in ascolto max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "Configurazione SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Abilita"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Porta"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Login"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Password"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Avanzato"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Imposta tempo limite del provider"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Abilita (utilizza a tuo rischio)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Tempo limite in secondi"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Manutenzione"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Svuota cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Abilita impaginazione"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Abilita stato in sovraimpressione"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Scegli fonte automaticamente"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Abilita aggiornamenti di anteprime"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Limita banda dopo il buffering"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Percorso libreria"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Limite connessioni"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Gestione dei torrent in background"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Frequenza di salvataggio sessione (secondi)"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar si è interrotto, sta riavviando..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Riavvia Kodi prima di usare Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Questo add-on funziona solo con Quasar avviato"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache svuotata"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Cerca serie TV"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Scegli fonte..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Visualizza informazioni"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Nessun provider è stato trovato"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Nessun collegamento trovato"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Cerca film"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Spazio nel percorso di archiviazione insufficiente."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Il daemon di Quasar si è avviato"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Cerca"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Più popolari"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Miglior voto"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Più votati"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "Migliori 250 di IMDB"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Film"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "Serie TV"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Incolla URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Incolla magnet o URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Prossima pagina"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Aggiungi / Rimuovi dalla Libreria"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Percorso libreria non impostato"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Oggetto aggiunto alla libreria con successo"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Oggetto rimosso dalla libreria"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "File"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Errore del provider"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Errore di navigazione"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Errore del Daemon"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Errore aggiornamento Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Stream disponibile per"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrent"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Avvia / riprendi torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Sospendi torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Elimina torrent"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Portuguese (Brazil)/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Portuguese (Brazil)/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..808ac665cfe35f662c3e4c4bde8b2d2f5b273096
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Portuguese (Brazil)/strings.po	
@@ -0,0 +1,335 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+
+msgctxt "#30000"
+msgid "General"
+msgstr "Geral"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Pasta de download (menos FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Manter arquivos após o fim do download/reprodução"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Tamanho do buffer (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Taxa de upload máx. (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Taxa de download máx. (kB/S)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Porta mín."
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Porta máx."
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "Configuração SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Habilitado"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Porta"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Login"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Senha"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Avançado"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Tempo limite do provedor"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Habilitado (use por sua conta e risco)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Tempo limite em segundos"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Manutenção"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Apagar cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Ativar paginação"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Permitir status sobreposto"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Escolher fonte automaticamente"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Receber atualizações de pré-lançamentos"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Limitar taxas apenas ao completar o buffer"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Pasta da biblioteca"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Limite de conexões"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Baixar torrents em segundo plano"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Frequência de salvamento da sessão (segundos)"
+
+# Interface
+
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar parou de funcionar. Reiniciando..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Você precisa reiniciar o Kodi antes de usar o Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Este addon só pode ser executado pelo Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Não foi possível encontrar o programa Quasar"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Insira arquivo ou URL"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "Arquivo"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Insira a URL"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "Pasta do arquivo"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "OK"
+
+# Quasar daemon
+
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache apagado"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Pesquisar Séries"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Escolher fonte..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Mostrar informação"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Não foi possível encontrar provedores"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Nenhum link foi encontrado"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Pesquisar Filmes"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Não há espaço suficiente na pasta de download."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "O serviço Quasar iniciou"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Pesquisar"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Mais Populares"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Melhores Avaliados"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Mais Votados"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Filmes"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "Séries"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Inserir URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Inserir Magnet ou URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Próxima página"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Adicionar / Remover da biblioteca"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Pasta da biblioteca não definida"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Item adicionado à biblioteca"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Item removido da biblioteca"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Arquivos"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Erro no provedor"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Erro na navegação"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Erro no serviço"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Erro ao atualizar o serviço Quasar"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Fontes disponíveis para"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Reproduzir / retomar torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pausar torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Apagar torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pausar sessão"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Retomar sessão"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Retomar torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Lançados Recentemente"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Séries Recentes"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Episódios Recentes"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Portuguese/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Portuguese/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..b1180d052c89e333cba5574f5cfb0da3085af077
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Portuguese/strings.po
@@ -0,0 +1,333 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2016-02-10 12:40+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.6\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "Geral"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Pasta de download (não FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Manter ficheiros depois da reprodução/download parar"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Tamanho do buffer (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Taxa máxima de upload (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Taxa máxima de download (kB/S)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Porta Min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Porta Max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "Configuração SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Activo"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Porta"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Login"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Password"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Avançado"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Timeout do provedor"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Activo (use à sua responsabilidade)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout em segundos"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Manutenção"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Apagar cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Activar paginação"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Activar barra de estado sobreposta"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Escolher stream automaticamente"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Obter updates de teste"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Limitar taxas apenas depois do buffering"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Pasta da biblioteca"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Limite de conexões"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Manuseio de torrents em segundo plano"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Frequência de gravação da sessão (segundos)"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar fechou de forma inesperada, a reiniciar..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Deve reiniciar o Kodi antes de usar o Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Este addon apenas pode ser corrido pelo Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Binario do Quasar não encontrado"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Inserir ficheiro ou URL"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "Ficheiro"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Inserir URL:"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "Caminho do ficheiro:"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "OK"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache apagada"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Pesquisar Séries"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Escolher stream..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Mostrar informação"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Não foi possível encontrar provedores"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Não foram encontrados links"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Pesquisar Filmes"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Sem espaço disponível na pasta de download."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Foi iniciado o Quasar daemon"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Pesquisar"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Mais Populares"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Melhor Votados"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Mais Votados"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Filmes"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "Séries"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Inserir URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Insira o Magnet ou URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Próxima página"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Adicionar/Remover da biblioteca"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Pasta da biblioteca não definida"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Item adicionado à biblioteca"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Item removido da biblioteca"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Ficheiros"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Erro de provedor"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Erro de navegação"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Erro do daemon"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Erro ao actualizar o Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Streams disponiveis para"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Reproduzir/Retomar torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pausar torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Apagar torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pausar sessão"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Retomar sessão"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Retomar torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Lançamentos Recentes"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Séries Recentes"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Episódios Recentes"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Romanian/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Romanian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..5acafff2b3c214174c976cab277ed034806e4f76
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Romanian/strings.po
@@ -0,0 +1,200 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2016-02-02 06:24-0500\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.6\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "General"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Calea spre descarcare (NU FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Pastreaza fisierele dupa reproducere"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Marime buffer (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Rata Maxima Upload (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Rata Maxima Download (kB/S)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Asculta Port Min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Asculta Port Max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "Configurare SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Activat"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Login"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Parola"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Avansat"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Timeout Provider"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Activat (utilizati la risc propriu)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout in secunde"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Mentenenta"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Sterge cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Activeaza Paginare"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Activeaza Bara de Stare"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar a intampinat probleme, se reporneste..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "E necesar sa restartati Kodi inainte de utilizare Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Acest addon poate fi rulat doar din Quasar"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache-ul a fost sters"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Cauta TV Shows"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Alege Stream..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Arată informații"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Nu a fost gasit nici un provider"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Nu a fost gasit nici un link"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Cauta filme"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Loc insuficient in calea pentru download."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar a startat"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Cauta"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Cele Mai Populare"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Cele Mai Apreciate"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Cele Mai Votate"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Filme"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "TV Shows"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Insereaza URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Insereaza Magnet sau URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Pagina Urmatoare"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Russian/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Russian/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..fa4237fd215d2e45424e320437fc5114804048c5
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Russian/strings.po
@@ -0,0 +1,312 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2016-02-07 12:27+03:00\n"
+"PO-Revision-Date: 2016-02-08 18:13+03:00\n"
+"Last-Translator: razer1s <ymychka@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+
+msgctxt "#30000"
+msgid "General"
+msgstr "Общие"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Путь для скачивания (кроме FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Сохранять файлы после остановки воспроизвидения/загрузки"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Размер буфера (МБ)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Максимальная скорость отдачи (кБ/с)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Максимальная скорость скачивания (кБ/с)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Порт (мин)"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Порт (макс)"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Прокси"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Включить"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Хост"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Порт"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Логин"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Пароль"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Дополнительно"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Пользовательский тайм-аут провайдера"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Включить (используйте на ваш риск)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Тайм-аут в секундах"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Обслуживание"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Очистить кеш"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Включить нумерацию страниц"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Включить overlay статус"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Выбирать торрент автоматически"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Получать обновления для пре-релизов"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Ограничить скорость только после буферизации"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Папка библиотеки"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Лимит подключений"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Фоновая обработка торрентов"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Частота сохранений в сессии (сек.)"
+
+# Interface
+
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Упс, перезапуск..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Перезапустите Kodi"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Это расширение можно запустить только через Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Quasar binary не найден"
+
+# Quasar daemon
+
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Кеш очищен"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Искать сериал"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Выбрать стрим..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Инфо"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Нет провайдеров"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Стримы не найдены"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Искать фильм"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Недостаточно места в папке для скачивания."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar daemon запустился"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Поиск"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Самые популярные"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "С лучшим рейтингом"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Самые оцениваемые"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Топ 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Фильмы"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "Сериалы"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Вставить URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Вставить Magnet или URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Следующая страница"
+
+msgctxt "#30219"
+msgid "Add/Remove from library"
+msgstr "Добавить/Удалить с библиотеки"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Путь к библиотеке не назначен"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Обьект успешно добавлен в библиотеку"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Обьект удален с библиотеки"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Файлы"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Ошибка провайдера"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Ошибка навигации"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Ошибка Quasar daemon"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Ошибка обновления Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Доступные торренты |"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Торренты"
+
+msgctxt "#30230"
+msgid "Play/resume torrent"
+msgstr "Играть/возобновить торрент"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Остановить торрент"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Удалить торрент"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Остановить сессию"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Возобновить сессию"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Возобновить торрент"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Новинки"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Новинки"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Новые эпизоды"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Slovak/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Slovak/strings.po
new file mode 100644
index 0000000000000000000000000000000000000000..301d0f0180932636d54bcecde2982583ae90ae21
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Slovak/strings.po
@@ -0,0 +1,336 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2016-02-06 16:35+01:00\n"
+"PO-Revision-Date:  2016-02-10 14:35+01:00\n"
+"Last-Translator: Sonics007 <krizo.ladislav@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+
+msgctxt "#30000"
+msgid "General"
+msgstr "Všeobecné"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Download cesta (nie FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Ponechať súbor po prehratí/stiahnutí"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Veľkosť dočasnej pamäte (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Max hodnota odosielania (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Max hodnota sťahovania (kB/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Listen port min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Listen port max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "SOCKS v5 konfigurácia"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "povolené"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Meno"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Heslo"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Pokročilé"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Vlastný timeout providera"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Povoliť (iba na vlastné riziko)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout v sekundách"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Údržba"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Vymazať cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Zapnúť stránkovanie"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Povoliť status prekrytia"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Automatický výber streamu"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Získať aktualizácie z pre-release"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Limit hodnôt iba po bufferingu"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Adresa knižnice"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Limit pripojenia"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Spracavanie torrentov na pozadí"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Frekvencia ukladania relácie (seconds)"
+
+# Interface
+
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar spadol, reštartovanie..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Prosím reštartujte Kodi pred spustením Qualsara"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Tento doplnok je možné spustiť len cez Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Quasar binary nenájdený"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Vložit súbor alebo URL adresu"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL adresa"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "Súbor"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Vložiť url adresu"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "cesta k súboru"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "Potvrdiť"
+
+# Quasar daemon
+
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache vymazaná"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Vyhľadať TV seriál"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Vybrať stream..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Zobraz informácie"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Žiaden provider najdený"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "Žiadne linky najdené"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Vyhľadat filmy"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Nedostatok miesta pre uloženie ."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar daemon sa práve spustil"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Vyhľadať"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Najpopulárnejšie filmyr"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Filmy s najvačším hodnotením"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Filmy s najvačším hlasovním"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Filmy"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "TV seriály"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Vložit URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Vložiť Magnet alebo URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Ďaľšia strana"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Pridať/Odobrať z knižnice"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Cesta knižnice nenastavená"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Objekt úspenšne pridaný do knižnice"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Objekt odstránený z knižnice"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Súbory"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Chyba providera"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Chyba navigacie"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Chyba daemona "
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Chyba updatovania Quasar daemona"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Dostupné streamy pre"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrenty"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Prehrať/pokračovať torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pozastaviť torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Vymazať torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pozastaviť reláciu"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Obnoviť reláciu"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "obnovit torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Nedávno vydané"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Aktuálne Seriály"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Aktuálne Epizódy"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Spanish (Mexico)/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Spanish (Mexico)/strings.po
new file mode 100755
index 0000000000000000000000000000000000000000..3497bd6485e2a6f7d064dbc5e3461386e7d26d85
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Spanish (Mexico)/strings.po	
@@ -0,0 +1,335 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+
+msgctxt "#30000"
+msgid "General"
+msgstr "General"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Ruta para descargar (NO FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Mantener archivos después de reproducirlos"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Tamaño buffer (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Tasa máxima de upload (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Tasa máxima de download (kB/S)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Puerto min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Puerto max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "Configuración SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Activado"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Puerto"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Usuario"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Clave"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Avanzado"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Timeout provider"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Activado (use bajo su responsabilidad)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout en segundos"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Borrar cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Activar paginación"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Activar barra de estado"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Seleccionar fuente automáticamente"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Obtener actualizaciones de pre-releases"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Limitar tasas después de hacer buffering"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Ruta de la librería"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Límite de conexiones"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Procesar torrents en segundo plano"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Frecuencia para grabar sesiones (segundos)"
+
+# Interface
+
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar se ha cerrado insperadamente, reiniciando..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Debe reiniciar Kodi antes de usar Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Este complemento solo puede ser utilizado desde Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "No se ha encontrado el binario de Quasar"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Insertar archivo o URL"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "Archivo"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Insertar URL"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "Ruta del archivo"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "OK"
+
+# Quasar daemon
+
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "El cache se ha borrado"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Buscar Series de TV"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Seleccione fuente..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Mostrar información"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "No se han encontrado providers"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "No se han encontrado fuentes"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Buscar Películas"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "No hay suficiente espacio disponible en la ruta de descarga."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar daemon ha iniciado"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Buscar"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Más Populares"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Más Valoradas"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Más Votadas"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Películas"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "Series de TV"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Insertar URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Ingresar Magnet o URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Siguiente página"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Agregar / Eliminar de librería"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "No se ha configurado la ruta de la librería"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Se agregado correctamente a la librería"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Se ha eliminado de la librería"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Archivos"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Error del provider"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Error de navegación"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Error del daemon"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Error al actualizar Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Fuentes disponibles para"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Reproducir / resumir torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pausar torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Borrar torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pausar sesión"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Resumir sesión"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Resumir torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Lanzadas recientemente"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Series Recientes"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Episodios Recientes"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Spanish/strings.po b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Spanish/strings.po
new file mode 100755
index 0000000000000000000000000000000000000000..70437cc335b4538c34871e94d3a44b74c3665a1b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/Spanish/strings.po
@@ -0,0 +1,335 @@
+# Kodi Media Center language file
+# Addon Name: Quasar
+# Addon id: plugin.video.quasar
+# Addon Provider: steeve
+msgid ""
+msgstr ""
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# Settings
+
+msgctxt "#30000"
+msgid "General"
+msgstr "General"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Ruta para descargar (NO FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Mantener archivos después de reproducirlos"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Tamaño buffer (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Tasa máxima de upload (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Tasa máxima de download (kB/S)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Puerto min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Puerto max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "Configuración SOCKS v5"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Activado"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Puerto"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Usuario"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Clave"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Avanzado"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Timeout provider"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Activado (use bajo su responsabilidad)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout en segundos"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Borrar cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Activar paginación"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Activar barra de estado"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Seleccionar fuente automáticamente"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Obtener actualizaciones de pre-releases"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Limitar tasas después de hacer buffering"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Ruta de la librería"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Límite de conexiones"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Procesar torrents en segundo plano"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Frecuencia para grabar sesiones (segundos)"
+
+# Interface
+
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar se ha cerrado insperadamente, reiniciando..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "Debe reiniciar Kodi antes de usar Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "Este complemento solo puede ser utilizado desde Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "No se ha encontrado el binario de Quasar"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Insertar archivo o URL"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "Archivo"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Insertar URL"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "Ruta del archivo"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "OK"
+
+# Quasar daemon
+
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "El cache se ha borrado"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Buscar Series de TV"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Seleccione fuente..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Mostrar información"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "No se han encontrado providers"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "No se han encontrado fuentes"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Buscar Películas"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "No hay suficiente espacio disponible en la ruta de descarga."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar daemon ha iniciado"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Buscar"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Más Populares"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Más Valoradas"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Más Votadas"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Películas"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "Series de TV"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Insertar URL"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Ingresar Magnet o URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Siguiente página"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Agregar / Eliminar de librería"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "No se ha configurado la ruta de la librería"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Se agregado correctamente a la librería"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Se ha eliminado de la librería"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Archivos"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Error del provider"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Error de navegación"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Error del daemon"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Error al actualizar Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Fuentes disponibles para"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Reproducir / resumir torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pausar torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Borrar torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pausar sesión"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Resumir sesión"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Resumir torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Lanzadas recientemente"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Series Recientes"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Episodios Recientes"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/messages.pot b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/messages.pot
new file mode 100644
index 0000000000000000000000000000000000000000..2da5fa619150638f63cf2d0659ad962622dcbf1b
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/language/messages.pot
@@ -0,0 +1,337 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-27 19:53+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# Settings
+msgctxt "#30000"
+msgid "General"
+msgstr "General"
+
+msgctxt "#30001"
+msgid "Download path (not FAT32)"
+msgstr "Download path (not FAT32)"
+
+msgctxt "#30002"
+msgid "Keep files after playback/download stops"
+msgstr "Keep files after playback/download stops"
+
+msgctxt "#30003"
+msgid "Buffer size (MB)"
+msgstr "Buffer size (MB)"
+
+msgctxt "#30004"
+msgid "Max upload rate (kB/s)"
+msgstr "Max upload rate (kB/s)"
+
+msgctxt "#30005"
+msgid "Max download rate (kB/s)"
+msgstr "Max download rate (kB/s)"
+
+msgctxt "#30006"
+msgid "Listen port min"
+msgstr "Listen port min"
+
+msgctxt "#30007"
+msgid "Listen port max"
+msgstr "Listen port max"
+
+msgctxt "#30008"
+msgid "Proxy"
+msgstr "Proxy"
+
+msgctxt "#30009"
+msgid "SOCKS v5 Configuration"
+msgstr "SOCKS v5 Configuration"
+
+msgctxt "#30010"
+msgid "Enabled"
+msgstr "Enabled"
+
+msgctxt "#30011"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30012"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "#30013"
+msgid "Login"
+msgstr "Login"
+
+msgctxt "#30014"
+msgid "Password"
+msgstr "Password"
+
+msgctxt "#30015"
+msgid "Advanced"
+msgstr "Advanced"
+
+msgctxt "#30016"
+msgid "Custom provider timeout"
+msgstr "Custom provider timeout"
+
+msgctxt "#30017"
+msgid "Enabled (use at your own risk)"
+msgstr "Enabled (use at your own risk)"
+
+msgctxt "#30018"
+msgid "Timeout in seconds"
+msgstr "Timeout in seconds"
+
+msgctxt "#30019"
+msgid "Maintenance"
+msgstr "Maintenance"
+
+msgctxt "#30020"
+msgid "Clear cache"
+msgstr "Clear cache"
+
+msgctxt "#30021"
+msgid "Enable pagination"
+msgstr "Enable pagination"
+
+msgctxt "#30022"
+msgid "Enable overlay status"
+msgstr "Enable overlay status"
+
+msgctxt "#30023"
+msgid "Choose stream automatically"
+msgstr "Choose stream automatically"
+
+msgctxt "#30024"
+msgid "Get updates for pre-releases"
+msgstr "Get updates for pre-releases"
+
+msgctxt "#30025"
+msgid "Limit rates after buffering only"
+msgstr "Limit rates after buffering only"
+
+msgctxt "#30026"
+msgid "Library path"
+msgstr "Library path"
+
+msgctxt "#30027"
+msgid "Connections limit"
+msgstr "Connections limit"
+
+msgctxt "#30028"
+msgid "Background handling of torrents"
+msgstr "Background handling of torrents"
+
+msgctxt "#30029"
+msgid "Session saving frequency (seconds)"
+msgstr "Session saving frequency (seconds)"
+
+# Interface
+msgctxt "#30100"
+msgid "Quasar has crashed, restarting..."
+msgstr "Quasar has crashed, restarting..."
+
+msgctxt "#30101"
+msgid "You must restart Kodi before using Quasar"
+msgstr "You must restart Kodi before using Quasar"
+
+msgctxt "#30102"
+msgid "This add-on can only be run from within Quasar"
+msgstr "This add-on can only be run from within Quasar"
+
+msgctxt "#30103"
+msgid "Unable to find Quasar binary"
+msgstr "Unable to find Quasar binary"
+
+msgctxt "#30104"
+msgid "Insert file or URL"
+msgstr "Insert file or URL"
+
+msgctxt "#30105"
+msgid "URL"
+msgstr "URL"
+
+msgctxt "#30106"
+msgid "File"
+msgstr "File"
+
+msgctxt "#30107"
+msgid "Insert URL"
+msgstr "Insert URL"
+
+msgctxt "#30108"
+msgid "File path"
+msgstr "File path"
+
+msgctxt "#30109"
+msgid "OK"
+msgstr "OK"
+
+# Quasar daemon
+msgctxt "#30200"
+msgid "Cache cleared"
+msgstr "Cache cleared"
+
+msgctxt "#30201"
+msgid "Search TV Shows"
+msgstr "Search TV Shows"
+
+msgctxt "#30202"
+msgid "Choose stream..."
+msgstr "Choose stream..."
+
+msgctxt "#30203"
+msgid "Show information"
+msgstr "Show information"
+
+msgctxt "#30204"
+msgid "Unable to find any providers"
+msgstr "Unable to find any providers"
+
+msgctxt "#30205"
+msgid "No links were found"
+msgstr "No links were found"
+
+msgctxt "#30206"
+msgid "Search Movies"
+msgstr "Search Movies"
+
+msgctxt "#30207"
+msgid "Not enough space available on the download path."
+msgstr "Not enough space available on the download path."
+
+msgctxt "#30208"
+msgid "Quasar daemon has started"
+msgstr "Quasar daemon has started"
+
+msgctxt "#30209"
+msgid "Search"
+msgstr "Search"
+
+msgctxt "#30210"
+msgid "Most Popular"
+msgstr "Most Popular"
+
+msgctxt "#30211"
+msgid "Top Rated"
+msgstr "Top Rated"
+
+msgctxt "#30212"
+msgid "Most Voted"
+msgstr "Most Voted"
+
+msgctxt "#30213"
+msgid "IMDB Top 250"
+msgstr "IMDB Top 250"
+
+msgctxt "#30214"
+msgid "Movies"
+msgstr "Movies"
+
+msgctxt "#30215"
+msgid "TV Shows"
+msgstr "TV Shows"
+
+msgctxt "#30216"
+msgid "Add Torrent"
+msgstr "Add Torrent"
+
+msgctxt "#30217"
+msgid "Paste Magnet or URL"
+msgstr "Paste Magnet or URL"
+
+msgctxt "#30218"
+msgid "Next page"
+msgstr "Next page"
+
+msgctxt "#30219"
+msgid "Add / Remove from library"
+msgstr "Add / Remove from library"
+
+msgctxt "#30220"
+msgid "Library path not set"
+msgstr "Library path not set"
+
+msgctxt "#30221"
+msgid "Item successfully added to library"
+msgstr "Item successfully added to library"
+
+msgctxt "#30222"
+msgid "Item removed from library"
+msgstr "Item removed from library"
+
+msgctxt "#30223"
+msgid "Files"
+msgstr "Files"
+
+msgctxt "#30224"
+msgid "Provider error"
+msgstr "Provider error"
+
+msgctxt "#30225"
+msgid "Navigation error"
+msgstr "Navigation error"
+
+msgctxt "#30226"
+msgid "Daemon error"
+msgstr "Daemon error"
+
+msgctxt "#30227"
+msgid "Error updating Quasar daemon"
+msgstr "Error updating Quasar daemon"
+
+msgctxt "#30228"
+msgid "Available streams for"
+msgstr "Available streams for"
+
+msgctxt "#30229"
+msgid "Torrents"
+msgstr "Torrents"
+
+msgctxt "#30230"
+msgid "Play / resume torrent"
+msgstr "Play / resume torrent"
+
+msgctxt "#30231"
+msgid "Pause torrent"
+msgstr "Pause torrent"
+
+msgctxt "#30232"
+msgid "Delete torrent"
+msgstr "Delete torrent"
+
+msgctxt "#30233"
+msgid "Pause session"
+msgstr "Pause session"
+
+msgctxt "#30234"
+msgid "Resume session"
+msgstr "Resume session"
+
+msgctxt "#30235"
+msgid "Resume torrent"
+msgstr "Resume torrent"
+
+msgctxt "#30236"
+msgid "Recently Released"
+msgstr "Recently Released"
+
+msgctxt "#30237"
+msgid "Recent Shows"
+msgstr "Recent Shows"
+
+msgctxt "#30238"
+msgid "Recent Episodes"
+msgstr "Recent Episodes"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/settings.xml b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bd1822b812a41ce632aa8d96b2c9344e8eb34c13
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/settings.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+    <category label="30000">
+        <!-- General -->
+        <setting label="30000" type="lsep" />
+        <setting id="download_path" type="folder" label="30001" source="auto" option="writeable" />
+        <setting id="library_path" type="folder" label="30026" source="auto" option="writeable" />
+        <setting id="background_handling" type="bool" label="30028" default="true" />
+        <setting id="keep_files" type="bool" label="30002" default="false" />
+        <setting id="enable_pagination" type="bool" label="30021" default="true" />
+        <setting id="enable_overlay_status" type="bool" label="30022" default="true" />
+        <setting id="choose_stream_auto" type="bool" label="30023" default="true" />
+        <setting id="pre_release_updates" type="bool" label="30024" default="false" />
+
+        <setting label="BitTorrent" type="lsep"/>
+        <setting id="buffer_size" label="30003" type="number" default="20" />
+        <setting id="max_upload_rate" label="30004" type="number" default="" />
+        <setting id="max_download_rate" label="30005" type="number" default="" />
+        <setting id="limit_after_buffering" label="30025" type="bool" default="false" />
+        <setting id="connections_limit" label="30027" type="number" default="" />
+        <setting id="session_save" label="30029" type="number" default="15" />
+        <setting id="listen_port_min" label="30006" type="number" default="6889" />
+        <setting id="listen_port_max" label="30007" type="number" default="7000" />
+    </category>
+    <category label="30008">
+        <!-- Proxy -->
+        <setting label="30009" type="lsep"/>
+        <setting id="socks_enabled" label="30010" type="bool" default="false" />
+        <setting id="socks_host" label="30011" type="text" default="" subsetting="true" visible="eq(-1,true)" />
+        <setting id="socks_port" label="30012" type="number" default="1080" subsetting="true" visible="eq(-2,true)" />
+        <setting id="socks_login" label="30013" type="text" default="" subsetting="true" visible="eq(-3,true)" />
+        <setting id="socks_password" label="30014" type="text" default="" option="hidden" subsetting="true" visible="eq(-4,true)" />
+    </category>
+    <category label="30015">
+        <!-- Advanced -->
+        <setting label="30016" type="lsep"/>
+        <setting id="custom_provider_timeout_enabled" label="30017" type="bool" default="false" />
+        <setting id="custom_provider_timeout" label="30018" type="number" default="4" visible="eq(-1,true)" />
+        <setting label="30019" type="lsep"/>
+        <setting type="action" label="30020" action="RunPlugin(plugin://plugin.video.quasar/cmd/clear_cache)" />
+    </category>
+</settings>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/__init__.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/__init__.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..2370b35a16e80e970ef365c07b08857e8854f3df
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/__init__.py
@@ -0,0 +1,46 @@
+# Copyright (c) 2010 David Martinez Marti
+# All rights reserved.
+#
+# Licensed under 3-clause BSD License.
+# See LICENSE.txt for the full license text.
+
+
+__version__ = '0.2'
+"""Version number of the library as a string with the format X.Y"""
+
+__release__ = '0.2.1'
+"""Release number of the library as a string with the format X.Y.Z"""
+
+
+__all__ = [  # NOQA
+    "createserver",
+    "connect",
+    "server",
+    "connection",
+    "request",
+    "handlers",
+    "proxies",
+    "jsonlib",
+    "exceptions"
+]
+
+bjsonrpc_options = {
+    'threaded': False
+}
+"""
+Dictionary with global options for the library.
+
+**threaded**
+    (Default: False) When is set to True, threads will be created for handling
+    each incoming item.
+
+"""
+from bjsonrpc.main import createserver, connect
+
+import bjsonrpc.server
+import bjsonrpc.connection
+import bjsonrpc.request
+import bjsonrpc.handlers
+import bjsonrpc.proxies
+import bjsonrpc.jsonlib
+import bjsonrpc.exceptions  # NOQA
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/connection.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/connection.py
new file mode 100644
index 0000000000000000000000000000000000000000..d9d753c432232bbbd4e18e797309b014ff38e99f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/connection.py
@@ -0,0 +1,899 @@
+"""
+    bjson/connection.py
+
+    Asynchronous Bidirectional JSON-RPC protocol implementation over TCP/IP
+
+    Copyright (c) 2010 David Martinez Marti
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of copyright holders nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+"""
+# Local changes:
+
+import errno
+import logging
+import inspect
+import socket
+import traceback
+import sys
+import threading
+from types import MethodType, FunctionType
+
+from bjsonrpc.proxies import Proxy
+from bjsonrpc.request import Request
+from bjsonrpc.exceptions import EofError, ServerError
+from bjsonrpc import bjsonrpc_options
+
+import bjsonrpc.jsonlib as json
+import select
+
+
+_log = logging.getLogger(__name__)
+
+
+class RemoteObject(object):
+    """
+        Represents a object in the server-side (or client-side when speaking from
+        the point of view of the server) . It remembers its name in the server-side
+        to allow calls to the original object.
+
+        Parameters:
+
+        **conn**
+            Connection object which holds the socket to the other end
+            of the communications
+
+        **obj**
+            JSON object (Python dictionary) holding the values recieved.
+            It is used to retrieve the properties to create the remote object.
+            (Initially only used to get object name)
+
+        Example::
+
+            list = conn.call.newList()
+            for i in range(10): list.notify.add(i)
+
+            print list.call.getitems()
+
+        Attributes:
+
+        **name**
+            name of the object in the server-side
+
+        **call**
+            Synchronous Proxy. It forwards your calls to it to the other end, waits
+            the response and returns the value.
+
+        **method**
+            Asynchronous Proxy. It forwards your calls to it to the other end and
+            inmediatelly returns a *request.Request* instance.
+
+        **pipe**
+            Asynchronous Proxy for "pipe" calls with multiple returns, like
+            method but you can check request.value multiple times, and must
+            call request.close() when you're done.
+
+        **notify**
+            Notification Proxy. It forwards your calls to it to the other end and
+            tells the server to not response even if there's any error in the call.
+            Returns *None*.
+
+
+    """
+
+    name = None
+    call = None
+    method = None
+    notify = None
+    pipe = None
+
+    @property
+    def connection(self):
+        """
+            Public property to get the internal connection object.
+        """
+        return self._conn
+
+    def __init__(self, conn, obj):
+        self._conn = conn
+        self.name = obj['__remoteobject__']
+
+        self.call = Proxy(self._conn, obj=self.name, sync_type=0)
+        self.method = Proxy(self._conn, obj=self.name, sync_type=1)
+        self.notify = Proxy(self._conn, obj=self.name, sync_type=2)
+        self.pipe = Proxy(self._conn, obj=self.name, sync_type=3)
+
+    def __del__(self):
+        self._close()
+
+    def _close(self):
+        """
+            Internal close method called both by __del__() and public
+            method close()
+        """
+        self.call.__delete__()
+        self.name = None
+
+    def close(self):
+        """
+            Closes/deletes the remote object. The server may or may not delete
+            it at this time, but after this call we don't longer have any access to it.
+
+            This method is automatically called when Python deletes this instance.
+        """
+        return self._close()
+
+
+class Connection(object):  # TODO: Split this class in simple ones
+    """
+        Represents a communiation tunnel between two parties.
+
+        **sck**
+            Connected socket to use. Should be an instance of *socket.socket* or
+            something compatible.
+
+        **address**
+            Address of the other peer in (host,port) form. It is only used to
+            inform handlers about the peer address.
+
+        **handler_factory**
+            Class type inherited from BaseHandler which holds the public methods.
+            It defaults to *NullHandler* meaning no public methods will be
+            avaliable to the other end.
+
+        **Members:**
+
+        **call**
+            Synchronous Proxy. It forwards your calls to it to the other end, waits
+            the response and returns the value
+
+        **method**
+            Asynchronous Proxy. It forwards your calls to it to the other end and
+            inmediatelly returns a *request.Request* instance.
+
+        **notify**
+            Notification Proxy. It forwards your calls to it to the other end and
+            tells the server to not response even if there's any error in the call.
+            Returns *None*.
+
+    """
+    _maxtimeout = {
+        'read': 60,    # default maximum read timeout.
+        'write': 60,   # default maximum write timeout.
+    }
+
+    _SOCKET_COMM_ERRORS = (errno.ECONNABORTED, errno.ECONNREFUSED,
+                           errno.ECONNRESET, errno.ENETDOWN,
+                           errno.ENETRESET, errno.ENETUNREACH)
+
+    call = None
+    method = None
+    notify = None
+    pipe = None
+
+    @classmethod
+    def setmaxtimeout(cls, operation, value):
+        """
+            Set the maximum timeout in seconds for **operation** operation.
+
+            Parameters:
+
+            **operation**
+                The operation which has to be configured. Can be either 'read'
+                or 'write'.
+
+            **value**
+                The timeout in seconds as a floating number. If is None, will
+                block until succeed. If is 0, will be nonblocking.
+
+        """
+        assert(operation in ['read', 'write'])
+        cls._maxtimeout[operation] = value
+
+    @classmethod
+    def getmaxtimeout(cls, operation):
+        """
+            Get the maximum timeout in seconds for **operation** operation.
+
+            Parameters:
+
+            **operation**
+                The operation which has to be configured. Can be either 'read'
+                or 'write'.
+
+            **(return value)**
+                The timeout in seconds as a floating number or None.
+
+        """
+        if operation not in cls._maxtimeout:
+            return None
+
+        return cls._maxtimeout[operation]
+
+    def __init__(self, sck, address=None, handler_factory=None):
+        self._debug_socket = False
+        self._debug_dispatch = False
+        self._buffer = b''
+        self._sck = sck
+        self._address = address
+        self._handler = handler_factory
+        self.connection_status = "open"
+        if self._handler:
+            self.handler = self._handler(self)
+
+        self._id = 0
+        self._requests = {}
+        self._objects = {}
+
+        self.scklock = threading.Lock()
+        self.call = Proxy(self, sync_type=0)
+        self.method = Proxy(self, sync_type=1)
+        self.notify = Proxy(self, sync_type=2)
+        self.pipe = Proxy(self, sync_type=3)
+        self._wbuffer = b''
+        self.write_lock = threading.RLock()
+        self.read_lock = threading.RLock()
+        self.getid_lock = threading.Lock()
+        self.reading_event = threading.Event()
+        self.threaded = bjsonrpc_options['threaded']
+        self.write_thread_queue = []
+        self.write_thread_semaphore = threading.Semaphore(0)
+        self.write_thread = threading.Thread(target=self.write_thread)
+        self.write_thread.daemon = True
+        self.write_thread.start()
+
+    @property
+    def socket(self):
+        """
+            public property that holds the internal socket used.
+        """
+        return self._sck
+
+    def get_id(self):
+        """
+            Retrieves a new ID counter. Each connection has a exclusive ID counter.
+
+            It is mainly used to create internal id's for calls.
+        """
+        self.getid_lock.acquire()
+        # Prevent two threads to execute this code simultaneously
+        self._id += 1
+        ret = self._id
+        self.getid_lock.release()
+
+        return ret
+
+    def load_object(self, obj):
+        """
+            Helper function for JSON loads. Given a dictionary (javascript object) returns
+            an apropiate object (a specific class) in certain cases.
+
+            It is mainly used to convert JSON hinted classes back to real classes.
+
+            Parameters:
+
+            **obj**
+                Dictionary-like object to test.
+
+            **(return value)**
+                Either the same dictionary, or a class representing that object.
+        """
+
+        if '__remoteobject__' in obj:
+            return RemoteObject(self, obj)
+
+        if '__objectreference__' in obj:
+            return self._objects[obj['__objectreference__']]
+
+        if '__functionreference__' in obj:
+            name = obj['__functionreference__']
+            if '.' in name:
+                objname, methodname = name.split('.')
+                obj = self._objects[objname]
+            else:
+                obj = self.handler
+                methodname = name
+            method = obj.get_method(methodname)
+            return method
+
+        return obj
+
+    def addrequest(self, request):
+        """
+            Adds a request to the queue of requests waiting for response.
+        """
+        assert(isinstance(request, Request))
+        assert(request.request_id not in self._requests)
+        self._requests[request.request_id] = request
+
+    def delrequest(self, req_id):
+        """
+            Removes a request to the queue of requests waiting for response.
+        """
+        del self._requests[req_id]
+
+    def dump_object(self, obj):
+        """
+            Helper function to convert classes and functions to JSON objects.
+
+            Given a incompatible object called *obj*, dump_object returns a
+            JSON hinted object that represents the original parameter.
+
+            Parameters:
+
+            **obj**
+                Object, class, function,etc which is incompatible with JSON
+                serialization.
+
+            **(return value)**
+                A valid serialization for that object using JSON class hinting.
+
+        """
+        # object of unknown type
+        if type(obj) is FunctionType or type(obj) is MethodType:
+            conn = getattr(obj, '_conn', None)
+            if conn != self:
+                raise TypeError("Tried to serialize as JSON a handler for "
+                                "another connection!")
+            return self._dump_functionreference(obj)
+
+        if not isinstance(obj, object):
+            raise TypeError("JSON objects must be new-style classes")
+
+        if not hasattr(obj, '__class__'):
+            raise TypeError("JSON objects must be instances, not types")
+
+        if obj.__class__.__name__ == 'Decimal':  # Probably is just a float.
+            return float(obj)
+
+        if isinstance(obj, RemoteObject):
+            return self._dump_objectreference(obj)
+
+        if hasattr(obj, 'get_method'):
+            return self._dump_remoteobject(obj)
+
+        raise TypeError("Python object %s laks a 'get_method' and "
+                        "is not serializable!" % repr(obj))
+
+    def _dump_functionreference(self, obj):
+        """ Converts obj to a JSON hinted-class functionreference"""
+        return {'__functionreference__': obj.__name__}
+
+    def _dump_objectreference(self, obj):
+        """ Converts obj to a JSON hinted-class objectreference"""
+        return {'__objectreference__': obj.name}
+
+    def _dump_remoteobject(self, obj):
+        """
+            Converts obj to a JSON hinted-class remoteobject, creating
+            a RemoteObject if necessary
+        """
+
+        # An object can be remotely called if :
+        #  - it derives from object (new-style classes)
+        #  - it is an instance
+        #  - has an internal function _get_method to handle remote calls
+        if not hasattr(obj, '__remoteobjects__'):
+            obj.__remoteobjects__ = {}
+
+        if self in obj.__remoteobjects__:
+            instancename = obj.__remoteobjects__[self]
+        else:
+            classname = obj.__class__.__name__
+            instancename = "%s_%04x" % (classname.lower(), self.get_id())
+            self._objects[instancename] = obj
+            obj.__remoteobjects__[self] = instancename
+        return {'__remoteobject__': instancename}
+
+    def _format_exception(self, obj, method, args, kw, exc):
+        etype, evalue, etb = exc
+        funargs = ", ".join(
+            [repr(x) for x in args] +
+            ["%s=%r" % (k, kw[k]) for k in kw]
+        )
+        if len(funargs) > 40:
+            funargs = funargs[:37] + "..."
+
+        _log.error("(%s) In Handler method %s.%s(%s) ",
+                   obj.__class__.__module__,
+                   obj.__class__.__name__,
+                   method,
+                   funargs)
+        _log.debug("\n".join(["%s::%s:%d %s" % (
+            filename, fnname,
+            lineno, srcline)
+            for filename, lineno, fnname, srcline
+            in traceback.extract_tb(etb)[1:]]))
+        _log.error("Unhandled error: %s: %s", etype.__name__, evalue)
+        del etb
+        return '%s: %s' % (etype.__name__, evalue)
+
+    def _dispatch_delete(self, objectname):
+        try:
+            self._objects[objectname]._shutdown()
+        except Exception:
+            _log.error("Error when shutting down the object %s:",
+                       type(self._objects[objectname]))
+            _log.debug(traceback.format_exc())
+        del self._objects[objectname]
+
+    def _extract_params(self, request):
+        req_method = request.get("method")
+        req_args = request.get("params", [])
+        if type(req_args) is dict:
+            req_kwargs = req_args
+            req_args = []
+        else:
+            req_kwargs = request.get("kwparams", {})
+        if req_kwargs:
+            req_kwargs = dict((str(k), req_kwargs[k]) for k in req_kwargs)
+        return req_method, req_args, req_kwargs
+
+    def _find_object(self, req_method, req_args, req_kwargs):
+        if '.' in req_method:  # local-object.
+            objectname, req_method = req_method.split('.')[:2]
+            if objectname not in self._objects:
+                raise ValueError("Invalid object identifier")
+            elif req_method == '__delete__':
+                self._dispatch_delete(objectname)
+            else:
+                return self._objects[objectname]
+        else:
+            return self.handler
+
+    def _find_method(self, req_object, req_method, req_args, req_kwargs):
+        """
+            Finds the method to process one request.
+        """
+        try:
+            req_function = req_object.get_method(req_method)
+            return req_function
+        except ServerError as err:
+            return str(err)
+        except Exception:
+            err = self._format_exception(req_object, req_method,
+                                         req_args, req_kwargs,
+                                         sys.exc_info())
+            return err
+
+    def dispatch_until_empty(self):
+        """
+            Calls *read_and_dispatch* method until there are no more messages to
+            dispatch in the buffer.
+
+            Returns the number of operations that succeded.
+
+            This method will never block waiting. If there aren't
+            any more messages that can be processed, it returns.
+        """
+        ready_to_read = select.select(
+            [self._sck],  # read
+            [], [],  # write, errors
+            0  # timeout
+        )[0]
+
+        if not ready_to_read:
+            return 0
+
+        newline_idx = 0
+        count = 0
+        while newline_idx != -1:
+            if not self.read_and_dispatch(timeout=0):
+                break
+            count += 1
+            newline_idx = self._buffer.find(b'\n')
+        return count
+
+    def read_and_dispatch(self, timeout=None, thread=True, condition=None):
+        """
+            Read one message from socket (with timeout specified by the optional
+            argument *timeout*) and dispatches that message.
+
+            Parameters:
+
+            **timeout** = None
+                Timeout in seconds of the read operation. If it is None
+                (or ommitted) then the read will wait
+                until new data is available.
+
+            **(return value)**
+                True, in case of the operation has suceeded and **one** message
+                has been dispatched. False, if no data or malformed data has
+                been received.
+
+        """
+        self.read_lock.acquire()
+        self.reading_event.set()
+        try:
+            if condition:
+                if condition() is False:
+                    return False
+            if thread:
+                dispatch_item = self.dispatch_item_threaded
+            else:
+                dispatch_item = self.dispatch_item_single
+
+            data = self.read(timeout=timeout)
+            if not data:
+                return False
+            try:
+                item = json.loads(data, self)
+                if type(item) is list:  # batch call
+                    for i in item:
+                        dispatch_item(i)
+                elif type(item) is dict:  # std call
+                    if 'result' in item:
+                        self.dispatch_item_single(item)
+                    else:
+                        dispatch_item(item)
+                else:  # Unknown format :-(
+                    _log.debug("Received message with unknown format type: %s", type(item))
+                    return False
+            except Exception:
+                _log.debug(traceback.format_exc())
+                return False
+            return True
+        finally:
+            self.reading_event.clear()
+            self.read_lock.release()
+
+    def dispatch_item_threaded(self, item):
+        """
+            If threaded mode is activated, this function creates a new thread per
+            each item received and returns without blocking.
+        """
+        if self.threaded:
+            th1 = threading.Thread(target=self.dispatch_item_single, args=[item])
+            th1.start()
+            return True
+        else:
+            return self.dispatch_item_single(item)
+
+    def _send(self, response):
+        txtResponse = None
+        try:
+            txtResponse = json.dumps(response, self)
+        except Exception as e:
+            _log.error("An unexpected error ocurred when trying to create the message: %r", e)
+            response = {
+                'result': None,
+                'error': "InternalServerError: " + repr(e)
+            }
+            txtResponse = json.dumps(response, self)
+        try:
+            self.write(txtResponse)
+        except TypeError:
+            _log.debug("response was: %r", response)
+            raise
+
+    def _send_response(self, item, response):
+        if item.get('id') is not None:
+            ret = {'result': response, 'error': None, 'id': item['id']}
+            self._send(ret)
+
+    def _send_error(self, item, err):
+        if item.get('id') is not None:
+            ret = {'result': None, 'error': err, 'id': item['id']}
+            self._send(ret)
+
+    def dispatch_item_single(self, item):
+        """
+            Given a JSON item received from socket, determine its type and
+            process the message.
+        """
+        assert(type(item) is dict)
+        item.setdefault('id', None)
+
+        if 'method' in item:
+            method, args, kw = self._extract_params(item)
+            obj = self._find_object(method, args, kw)
+            if obj is None:
+                return
+            fn = self._find_method(obj, method, args, kw)
+            try:
+                if inspect.isgeneratorfunction(fn):
+                    for response in fn(*args, **kw):
+                        self._send_response(item, response)
+                elif callable(fn):
+                    self._send_response(item, fn(*args, **kw))
+                elif fn:
+                    self._send_error(item, fn)
+            except ServerError as exc:
+                self._send_error(item, str(exc))
+            except Exception:
+                err = self._format_exception(obj, method, args, kw,
+                                             sys.exc_info())
+                self._send_error(item, err)
+        elif 'result' in item:
+            assert(item['id'] in self._requests)
+            request = self._requests[item['id']]
+            request.setresponse(item)
+        else:
+            self._send_error(item, 'Unknown format')
+        return True
+
+    def proxy(self, sync_type, name, args, kwargs):
+        """
+        Call method on server.
+
+        sync_type ::
+          = 0 .. call method, wait, get response.
+          = 1 .. call method, inmediate return of object.
+          = 2 .. call notification and exit.
+          = 3 .. call method, inmediate return of non-auto-close object.
+
+        """
+
+        data = {}
+        data['method'] = name
+
+        if sync_type in [0, 1, 3]:
+            data['id'] = self.get_id()
+
+        if len(args) > 0:
+            data['params'] = args
+
+        if len(kwargs) > 0:
+            if len(args) == 0:
+                data['params'] = kwargs
+            else:
+                data['kwparams'] = kwargs
+
+        if sync_type == 2:  # short-circuit for speed!
+            self.write(json.dumps(data, self))
+            return None
+
+        req = Request(self, data)
+        if sync_type == 0:
+            return req.value
+        if sync_type == 3:
+            req.auto_close = False
+        return req
+
+    def close(self):
+        """
+            Close the connection and the socket.
+        """
+        if self.connection_status == "closed":
+            return
+        item = {
+            'abort': True,
+            'event': threading.Event()
+        }
+        self.write_thread_queue.append(item)
+        self.write_thread_semaphore.release()  # notify new item.
+        item['event'].wait(1)
+        if not item['event'].isSet():
+            _log.warning("write thread doesn't process our abort command")
+        try:
+            self.handler._shutdown()
+        except Exception:
+            _log.error("Error when shutting down the handler: %s",
+                       traceback.format_exc())
+        try:
+            self._sck.shutdown(socket.SHUT_RDWR)
+        except socket.error:
+            pass
+        self._sck.close()
+        self.connection_status = "closed"
+
+    def write_line(self, data):
+        """
+            Write a line *data* to socket. It appends a **newline** at
+            the end of the *data* before sending it.
+
+            The string MUST NOT contain **newline** otherwise an AssertionError will
+            raise.
+
+            Parameters:
+
+            **data**
+                String containing the data to be sent.
+        """
+        assert('\n' not in data)
+        self.write_lock.acquire()
+        try:
+            try:
+                data = data.encode('utf-8')
+            except AttributeError:
+                pass
+            if self._debug_socket:
+                _log.debug("<:%d: %s", len(data), data.decode('utf-8')[:130])
+
+            self._wbuffer += data + b'\n'
+            sbytes = 0
+            while self._wbuffer:
+                try:
+                    sbytes = self._sck.send(self._wbuffer)
+                except IOError:
+                    _log.debug("Read socket error: IOError (timeout: %r)",
+                               self._sck.gettimeout())
+                    _log.debug(traceback.format_exc(0))
+                    return 0
+                except socket.error:
+                    _log.debug("Read socket error: socket.error (timeout: %r)",
+                               self._sck.gettimeout())
+                    _log.debug(traceback.format_exc(0))
+                    return 0
+                except:
+                    raise
+                if sbytes == 0:
+                    break
+                self._wbuffer = self._wbuffer[sbytes:]
+            if self._wbuffer:
+                _log.warning("%d bytes left in write buffer", len(self._wbuffer))
+            return len(self._wbuffer)
+        finally:
+            self.write_lock.release()
+
+    def read_line(self):
+        """
+            Read a line of *data* from socket. It removes the `\\n` at
+            the end before returning the value.
+
+            If the original packet contained `\\n`, the message will be decoded
+            as two or more messages.
+
+            Returns the line of *data* received from the socket.
+        """
+
+        self.read_lock.acquire()
+        try:
+            data = self._readn()
+            if len(data) and self._debug_socket:
+                _log.debug(">:%d: %s", len(data), data.decode('utf-8')[:130])
+            return data.decode('utf-8')
+        finally:
+            self.read_lock.release()
+
+    def settimeout(self, operation, timeout):
+        """
+            configures a timeout for the connection for a given operation.
+            operation is one of "read" or "write"
+        """
+        if operation in self._maxtimeout:
+            maxtimeout = self._maxtimeout[operation]
+        else:
+            maxtimeout = None
+
+        if maxtimeout is not None:
+            if timeout is None or timeout > maxtimeout:
+                timeout = maxtimeout
+
+        self._sck.settimeout(timeout)
+
+    def write_thread(self):
+        abort = False
+        while not abort:
+            self.write_thread_semaphore.acquire()
+            try:
+                item = self.write_thread_queue.pop(0)
+            except IndexError:  # pop from empty list?
+                _log.warning("write queue was empty??")
+                continue
+            abort = item.get("abort", False)
+            event = item.get("event")
+            write_data = item.get("write_data")
+            if write_data:
+                item["result"] = self.write_now(write_data)
+            if event:
+                event.set()
+        if self._debug_socket:
+            _log.debug("Writing thread finished.")
+
+    def write(self, data, timeout=None):
+        item = {
+            'write_data': data
+        }
+        self.write_thread_queue.append(item)
+        self.write_thread_semaphore.release()  # notify new item.
+
+    def write_now(self, data, timeout=None):
+        """
+            Standard function to write to the socket
+            which by default points to write_line
+        """
+        # self.scklock.acquire()
+        self.settimeout("write", timeout)
+        ret = None
+        # try:
+        ret = self.write_line(data)
+        # finally:
+        #     self.scklock.release()
+        return ret
+
+    def read(self, timeout=None):
+        """
+            Standard function to read from the socket
+            which by default points to read_line
+        """
+        ret = None
+        self.scklock.acquire()
+        self.settimeout("read", timeout)
+        try:
+            ret = self.read_line()
+        finally:
+            self.scklock.release()
+        return ret
+
+    def _readn(self):
+        """
+            Internal function which reads from socket waiting for a newline
+        """
+        streambuffer = self._buffer
+        pos = streambuffer.find(b'\n')
+        # _log.debug("read...")
+        # retry = 0
+        while pos == -1:
+            data = b''
+            try:
+                data = self._sck.recv(2048)
+            except IOError as inst:
+                _log.debug("Read socket error: IOError%r (timeout: %r)",
+                           inst.args, self._sck.gettimeout())
+                if inst.errno in (errno.EAGAIN, errno.EWOULDBLOCK):
+                    if self._sck.gettimeout() == 0:  # if it was too fast
+                        self._sck.settimeout(5)
+                        continue
+                        # time.sleep(0.5)
+                        # retry += 1
+                        # if retry < 10:
+                        #     _log.debug("Retry %s", retry)
+                        #     continue
+                # _log.debug(traceback.format_exc(0))
+                if inst.errno in self._SOCKET_COMM_ERRORS:
+                    raise EofError(len(streambuffer))
+
+                return b''
+            except socket.error as inst:
+                _log.error("Read socket error: socket.error%r (timeout: %r)",
+                           inst.args, self._sck.gettimeout())
+                # _log.debug(traceback.format_exc(0))
+                return b''
+            except:
+                raise
+            if not data:
+                raise EofError(len(streambuffer))
+            # _log.debug("readbuf+: %r", data)
+            streambuffer += data
+            pos = streambuffer.find(b'\n')
+
+        self._buffer = streambuffer[pos + 1:]
+        streambuffer = streambuffer[:pos]
+        # _log.debug("read: %r", buffer)
+        return streambuffer
+
+    def serve(self):
+        """
+            Basic function to put the connection serving. Usually is better to
+            use server.Server class to do this, but this would be useful too if
+            it is run from a separate Thread.
+        """
+        try:
+            while True:
+                self.read_and_dispatch()
+        finally:
+            self.close()
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/exceptions.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/exceptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..264f2b336f4c6927e5351c18a1f0728c59628f8f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/exceptions.py
@@ -0,0 +1,48 @@
+"""
+    bjson/exceptions.py
+
+    Asynchronous Bidirectional JSON-RPC protocol implementation over TCP/IP
+
+    Copyright (c) 2010 David Martinez Marti
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of copyright holders nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+"""
+class ServerError(Exception):
+    """
+        Exception raised whenever an error occurs in the other end handling
+        your request. You may create your own versions of this class to send
+        custom exceptions through RPC.
+    """
+    pass
+
+class EofError(Exception):
+    """
+        End-of-file error raised whenever the socket reaches the
+        end of the sream. In normal operation, this error never is sent to the
+        developer. If you get this error, it may be a bug.
+    """
+    pass
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/handlers.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/handlers.py
new file mode 100644
index 0000000000000000000000000000000000000000..b646a14a8623341af998cf5ca8a81bc55387ddc8
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/handlers.py
@@ -0,0 +1,180 @@
+"""
+    bjson/handlers.py
+
+    Asynchronous Bidirectional JSON-RPC protocol implementation over TCP/IP
+
+    Copyright (c) 2010 David Martinez Marti
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of copyright holders nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+"""
+import re
+from types import MethodType
+from bjsonrpc.exceptions import ServerError
+
+class BaseHandler(object):
+    """
+        Base Class to publish remote methods. It is instantiated by *Connection*.
+
+        Example::
+
+            class MyHandler(bjson.handlers.BaseHandler):
+                def _setup(self):
+                    # Initailize here.
+                    self.c = 0
+
+                def echo(self,text):
+                    print text
+                    self.c += 1
+
+                def getcount(self): return c
+
+        Other members:
+
+        **public_methods_pattern**
+            RegEx string that returns True if the method name is suitable for
+            publishing. Defaults to r'^[a-z]\w+$'
+
+        **nonpublic_methods**
+            List of string containing names that shouldn't be published (even
+            if they are in the format required by the RegEx). Defaults to
+            ["close","_factory","add_method","get_method"]
+
+    """
+
+    public_methods_pattern = r'^[a-z]\w+$'
+    # Pattern to know which methods should be automatically published
+
+    nonpublic_methods = [
+        "close",
+        "_factory",
+        "add_method",
+        "get_method",
+    ]
+    # List of method names that never should be published
+
+    @classmethod
+    def _factory(cls, *args, **kwargs):
+        """
+            *New in bjsonrpc v0.2.1*
+
+            Classmethod aimed to create flavoured instances of BaseHandler.
+            When you create a new connection you may want to give the constructor
+            a set of specific arguments. Use this classmethod to do that:
+
+                conn = bjsonrpc.connect(handler_factory=MyHandler._factory("my flavoured one"))
+
+            Later, whenever the class is instantiated, the BaseHandler.setup
+            method will receive the arguments passed to factory.
+
+            The original idea for this feature is from Paul Pietkiewicz *(pawel.pietkiewicz (at) gmail.com)*
+        """
+        def handler_factory(connection):
+            handler = cls(connection, *args, **kwargs)
+            return handler
+        return handler_factory
+
+    def __init__(self, connection, *args, **kwargs):
+        self._conn = connection
+
+        if hasattr(self._conn, "connection"):
+            self._conn = self._conn.connection
+        if hasattr(self._conn, "_conn"):
+            self._conn = self._conn._conn
+
+        self._methods = {}
+        for mname in dir(self):
+            if re.match(self.public_methods_pattern, mname):
+                function = getattr(self, mname)
+                if isinstance(function, MethodType):
+                    self.add_method(function)
+
+        self._setup(*args, **kwargs)
+
+    def _setup(self, *args, **kwargs):
+        """
+            Empty method to ease inheritance. Overload it with your needs, it
+            will be called after __init__.
+        """
+        pass
+
+    def _shutdown(self):
+        """
+            Internal method called when the handler is going to be destroyed.
+            You should add cleanup code here. Remember to call the parent
+            function.
+        """
+        self.close()
+
+    def close(self):
+        """
+            Cleans some variables before the object is freed. close is called
+            manually from connection whenever a handler is going to be deleted.
+        """
+        self._methods = {}
+        self._conn = None
+
+    def add_method(self, *args, **kwargs):
+        """
+            Porcelain for publishing methods into the handler. Is used by the
+            constructor itself to publish all non-private functions.
+        """
+        for method in args:
+            if method.__name__ in self.nonpublic_methods:
+                continue
+            try:
+                assert(method.__name__ not in self._methods)
+            except AssertionError:
+                raise NameError("Method with name %s already in the class methods!" % (method.__name__))
+            self._methods[method.__name__] = method
+
+        for name, method in kwargs.items():
+            if method.__name__ in self.nonpublic_methods:
+                continue
+            try:
+                assert(name not in self._methods)
+            except AssertionError:
+                raise NameError("Method with name %s already in the class methods!" % (method.__name__))
+
+            self._methods[name] = method
+
+    def get_method(self, name):
+        """
+            Porcelain for resolving method objects from their names. Used by
+            connections to get the apropiate method object.
+        """
+        if name not in self._methods:
+            raise ServerError("Unknown method '%s'" % name)
+
+        return self._methods[name]
+
+
+class NullHandler(BaseHandler):
+    """
+        Null version of BaseHandler which has nothing in it. Use this when you
+        don't want to publish any function.
+    """
+    pass
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/jsonlib.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/jsonlib.py
new file mode 100644
index 0000000000000000000000000000000000000000..6bc5ef36fab356c430377e06c9f6e48d1bda934f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/jsonlib.py
@@ -0,0 +1,71 @@
+"""
+    bjson/jsonlib.py
+
+    Asynchronous Bidirectional JSON-RPC protocol implementation over TCP/IP
+
+    Copyright (c) 2010 David Martinez Marti
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of copyright holders nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+"""
+try:
+    import simplejson as j
+except ImportError:
+    import json as j
+except ImportError:
+    print("FATAL: No suitable json library found!")
+    raise
+from pprint import pprint
+
+
+def dumps(argobj, conn):
+    """
+        dumps json object using loaded json library and forwards unknown objects
+        to *Connection.dumpObject* function.
+    """
+    ret = None
+    try:
+        ret = j.dumps(argobj, separators=(',', ':'), default=conn.dump_object)
+    except TypeError:
+        pprint(argobj)
+        raise
+        # raise TypeError("The Python object is not serializable to JSON!")
+    return ret
+
+def loads(argobj, conn):
+    """
+        loads json object using *Connection.load_object* to convert json hinted
+        objects to real objects.
+    """
+    ret = None
+    try:
+        ret = j.loads(argobj, object_hook=conn.load_object)
+    except ValueError:
+        pprint(argobj)
+        raise
+        # raise ValueError("The String object is not a valid JSON data!")
+
+    return ret
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/main.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/main.py
new file mode 100644
index 0000000000000000000000000000000000000000..28bc8b5dcbadb4f8799cee779f999faee30a745f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/main.py
@@ -0,0 +1,90 @@
+"""
+    bjson/main.py
+
+    Copyright (c) 2010 David Martinez Marti
+    All rights reserved.
+
+    Licensed under 3-clause BSD License.
+    See LICENSE.txt for the full license text.
+
+"""
+import socket
+
+import bjsonrpc.server
+import bjsonrpc.connection
+import bjsonrpc.handlers
+
+__all__ = [
+    "createserver",
+    "connect",
+]
+
+def createserver(host="127.0.0.1", port=10123, handler_factory=bjsonrpc.handlers.NullHandler):
+    """
+        Creates a *bjson.server.Server* object linked to a listening socket.
+
+        Parameters:
+
+        **host**
+          Address (IP or Host Name) to listen to as in *socket.bind*.
+          Use "0.0.0.0" to listen to all address. By default this points to
+          127.0.0.1 to avoid security flaws.
+
+        **port**
+          Port number to bind the socket. In Unix, port numbers less
+          than 1024 requires special permissions.
+
+        **handler_factory**
+          Class to instantiate to publish remote functions.
+
+        **(return value)**
+          A *bjson.server.Server* instance or raises an exception.
+
+        Servers are usually created this way::
+
+            import bjsonrpc
+
+            server = bjsonrpc.createserver("0.0.0.0")
+            server.serve()
+
+        Check :ref:`bjsonrpc.server` documentation
+    """
+    sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sck.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+
+    sck.bind((host, port))
+    sck.listen(3)
+    return bjsonrpc.server.Server(sck, handler_factory=handler_factory)
+
+
+def connect(host="127.0.0.1", port=10123, handler_factory=bjsonrpc.handlers.NullHandler):
+    """
+        Creates a *bjson.connection.Connection* object linked to a connected
+        socket.
+
+        Parameters:
+
+        **host**
+          Address (IP or Host Name) to connect to.
+
+        **port**
+          Port number to connect to.
+
+        **handler_factory**
+          Class to instantiate to publish remote functions to the server.
+          By default this is *NullHandler* which means that no functions are
+          executable by the server.
+
+        **(return value)**
+          A *bjson.connection.Connection* instance or raises an exception.
+
+        Connections are usually created this way::
+
+            import bjsonrpc
+
+            conn = bjsonrpc.connect("rpc.host.net")
+            print conn.call.some_method_in_server_side()
+    """
+    sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sck.connect((host, port))
+    return bjsonrpc.connection.Connection(sck, handler_factory=handler_factory)
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/proxies.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/proxies.py
new file mode 100644
index 0000000000000000000000000000000000000000..b5611e8d67a4498f5e33a4d543f05caafbe112d8
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/proxies.py
@@ -0,0 +1,51 @@
+"""
+    bjson/proxies.py
+
+    Copyright (c) 2010 David Martinez Marti
+    All rights reserved.
+
+    Licensed under 3-clause BSD License.
+    See LICENSE.txt for the full license text.
+
+"""
+# import weakref
+
+class Proxy(object):
+    """
+    Object that forwards calls to the remote.
+    This class is intended to be instantiated from Connection class.
+
+    Parameters:
+
+    **conn**
+        Connection object to forward calls.
+
+    **sync_type**
+        synchronization type. 0-synchronous. 1-asynchronous. 2-notification.
+
+    **obj** = None
+        optional. Object name to call their functions, (used to proxy
+        functions of *RemoteObject*)
+
+    """
+    def __init__(self, conn, sync_type, obj=None):
+        self._conn = conn
+        self._obj = obj
+        self.sync_type = sync_type
+
+    def __getattr__(self, name):
+        if self._obj:
+            name = "%s.%s" % (self._obj, name)
+
+        def function(*args, **kwargs):
+            """
+                Decorator-like function that forwards all calls to proxy
+                method of connection.
+            """
+            return self._conn.proxy(self.sync_type, name, args, kwargs)
+        # print name
+        function.__name__ = str(name)
+        function._conn = self._conn
+        # function.sync_type = self.sync_type
+
+        return function
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/request.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/request.py
new file mode 100644
index 0000000000000000000000000000000000000000..0fedb16ae6472c4827676dc973c5b558c3cc36b1
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/request.py
@@ -0,0 +1,189 @@
+"""
+    bjson/request.py
+
+    Asynchronous Bidirectional JSON-RPC protocol implementation over TCP/IP
+
+    Copyright (c) 2010 David Martinez Marti
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of copyright holders nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+"""
+try:
+    from Queue import Queue
+except ImportError:
+    from queue import Queue
+import logging
+from threading import Event
+import traceback
+
+from bjsonrpc.exceptions import ServerError
+import bjsonrpc.jsonlib as json
+
+
+_log = logging.getLogger(__name__)
+
+class Request(object):
+    """
+        Represents a request to the other end which may be not be completed yet.
+        This class is automatically created by *method* Proxy.
+
+        Parameters:
+
+        **conn**
+            Connection instance which this Request belongs to.
+            (internally stored as Request.conn)
+
+        **request_data**
+            Dictionary object to serialize as JSON to send to the other end.
+            (internally stored as Request.data)
+
+
+        Attributes:
+
+        **responses**
+            Queue of JSON Objects of the response, each as a dictionary. If
+            no response has been received, this is empty.
+
+        **event_response**
+            A threading.Event object, which is set to true when a response has
+            been received. Useful to wake up threads or to wait exactly until
+            the response is received.
+
+        **callbacks**
+            List array where the developer can append functions to call when
+            the response is received. The function will get the Request object
+            as a first argument.
+
+        **request_id**
+            Number of ID that identifies the call. For notifications this is None.
+            Be careful because it may be not an integer. Strings and other objects
+            may be valid for other implementations.
+
+    """
+    def __init__(self, conn, request_data):
+        self.conn = conn
+        self.data = request_data
+        self.responses = Queue()
+        # TODO: Now that we have a Queue, do we need an Event (and a cv)?
+        self.event_response = Event()
+        self.callbacks = []
+        self.thread_wait = self.event_response.wait
+        self.request_id = None
+        self.auto_close = False
+        if 'id' in self.data:
+            self.request_id = self.data['id']
+
+        if self.request_id:
+            self.auto_close = True
+            self.conn.addrequest(self)
+
+        data = json.dumps(self.data, self.conn)
+
+        self.conn.write(data)
+
+    def hasresponse(self):
+        """
+            Method thet checks if there's a response or not.
+            Returns True if there it is or False if it haven't arrived yet.
+        """
+        if not self.responses.empty():
+            return True
+        self.conn.dispatch_until_empty()
+        return not self.responses.empty()
+
+    def setresponse(self, value):
+        """
+            Method used by Connection instance to tell Request that a Response
+            is available to this request.
+
+            Parameters:
+
+            **value**
+                Value (JSON decoded) received from socket.
+        """
+        self.responses.put(value)
+        for callback in self.callbacks:
+            try:
+                callback(self)
+            except Exception as exc:
+                _log.error("Error on callback: %r", exc)
+                _log.debug(traceback.format_exc())
+
+        self.event_response.set()  # helper for threads.
+        if self.auto_close:
+            self.close()
+
+    def wait(self):
+        """
+            Block until there is a response. Will manage the socket and dispatch
+            messages until the response is found.
+        """
+        # if self.response is None:
+        #     self.conn.read_ensure_thread()
+
+        while self.responses.empty():
+            self.conn.read_and_dispatch(condition=lambda: self.responses.empty())
+
+    def __call__(self):
+        return self.value
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        return self.value
+
+    def next(self):
+        return self.__next__()
+
+    def close(self):
+        reqid, self.request_id, self.auto_close = self.request_id, None, False
+        if reqid:
+            self.conn.delrequest(reqid)
+
+    def __del__(self):
+        self.close()
+
+    @property
+    def value(self):
+        """
+            Property to get value response. If the response is not available, it waits
+            to it (see *wait* method). If the response contains an Error, this
+            method raises *exceptions.ServerError* with the error text inside.
+
+            From version 0.2.0 you can also call the class itself to get the value::
+
+                req_stime = rpcconn.method.getServerTime()
+                print req_stime.value
+                print req_stime()     # equivalent to the prior line.
+
+        """
+        self.wait()
+        response = self.responses.get()
+        err = response.get('error', None)
+        if err is not None:
+            raise ServerError(err)
+        return response['result']
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/server.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/server.py
new file mode 100644
index 0000000000000000000000000000000000000000..9ed0c239c1baa3238b25087414d404367dac34f0
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/server.py
@@ -0,0 +1,191 @@
+"""
+    bjson/server.py
+
+    Asynchronous Bidirectional JSON-RPC protocol implementation over TCP/IP
+
+    Copyright (c) 2010 David Martinez Marti
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of copyright holders nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+"""
+import xbmc
+import socket
+import select
+
+from bjsonrpc.connection import Connection
+from bjsonrpc.exceptions import EofError
+
+class Server(object):
+    """
+        Handles a listening socket and automatically accepts incoming
+        connections. It will create a *bjsonrpc.connection.Connection* for
+        each socket connected to it.
+
+        Use the *Server.serve()* method to start accepting connections.
+
+        Parameters:
+
+        **lstsck**
+            Listening socket to watch for incoming connections. Must be an instance
+            of *socket.socket* or something compatible, and must to be already
+            listening for new connections in the desired port.
+
+        **handler_factory**
+            Class (object type) to instantiate to publish methods for incoming
+            connections. Should be an inherited class of *bjsonrpc.handlers.BaseHandler*
+
+    """
+    def __init__(self, lstsck, handler_factory):
+        self._lstsck = lstsck
+        self._handler = handler_factory
+        self._debug_socket = False
+        self._debug_dispatch = False
+        self._serve = True
+
+    def stop(self):
+        """
+            Tells the server that it should stop. Useful in multithread apps.
+            Once stopped, call again to *serve()* to start the server loop again.
+        """
+        self._serve = False
+
+    def debug_socket(self, value=None):
+        """
+            Sets or retrieves the internal debug_socket value.
+
+            When is set to true, each new connection will have it set to true,
+            and every data sent or received by the socket will be printed to
+            stdout.
+
+            By default is set to *False*
+        """
+        retval = self._debug_socket
+        if type(value) is bool:
+            self._debug_socket = value
+
+        return retval
+
+    def debug_dispatch(self, value=None):
+        """
+            Sets or retrieves the internal debug_dispatch value.
+
+            When is set to true, each new connection will have it set to true,
+            and every error produced by client connections will be printed to
+            stdout.
+
+            By default is set to *False*
+        """
+        ret = self._debug_dispatch
+        if type(value) is bool:
+            self._debug_dispatch = value
+
+        return ret
+
+    def serve(self):
+        """
+            Starts the forever-serving loop. This function only exits when an
+            Exception is raised inside, by unexpected error, KeyboardInterrput,
+            etc.
+
+            It is coded using *select.select* function, and it is capable to
+            serve to an unlimited amount of connections at same time
+            without using threading.
+        """
+        self._serve = True
+        try:
+            sockets = []
+            connections = []
+            connidx = {}
+            while not xbmc.abortRequested:
+                try:
+                    ready_to_read = select.select(
+                        [self._lstsck] + sockets,  # read
+                        [], [],  # write, errors
+                        1  # timeout
+                    )[0]
+                except Exception:
+                    # Probably a socket is no longer valid.
+                    a = self._lstsck.fileno()  # if this is not valid, raise Exception, exit.
+                    newsockets = []
+                    for sck in sockets:
+                        try:
+                            a = sck.fileno()  # NOQA
+                            h = sck.getpeername()  # NOQA
+                        except Exception:
+                            continue
+                        newsockets.append(sck)
+                    sockets[:] = newsockets
+                    continue
+                if not ready_to_read:
+                    continue
+
+                if self._lstsck in ready_to_read:
+                    clientsck, clientaddr = self._lstsck.accept()
+                    sockets.append(clientsck)
+
+                    conn = Connection(
+                        sck=clientsck, address=clientaddr,
+                        handler_factory=self._handler
+                    )
+                    connidx[clientsck.fileno()] = conn
+                    conn._debug_socket = self._debug_socket
+                    conn._debug_dispatch = self._debug_socket
+                    # conn.internal_error_callback = self.
+
+                    connections.append(conn)
+
+                for sck in ready_to_read:
+                    fileno = sck.fileno()
+                    if fileno not in connidx:
+                        continue
+
+                    conn = connidx[fileno]
+                    try:
+                        conn.dispatch_until_empty()
+                    except EofError:
+                        conn.close()
+                        sockets.remove(conn.socket)
+                        connections.remove(conn)
+                        # print "Closing client conn."
+
+        finally:
+            for conn in connections:
+                conn.close()
+            try:
+                self._lstsck.shutdown(socket.SHUT_RDWR)
+            except Exception:
+                pass
+            try:
+                self._lstsck.close()
+            except Exception:
+                pass
+
+    @property
+    def socket(self):
+        """
+            public property that holds the internal listener socket used.
+        """
+        return self._lstsck
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/varsync/__init__.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/varsync/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..db6f7b25750816d53a52ead30dd78c686a538613
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/bjsonrpc/varsync/__init__.py
@@ -0,0 +1,54 @@
+# encoding: UTF-8
+
+"""
+
+    Variables Syncronized over json-rpc at both ends.
+
+    This package has several datatypes to ease variable-sharing across peers.
+
+    Proposed Utils:
+
+    * FIFOBuffer: streams lists of bytes/numbers/etc over network.
+
+
+    Proposed Types:
+
+    * FloatSync: floating point number synced over network
+        - sync_mode:  fixed master-slave, dynamic master-slave,
+            queued master-master
+        - get, set(value)
+        - apply(operator, value) -- sum 3, mult 1.5, set 6 ...
+        - addcallback(fn), removecallback(fn)
+
+    * TupleSync: Tuple synced over network
+        - sync_mode:  fixed master-slave, dynamic master-slave,
+            queued master-master
+        - get, set(value)
+        - addcallback(fn), removecallback(fn)
+
+    * StringSync: (small) String synced over network
+        - sync_mode:  fixed master-slave, dynamic master-slave,
+            queued master-master
+        - get, set(value)
+        - addcallback(fn), removecallback(fn)
+
+    * DictSync: dict of elements synced over network
+        - sync_mode:  fixed master-slave, dynamic master-slave,
+            queued master-master
+        - get(x), set(x,value)
+        - apply(x, operator, value)
+        - addcallback(fn), removecallback(fn)
+
+    * ListSync: list of elements synced over network.
+        - sync_mode:  fixed master-slave, dynamic master-slave,
+            queued master-master
+        - primary_key: index, full-item, dict-column, list-index
+        - item_style: single-object, list, dict
+        - clear
+        - append(x),push(x)
+        - remove(x),pop(x)
+        - update(x,value)
+        - addcallback(fn), removecallback(fn)
+
+
+"""
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/__init__.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/addon.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/addon.py
new file mode 100644
index 0000000000000000000000000000000000000000..7fc8a6a011c63b8e42f3c78dc09d8e505cb1e2ec
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/addon.py
@@ -0,0 +1,6 @@
+import xbmcaddon
+
+ADDON = xbmcaddon.Addon()
+ADDON_ID = ADDON.getAddonInfo("id")
+ADDON_NAME = ADDON.getAddonInfo("name")
+ADDON_PATH = ADDON.getAddonInfo("path")
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/config.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..313a8414ff8006c317efe7799068ef10068830ae
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/config.py
@@ -0,0 +1,2 @@
+JSONRPC_EXT_PORT = 65252
+QUASARD_HOST = "http://localhost:65251"
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/daemon.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/daemon.py
new file mode 100644
index 0000000000000000000000000000000000000000..19f30f34787cf2bbdbe035ce008fe6cedd4f987f
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/daemon.py
@@ -0,0 +1,179 @@
+import os
+import stat
+import time
+import xbmc
+import shutil
+import urllib2
+import threading
+import traceback
+import subprocess
+from quasar.logger import log
+from quasar.osarch import PLATFORM
+from quasar.config import QUASARD_HOST
+from quasar.addon import ADDON, ADDON_ID
+from quasar.util import notify, system_information
+
+SW_HIDE = 0
+STARTF_USESHOWWINDOW = 1
+
+def ensure_exec_perms(file_):
+    st = os.stat(file_)
+    os.chmod(file_, st.st_mode | stat.S_IEXEC)
+    return file_
+
+def android_get_current_appid():
+    with open("/proc/%d/cmdline" % os.getpid()) as fp:
+        return fp.read().rstrip("\0")
+
+def get_quasard_checksum(path):
+    with open(path) as fp:
+        fp.seek(-40, os.SEEK_END)  # we put a sha1 there
+        return fp.read()
+
+def get_quasar_binary():
+    binary = "quasar" + (PLATFORM["os"] == "windows" and ".exe" or "")
+
+    binary_dir = os.path.join(ADDON.getAddonInfo("path"), "resources", "bin", "%(os)s_%(arch)s" % PLATFORM)
+    if PLATFORM["os"] == "android":
+        log.info("Detected binary folder: %s" % binary_dir)
+        binary_dir_legacy = binary_dir.replace("/storage/emulated/0", "/storage/emulated/legacy")
+        if os.path.exists(binary_dir_legacy):
+            binary_dir = binary_dir_legacy
+        log.info("Using binary folder: %s" % binary_dir)
+        app_id = android_get_current_appid()
+        xbmc_data_path = os.path.join("/data", "data", app_id)
+        dest_binary_dir = os.path.join(xbmc_data_path, "files", ADDON_ID, "bin", "%(os)s_%(arch)s" % PLATFORM)
+    else:
+        dest_binary_dir = os.path.join(xbmc.translatePath(ADDON.getAddonInfo("profile")), "bin", "%(os)s_%(arch)s" % PLATFORM)
+
+    try:
+        binary_dir = binary_dir.decode("latin1")
+        dest_binary_dir = dest_binary_dir.decode("latin1")
+    except UnicodeEncodeError:
+        log.info("Unable to decode: binary_dir=%s dest_binary_dir=%s" % (repr(binary_dir), repr(dest_binary_dir)))
+
+    binary_path = os.path.join(binary_dir, binary)
+    dest_binary_path = os.path.join(dest_binary_dir, binary)
+
+    if not os.path.exists(binary_path):
+        notify(ADDON.getLocalizedString(30103).encode('utf-8'))
+        system_information()
+        return False, False
+
+    if not os.path.exists(dest_binary_path) or get_quasard_checksum(dest_binary_path) != get_quasard_checksum(binary_path):
+        log.info("Updating quasar daemon...")
+        try:
+            os.makedirs(dest_binary_dir)
+        except OSError:
+            pass
+        try:
+            shutil.rmtree(dest_binary_dir)
+        except OSError as e:
+            log.error("Unable to remove destination path for update: %s" % e)
+            system_information()
+            pass
+        try:
+            shutil.copytree(binary_dir, dest_binary_dir)
+        except OSError as e:
+            log.error("Unable to copy to destination path for update: %s" % e)
+            notify(ADDON.getLocalizedString(30227).encode('utf-8'))
+            system_information()
+            pass
+
+    # Clean stale files in the directory, as this can cause headaches on
+    # Android when they are unreachable
+    dest_files = set(os.listdir(dest_binary_dir))
+    orig_files = set(os.listdir(binary_dir))
+    log.info("Deleting stale files %s" % (dest_files - orig_files))
+    for file_ in (dest_files - orig_files):
+        path = os.path.join(dest_binary_dir, file_)
+        if os.path.isdir(path):
+            shutil.rmtree(path)
+        else:
+            os.remove(path)
+
+    return dest_binary_dir, ensure_exec_perms(dest_binary_path)
+
+def start_quasard(**kwargs):
+    # Make sure all other quasard instances are closed
+    shutdown()
+
+    quasar_dir, quasar_binary = get_quasar_binary()
+
+    if quasar_dir is False or quasar_binary is False:
+        return False
+
+    args = [quasar_binary]
+    kwargs["cwd"] = quasar_dir
+
+    if PLATFORM["os"] == "windows":
+        si = subprocess.STARTUPINFO()
+        si.dwFlags = STARTF_USESHOWWINDOW
+        si.wShowWindow = SW_HIDE
+        kwargs["startupinfo"] = si
+    else:
+        env = os.environ.copy()
+        env["LD_LIBRARY_PATH"] = "%s:%s" % (quasar_dir, env.get("LD_LIBRARY_PATH", ""))
+        kwargs["env"] = env
+
+    return subprocess.Popen(args, **kwargs)
+
+def shutdown():
+    try:
+        urllib2.urlopen(QUASARD_HOST + "/shutdown")
+    except:
+        pass
+
+def wait_for_abortRequested(proc, monitor):
+    monitor.closing.wait()
+    log.info("quasard: exiting quasard daemon")
+    try:
+        proc.terminate()
+    except OSError:
+        pass  # Process already exited, nothing to terminate
+    log.info("quasard: quasard daemon exited")
+
+def quasard_thread(monitor):
+    try:
+        while not xbmc.abortRequested:
+            log.info("quasard: starting quasard")
+            proc = start_quasard(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            if not proc:
+                break
+            threading.Thread(target=wait_for_abortRequested, args=[proc, monitor]).start()
+
+            if PLATFORM["os"] == "windows":
+                while proc.poll() is None:
+                    log.info(proc.stdout.readline())
+            else:
+                # Kodi hangs on some Android (sigh...) systems when doing a blocking
+                # read. We count on the fact that Quasar daemon flushes its log
+                # output on \n, creating a pretty clean output
+                import fcntl
+                import select
+                fd = proc.stdout.fileno()
+                fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+                fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+                while proc.poll() is None:
+                    try:
+                        to_read, _, _ = select.select([proc.stdout], [], [])
+                        for ro in to_read:
+                            line = ro.readline()
+                            if line == "":  # write end is closed
+                                break
+                            log.info(line)
+                    except IOError:
+                        time.sleep(1)  # nothing to read, sleep
+
+            if proc.returncode == 0 or xbmc.abortRequested:
+                break
+
+            notify(ADDON.getLocalizedString(30100).encode('utf-8'), time=3000)
+            xbmc.executebuiltin("Dialog.Close(all, true)")
+            system_information()
+            time.sleep(3)
+
+    except Exception as e:
+        notify("%s: %s" % (ADDON.getLocalizedString(30226).encode('utf-8'), e))
+        map(log.error, traceback.format_exc().split("\n"))
+        raise
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog.py
new file mode 100644
index 0000000000000000000000000000000000000000..bee3611460f68f82bc1df9a7c8ea42ce917b30bb
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog.py
@@ -0,0 +1,21 @@
+# Constants
+ACTION_LEFT = 1
+ACTION_RIGHT = 2
+ACTION_UP = 3
+ACTION_DOWN = 4
+ACTION_PAGE_UP = 5
+ACTION_PAGE_DOWN = 6
+ACTION_SELECT_ITEM = 7
+ACTION_PARENT_DIR = 9
+ACTION_PREVIOUS_MENU = 10
+ACTION_SHOW_INFO = 11
+ACTION_NEXT_ITEM = 14
+ACTION_PREV_ITEM = 15
+
+ACTION_MOUSE_WHEEL_UP = 104
+ACTION_MOUSE_WHEEL_DOWN = 105
+ACTION_MOUSE_MOVE = 107
+
+KEY_NAV_BACK = 92
+KEY_CONTEXT_MENU = 117
+KEY_HOME = 159
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog_insert.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog_insert.py
new file mode 100644
index 0000000000000000000000000000000000000000..df8e0a87ef202df46f66952cd4c73be92b93d54c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog_insert.py
@@ -0,0 +1,74 @@
+import xbmcgui
+from dialog import *  # NOQA
+
+class DialogInsert(xbmcgui.WindowXMLDialog):
+    def __init__(self, *args, **kwargs):
+        xbmcgui.WindowXML.__init__(self)
+
+    def onInit(self):
+        self.setOption1()
+        self.retval = ""
+
+    def onClick(self, controlId):
+        if controlId == 32500:
+            # Close Button
+            self.cancelled()
+        elif controlId == 32501:
+            # Radio Button 1
+            self.setOption1()
+        elif controlId == 32502:
+            # Radio Button 2
+            self.setOption2()
+        elif controlId == 32508:
+            # OK button
+            self.OK()
+        elif controlId == 32505:
+            # Option 1 url button
+            self.setURL()
+        elif controlId == 32507:
+            # Option 2 path button
+            self.setPath()
+
+    def onAction(self, action):
+        if action.getId() in [ACTION_PARENT_DIR, KEY_NAV_BACK, ACTION_PREVIOUS_MENU]:
+            self.cancelled()
+
+    def setOption1(self):
+        self.getControl(32501).setSelected(True)  # Radio Button 1
+        self.getControl(32502).setSelected(False)  # Radio Button 2
+        self.type = 1
+
+    def getURL(self):
+        # return self.getControl(32505).getText()
+        return self.getControl(32505).getLabel()
+
+    def setOption2(self):
+        self.getControl(32501).setSelected(False)  # Radio Button 1
+        self.getControl(32502).setSelected(True)  # Radio Button 2
+        self.type = 2
+
+    def setURL(self):
+        url = xbmcgui.Dialog().input("Quasar")
+        if url != "":
+            self.getControl(32505).setLabel(url)
+
+    def setPath(self):
+        fn = xbmcgui.Dialog().browse(1, "Quasar", "files", ".torrent")
+        if fn != "":
+            self.getControl(32507).setLabel(fn)
+
+    def getPath(self):
+        return self.getControl(32507).getLabel()
+
+    def cancelled(self):
+        self.type = 0
+        self.close()
+
+    def OK(self):
+        if self.type == 1:
+            # Option 1 text input
+            self.retval = self.getURL()
+        elif self.type == 2:
+            # Option 2 text input
+            self.retval = self.getPath()
+        self.close()
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog_select.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog_select.py
new file mode 100644
index 0000000000000000000000000000000000000000..9828a7301122dc7eb36865380e6559356806746c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/dialog_select.py
@@ -0,0 +1,43 @@
+import xbmcgui
+from dialog import *  # NOQA
+
+class DialogSelect(xbmcgui.WindowXMLDialog):
+    def __init__(self, *args, **kwargs):
+        xbmcgui.WindowXML.__init__(self)
+        self.items = kwargs['items']
+        self.title = kwargs['title']
+        self.count = 0
+        self.retval = -1
+
+    def onInit(self):
+        self.getControl(32501).setLabel(self.title)
+        for item in self.items:
+            labels = item.split('\n')
+            label1 = labels[0]
+            try:
+                label2 = labels[1]
+            except:
+                label2 = ''
+            self.addItem(label1, label2)
+
+    def onClick(self, controlId):
+        if controlId == 32500:
+            # Close Button
+            self.close()
+        elif controlId == 32503:
+            # Panel
+            listControl = self.getControl(32503)
+            selected = listControl.getSelectedItem()
+            self.retval = int(selected.getProperty('index'))
+            self.close()
+
+    def onAction(self, action):
+        if action.getId() in [ACTION_PARENT_DIR, KEY_NAV_BACK, ACTION_PREVIOUS_MENU]:
+            self.close()
+
+    def addItem(self, label1, label2):
+        listControl = self.getControl(32503)
+        item = xbmcgui.ListItem("[B]%s[/B]" % label1, label2)
+        item.setProperty('index', str(self.count))
+        listControl.addItem(item)
+        self.count += 1
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/library.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/library.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ff494d265364693e5dedb87c95c7175e3ddf544
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/library.py
@@ -0,0 +1,18 @@
+import xbmc
+import time
+import urllib2
+from quasar.config import QUASARD_HOST
+
+def library_thread():
+    limit = 8 * 60 * 60
+    count = limit - 60
+    while not xbmc.abortRequested:
+        # 8 hours passed - Update Library
+        if count >= limit:
+            count = 0
+            try:
+                urllib2.urlopen(QUASARD_HOST + "/library/update")
+            except:
+                pass
+        time.sleep(3)
+        count += 3
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/logger.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/logger.py
new file mode 100644
index 0000000000000000000000000000000000000000..2135f45e603ae1a42832a5626f85bb6a791f154a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/logger.py
@@ -0,0 +1,28 @@
+# Borrowed and modified from xbmcswift
+import logging
+import xbmc
+from quasar.addon import ADDON_ID
+
+class XBMCHandler(logging.StreamHandler):
+    xbmc_levels = {
+        'DEBUG': 0,
+        'INFO': 2,
+        'WARNING': 3,
+        'ERROR': 4,
+        'LOGCRITICAL': 5,
+    }
+
+    def emit(self, record):
+        xbmc_level = self.xbmc_levels.get(record.levelname)
+        xbmc.log(self.format(record), xbmc_level)
+
+
+def _get_logger():
+    logger = logging.getLogger(ADDON_ID)
+    logger.setLevel(logging.DEBUG)
+    handler = XBMCHandler()
+    handler.setFormatter(logging.Formatter('[%(name)s] %(message)s'))
+    logger.addHandler(handler)
+    return logger
+
+log = _get_logger()
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/monitor.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/monitor.py
new file mode 100644
index 0000000000000000000000000000000000000000..8e8027111afe4b6360af48495dcdfb2b029d8afa
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/monitor.py
@@ -0,0 +1,29 @@
+import xbmc
+import urllib2
+import threading
+from quasar.config import QUASARD_HOST
+from quasar.daemon import shutdown
+
+
+class QuasarMonitor(xbmc.Monitor):
+    def __init__(self):
+        self._closing = threading.Event()
+
+    @property
+    def closing(self):
+        return self._closing
+
+    def onAbortRequested(self):
+        # Only when closing Kodi
+        if xbmc.abortRequested:
+            xbmc.executebuiltin("Dialog.Close(all, true)")
+            shutdown()
+            self._closing.set()
+            self._closing.clear()
+
+    def onSettingsChanged(self):
+        try:
+            urllib2.urlopen("%s/reload" % QUASARD_HOST)
+            urllib2.urlopen("%s/cmd/clear_cache" % QUASARD_HOST)
+        except:
+            pass
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/navigation.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/navigation.py
new file mode 100644
index 0000000000000000000000000000000000000000..e1c9a87716829ae5aeabc8c94d1a822bfbb86f82
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/navigation.py
@@ -0,0 +1,141 @@
+import os
+import sys
+import urllib2
+import xbmc
+import xbmcgui
+import xbmcplugin
+import socket
+import traceback
+from quasar.logger import log
+from quasar.config import QUASARD_HOST
+from quasar.addon import ADDON, ADDON_ID
+from quasar.util import notify, GetLocalizedString, system_information
+
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+
+HANDLE = int(sys.argv[1])
+
+
+class closing(object):
+    def __init__(self, thing):
+        self.thing = thing
+
+    def __enter__(self):
+        return self.thing
+
+    def __exit__(self, *exc_info):
+        self.thing.close()
+
+
+class NoRedirectHandler(urllib2.HTTPRedirectHandler):
+    def http_error_302(self, req, fp, code, msg, headers):
+        import urllib
+        infourl = urllib.addinfourl(fp, headers, headers["Location"])
+        infourl.status = code
+        infourl.code = code
+        return infourl
+    http_error_300 = http_error_302
+    http_error_301 = http_error_302
+    http_error_303 = http_error_302
+    http_error_307 = http_error_302
+
+
+def _json(url):
+    with closing(urllib2.urlopen(url)) as response:
+        if response.code >= 300 and response.code <= 307:
+            item = xbmcgui.ListItem(
+                path=response.geturl(),
+                label=xbmc.getInfoLabel("ListItem.Label"),
+                label2=xbmc.getInfoLabel("ListItem.label2"),
+                thumbnailImage=xbmc.getInfoLabel("ListItem.Art(thumb)"))
+            _infoLabels = {
+                "Title": xbmc.getInfoLabel("ListItem.Title"),
+                "OriginalTitle": xbmc.getInfoLabel("ListItem.OriginalTitle"),
+                "TVShowTitle": xbmc.getInfoLabel("ListItem.TVShowTitle"),
+                "Season": xbmc.getInfoLabel("ListItem.Season"),
+                "Episode": xbmc.getInfoLabel("ListItem.Episode"),
+                # "Date": xbmc.getInfoLabel("ListItem.Date"),
+                "VideoCodec": xbmc.getInfoLabel("ListItem.VideoCodec"),
+                "VideoResolution": xbmc.getInfoLabel("ListItem.VideoResolution"),
+                "VideoAspect": xbmc.getInfoLabel("ListItem.VideoAspect"),
+                "DBID": xbmc.getInfoLabel("ListItem.DBID"),
+                "DBTYPE": xbmc.getInfoLabel("ListItem.DBTYPE"),
+            }
+            infoLabels = {}
+            for key, value in _infoLabels.iteritems():
+                if value:
+                    infoLabels[key] = value
+
+            item.setInfo(type='Video', infoLabels=infoLabels)
+            xbmcplugin.setResolvedUrl(HANDLE, True, item)
+            return
+
+        payload = response.read()
+
+        if payload:
+            return json.loads(payload)
+
+
+def run(url_suffix=""):
+    if not os.path.exists(os.path.join(xbmc.translatePath(ADDON.getAddonInfo("path")), ".firstrun")):
+        notify(ADDON.getLocalizedString(30101).encode('utf-8'))
+        system_information()
+        return
+
+    socket.setdefaulttimeout(300)
+    urllib2.install_opener(urllib2.build_opener(NoRedirectHandler()))
+
+    url = sys.argv[0].replace("plugin://%s" % ADDON_ID, QUASARD_HOST + url_suffix) + sys.argv[2]
+    log.info("Requesting %s from %s" % (url, repr(sys.argv)))
+
+    try:
+        data = _json(url)
+    except Exception as e:
+        map(log.error, traceback.format_exc().split("\n"))
+        notify("%s: %s" % (ADDON.getLocalizedString(30225).encode('utf-8'), e))
+        return
+
+    if not data:
+        return
+
+    if data["content_type"]:
+        xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_UNSORTED)
+        xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_LABEL_IGNORE_THE)
+        xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_DATE)
+        xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_GENRE)
+        xbmcplugin.setContent(HANDLE, data["content_type"])
+
+    listitems = range(len(data["items"]))
+    for i, item in enumerate(data["items"]):
+        # Translate labels
+        if item["label"][0:8] == "LOCALIZE":
+            item["label"] = GetLocalizedString(item["label"])
+        if item["label2"][0:8] == "LOCALIZE":
+            item["label2"] = GetLocalizedString(item["label2"])
+
+        listItem = xbmcgui.ListItem(label=item["label"], label2=item["label2"], iconImage=item["icon"], thumbnailImage=item["thumbnail"])
+        if item.get("info"):
+            listItem.setInfo("video", item["info"])
+        if item.get("stream_info"):
+            for type_, values in item["stream_info"].items():
+                listItem.addStreamInfo(type_, values)
+        if item.get("art"):
+            listItem.setArt(item["art"])
+        if item.get("context_menu"):
+            # Translate context menus
+            for m, menu in enumerate(item["context_menu"]):
+                if menu[0][0:8] == "LOCALIZE":
+                    menu[0] = GetLocalizedString(menu[0])
+            listItem.addContextMenuItems(item["context_menu"])
+        listItem.setProperty("isPlayable", item["is_playable"] and "true" or "false")
+        if item.get("properties"):
+            for k, v in item["properties"].items():
+                listItem.setProperty(k, v)
+        listitems[i] = (item["path"], listItem, not item["is_playable"])
+
+    xbmcplugin.addDirectoryItems(HANDLE, listitems, totalItems=len(listitems))
+    xbmcplugin.endOfDirectory(HANDLE, succeeded=True, updateListing=False, cacheToDisc=True)
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/osarch.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/osarch.py
new file mode 100644
index 0000000000000000000000000000000000000000..a3866b0c672c457f97bc5d1cbe8de2d72c356965
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/osarch.py
@@ -0,0 +1,34 @@
+import xbmc
+import sys
+import platform
+
+def get_platform():
+    ret = {
+        "arch": sys.maxsize > 2 ** 32 and "x64" or "x86",
+        "os": "",
+        "version": platform.release()
+    }
+    if xbmc.getCondVisibility("system.platform.android"):
+        ret["os"] = "android"
+        if "arm" in platform.machine() or "aarch" in platform.machine():
+            ret["arch"] = "arm"
+    elif xbmc.getCondVisibility("system.platform.linux"):
+        ret["os"] = "linux"
+        if "arm" in platform.machine():
+            ret["arch"] = "arm"
+    elif xbmc.getCondVisibility("system.platform.xbox"):
+        ret["os"] = "windows"
+        ret["arch"] = "x64"
+    elif xbmc.getCondVisibility("system.platform.windows"):
+        ret["os"] = "windows"
+        if platform.machine().endswith('64'):
+            ret["arch"] = "x64"
+    elif xbmc.getCondVisibility("system.platform.osx"):
+        ret["os"] = "darwin"
+        ret["arch"] = "x64"
+    elif xbmc.getCondVisibility("system.platform.ios"):
+        ret["os"] = "ios"
+        ret["arch"] = "arm"
+    return ret
+
+PLATFORM = get_platform()
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/overlay.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/overlay.py
new file mode 100644
index 0000000000000000000000000000000000000000..885fb490b4ff13e7f6529a113aa24966b4eadce5
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/overlay.py
@@ -0,0 +1,59 @@
+import os
+import sys
+import xbmc
+import xbmcgui
+
+RESOURCES_PATH = os.path.join(os.path.dirname(sys.modules["__main__"].__file__), 'resources')
+XBFONT_CENTER_X = 0x00000002
+XBFONT_CENTER_Y = 0x00000004
+WINDOW_FULLSCREEN_VIDEO = 12005
+VIEWPORT_WIDTH = 1920.0
+VIEWPORT_HEIGHT = 1088.0
+OVERLAY_WIDTH = int(VIEWPORT_WIDTH * 0.7)  # 70% size
+OVERLAY_HEIGHT = 150
+
+class OverlayText(object):
+    def __init__(self, w=OVERLAY_WIDTH, h=OVERLAY_HEIGHT, *args, **kwargs):
+        self.window = xbmcgui.Window(WINDOW_FULLSCREEN_VIDEO)
+        viewport_w, viewport_h = self._get_skin_resolution()
+        # Adjust size based on viewport, we are using 1080p coordinates
+        w = int(w * viewport_w / VIEWPORT_WIDTH)
+        h = int(h * viewport_h / VIEWPORT_HEIGHT)
+        x = (viewport_w - w) / 2
+        y = (viewport_h - h) / 2 + 200
+        self._shown = False
+        self._text = ""
+        self._label = xbmcgui.ControlLabel(x, y, w, h, self._text, alignment=XBFONT_CENTER_X | XBFONT_CENTER_Y, *args, **kwargs)
+        self._background = xbmcgui.ControlImage(x, y, w, h, os.path.join(RESOURCES_PATH, "img", "black.png"))
+        self._background.setColorDiffuse("0xD0000000")
+
+    def show(self):
+        if not self._shown:
+            self.window.addControls([self._background, self._label])
+            self._shown = True
+
+    def hide(self):
+        if self._shown:
+            self._shown = False
+            self.window.removeControls([self._background, self._label])
+
+    def close(self):
+        self.hide()
+
+    @property
+    def text(self):
+        return self._text
+
+    @text.setter
+    def text(self, text):
+        self._text = text
+        if self._shown:
+            self._label.setLabel(self._text)
+
+    # This is so hackish it hurts.
+    def _get_skin_resolution(self):
+        import xml.etree.ElementTree as ET
+        skin_path = xbmc.translatePath("special://skin/")
+        tree = ET.parse(os.path.join(skin_path, "addon.xml"))
+        res = tree.findall("./extension/res")[0]
+        return int(res.attrib["width"]), int(res.attrib["height"])
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/provider.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/provider.py
new file mode 100644
index 0000000000000000000000000000000000000000..6451223b1e074eb908cf3eb925da2233036ca423
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/provider.py
@@ -0,0 +1,209 @@
+import sys
+import json
+import base64
+import urllib2
+import traceback
+from urllib import urlencode
+from quasar.util import notify
+from quasar.logger import log
+from quasar.addon import ADDON
+from cookielib import CookieJar
+
+
+RESOLUTION_UNKNOWN = 0
+RESOLUTION_480P = 1
+RESOLUTION_720P = 2
+RESOLUTION_1080P = 3
+RESOLUTION_1440P = 4
+RESOLUTION_4K2K = 5
+
+RIP_UNKNOWN = 0
+RIP_CAM = 1
+RIP_TS = 2
+RIP_TC = 3
+RIP_SCR = 4
+RIP_DVDSCR = 5
+RIP_DVD = 6
+RIP_HDTV = 7
+RIP_WEB = 8
+RIP_BLURAY = 9
+
+RATING_UNKNOWN = 0
+RATING_PROPER = 1
+RATING_NUKED = 2
+
+CODEC_UNKNOWN = 0
+CODEC_XVID = 1
+CODEC_H264 = 2
+CODEC_MP3 = 3
+CODEC_AAC = 4
+CODEC_AC3 = 5
+CODEC_DTS = 6
+CODEC_DTSHD = 7
+CODEC_DTSHDMA = 8
+
+USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36"
+
+COOKIE_JAR = CookieJar()
+urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor(COOKIE_JAR)))
+
+
+class closing(object):
+    def __init__(self, thing):
+        self.thing = thing
+
+    def __enter__(self):
+        return self.thing
+
+    def __exit__(self, *exc_info):
+        self.thing.close()
+
+
+def parse_json(data):
+    try:
+        import simplejson as json
+    except ImportError:
+        import json
+    return json.loads(data)
+
+
+def parse_xml(data):
+    import xml.etree.ElementTree as ET
+    return ET.fromstring(data)
+
+
+def request(url, params={}, headers={}, data=None, method=None):
+    if params:
+        url = "".join([url, "?", urlencode(params)])
+
+    req = urllib2.Request(url)
+    if method:
+        req.get_method = lambda: method
+    req.add_header("User-Agent", USER_AGENT)
+    req.add_header("Accept-Encoding", "gzip")
+    for k, v in headers.items():
+        req.add_header(k, v)
+    if data:
+        req.add_data(data)
+    try:
+        with closing(urllib2.urlopen(req)) as response:
+            data = response.read()
+            if response.headers.get("Content-Encoding", "") == "gzip":
+                import zlib
+                data = zlib.decompressobj(16 + zlib.MAX_WBITS).decompress(data)
+            response.data = data
+            response.json = lambda: parse_json(data)
+            response.xml = lambda: parse_xml(data)
+            return response
+    except Exception as e:
+        notify("%s: %s" % (ADDON.getLocalizedString(30224).encode('utf-8'), e))
+        map(log.error, traceback.format_exc().split("\n"))
+        return None, None
+
+HEAD = lambda *args, **kwargs: request(*args, method="HEAD", **kwargs)
+GET = lambda *args, **kwargs: request(*args, method="GET", **kwargs)
+POST = lambda *args, **kwargs: request(*args, method="POST", **kwargs)
+PUT = lambda *args, **kwargs: request(*args, method="PUT", **kwargs)
+DELETE = lambda *args, **kwargs: request(*args, method="DELETE", **kwargs)
+
+
+def append_headers(uri, headers):
+    return uri + "|" + "|".join(["%s=%s" % h for h in headers.items()])
+
+
+def with_cookies(uri):
+    return uri + "|Cookies=" + "; ".join(["%s=%s" % (c.name, c.value) for c in COOKIE_JAR])
+
+
+def extract_magnets(data):
+    import re
+    for magnet in re.findall(r'magnet:\?[^\'"\s<>\[\]]+', data):
+        yield {"uri": magnet}
+
+
+def parse_rss(root):
+    NSMAP = {
+        "torrent": "http://xmlns.ezrss.it/0.1/",
+        "showrss": "http://showrss.info/",
+    }
+
+    def _maybe_int(val):
+        try:
+            return int(val)
+        except:
+            return 0
+
+    def _text(node, path):
+        n = node.find(path)
+        if n is not None:
+            return n.text
+
+    def _attr(node, path, attrib):
+        n = node.find(path)
+        if n is not None:
+            return n.attrib.get(attrib)
+
+    for item in root.getiterator("item"):
+        yield {
+            "name": _text(item, "title") or _text(item, ".//{%(torrent)s}fileName" % NSMAP) or _text(item, ".//{%(showrss)s}rawtitle" % NSMAP),
+            "info_hash": _text(item, ".//info_hash") or _text(item, ".//{%(showrss)s}info_hash" % NSMAP),
+            "uri": _text(item, ".//{%(torrent)s}magnetURI" % NSMAP) or _attr(item, ".//enclosure", "url") or _text(item, "./link"),
+            "seeds": _maybe_int(_text(item, ".//{%(torrent)s}seeds" % NSMAP) or _text(item, "numSeeders") or _text(item, "seeders")),
+            "peers": _maybe_int(_text(item, ".//{%(torrent)s}peers" % NSMAP) or _text(item, "numLeechers") or _text(item, "leechers")),
+            "size": _maybe_int(_text(item, ".//{%(torrent)s}contentLength" % NSMAP) or _attr(item, ".//enclosure", "length")),
+        }
+
+
+# Borrowed from xbmcswift2
+def get_setting(key, converter=str, choices=None):
+    value = ADDON.getSetting(id=key)
+    if converter is str:
+        return value
+    elif converter is unicode:
+        return value.decode('utf-8')
+    elif converter is bool:
+        return value == 'true'
+    elif converter is int:
+        return int(value)
+    elif isinstance(choices, (list, tuple)):
+        return choices[int(value)]
+    else:
+        raise TypeError('Acceptable converters are str, unicode, bool and '
+                        'int. Acceptable choices are instances of list '
+                        ' or tuple.')
+
+
+def set_setting(key, val):
+    return ADDON.setSetting(id=key, value=val)
+
+
+def register(search, search_movie, search_episode):
+    try:
+        payload = json.loads(base64.b64decode(sys.argv[1]))
+    except:
+        notify(ADDON.getLocalizedString(30102).encode('utf-8'), time=1000)
+        return
+
+    results = ()
+    method = {
+        "search": search,
+        "search_movie": search_movie,
+        "search_episode": search_episode,
+    }.get(payload["method"]) or (lambda *a, **kw: [])
+    try:
+        results = ()
+        try:
+            objects = method(payload["search_object"])
+            if objects is not None:
+                results = tuple(objects)
+        except Exception as e:
+            notify("%s: %s" % (ADDON.getLocalizedString(30224).encode('utf-8'), e))
+            map(log.error, traceback.format_exc().split("\n"))
+    finally:
+        try:
+            req = urllib2.Request(payload["callback_url"], data=json.dumps(results))
+            with closing(urllib2.urlopen(req)) as response:
+                log.info("%s" % repr(response))
+        except Exception as e:
+            notify("%s: %s" % (ADDON.getLocalizedString(30224).encode('utf-8'), e))
+            map(log.error, traceback.format_exc().split("\n"))
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/rpc.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/rpc.py
new file mode 100644
index 0000000000000000000000000000000000000000..73f010a3addfc0459104e32412ff6b83535d675e
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/rpc.py
@@ -0,0 +1,181 @@
+import xbmc
+import xbmcgui
+import bjsonrpc
+from bjsonrpc.handlers import BaseHandler
+from quasar.addon import ADDON, ADDON_PATH
+from quasar.logger import log
+from quasar.config import JSONRPC_EXT_PORT
+from quasar.osarch import PLATFORM
+from quasar.util import notify, GetLocalizedString, system_information
+from quasar.overlay import OverlayText
+from quasar.dialog_select import DialogSelect
+from quasar.dialog_insert import DialogInsert
+
+XBMC_PLAYER = xbmc.Player()
+
+class QuasarRPCServer(BaseHandler):
+    public_methods_pattern = r'^[A-Za-z]\w+$'
+
+    _objects = {}
+
+    def Reset(self):
+        for i in self._objects:
+            try:
+                self._objects[i].hide()
+            except:
+                pass
+        log.info("Resetting RPC objects...")
+        self._objects = {}
+
+    def Refresh(self):
+        return xbmc.executebuiltin("Container.Refresh")
+
+    def UpdateAddonRepos(self):
+        return xbmc.executebuiltin("UpdateAddonRepos")
+
+    def SystemInformation(self):
+        return system_information()
+
+    def Notify(self, header, message, image):
+        return notify(GetLocalizedString(message), header, 3000, image)
+
+    def Keyboard(self, default="", heading="", hidden=False):
+        keyboard = xbmc.Keyboard(default, GetLocalizedString(heading), hidden)
+        keyboard.doModal()
+        if keyboard.isConfirmed():
+            return keyboard.getText()
+
+    def Dialog_Select(self, title, items):
+        dialog = xbmcgui.Dialog()
+        return dialog.select(GetLocalizedString(title), items)
+
+    def Dialog_Select_Large(self, title, subject, items):
+        window = DialogSelect("DialogSelectLarge.xml", ADDON_PATH, "Default", title="%s %s" % (GetLocalizedString(title), subject), items=items)
+        window.doModal()
+        retval = window.retval
+        del window
+
+        return retval
+
+    def Player_GetPlayingFile(self, *args, **kwargs):
+        return XBMC_PLAYER.getPlayingFile()
+
+    def Player_IsPlaying(self, *args, **kwargs):
+        return XBMC_PLAYER.isPlaying(*args, **kwargs)
+
+    def Player_IsPaused(self):
+        return xbmc.getCondVisibility("Player.Paused")
+
+    def ConvertLanguage(self, *args, **kwargs):
+        return xbmc.convertLanguage(*args, **kwargs)
+
+    def GetPlatform(self):
+        return PLATFORM
+
+    def GetAddonInfo(self):
+        info = {}
+        for key in ("author", "changelog", "description", "disclaimer",
+                    "fanart", "icon", "id", "name", "path", "profile", "stars",
+                    "summary", "type", "version"):
+            info[key] = ADDON.getAddonInfo(key)
+        return info
+
+    def GetLanguage(self, *args, **kwargs):
+        return xbmc.getLanguage(*args, **kwargs)
+
+    def GetLocalizedString(self, *args, **kwargs):
+        return ADDON.getLocalizedString(*args, **kwargs).encode('utf-8')
+
+    def GetSetting(self, *args, **kwargs):
+        return ADDON.getSetting(*args, **kwargs)
+
+    def SetSetting(self, *args, **kwargs):
+        return ADDON.setSetting(*args, **kwargs)
+
+    def TranslatePath(self, *args, **kwargs):
+        return xbmc.translatePath(*args, **kwargs)
+
+    def Log(self, *args, **kwargs):
+        return xbmc.log(*args, **kwargs)
+
+    def Dialog_CloseAll(self, *args, **kwargs):
+        return xbmc.executebuiltin("Dialog.Close(all, true)")
+
+    def DialogInsert(self, *args, **kwargs):
+        window = DialogInsert("DialogInsert.xml", ADDON_PATH, "Default")
+        window.doModal()
+        retval = {"type": ("cancelled", "url", "file")[window.type], "path": window.retval}
+        del window
+        return retval
+
+    ###########################################################################
+    # DialogProgress
+    ###########################################################################
+    def DialogProgress_Create(self, *args, **kwargs):
+        dialog = xbmcgui.DialogProgress()
+        self._objects[id(dialog)] = dialog
+        dialog.create(*args, **kwargs)
+        return id(dialog)
+
+    def DialogProgress_IsCanceled(self, hwnd, *args, **kwargs):
+        return self._objects[hwnd].iscanceled(*args, **kwargs)
+
+    def DialogProgress_Update(self, hwnd, *args, **kwargs):
+        return self._objects[hwnd].update(*args, **kwargs)
+
+    def DialogProgress_Close(self, hwnd, *args, **kwargs):
+        dialog = self._objects.pop(hwnd)
+        dialog.close()
+        del dialog
+
+    # Background DialogProgress
+    def DialogProgressBG_Create(self, *args, **kwargs):
+        dialog = xbmcgui.DialogProgressBG()
+        self._objects[id(dialog)] = dialog
+        dialog.create(*args, **kwargs)
+        return id(dialog)
+
+    def DialogProgressBG_IsFinished(self, hwnd, *args, **kwargs):
+        return self._objects[hwnd].isFinished(*args, **kwargs)
+
+    def DialogProgressBG_Update(self, hwnd, *args, **kwargs):
+        return self._objects[hwnd].update(*args, **kwargs)
+
+    def DialogProgressBG_Close(self, hwnd, *args, **kwargs):
+        dialog = self._objects.pop(hwnd)
+        dialog.close()
+        del dialog
+
+    # Overlay status
+    def OverlayStatus_Create(self):
+        overlay = OverlayText()
+        overlayId = id(overlay)
+        self._objects[overlayId] = overlay
+        return overlayId
+
+    def OverlayStatus_Update(self, hwnd, percent, line1, line2, line3):
+        text = "\n".join([line1, line2, line3])
+        self._objects[hwnd].text = text
+
+    def OverlayStatus_Show(self, hwnd):
+        self._objects[hwnd].show()
+
+    def OverlayStatus_Hide(self, hwnd):
+        self._objects[hwnd].hide()
+
+    def OverlayStatus_Close(self, hwnd):
+        overlay = self._objects.pop(hwnd)
+        overlay.hide()
+        del overlay
+
+
+def server_thread():
+    try:
+        s = bjsonrpc.createserver(port=JSONRPC_EXT_PORT, handler_factory=QuasarRPCServer)
+        log.info("quasar: starting jsonrpc service")
+        s.serve()
+        log.info("quasar: exiting jsonrpc service")
+    except Exception:
+        import traceback
+        map(log.error, traceback.format_exc().split("\n"))
+        raise
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/service.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/service.py
new file mode 100644
index 0000000000000000000000000000000000000000..035cda2110928567f4679031010588f2a091c7e9
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/service.py
@@ -0,0 +1,30 @@
+import xbmc
+import threading
+from quasar.logger import log
+from quasar.rpc import server_thread
+from quasar.monitor import QuasarMonitor
+from quasar.daemon import quasard_thread
+from quasar.library import library_thread
+
+
+def run():
+    # Make sure the XBMC jsonrpc server is started.
+    xbmc.startServer(xbmc.SERVER_JSONRPCSERVER, True)
+
+    # Make the monitor
+    monitor = QuasarMonitor()
+
+    threads = [
+        threading.Thread(target=server_thread),  # JSONRPC thread
+        threading.Thread(target=quasard_thread, args=[monitor]),  # Quasard thread
+        threading.Thread(target=library_thread),  # Library thread
+    ]
+    for t in threads:
+        t.daemon = True
+        t.start()
+
+    # XBMC loop
+    while not xbmc.abortRequested:
+        xbmc.sleep(1000)
+
+    log.info("quasar: exiting quasard")
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/util.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..f15044645f1b3295df15f116f74ebcf833d80dde
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/quasar/util.py
@@ -0,0 +1,26 @@
+import platform
+import xbmc
+from quasar.logger import log
+from quasar.osarch import PLATFORM
+from quasar.addon import ADDON_NAME, ADDON
+
+
+def notify(message='', header=None, time=5000, image=''):
+    if header is None:
+        header = ADDON_NAME
+    return xbmc.executebuiltin('Notification("%s", "%s", "%d", "%s")' %
+                               (header, message, time, image))
+
+def GetLocalizedString(label):
+    try:
+        return ADDON.getLocalizedString(int(label[9:-1])).encode('utf-8')
+    except:
+        return label
+
+def system_information():
+    build = xbmc.getInfoLabel("System.BuildVersion")
+    log.info("System information: %(os)s_%(arch)s %(version)s" % PLATFORM)
+    log.info("Kodi build version: %s" % build)
+    log.info("OS type: %s" % platform.system())
+    log.info("uname: %s" % repr(platform.uname()))
+    return PLATFORM
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/__init__.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..8c0b698a639edcc2e636ce6589ebc01a87f520ee
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/__init__.py
@@ -0,0 +1,564 @@
+r"""JSON (JavaScript Object Notation) <http://json.org> is a subset of
+JavaScript syntax (ECMA-262 3rd edition) used as a lightweight data
+interchange format.
+
+:mod:`simplejson` exposes an API familiar to users of the standard library
+:mod:`marshal` and :mod:`pickle` modules. It is the externally maintained
+version of the :mod:`json` library contained in Python 2.6, but maintains
+compatibility with Python 2.4 and Python 2.5 and (currently) has
+significant performance advantages, even without using the optional C
+extension for speedups.
+
+Encoding basic Python object hierarchies::
+
+    >>> import simplejson as json
+    >>> json.dumps(['foo', {'bar': ('baz', None, 1.0, 2)}])
+    '["foo", {"bar": ["baz", null, 1.0, 2]}]'
+    >>> print(json.dumps("\"foo\bar"))
+    "\"foo\bar"
+    >>> print(json.dumps(u'\u1234'))
+    "\u1234"
+    >>> print(json.dumps('\\'))
+    "\\"
+    >>> print(json.dumps({"c": 0, "b": 0, "a": 0}, sort_keys=True))
+    {"a": 0, "b": 0, "c": 0}
+    >>> from simplejson.compat import StringIO
+    >>> io = StringIO()
+    >>> json.dump(['streaming API'], io)
+    >>> io.getvalue()
+    '["streaming API"]'
+
+Compact encoding::
+
+    >>> import simplejson as json
+    >>> obj = [1,2,3,{'4': 5, '6': 7}]
+    >>> json.dumps(obj, separators=(',',':'), sort_keys=True)
+    '[1,2,3,{"4":5,"6":7}]'
+
+Pretty printing::
+
+    >>> import simplejson as json
+    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True, indent='    '))
+    {
+        "4": 5,
+        "6": 7
+    }
+
+Decoding JSON::
+
+    >>> import simplejson as json
+    >>> obj = [u'foo', {u'bar': [u'baz', None, 1.0, 2]}]
+    >>> json.loads('["foo", {"bar":["baz", null, 1.0, 2]}]') == obj
+    True
+    >>> json.loads('"\\"foo\\bar"') == u'"foo\x08ar'
+    True
+    >>> from simplejson.compat import StringIO
+    >>> io = StringIO('["streaming API"]')
+    >>> json.load(io)[0] == 'streaming API'
+    True
+
+Specializing JSON object decoding::
+
+    >>> import simplejson as json
+    >>> def as_complex(dct):
+    ...     if '__complex__' in dct:
+    ...         return complex(dct['real'], dct['imag'])
+    ...     return dct
+    ...
+    >>> json.loads('{"__complex__": true, "real": 1, "imag": 2}',
+    ...     object_hook=as_complex)
+    (1+2j)
+    >>> from decimal import Decimal
+    >>> json.loads('1.1', parse_float=Decimal) == Decimal('1.1')
+    True
+
+Specializing JSON object encoding::
+
+    >>> import simplejson as json
+    >>> def encode_complex(obj):
+    ...     if isinstance(obj, complex):
+    ...         return [obj.real, obj.imag]
+    ...     raise TypeError(repr(o) + " is not JSON serializable")
+    ...
+    >>> json.dumps(2 + 1j, default=encode_complex)
+    '[2.0, 1.0]'
+    >>> json.JSONEncoder(default=encode_complex).encode(2 + 1j)
+    '[2.0, 1.0]'
+    >>> ''.join(json.JSONEncoder(default=encode_complex).iterencode(2 + 1j))
+    '[2.0, 1.0]'
+
+
+Using simplejson.tool from the shell to validate and pretty-print::
+
+    $ echo '{"json":"obj"}' | python -m simplejson.tool
+    {
+        "json": "obj"
+    }
+    $ echo '{ 1.2:3.4}' | python -m simplejson.tool
+    Expecting property name: line 1 column 3 (char 2)
+"""
+from __future__ import absolute_import
+__version__ = '3.6.5'
+__all__ = [
+    'dump', 'dumps', 'load', 'loads',
+    'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
+    'OrderedDict', 'simple_first',
+]
+
+__author__ = 'Bob Ippolito <bob@redivi.com>'
+
+from decimal import Decimal
+
+from .scanner import JSONDecodeError
+from .decoder import JSONDecoder
+from .encoder import JSONEncoder, JSONEncoderForHTML
+def _import_OrderedDict():
+    import collections
+    try:
+        return collections.OrderedDict
+    except AttributeError:
+        from . import ordered_dict
+        return ordered_dict.OrderedDict
+OrderedDict = _import_OrderedDict()
+
+def _import_c_make_encoder():
+    try:
+        from ._speedups import make_encoder
+        return make_encoder
+    except ImportError:
+        return None
+
+_default_encoder = JSONEncoder(
+    skipkeys=False,
+    ensure_ascii=True,
+    check_circular=True,
+    allow_nan=True,
+    indent=None,
+    separators=None,
+    encoding='utf-8',
+    default=None,
+    use_decimal=True,
+    namedtuple_as_object=True,
+    tuple_as_array=True,
+    bigint_as_string=False,
+    item_sort_key=None,
+    for_json=False,
+    ignore_nan=False,
+    int_as_string_bitcount=None,
+)
+
+def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True,
+         allow_nan=True, cls=None, indent=None, separators=None,
+         encoding='utf-8', default=None, use_decimal=True,
+         namedtuple_as_object=True, tuple_as_array=True,
+         bigint_as_string=False, sort_keys=False, item_sort_key=None,
+         for_json=False, ignore_nan=False, int_as_string_bitcount=None, **kw):
+    """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a
+    ``.write()``-supporting file-like object).
+
+    If *skipkeys* is true then ``dict`` keys that are not basic types
+    (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``)
+    will be skipped instead of raising a ``TypeError``.
+
+    If *ensure_ascii* is false, then the some chunks written to ``fp``
+    may be ``unicode`` instances, subject to normal Python ``str`` to
+    ``unicode`` coercion rules. Unless ``fp.write()`` explicitly
+    understands ``unicode`` (as in ``codecs.getwriter()``) this is likely
+    to cause an error.
+
+    If *check_circular* is false, then the circular reference check
+    for container types will be skipped and a circular reference will
+    result in an ``OverflowError`` (or worse).
+
+    If *allow_nan* is false, then it will be a ``ValueError`` to
+    serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``)
+    in strict compliance of the original JSON specification, instead of using
+    the JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``). See
+    *ignore_nan* for ECMA-262 compliant behavior.
+
+    If *indent* is a string, then JSON array elements and object members
+    will be pretty-printed with a newline followed by that string repeated
+    for each level of nesting. ``None`` (the default) selects the most compact
+    representation without any newlines. For backwards compatibility with
+    versions of simplejson earlier than 2.1.0, an integer is also accepted
+    and is converted to a string with that many spaces.
+
+    If specified, *separators* should be an
+    ``(item_separator, key_separator)`` tuple.  The default is ``(', ', ': ')``
+    if *indent* is ``None`` and ``(',', ': ')`` otherwise.  To get the most
+    compact JSON representation, you should specify ``(',', ':')`` to eliminate
+    whitespace.
+
+    *encoding* is the character encoding for str instances, default is UTF-8.
+
+    *default(obj)* is a function that should return a serializable version
+    of obj or raise ``TypeError``. The default simply raises ``TypeError``.
+
+    If *use_decimal* is true (default: ``True``) then decimal.Decimal
+    will be natively serialized to JSON with full precision.
+
+    If *namedtuple_as_object* is true (default: ``True``),
+    :class:`tuple` subclasses with ``_asdict()`` methods will be encoded
+    as JSON objects.
+
+    If *tuple_as_array* is true (default: ``True``),
+    :class:`tuple` (and subclasses) will be encoded as JSON arrays.
+
+    If *bigint_as_string* is true (default: ``False``), ints 2**53 and higher
+    or lower than -2**53 will be encoded as strings. This is to avoid the
+    rounding that happens in Javascript otherwise. Note that this is still a
+    lossy operation that will not round-trip correctly and should be used
+    sparingly.
+
+    If *int_as_string_bitcount* is a positive number (n), then int of size
+    greater than or equal to 2**n or lower than or equal to -2**n will be
+    encoded as strings.
+
+    If specified, *item_sort_key* is a callable used to sort the items in
+    each dictionary. This is useful if you want to sort items other than
+    in alphabetical order by key. This option takes precedence over
+    *sort_keys*.
+
+    If *sort_keys* is true (default: ``False``), the output of dictionaries
+    will be sorted by item.
+
+    If *for_json* is true (default: ``False``), objects with a ``for_json()``
+    method will use the return value of that method for encoding as JSON
+    instead of the object.
+
+    If *ignore_nan* is true (default: ``False``), then out of range
+    :class:`float` values (``nan``, ``inf``, ``-inf``) will be serialized as
+    ``null`` in compliance with the ECMA-262 specification. If true, this will
+    override *allow_nan*.
+
+    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
+    ``.default()`` method to serialize additional types), specify it with
+    the ``cls`` kwarg. NOTE: You should use *default* or *for_json* instead
+    of subclassing whenever possible.
+
+    """
+    # cached encoder
+    if (not skipkeys and ensure_ascii and
+        check_circular and allow_nan and
+        cls is None and indent is None and separators is None and
+        encoding == 'utf-8' and default is None and use_decimal
+        and namedtuple_as_object and tuple_as_array
+        and not bigint_as_string and not sort_keys
+        and not item_sort_key and not for_json
+        and not ignore_nan and int_as_string_bitcount is None
+        and not kw
+    ):
+        iterable = _default_encoder.iterencode(obj)
+    else:
+        if cls is None:
+            cls = JSONEncoder
+        iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii,
+            check_circular=check_circular, allow_nan=allow_nan, indent=indent,
+            separators=separators, encoding=encoding,
+            default=default, use_decimal=use_decimal,
+            namedtuple_as_object=namedtuple_as_object,
+            tuple_as_array=tuple_as_array,
+            bigint_as_string=bigint_as_string,
+            sort_keys=sort_keys,
+            item_sort_key=item_sort_key,
+            for_json=for_json,
+            ignore_nan=ignore_nan,
+            int_as_string_bitcount=int_as_string_bitcount,
+            **kw).iterencode(obj)
+    # could accelerate with writelines in some versions of Python, at
+    # a debuggability cost
+    for chunk in iterable:
+        fp.write(chunk)
+
+
+def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True,
+          allow_nan=True, cls=None, indent=None, separators=None,
+          encoding='utf-8', default=None, use_decimal=True,
+          namedtuple_as_object=True, tuple_as_array=True,
+          bigint_as_string=False, sort_keys=False, item_sort_key=None,
+          for_json=False, ignore_nan=False, int_as_string_bitcount=None, **kw):
+    """Serialize ``obj`` to a JSON formatted ``str``.
+
+    If ``skipkeys`` is false then ``dict`` keys that are not basic types
+    (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``)
+    will be skipped instead of raising a ``TypeError``.
+
+    If ``ensure_ascii`` is false, then the return value will be a
+    ``unicode`` instance subject to normal Python ``str`` to ``unicode``
+    coercion rules instead of being escaped to an ASCII ``str``.
+
+    If ``check_circular`` is false, then the circular reference check
+    for container types will be skipped and a circular reference will
+    result in an ``OverflowError`` (or worse).
+
+    If ``allow_nan`` is false, then it will be a ``ValueError`` to
+    serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) in
+    strict compliance of the JSON specification, instead of using the
+    JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).
+
+    If ``indent`` is a string, then JSON array elements and object members
+    will be pretty-printed with a newline followed by that string repeated
+    for each level of nesting. ``None`` (the default) selects the most compact
+    representation without any newlines. For backwards compatibility with
+    versions of simplejson earlier than 2.1.0, an integer is also accepted
+    and is converted to a string with that many spaces.
+
+    If specified, ``separators`` should be an
+    ``(item_separator, key_separator)`` tuple.  The default is ``(', ', ': ')``
+    if *indent* is ``None`` and ``(',', ': ')`` otherwise.  To get the most
+    compact JSON representation, you should specify ``(',', ':')`` to eliminate
+    whitespace.
+
+    ``encoding`` is the character encoding for str instances, default is UTF-8.
+
+    ``default(obj)`` is a function that should return a serializable version
+    of obj or raise TypeError. The default simply raises TypeError.
+
+    If *use_decimal* is true (default: ``True``) then decimal.Decimal
+    will be natively serialized to JSON with full precision.
+
+    If *namedtuple_as_object* is true (default: ``True``),
+    :class:`tuple` subclasses with ``_asdict()`` methods will be encoded
+    as JSON objects.
+
+    If *tuple_as_array* is true (default: ``True``),
+    :class:`tuple` (and subclasses) will be encoded as JSON arrays.
+
+    If *bigint_as_string* is true (not the default), ints 2**53 and higher
+    or lower than -2**53 will be encoded as strings. This is to avoid the
+    rounding that happens in Javascript otherwise.
+
+    If *int_as_string_bitcount* is a positive number (n), then int of size
+    greater than or equal to 2**n or lower than or equal to -2**n will be
+    encoded as strings.
+
+    If specified, *item_sort_key* is a callable used to sort the items in
+    each dictionary. This is useful if you want to sort items other than
+    in alphabetical order by key. This option takes precendence over
+    *sort_keys*.
+
+    If *sort_keys* is true (default: ``False``), the output of dictionaries
+    will be sorted by item.
+
+    If *for_json* is true (default: ``False``), objects with a ``for_json()``
+    method will use the return value of that method for encoding as JSON
+    instead of the object.
+
+    If *ignore_nan* is true (default: ``False``), then out of range
+    :class:`float` values (``nan``, ``inf``, ``-inf``) will be serialized as
+    ``null`` in compliance with the ECMA-262 specification. If true, this will
+    override *allow_nan*.
+
+    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
+    ``.default()`` method to serialize additional types), specify it with
+    the ``cls`` kwarg. NOTE: You should use *default* instead of subclassing
+    whenever possible.
+
+    """
+    # cached encoder
+    if (
+        not skipkeys and ensure_ascii and
+        check_circular and allow_nan and
+        cls is None and indent is None and separators is None and
+        encoding == 'utf-8' and default is None and use_decimal
+        and namedtuple_as_object and tuple_as_array
+        and not bigint_as_string and not sort_keys
+        and not item_sort_key and not for_json
+        and not ignore_nan and int_as_string_bitcount is None
+        and not kw
+    ):
+        return _default_encoder.encode(obj)
+    if cls is None:
+        cls = JSONEncoder
+    return cls(
+        skipkeys=skipkeys, ensure_ascii=ensure_ascii,
+        check_circular=check_circular, allow_nan=allow_nan, indent=indent,
+        separators=separators, encoding=encoding, default=default,
+        use_decimal=use_decimal,
+        namedtuple_as_object=namedtuple_as_object,
+        tuple_as_array=tuple_as_array,
+        bigint_as_string=bigint_as_string,
+        sort_keys=sort_keys,
+        item_sort_key=item_sort_key,
+        for_json=for_json,
+        ignore_nan=ignore_nan,
+        int_as_string_bitcount=int_as_string_bitcount,
+        **kw).encode(obj)
+
+
+_default_decoder = JSONDecoder(encoding=None, object_hook=None,
+                               object_pairs_hook=None)
+
+
+def load(fp, encoding=None, cls=None, object_hook=None, parse_float=None,
+        parse_int=None, parse_constant=None, object_pairs_hook=None,
+        use_decimal=False, namedtuple_as_object=True, tuple_as_array=True,
+        **kw):
+    """Deserialize ``fp`` (a ``.read()``-supporting file-like object containing
+    a JSON document) to a Python object.
+
+    *encoding* determines the encoding used to interpret any
+    :class:`str` objects decoded by this instance (``'utf-8'`` by
+    default).  It has no effect when decoding :class:`unicode` objects.
+
+    Note that currently only encodings that are a superset of ASCII work,
+    strings of other encodings should be passed in as :class:`unicode`.
+
+    *object_hook*, if specified, will be called with the result of every
+    JSON object decoded and its return value will be used in place of the
+    given :class:`dict`.  This can be used to provide custom
+    deserializations (e.g. to support JSON-RPC class hinting).
+
+    *object_pairs_hook* is an optional function that will be called with
+    the result of any object literal decode with an ordered list of pairs.
+    The return value of *object_pairs_hook* will be used instead of the
+    :class:`dict`.  This feature can be used to implement custom decoders
+    that rely on the order that the key and value pairs are decoded (for
+    example, :func:`collections.OrderedDict` will remember the order of
+    insertion). If *object_hook* is also defined, the *object_pairs_hook*
+    takes priority.
+
+    *parse_float*, if specified, will be called with the string of every
+    JSON float to be decoded.  By default, this is equivalent to
+    ``float(num_str)``. This can be used to use another datatype or parser
+    for JSON floats (e.g. :class:`decimal.Decimal`).
+
+    *parse_int*, if specified, will be called with the string of every
+    JSON int to be decoded.  By default, this is equivalent to
+    ``int(num_str)``.  This can be used to use another datatype or parser
+    for JSON integers (e.g. :class:`float`).
+
+    *parse_constant*, if specified, will be called with one of the
+    following strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``.  This
+    can be used to raise an exception if invalid JSON numbers are
+    encountered.
+
+    If *use_decimal* is true (default: ``False``) then it implies
+    parse_float=decimal.Decimal for parity with ``dump``.
+
+    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
+    kwarg. NOTE: You should use *object_hook* or *object_pairs_hook* instead
+    of subclassing whenever possible.
+
+    """
+    return loads(fp.read(),
+        encoding=encoding, cls=cls, object_hook=object_hook,
+        parse_float=parse_float, parse_int=parse_int,
+        parse_constant=parse_constant, object_pairs_hook=object_pairs_hook,
+        use_decimal=use_decimal, **kw)
+
+
+def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None,
+        parse_int=None, parse_constant=None, object_pairs_hook=None,
+        use_decimal=False, **kw):
+    """Deserialize ``s`` (a ``str`` or ``unicode`` instance containing a JSON
+    document) to a Python object.
+
+    *encoding* determines the encoding used to interpret any
+    :class:`str` objects decoded by this instance (``'utf-8'`` by
+    default).  It has no effect when decoding :class:`unicode` objects.
+
+    Note that currently only encodings that are a superset of ASCII work,
+    strings of other encodings should be passed in as :class:`unicode`.
+
+    *object_hook*, if specified, will be called with the result of every
+    JSON object decoded and its return value will be used in place of the
+    given :class:`dict`.  This can be used to provide custom
+    deserializations (e.g. to support JSON-RPC class hinting).
+
+    *object_pairs_hook* is an optional function that will be called with
+    the result of any object literal decode with an ordered list of pairs.
+    The return value of *object_pairs_hook* will be used instead of the
+    :class:`dict`.  This feature can be used to implement custom decoders
+    that rely on the order that the key and value pairs are decoded (for
+    example, :func:`collections.OrderedDict` will remember the order of
+    insertion). If *object_hook* is also defined, the *object_pairs_hook*
+    takes priority.
+
+    *parse_float*, if specified, will be called with the string of every
+    JSON float to be decoded.  By default, this is equivalent to
+    ``float(num_str)``. This can be used to use another datatype or parser
+    for JSON floats (e.g. :class:`decimal.Decimal`).
+
+    *parse_int*, if specified, will be called with the string of every
+    JSON int to be decoded.  By default, this is equivalent to
+    ``int(num_str)``.  This can be used to use another datatype or parser
+    for JSON integers (e.g. :class:`float`).
+
+    *parse_constant*, if specified, will be called with one of the
+    following strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``.  This
+    can be used to raise an exception if invalid JSON numbers are
+    encountered.
+
+    If *use_decimal* is true (default: ``False``) then it implies
+    parse_float=decimal.Decimal for parity with ``dump``.
+
+    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
+    kwarg. NOTE: You should use *object_hook* or *object_pairs_hook* instead
+    of subclassing whenever possible.
+
+    """
+    if (cls is None and encoding is None and object_hook is None and
+            parse_int is None and parse_float is None and
+            parse_constant is None and object_pairs_hook is None
+            and not use_decimal and not kw):
+        return _default_decoder.decode(s)
+    if cls is None:
+        cls = JSONDecoder
+    if object_hook is not None:
+        kw['object_hook'] = object_hook
+    if object_pairs_hook is not None:
+        kw['object_pairs_hook'] = object_pairs_hook
+    if parse_float is not None:
+        kw['parse_float'] = parse_float
+    if parse_int is not None:
+        kw['parse_int'] = parse_int
+    if parse_constant is not None:
+        kw['parse_constant'] = parse_constant
+    if use_decimal:
+        if parse_float is not None:
+            raise TypeError("use_decimal=True implies parse_float=Decimal")
+        kw['parse_float'] = Decimal
+    return cls(encoding=encoding, **kw).decode(s)
+
+
+def _toggle_speedups(enabled):
+    from . import decoder as dec
+    from . import encoder as enc
+    from . import scanner as scan
+    c_make_encoder = _import_c_make_encoder()
+    if enabled:
+        dec.scanstring = dec.c_scanstring or dec.py_scanstring
+        enc.c_make_encoder = c_make_encoder
+        enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or
+            enc.py_encode_basestring_ascii)
+        scan.make_scanner = scan.c_make_scanner or scan.py_make_scanner
+    else:
+        dec.scanstring = dec.py_scanstring
+        enc.c_make_encoder = None
+        enc.encode_basestring_ascii = enc.py_encode_basestring_ascii
+        scan.make_scanner = scan.py_make_scanner
+    dec.make_scanner = scan.make_scanner
+    global _default_decoder
+    _default_decoder = JSONDecoder(
+        encoding=None,
+        object_hook=None,
+        object_pairs_hook=None,
+    )
+    global _default_encoder
+    _default_encoder = JSONEncoder(
+       skipkeys=False,
+       ensure_ascii=True,
+       check_circular=True,
+       allow_nan=True,
+       indent=None,
+       separators=None,
+       encoding='utf-8',
+       default=None,
+   )
+
+def simple_first(kv):
+    """Helper function to pass to item_sort_key to sort simple
+    elements to the top, then container elements.
+    """
+    return (isinstance(kv[1], (list, dict, tuple)), kv[0])
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/compat.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/compat.py
new file mode 100644
index 0000000000000000000000000000000000000000..a0af4a1cb86e070ca42b45ac5c7cd1eca3619c79
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/compat.py
@@ -0,0 +1,46 @@
+"""Python 3 compatibility shims
+"""
+import sys
+if sys.version_info[0] < 3:
+    PY3 = False
+    def b(s):
+        return s
+    def u(s):
+        return unicode(s, 'unicode_escape')
+    import cStringIO as StringIO
+    StringIO = BytesIO = StringIO.StringIO
+    text_type = unicode
+    binary_type = str
+    string_types = (basestring,)
+    integer_types = (int, long)
+    unichr = unichr
+    reload_module = reload
+    def fromhex(s):
+        return s.decode('hex')
+
+else:
+    PY3 = True
+    if sys.version_info[:2] >= (3, 4):
+        from importlib import reload as reload_module
+    else:
+        from imp import reload as reload_module
+    import codecs
+    def b(s):
+        return codecs.latin_1_encode(s)[0]
+    def u(s):
+        return s
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+    text_type = str
+    binary_type = bytes
+    string_types = (str,)
+    integer_types = (int,)
+
+    def unichr(s):
+        return u(chr(s))
+
+    def fromhex(s):
+        return bytes.fromhex(s)
+
+long_type = integer_types[-1]
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/decoder.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/decoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..545e65877b3591e7785edb1a5cff49c05c5af908
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/decoder.py
@@ -0,0 +1,400 @@
+"""Implementation of JSONDecoder
+"""
+from __future__ import absolute_import
+import re
+import sys
+import struct
+from .compat import fromhex, b, u, text_type, binary_type, PY3, unichr
+from .scanner import make_scanner, JSONDecodeError
+
+def _import_c_scanstring():
+    try:
+        from ._speedups import scanstring
+        return scanstring
+    except ImportError:
+        return None
+c_scanstring = _import_c_scanstring()
+
+# NOTE (3.1.0): JSONDecodeError may still be imported from this module for
+# compatibility, but it was never in the __all__
+__all__ = ['JSONDecoder']
+
+FLAGS = re.VERBOSE | re.MULTILINE | re.DOTALL
+
+def _floatconstants():
+    _BYTES = fromhex('7FF80000000000007FF0000000000000')
+    # The struct module in Python 2.4 would get frexp() out of range here
+    # when an endian is specified in the format string. Fixed in Python 2.5+
+    if sys.byteorder != 'big':
+        _BYTES = _BYTES[:8][::-1] + _BYTES[8:][::-1]
+    nan, inf = struct.unpack('dd', _BYTES)
+    return nan, inf, -inf
+
+NaN, PosInf, NegInf = _floatconstants()
+
+_CONSTANTS = {
+    '-Infinity': NegInf,
+    'Infinity': PosInf,
+    'NaN': NaN,
+}
+
+STRINGCHUNK = re.compile(r'(.*?)(["\\\x00-\x1f])', FLAGS)
+BACKSLASH = {
+    '"': u('"'), '\\': u('\u005c'), '/': u('/'),
+    'b': u('\b'), 'f': u('\f'), 'n': u('\n'), 'r': u('\r'), 't': u('\t'),
+}
+
+DEFAULT_ENCODING = "utf-8"
+
+def py_scanstring(s, end, encoding=None, strict=True,
+        _b=BACKSLASH, _m=STRINGCHUNK.match, _join=u('').join,
+        _PY3=PY3, _maxunicode=sys.maxunicode):
+    """Scan the string s for a JSON string. End is the index of the
+    character in s after the quote that started the JSON string.
+    Unescapes all valid JSON string escape sequences and raises ValueError
+    on attempt to decode an invalid string. If strict is False then literal
+    control characters are allowed in the string.
+
+    Returns a tuple of the decoded string and the index of the character in s
+    after the end quote."""
+    if encoding is None:
+        encoding = DEFAULT_ENCODING
+    chunks = []
+    _append = chunks.append
+    begin = end - 1
+    while 1:
+        chunk = _m(s, end)
+        if chunk is None:
+            raise JSONDecodeError(
+                "Unterminated string starting at", s, begin)
+        end = chunk.end()
+        content, terminator = chunk.groups()
+        # Content is contains zero or more unescaped string characters
+        if content:
+            if not _PY3 and not isinstance(content, text_type):
+                content = text_type(content, encoding)
+            _append(content)
+        # Terminator is the end of string, a literal control character,
+        # or a backslash denoting that an escape sequence follows
+        if terminator == '"':
+            break
+        elif terminator != '\\':
+            if strict:
+                msg = "Invalid control character %r at"
+                raise JSONDecodeError(msg, s, end)
+            else:
+                _append(terminator)
+                continue
+        try:
+            esc = s[end]
+        except IndexError:
+            raise JSONDecodeError(
+                "Unterminated string starting at", s, begin)
+        # If not a unicode escape sequence, must be in the lookup table
+        if esc != 'u':
+            try:
+                char = _b[esc]
+            except KeyError:
+                msg = "Invalid \\X escape sequence %r"
+                raise JSONDecodeError(msg, s, end)
+            end += 1
+        else:
+            # Unicode escape sequence
+            msg = "Invalid \\uXXXX escape sequence"
+            esc = s[end + 1:end + 5]
+            escX = esc[1:2]
+            if len(esc) != 4 or escX == 'x' or escX == 'X':
+                raise JSONDecodeError(msg, s, end - 1)
+            try:
+                uni = int(esc, 16)
+            except ValueError:
+                raise JSONDecodeError(msg, s, end - 1)
+            end += 5
+            # Check for surrogate pair on UCS-4 systems
+            # Note that this will join high/low surrogate pairs
+            # but will also pass unpaired surrogates through
+            if (_maxunicode > 65535 and
+                uni & 0xfc00 == 0xd800 and
+                s[end:end + 2] == '\\u'):
+                esc2 = s[end + 2:end + 6]
+                escX = esc2[1:2]
+                if len(esc2) == 4 and not (escX == 'x' or escX == 'X'):
+                    try:
+                        uni2 = int(esc2, 16)
+                    except ValueError:
+                        raise JSONDecodeError(msg, s, end)
+                    if uni2 & 0xfc00 == 0xdc00:
+                        uni = 0x10000 + (((uni - 0xd800) << 10) |
+                                         (uni2 - 0xdc00))
+                        end += 6
+            char = unichr(uni)
+        # Append the unescaped character
+        _append(char)
+    return _join(chunks), end
+
+
+# Use speedup if available
+scanstring = c_scanstring or py_scanstring
+
+WHITESPACE = re.compile(r'[ \t\n\r]*', FLAGS)
+WHITESPACE_STR = ' \t\n\r'
+
+def JSONObject(state, encoding, strict, scan_once, object_hook,
+        object_pairs_hook, memo=None,
+        _w=WHITESPACE.match, _ws=WHITESPACE_STR):
+    (s, end) = state
+    # Backwards compatibility
+    if memo is None:
+        memo = {}
+    memo_get = memo.setdefault
+    pairs = []
+    # Use a slice to prevent IndexError from being raised, the following
+    # check will raise a more specific ValueError if the string is empty
+    nextchar = s[end:end + 1]
+    # Normally we expect nextchar == '"'
+    if nextchar != '"':
+        if nextchar in _ws:
+            end = _w(s, end).end()
+            nextchar = s[end:end + 1]
+        # Trivial empty object
+        if nextchar == '}':
+            if object_pairs_hook is not None:
+                result = object_pairs_hook(pairs)
+                return result, end + 1
+            pairs = {}
+            if object_hook is not None:
+                pairs = object_hook(pairs)
+            return pairs, end + 1
+        elif nextchar != '"':
+            raise JSONDecodeError(
+                "Expecting property name enclosed in double quotes",
+                s, end)
+    end += 1
+    while True:
+        key, end = scanstring(s, end, encoding, strict)
+        key = memo_get(key, key)
+
+        # To skip some function call overhead we optimize the fast paths where
+        # the JSON key separator is ": " or just ":".
+        if s[end:end + 1] != ':':
+            end = _w(s, end).end()
+            if s[end:end + 1] != ':':
+                raise JSONDecodeError("Expecting ':' delimiter", s, end)
+
+        end += 1
+
+        try:
+            if s[end] in _ws:
+                end += 1
+                if s[end] in _ws:
+                    end = _w(s, end + 1).end()
+        except IndexError:
+            pass
+
+        value, end = scan_once(s, end)
+        pairs.append((key, value))
+
+        try:
+            nextchar = s[end]
+            if nextchar in _ws:
+                end = _w(s, end + 1).end()
+                nextchar = s[end]
+        except IndexError:
+            nextchar = ''
+        end += 1
+
+        if nextchar == '}':
+            break
+        elif nextchar != ',':
+            raise JSONDecodeError("Expecting ',' delimiter or '}'", s, end - 1)
+
+        try:
+            nextchar = s[end]
+            if nextchar in _ws:
+                end += 1
+                nextchar = s[end]
+                if nextchar in _ws:
+                    end = _w(s, end + 1).end()
+                    nextchar = s[end]
+        except IndexError:
+            nextchar = ''
+
+        end += 1
+        if nextchar != '"':
+            raise JSONDecodeError(
+                "Expecting property name enclosed in double quotes",
+                s, end - 1)
+
+    if object_pairs_hook is not None:
+        result = object_pairs_hook(pairs)
+        return result, end
+    pairs = dict(pairs)
+    if object_hook is not None:
+        pairs = object_hook(pairs)
+    return pairs, end
+
+def JSONArray(state, scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
+    (s, end) = state
+    values = []
+    nextchar = s[end:end + 1]
+    if nextchar in _ws:
+        end = _w(s, end + 1).end()
+        nextchar = s[end:end + 1]
+    # Look-ahead for trivial empty array
+    if nextchar == ']':
+        return values, end + 1
+    elif nextchar == '':
+        raise JSONDecodeError("Expecting value or ']'", s, end)
+    _append = values.append
+    while True:
+        value, end = scan_once(s, end)
+        _append(value)
+        nextchar = s[end:end + 1]
+        if nextchar in _ws:
+            end = _w(s, end + 1).end()
+            nextchar = s[end:end + 1]
+        end += 1
+        if nextchar == ']':
+            break
+        elif nextchar != ',':
+            raise JSONDecodeError("Expecting ',' delimiter or ']'", s, end - 1)
+
+        try:
+            if s[end] in _ws:
+                end += 1
+                if s[end] in _ws:
+                    end = _w(s, end + 1).end()
+        except IndexError:
+            pass
+
+    return values, end
+
+class JSONDecoder(object):
+    """Simple JSON <http://json.org> decoder
+
+    Performs the following translations in decoding by default:
+
+    +---------------+-------------------+
+    | JSON          | Python            |
+    +===============+===================+
+    | object        | dict              |
+    +---------------+-------------------+
+    | array         | list              |
+    +---------------+-------------------+
+    | string        | str, unicode      |
+    +---------------+-------------------+
+    | number (int)  | int, long         |
+    +---------------+-------------------+
+    | number (real) | float             |
+    +---------------+-------------------+
+    | true          | True              |
+    +---------------+-------------------+
+    | false         | False             |
+    +---------------+-------------------+
+    | null          | None              |
+    +---------------+-------------------+
+
+    It also understands ``NaN``, ``Infinity``, and ``-Infinity`` as
+    their corresponding ``float`` values, which is outside the JSON spec.
+
+    """
+
+    def __init__(self, encoding=None, object_hook=None, parse_float=None,
+            parse_int=None, parse_constant=None, strict=True,
+            object_pairs_hook=None):
+        """
+        *encoding* determines the encoding used to interpret any
+        :class:`str` objects decoded by this instance (``'utf-8'`` by
+        default).  It has no effect when decoding :class:`unicode` objects.
+
+        Note that currently only encodings that are a superset of ASCII work,
+        strings of other encodings should be passed in as :class:`unicode`.
+
+        *object_hook*, if specified, will be called with the result of every
+        JSON object decoded and its return value will be used in place of the
+        given :class:`dict`.  This can be used to provide custom
+        deserializations (e.g. to support JSON-RPC class hinting).
+
+        *object_pairs_hook* is an optional function that will be called with
+        the result of any object literal decode with an ordered list of pairs.
+        The return value of *object_pairs_hook* will be used instead of the
+        :class:`dict`.  This feature can be used to implement custom decoders
+        that rely on the order that the key and value pairs are decoded (for
+        example, :func:`collections.OrderedDict` will remember the order of
+        insertion). If *object_hook* is also defined, the *object_pairs_hook*
+        takes priority.
+
+        *parse_float*, if specified, will be called with the string of every
+        JSON float to be decoded.  By default, this is equivalent to
+        ``float(num_str)``. This can be used to use another datatype or parser
+        for JSON floats (e.g. :class:`decimal.Decimal`).
+
+        *parse_int*, if specified, will be called with the string of every
+        JSON int to be decoded.  By default, this is equivalent to
+        ``int(num_str)``.  This can be used to use another datatype or parser
+        for JSON integers (e.g. :class:`float`).
+
+        *parse_constant*, if specified, will be called with one of the
+        following strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``.  This
+        can be used to raise an exception if invalid JSON numbers are
+        encountered.
+
+        *strict* controls the parser's behavior when it encounters an
+        invalid control character in a string. The default setting of
+        ``True`` means that unescaped control characters are parse errors, if
+        ``False`` then control characters will be allowed in strings.
+
+        """
+        if encoding is None:
+            encoding = DEFAULT_ENCODING
+        self.encoding = encoding
+        self.object_hook = object_hook
+        self.object_pairs_hook = object_pairs_hook
+        self.parse_float = parse_float or float
+        self.parse_int = parse_int or int
+        self.parse_constant = parse_constant or _CONSTANTS.__getitem__
+        self.strict = strict
+        self.parse_object = JSONObject
+        self.parse_array = JSONArray
+        self.parse_string = scanstring
+        self.memo = {}
+        self.scan_once = make_scanner(self)
+
+    def decode(self, s, _w=WHITESPACE.match, _PY3=PY3):
+        """Return the Python representation of ``s`` (a ``str`` or ``unicode``
+        instance containing a JSON document)
+
+        """
+        if _PY3 and isinstance(s, binary_type):
+            s = s.decode(self.encoding)
+        obj, end = self.raw_decode(s)
+        end = _w(s, end).end()
+        if end != len(s):
+            raise JSONDecodeError("Extra data", s, end, len(s))
+        return obj
+
+    def raw_decode(self, s, idx=0, _w=WHITESPACE.match, _PY3=PY3):
+        """Decode a JSON document from ``s`` (a ``str`` or ``unicode``
+        beginning with a JSON document) and return a 2-tuple of the Python
+        representation and the index in ``s`` where the document ended.
+        Optionally, ``idx`` can be used to specify an offset in ``s`` where
+        the JSON document begins.
+
+        This can be used to decode a JSON document from a string that may
+        have extraneous data at the end.
+
+        """
+        if idx < 0:
+            # Ensure that raw_decode bails on negative indexes, the regex
+            # would otherwise mask this behavior. #98
+            raise JSONDecodeError('Expecting value', s, idx)
+        if _PY3 and not isinstance(s, text_type):
+            raise TypeError("Input string must be text, not bytes")
+        # strip UTF-8 bom
+        if len(s) > idx:
+            ord0 = ord(s[idx])
+            if ord0 == 0xfeff:
+                idx += 1
+            elif ord0 == 0xef and s[idx:idx + 3] == '\xef\xbb\xbf':
+                idx += 3
+        return self.scan_once(s, idx=_w(s, idx).end())
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/encoder.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..db18244ecbf994b32f44bbfab064c1469814d96a
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/encoder.py
@@ -0,0 +1,648 @@
+"""Implementation of JSONEncoder
+"""
+from __future__ import absolute_import
+import re
+from operator import itemgetter
+from decimal import Decimal
+from .compat import u, unichr, binary_type, string_types, integer_types, PY3
+def _import_speedups():
+    try:
+        from . import _speedups
+        return _speedups.encode_basestring_ascii, _speedups.make_encoder
+    except ImportError:
+        return None, None
+c_encode_basestring_ascii, c_make_encoder = _import_speedups()
+
+from simplejson.decoder import PosInf
+
+#ESCAPE = re.compile(ur'[\x00-\x1f\\"\b\f\n\r\t\u2028\u2029]')
+# This is required because u() will mangle the string and ur'' isn't valid
+# python3 syntax
+ESCAPE = re.compile(u'[\\x00-\\x1f\\\\"\\b\\f\\n\\r\\t\u2028\u2029]')
+ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])')
+HAS_UTF8 = re.compile(r'[\x80-\xff]')
+ESCAPE_DCT = {
+    '\\': '\\\\',
+    '"': '\\"',
+    '\b': '\\b',
+    '\f': '\\f',
+    '\n': '\\n',
+    '\r': '\\r',
+    '\t': '\\t',
+}
+for i in range(0x20):
+    #ESCAPE_DCT.setdefault(chr(i), '\\u{0:04x}'.format(i))
+    ESCAPE_DCT.setdefault(chr(i), '\\u%04x' % (i,))
+for i in [0x2028, 0x2029]:
+    ESCAPE_DCT.setdefault(unichr(i), '\\u%04x' % (i,))
+
+FLOAT_REPR = repr
+
+def encode_basestring(s, _PY3=PY3, _q=u('"')):
+    """Return a JSON representation of a Python string
+
+    """
+    if _PY3:
+        if isinstance(s, binary_type):
+            s = s.decode('utf-8')
+    else:
+        if isinstance(s, str) and HAS_UTF8.search(s) is not None:
+            s = s.decode('utf-8')
+    def replace(match):
+        return ESCAPE_DCT[match.group(0)]
+    return _q + ESCAPE.sub(replace, s) + _q
+
+
+def py_encode_basestring_ascii(s, _PY3=PY3):
+    """Return an ASCII-only JSON representation of a Python string
+
+    """
+    if _PY3:
+        if isinstance(s, binary_type):
+            s = s.decode('utf-8')
+    else:
+        if isinstance(s, str) and HAS_UTF8.search(s) is not None:
+            s = s.decode('utf-8')
+    def replace(match):
+        s = match.group(0)
+        try:
+            return ESCAPE_DCT[s]
+        except KeyError:
+            n = ord(s)
+            if n < 0x10000:
+                #return '\\u{0:04x}'.format(n)
+                return '\\u%04x' % (n,)
+            else:
+                # surrogate pair
+                n -= 0x10000
+                s1 = 0xd800 | ((n >> 10) & 0x3ff)
+                s2 = 0xdc00 | (n & 0x3ff)
+                #return '\\u{0:04x}\\u{1:04x}'.format(s1, s2)
+                return '\\u%04x\\u%04x' % (s1, s2)
+    return '"' + str(ESCAPE_ASCII.sub(replace, s)) + '"'
+
+
+encode_basestring_ascii = (
+    c_encode_basestring_ascii or py_encode_basestring_ascii)
+
+class JSONEncoder(object):
+    """Extensible JSON <http://json.org> encoder for Python data structures.
+
+    Supports the following objects and types by default:
+
+    +-------------------+---------------+
+    | Python            | JSON          |
+    +===================+===============+
+    | dict, namedtuple  | object        |
+    +-------------------+---------------+
+    | list, tuple       | array         |
+    +-------------------+---------------+
+    | str, unicode      | string        |
+    +-------------------+---------------+
+    | int, long, float  | number        |
+    +-------------------+---------------+
+    | True              | true          |
+    +-------------------+---------------+
+    | False             | false         |
+    +-------------------+---------------+
+    | None              | null          |
+    +-------------------+---------------+
+
+    To extend this to recognize other objects, subclass and implement a
+    ``.default()`` method with another method that returns a serializable
+    object for ``o`` if possible, otherwise it should call the superclass
+    implementation (to raise ``TypeError``).
+
+    """
+    item_separator = ', '
+    key_separator = ': '
+
+    def __init__(self, skipkeys=False, ensure_ascii=True,
+                 check_circular=True, allow_nan=True, sort_keys=False,
+                 indent=None, separators=None, encoding='utf-8', default=None,
+                 use_decimal=True, namedtuple_as_object=True,
+                 tuple_as_array=True, bigint_as_string=False,
+                 item_sort_key=None, for_json=False, ignore_nan=False,
+                 int_as_string_bitcount=None):
+        """Constructor for JSONEncoder, with sensible defaults.
+
+        If skipkeys is false, then it is a TypeError to attempt
+        encoding of keys that are not str, int, long, float or None.  If
+        skipkeys is True, such items are simply skipped.
+
+        If ensure_ascii is true, the output is guaranteed to be str
+        objects with all incoming unicode characters escaped.  If
+        ensure_ascii is false, the output will be unicode object.
+
+        If check_circular is true, then lists, dicts, and custom encoded
+        objects will be checked for circular references during encoding to
+        prevent an infinite recursion (which would cause an OverflowError).
+        Otherwise, no such check takes place.
+
+        If allow_nan is true, then NaN, Infinity, and -Infinity will be
+        encoded as such.  This behavior is not JSON specification compliant,
+        but is consistent with most JavaScript based encoders and decoders.
+        Otherwise, it will be a ValueError to encode such floats.
+
+        If sort_keys is true, then the output of dictionaries will be
+        sorted by key; this is useful for regression tests to ensure
+        that JSON serializations can be compared on a day-to-day basis.
+
+        If indent is a string, then JSON array elements and object members
+        will be pretty-printed with a newline followed by that string repeated
+        for each level of nesting. ``None`` (the default) selects the most compact
+        representation without any newlines. For backwards compatibility with
+        versions of simplejson earlier than 2.1.0, an integer is also accepted
+        and is converted to a string with that many spaces.
+
+        If specified, separators should be an (item_separator, key_separator)
+        tuple.  The default is (', ', ': ') if *indent* is ``None`` and
+        (',', ': ') otherwise.  To get the most compact JSON representation,
+        you should specify (',', ':') to eliminate whitespace.
+
+        If specified, default is a function that gets called for objects
+        that can't otherwise be serialized.  It should return a JSON encodable
+        version of the object or raise a ``TypeError``.
+
+        If encoding is not None, then all input strings will be
+        transformed into unicode using that encoding prior to JSON-encoding.
+        The default is UTF-8.
+
+        If use_decimal is true (not the default), ``decimal.Decimal`` will
+        be supported directly by the encoder. For the inverse, decode JSON
+        with ``parse_float=decimal.Decimal``.
+
+        If namedtuple_as_object is true (the default), objects with
+        ``_asdict()`` methods will be encoded as JSON objects.
+
+        If tuple_as_array is true (the default), tuple (and subclasses) will
+        be encoded as JSON arrays.
+
+        If bigint_as_string is true (not the default), ints 2**53 and higher
+        or lower than -2**53 will be encoded as strings. This is to avoid the
+        rounding that happens in Javascript otherwise.
+
+        If int_as_string_bitcount is a positive number (n), then int of size
+        greater than or equal to 2**n or lower than or equal to -2**n will be
+        encoded as strings.
+
+        If specified, item_sort_key is a callable used to sort the items in
+        each dictionary. This is useful if you want to sort items other than
+        in alphabetical order by key.
+
+        If for_json is true (not the default), objects with a ``for_json()``
+        method will use the return value of that method for encoding as JSON
+        instead of the object.
+
+        If *ignore_nan* is true (default: ``False``), then out of range
+        :class:`float` values (``nan``, ``inf``, ``-inf``) will be serialized
+        as ``null`` in compliance with the ECMA-262 specification. If true,
+        this will override *allow_nan*.
+
+        """
+
+        self.skipkeys = skipkeys
+        self.ensure_ascii = ensure_ascii
+        self.check_circular = check_circular
+        self.allow_nan = allow_nan
+        self.sort_keys = sort_keys
+        self.use_decimal = use_decimal
+        self.namedtuple_as_object = namedtuple_as_object
+        self.tuple_as_array = tuple_as_array
+        self.bigint_as_string = bigint_as_string
+        self.item_sort_key = item_sort_key
+        self.for_json = for_json
+        self.ignore_nan = ignore_nan
+        self.int_as_string_bitcount = int_as_string_bitcount
+        if indent is not None and not isinstance(indent, string_types):
+            indent = indent * ' '
+        self.indent = indent
+        if separators is not None:
+            self.item_separator, self.key_separator = separators
+        elif indent is not None:
+            self.item_separator = ','
+        if default is not None:
+            self.default = default
+        self.encoding = encoding
+
+    def default(self, o):
+        """Implement this method in a subclass such that it returns
+        a serializable object for ``o``, or calls the base implementation
+        (to raise a ``TypeError``).
+
+        For example, to support arbitrary iterators, you could
+        implement default like this::
+
+            def default(self, o):
+                try:
+                    iterable = iter(o)
+                except TypeError:
+                    pass
+                else:
+                    return list(iterable)
+                return JSONEncoder.default(self, o)
+
+        """
+        raise TypeError(repr(o) + " is not JSON serializable")
+
+    def encode(self, o):
+        """Return a JSON string representation of a Python data structure.
+
+        >>> from simplejson import JSONEncoder
+        >>> JSONEncoder().encode({"foo": ["bar", "baz"]})
+        '{"foo": ["bar", "baz"]}'
+
+        """
+        # This is for extremely simple cases and benchmarks.
+        if isinstance(o, binary_type):
+            _encoding = self.encoding
+            if (_encoding is not None and not (_encoding == 'utf-8')):
+                o = o.decode(_encoding)
+        if isinstance(o, string_types):
+            if self.ensure_ascii:
+                return encode_basestring_ascii(o)
+            else:
+                return encode_basestring(o)
+        # This doesn't pass the iterator directly to ''.join() because the
+        # exceptions aren't as detailed.  The list call should be roughly
+        # equivalent to the PySequence_Fast that ''.join() would do.
+        chunks = self.iterencode(o, _one_shot=True)
+        if not isinstance(chunks, (list, tuple)):
+            chunks = list(chunks)
+        if self.ensure_ascii:
+            return ''.join(chunks)
+        else:
+            return u''.join(chunks)
+
+    def iterencode(self, o, _one_shot=False):
+        """Encode the given object and yield each string
+        representation as available.
+
+        For example::
+
+            for chunk in JSONEncoder().iterencode(bigobject):
+                mysocket.write(chunk)
+
+        """
+        if self.check_circular:
+            markers = {}
+        else:
+            markers = None
+        if self.ensure_ascii:
+            _encoder = encode_basestring_ascii
+        else:
+            _encoder = encode_basestring
+        if self.encoding != 'utf-8':
+            def _encoder(o, _orig_encoder=_encoder, _encoding=self.encoding):
+                if isinstance(o, binary_type):
+                    o = o.decode(_encoding)
+                return _orig_encoder(o)
+
+        def floatstr(o, allow_nan=self.allow_nan, ignore_nan=self.ignore_nan,
+                _repr=FLOAT_REPR, _inf=PosInf, _neginf=-PosInf):
+            # Check for specials. Note that this type of test is processor
+            # and/or platform-specific, so do tests which don't depend on
+            # the internals.
+
+            if o != o:
+                text = 'NaN'
+            elif o == _inf:
+                text = 'Infinity'
+            elif o == _neginf:
+                text = '-Infinity'
+            else:
+                return _repr(o)
+
+            if ignore_nan:
+                text = 'null'
+            elif not allow_nan:
+                raise ValueError(
+                    "Out of range float values are not JSON compliant: " +
+                    repr(o))
+
+            return text
+
+        key_memo = {}
+        int_as_string_bitcount = (
+            53 if self.bigint_as_string else self.int_as_string_bitcount)
+        if (_one_shot and c_make_encoder is not None
+                and self.indent is None):
+            _iterencode = c_make_encoder(
+                markers, self.default, _encoder, self.indent,
+                self.key_separator, self.item_separator, self.sort_keys,
+                self.skipkeys, self.allow_nan, key_memo, self.use_decimal,
+                self.namedtuple_as_object, self.tuple_as_array,
+                int_as_string_bitcount,
+                self.item_sort_key, self.encoding, self.for_json,
+                self.ignore_nan, Decimal)
+        else:
+            _iterencode = _make_iterencode(
+                markers, self.default, _encoder, self.indent, floatstr,
+                self.key_separator, self.item_separator, self.sort_keys,
+                self.skipkeys, _one_shot, self.use_decimal,
+                self.namedtuple_as_object, self.tuple_as_array,
+                int_as_string_bitcount,
+                self.item_sort_key, self.encoding, self.for_json,
+                Decimal=Decimal)
+        try:
+            return _iterencode(o, 0)
+        finally:
+            key_memo.clear()
+
+
+class JSONEncoderForHTML(JSONEncoder):
+    """An encoder that produces JSON safe to embed in HTML.
+
+    To embed JSON content in, say, a script tag on a web page, the
+    characters &, < and > should be escaped. They cannot be escaped
+    with the usual entities (e.g. &amp;) because they are not expanded
+    within <script> tags.
+    """
+
+    def encode(self, o):
+        # Override JSONEncoder.encode because it has hacks for
+        # performance that make things more complicated.
+        chunks = self.iterencode(o, True)
+        if self.ensure_ascii:
+            return ''.join(chunks)
+        else:
+            return u''.join(chunks)
+
+    def iterencode(self, o, _one_shot=False):
+        chunks = super(JSONEncoderForHTML, self).iterencode(o, _one_shot)
+        for chunk in chunks:
+            chunk = chunk.replace('&', '\\u0026')
+            chunk = chunk.replace('<', '\\u003c')
+            chunk = chunk.replace('>', '\\u003e')
+            yield chunk
+
+
+def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
+        _key_separator, _item_separator, _sort_keys, _skipkeys, _one_shot,
+        _use_decimal, _namedtuple_as_object, _tuple_as_array,
+        _int_as_string_bitcount, _item_sort_key,
+        _encoding,_for_json,
+        ## HACK: hand-optimized bytecode; turn globals into locals
+        _PY3=PY3,
+        ValueError=ValueError,
+        string_types=string_types,
+        Decimal=Decimal,
+        dict=dict,
+        float=float,
+        id=id,
+        integer_types=integer_types,
+        isinstance=isinstance,
+        list=list,
+        str=str,
+        tuple=tuple,
+    ):
+    if _item_sort_key and not callable(_item_sort_key):
+        raise TypeError("item_sort_key must be None or callable")
+    elif _sort_keys and not _item_sort_key:
+        _item_sort_key = itemgetter(0)
+
+    if (_int_as_string_bitcount is not None and
+        (_int_as_string_bitcount <= 0 or
+         not isinstance(_int_as_string_bitcount, integer_types))):
+        raise TypeError("int_as_string_bitcount must be a positive integer")
+
+    def _encode_int(value):
+        skip_quoting = (
+            _int_as_string_bitcount is None
+            or
+            _int_as_string_bitcount < 1
+        )
+        if (
+            skip_quoting or
+            (-1 << _int_as_string_bitcount)
+            < value <
+            (1 << _int_as_string_bitcount)
+        ):
+            return str(value)
+        return '"' + str(value) + '"'
+
+    def _iterencode_list(lst, _current_indent_level):
+        if not lst:
+            yield '[]'
+            return
+        if markers is not None:
+            markerid = id(lst)
+            if markerid in markers:
+                raise ValueError("Circular reference detected")
+            markers[markerid] = lst
+        buf = '['
+        if _indent is not None:
+            _current_indent_level += 1
+            newline_indent = '\n' + (_indent * _current_indent_level)
+            separator = _item_separator + newline_indent
+            buf += newline_indent
+        else:
+            newline_indent = None
+            separator = _item_separator
+        first = True
+        for value in lst:
+            if first:
+                first = False
+            else:
+                buf = separator
+            if (isinstance(value, string_types) or
+                (_PY3 and isinstance(value, binary_type))):
+                yield buf + _encoder(value)
+            elif value is None:
+                yield buf + 'null'
+            elif value is True:
+                yield buf + 'true'
+            elif value is False:
+                yield buf + 'false'
+            elif isinstance(value, integer_types):
+                yield buf + _encode_int(value)
+            elif isinstance(value, float):
+                yield buf + _floatstr(value)
+            elif _use_decimal and isinstance(value, Decimal):
+                yield buf + str(value)
+            else:
+                yield buf
+                for_json = _for_json and getattr(value, 'for_json', None)
+                if for_json and callable(for_json):
+                    chunks = _iterencode(for_json(), _current_indent_level)
+                elif isinstance(value, list):
+                    chunks = _iterencode_list(value, _current_indent_level)
+                else:
+                    _asdict = _namedtuple_as_object and getattr(value, '_asdict', None)
+                    if _asdict and callable(_asdict):
+                        chunks = _iterencode_dict(_asdict(),
+                                                  _current_indent_level)
+                    elif _tuple_as_array and isinstance(value, tuple):
+                        chunks = _iterencode_list(value, _current_indent_level)
+                    elif isinstance(value, dict):
+                        chunks = _iterencode_dict(value, _current_indent_level)
+                    else:
+                        chunks = _iterencode(value, _current_indent_level)
+                for chunk in chunks:
+                    yield chunk
+        if newline_indent is not None:
+            _current_indent_level -= 1
+            yield '\n' + (_indent * _current_indent_level)
+        yield ']'
+        if markers is not None:
+            del markers[markerid]
+
+    def _stringify_key(key):
+        if isinstance(key, string_types): # pragma: no cover
+            pass
+        elif isinstance(key, binary_type):
+            key = key.decode(_encoding)
+        elif isinstance(key, float):
+            key = _floatstr(key)
+        elif key is True:
+            key = 'true'
+        elif key is False:
+            key = 'false'
+        elif key is None:
+            key = 'null'
+        elif isinstance(key, integer_types):
+            key = str(key)
+        elif _use_decimal and isinstance(key, Decimal):
+            key = str(key)
+        elif _skipkeys:
+            key = None
+        else:
+            raise TypeError("key " + repr(key) + " is not a string")
+        return key
+
+    def _iterencode_dict(dct, _current_indent_level):
+        if not dct:
+            yield '{}'
+            return
+        if markers is not None:
+            markerid = id(dct)
+            if markerid in markers:
+                raise ValueError("Circular reference detected")
+            markers[markerid] = dct
+        yield '{'
+        if _indent is not None:
+            _current_indent_level += 1
+            newline_indent = '\n' + (_indent * _current_indent_level)
+            item_separator = _item_separator + newline_indent
+            yield newline_indent
+        else:
+            newline_indent = None
+            item_separator = _item_separator
+        first = True
+        if _PY3:
+            iteritems = dct.items()
+        else:
+            iteritems = dct.iteritems()
+        if _item_sort_key:
+            items = []
+            for k, v in dct.items():
+                if not isinstance(k, string_types):
+                    k = _stringify_key(k)
+                    if k is None:
+                        continue
+                items.append((k, v))
+            items.sort(key=_item_sort_key)
+        else:
+            items = iteritems
+        for key, value in items:
+            if not (_item_sort_key or isinstance(key, string_types)):
+                key = _stringify_key(key)
+                if key is None:
+                    # _skipkeys must be True
+                    continue
+            if first:
+                first = False
+            else:
+                yield item_separator
+            yield _encoder(key)
+            yield _key_separator
+            if (isinstance(value, string_types) or
+                (_PY3 and isinstance(value, binary_type))):
+                yield _encoder(value)
+            elif value is None:
+                yield 'null'
+            elif value is True:
+                yield 'true'
+            elif value is False:
+                yield 'false'
+            elif isinstance(value, integer_types):
+                yield _encode_int(value)
+            elif isinstance(value, float):
+                yield _floatstr(value)
+            elif _use_decimal and isinstance(value, Decimal):
+                yield str(value)
+            else:
+                for_json = _for_json and getattr(value, 'for_json', None)
+                if for_json and callable(for_json):
+                    chunks = _iterencode(for_json(), _current_indent_level)
+                elif isinstance(value, list):
+                    chunks = _iterencode_list(value, _current_indent_level)
+                else:
+                    _asdict = _namedtuple_as_object and getattr(value, '_asdict', None)
+                    if _asdict and callable(_asdict):
+                        chunks = _iterencode_dict(_asdict(),
+                                                  _current_indent_level)
+                    elif _tuple_as_array and isinstance(value, tuple):
+                        chunks = _iterencode_list(value, _current_indent_level)
+                    elif isinstance(value, dict):
+                        chunks = _iterencode_dict(value, _current_indent_level)
+                    else:
+                        chunks = _iterencode(value, _current_indent_level)
+                for chunk in chunks:
+                    yield chunk
+        if newline_indent is not None:
+            _current_indent_level -= 1
+            yield '\n' + (_indent * _current_indent_level)
+        yield '}'
+        if markers is not None:
+            del markers[markerid]
+
+    def _iterencode(o, _current_indent_level):
+        if (isinstance(o, string_types) or
+            (_PY3 and isinstance(o, binary_type))):
+            yield _encoder(o)
+        elif o is None:
+            yield 'null'
+        elif o is True:
+            yield 'true'
+        elif o is False:
+            yield 'false'
+        elif isinstance(o, integer_types):
+            yield _encode_int(o)
+        elif isinstance(o, float):
+            yield _floatstr(o)
+        else:
+            for_json = _for_json and getattr(o, 'for_json', None)
+            if for_json and callable(for_json):
+                for chunk in _iterencode(for_json(), _current_indent_level):
+                    yield chunk
+            elif isinstance(o, list):
+                for chunk in _iterencode_list(o, _current_indent_level):
+                    yield chunk
+            else:
+                _asdict = _namedtuple_as_object and getattr(o, '_asdict', None)
+                if _asdict and callable(_asdict):
+                    for chunk in _iterencode_dict(_asdict(),
+                            _current_indent_level):
+                        yield chunk
+                elif (_tuple_as_array and isinstance(o, tuple)):
+                    for chunk in _iterencode_list(o, _current_indent_level):
+                        yield chunk
+                elif isinstance(o, dict):
+                    for chunk in _iterencode_dict(o, _current_indent_level):
+                        yield chunk
+                elif _use_decimal and isinstance(o, Decimal):
+                    yield str(o)
+                else:
+                    if markers is not None:
+                        markerid = id(o)
+                        if markerid in markers:
+                            raise ValueError("Circular reference detected")
+                        markers[markerid] = o
+                    o = _default(o)
+                    for chunk in _iterencode(o, _current_indent_level):
+                        yield chunk
+                    if markers is not None:
+                        del markers[markerid]
+
+    return _iterencode
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/ordered_dict.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/ordered_dict.py
new file mode 100644
index 0000000000000000000000000000000000000000..87ad8882482ca02970df711f4aa1039bece45cb9
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/ordered_dict.py
@@ -0,0 +1,119 @@
+"""Drop-in replacement for collections.OrderedDict by Raymond Hettinger
+
+http://code.activestate.com/recipes/576693/
+
+"""
+from UserDict import DictMixin
+
+# Modified from original to support Python 2.4, see
+# http://code.google.com/p/simplejson/issues/detail?id=53
+try:
+    all
+except NameError:
+    def all(seq):
+        for elem in seq:
+            if not elem:
+                return False
+        return True
+
+class OrderedDict(dict, DictMixin):
+
+    def __init__(self, *args, **kwds):
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__end
+        except AttributeError:
+            self.clear()
+        self.update(*args, **kwds)
+
+    def clear(self):
+        self.__end = end = []
+        end += [None, end, end]         # sentinel node for doubly linked list
+        self.__map = {}                 # key --> [key, prev, next]
+        dict.clear(self)
+
+    def __setitem__(self, key, value):
+        if key not in self:
+            end = self.__end
+            curr = end[1]
+            curr[2] = end[1] = self.__map[key] = [key, curr, end]
+        dict.__setitem__(self, key, value)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        key, prev, next = self.__map.pop(key)
+        prev[2] = next
+        next[1] = prev
+
+    def __iter__(self):
+        end = self.__end
+        curr = end[2]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[2]
+
+    def __reversed__(self):
+        end = self.__end
+        curr = end[1]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[1]
+
+    def popitem(self, last=True):
+        if not self:
+            raise KeyError('dictionary is empty')
+        # Modified from original to support Python 2.4, see
+        # http://code.google.com/p/simplejson/issues/detail?id=53
+        if last:
+            key = reversed(self).next()
+        else:
+            key = iter(self).next()
+        value = self.pop(key)
+        return key, value
+
+    def __reduce__(self):
+        items = [[k, self[k]] for k in self]
+        tmp = self.__map, self.__end
+        del self.__map, self.__end
+        inst_dict = vars(self).copy()
+        self.__map, self.__end = tmp
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def keys(self):
+        return list(self)
+
+    setdefault = DictMixin.setdefault
+    update = DictMixin.update
+    pop = DictMixin.pop
+    values = DictMixin.values
+    items = DictMixin.items
+    iterkeys = DictMixin.iterkeys
+    itervalues = DictMixin.itervalues
+    iteritems = DictMixin.iteritems
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % (self.__class__.__name__,)
+        return '%s(%r)' % (self.__class__.__name__, self.items())
+
+    def copy(self):
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        d = cls()
+        for key in iterable:
+            d[key] = value
+        return d
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedDict):
+            return len(self)==len(other) and \
+                   all(p==q for p, q in  zip(self.items(), other.items()))
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        return not self == other
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/scanner.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/scanner.py
new file mode 100644
index 0000000000000000000000000000000000000000..5abed357b3d0162f3a2ac7711bef6b1b3e084d43
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/scanner.py
@@ -0,0 +1,133 @@
+"""JSON token scanner
+"""
+import re
+def _import_c_make_scanner():
+    try:
+        from simplejson._speedups import make_scanner
+        return make_scanner
+    except ImportError:
+        return None
+c_make_scanner = _import_c_make_scanner()
+
+__all__ = ['make_scanner', 'JSONDecodeError']
+
+NUMBER_RE = re.compile(
+    r'(-?(?:0|[1-9]\d*))(\.\d+)?([eE][-+]?\d+)?',
+    (re.VERBOSE | re.MULTILINE | re.DOTALL))
+
+class JSONDecodeError(ValueError):
+    """Subclass of ValueError with the following additional properties:
+
+    msg: The unformatted error message
+    doc: The JSON document being parsed
+    pos: The start index of doc where parsing failed
+    end: The end index of doc where parsing failed (may be None)
+    lineno: The line corresponding to pos
+    colno: The column corresponding to pos
+    endlineno: The line corresponding to end (may be None)
+    endcolno: The column corresponding to end (may be None)
+
+    """
+    # Note that this exception is used from _speedups
+    def __init__(self, msg, doc, pos, end=None):
+        ValueError.__init__(self, errmsg(msg, doc, pos, end=end))
+        self.msg = msg
+        self.doc = doc
+        self.pos = pos
+        self.end = end
+        self.lineno, self.colno = linecol(doc, pos)
+        if end is not None:
+            self.endlineno, self.endcolno = linecol(doc, end)
+        else:
+            self.endlineno, self.endcolno = None, None
+
+    def __reduce__(self):
+        return self.__class__, (self.msg, self.doc, self.pos, self.end)
+
+
+def linecol(doc, pos):
+    lineno = doc.count('\n', 0, pos) + 1
+    if lineno == 1:
+        colno = pos + 1
+    else:
+        colno = pos - doc.rindex('\n', 0, pos)
+    return lineno, colno
+
+
+def errmsg(msg, doc, pos, end=None):
+    lineno, colno = linecol(doc, pos)
+    msg = msg.replace('%r', repr(doc[pos:pos + 1]))
+    if end is None:
+        fmt = '%s: line %d column %d (char %d)'
+        return fmt % (msg, lineno, colno, pos)
+    endlineno, endcolno = linecol(doc, end)
+    fmt = '%s: line %d column %d - line %d column %d (char %d - %d)'
+    return fmt % (msg, lineno, colno, endlineno, endcolno, pos, end)
+
+
+def py_make_scanner(context):
+    parse_object = context.parse_object
+    parse_array = context.parse_array
+    parse_string = context.parse_string
+    match_number = NUMBER_RE.match
+    encoding = context.encoding
+    strict = context.strict
+    parse_float = context.parse_float
+    parse_int = context.parse_int
+    parse_constant = context.parse_constant
+    object_hook = context.object_hook
+    object_pairs_hook = context.object_pairs_hook
+    memo = context.memo
+
+    def _scan_once(string, idx):
+        errmsg = 'Expecting value'
+        try:
+            nextchar = string[idx]
+        except IndexError:
+            raise JSONDecodeError(errmsg, string, idx)
+
+        if nextchar == '"':
+            return parse_string(string, idx + 1, encoding, strict)
+        elif nextchar == '{':
+            return parse_object((string, idx + 1), encoding, strict,
+                _scan_once, object_hook, object_pairs_hook, memo)
+        elif nextchar == '[':
+            return parse_array((string, idx + 1), _scan_once)
+        elif nextchar == 'n' and string[idx:idx + 4] == 'null':
+            return None, idx + 4
+        elif nextchar == 't' and string[idx:idx + 4] == 'true':
+            return True, idx + 4
+        elif nextchar == 'f' and string[idx:idx + 5] == 'false':
+            return False, idx + 5
+
+        m = match_number(string, idx)
+        if m is not None:
+            integer, frac, exp = m.groups()
+            if frac or exp:
+                res = parse_float(integer + (frac or '') + (exp or ''))
+            else:
+                res = parse_int(integer)
+            return res, m.end()
+        elif nextchar == 'N' and string[idx:idx + 3] == 'NaN':
+            return parse_constant('NaN'), idx + 3
+        elif nextchar == 'I' and string[idx:idx + 8] == 'Infinity':
+            return parse_constant('Infinity'), idx + 8
+        elif nextchar == '-' and string[idx:idx + 9] == '-Infinity':
+            return parse_constant('-Infinity'), idx + 9
+        else:
+            raise JSONDecodeError(errmsg, string, idx)
+
+    def scan_once(string, idx):
+        if idx < 0:
+            # Ensure the same behavior as the C speedup, otherwise
+            # this would work for *some* negative string indices due
+            # to the behavior of __getitem__ for strings. #98
+            raise JSONDecodeError('Expecting value', string, idx)
+        try:
+            return _scan_once(string, idx)
+        finally:
+            memo.clear()
+
+    return scan_once
+
+make_scanner = c_make_scanner or py_make_scanner
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/tool.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/tool.py
new file mode 100644
index 0000000000000000000000000000000000000000..062e8e2c181f02f866e443295d7613b4506e19fe
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/site-packages/simplejson/tool.py
@@ -0,0 +1,42 @@
+r"""Command-line tool to validate and pretty-print JSON
+
+Usage::
+
+    $ echo '{"json":"obj"}' | python -m simplejson.tool
+    {
+        "json": "obj"
+    }
+    $ echo '{ 1.2:3.4}' | python -m simplejson.tool
+    Expecting property name: line 1 column 2 (char 2)
+
+"""
+from __future__ import with_statement
+import sys
+import simplejson as json
+
+def main():
+    if len(sys.argv) == 1:
+        infile = sys.stdin
+        outfile = sys.stdout
+    elif len(sys.argv) == 2:
+        infile = open(sys.argv[1], 'r')
+        outfile = sys.stdout
+    elif len(sys.argv) == 3:
+        infile = open(sys.argv[1], 'r')
+        outfile = open(sys.argv[2], 'w')
+    else:
+        raise SystemExit(sys.argv[0] + " [infile [outfile]]")
+    with infile:
+        try:
+            obj = json.load(infile,
+                            object_pairs_hook=json.OrderedDict,
+                            use_decimal=True)
+        except ValueError:
+            raise SystemExit(sys.exc_info()[1])
+    with outfile:
+        json.dump(obj, outfile, sort_keys=True, indent='    ', use_decimal=True)
+        outfile.write('\n')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/720p/DialogInsert.xml b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/720p/DialogInsert.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c2d468631bf2cc4482e5fd985b0e73f54eecde4c
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/720p/DialogInsert.xml
@@ -0,0 +1,210 @@
+<window>
+	<!-- 1280 x 720 -->
+	<defaultcontrol always="false">32501</defaultcontrol>
+    <allowoverlay>no</allowoverlay>
+	<animation effect="slide" start="0,650" time="200">WindowOpen</animation>
+	<animation effect="slide" end="0,650" time="200">WindowClose</animation>
+    <controls>
+		<control type="group">
+			<control type="image">
+				<!-- Background -->
+				<posx>240</posx>
+				<posy>205</posy>
+				<width>800</width>
+				<height>310</height>
+				<texture>AddonWindow/ContentPanel.png</texture>
+				<!--<colordiffuse>EEFFFFFF</colordiffuse>-->
+			</control>
+			<control type="image">
+				<posx>340</posx>
+				<posy>214</posy>
+				<width>600</width>
+				<height>35</height>
+				<texture>AddonWindow/dialogheader.png</texture>
+			</control>
+			<control type="button" id="32500">
+				<!-- Close button -->
+				<posx>986</posx>
+				<posy>217</posy>
+				<width>32</width>
+				<height>32</height>
+				<texturefocus>AddonWindow/dialog_close_focus.png</texturefocus>
+				<texturenofocus>AddonWindow/dialog_close_nofocus.png</texturenofocus>
+				<onup>32508</onup>
+				<ondown>32501</ondown>
+				<onleft condition="SubString(Control.GetLabel(32501),*)">32505</onleft>
+				<onleft condition="SubString(Control.GetLabel(32502),*)">32507</onleft>
+			</control>
+			<control type="radiobutton" id="32501">
+				<!-- Radio Button 1 -->
+				<posx>820</posx>
+				<posy>315</posy>
+				<width>180</width>
+				<height>43</height>
+				<visible>true</visible>
+				<colordiffuse>FFFFFFFF</colordiffuse>
+				<texturefocus>Button/button-focus.png</texturefocus>
+				<texturenofocus>Button/button-nofocus.png</texturenofocus>
+				<wrapmultiline>true</wrapmultiline>
+				<font>font12</font>
+				<label>$ADDON[plugin.video.quasar 30105]</label>
+				<textcolor>FFFFFFFF</textcolor>
+				<focusedcolor>FFFFFFFF</focusedcolor>
+				<disabledcolor>80FFFFFF</disabledcolor>
+				<invalidcolor>FFFFFFFF</invalidcolor>
+				<align>center</align>
+				<aligny>center</aligny>
+				<onup>32500</onup>
+				<ondown>32502</ondown>
+				<onleft condition="SubString(Control.GetLabel(32501),*)">32505</onleft>
+				<onleft condition="SubString(Control.GetLabel(32502),*)">32507</onleft>
+			</control>
+			<control type="radiobutton" id="32502">
+				<!-- Radio Button 2 -->
+				<posx>820</posx>
+				<posy>375</posy>
+				<width>180</width>
+				<height>43</height>
+				<visible>true</visible>
+				<colordiffuse>FFFFFFFF</colordiffuse>
+				<texturefocus>Button/button-focus.png</texturefocus>
+				<texturenofocus>Button/button-nofocus.png</texturenofocus>
+				<wrapmultiline>true</wrapmultiline>
+				<font>font12</font>
+				<label>$ADDON[plugin.video.quasar 30106]</label>
+				<textcolor>FFFFFFFF</textcolor>
+				<focusedcolor>FFFFFFFF</focusedcolor>
+				<disabledcolor>80FFFFFF</disabledcolor>
+				<invalidcolor>FFFFFFFF</invalidcolor>
+				<align>center</align>
+				<aligny>center</aligny>
+				<onup>32501</onup>
+				<ondown>32508</ondown>
+				<onleft condition="SubString(Control.GetLabel(32501),*)">32505</onleft>
+				<onleft condition="SubString(Control.GetLabel(32502),*)">32507</onleft>
+			</control>
+			<control type="button" id="32508">
+				<!-- OK button -->
+				<posx>820</posx>
+				<posy>435</posy>
+				<width>180</width>
+				<height>43</height>
+				<visible>true</visible>
+				<colordiffuse>FFFFFFFF</colordiffuse>
+				<texturefocus>Button/button-focus.png</texturefocus>
+				<texturenofocus>Button/button-nofocus.png</texturenofocus>
+				<wrapmultiline>true</wrapmultiline>
+				<font>font12</font>
+				<label>$ADDON[plugin.video.quasar 30109]</label>
+				<textcolor>FFFFFFFF</textcolor>
+				<focusedcolor>FFFFFFFF</focusedcolor>
+				<disabledcolor>80FFFFFF</disabledcolor>
+				<invalidcolor>FFFFFFFF</invalidcolor>
+				<align>center</align>
+				<aligny>center</aligny>
+				<onup>32502</onup>
+				<ondown>32500</ondown>
+				<onleft condition="SubString(Control.GetLabel(32501),*)">32505</onleft>
+				<onleft condition="SubString(Control.GetLabel(32502),*)">32507</onleft>
+			</control>
+			<control type="label" id="32503">
+				<!-- Window title -->
+				<posx>425</posx>
+				<posy>216</posy>
+				<width>400</width>
+				<height>30</height>
+				<font>font13</font>
+				<align>center</align>
+				<aligny>center</aligny>
+				<label>[B]$ADDON[plugin.video.quasar 30104][/B]</label>
+				<textcolor>FFFFA500</textcolor>
+				<shadowcolor>AA000000</shadowcolor>
+			</control>
+			<control type="label" id="32504">
+				<!-- Option 1 label -->
+				<posx>280</posx>
+				<posy>280</posy>
+				<width>500</width>
+				<height>30</height>
+				<visible>SubString(Control.GetLabel(32501),*)</visible>
+				<font>font13</font>
+				<label>$ADDON[plugin.video.quasar 30107]</label>
+				<align>left</align>
+				<aligny>center</aligny>
+				<textcolor>blue</textcolor>
+				<shadowcolor>AA000000</shadowcolor>
+			</control>
+			<!--<control type="edit" id="32505">
+				<posx>280</posx>
+				<posy>315</posy>
+				<width>500</width>
+				<height>43</height>
+				<visible>SubString(Control.GetLabel(32501),*)</visible>
+				<aligny>center</aligny>
+				<font>font14</font>
+				<textoffsetx>10</textoffsetx>
+				<textcolor>FFB2D4F5</textcolor>
+				<disabledcolor>FF000000</disabledcolor>
+				<invalidcolor>FFFFFFFF</invalidcolor>
+				<texturefocus>Button/button-focus.png</texturefocus>
+				<texturenofocus>Button/button-nofocus.png</texturenofocus>
+				<pulseonselect>no</pulseonselect>
+				<onright>32508</onright>
+			</control>-->
+			<control type="button" id="32505">
+				<!-- Option 1 url button -->
+				<posx>280</posx>
+				<posy>315</posy>
+				<width>500</width>
+				<height>43</height>
+				<visible>SubString(Control.GetLabel(32501),*)</visible>
+				<colordiffuse>FFFFFFFF</colordiffuse>
+				<texturefocus>Button/button-focus.png</texturefocus>
+				<texturenofocus>Button/button-nofocus.png</texturenofocus>
+				<wrapmultiline>false</wrapmultiline>
+				<font>font14</font>
+				<textcolor>FFB2D4F5</textcolor>
+				<focusedcolor>FFFFFFFF</focusedcolor>
+				<disabledcolor>80FFFFFF</disabledcolor>
+				<invalidcolor>FFFFFFFF</invalidcolor>
+				<align>left</align>
+				<aligny>center</aligny>
+				<onright>32508</onright>
+			</control>
+			<control type="label" id="32506">
+				<!-- Option 2 label -->
+				<posx>280</posx>
+				<posy>280</posy>
+				<width>500</width>
+				<height>30</height>
+				<visible>SubString(Control.GetLabel(32502),*)</visible>
+				<font>font13</font>
+				<label>$ADDON[plugin.video.quasar 30108]</label>
+				<align>left</align>
+				<aligny>center</aligny>
+				<textcolor>blue</textcolor>
+				<shadowcolor>AA000000</shadowcolor>
+			</control>
+			<control type="button" id="32507">
+				<!-- Option 2 path button -->
+				<posx>280</posx>
+				<posy>315</posy>
+				<width>500</width>
+				<height>43</height>
+				<visible>SubString(Control.GetLabel(32502),*)</visible>
+				<colordiffuse>FFFFFFFF</colordiffuse>
+				<texturefocus>Button/button-focus.png</texturefocus>
+				<texturenofocus>Button/button-nofocus.png</texturenofocus>
+				<wrapmultiline>false</wrapmultiline>
+				<font>font14</font>
+				<textcolor>FFB2D4F5</textcolor>
+				<focusedcolor>FFFFFFFF</focusedcolor>
+				<disabledcolor>80FFFFFF</disabledcolor>
+				<invalidcolor>FFFFFFFF</invalidcolor>
+				<align>left</align>
+				<aligny>center</aligny>
+				<onright>32508</onright>
+			</control>
+		</control>
+    </controls>
+</window>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/720p/DialogSelectLarge.xml b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/720p/DialogSelectLarge.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d676bad6f7d05826a3f470ca0ddf0a7f08eb5679
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/720p/DialogSelectLarge.xml
@@ -0,0 +1,148 @@
+<window>
+	<!-- 1280 x 720 -->
+	<defaultcontrol always="false">32503</defaultcontrol>
+    <allowoverlay>no</allowoverlay>
+	<animation effect="slide" start="0,650" time="200">WindowOpen</animation>
+	<animation effect="slide" end="0,650" time="200">WindowClose</animation>
+    <controls>
+		<control type="group">
+			<control type="image">
+				<!-- Background -->
+				<posx>190</posx>
+				<posy>60</posy>
+				<width>900</width>
+				<height>600</height>
+				<texture>AddonWindow/ContentPanel.png</texture>
+				<!--<colordiffuse>EEFFFFFF</colordiffuse>-->
+			</control>
+			<control type="image">
+				<posx>340</posx>
+				<posy>69</posy>
+				<width>600</width>
+				<height>35</height>
+				<texture>AddonWindow/dialogheader.png</texture>
+			</control>
+			<control type="button" id="32500">
+				<!-- Close button -->
+				<posx>1034</posx>
+				<posy>72</posy>
+				<width>32</width>
+				<height>32</height>
+				<texturefocus>AddonWindow/dialog_close_focus.png</texturefocus>
+				<texturenofocus>AddonWindow/dialog_close_nofocus.png</texturenofocus>
+				<onup>32508</onup>
+				<ondown>32503</ondown>
+			</control>
+			<control type="label" id="32501">
+				<!-- Window title -->
+				<posx>290</posx>
+				<posy>72</posy>
+				<width>700</width>
+				<height>30</height>
+				<font>font13</font>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>silver</textcolor>
+				<shadowcolor>AA000000</shadowcolor>
+			</control>
+			<control type="scrollbar" id="32502">
+				<!-- Scrollbar -->
+				<posx>1052</posx>
+				<posy>142</posy>
+				<width>10</width>
+				<height>470</height>
+				<onleft>32503</onleft>
+				<onup>32500</onup>
+				<texturesliderbackground border="0,14,0,14">Scrollbar/scrollbar.png</texturesliderbackground>
+				<texturesliderbar border="2,16,2,16">Scrollbar/scrollbarv_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="2,16,2,16">Scrollbar/scrollbarv_bar_focus.png</texturesliderbarfocus>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+
+			<control type="panel" id="32503">
+				<!-- Panel -->
+				<posx>226</posx>
+				<posy>150</posy>
+				<width>800</width>
+				<height>455</height>
+				<onleft>2</onleft>
+				<onright>32502</onright>
+				<onup>32500</onup>
+				<align>center</align>
+				<viewtype>list</viewtype>
+				<focusposition>0</focusposition>
+				<pagecontrol>32502</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<preloaditems>2</preloaditems>
+				<itemlayout height="65" width="790">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>790</width>
+						<height>60</height>
+						<texture border="5">Button/button-nofocus.png</texture>
+					</control>
+					<control type="label">
+						<posx>10</posx>
+						<posy>2</posy>
+						<width>767</width>
+						<height>30</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<textcolor>silver</textcolor>
+						<shadowcolor>AA000000</shadowcolor>
+						<info>ListItem.Label</info>
+					</control>
+					<control type="label">
+						<posx>10</posx>
+						<posy>28</posy>
+						<width>767</width>
+						<height>30</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<textcolor>silver</textcolor>
+						<shadowcolor>AA000000</shadowcolor>
+						<info>ListItem.Label2</info>
+					</control>
+				</itemlayout>
+
+				<focusedlayout height="65" width="790">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>790</width>
+						<height>60</height>
+						<texture border="5">Button/button-focus.png</texture>
+					</control>
+					<control type="label">
+						<posx>10</posx>
+						<posy>2</posy>
+						<width>767</width>
+						<height>30</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<textcolor>white</textcolor>
+						<shadowcolor>AA000000</shadowcolor>
+						<info>ListItem.Label</info>
+					</control>
+					<control type="label">
+						<posx>10</posx>
+						<posy>28</posy>
+						<width>767</width>
+						<height>30</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<textcolor>white</textcolor>
+						<shadowcolor>AA000000</shadowcolor>
+						<info>ListItem.Label2</info>
+					</control>
+				</focusedlayout>
+			</control>
+		</control>
+    </controls>
+</window>
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/ContentPanel.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/ContentPanel.png
new file mode 100644
index 0000000000000000000000000000000000000000..87888dae36eaad6910c045dde1d0d97ad4238d6d
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/ContentPanel.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialog_close_focus.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialog_close_focus.png
new file mode 100644
index 0000000000000000000000000000000000000000..325b167e261b2a0f8688a189bc7f136f101056ca
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialog_close_focus.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialog_close_nofocus.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialog_close_nofocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c23bff338670ad92ba53aec7be5809d0b2d8bbc6
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialog_close_nofocus.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialogheader.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialogheader.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7ba85beb3d021cc93127f2f5281bde2586aeb4
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/AddonWindow/dialogheader.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Button/button-focus.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Button/button-focus.png
new file mode 100644
index 0000000000000000000000000000000000000000..122943f70bffbace272635468b84cb541753a3eb
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Button/button-focus.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Button/button-nofocus.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Button/button-nofocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0377e658d2cef1dd41a897583aabcd0a12edc2ac
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Button/button-nofocus.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/List/item-focus.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/List/item-focus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9e15ce4c7525ec989d697012eee155cdad22adc
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/List/item-focus.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/List/item-nofocus.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/List/item-nofocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecbf84f9f2a47a6c615e0cc186dd5ce55157b1e8
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/List/item-nofocus.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbar.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..05c8698bfb977ff6805cb1ad9bbe138cf4009c04
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbar.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarh_bar.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarh_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4429772b9fd2c6ebd8383e9e635d91a93571ece
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarh_bar.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarh_bar_focus.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarh_bar_focus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d8a9fafcf36180be4a8040d3fd94a715fd783df
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarh_bar_focus.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarv_bar.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarv_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9e94fa331b6069a80040c714700ccdd21bc29f5
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarv_bar.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarv_bar_focus.png b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarv_bar_focus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c3bb8ab0e81109dddc0e09f220f4261f5690ff3
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/resources/skins/Default/media/Scrollbar/scrollbarv_bar_focus.png differ
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/scripts/xgettext.sh b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/scripts/xgettext.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e0a24fd9c6229d8bb181609764d39227e30b7f6e
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/scripts/xgettext.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+NC='\033[0m'
+FAIL='\033[0;31m'
+PASS='\033[0;32m'
+rc=0
+result=0
+for d in resources/language/*/*.po; do
+  printf "%-70s %s" "Checking ${d}"
+  xgettext "$d" 2> out || rc=$?
+  if [ $rc == 1 ]; then
+    printf "[ ${FAIL}FAIL${NC} ]\n"
+    while read i; do
+      printf "  %s\n" "$i"
+    done < out
+    result=1
+  else
+    printf "[ ${PASS} OK ${NC} ]\n"
+  fi
+  rc=0
+done
+rm messages.po
+rm out
+exit $result
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/service.py b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/service.py
new file mode 100644
index 0000000000000000000000000000000000000000..ebf0d1a005b28a53a23001d23d721ce324143833
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/service.py
@@ -0,0 +1,6 @@
+import os
+import sys
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'resources', 'site-packages'))
+from quasar import service
+
+service.run()
diff --git a/packages/mediacenter/kodi/config/skin/plugin.video.quasar/setup.cfg b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/setup.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..285e81624955b7f5073d14f34d2ec81e9d4aac30
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/plugin.video.quasar/setup.cfg
@@ -0,0 +1,7 @@
+[flake8]
+ignore = E302,E402,E731,C901
+max-line-length = 370
+exclude = resources/site-packages/simplejson
+
+[pytest]
+norecursedirs = .git
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/Kodi_IPTV_Imagenio.pvr b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/Kodi_IPTV_Imagenio.pvr
index de7ce9be30f4e6ef0b742b85f5c654da040b5cf0..d5a2f5a3aa574e1100925ab917800979a77595ec 100755
Binary files a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/Kodi_IPTV_Imagenio.pvr and b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/Kodi_IPTV_Imagenio.pvr differ
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/addon.xml b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/addon.xml
index 5ab5773ddfb069600f1f8acf44d506138303d1a2..27f13c2c1282860a38475d87746c29c5a850259d 100755
--- a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/addon.xml
+++ b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvImagenio.rpi"
-  version="1.0.61"
+  version="1.0.63"
   name="PVR IPTV Imagenio para Raspberry Pi (Isengard)"
   provider-name="Victor Juidiaz">
   <requires>
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/changelog.txt b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/changelog.txt
index 5bf98d90433b283b3cc9fd0410072ff66426d2c8..65e0161f74e10928beac0a3f5c701758ed47f189 100755
--- a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/changelog.txt
+++ b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/changelog.txt
@@ -1,4 +1,10 @@
-- Versión 1.0.61.
+- Versión 1.0.62.
+   - Se arregla un error en el sock de salida del stream mediane http.
+   - En opciones avanzadas se añade como origen de stream de canales un servidor udpxy.
+   - Se modifican los sistemas de buffer de cliente y emisión en DLNA.
+   - Se corrige error en carga de logos de series que produce un tiempo excesivo en la carga del EPG.
+   
+- Versión 1.0.61.
 	- Parche sobre timeout de servidor de servicios.
 	- Se añaden en opciones avanzadas 
 	
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/language/English/strings.xml b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/language/English/strings.xml
index d0327f1996e9d18834d6a03d1eae217c6e00da12..6bd7f0ca9a1ba6372f5b411f07559f061512ea06 100755
--- a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/language/English/strings.xml
+++ b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/language/English/strings.xml
@@ -28,6 +28,7 @@
 <string id="30273">Información de programa</string>
 <string id="30274">No es posible conectar</string>
 <string id="30275">No es posible conectar con el servidor de busqueda de Movistar+</string>
+<string id="30276">No existen capítulos de la serie el los últimos 7 días</string>
 <string id="30280">Utilidades</string>
 <string id="30500">Sin conexión con el servidor de Imagenio</string>
 <string id="30501">Actualizando canales desde Imagenio</string>
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/language/Spanish/strings.xml b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/language/Spanish/strings.xml
index d0327f1996e9d18834d6a03d1eae217c6e00da12..6bd7f0ca9a1ba6372f5b411f07559f061512ea06 100755
--- a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/language/Spanish/strings.xml
+++ b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/language/Spanish/strings.xml
@@ -28,6 +28,7 @@
 <string id="30273">Información de programa</string>
 <string id="30274">No es posible conectar</string>
 <string id="30275">No es posible conectar con el servidor de busqueda de Movistar+</string>
+<string id="30276">No existen capítulos de la serie el los últimos 7 días</string>
 <string id="30280">Utilidades</string>
 <string id="30500">Sin conexión con el servidor de Imagenio</string>
 <string id="30501">Actualizando canales desde Imagenio</string>
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/DialogContextSerieNP.xml b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/DialogContextSerieNP.xml
index c5ce8b3e96c9bbe109b75f1bca2bfcb1492167f0..3e63d787cddb6ffb5bd90c5a1dc1d393ae83e93c 100755
--- a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/DialogContextSerieNP.xml
+++ b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/DialogContextSerieNP.xml
@@ -5,7 +5,7 @@
 	<coordinates>
 		<system>1</system>
 		<left>280</left>
-		<top>230</top>
+		<top>250</top>
 	</coordinates>
 	<controls>
 		<control type="image" id="999">
@@ -13,7 +13,7 @@
 			<left>0</left>
 			<top>0</top>
 			<width>340</width>
-			<height>210</height>
+			<height>250</height>
 			<texture border="20">special://home/addons/pvr.iptvImagenio/resources/skins/images/DialogBack.png</texture>
 		</control>
 		<control type="button">
@@ -53,6 +53,19 @@
 				<texturefocus border="5">special://home/addons/pvr.iptvImagenio/resources/skins/images/button-focus.png</texturefocus>
 				<label>Últimos 7 días</label>
 			</control>
+			<control type="button" id="1011">
+				<description>button template</description>
+				<left>20</left>
+				<top>-</top>
+				<width>300</width>
+				<height>38</height>
+				<font>fontContextMenu</font>
+				<align>center</align>
+				<textcolor>grey2</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<texturefocus border="5">special://home/addons/pvr.iptvImagenio/resources/skins/images/button-focus.png</texturefocus>
+				<label>Añadir/quitar Favoritos</label>
+			</control>
 			<control type="button" id="1000">
 				<description>button template</description>
 				<left>20</left>
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/DialogContextSerieP.xml b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/DialogContextSerieP.xml
index 341e92a464fba1c7234dd0632fe5963c2cee657e..e974074860cecf982466d1a0b4ba38de189626a0 100755
--- a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/DialogContextSerieP.xml
+++ b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/DialogContextSerieP.xml
@@ -5,7 +5,7 @@
 	<coordinates>
 		<system>1</system>
 		<left>280</left>
-		<top>210</top>
+		<top>230</top>
 	</coordinates>
 	<controls>
 		<control type="image" id="999">
@@ -13,7 +13,7 @@
 			<left>0</left>
 			<top>0</top>
 			<width>340</width>
-			<height>290</height>
+			<height>330</height>
 			<texture border="20">special://home/addons/pvr.iptvImagenio/resources/skins/images/DialogBack.png</texture>
 		</control>
 		<control type="button">
@@ -53,6 +53,19 @@
 				<texturefocus border="5">special://home/addons/pvr.iptvImagenio/resources/skins/images/button-focus.png</texturefocus>
 				<label>Últimos 7 días</label>
 			</control>
+			<control type="button" id="1011">
+				<description>button template</description>
+				<left>20</left>
+				<top>-</top>
+				<width>300</width>
+				<height>38</height>
+				<font>fontContextMenu</font>
+				<align>center</align>
+				<textcolor>grey2</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<texturefocus border="5">special://home/addons/pvr.iptvImagenio/resources/skins/images/button-focus.png</texturefocus>
+				<label>Añadir/quitar Favoritos</label>
+			</control>
 			<control type="button" id="1003">
 				<description>button template</description>
 				<left>20</left>
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/listadeseries.xml b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/listadeseries.xml
index 176d53bd00a61ccb8ce91eeb2cc1a67c900592b6..9a84d08ca89a18ff4888b748dfdefa1a14e31121 100755
--- a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/listadeseries.xml
+++ b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/720p/listadeseries.xml
@@ -136,6 +136,14 @@
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.Label]</label>
 				</control>
+				<control type="image">
+					<left>705</left>
+					<top>10</top>
+					<width>20</width>
+					<height>20</height>
+					<texture>special://home/addons/pvr.iptvImagenio/resources/skins/images/icon_favourites.png</texture>
+				    <visible>ListItem.property("Favorito")</visible> 
+				</control>
 				<control type="image">
 					<left>730</left>
 					<top>10</top>
@@ -191,6 +199,14 @@
 						<aligny>center</aligny>
 						<label>$INFO[ListItem.Label]</label>
 					</control>
+					<control type="image">
+						<left>705</left>
+						<top>10</top>
+						<width>20</width>
+						<height>20</height>
+						<texture>special://home/addons/pvr.iptvImagenio/resources/skins/images/icon_favourites.png</texture>
+						<visible>ListItem.property("Favorito")</visible> 
+					</control>
 					<control type="image">
 						<left>730</left>
 						<top>10</top>
@@ -361,6 +377,20 @@
 					<onleft>50</onleft>
 					<onright>50</onright>
 				</control>
+				<control type="button" id="33">
+					<description>Series Favoritas</description>
+					<left>0</left>
+					<top>40</top>
+					<textwidth>235</textwidth>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<texturefocus border="5">special://home/addons/pvr.iptvImagenio/resources/skins/images/button-focus.png</texturefocus>
+					<texturenofocus>-</texturenofocus>
+					<pulseonselect>false</pulseonselect>
+					<label>Series Favoritas</label>
+					<onleft>50</onleft>
+					<onright>50</onright>
+				</control>
 			</control>
 		</control>
 		
diff --git a/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/images/icon_favourites.png b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/images/icon_favourites.png
new file mode 100755
index 0000000000000000000000000000000000000000..aa61b1f7cc8f3b6c3d1d643afd071affe0ee5ef3
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/pvr.iptvImagenio/resources/skins/images/icon_favourites.png differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/addon.xml b/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2c26b9821b909c1b126a1dd1acabe1b3dba66603
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/addon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="repository.addonscriptorde-beta" name="AddonScriptorDE's Testing Repo" version="1.0.1" provider-name="AddonScriptorDE">
+	<extension point="xbmc.addon.repository" name="AddonScriptorDE's Testing Repo">
+		<info compressed="false">http://addonscriptorde-beta-repo.googlecode.com/svn/trunk/addons.xml</info>
+		<checksum>http://addonscriptorde-beta-repo.googlecode.com/svn/trunk/addons.xml.md5</checksum>
+		<datadir zip="false">http://addonscriptorde-beta-repo.googlecode.com/svn/trunk/</datadir>
+	</extension>
+	<extension point="xbmc.addon.metadata">
+		<summary>Add-ons and updates that are not (yet) available via the xbmc.org repo</summary>
+		<description>Add-ons and updates that are not (yet) available via the xbmc.org repo</description>
+		<disclaimer></disclaimer>
+		<platform>all</platform>
+	</extension>
+</addon>
diff --git a/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/changelog.txt b/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/changelog.txt
new file mode 100644
index 0000000000000000000000000000000000000000..df88b1a3d5ef6d577211a672f935f31d0ee74079
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/changelog.txt
@@ -0,0 +1,4 @@
+1.0.0
+- Initial release
+1.0.1
+- Added icon (thx@djtoll)
diff --git a/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/icon.png b/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5603dcaf46e93e7a8330504526b3c1c156c192d
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/repository.addonscriptorde-beta/icon.png differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.husham.com/addon.xml b/packages/mediacenter/kodi/config/skin/repository.husham.com/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63494539753b820367a1212873bfbd8cd1038e63
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/repository.husham.com/addon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="repository.husham.com" name="Husham.com Repo" version="1.1.0004" provider-name="husham.com">
+	<extension point="xbmc.addon.repository" name="Husham.com Repository">
+		<info compressed="false">https://raw.githubusercontent.com/hmemar/husham.com/master/repository/addons.xml</info>
+		<checksum>https://raw.githubusercontent.com/hmemar/husham.com/master/repository/addons.xml.md5</checksum>
+		<datadir zip="true">https://raw.githubusercontent.com/hmemar/husham.com/master/zip</datadir>
+	</extension>
+	<extension point="xbmc.addon.metadata">
+		<summary>The Husham.com Repo</summary>
+		<description>Download and install addons from husham.com repo</description>
+		<platform>all</platform>
+	</extension>
+</addon>
+
diff --git a/packages/mediacenter/kodi/config/skin/repository.husham.com/changelog.txt b/packages/mediacenter/kodi/config/skin/repository.husham.com/changelog.txt
new file mode 100644
index 0000000000000000000000000000000000000000..aa0440ac310ec0c298ad27c509819d3260f89a00
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/repository.husham.com/changelog.txt
@@ -0,0 +1,9 @@
+[B]Version 1.0[/B]
+- Initial version
+
+[B]Version 1.0.1[/B]
+- Manual Download
+
+[B]Version 1.0.2[/B]
+- updated addons
+
diff --git a/packages/mediacenter/kodi/config/skin/repository.husham.com/fanart.jpg b/packages/mediacenter/kodi/config/skin/repository.husham.com/fanart.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..763c63c6bdfa3928772cf958d3a4ddb0d34f264a
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/repository.husham.com/fanart.jpg differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.husham.com/icon.png b/packages/mediacenter/kodi/config/skin/repository.husham.com/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..21a8ee921f98ef8a1da754f508dd9bb7f8851593
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/repository.husham.com/icon.png differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.podgod/addon.xml b/packages/mediacenter/kodi/config/skin/repository.podgod/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eedb9b2fb0fdce29db3fb0af1ceb64f403160333
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/repository.podgod/addon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="repository.podgod" name="podgod repo" version="1.7" provider-name="podgod">
+	<extension point="xbmc.addon.repository" name="PodGod Addon Repository">
+		<info compressed="false">http://offshoregit.com/podgod/repo/addons.xml</info>
+		<checksum>http://offshoregit.com/podgod/repo/addons.xml.md5</checksum>
+		<datadir zip="true">http://offshoregit.com/podgod/repo/zips</datadir>
+	</extension>
+	<extension point="xbmc.addon.metadata">
+		<summary>Install My Addons</summary>
+		<description>Download and install addons from podgod!</description>
+		<platform>all</platform>
+	</extension>
+</addon>
+
diff --git a/packages/mediacenter/kodi/config/skin/repository.podgod/changelog.txt b/packages/mediacenter/kodi/config/skin/repository.podgod/changelog.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4a1e4591529f8ae17b88ef6dd4307f0b7369bd89
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/repository.podgod/changelog.txt
@@ -0,0 +1,17 @@
+[B]Version 1.7[/B]
+- Changed hosts
+
+[B]Version 1.5[/B]
+- Changed hosts again - thanks to mtlfreetv.com
+
+[B]Version 1.4[/B]
+- Changed hosts
+
+[B]Version 1.3[/B]
+- Changed hosts
+
+[B]Version 1.2[/B]
+- Bug fix
+
+[B]Version 1.0[/B]
+- Initial version
diff --git a/packages/mediacenter/kodi/config/skin/repository.podgod/icon.png b/packages/mediacenter/kodi/config/skin/repository.podgod/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..de423d6922b2cdc9d108619e63ff9065a1845fbb
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/repository.podgod/icon.png differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/LICENSE.txt b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/LICENSE.txt
deleted file mode 100644
index 818433ecc0e094a4db1023c68b33f24344643ad8..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/LICENSE.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/addon.xml b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/addon.xml
deleted file mode 100644
index 09686b9cbfb80bfdcafaf7a1f5578888295dc657..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/addon.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="repository.pulsarunofficial" name="Pulsar [COLOR red]Unofficial [/COLOR]Repo" version="2.0.0" provider-name="mancuniancol,iCanuck">
-	<extension point="xbmc.addon.repository" name="Pulsar Unofficial Repository">
-       <info>http://offshoregit.com/pulsarunofficial/raw/master/addons.xml</info>
-       <checksum>http://offshoregit.com/pulsarunofficial/raw/master/addons.xml.md5</checksum>
-       <datadir zip="true">http://offshoregit.com/pulsarunofficial/raw/master/</datadir>	
-	</extension>
-	<extension point="xbmc.addon.metadata">
-		<summary>Install Pulsar and Providers</summary>
-		<description>Download and install Pulsar and Providers</description>
-		<disclaimer>The owners and submitters to this repository do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers.</disclaimer>
-		<platform>all</platform>
-		<license>GNU GENERAL PUBLIC LICENSE. Version 3, June 2007</license>
-	</extension>
-</addon>
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/changelog.txt b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/changelog.txt
deleted file mode 100644
index 70a9cbbbd344bc43c98d8973ca0ee1007528ed62..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/changelog.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-v2.0.0 (215000 downloads)
-* Changed Host to Offshoregit 
-
-v1.0.2 (155000 downloads)
-* Repo name - added color
-
-v1.0.1
-* Updated Disclaimer
-
-v1.0.0
-* Initial Release (1136 downloads)
-
-
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/fanart.jpg b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/fanart.jpg
deleted file mode 100644
index cf6ee0214925357d9be6c9e13ca0ce1782427df4..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/fanart.jpg and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/icon.png b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/icon.png
deleted file mode 100644
index c134d89eef81d6bc776655d4bd7459ad1aa223c5..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficial/icon.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/LICENSE.txt b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/LICENSE.txt
deleted file mode 100644
index 818433ecc0e094a4db1023c68b33f24344643ad8..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/LICENSE.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/addon.xml b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/addon.xml
deleted file mode 100644
index 7538a71d72442d85b59b96ecb1fb77366d36190e..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/addon.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="repository.pulsarunofficialmirror" name="Pulsar [COLOR red]Unofficial[/COLOR] Repo [COLOR red]Mirror[/COLOR]" version="2.0.0" provider-name="mancuniancol,iCanuck">
-	<extension point="xbmc.addon.repository" name="Pulsar Unofficial Repo Mirror">	   
-        <info compressed="false">http://offshoregit.com/iCanuck/Unofficial-Pulsar-Repo/raw/master/addons.xml</info>
-        <checksum>http://offshoregit.com/iCanuck/Unofficial-Pulsar-Repo/raw/master/addons.xml.md5</checksum>
-        <datadir zip="true">http://offshoregit.com/iCanuck/Unofficial-Pulsar-Repo/raw/master/</datadir>		
-	</extension>
-	<extension point="xbmc.addon.metadata">
-		<summary>Install Pulsar and Providers</summary>
-		<description>Download and install Pulsar and Providers</description>
-		<disclaimer>The owners and submitters to this repository do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers.</disclaimer>
-		<platform>all</platform>
-		<license>GNU GENERAL PUBLIC LICENSE. Version 3, June 2007</license>
-	</extension>
-</addon>
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/changelog.txt b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/changelog.txt
deleted file mode 100644
index 364b978a037284e5ca71afad7ea8d3dac9f64c63..0000000000000000000000000000000000000000
--- a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/changelog.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-v2.0.0
-* Changed Host to Offshoregit
-
-v1.0.1
-* Repo name - added color
-
-v1.0.0
-* Mirror Repo - Github
-
-
-
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/fanart.jpg b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/fanart.jpg
deleted file mode 100644
index cf6ee0214925357d9be6c9e13ca0ce1782427df4..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/fanart.jpg and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/icon.png b/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/icon.png
deleted file mode 100644
index c134d89eef81d6bc776655d4bd7459ad1aa223c5..0000000000000000000000000000000000000000
Binary files a/packages/mediacenter/kodi/config/skin/repository.pulsarunofficialmirror/icon.png and /dev/null differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.quasar/addon.xml b/packages/mediacenter/kodi/config/skin/repository.quasar/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a0c550dc4ba10d04e90bdeeb214a59720ce36aa5
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/repository.quasar/addon.xml
@@ -0,0 +1 @@
+<addon id="repository.quasar" name="Quasar Repository" version="0.9.12" provider-name="scakemyer"><requires></requires><extension point="xbmc.addon.repository" name="Quasar Repository"><info compressed="false">http://localhost:65251/repository/scakemyer/plugin.video.quasar/addons.xml</info><checksum>http://localhost:65251/repository/scakemyer/plugin.video.quasar/addons.xml.md5</checksum><datadir zip="true">http://localhost:65251/repository/scakemyer/</datadir></extension><extension point="xbmc.addon.metadata"><platform>all</platform><summary lang="en">GitHub repository for Quasar Updates</summary></extension></addon>
\ No newline at end of file
diff --git a/packages/mediacenter/kodi/config/skin/repository.quasar/icon.png b/packages/mediacenter/kodi/config/skin/repository.quasar/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d0fb6f0854a2ee3690d47c68450dd59df6b91a
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/repository.quasar/icon.png differ
diff --git a/packages/mediacenter/kodi/config/skin/repository.xbmc.org/addon.xml b/packages/mediacenter/kodi/config/skin/repository.xbmc.org/addon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89e42e9047e2570d584de304f3ad42240427c557
--- /dev/null
+++ b/packages/mediacenter/kodi/config/skin/repository.xbmc.org/addon.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="repository.xbmc.org"
+		name="Kodi Add-on repository"
+		version="2.2.34"
+		provider-name="XBMC Foundation">
+  <requires>
+    <import addon="xbmc.addon" version="12.0.0"/>
+    <import addon="xbmc.gui" version="5.9.0"/>
+  </requires>
+	<extension point="xbmc.addon.repository"
+		name="Official XBMC.org Add-on Repository">
+		<dir minversion="14.9.0">
+			<info compressed="true">http://mirrors.kodi.tv/addons/isengard/addons.xml</info>
+			<checksum>http://mirrors.kodi.tv/addons/isengard/addons.xml.md5</checksum>
+			<datadir zip="true">http://mirrors.kodi.tv/addons/isengard</datadir>
+			<hashes>true</hashes>
+		</dir>
+	</extension>
+	<extension point="xbmc.addon.metadata">
+		<summary lang="af_ZA">Installeer Byvoegsels vanaf Kodi.tv</summary>
+		<summary lang="am_ET">ከ Kodi.tv ተጨማ-ሪዎች መግጠሚያ </summary>
+		<summary lang="ar_SA">ثبت إضافات من موقع Kodi.tv الرسمي</summary>
+		<summary lang="be_BY">Усталяваць дадатак з Kodi.tv</summary>
+		<summary lang="bg_BG">Инсталира добавки от Kodi.tv</summary>
+		<summary lang="ca_ES">Instal·la complements des de Kodi.tv</summary>
+		<summary lang="cs_CZ">Instalovat rozšíření z Kodi.tv</summary>
+		<summary lang="cy_GB">Gosod Ychwanegion o Kodi.tv</summary>
+		<summary lang="da_DK">Installer Add-ons fra Kodi.tv</summary>
+		<summary lang="de_DE">Installiere Addons von Kodi.tv</summary>
+		<summary lang="el_GR">Εγκατάσταση Πρόσθετων από το Kodi.tv</summary>
+		<summary lang="en_AU">Install Add-ons from Kodi.tv</summary>
+		<summary lang="en_GB">Install Add-ons from Kodi.tv</summary>
+		<summary lang="en_NZ">Install Add-ons from Kodi.tv</summary>
+		<summary lang="en_US">Install Add-ons from Kodi.tv</summary>
+		<summary lang="es_AR">Instalar Add-ons de Kodi.tv</summary>
+		<summary lang="es_ES">Instalar Complementos de Kodi.tv</summary>
+		<summary lang="es_MX">Installar Add-ons de Kodi.tv</summary>
+		<summary lang="et_EE">Paigalda lisasid lehelt Kodi.tv</summary>
+		<summary lang="eu_ES">Instalatu Kodi.tv-eko gehigarriak</summary>
+		<summary lang="fa_IR">نصب افزونه ها از سایت Kodi.tv</summary>
+		<summary lang="fi_FI">Asenna lisäosia Kodi.tv -sivustolta</summary>
+		<summary lang="fr_CA">Installer des addiciels depuis Kodi.tv</summary>
+		<summary lang="fr_FR">Installer des extensions depuis Kodi.tv</summary>
+		<summary lang="gl_ES">Instalar Engadidos dende Kodi.tv</summary>
+		<summary lang="he_IL">התקנת הרחבות מ־Kodi.tv</summary>
+		<summary lang="hr_HR">Instaliraj dodatke s Kodi.tv</summary>
+		<summary lang="hu_HU">Kiegészítők letöltése az Kodi.tv-ról</summary>
+		<summary lang="id_ID">Pasang Pengaya dari Kodi.tv</summary>
+		<summary lang="is_IS">Setja inn viðbætur frá Kodi.tv</summary>
+		<summary lang="it_IT">Installa addon da Kodi.tv</summary>
+		<summary lang="ja_JP">Kodi.tv からアドオンをインストール</summary>
+		<summary lang="ko_KR">Kodi.tv에서 애드온 설치</summary>
+		<summary lang="lt_LT">Įdiegti priedus iš Kodi.tv</summary>
+		<summary lang="lv_LV">Instalēt pielikumus no Kodi.tv</summary>
+		<summary lang="mk_MK">Инсталирај Додатоци од Kodi.tv</summary>
+		<summary lang="ms_MY">Pasang tambahan daripada Kodi.tv</summary>
+		<summary lang="my_MM">Kodi.tv မှ Add-on များကိုသွင်းမည်</summary>
+		<summary lang="nb_NO">Installer utvidelser fra Kodi.tv</summary>
+		<summary lang="nl_NL">Add-ons van Kodi.tv installeren</summary>
+		<summary lang="pl_PL">Instaluj dodatki z Kodi.tv</summary>
+		<summary lang="pt_BR">Instale Add-ons do Kodi.tv</summary>
+		<summary lang="pt_PT">Instalar Add-ons a partir de Kodi.tv</summary>
+		<summary lang="ro_RO">Instalați suplimente de la Kodi.tv</summary>
+		<summary lang="ru_RU">Установить дополнения с сайта Kodi.tv</summary>
+		<summary lang="sk_SK">Inštalovať rozšírenia z Kodi.tv</summary>
+		<summary lang="sl_SI">Namestite dodatke s Kodi.tv</summary>
+		<summary lang="sr_RS">Инсталирај додатке са Kodi.tv</summary>
+		<summary lang="sr_RS@latin">Instaliraj dodatne programe sa Kodi-tv</summary>
+		<summary lang="sv_SE">Installera tillägg från Kodi.tv</summary>
+		<summary lang="tg_TJ">Насб кардани барномаҳои иловагӣ аз Kodi.tv</summary>
+		<summary lang="th_TH">ติดตั้งส่วนเสริมจาก Kodi.tv</summary>
+		<summary lang="tr_TR">Kodi.tv sitesinden eklentileri yükle</summary>
+		<summary lang="uk_UA">Встановити додатки з Kodi.tv</summary>
+		<summary lang="vi_VN">Cài đặt Add-on từ Kodi.tv</summary>
+		<summary lang="zh_CN">从 Kodi.tv 安装插件</summary>
+		<summary lang="zh_TW">從 Kodi.tv 安裝附加元件</summary>
+		<description lang="af_ZA">Aflaai en installeer byvoegsels vanaf die Amptelike Kodi.tv byvoegsel kodebank.[CR] Deur die amptelike Kodebank te gebruik trek jy voordeel van ons uitgebreide lêer spieël diens wat jou help vinniger aflaai vanaf 'n gebied naby aan jou.[CR] Alle byvoegsels in die kodebank het basiese toetsing ondergaan, as jy 'n gebreekte of nie werkende byvoegsel vind rapporteer dit asseblief aan die Kodi Span sodat ons die nodige stappe kan neem.</description>
+		<description lang="ar_SA">حمل و ثبت الإضافات من مستودع الإضافات لموقع Kodi.tv الرسمي.[CR] باستخدامك المستودع الرسمي ستكون قادر على الاستفادة مما نقدمه من خدمة حصرية لتوفير خوادم بديله لتحميل الملفات توفر لك سرعة تحميل أعلى من منطقه قريبة منك.[CR] جميع الإضافات في هذا المستودع خضعت لاختبارات مبدئية, إذا صادفتك إضافة معطوبة أو لا تعمل برجاء الإبلاغ عنها لفريق Kodi لنتمكن من اتخاذ الإجراء اللازم.</description>
+		<description lang="be_BY">Download and install add-ons from the Official Kodi.tv addon repository.[CR]  By using the official Repository you will be able to take advantage of our extensive file mirror service to help get you faster downloads from a region close to you.[CR]  All addons on this repository have under gone basic testing, if you find a broken or not working addon please report it to Team-Kodi so we can take any action needed.</description>
+		<description lang="bg_BG">Сваля и инсталира добавки от официалното хранилище за добавки на Kodi.tv. Ползвайки добавката ще се възползвате от системата ни от огледални сървъри - за да сваляте с висока скорост, от сървър близък до Вас. Добавките от хранилището са минали няколко теста, но ако се натъкнете на неработеща или проблемна добавка, моля уведомете екипа на Kodi, за да бъдат предприети необходимите действия.</description>
+		<description lang="ca_ES">Baixa i instal·la complements des del repositori oficial de Kodi.tv.[CR]Utilitzant el repositori oficial, podràs aprofitar els avantatges del nostre sistema de miralls per ajudar-te a tenir unes descarregues més ràpides des d'una regió propera a tu.[CR] Tots els complements d'aquest repositori han passat per un testeig bàsic, així que si trobeu algun complement que no funcioni correctament, si us plau digueu-ho a l'equip del Kodi per què puguin dur a terme les accions pertinents.</description>
+		<description lang="cs_CZ">Stáhnout a nainstalovat rozšíření z oficiálního repozitáře Kodi.tv. [CR]  Použitím oficiálního repozitáře získáte rozsáhlý systém zrcadel, který vám umožní rychlé stažení z blízkého regionu.[CR]  Všechna rozšíření v repozitáři prošla základním testováním. Pokud najdete rozbité nebo nefunkční rozšíření, nahlaste jej týmu Kodi, abychom mohli dle potřeby zakročit.</description>
+		<description lang="cy_GB">Llwytho i lawr a gosod ychwanegion o storfa ychwanegion Swyddogol Kodi.tv.{CR}Drwy ddefnyddio'r Storfa swyddogol bydd modd i chi gymryd mantais o'n gwasanaeth drychau ffeiliau i'ch cynorthwyoi lwytho i lawr yn gyflym o ardal yn agos i chi.[CR] Mae pob ychwnaegyn yn y storfa hwn wedi eu profi'n fras, os ydych yn canfod ychwanegyn sydd wedi torri  neu ddim yn gweithio yna hysbyswch Team-Kodi fel bod modd i ni weithredu.</description>
+		<description lang="da_DK">Hent og installer add-ons fra det officielle Kodi.tv add-on fjernlager.[CR] Ved at bruge det officielle fjernlager drager du fordel af vores omfattende spejltjeneste, som gør at du kan hente hurtigere fra et sted nær dig.[CR]  Alle add-ons i dette fjernlager har gennemgået grundlæggende tests. Hvis du finder en defekt add-on, så rapporter venligst dette til Team-Kodi, så vi kan tage hånd i hanke med eventuelle problemer.</description>
+		<description lang="de_DE">Dies ist das offizielle Kodi.tv Addon-Verzeichnis.[CR]Dieses Addon-Verzeichnis ermöglicht aufgrund umfangreicher Spiegelserver in der Nähe schnelle Downloads.[CR]Alle Addons in diesem Verzeichnis wurden einfachen Tests unterzogen. Sollte dennoch ein Addon nicht richtig funktionieren benachrichtige bitte Team-Kodi, damit wir reagieren können.</description>
+		<description lang="el_GR">Λήψη και εγκατάσταση πρόσθετων από το επίσημο αποθετήριο του Kodi.tv.[CR]  Χρησιμοποιώντας το Επίσημο Αποθετήριο μπορείτε να εκμεταλλευτείτε τους εκτεταμένους διακομιστές αρχείων μας για ταχύτερες λήψεις από μία κοντινή σας περιοχή.[CR]  Όλα τα πρόσθετα σε αυτό το αποθετήριο έχουν περάσει τις στοιχειώδεις δοκιμές, αν βρείτε ένα κατεστραμμένο ή ανενεργό πρόσθετο παρακαλούμε να το αναφέρετε στην Ομάδα Kodi ούτως ώστε να ληφθούν οι απαραίτητες ενέργειες.</description>
+		<description lang="en_AU">Download and install add-ons from the Official Kodi.tv add-on repository.[CR]  By using the official Repository you will be able to take advantage of our extensive file mirror service to help get you faster downloads from a region close to you.[CR]  All add-ons on this repository have undergone basic testing, if you find a broken or not working add-on please report it to Team-Kodi so we can take any action needed.</description>
+		<description lang="en_GB">Download and install add-ons from the Official Kodi.tv add-on repository.[CR]  By using the official Repository you will be able to take advantage of our extensive file mirror service to help get you faster downloads from a region close to you.[CR]  All add-ons on this repository have under gone basic testing, if you find a broken or not working add-on please report it to Team-Kodi so we can take any action needed.</description>
+		<description lang="en_NZ">Download and install add-ons from the Official Kodi.tv add-on repository.[CR]  By using the official Repository you will be able to take advantage of our extensive file mirror service to help get you faster downloads from a region close to you.[CR]  All add-ons on this repository have under gone basic testing, if you find a broken or not working add-on please report it to Team-Kodi so we can take any action needed.</description>
+		<description lang="en_US">Download and install add-ons from the Official Kodi.tv add-on repository.[CR]  By using the official Repository you will be able to take advantage of our extensive file mirror service to help get you faster downloads from a region close to you.[CR]  All add-ons on this repository have under gone basic testing, if you find a broken or not working add-on please report it to Team-Kodi so we can take any action needed.</description>
+		<description lang="es_AR">Descarga e instala el complemento desde el repositorio oficial de Kodi.tv.[CR] Usando el repositorio oficial tendrá las ventajas de nuestro servicio de réplicas para ayudarle a conseguir unas descargas más rápidas de un sitio cercano a su región.[CR] Todos los complementos en este repositorio han pasado por un periodo de pruebas básico, pero si encuentra algún complemento que no funciona, por favor infórmelo al equipo de Kodi para que podamos tomar las acciones necesarias.</description>
+		<description lang="es_ES">Descarga e instala complementos desde el repositorio oficial de Kodi.[CR]  Usando el repositorio oficial podrás aprovecharte de nuestro servicio de mirrors para poder descargar más rápidamente desde un sitio cercano.[CR]  Todos los complementos en este repositorio han pasado por un periodo de pruebas básico, pero si encontraras algún complemento que no funcionase, por favor avisa al equipo de Kodi para solucionar el problema.</description>
+		<description lang="es_MX">Descarga e instala add-ons del repositorio oficial Kodi.tv.[CR] Al usar el repositorio oficial, tendrá la ventaja de los servicios de espejos, y así tener descargas más rápidas.[CR] Todos los add-ons en este repositorio se han probado de manera básica, si encuentra alguno que no funciona o roto, favor de reportarlo al Equipo de Kodi para poder tomar las medidas necesarias.</description>
+		<description lang="et_EE">Lae alla ja installi lisasid ametlikust Kodi.tv hoidlast.[CR]  Ametliku hoidla kasutamise eeliseks on võimalus kasutada meie ulatuslikku failide peegelteenust laadides faile sulle kõige lähemast serverist.[CR]  Kõik lisad selles hoidlas on läbinud elementaarse testimise. Siiski, kui sa leiad vigase või mittetöötava lisa, siis palun teavita sellest Kodi meeskonda, et me saaksime vajaliku abi osutada.</description>
+		<description lang="eu_ES">Gehigarriak Kodi.tv biltegi ofizialetik deskargatu eta instalatu.[CR]  &#10;Biltegi ofiziala erabiliaz zutaz gertu dagoen gune batetik deskargatu&#10;ditzakezu gure fitxategi-ispilu multzoaren abantailaz aprobetxatuaz.[CR]  &#10;Biltegi honetako gehigarri guztiek proba basikoak gainditu dituzte baina hondaturiko edo funtzionatzen ez duen gehigarri baten bat aurki ezkero honen berri Kodi taldeari eman beharrezko ekintzak burutu ditzagun.</description>
+		<description lang="fa_IR">افزودنی ها را از منبع رسمی افزونه ها در Kodi.tv دانلود و نصب کنید. [CR] با استفاده از منبع رسمی شما قادر خواهید بود از خدمات گسترده سرویس دانلود جایگزین ما بهره ببرید که امکان دانلود از مناطق نزدیکتر را در اختیار شما قرار می دهد. [CR] همه افزونه های این منبع آزمایش های اولیه را پشت سر گذاشته اند. در صورت یافتن افزونه معیوب یا غیر قابل استفاده لطفا آن را به تیم کودی گزارش کنید تا اقدامات لازم را انجام دهیم.</description>
+		<description lang="fi_FI">Lataa ja asenna lisäosia virallisesta Kodi.tv -lisäosasäilöstä.[CR]  Käyttämällä virallista säilöä sinun on mahdollista käyttää hyväksesi meidän kattavaa tiedostojen peilauspalveluamme saavuttaaksesi korkeat latausnopeudet sinun lähialueeltasi.[CR]  Kaikki tämän säilön lisäosat on testattu toimiviksi, jos löydät rikkinäisen tai "ei toimivan" lisäosan, ilmoita siitä Team-Kodi:lle, jotta voimme korjata asian.</description>
+		<description lang="fr_CA">Télécharger et installer des addiciels depuis le dépôt officiel de Kodi.tv.[CR] En utilisant le dépôt officiel vous pourrez bénéficier de notre service étendu de miroirs de fichiers favorisant des téléchargements plus rapides depuis une région proche de vous.[CR] Tous les addiciels de ce dépôt ont subi des tests de base. Si vous trouvez un addiciel non fonctionnel ou brisé, veuillez le rapporter à l'équipe-Kodi afin que nous puissions agir.</description>
+		<description lang="fr_FR">Télécharger et installer des extensions à partir du dépôt officiel Kodi.tv.[CR] En utilisant le dépôt officiel, vous bénéficierez de notre service de serveurs miroirs vous permettant de télécharger rapidement depuis une région proche de chez vous.[CR] Toutes les extensions de ce dépôt ont été testées sommairement, si vous trouvez une extension corrompue ou inutilisable, veuillez en informer l'Équipe Kodi afin que nous puissions prendre les mesures nécessaires.</description>
+		<description lang="gl_ES">Descargar e instalar Engadidos dende o repositorio oficial de Kodi.tv.[CR] Empregando o repositorio oficial, vostede poderá gozar das vantaxes do seu extenso servizo de replicación de ficheiros que lle permite unhas descargas máis rápidas dende unha rexión preto a vostede.[CR] Tódolos Engadidos deste repositorio pasaron por comprobacións básicas. Se atopa algún Engadido roto ou non funcional, por favor reporteo ó equipo de Kodi para que poidan actuar en consecuencia.</description>
+		<description lang="he_IL">הורדה והתקנת הרחבות ממאגר הרחבות Kodi.tv הרשמי.[CR] שימוש במאגר הרשמי מאפשר לנצל את שירות שיקוף הקבצים של Kodi.tv העוזר להוריד מהר יותר מהשרת הקרוב ביותר.[CR] כל ההרחבות במאגר זה עברו בדיקה בסיסית. יש לדווח לצוות הפיתוח של Kodi על כל הרחבה שנמצאה כלא תקינה או שלא עובדת ע"מ שתתבצע הפעולה המתאימה.</description>
+		<description lang="hr_HR">Preuzmite i instalirajte dodatke sa službenog Kodi.tv repozitorija dodataka.[CR] Korištenjem službenog repozitorija bit ćete u mogućnosti iskoristiti prednosti usluge našeg brzog zrcalnog poslužitelja datoteka, da bi mogli brže preuzimati iz regije koje je bliže vašoj lokaciji.[CR] Svi dodaci na ovom repozitoriju prošli su osnovno testiranje, u slučaju da primijetite neispravan dodatak, molimo vas da to prijavite Kodi timu koji će zatim poduzeti potrebne korake.</description>
+		<description lang="hu_HU">Kiegészítők letöltése és telepítése a hivatalos Kodi.tv tárolóhelyről.[CR] A hivatalos tárolóhely használatával kihasználhatod szerteágazó tükör-kiszolgáló hálózatunkat, ami segít a gyorsabb letöltésben egy hozzád közelebb eső körzet használatával.[CR]  Minden kiegészítő ezen a tárolóhelyen átment egy alaptesztelésen. Ha mégis hibás vagy nem működő kiegészítőt találsz, kérünk jelezd az Kodi csapatnak, hogy megtegyük a szükséges lépéseket.</description>
+		<description lang="id_ID">Unduh dan pasang pengaya dari repositori pengaya resmi Kodi.tv. [CR] Dengan menggunakan repositori resmi anda akan mendapat keuntungan dari miror berkas kami yang luas dimana dapat membantu anda untuk lebih cepat mengunduh dari daerah yang dekat dengan anda. [CR] Semua pengaya pada repository telah melalui uji coba standar, jika anda menemukan pengaya yang rusak atau tidak bekerja tolong laporkan kepada tim Kodi agar kami bisa menindak lanjutinya.</description>
+		<description lang="is_IS">Sækja og setja inn viðbætur frá hinu viðurkennda Kodi.tv viðbóta safni.[CR] Með því að nota þetta safn getur þú nýtt þér möguleikann á fullkmonni speglunar þjónustu sem hjálpar við að sækja viðbætur hraðar frá landsvæði nálægt þér.[CR] Allar viðbætur í þessu safni hafa gengið undir grunn prófanir, ef þú finnur viðbætur sem eru bilaðar eða virka ekki vinsamlegast látið Kodi teymið vita svo við getum gert eitthvað í málinu.</description>
+		<description lang="it_IT">Scarica ed installa gli add-on dalla libreria ufficiale di Kodi.tv[CR]  Usando la libreria ufficiale avrai il vantaggio di ottenere download più veloci con mirror più vicini alla tua località.[CR]  Tutti gli add-on in questa libreria sono stati sottoposti a test di base, se ne trovi uno non funzionante o corrotto, per favore riporta il problema al team di Kodi così potremmo prendere provvedimenti.</description>
+		<description lang="ja_JP">オフィシャルの Kodi.tv リポジトリからアドオンをダウンロードします。[CR]  オフィシャルリポジトリを使うことで、お住まいのエリアに近いミラーサーバーから高速にアドオンをダウンロードすることが可能です。[CR]  このリポジトリ上のアドオンは全て、簡単な動作テストを受けてはいますが、もしアドオンがおかしかったりうまく動作しなかったりした場合は、Kodi チームに連絡をお願いします。</description>
+		<description lang="ko_KR">공식 Kodi.tv 애드온 저장소에서 애드온을 다운로드하여 설치합니다.[CR] 공식 저장소를 사용하면 파일 미러링 서비스를 통해 사용자와 가까운 곳에서 빠르게 다운로드할 수 있습니다.[CR] 저장소의 모든 애드온은 기본 테스트를 거치지만 작동이 되지 않거나 손상된 애드온을 발견하면 필요한 조치를 취할 수 있게 Team-Kodi로 알려주시기 바랍니다.</description>
+		<description lang="lt_LT">Atsisiųskite ir įdiegite priedus iš oficialios Kodi.tv saugyklos.[CR]Naudojantis oficialia saugykla, galėsite pasinaudoti pranašumu mūsų didele failų veidrodinę paslauga.[CR]Taip pat siekiame padėti jums greičiau parsisiųsti priedą iš Jūsų regiono.[CR]Visiems šioje saugykloje saugomiems priedams buvo atliktas testavimas, jei Jūs radote netaisyklingą ir nedarbinį priedą.[CR]Prašome pranešti apie tai Kodi komandai, kad mes galėtume imtis būtinų veiksmų </description>
+		<description lang="lv_LV">Lejupielādējiet un instalējiet pielikumus no oficiālā Kodi.tv pielikumu repozitorija[CR] Izmantojot oficiālo repozitoriju, varēsiet izmantot mūsu plašo spoguļu pakalpojumu, lai iegūtu ātrākas lejupielādes no reģiona, kas vistuvāk.[CR] Visi pielikumi šajā repozitorijā ir izgājuši pamata testēšanu, bet, ja atrodat saplīsušu vai nestrādājošu pielikumu, lūdzu, ziņojiet par to Team-Kodi, lai varam izpildīt nepieciešamās labošanas darbības.</description>
+		<description lang="mk_MK">Превземи и инсталирај Додатоци од официјалниот Kodi.tv склад.[CR] Со користење на официјалниот склад ќе бидете во можност да ги користите предностите на нашата богата датотека со услуги која ви помага да добиете побрзи превземања од регионот блиску до вас.[CR]  Сите Додатоци во овој склад се основно тестирани, ако најдете неисправни или додатоци кои не работат пријавете го тоа на тимот на Kodi така што ќе можеме да превземеме било каква акција што е потребна.</description>
+		<description lang="ms_MY">Muat turun dan pasang tambahan PVR melalui repositori rasmi Kodi.tv[CR]  Dengan menggunakan Repositori rasmi anda dapat perkhidmatan cermin fail yang luas supaya dapat memuat turun lebih pantas menerusi kawasan berhampiran anda.[CR]  Semua tambahan di dalam repositori ini telah lulus pengujian asas, jika anda temui tambahan yang rosak atau tidak berfungsi sila laporkannya kepada Team-Kodi supaya kami boleh membuat tindakan yang sewajarnya.</description>
+		<description lang="nb_NO">Last ned og installer utvidelser fra den offisielle Kodi.tv pakkebrønnen.[CR] Når du benytter den offisielle pakkebrønnen kan du dra nytte av vår omfattende arkivtjeneste slik at du får raskere nedlasting fra en server nær deg.[CR] Alle tillegg i denne brønnen har gått gjennom grunnleggende testing, men hvis du finner et tillegg som ikke fungerer, vennligst rapporter det til Team-Kodi så vi får sett på det.</description>
+		<description lang="nl_NL">Download en installeer add-ons uit de officiële Kodi.tv add-on depot.[CR] Wanneer u de officiële depot gebruikt beschikt u over onze uitgebreide mirrorservice, waardoor u snel kan downloaden van locaties in uw buurt.[CR] Alle add-ons in dit depot ondergingen standaardtests; indien u een defecte of niet-werkende add-on vindt, meld dit dan aan Team-Kodi zodat zij actie kunnen ondernemen.</description>
+		<description lang="pl_PL">Pobieraj i instaluj dodatki z oficjalnego repozytorium Kodi.tv.[CR] Używając oficjalnego repozytorium korzystasz z serwerów lustrzanych, rozsianych po całym świecie. Wybierany jest ten, który znajduje się najbliżej ciebie, zapewniając dużą prędkość połączenia.[CR]Wszystkie dodatki znajdujące się w tym repozytorium są testowane, ale mogą okazać się niesprawne. Zgłoś wówczas błąd, aby zespół Kodi mógł podjąć odpowiednie działanie.</description>
+		<description lang="pt_BR">Transfira e instale add-ons a partir do repositório oficial do Kodi.tv.[CR]|Ao utilizar o repositório oficial, você será capaz de tirar proveito do nosso serviço de espelhamento de arquivos, auxiliando em downloads mais rápidos a partir de uma região perto de você.[CR]|Todos os add-ons neste repositório passam por testes básicos, se você encontrar algum quebrado ou que não esteja funcionando, por favor reporte para a equipe do Kodi, para que possamos tomar as ações necessárias.</description>
+		<description lang="pt_PT">Transferir e instalar os add-ons do repositório de add-ons Oficiais de Kodi.tv.[CR]Ao utilizar o Repositório oficial, irá beneficiar do nosso serviço de servidores de ficheiro para o ajudar a ter transferências mais rápidas a partir da região mais perto de si.[CR]Todos os Add-ons neste repositório foram alvo de testes básicos. Se encontrar um danificado ou que não funciona, por favor, informe a Equipa do Kodi, para que a situação seja resolva.</description>
+		<description lang="ro_RO">Descărcați și instalați suplimente din depozitul de suplimente Kodi.tv oficial.[CR]  Folosind depozitul (repository) oficial puteți beneficia de serviciul nostru de găzduire distribuită pentru a vă ajuta să descărcați mai repede dintr-o regiune mai apropiată de dumneavoastră.[CR]  Toate suplimentele din acest depozit au trecut testele de bază, în caz că găsiți un supliment defect vă rugăm să îl raportați echipei Kodi pentru a lua măsurile necesare.</description>
+		<description lang="ru_RU">Загружайте и устанавливайте обновления из официального репозитория Kodi.tv[CR]Используя официальный репозиторий, вы сможете воспользоваться преимуществами распределенного хранилища для быстрой загрузки файлов с ближайшего к вам сервера.[CR]Все дополнения в данном репозитории прошли тестирование. Если вы обнаружили нерабочее дополнение, сообщите об этом разработчикам Kodi.</description>
+		<description lang="sk_SK">Stiahnuť a nainštalovať rozšírenia z oficiálneho zdroja rozšírení Kodi.tv.[CR] Použitím oficiálneho zdroja získavate možnosť využiť rozsiahly systém zrkadiel, ktorý Vám umožní rýchlejšie sťahovanie z Vám blízkeho regiónu.[CR] Všetky rozšírenia v tomto zdroji boli podrobené základnému testovaniu. Ak nájdete poškodené alebo nefunkčné rozšírenie, oznámte to prosím týmu Kodi aby mohol podľa potreby zakročiť.</description>
+		<description lang="sl_SI">Prenos in namestitev dodatkov iz uradnega skladišča Kodi.tv.[CR] Z uporabo uradnega skladišča, boste lahko izkoristili hitrejšo povezavo, ki bo izbrana glede na vašo lokacijo.[CR] Vsi dodatki tega skladišča so bili osnovno stestirani, če pa boste našli pokvarjen ali nedelujoč dodatek, to sporočite ekipi Kodi, da bomo lahko odpravili napake.</description>
+		<description lang="sr_RS">Преузмите и инсталирајте додатке из Званичног Kodi.tv спремишта додатака.[CR] Коришћењем званичног Спремишта моћићете да искористите предности нашег сервиса копија фајлова који ће вам помоћи приликом бржег преузимања из региона ближег вашој локацији.[CR] Сви додаци у овом спремишту прошли су основно тестирање, у случају да пронађете неисправан додатак молимо вас да то пријавите Kodi тиму који ће затим предузети неопходне мере.</description>
+		<description lang="sr_RS@latin">Preuzmi i instaliraj dodatne programe iz Zvaničnog Kodi.tv spremišta za dodatne programe.[CR] Korišćenjem zvaničnog Spremišta moći ćete da iskoristite prednosti našeg servisa kopija fajlova koji će vam pomoći prilikom bržeg preuzimanja iz regiona bližeg vašoj lokaciji.[CR] Svi dodatni programi u ovom spremištu prošli su osnovno testiranje, u slučaju da pronađete neispravan dodatni program molimo vas da to prijavite Kodi timu koji će zatim preduzeti neophodne mere.</description>
+		<description lang="sv_SE">Ladda ner och installera tillägg från det officiella Kodi.tv tilläggsförrådet.[CR]Genom att använda det officiella förrådet kommer du att få fördelen att kunna använda vår omfattande spegeltjänst som kommer att hjälpa dig till snabbare nedladdningar från en plats nära dig.[CR]Alla tillägg i detta förråd har genomgått grundläggande tester. Hittar du ett trasigt eller icke fungerande tillägg, vänligen meddela detta till Team-Kodi så att vi kan vidta nödvändiga åtgärder.</description>
+		<description lang="tg_TJ">Барномаҳои иловагиро аз анбори нармафзори Kodi.tv боргирӣ кунед ва насб намоед.[CR]  Аз истифодаи анбори нармафзори расмии мо ба шумо имконият пайдо мешавад, ки тавонед шароити мусофидро аз хидмати оинаи файлии васеъ ба даст оред ва нармафзори лозимиро аз сервери минтакаи ба шумо наздиктар бо суръати баланд боргирӣ кунед.[CR]  Ҳамаи барномаҳо аз анбори нармафзори мо дар ҳолати санҷишӣ мебошанд, бинобар ин агар ягон барномаи иловагии нуқсондор ё вайроншударо ёбед, лутфан дар бораи он барнома ва нуқсон пайдошуда ба гурӯҳи кории Kodi гузориш диҳед, то ин ки мо тавонем ҳамаи камбудиҳои барномаҳои моро ҳал кунем.</description>
+		<description lang="th_TH">ดาวน์โหลดและติดตั้งส่วนเสริม จากแหล่งข้อมูลโปรแกรมของ Kodi.tv อย่างเป็นทางการ.[CR]  โดยการใช้งานแหล่งข้อมูลโปรแกรมอย่างเป็นทางการ คุณสามารถใช้ประโยชน์จากบริการแฟ้มมิเรอร์ที่กว้างขวางของเรา ที่จะช่วยให้การดาวน์โหลดของคุณเร็วขึ้นจากภูมิภาคที่ใกล้ที่สุด.[CR]  ส่วนเสริม ทั้งหมดในแหล่งเก็บข้อมูลนี้ อยู่ภายใต้การทดสอบขั้นพื้นฐานแล้ว ถ้าคุณพบส่วนเสริมที่เสียหายหรือไม่ทำงาน กรุณาแจ้งทีมงาน Kodi เพื่อให้เราสามารถดำเนินการใด ๆ ที่จำเป็น.</description>
+		<description lang="tr_TR">Eklentileri resmi Kodi.tv eklenti deposundan indir ve yükle.[CR]Resmi yazılım depomuzu kullanarak size en yakın bölgeden en hızlı biçimde indirme yapmanızı sağlayacak gelişkin dosya aynalama servisini kullanma avantajını elde edeceksiniz.[CR]Bu yazılım deposundaki tüm eklentiler temel testlerden geçerler, şayet hatalı ya da çalışmayan bir eklenti bulur iseniz lütfen düzeltilmesi için bu durumu Kodi Takımına bildiriniz.</description>
+		<description lang="uk_UA">Завантажити і встановити додатки з Офіційного репозиторію додатків Kodi.tv.[CR]  Використовуючи Офіційний Репозиторій ви отримаєте перевагу надану нашими дзеркальними серверами, які забезпечать вам швидке завантаження із найближчого до вас регіону.[CR]  Всі додатки в цьому Репозиторії пройшли лише базове тестування. Якщо ви знайшли зламаний або непрацюючий додаток, будь-ласка повідомте про це Команду Kodi щоб ми могли вжити потрібних заходів.</description>
+		<description lang="vi_VN">Tải về và cài đặt add-on từ kho addon chính thức của Kodi.[CR]  Khi sử dụng kho chứa này bạn sẽ hưởng lợi từ dịch vụ tạo nguồn của chúng tôi, giúp bạn có thể tải về nhanh hơn từ vùng địa lý gần bạn.[CR]  Tất cả addon trên kho chứa này đã được thông qua bài kiểm tra cơ bản, nếu bạn phát hiện ra một addon không hoạt động xin vui lòng báo cáo lại nó cho đội ngũ Kodi để chúng tôi có thể kịp thời xử lý.</description>
+		<description lang="zh_CN">从官方 Kodi.tv 插件库下载和安装插件。[CR]　通过官方插件库你将能利用我们广泛的镜像服务优势，使你能够就近下载资源。[CR]　官方库中的所有插件都经过了基本的测试，如果你发现有损坏或不能正常工作的插件请向 Kodi 开发团队报告，以便及时处理。</description>
+		<description lang="zh_TW">從 Kodi.tv 官方的附加元件庫下載並安裝附加元件。[CR] 使用官方的附加元件庫你可以從離你較近的檔案鏡像伺器以較快的速度下載附加元件。[CR] 在這個附加元件庫中的附加元件都經過簡單的測試，如果你發現損壞或無法正常工作的附加元件，請回報給 Kodi 團隊，以讓 Kodi 團隊能做一些必須的處置。</description>
+		<disclaimer lang="af_ZA">Die Kodi span het nie al die byvoegsels in die kodebank gemaak nie en is nie verantwoordelik vir hulle inhoud nie</disclaimer>
+		<disclaimer lang="am_ET">የ Kodi ቡድን እዚህ ማጠራቀሚያ ውስጥ ያሉትን የ ተጨማ-ሪዎች ይዞታ አልፈጠሩም ስለዚህም ምንም አይነት ሀላፊነት አይወስዱም</disclaimer>
+		<disclaimer lang="ar_SA">فريق Kodi لم يقم بصنع جميع اﻹضافات فى هذا المستودع وغير مسؤول عن محتواها</disclaimer>
+		<disclaimer lang="be_BY">Team-Kodi did not make all the add-ons on this repository and are not responsible for their content</disclaimer>
+		<disclaimer lang="bg_BG">Team-Kodi (Екипът зад Kodi) не е автор на всички добавки в хранилището и не носи отговорност за съдържанието им</disclaimer>
+		<disclaimer lang="ca_ES">L'equip del Kodi no ha fet tots els complements d'aquest repositori i per tant no són responsables del seu contingut.</disclaimer>
+		<disclaimer lang="cs_CZ">Tým Kodi nevytvořil všechna rozšíření v tomto repozitáři a není zodpovědný za jejich obsah</disclaimer>
+		<disclaimer lang="cy_GB">Nid Team-Kodi wnaeth yr holl ychwanegion yn y storfa hon ac nid ydynt yn gyfrifol am eu cynnwys.</disclaimer>
+		<disclaimer lang="da_DK">Team-Kodi har ikke lavet alle add-ons i dette fjernlager og er ikke ansvarlig for deres indhold</disclaimer>
+		<disclaimer lang="de_DE">Die Addons in diesem Verzeichnis wurden nicht alle vom Team-Kodi erstellt. Verantwortlich für den Inhalt sind die jeweiligen Autoren.</disclaimer>
+		<disclaimer lang="el_GR">Η Ομάδα Kodi δεν δημιούργησε όλα τα πρόσθετα σε αυτό το αποθετήριο συνεπώς δεν είναι υπεύθυνοι για το περιεχόμενό τους</disclaimer>
+		<disclaimer lang="en_AU">Team-Kodi did not make all the add-ons on this repository and are not responsible for their content</disclaimer>
+		<disclaimer lang="en_GB">Team-Kodi did not make all the add-ons on this repository and are not responsible for their content</disclaimer>
+		<disclaimer lang="en_NZ">Team-Kodi did not make all the add-ons on this repository and are not responsible for their content</disclaimer>
+		<disclaimer lang="en_US">Team-Kodi did not make all the add-ons on this repository and are not responsible for their content</disclaimer>
+		<disclaimer lang="es_AR">No todos los add-ons en este repositorio han sido creados por el equipo de Kodi y este no es responsable de su contenido</disclaimer>
+		<disclaimer lang="es_ES">El equipo de Kodi no ha hecho todos los Complementos en este repositorio y no son responsables de su contenido</disclaimer>
+		<disclaimer lang="es_MX">El equipo de Kodi no hizo todos los add-ons en este repositorio y no es responsable de su contenido</disclaimer>
+		<disclaimer lang="et_EE">Kodi meeskond ei teinud kõiki lisasid selles hoidlas ja ei vastuta ka nende sisu eest.</disclaimer>
+		<disclaimer lang="eu_ES">Kodi taldeak ez ditu biltegi honetako gehigarri guztiak sortu eta ez da beren edukien erantzule.</disclaimer>
+		<disclaimer lang="fa_IR">همه افزونه های این منبع محصول کار تیم کودی نیستند و این تیم مسئولیتی در قبال محتوای آنها ندارد.</disclaimer>
+		<disclaimer lang="fi_FI">Team-Kodi ei ole tehnyt kaikkia tässä säilössä olevia lisäosia, eikä siten ole vastuullinen kyseisten lisäosien sisällöstä</disclaimer>
+		<disclaimer lang="fr_CA">L'équipe-Kodi n'a pas créé tous les addiciels de ce dépôt et n'est pas responsable de leur contenu</disclaimer>
+		<disclaimer lang="fr_FR">L'Équipe-Kodi n'a pas créé toutes les extensions de ce dépôt et n'est pas responsable de leur contenu</disclaimer>
+		<disclaimer lang="gl_ES">O equipo de Kodi non creou todos os Engadidos deste repositorio e non é responsábel do seu contido</disclaimer>
+		<disclaimer lang="he_IL">צוות הפיתוח של Kodi לא יצר את כל ההרחבות שבמאגר זה ואיננו אחראי על תוכנן</disclaimer>
+		<disclaimer lang="hr_HR">Kodi tim nije autor svih dodataka u ovom repozitoriju te kao takvi ne odgovaraju za njihov sadržaj</disclaimer>
+		<disclaimer lang="hu_HU">Nem minden itt található kiegészítőt az Kodi csapat készített és nem vállal felelősséget azok tartalmáért</disclaimer>
+		<disclaimer lang="id_ID">Tim Kodi tidak membuat semua pengaya pada repository ini dan tidak bertanggung jawab atas isinya.</disclaimer>
+		<disclaimer lang="is_IS">Kodi teymið gerir ekki allar þessar viðbætur og er ekki ábyrgt fyrir innihaldi þeirra.</disclaimer>
+		<disclaimer lang="it_IT">Il team di Kodi non ha creato tutti gli add-on di questa libreria e non è responsabile per il loro contenuto</disclaimer>
+		<disclaimer lang="ja_JP">Kodi チームが、このリポジトリ上の全アドオンを作ったわけではありません。また、その内容についても責任は負いかねます。</disclaimer>
+		<disclaimer lang="ko_KR">Team-Kodi가 이 저장소의 모든 애드온을 제작한 것은 아니며, 애드온 컨텐츠에 대한 책임이 없습니다.</disclaimer>
+		<disclaimer lang="lt_LT">Kodi komanda netestavo priedų šioje saugykloje ir neatsako arba nėra atsakinga už jų turinį</disclaimer>
+		<disclaimer lang="lv_LV">Kodi komanda nav izveidojusi visus šīs krātuves pielikumus un nav atbildīga par to saturu</disclaimer>
+		<disclaimer lang="mk_MK">Kodi тимот ги нема направено сите овие додатоци и не е одговорен за нивната содржина</disclaimer>
+		<disclaimer lang="ms_MY">Team-Kodi tidak menghasilkan semua tambahan di dalam repositori ini dan tidak bertanggungjawab keatas kandungannya</disclaimer>
+		<disclaimer lang="nb_NO">Team-Kodi har ikke utviklet alle utvidelsene i denne pakkebrønnen og er ikke ansvarlig for deres innhold</disclaimer>
+		<disclaimer lang="nl_NL">Team-Kodi heeft niet alle add-ons in deze depot geschreven en is niet verantwoordelijk voor hun inhoud.</disclaimer>
+		<disclaimer lang="pl_PL">Zespół Kodi nie tworzy wszystkich dodatków i nie bierze odpowiedzialności za ich zawartość</disclaimer>
+		<disclaimer lang="pt_BR">O Time do Kodi não produziu todos os add-ons deste repositório, e portanto não é responsável ​​por seu conteúdo</disclaimer>
+		<disclaimer lang="pt_PT">A equipa Kodi não desenvolveu todos os add-ons neste repositório e não é responsável pelo seu conteúdo.</disclaimer>
+		<disclaimer lang="ro_RO">Echipa Kodi nu a creat toate aceste suplimente din acest depozit și nu este responsabilă pentru conținutul lor.</disclaimer>
+		<disclaimer lang="ru_RU">Разработчики Kodi не являются авторами всех дополнений в данном репозитории и не несут ответственность за их содержимое.</disclaimer>
+		<disclaimer lang="sk_SK">Team-Kodi nevytvoril všetky rozšírenia v tomto zdroji nie je zodpovedný za ich obsah</disclaimer>
+		<disclaimer lang="sl_SI">Ekipa Kodi ni naredila vseh dodatkov v tem skladišču in ne odgovarja za njihovo vsebino</disclaimer>
+		<disclaimer lang="sr_RS">Тим Kodi није направио све додатке у овом спремишту и није одговоран за њихов садржај</disclaimer>
+		<disclaimer lang="sr_RS@latin">Tim-Kodi nije napravio sve dodatne programe u ovom spremištu i nije odgovoran za njihov sadržaj</disclaimer>
+		<disclaimer lang="sv_SE">Team-Kodi har inte gjort alla tillägg och är inte ansvariga för innehållet i dessa.</disclaimer>
+		<disclaimer lang="tg_TJ">Гурӯҳи кории Kodi дар ин анбори нармафзор соҳиби ҳамаи барномаҳои иловагӣ намебошад ва барои мӯҳтавояшон ҷавобгар намебшад</disclaimer>
+		<disclaimer lang="th_TH">ทีม Kodi ไม่ได้จัดทำ ส่วนเสริม ทั้งหมดในแหล่งข้อมูลโปรแกรมนี้ และจะไม่รับผิดชอบต่อเนื้อหาเหล่านั้น</disclaimer>
+		<disclaimer lang="tr_TR">Kodi takımı bu depodaki tüm eklentileri geliştirmemiştir ve bunların içeriklerinden sorumlu değildir.</disclaimer>
+		<disclaimer lang="uk_UA">Зауважте, що не всі додатки в цьому Репозиторії створені Командою Kodi, і тому Команда не несе відповідальності за їх вміст.</disclaimer>
+		<disclaimer lang="vi_VN">Đội ngũ Kodi không làm ra tất cả các add-on có trên kho chứa này và sẽ không chịu trách nhiệm về nội dung của các add-on đấy</disclaimer>
+		<disclaimer lang="zh_CN">本库中插件不完全由 Kodi 团队开发，Kodi 团队对他人提交的内容不承担责任</disclaimer>
+		<disclaimer lang="zh_TW">這個附加元件庫的附加元件並非全部由 Kodi 團隊製作的，所以我們不對這些內容負責。</disclaimer>
+		<platform>all</platform>
+	</extension>
+</addon>
diff --git a/packages/mediacenter/kodi/config/skin/repository.xbmc.org/icon.png b/packages/mediacenter/kodi/config/skin/repository.xbmc.org/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..58a2772c26d4e336355700bf3889347817edb8dd
Binary files /dev/null and b/packages/mediacenter/kodi/config/skin/repository.xbmc.org/icon.png differ
diff --git a/packages/mediacenter/kodi/config/skin/skin.titan.beta/1080i/script-skinshortcuts-includes.xml b/packages/mediacenter/kodi/config/skin/skin.titan.beta/1080i/script-skinshortcuts-includes.xml
index 178acefa6589f7a3a5d9822fcb34b3e6bbf222a4..1faac562f268aae71f46714d5e03c448adaa1b2a 100644
--- a/packages/mediacenter/kodi/config/skin/skin.titan.beta/1080i/script-skinshortcuts-includes.xml
+++ b/packages/mediacenter/kodi/config/skin/skin.titan.beta/1080i/script-skinshortcuts-includes.xml
@@ -456,15 +456,15 @@
 		<item id="1">
 			<property name="id">$NUM[1]</property>
 			<label>Buscar Pelis</label>
-			<label2>Favorito</label2>
+			<label2>Custom shortcut</label2>
 			<icon>DefaultFolder.png</icon>
 			<thumb>/usr/share/kodi/addons/plugin.video.pulsar/resources/img/search.png</thumb>
-			<property name="labelID">plugin.video.pulsar/movies/search</property>
+			<property name="labelID">plugin.video.quasar/movies/search</property>
 			<property name="defaultID">plugin.video.pulsar/movies/search</property>
 			<property name="translatedPath">ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</property>
-			<onclick>ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</onclick>
-			<property name="path">ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</property>
-			<property name="list">plugin://plugin.video.pulsar/movies/search</property>
+			<onclick>ActivateWindow(10025,"plugin://plugin.video.quasar/movies/search",return)</onclick>
+			<property name="path">ActivateWindow(10025,"plugin://plugin.video.quasar/movies/search",return)</property>
+			<property name="list">plugin://plugin.video.quasar/movies/search</property>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(300).ListItem.Property(submenuVisibility),plugin-video-pulsar)</visible>
 			<property name="group">plugin.video.pulsar</property>
 			<property name="isSubmenu">True</property>
@@ -472,15 +472,15 @@
 		<item id="2">
 			<property name="id">$NUM[2]</property>
 			<label>Buscar Series</label>
-			<label2>Favorito</label2>
+			<label2>Custom shortcut</label2>
 			<icon>DefaultFolder.png</icon>
 			<thumb>/usr/share/kodi/addons/plugin.video.pulsar/resources/img/search.png</thumb>
-			<property name="labelID">plugin.video.pulsar/shows/search</property>
+			<property name="labelID">plugin.video.quasar/shows/search</property>
 			<property name="defaultID">plugin.video.pulsar/shows/search</property>
 			<property name="translatedPath">ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</property>
-			<onclick>ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</onclick>
-			<property name="path">ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</property>
-			<property name="list">plugin://plugin.video.pulsar/shows/search</property>
+			<onclick>ActivateWindow(10025,"plugin://plugin.video.quasar/shows/search",return)</onclick>
+			<property name="path">ActivateWindow(10025,"plugin://plugin.video.quasar/shows/search",return)</property>
+			<property name="list">plugin://plugin.video.quasar/shows/search</property>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(300).ListItem.Property(submenuVisibility),plugin-video-pulsar)</visible>
 			<property name="group">plugin.video.pulsar</property>
 			<property name="isSubmenu">True</property>
@@ -1425,15 +1425,15 @@
 		<item id="1">
 			<property name="id">$NUM[1]</property>
 			<label>Buscar Pelis</label>
-			<label2>Favorito</label2>
+			<label2>Custom shortcut</label2>
 			<icon>DefaultFolder.png</icon>
 			<thumb>/usr/share/kodi/addons/plugin.video.pulsar/resources/img/search.png</thumb>
-			<property name="labelID">plugin.video.pulsar/movies/search</property>
+			<property name="labelID">plugin.video.quasar/movies/search</property>
 			<property name="defaultID">plugin.video.pulsar/movies/search</property>
 			<property name="translatedPath">ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</property>
-			<onclick>ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</onclick>
-			<property name="path">ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</property>
-			<property name="list">plugin://plugin.video.pulsar/movies/search</property>
+			<onclick>ActivateWindow(10025,"plugin://plugin.video.quasar/movies/search",return)</onclick>
+			<property name="path">ActivateWindow(10025,"plugin://plugin.video.quasar/movies/search",return)</property>
+			<property name="list">plugin://plugin.video.quasar/movies/search</property>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">plugin.video.pulsar</property>
 			<property name="isSubmenu">True</property>
@@ -1441,15 +1441,15 @@
 		<item id="2">
 			<property name="id">$NUM[2]</property>
 			<label>Buscar Series</label>
-			<label2>Favorito</label2>
+			<label2>Custom shortcut</label2>
 			<icon>DefaultFolder.png</icon>
 			<thumb>/usr/share/kodi/addons/plugin.video.pulsar/resources/img/search.png</thumb>
-			<property name="labelID">plugin.video.pulsar/shows/search</property>
+			<property name="labelID">plugin.video.quasar/shows/search</property>
 			<property name="defaultID">plugin.video.pulsar/shows/search</property>
 			<property name="translatedPath">ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</property>
-			<onclick>ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</onclick>
-			<property name="path">ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</property>
-			<property name="list">plugin://plugin.video.pulsar/shows/search</property>
+			<onclick>ActivateWindow(10025,"plugin://plugin.video.quasar/shows/search",return)</onclick>
+			<property name="path">ActivateWindow(10025,"plugin://plugin.video.quasar/shows/search",return)</property>
+			<property name="list">plugin://plugin.video.quasar/shows/search</property>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">plugin.video.pulsar</property>
 			<property name="isSubmenu">True</property>
@@ -1508,15 +1508,15 @@
 		<item id="1">
 			<property name="id">$NUM[1]</property>
 			<label>Buscar Pelis</label>
-			<label2>Favorito</label2>
+			<label2>Custom shortcut</label2>
 			<icon>DefaultFolder.png</icon>
 			<thumb>/usr/share/kodi/addons/plugin.video.pulsar/resources/img/search.png</thumb>
-			<property name="labelID">plugin.video.pulsar/movies/search</property>
+			<property name="labelID">plugin.video.quasar/movies/search</property>
 			<property name="defaultID">plugin.video.pulsar/movies/search</property>
 			<property name="translatedPath">ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</property>
-			<onclick>ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</onclick>
-			<property name="path">ActivateWindow(10025,"plugin://plugin.video.pulsar/movies/search",return)</property>
-			<property name="list">plugin://plugin.video.pulsar/movies/search</property>
+			<onclick>ActivateWindow(10025,"plugin://plugin.video.quasar/movies/search",return)</onclick>
+			<property name="path">ActivateWindow(10025,"plugin://plugin.video.quasar/movies/search",return)</property>
+			<property name="list">plugin://plugin.video.quasar/movies/search</property>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),plugin-video-pulsar)</visible>
 			<property name="group">plugin.video.pulsar</property>
 			<property name="isSubmenu">True</property>
@@ -1524,15 +1524,15 @@
 		<item id="2">
 			<property name="id">$NUM[2]</property>
 			<label>Buscar Series</label>
-			<label2>Favorito</label2>
+			<label2>Custom shortcut</label2>
 			<icon>DefaultFolder.png</icon>
 			<thumb>/usr/share/kodi/addons/plugin.video.pulsar/resources/img/search.png</thumb>
-			<property name="labelID">plugin.video.pulsar/shows/search</property>
+			<property name="labelID">plugin.video.quasar/shows/search</property>
 			<property name="defaultID">plugin.video.pulsar/shows/search</property>
 			<property name="translatedPath">ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</property>
-			<onclick>ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</onclick>
-			<property name="path">ActivateWindow(10025,"plugin://plugin.video.pulsar/shows/search",return)</property>
-			<property name="list">plugin://plugin.video.pulsar/shows/search</property>
+			<onclick>ActivateWindow(10025,"plugin://plugin.video.quasar/shows/search",return)</onclick>
+			<property name="path">ActivateWindow(10025,"plugin://plugin.video.quasar/shows/search",return)</property>
+			<property name="list">plugin://plugin.video.quasar/shows/search</property>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),plugin-video-pulsar)</visible>
 			<property name="group">plugin.video.pulsar</property>
 			<property name="isSubmenu">True</property>