diff --git a/addons.xml b/addons.xml
index a52b1492dd..1973023cbd 100644
--- a/addons.xml
+++ b/addons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addons>
-<addon id="plugin.video.vstream" name="vStream" version="2.7.2" provider-name="venom-xbmc-addons">
+<addon id="plugin.video.vstream" name="vStream" version="2.7.3" provider-name="venom-xbmc-addons">
     <requires>
 
         <trycatch>
diff --git a/addons.xml.md5 b/addons.xml.md5
index 6e74c664cd..469673329a 100644
--- a/addons.xml.md5
+++ b/addons.xml.md5
@@ -1 +1 @@
-d571d86457fca5621bcf0fb7fd614fd3
\ No newline at end of file
+428fe7749c70c893128c315b04c48b44
\ No newline at end of file
diff --git a/plugin.video.vstream/addon.xml b/plugin.video.vstream/addon.xml
index 5f3011fa44..49473e0dcc 100644
--- a/plugin.video.vstream/addon.xml
+++ b/plugin.video.vstream/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.vstream" name="vStream" version="2.7.2" provider-name="venom-xbmc-addons">
+<addon id="plugin.video.vstream" name="vStream" version="2.7.3" provider-name="venom-xbmc-addons">
     <requires>
 
         <trycatch>
diff --git a/plugin.video.vstream/resources/hosters/oneupload.py b/plugin.video.vstream/resources/hosters/oneupload.py
index d319c8ab50..d3317776d7 100644
--- a/plugin.video.vstream/resources/hosters/oneupload.py
+++ b/plugin.video.vstream/resources/hosters/oneupload.py
@@ -23,6 +23,12 @@ def _getMediaLinkForGuest(self):
         if aResult[0] is True:
             api_call = aResult[1][0]
 
+        if not api_call:
+            sPattern = 'jwplayer\("vplayer"\)\.setup\({ *sources: \[\{file:"([^"]+)'
+            aResult = oParser.parse(sHtmlContent, sPattern)
+            if aResult[0] is True:
+                api_call = aResult[1][0]
+    
         if api_call:
             return True, api_call #+ '|User-Agent=' + UA + '&Referer=' + self._url + '&Origin=https://vidfast.co'
 
diff --git a/plugin.video.vstream/resources/lib/gui/gui.py b/plugin.video.vstream/resources/lib/gui/gui.py
index 4f29329cf9..bf39e00fbf 100644
--- a/plugin.video.vstream/resources/lib/gui/gui.py
+++ b/plugin.video.vstream/resources/lib/gui/gui.py
@@ -38,6 +38,8 @@ def addNewDir(self, Type, sId, sFunction, sLabel, sIcon, sThumbnail='', sDesc=''
         # dir ou link => CONTENT par défaut = files
         if Type != 'dir' and Type != 'link':
             cGui.CONTENT = Type
+        if sCat is not None:
+            oGuiElement.setCat(sCat)
         oGuiElement.setSiteName(sId)
         oGuiElement.setFunction(sFunction)
         oGuiElement.setTitle(sLabel)
@@ -51,9 +53,6 @@ def addNewDir(self, Type, sId, sFunction, sLabel, sIcon, sThumbnail='', sDesc=''
 
         oGuiElement.setDescription(sDesc)
 
-        if sCat is not None:
-            oGuiElement.setCat(sCat)
-
         # Pour addLink on recupere le sCat et sMeta precedent.
         if Type == 'link':
             oInputParameterHandler = cInputParameterHandler()
@@ -397,9 +396,9 @@ def _createListItem(self, oGuiElement, oListItem=None):
             oListItem = listitem(itemTitle)
 
         if data.get('cast'):
-            credits = json.loads(data['cast'])
+            casts = json.loads(data['cast'])
             data['cast'] = []
-            for i in credits:
+            for i in casts:
                 if isNexus():
                     data['cast'].append(xbmc.Actor(i['name'], i['character'], i['order'], i.get('thumbnail', "")))
                 else:
@@ -425,7 +424,8 @@ def _createListItem(self, oGuiElement, oListItem=None):
             videoInfoTag.setMpaa(data.get('mpaa', ""))
             videoInfoTag.setDuration(int(data.get('duration', 0)))
             videoInfoTag.setPlaycount(int(data.get('playcount', 0)))
-            videoInfoTag.setCountries(data.get('country', [""]))
+            # inutilisé ? et fragile 
+            # videoInfoTag.setCountries(data.get('country', ['']))
             videoInfoTag.setTrailer(data.get('trailer', ""))
             videoInfoTag.setTagLine(data.get('tagline', ""))
             videoInfoTag.setStudios(list(data.get('studio', '').split("/")))
diff --git a/plugin.video.vstream/resources/lib/gui/guiElement.py b/plugin.video.vstream/resources/lib/gui/guiElement.py
index 6e91b21e41..f0827a913e 100644
--- a/plugin.video.vstream/resources/lib/gui/guiElement.py
+++ b/plugin.video.vstream/resources/lib/gui/guiElement.py
@@ -238,40 +238,44 @@ def TraiteTitre(self, sTitle):
         sDecoColor = self.addons.getSetting('deco_color')
         sTitle = re.sub('([\(|\[](?!\/*COLOR)[^\)\(\]\[]+?[\]|\)])', '[COLOR ' + sDecoColor + ']\\1[/COLOR]', sTitle)
 
-        # Recherche saisons et episodes
+        # Recherche saisons et episodes si séries ou animes
         sa = ep = ''
-        m = re.search('(|S|saison)(\s?|\.)(\d+)(\s?|\.)(E|Ep|x|\wpisode)(\s?|\.)(\d+)', sTitle, re.UNICODE)
-        if m:
-            sa = m.group(3)
-            ep = m.group(7)
-            if ep=='264' or ep=='265':  # echape les codecs X264 et x265
-                sa = ep = ''
-            else:
-                sTitle = sTitle.replace(m.group(0), '')
-                
-        else:  # Juste l'épisode
-            m = re.search('(^|\s|\.)(E|Ep|\wpisode)(\s?|\.)(\d+)', sTitle, re.UNICODE)
+        
+        if self.__sCat in (2, 3, 4, 8, 9):
+            m = re.search('(|S|saison)(\s?|\.)(\d+)(\s?|\.)(E|Ep|x|\wpisode)(\s?|\.)(\d+)', sTitle, re.UNICODE)
             if m:
-                sTitle = sTitle.replace(m.group(0), '')
-                ep = m.group(4)
-            else:  # juste la saison
-                m = re.search('( S|saison)(\s?|\.)(\d+)', sTitle, re.UNICODE)
+                sa = m.group(3)
+                ep = m.group(7)
+                if ep=='264' or ep=='265':  # echape les codecs X264 et x265
+                    sa = ep = ''
+                else:
+                    sTitle = sTitle.replace(m.group(0), '')
+                    
+            else:  # Juste l'épisode
+                m = re.search('(^|\s|\.)(E|Ep|\wpisode)(\s?|\.)(\d+)', sTitle, re.UNICODE)
                 if m:
                     sTitle = sTitle.replace(m.group(0), '')
-                    sa = m.group(3)
-
-        # enleve les crochets et les parentheses si elles sont vides
-        if sa or ep:
-            sTitle = sTitle.replace('()', '').replace('[]', '').replace('- -', '-')
-            # vire espace et - a la fin
-            sTitle = re.sub('[- –_\.\[]+$', '', sTitle)
-
-        if sa:
-            self.__Season = sa
-            self.addItemValues('Season', self.__Season)
-        if ep:
-            self.__Episode = ep
-            self.addItemValues('Episode', self.__Episode)
+                    ep = m.group(4)
+                else:  # juste la saison
+                    m = re.search('( S|saison)(\s?|\.)(\d+)', sTitle, re.UNICODE)
+                    if m:
+                        sTitle = sTitle.replace(m.group(0), '')
+                        sa = m.group(3)
+    
+            # enleve les crochets et les parentheses si elles sont vides
+            if sa or ep:
+                sTitle = sTitle.replace('()', '').replace('[]', '').replace('- -', '-')
+                # vire espace et - a la fin
+                sTitle = re.sub('[- –_\.\[]+$', '', sTitle)
+    
+            if sa:
+                self.__Season = sa
+                self.addItemValues('Season', self.__Season)
+            if ep:
+                self.__Episode = ep
+                self.addItemValues('Episode', self.__Episode)
+                if not self.__Season:
+                    self.__Season = 1   # forcer pour les séries sans saison
 
         # on repasse en utf-8
         if not isMatrix():
diff --git a/plugin.video.vstream/resources/lib/home.py b/plugin.video.vstream/resources/lib/home.py
index 2df496627e..6e0fac756f 100644
--- a/plugin.video.vstream/resources/lib/home.py
+++ b/plugin.video.vstream/resources/lib/home.py
@@ -401,7 +401,7 @@ def showUsers(self):
         oGui.addDir('alldebrid', 'load', 'AllDebrid', 'sites/alldebrid.png', oOutputParameterHandler)
 
         oOutputParameterHandler.addParameter('siteUrl', 'http://')
-        oGui.addDir('sitedarkibox', 'load', 'darkiBox', 'sites/sitedarkibox.png', oOutputParameterHandler)
+        oGui.addDir('sitedarkibox', 'load', 'DarkiBox', 'sites/sitedarkibox.png', oOutputParameterHandler)
 
         oOutputParameterHandler.addParameter('siteUrl', 'http://')
         oGui.addDir('themoviedb_org', 'showMyTmdb', 'TMDB', 'tmdb.png', oOutputParameterHandler)
diff --git a/plugin.video.vstream/resources/lib/trakt.py b/plugin.video.vstream/resources/lib/trakt.py
index 95893176ba..9bd683bcbb 100644
--- a/plugin.video.vstream/resources/lib/trakt.py
+++ b/plugin.video.vstream/resources/lib/trakt.py
@@ -717,7 +717,11 @@ def getLocalizedTitle(self, item, what):
                 oRequestHandler.addHeaderEntry('Authorization', 'Bearer %s' % self.ADDON.getSetting('bstoken'))
                 sHtmlContent = oRequestHandler.request(jsonDecode=True)
 
-            title = next((title for title in sHtmlContent if title['language'].lower() == 'fr'), item)['title']
+            for titleSearch in sHtmlContent:
+                if titleSearch['language'].lower() == 'fr':
+                    title = titleSearch['title']
+                if titleSearch['country'].lower() == 'fr':
+                    break
 
             if title is None:
                 return item['title']
@@ -1042,9 +1046,6 @@ def getTmdbInfo(self, sTmdb, oGuiElement):
         return
 
     def getTmdbID(self, sTitle, sType):
-
-        oInputParameterHandler = cInputParameterHandler()
-
         from resources.lib.tmdb import cTMDb
         grab = cTMDb()
 
@@ -1053,9 +1054,8 @@ def getTmdbID(self, sTitle, sType):
         elif sType == 'movies':
             sType = 'movie'
 
-        meta = 0
-        year = ''
         # on cherche l'annee
+        year = ''
         r = re.search('(\([0-9]{4}\))', sTitle)
         if r:
             year = str(r.group(0))
diff --git a/plugin.video.vstream/resources/sites/buzzmonclick_com.py b/plugin.video.vstream/resources/sites/buzzmonclick_com.py
index 82fd05457f..5f277ca527 100644
--- a/plugin.video.vstream/resources/sites/buzzmonclick_com.py
+++ b/plugin.video.vstream/resources/sites/buzzmonclick_com.py
@@ -109,7 +109,7 @@ def showMovies(sSearch=''):
             # mise en page
             sTitle = sTitle.replace('Permalien pour', '').replace('&prime;', '\'')
             sTitle = re.sub('(?:,)* (?:Replay |Video )*du ([0-9]+ [a-zA-z]+ [0-9]+)', ' (\\1)', sTitle)
-            sTitle = re.sub(', (?:Replay|Video)$', '', sTitle)
+            sTitle = re.sub(', (?:Replay|Video|Vidéo|vidéo)', '', sTitle)
             sUrl = aEntry[1]
             sThumb = aEntry[2]
 
@@ -131,7 +131,7 @@ def showMovies(sSearch=''):
 
 
 def __checkForNextPage(sHtmlContent):
-    sPattern = 'class="nextpostslink" rel="next" href="([^"]+)"'
+    sPattern = 'class="nextpostslink" rel="next".+?href="([^"]+)"'
     oParser = cParser()
     aResult = oParser.parse(sHtmlContent, sPattern)
     if aResult[0]:
@@ -153,9 +153,14 @@ def showLinks():
     sHtmlContent = oRequestHandler.request()
 
     oParser = cParser()
-    sPattern = 'wp-block-button.+?(?:href=|src=)"([^"]+)".+?>(?:([^<]+)|)'
+    sHtmlContent = oParser.abParse(sHtmlContent, '#555555;', 'section-box')
+    sPattern = "(?:href=|src=)\"([^\"]+)\".+?value=\'([^\']+)\'"
     aResult = oParser.parse(sHtmlContent, sPattern)
 
+    if not aResult[0]:
+        sPattern = 'wp-block-button.+?(?:href=|src=)"([^"]+)".+?>(?:([^<]+)|)'
+        aResult = oParser.parse(sHtmlContent, sPattern)
+        
     if aResult[0]:
         oOutputParameterHandler = cOutputParameterHandler()
         for aEntry in aResult[1]:
@@ -178,20 +183,32 @@ def showLinks():
 
 def showHosters():
     oGui = cGui()
+    oParser = cParser()
     oInputParameterHandler = cInputParameterHandler()
     sUrl = oInputParameterHandler.getValue('siteUrl')
     sMovieTitle = oInputParameterHandler.getValue('sMovieTitle')
     sThumb = oInputParameterHandler.getValue('sThumb')
+    oHoster = None
 
-    if 'forum-tv' in sUrl:
+    if 'generated' in sUrl:
+        oRequestHandler = cRequestHandler(sUrl)
+        sHtmlContent = oRequestHandler.request()
+        sPattern = 'window.location.href = "([^"]+)"'
+        aResult = oParser.parse(sHtmlContent, sPattern)
+        if aResult[0]:
+            sHosterUrl = aResult[1][0]
+        oHoster = cHosterGui().checkHoster(sHosterUrl)
+
+    elif 'dood.forum-tv.org' in sUrl:
+        showDoodHosters(sMovieTitle, sUrl)
+
+    elif 'forum-tv' in sUrl:
         dialog().VSinfo('Décodage en cours', "Patientez", 5)
         s = requests.Session()
-
         response = s.get(sUrl, headers={'User-Agent': UA})
         sHtmlContent = str(response.content)
         cookie_string = "; ".join([str(x) + "=" + str(y) for x, y in s.cookies.items()])
 
-        oParser = cParser()
         sPattern = '<input type="hidden".+?value="([^"]+)"'
         aResult = oParser.parse(sHtmlContent, sPattern)
 
@@ -216,7 +233,7 @@ def showHosters():
             aResult = oParser.parse(sHtmlContent, sPattern)
             if aResult[0]:
                 sHosterUrl = aResult[1][0]
-                oHoster = False
+                oHoster = None
                 
                 if 'replay.forum-tv.org' in sHosterUrl: 
                     oRequestHandler = cRequestHandler(sHosterUrl)
@@ -233,17 +250,14 @@ def showHosters():
                 else:
                     oHoster = cHosterGui().checkHoster(sHosterUrl)
 
-                if oHoster:
-                    oHoster.setDisplayName(sMovieTitle)
-                    oHoster.setFileName(sMovieTitle)
-                    cHosterGui().showHoster(oGui, oHoster, sHosterUrl, sThumb)
     else:
         sHosterUrl = sUrl
         oHoster = cHosterGui().checkHoster(sHosterUrl)
-        if oHoster:
-            oHoster.setDisplayName(sMovieTitle)
-            oHoster.setFileName(sMovieTitle)
-            cHosterGui().showHoster(oGui, oHoster, sHosterUrl, sThumb)
+
+    if oHoster:
+        oHoster.setDisplayName(sMovieTitle)
+        oHoster.setFileName(sMovieTitle)
+        cHosterGui().showHoster(oGui, oHoster, sHosterUrl, sThumb)
 
     oGui.setEndOfDirectory()
     
@@ -260,7 +274,10 @@ def showDoodHosters(sMovieTitle, sUrl):
         for aEntry in aResult[1]:
             sUrl = aEntry[0]
             sHost = aEntry[1]
-
+            oHoster = cHosterGui().checkHoster(sHost)
+            if not oHoster:
+                continue
+            
             sTitle = ('%s [COLOR coral]%s[/COLOR]') % (sMovieTitle, sHost)
 
             oOutputParameterHandler.addParameter('siteUrl', sUrl)
diff --git a/plugin.video.vstream/resources/sites/free_telechargement_org.py b/plugin.video.vstream/resources/sites/free_telechargement_org.py
index cb1eb703e6..7d355fce60 100644
--- a/plugin.video.vstream/resources/sites/free_telechargement_org.py
+++ b/plugin.video.vstream/resources/sites/free_telechargement_org.py
@@ -473,7 +473,7 @@ def showHosters():
     oRequestHandler = cRequestHandler(sUrl)
     sHtmlContent = oRequestHandler.request()
     # parfois présent, plus sure que de réduire la regex
-    sHtmlContent = re.sub('</font>', '', sHtmlContent)
+    sHtmlContentBck = sHtmlContent = re.sub('</font>', '', sHtmlContent)
 
     # recuperation nom de la release
     if 'elease :' in sHtmlContent:
@@ -558,6 +558,24 @@ def showHosters():
             oOutputParameterHandler.addParameter('sDesc', sDesc)
             oGui.addLink(SITE_IDENTIFIER, 'Display_protected_link', sTitle, sThumb, sDesc, oOutputParameterHandler)
 
+    else:
+        sHtmlContent = oParser.abParse(sHtmlContentBck, '<div id="link">', 'onclick')
+        sHtmlContent = sHtmlContent.replace('&nbsp;', '')
+        sPattern = '<b>([^<]+)</b> *</br>.+?href="([^"]+)"'
+        aResult = oParser.parse(sHtmlContent, sPattern)
+        if aResult[0]:
+            oOutputParameterHandler = cOutputParameterHandler()
+            for aEntry in aResult[1]:
+                sUrl = aEntry[1]
+                if len(sUrl) <10:
+                    continue
+                sTitle = '%s - [%s]' % (sMovieTitle, aEntry[0])
+                oOutputParameterHandler.addParameter('siteUrl', sUrl)
+                oOutputParameterHandler.addParameter('sMovieTitle', sTitle)
+                oOutputParameterHandler.addParameter('sThumb', sThumb)
+                oOutputParameterHandler.addParameter('sDesc', sDesc)
+                oGui.addLink(SITE_IDENTIFIER, 'Display_protected_link', sTitle, sThumb, sDesc, oOutputParameterHandler)
+
     oGui.setEndOfDirectory()
 
 
diff --git a/plugin.video.vstream/resources/sites/french_stream_lol.py b/plugin.video.vstream/resources/sites/french_stream_lol.py
index 343f79d396..106de9711a 100644
--- a/plugin.video.vstream/resources/sites/french_stream_lol.py
+++ b/plugin.video.vstream/resources/sites/french_stream_lol.py
@@ -195,7 +195,7 @@ def showMovies(sSearch=''):
         sSearchText = sSearchText.replace(URL_SEARCH_SERIES[0], '')
         sSearchText = oUtil.CleanName(sSearchText)
 
-        # sUrl = URL_SEARCH[0]  # ne sert à rien
+        # sUrl = URL_SEARCH[0] # ne sert à rien
         sSearch = sSearch.replace(' ', '+').replace('%20', '+')
 
         if key_search_movies in sSearch:
@@ -334,30 +334,30 @@ def showEpisodes():
 
             if bFind and aEntry[0]:
                 sFirst_Url = aEntry[2]
-                if not 'http' in sFirst_Url :
+                if 'http' not in sFirst_Url:
                     continue
-            
-                sHoster = re.findall('https:\/\/([^.]+)', sFirst_Url) 
+
+                sHoster = re.findall('https:\/\/([^.]+)', sFirst_Url)
                 sHoster = sHoster[0]
                 oHoster = cHosterGui().checkHoster(sHoster)
             if not oHoster:
-                continue 
-                
-                #sRel_Episode = aEntry[2]
-                #if sRel_Episode == "ABCDE":
-                    #sEpisode = 'Episode 2'
-                #else:
-                    #sEpisode = aEntry[3]
+                continue
+
+                # sRel_Episode = aEntry[2]
+                # if sRel_Episode == "ABCDE":
+                    # sEpisode = 'Episode 2'
+                # else:
+                    # sEpisode = aEntry[3]
 
             sTitle = sMovieTitle + ' ' + sEpisode
-            sDisplayTitle = ' %s (%s) [COLOR skyblue]%s[/COLOR]' % (sTitle,  sLang,  sHoster )
+            sDisplayTitle = ' %s (%s) [COLOR coral]%s[/COLOR]' % (sTitle,  sLang.upper(),  sHoster.capitalize())
 
             oOutputParameterHandler.addParameter('siteUrl', sUrl)
             oOutputParameterHandler.addParameter('sThumb', sThumb)
             oOutputParameterHandler.addParameter('sMovieTitle', sTitle)
             oOutputParameterHandler.addParameter('sDesc', sDesc)
             oOutputParameterHandler.addParameter('sLang', sLang)
-            #oOutputParameterHandler.addParameter('sRel_Episode', sRel_Episode)
+            # oOutputParameterHandler.addParameter('sRel_Episode', sRel_Episode)
             oOutputParameterHandler.addParameter('sFirst_Url', sFirst_Url)
 
             oGui.addEpisode(SITE_IDENTIFIER, 'showSerieLinks', sDisplayTitle, '', sThumb, sDesc, oOutputParameterHandler)
diff --git a/plugin.video.vstream/resources/sites/pastebin.py b/plugin.video.vstream/resources/sites/pastebin.py
index 4ecf6d3044..d663f8d547 100644
--- a/plugin.video.vstream/resources/sites/pastebin.py
+++ b/plugin.video.vstream/resources/sites/pastebin.py
@@ -1685,8 +1685,7 @@ def showGroupes():
                         for gr in groupe:
                             if ':' in gr:
                                 grID = gr.split(':')[0]
-                                if grID not in sousGroupe:
-                                    sousGroupe.add(grID)
+                                sousGroupe.add(grID)
                             else:
                                 groupesPerso.add(gr)
             except Exception as e:
@@ -1717,6 +1716,7 @@ def showGroupeDetails():
     aParams = dict(param.split('=') for param in params.split('&'))
     pasteID = aParams['pasteID'] if 'pasteID' in aParams else None
     sGroupe = aParams['sGroupe'].replace('+', ' ') + ':' if 'sGroupe' in aParams else None
+    sMedia = aParams['sMedia']
 
     pbContent = PasteContent()
     groupes = set()
@@ -1724,9 +1724,9 @@ def showGroupeDetails():
     if sGroupe:
         listeIDs = getPasteList(pasteID)
         for pasteBin in listeIDs:
-            movies = pbContent.getLines(pasteBin)
-            try:
-                for movie in movies:
+            movies = pbContent.getLines(pasteBin, sMedia)
+            for movie in movies:
+                try:
                     groupe = movie[pbContent.GROUPES].strip().replace("''", '')
                     if groupe:
                         groupe = eval(groupe)
@@ -1734,8 +1734,8 @@ def showGroupeDetails():
                             for gr in groupe:
                                 if gr.startswith(sGroupe):
                                     groupes.add(gr)
-            except Exception as e:
-                pass
+                except Exception as e:
+                    pass
 
     oOutputParameterHandler = cOutputParameterHandler()
     for sGroupe in sorted(groupes):
@@ -2361,9 +2361,10 @@ def showSerieSaisons():
         sDisplaySaison = sSaison
         if sSaison.isdigit():
             sDisplaySaison = 'S{:02d}'.format(int(sSaison))
-
+            sDisplayTitle = searchTitle + ' - ' + sDisplaySaison
+        else:
+            sDisplayTitle = '[' + sDisplaySaison + ']' + ' - ' + searchTitle
         sUrl = siteUrl + '&sSaison=' + sSaison
-        sDisplayTitle = searchTitle + ' - ' + sDisplaySaison
         oOutputParameterHandler.addParameter('siteUrl', sUrl)
         oOutputParameterHandler.addParameter('sMovieTitle', sDisplayTitle) # on ne passe pas sTitre afin de pouvoir mettre la saison en marque-page
         oGui.addSeason(SITE_IDENTIFIER, 'showEpisodesLinks', sDisplayTitle, 'series.png', '', '', oOutputParameterHandler)
@@ -2394,6 +2395,8 @@ def showEpisodesLinks(siteUrl=''):
     listeEpisodes = set()
     for episode in lines:
         for numEpisode in episode.keys():
+            numEpisode = str(numEpisode).replace('E', '')
+            numEpisode = int(numEpisode)
             if numEpisode not in listeEpisodes:
                 listeEpisodes.add(numEpisode)
 
@@ -2406,7 +2409,10 @@ def showEpisodesLinks(siteUrl=''):
         sUrl = siteUrl + '&sEpisode=' + str(episode)
 
         if str(episode).isdigit():
-            episode = '{}E{:02d}'.format(sDisplaySaison, int(episode))
+            if sSaison.isdigit():
+                episode = '{}E{:02d}'.format(sDisplaySaison, int(episode))
+            else:
+                episode = 'E{:02d}'.format(int(episode))
         else:
             episode = '{}{}'.format(sDisplaySaison, episode)
         sDisplayTitle = searchTitle + ' - ' + episode
@@ -2547,7 +2553,7 @@ def getHosterList(siteUrl):
             if searchSaison and pbContent.SAISON >= 0:
                 sSaisons = movie[pbContent.SAISON].strip()
                 if sSaisons:
-                    if sSaisons.isdigit:
+                    if sSaisons.isdigit():
                         sSaisons = '%02d' % int(sSaisons)
                     if searchSaison != sSaisons:
                         continue
diff --git a/plugin.video.vstream/resources/sites/sitedarkibox.py b/plugin.video.vstream/resources/sites/sitedarkibox.py
index ae92eb72c1..9f94eee483 100644
--- a/plugin.video.vstream/resources/sites/sitedarkibox.py
+++ b/plugin.video.vstream/resources/sites/sitedarkibox.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # vStream https://github.com/Kodi-vStream/venom-xbmc-addons
 import json
 import re
@@ -19,6 +20,7 @@
 NB_FILES = 100
 URL_MAIN = siteManager().getUrlMain(SITE_IDENTIFIER)
 API_URL_FILE = 'api/file/list?per_page=100'
+API_URL_FILE_TVSHOW = 'api/file/list?per_page=1000'
 API_URL_FOLDER = 'api/folder/list?files=0'
 
 URL_MOVIE = (API_URL_FILE, 'showMedias')
@@ -51,7 +53,7 @@ def load():
     oGui.addDir(SITE_IDENTIFIER, URL_MOVIE[1], 'Mes vidéos', 'films.png', oOutputParameterHandler)
 
     oOutputParameterHandler.addParameter('siteUrl', URL_MOVIE[0] + '&fld_id=0')
-    oGui.addDir(SITE_IDENTIFIER, 'showFile', 'Mes Fichiers', 'genres.png', oOutputParameterHandler)
+    oGui.addDir(SITE_IDENTIFIER, 'showFile', 'Mes fichiers', 'genres.png', oOutputParameterHandler)
 
     oGui.setEndOfDirectory()
 
@@ -228,18 +230,19 @@ def showMedias(sSearch = ''):
         sSiteUrl = oInputParameterHandler.getValue('siteUrl')
         fldId = int(re.search('&fld_id=(\d+)', siteUrl).group(1))
 
-    sFolderCat = sCat
     if sMovieTitle and not sCat:
         if 'FILM' in sMovieTitle or 'MOVIE' in sMovieTitle or 'DISNEY' in sMovieTitle or '3D' in sMovieTitle or '4K' in sMovieTitle or 'DOCUMENTAIRE' in sMovieTitle or 'DOCS' in sMovieTitle:
-            sFolderCat = 'film'
+            sCat = 'film'
+        elif 'MANGA' in sMovieTitle or 'JAPAN' in sMovieTitle:
+            sCat = 'anime'
         elif 'SERIE' in sMovieTitle or 'SÉRIE' in sMovieTitle or 'TVSHOW' in sMovieTitle:
-            sFolderCat = 'serie'
-        elif 'ANIMES' in sMovieTitle or 'ANIMÉS' in sMovieTitle or 'MANGA' in sMovieTitle or 'JAPAN' in sMovieTitle:
-            sFolderCat = 'anime'
-    isMovie = sFolderCat == 'film'
-    isTvShow = sFolderCat == 'serie'
-    isAnime = sFolderCat == 'anime'
+            sCat = 'serie'
+        elif 'ANIMES' in sMovieTitle or 'ANIMÉS' in sMovieTitle:
+            sCat = 'anime'
 
+    isMovie = sCat == 'film'
+    isTvShow = sCat == 'serie'
+    isAnime = sCat == 'anime'
 
     nbFile = 0
     numPage = 1
@@ -250,19 +253,20 @@ def showMedias(sSearch = ''):
     sToken = oPremiumHandler.getToken()
 
     # menu de recherche
-    if not sSearch and numPage == 1 :
-        if isMovie:
-            oOutputParameterHandler = cOutputParameterHandler()
-            oOutputParameterHandler.addParameter('siteUrl', URL_MOVIE[0])
-            oOutputParameterHandler.addParameter('sMovieTitle', 'film')
-            oGui.addDir(SITE_IDENTIFIER, 'showSearch', 'Rechercher (Films)', 'search.png', oOutputParameterHandler)
-
-        if isTvShow:
-            if 'sSeason' not in siteUrl:
+    if not sSearch:
+        if numPage == 1 :
+            if isMovie:
                 oOutputParameterHandler = cOutputParameterHandler()
-                oOutputParameterHandler.addParameter('siteUrl', fldId)
-                oOutputParameterHandler.addParameter('sMovieTitle', 'serie')
-                oGui.addDir(SITE_IDENTIFIER, 'showSearch', 'Rechercher (Séries)', 'search.png', oOutputParameterHandler)
+                oOutputParameterHandler.addParameter('siteUrl', URL_MOVIE[0])
+                oOutputParameterHandler.addParameter('sMovieTitle', 'film')
+                oGui.addDir(SITE_IDENTIFIER, 'showSearch', 'Rechercher (Films)', 'search.png', oOutputParameterHandler)
+    
+            if isTvShow:
+                if 'sSeason' not in siteUrl:
+                    oOutputParameterHandler = cOutputParameterHandler()
+                    oOutputParameterHandler.addParameter('siteUrl', fldId)
+                    oOutputParameterHandler.addParameter('sMovieTitle', 'serie')
+                    oGui.addDir(SITE_IDENTIFIER, 'showSearch', 'Rechercher (Séries)', 'search.png', oOutputParameterHandler)
 
     
         # parcourir un dossier virtuel, séparateur ':'
@@ -294,13 +298,15 @@ def showMedias(sSearch = ''):
             nbFile = showSeries(oGui, content, searchFolder, numPage)
         # ajout des dossiers en premier, sur la première page seulement
         if not isTvShow and not isAnime and not sSearch and numPage == 1 and 'folders' in content:
-            addFolders(oGui, content, searchFolder)
+            addFolders(oGui, content, sCat, searchFolder)
 
     # les fichiers
     if sSearch:
         sUrl = sSearch
     else:
         sUrl = API_URL_FILE
+        if isTvShow or isAnime:
+            sUrl = API_URL_FILE_TVSHOW        
     if fldId:
         sUrl += '&fld_id=%d' % fldId
     if isMovie: 
@@ -349,12 +355,11 @@ def showMedias(sSearch = ''):
     oGui.setEndOfDirectory()
 
 
-def addFolders(oGui, content, searchFolder = None):
+def addFolders(oGui, content, sSearchCat, searchFolder = None):
     oUtil = cUtil()
 
     # dossiers trier par ordre alpha
     folders = sorted(content['folders'], key=lambda f: f['name'].upper())
-
     fldId = ''
 
     # Sous-dossiers virtuels identifiés par les deux-points
@@ -367,6 +372,13 @@ def addFolders(oGui, content, searchFolder = None):
         fldId = folder['fld_id']
         sTitle = oUtil.unescape(sTitle)
 
+        # on passe en utf-8
+        if not isMatrix():
+            try:
+                sTitle = sTitle.encode('utf-8')
+            except:
+                pass
+
         if searchFolder and not sTitle.startswith(searchFolder):
             continue
 
@@ -376,9 +388,6 @@ def addFolders(oGui, content, searchFolder = None):
 
         if isSubFolder and ':' in sTitle:
             subName, subFolder = sTitle.split(':')
-            # if folderPath.endswith(subName):
-            #     sTitle = subFolder.strip()
-            # else:
             if searchFolder:
                 if subName == searchFolder:
                     sTitle = subFolder
@@ -387,46 +396,59 @@ def addFolders(oGui, content, searchFolder = None):
                     continue
                 subFolders.add(subName)
                 sTitle = subName
-# TODO                sFoldername = sFoldername.replace(subFolder, '')
 
         if sTitle.startswith('REP_'):
             sTitle=sTitle.replace('REP_', '')
-        if sTitle.startswith('00_'):
+        elif sTitle.startswith('00_'):
             sTitle=sTitle.replace('00_', '')
         
         # format du genre "REP_:"
         if not sTitle:
-            return addFolders(oGui, content, subName)           
+            return addFolders(oGui, content, sSearchCat, subName)           
             
         if sTitle.startswith('RES-') and sTitle.endswith('-RES'):
             sTitle=sTitle.replace('RES-', '[').replace('-RES', ']')
-
-        if 'SERIE' in sTitle.upper() or 'SÉRIE' in sTitle.upper() or 'TVSHOW' in sTitle.upper():
-            sCat = 'serie'
-            sThumb = 'series.png'
-        elif 'DOCUMENTAIRE' in sTitle.upper() or 'DOCS' in sTitle.upper():
-            sCat = 'film'
-            sThumb = 'doc.png'
-        elif 'SPECTACLE' in sTitle.upper():
-            sCat = 'film'
-            sThumb = 'star.png'
-        elif 'CONCERT' in sTitle.upper():
-            sCat = 'film'
-            sThumb = 'music.png'
-        elif 'SPORT' in sTitle.upper():
-            sCat = 'film'
-            sThumb = 'sport.png'
-        elif 'FILM' in sTitle.upper() or 'MOVIE' in sTitle.upper():
-            sCat = 'film'
-            sThumb = 'films.png'
-        elif 'ANIMES' in sTitle.upper() or 'ANIMÉS' in sTitle.upper() or 'MANGA' in sTitle.upper() or 'JAPAN' in sTitle.upper():
-            sCat = 'anime'
-            sThumb = 'animes.png'
+        
+        if sSearchCat:
+            if sSearchCat == 'serie':
+                sThumb = 'series.png'
+            elif sSearchCat == 'film':
+                sThumb = 'films.png'
+            elif sSearchCat == 'anime':
+                sThumb = 'animes.png'
+            else:
+                sThumb = 'genres.png'
+            sCat = sSearchCat
         else:
-            sCat = None
-            sThumb = 'genres.png'
+            if 'FILM' in sTitle.upper() or 'MOVIE' in sTitle.upper():
+                sCat = 'film'
+                sThumb = 'films.png'
+            elif 'MANGA' in sTitle.upper() or 'JAPAN' in sTitle.upper():
+                sCat = 'anime'
+                sThumb = 'animes.png'
+            elif 'SERIE' in sTitle.upper() or 'SÉRIE' in sTitle.upper() or 'TVSHOW' in sTitle.upper():
+                sCat = 'serie'
+                sThumb = 'series.png'
+            elif 'DOCUMENTAIRE' in sTitle.upper() or 'DOCS' in sTitle.upper():
+                sCat = 'film'
+                sThumb = 'doc.png'
+            elif 'SPECTACLE' in sTitle.upper():
+                sCat = 'film'
+                sThumb = 'star.png'
+            elif 'CONCERT' in sTitle.upper():
+                sCat = 'film'
+                sThumb = 'music.png'
+            elif 'SPORT' in sTitle.upper():
+                sCat = 'film'
+                sThumb = 'sport.png'
+            elif 'ANIMES' in sTitle.upper() or 'ANIMÉS' in sTitle.upper():
+                sCat = 'anime'
+                sThumb = 'animes.png'
+            else:
+                sCat = None
+                sThumb = 'genres.png'
         
-#        sUrl = sFoldername
+
         sUrl = API_URL_FILE + '&fld_id=%d' % fldId
         if sCat:
             sUrl += '&cat=%s' % sCat
@@ -456,13 +478,12 @@ def showMovies(oGui, content):
             # enlever l'extension
             sTitle = sTitle[:-4]
     
-        # enlever les séries
-        # sa, ep = searchEpisode(sTitle)
-        # if sa or ep:
-        #     return
-    
+        # on passe en utf-8
         if not isMatrix():
-            sTitle = sTitle.encode('utf-8')
+            try:
+                sTitle = sTitle.encode('utf-8')
+            except:
+                pass
             
         # recherche des métadonnées
         sMovieTitle = sTitle 
@@ -515,11 +536,34 @@ def showSeries(oGui, content, searchFolder, numPage):
     offset = (numPage-1) * NB_FILES
 
     # Sous-dossiers virtuels identifiés par les deux-points
-    subFolders = set()
     oOutputParameterHandler = cOutputParameterHandler()
 
+    # sous-dossiers en premier
+    if numPage == 1:
+#        subFolders = set()
+        for folder in folders:
+            sTitle = folder['name']
+            fldId = folder['fld_id']
+            if 'REP_' in sTitle[0:4] or '00_' in sTitle[0:3]:
+                if not isMatrix():
+                    sTitle = sTitle.encode('utf-8')
+                sTitle = oUtil.unescape(sTitle)
+                if ':' in sTitle:
+                    sTitle = sTitle.split(':')[-1]
+                sUrl = API_URL_FILE + '&fld_id=%d' % fldId
+                sUrl += '&cat=serie'
+                sThumb = 'genres.png'
+
+                if sTitle.startswith('REP_'):
+                    sTitle=sTitle.replace('REP_', '')
+                elif sTitle.startswith('00_'):
+                    sTitle=sTitle.replace('00_', '')
+
+                oOutputParameterHandler.addParameter('siteUrl', sUrl)
+                oOutputParameterHandler.addParameter('sMovieTitle', sTitle)
+                oGui.addDir(SITE_IDENTIFIER, 'showMedias', sTitle, sThumb, oOutputParameterHandler)
+
     for folder in folders:
-        
         fldId = folder['fld_id']
         sTitle = folder['name']
         if not isMatrix():
@@ -530,39 +574,13 @@ def showSeries(oGui, content, searchFolder, numPage):
         if searchFolder and searchFolder.upper() not in sTitle.upper():
             continue
 
-        if 'REP_' in sTitle:
-            addFolders(oGui, content, sTitle.split(':')[0])
+        if 'REP_' in sTitle[0:4] or '00_' in sTitle[0:3]:
             continue
         
         numSeries += 1
         if numSeries <= offset:
             continue
 
-        # dossier
-        isSubFolder = False
-        if sTitle.startswith('REP_') or sTitle.startswith('00_'):
-            isSubFolder = True
-
-        if isSubFolder and ':' in sTitle:
-            subName, subFolder = sTitle.split(':')
-            if folder['path'].endswith(subName):
-                sTitle = subFolder.strip()
-            else:
-                if searchFolder:
-                    if subName == searchFolder:
-                        sTitle = subFolder
-                else:
-                    if subName in subFolders:
-                        continue
-                    subFolders.add(subName)
-                    sTitle = subName
-# TODO                    sFoldername = sFoldername.replace(subFolder, '')
-
-        if sTitle.startswith('REP_'):
-            sTitle=sTitle.replace('REP_', '')
-        if sTitle.startswith('00_'):
-            sTitle=sTitle.replace('00_', '')
-
         pos = len(sTitle)
         sRes, pos = getReso(sTitle, pos)
         sYear, pos = getYear(sTitle, pos)
@@ -579,39 +597,33 @@ def showSeries(oGui, content, searchFolder, numPage):
         oOutputParameterHandler.addParameter('sRes', sRes)
         oOutputParameterHandler.addParameter('sTmdbId', sTmdbId)
         
-        if isSubFolder:   # dossier
-            oGui.addDir(SITE_IDENTIFIER, 'showMedias', sTitle, 'genres.png', oOutputParameterHandler)
-        else:           # série
-            saison = None
-            if 'SAISON' in sTitle.upper() or 'SEASON' in sTitle.upper():
-                saison = re.search('(\d+)', sTitle)
-                if saison:
-                    saison = int(saison.group(1))
-            if not saison:
-                saison = re.search('S(\d+)', sTitle)
-                if saison:
-                    saison = int(saison.group(1))
+        saison = None
+        if 'SAISON' in sTitle.upper() or 'SEASON' in sTitle.upper():
+            saison = re.search('(\d+)', sTitle)
             if saison:
-                sMovieTitle = sTitle
-                pos = len(sMovieTitle)
-                sYear, pos = getYear(sMovieTitle, pos)
-                sTmdbId, pos = getIdTMDB(sMovieTitle, pos)
-                sMovieTitle = sMovieTitle[:pos]
-                
-                sUrl += '&sSeason=%d' % saison
-                oOutputParameterHandler.addParameter('siteUrl', sUrl)
-                oOutputParameterHandler.addParameter('sMovieTitle', sMovieTitle)
-                oOutputParameterHandler.addParameter('sYear', sYear)
-                oOutputParameterHandler.addParameter('sTmdbId', sTmdbId)
-
-                oGui.addSeason(SITE_IDENTIFIER, 'showMedias', sMovieTitle + ' ' + sTitle, '', '', '', oOutputParameterHandler)
-            # elif sTitle.upper() == 'ANIMES' or sTitle.upper() == 'ANIMÉS' or 'MANGA' in sTitle.upper() or 'JAPAN' in sTitle.upper():
-            #     oGui.addAnime(SITE_IDENTIFIER, 'showMedias', sTitle, '', '', '', oOutputParameterHandler)
-            else:
-                sMovieTitle = sTitle
-                if sRes:
-                    sMovieTitle += '[' + sRes + ']'
-                oGui.addTV(SITE_IDENTIFIER, 'showMedias', sMovieTitle, '', '', '', oOutputParameterHandler)
+                saison = int(saison.group(1))
+        if not saison:
+            saison = re.search('S(\d+)', sTitle)
+            if saison:
+                saison = int(saison.group(1))
+        if saison:
+            sMovieTitle = sTitle
+            pos = len(sMovieTitle)
+            sYear, pos = getYear(sMovieTitle, pos)
+            sTmdbId, pos = getIdTMDB(sMovieTitle, pos)
+            sMovieTitle = sMovieTitle[:pos]
+            
+            sUrl += '&sSeason=%d' % saison
+            oOutputParameterHandler.addParameter('siteUrl', sUrl)
+            oOutputParameterHandler.addParameter('sMovieTitle', sMovieTitle)
+            oOutputParameterHandler.addParameter('sYear', sYear)
+            oOutputParameterHandler.addParameter('sTmdbId', sTmdbId)
+            oGui.addSeason(SITE_IDENTIFIER, 'showMedias', sMovieTitle + ' ' + sTitle, '', '', '', oOutputParameterHandler)
+        else:
+            sMovieTitle = sTitle
+            if sRes:
+                sMovieTitle += '[' + sRes + ']'
+            oGui.addTV(SITE_IDENTIFIER, 'showMedias', sMovieTitle, '', '', '', oOutputParameterHandler)
 
         nbSeries += 1
         if nbSeries == NB_FILES:
@@ -641,7 +653,7 @@ def showEpisodes(oGui, sMovieTitle, content, sSiteUrl, sSeason):
         # plusieurs saisons, on les découpe
         if len(saisons) > 0:
             oOutputParameterHandler = cOutputParameterHandler()
-            for saison in saisons:
+            for saison in sorted(saisons):
                 sUrl = sSiteUrl + '&sSeason=%d' % saison
                 sTitle = 'Saison %d ' % saison + sMovieTitle
                 oOutputParameterHandler.addParameter('siteUrl', sUrl)
@@ -708,14 +720,13 @@ def showEpisodes(oGui, sMovieTitle, content, sSiteUrl, sSeason):
 # Recherche saisons et episodes
 def searchEpisode(sTitle):
     sa = ep =''
-    m = re.search('(^S| S|\.S|_S|\[S|saison|\s+|\.)(\s?|\.)(\d+)( *- *| *_ *|\s?|\.)(E|Ep|x|\wpisode|Épisode)(\s?|\.)(\d+)', sTitle, re.UNICODE | re.IGNORECASE)
+    m = re.search('(^S|\WS|_*S|saison|season) *(\d+)(\W*E|_*E|\W*Ep|_*Ep|x|\W*\wpisode|\W*Épisode| *Etape) *(\d+)', sTitle, re.UNICODE | re.IGNORECASE)
     if m:
-        sa = m.group(3)
-        if int(sa) <100:
-            ep = m.group(7)
-        else:
-            sa = ''
-    else:  # Juste l'épisode
+        sa = m.group(2)
+        ep = m.group(4)
+        if int(sa) == 1 and int(ep) > 264:    # echape les codecs X264 et x265
+            sa = ep =''
+    if not ep:  # Juste l'épisode
         m = re.search('(^|\s|\.)(E|Ep|\wpisode)(\s?|\.)(\d+)', sTitle, re.UNICODE | re.IGNORECASE)
         if m:
             ep = m.group(4)
diff --git a/repo/plugin.video.vstream/plugin.video.vstream-2.7.3.zip b/repo/plugin.video.vstream/plugin.video.vstream-2.7.3.zip
new file mode 100644
index 0000000000..40f043d056
Binary files /dev/null and b/repo/plugin.video.vstream/plugin.video.vstream-2.7.3.zip differ