diff --git a/channels/filmigratis.json b/channels/filmigratis.json
new file mode 100644
index 00000000..53f6e70f
--- /dev/null
+++ b/channels/filmigratis.json
@@ -0,0 +1,70 @@
+{
+  "id": "filmigratis",
+  "name": "Filmi Gratis",
+  "active": true,
+  "adult": false,
+  "language": ["ita"],
+  "thumbnail": "filmigratis.png",
+  "banner": "filmigratis.png",
+  "categories": ["movie","tvshow"],  
+  "settings": [
+        {
+            "id": "include_in_global_search",
+            "type": "bool",
+            "label": "Includi ricerca globale",
+            "default": true,
+            "enabled": true,
+            "visible": true
+        },
+        {
+            "id": "include_in_newest_peliculas",
+            "type": "bool",
+            "label": "Includi in Novità - Film",
+            "default": true,
+            "enabled": true,
+            "visible": true
+        },
+        {
+            "id": "include_in_newest_series",
+            "type": "bool",
+            "label": "Includi in Novità - Serie TV",
+            "default": true,
+            "enabled": true,
+            "visible": true
+        },
+        {
+            "id": "include_in_newest_italiano",
+            "type": "bool",
+            "label": "Includi in Novità - Italiano",
+            "default": true,
+            "enabled": true,
+            "visible": true
+        },
+        {
+            "id": "comprueba_enlaces",
+            "type": "bool",
+            "label": "Verifica se i link esistono",
+            "default": false,
+            "enabled": true,
+            "visible": true
+        },
+        {
+            "id": "comprueba_enlaces_num",
+            "type": "list",
+            "label": "Numero de link da verificare",
+            "default": 1,
+            "enabled": true,
+            "visible": "eq(-1,true)",
+            "lvalues": [ "1", "2", "5", "10" ]
+        },
+        {
+            "id": "filter_languages",
+            "type": "list",
+            "label": "Mostra link in lingua...",
+            "default": 0,
+            "enabled": true,
+            "visible": true,
+            "lvalues": ["Non filtrare","IT"]
+        }
+    ]
+}
diff --git a/channels/filmigratis.py b/channels/filmigratis.py
new file mode 100644
index 00000000..9252686f
--- /dev/null
+++ b/channels/filmigratis.py
@@ -0,0 +1,303 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Canale per Filmi Gratis
+# ------------------------------------------------------------
+import base64
+import re
+import urlparse
+
+from channelselector import get_thumb
+from channels import filtertools, support, autoplay
+from core import scrapertools, servertools, httptools, tmdb
+from platformcode import logger, config
+from core.item import Item
+
+channel = 'filmigratis'
+
+host = 'https://filmigratis.net'
+
+IDIOMAS = {'Italiano': 'IT'}
+list_language = IDIOMAS.values()
+list_servers = ['openload', 'streamango', 'vidoza', 'okru']
+list_quality = ['1080p', '720p', '480p', '360']
+
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmigratis')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'filmigratis')
+
+headers = [['Referer', host]]
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def mainlist(item):
+
+    # Main options
+    itemlist = []
+    support.menu(itemlist, 'Al Cinema bold', 'carousel', host, contentType='movie')
+    support.menu(itemlist, 'Film alta definizione bold', 'peliculas', host, contentType='movie', args='film')
+    support.menu(itemlist, 'Categorie Film bold', 'categorias_film', host , contentType='movie', args='film')
+    support.menu(itemlist, 'Categorie Serie bold', 'categorias_serie', host, contentType='episode', args='serie')
+    support.menu(itemlist, '[COLOR blue]Cerca Film...[/COLOR] bold', 'search', host, contentType='movie', args='film')
+    support.menu(itemlist, '[COLOR blue]Cerca Serie...[/COLOR] bold', 'search', host, contentType='episode', args='serie')
+
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def carousel(item):
+    logger.info('[filmigratis.py] carousel')
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    blocco = scrapertools.find_single_match(data, r'<div class="owl-carousel" id="postCarousel">(.*?)<section class="main-content">')
+
+    patron = r'background-image: url\((.*?)\).*?<h3.*?>(.*?)<.*?<a.*?<a href="(.*?)"'
+    matches = re.compile(patron, re.DOTALL).findall(blocco)
+
+    for scrapedthumb, scrapedtitle, scrapedurl, in matches:
+        itemlist.append(
+            Item(channel=item.channel,
+                 action = "findvideos",
+                 contentType = item.contentType,
+                 title = scrapedtitle,
+                 fulltitle = scrapedtitle,
+                 url = scrapedurl,
+                 thumbnail = scrapedthumb,
+                 args=item.args,
+                 show = scrapedtitle,))
+    return itemlist
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def peliculas(item):
+    logger.info('[filmigratis.py] peliculas')
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    blocco = scrapertools.find_single_match(data, r'<h1>Film streaming ita in alta definizione</h1>(.*?)<div class="content-sidebar">')
+
+    patron = r'<div class="timeline-left-wrapper">.*?<a href="(.*?)".*?src="(.*?)".*?<h3.*?>(.*?)<'
+    matches = re.compile(patron, re.DOTALL).findall(blocco)
+
+    for scrapedurl, scrapedthumb, scrapedtitle,  in matches:
+        itemlist.append(
+            Item(channel=item.channel,
+                 action = "findvideos",
+                 contentType = item.contentType,
+                 title = scrapedtitle,
+                 fulltitle = scrapedtitle,
+                 url = scrapedurl,
+                 thumbnail = scrapedthumb,
+                 args=item.args,
+                 show = scrapedtitle))
+
+        patron = r'class="nextpostslink".*?href="(.*?)"'
+        next_page = scrapertools.find_single_match(data, patron)
+
+        if next_page != "":
+            itemlist.append(
+                Item(channel=item.channel,
+                     action="peliculas",
+                     title="[B]" + config.get_localized_string(30992) + "[/B]",
+                     args=item.args,
+                     url=next_page))
+
+    return itemlist
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def categorias_film(item):
+    logger.info("[filmigratis.py] categorias_film")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+    bloque = scrapertools.find_single_match(data, 'CATEGORIES.*?<ul>(.*?)</ul>')
+
+    patron = '<a href="(.*?)">(.*?)<'
+    matches = re.compile(patron, re.DOTALL).findall(bloque)
+
+    for scrapedurl, scrapedtitle in matches:
+        itemlist.append(
+            Item(channel=channel,
+                 action="peliculas_categorias",
+                 title="[COLOR azure]" + scrapedtitle + "[/COLOR]",
+                 url=scrapedurl,
+                 args=item.args,
+                 thumbnail=""))
+
+    return itemlist
+#-----------------------------------------------------------------------------------------------------------------------
+
+def categorias_serie(item):
+    logger.info("[filmigratis.py] categorias_serie")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+    bloque = scrapertools.find_single_match(data, 'class="material-button submenu-toggle"> SERIE TV.*?<ul>.*?</li>(.*?)</ul>')
+
+    patron = '<a href="(.*?)">(.*?)<'
+    matches = re.compile(patron, re.DOTALL).findall(bloque)
+
+    for scrapedurl, scrapedtitle in matches:
+        itemlist.append(
+            Item(channel=channel,
+                 contentType='episode',
+                 action="peliculas_serie",
+                 title="[COLOR azure]" + scrapedtitle + "[/COLOR]",
+                 url=scrapedurl,
+                 args=item.args,
+                 thumbnail=""))
+
+    return itemlist
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def peliculas_categorias(item):
+    logger.info("[filmigratis.py] peliculas_categorias")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<div class="cnt">.*?src="(.*?)".*?title="([A-Z|0-9].*?)".*?<a href="(.*?)"'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedthumb, scrapedtitle, scrapedurl in matches:
+        if scrapedtitle == "":
+            scrapedtitle = scrapertools.find_single_match(data, r'<small>.*?([A-Z|0-9].*?)		<')
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        scrapedtitle = scrapedtitle.replace ("È","È")
+        scrapedtitle = scrapedtitle.replace("–", "-")
+        scrapedtitle = scrapedtitle.replace("’", "'")
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="findvideos",
+                 contentType=item.contentType,
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 thumbnail=scrapedthumb,
+                 args=item.args,
+                 show=scrapedtitle))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def peliculas_serie(item):
+    logger.info("[filmigratis.py] peliculas_serie")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'div class="cnt">.*?src="(.*?)".*?title="([A-Z|0-9].*?)".*?<a href="(.*?)"'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedthumb, scrapedtitle, scrapedurl in matches:
+        if scrapedtitle == "":
+            scrapedtitle = scrapertools.find_single_match(data, r'<small>.*?([A-Z|0-9].*?)		<')
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        scrapedtitle = scrapedtitle.replace ("È","È")
+        scrapedtitle = scrapedtitle.replace("–", "-")
+        scrapedtitle = scrapedtitle.replace("’", "'")
+        scrapedtitle = scrapedtitle.replace("		", "")
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="episodios",
+                 contentType='episode',
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 thumbnail=scrapedthumb,
+                 args=item.args,
+                 show=scrapedtitle))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def episodios(item):
+    logger.info("[filmigratis.py] episodios")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    block = scrapertools.find_single_match(data, r'<div class="row">(.*?)<section class="main-content">')
+
+    patron = r'href="(.*?)".*?(S[^<]+)												<'
+    matches = re.compile(patron, re.DOTALL).findall(block)
+
+    for scrapedurl, scrapedtitle in matches:
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        scrapedtitle = scrapedtitle.replace ("S0", "")
+        scrapedtitle = scrapedtitle.replace(" - EP ", "x")
+        itemlist.append(
+            Item(channel=item.channel,
+                 action="findvideos",
+                 contentType='episode',
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 thumbnail=item.thumb,
+                 args=item.args,
+                 show=item.title))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    support.videolibrary(itemlist, item, 'color kod')
+    return itemlist
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def search(item, texto):
+    logger.info('[filmigratis.py] search')
+
+    item.url = host + '/search/?s=' + texto
+
+    if item.args == 'serie':
+        try:
+            return peliculas_serie(item)
+
+        except:
+            import sys
+            for line in sys.exc_info():
+                logger.error('%s' % line)
+            return []
+
+    else:
+        try:
+            return peliculas_categorias(item)
+
+        except:
+            import sys
+            for line in sys.exc_info():
+                logger.error('%s' % line)
+            return []
+
+#-----------------------------------------------------------------------------------------------------------------------
+
+def findvideos(item):
+    logger.info('[filmigratis.py] findvideos')
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    itemlist = servertools.find_video_items(data=data)
+
+    for videoitem in itemlist:
+        videoitem.title = item.title + '[COLOR green][B] - ' + videoitem.title + '[/B][/COLOR]'
+        videoitem.fulltitle = item.fulltitle
+        videoitem.show = item.show
+        videoitem.thumbnail = item.thumbnail
+        videoitem.channel = item.channel
+        videoitem.contentType = item.content
+
+    if item.args == "film":
+        support.videolibrary(itemlist, item, 'color kod')
+
+    autoplay.start(itemlist, item)
+
+    return itemlist
diff --git a/channels/toonitalia.json b/channels/toonitalia.json
new file mode 100644
index 00000000..bae4c203
--- /dev/null
+++ b/channels/toonitalia.json
@@ -0,0 +1,65 @@
+{
+  "id": "toonitalia", 
+  "name": "ToonItalia",
+  "language": ["ita"],  
+  "active": true, 
+  "adult": false, 
+  "thumbnail": "toonitalia.png", 
+  "banner": "toonitalia.png", 
+  "categories": ["tvshow", "movie", "vosi"], 
+  "settings": [
+		{
+		  "id": "include_in_global_search",
+		  "type": "bool",
+		  "label": "Includi in Ricerca Globale",
+		  "default": true,
+		  "enabled": true,
+		  "visible": true
+		},
+		{
+      "id": "include_in_newest_peliculas",
+      "type": "bool",
+      "label": "Includi in Novità - Film",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "include_in_newest_italiano",
+      "type": "bool",
+      "label": "Includi in Novità - Italiano",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
+		{
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verifica se i link esistono",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Numero di link da verificare",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    },
+    {
+      "id": "filter_languages",
+      "type": "list",
+      "label": "Mostra link in lingua...",
+      "default": 0,
+      "enabled": true,
+      "visible": true,
+      "lvalues": [
+        "No filtrar",
+        "Italiano"
+      ]
+    }
+	  ]
+}
\ No newline at end of file
diff --git a/channels/toonitalia.py b/channels/toonitalia.py
new file mode 100644
index 00000000..dd509fcc
--- /dev/null
+++ b/channels/toonitalia.py
@@ -0,0 +1,331 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Ringraziamo Icarus crew
+# Canale per ToonItalia
+# ------------------------------------------------------------
+
+import re
+import urlparse
+
+from channels import autoplay, filtertools, support
+from core import scrapertools, scrapertoolsV2, httptools, tmdb, servertools
+from core.item import Item
+from platformcode import logger, config
+
+channel = "toonitalia"
+host = "https://toonitalia.org"
+headers = [['Referer', host]]
+
+list_servers = ['wstream', 'openload', 'streamango']
+list_quality = ['HD', 'default']
+
+def mainlist(item):
+
+    # Main options
+    itemlist = []
+    support.menu(itemlist, 'Ultimi episodi inseriti bold', 'insert', host, contentType='episode')
+    support.menu(itemlist, 'Ultime novità bold', 'updates', host, contentType='episode')
+    support.menu(itemlist, 'Episodi più visti bold', 'most_view', host, contentType='episode')
+    support.menu(itemlist, 'Anime', 'list', host + '/lista-anime-2/', contentType='episode')
+    support.menu(itemlist, 'Sub-Ita submenu', 'list', host + '/lista-anime-sub-ita/', contentType='episode')
+    support.menu(itemlist, 'Serie TV bold', 'list', host + '/lista-serie-tv/', contentType='episode')
+    support.menu(itemlist, 'Film Animazione bold', 'list', host + '/lista-film-animazione/', contentType="episode", args="film")
+    support.menu(itemlist, '[COLOR blue]Cerca anime e serie...[/COLOR] bold', 'search', host, contentType='episode')
+
+    autoplay.init(item.channel, list_servers, list_quality)
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def insert(item):
+    logger.info("[toonitalia.py] insert")
+    itemlist = []
+    minpage = 14
+
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<h2 class="entry-title"><a href="([^"]+)" rel="bookmark">([^<]+)</a></h2>.*?'
+    patron += r'<p class[^>]+><a href="[^"]+"><img width[^>]+src="([^"]+)" class[^>]+>.*?'
+    patron += r'<p>(.*?)<\/p>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for i, (scrapedurl, scrapedtitle, scrapedthumbnail, scrapedplot) in enumerate(matches):
+        if (p - 1) * minpage > i: continue
+        if i >= p * minpage: break
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+
+        itemlist.append(
+            Item(channel=channel,
+                 action="episodios",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 thumbnail=scrapedthumbnail,
+                 plot=scrapedplot,
+                 folder=True))
+
+    if len(matches) >= p * minpage:
+        scrapedurl = item.url + '{}' + str(p + 1)
+        itemlist.append(
+            Item(channel=channel,
+                 args=item.args,
+                 action="insert",
+                 title="[COLOR blue][B]Successivo >[/B][/COLOR]",
+                 url=scrapedurl,
+                 thumbnail="thumb_next.png",
+                 folder=True))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def updates(item):
+    logger.info("[toonitalia.py] updates")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    blocco = r'Aggiornamenti</h2>(.*?)</ul>'
+    matches = re.compile(blocco, re.DOTALL).findall(data)
+    for scrapedurl in matches:
+        blocco = scrapedurl
+
+    patron = r'<a href="(.*?)">(.*?)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(blocco)
+
+    for scrapedurl, scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        itemlist.append(
+            Item(channel=channel,
+                 action="episodios",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 plot=scrapedplot))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def most_view(item):
+    logger.info("[toonitalia.py] most_view")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    blocco = r'I piu visti</h2>(.*?)</ul>'
+    matches = re.compile(blocco, re.DOTALL).findall(data)
+    for scrapedurl in matches:
+        blocco = scrapedurl
+
+    patron = r'<a href="([^"]+)" title="[^"]+" class="wpp-post-title" target="_self">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(blocco)
+
+    for scrapedurl, scrapedtitle in matches:
+        scrapedplot = ""
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        itemlist.append(
+            Item(channel=channel,
+                 action="episodios",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 plot=scrapedplot))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def list(item):
+    logger.info("[toonitalia.py] list")
+    itemlist = []
+    minpage = 14
+
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<li ><a href="([^"]+)" title="[^>]+">([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for i, (scrapedurl, scrapedtitle) in enumerate(matches):
+        if (p - 1) * minpage > i: continue
+        if i >= p * minpage: break
+        if 'Film Animazione disponibili' not in scrapedtitle:
+            scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+            scrapedplot = ""
+            itemlist.append(
+                Item(channel=channel,
+                     action = 'episodios' if not 'film' in item.args else 'findvideos',
+                     contentType=item.contentType,
+                     title=scrapedtitle,
+                     fulltitle=scrapedtitle,
+                     url=scrapedurl,
+                     show=scrapedtitle,
+                     args=item.args,
+                     plot=scrapedplot))
+
+    if len(matches) >= p * minpage:
+        scrapedurl = item.url + '{}' + str(p + 1)
+        itemlist.append(
+            Item(channel=channel,
+                 args=item.args,
+                 contentType=item.contentType,
+                 action="list",
+                 title="[COLOR blue][B]Successivo >[/B][/COLOR]",
+                 url=scrapedurl))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def peliculas(item):
+    logger.info("[toonitalia] peliculas")
+    itemlist = []
+    minpage = 14
+
+    p = 1
+    if '{}' in item.url:
+        item.url, p = item.url.split('{}')
+        p = int(p)
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<h2 class="entry-title"><a href="([^"]+)" rel="bookmark">([^<]+)</a></h2>.*?<p>([^<]+)</p>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    print data
+
+    for i, (scrapedurl, scrapedtitle, scrapedplot) in enumerate(matches):
+        if (p - 1) * minpage > i: continue
+        if i >= p * minpage: break
+        scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+        itemlist.append(
+            Item(channel=channel,
+                 action="episodios",
+                 contentType="episode",
+                 title=scrapedtitle,
+                 fulltitle=scrapedtitle,
+                 url=scrapedurl,
+                 show=scrapedtitle,
+                 plot=scrapedplot))
+
+    if len(matches) >= p * minpage:
+        scrapedurl = item.url + '{}' + str(p + 1)
+        itemlist.append(
+            Item(channel=channel,
+                 extra=item.extra,
+                 action="peliculas",
+                 title="[COLOR blue][B]Successivo >[/B][/COLOR]",
+                 url=scrapedurl))
+
+    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def episodios(item):
+    logger.info("[toonitalia.py] episodios")
+    itemlist = []
+
+    data = httptools.downloadpage(item.url, headers=headers).data
+
+    patron = r'<br /> <a href="([^"]+)"\s*target="_blank"\s*rel[^>]+>([^<]+)</a>'
+    matches = re.compile(patron, re.DOTALL).findall(data)
+
+    for scrapedurl, scrapedtitle in matches:
+        if 'Wikipedia' not in scrapedurl:
+            scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).replace("×", "x")
+            scrapedtitle = scrapedtitle.replace("_", " ")
+            scrapedtitle = scrapedtitle.replace(".mp4", "")
+            puntata = scrapertools.find_single_match(scrapedtitle, '[0-9]+x[0-9]+')
+            for i in itemlist:
+                if i.args == puntata: #è già stata aggiunta
+                    i.url +=  " " + scrapedurl
+                    break
+
+            else:
+                itemlist.append(
+                    Item(channel=channel,
+                         action="findvideos",
+                         contentType=item.contentType,
+                         title="[COLOR azure]" + scrapedtitle + "[/COLOR]",
+                         thumbnail=item.thumbnail,
+                         fulltitle=scrapedtitle,
+                         url=scrapedurl,
+                         args = puntata,
+                         show=item.show,
+                         plot=item.plot))
+
+    support.videolibrary(itemlist, item, 'color kod')
+
+    return itemlist
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def search(item, texto):
+    logger.info("[toonitalia.py] " + item.url + " search " + texto)
+    item.url = host + "/?s=" + texto
+    try:
+        return peliculas(item)
+
+    except:
+        import sys
+        for line in sys.exc_info():
+            logger.error("%s" % line)
+        return []
+
+#----------------------------------------------------------------------------------------------------------------------------------------------
+
+def findvideos(item):
+    logger.info("[toonitalia.py] findvideos")
+
+    if item.args == 'film':
+        data = httptools.downloadpage(item.url, headers=headers).data
+        itemlist = servertools.find_video_items(data=data)
+
+        for videoitem in itemlist:
+            videoitem.channel = channel
+            server = re.sub(r'[-\[\]\s]+', '', videoitem.title)
+            videoitem.title = "".join(['[COLOR blue] ' + "[[B]" + server + "[/B]][/COLOR] " + item.title])
+            videoitem.thumbnail = item.thumbnail
+            videoitem.plot = item.plot
+            videoitem.fulltitle = item.fulltitle
+            videoitem.show = item.show
+
+    else:
+        itemlist = servertools.find_video_items(data=item.url)
+
+        for videoitem in itemlist:
+            videoitem.channel = channel
+            server = re.sub(r'[-\[\]\s]+', '', videoitem.title)
+            videoitem.title = "".join(['[COLOR blue] ' + "[[B]" + server + "[/B]] " + item.title + '[/COLOR]'])
+            videoitem.thumbnail = item.thumbnail
+            videoitem.plot = item.plot
+            videoitem.fulltitle = item.fulltitle
+            videoitem.show = item.show
+
+    autoplay.start(itemlist, item)
+
+    return itemlist
diff --git a/resources/media/channels/thumb/documentaristreamingda.png b/resources/media/channels/thumb/documentaristreamingda.png
new file mode 100644
index 00000000..c9342c90
Binary files /dev/null and b/resources/media/channels/thumb/documentaristreamingda.png differ
diff --git a/resources/media/channels/thumb/filmigratis.png b/resources/media/channels/thumb/filmigratis.png
new file mode 100644
index 00000000..d623d0b6
Binary files /dev/null and b/resources/media/channels/thumb/filmigratis.png differ
diff --git a/resources/media/channels/thumb/toonitalia.png b/resources/media/channels/thumb/toonitalia.png
new file mode 100644
index 00000000..15c31ab6
Binary files /dev/null and b/resources/media/channels/thumb/toonitalia.png differ
diff --git a/servers/upvid.json b/servers/upvid.json
index 13c77fe0..1c237a48 100644
--- a/servers/upvid.json
+++ b/servers/upvid.json
@@ -4,8 +4,8 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "https://upvid.co/embed-([a-z0-9]+).html",
-        "url": "https://upvid.co/embed-\\1.html"
+        "pattern": "upvid.(?:co|live)/(?:embed-)?([a-z0-9]+).html",
+        "url": "https://upvid.live/\\1.html"
       }
     ]
   },
diff --git a/servers/upvid.py b/servers/upvid.py
index 1e6f13c5..2a13afa8 100644
--- a/servers/upvid.py
+++ b/servers/upvid.py
@@ -29,7 +29,7 @@ def get_video_url(page_url, premium = False, user = "", password = "", video_pas
         if 'ﾟωﾟﾉ' in data:
             break
         else:
-            page_url = scrapertools.find_single_match(data, '"iframe" src="([^"]+)')
+            page_url = scrapertools.find_single_match(data, '\'<iframe src="([^"]+)')
             if not page_url:
                 page_url = scrapertools.find_single_match(data, '<input type="hidden" id="link" value="([^"]+)')
     data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)