diff --git a/zen/xbian_vstream.sh b/zen/xbian_vstream.sh
index 6fb548b31..c0257cbd8 100755
--- a/zen/xbian_vstream.sh
+++ b/zen/xbian_vstream.sh
@@ -6,11 +6,16 @@
 ########################################################################
 # Transfert ~/astroport/files to IPFS
 # Create Astroport(pastebin) index for Xbian/Vstream
-# ipfs publish with xbian key
 ######## #### ### ## #
 #inotifywait -e close_write -m ~/astroport/films | while read dir flags file; do
-#   ~/.zen/astrXbian/zen/xbian_vstream.sh $file $path
+#   ~/.zen/astrXbian/zen/xbian_vstream.sh $path $file
 #done
+# ipfs add new file 
+# create ASTRXBIAN indexes in ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+# unify swarm indexes in /var/www/astrxbian/${PREFIX}ASTRXBIAN
+# Vstream/Astroport reads ${PREFIX}ASTRXBIAN through http://localhost:10021/
+# Using Vstream/Pastebin file format
+# https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films
 ########################################################################
 ## ACTUAL inotifywait ~/astroport/ FILESYSTEM STRUCTURE
 mkdir -p ~/astroport/films
@@ -20,20 +25,26 @@ path="$1"
 file="$2"
 [[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameters missing. xbian_vstream.sh file=$file? path=$path?"
 extension="${file##*.}"
-filena="${file%.*}"
+TITLE="${file%.*}"
 
 # GET XZUID
 [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && echo "ERROR no _xbian.zuid" && exit 1
 XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)
 
-### EXTRACT first letter index file prefix (ex: path=/home/xbian/astroport/films/)
-TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: films
-PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F
+### EXTRACT first letter index file prefix
+# path=/home/xbian/astroport/films/($YEAR)/($RES) TODO !! :: )
+# path=/home/xbian/astroport/series/($YEAR)/$SAISON/$RES) optional
+# Separte in multiple inotifywait?
 
+TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: films / series / ...
+PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F
+YEAR=$(echo "$path" | cut -d '/' -f 6 )
+RES=$(echo "$path" | cut -d '/' -f 7 )
+
+# file is placed in ROOT ~/astroport
 [[ $PREFIX == "" ]] && echo "WARNING. File is in ~/astroport/$file" && PREFIX="_"; TYPE="files"
 
-# CREATE Vstream/Pastebin file format
-# https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films
+
 echo "ADDING ${path}${file} IPFS INDEX to ~/.zen/ipfs/xbian/${PREFIX}${XZUID}"
 echo "-----------------------------------------------------------------"
 
@@ -46,15 +57,16 @@ echo "-----------------------------------------------------------------"
 mkdir -p ~/.zen/ipfs/xbian
 
 # Init ${PREFIX}${XZUID} header
-[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TITLE;URLS" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+#[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TITLE;URLS" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
 
-## CHECK IF $NEWSHARE is NEW, or an already existing file upgrade?
+## CHECK IF $NEWSHARE is NEW, or an already existing file to upgrade?
 isFILEinINDEX=$(grep "$file" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
 isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
 
 # Is it a new file? Add it to INDEX
 if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
-	echo "$TYPE;$filena;http://localhost:10021/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+	echo "$TYPE;$TMDB;$YEAR;$TITLE;$SAISON;$GENRES;${XZUID};$RES;http://localhost:10021/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
 else
 	if [[ $isFILEinINDEX ]]; then
 		echo "$file already in index" ## File was updated => Change OLDLINK
@@ -71,23 +83,17 @@ echo "-----------------------------------------------------------------"
 MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
 NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
 
-echo "NOW SYNCing my SWARM..."
+echo "NOW SYNCing ALL SWARM..."
 echo "-----------------------------------------------------------------"
 ~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh
 
-echo "CREATE my local ${PREFIX}ASTRXBIAN ($TYPE) from ALL ipfs_swarm"
+echo "CREATE my local ${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm foudn indexes"
 echo "-----------------------------------------------------------------"
 mkdir -p /tmp/xbian/
-echo 'CAT;TITLE;URL' > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER
-cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TITLE;URL' >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET SWARM INDEXES
+echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER
+cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET SWARM INDEXES
 cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE INDEX
 mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN
 
 echo "NEW $TYPE ($file) ADDED."
 echo "INDEX UPDATED : http://localhost:10021/${PREFIX}ASTRXBIAN"
-
-## INUTILE
-#echo "PUBLISH IPNS with 'xbian' key"
-#echo "-----------------------------------------------------------------"
-#ISTREAM=$(ipfs add -qrw /tmp/xbian/ | tail -n 1)
-#ipfs name publish -k xbian $ISTREAM