diff --git a/zen/xbian_vstream.sh b/zen/xbian_vstream.sh
index 130be3b..16801cc 100755
--- a/zen/xbian_vstream.sh
+++ b/zen/xbian_vstream.sh
@@ -1,95 +1,88 @@
 #!/bin/bash
 ########################################################################
 # Author: Fred (support@qo-op.com)
-# Version: 2020.12.05
+# Version: 2020.12.15
 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
 ########################################################################
 # 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
+#done
 ########################################################################
-[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && echo "ERROR no _xbian.zuid" && exit 1
-
+## ACTUAL inotifywait ~/astroport/ FILESYSTEM STRUCTURE
 mkdir -p ~/astroport/films
 mkdir -p ~/astroport/animes
-
-## TODO: REMOVE SOURCE FILE and ONLY KEEP IPFS links
-#inotifywait -e close_write -m ~/astroport/films | while read dir flags file; do
-#  ...do something with the file...
-#done
+########################################################################
+path="$1"
+file="$2"
+[[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameters missing. xbian_vstream.sh file=$file? path=$path?"
+extension="${file##*.}"
+filena="${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 "$path" | cut -d '/' -f 5 | head -c 1 | awk '{ print toupper($0) }' ) # ex: F
+
 # 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 "CREATE ~/.zen/ipfs/xbian/F$XZUID FROM ~/astroport/films"
+echo "ADD $path/$file to ~/.zen/ipfs/xbian/${PREFIX}${XZUID}"
 echo "-----------------------------------------------------------------"
 
-## Films
-echo "ADDING ~/astroport/films/ to IPFS"
+echo "ADDING ~/astroport/$TYPE/$file to IPFS"
 echo "-----------------------------------------------------------------"
-AFSHARE=$(ipfs add -rq ~/astroport/films/ | tail -n 1)
-[[ $AFSHARE == "" ]] && echo "ipfs add ERROR" && exit 1
+NEWSHARE=$(ipfs add -wq "$path$file" | tail -n 1)
+[[ $NEWSHARE == "" ]] && echo "ipfs add ERROR" && exit 1
+echo "CHECK : ipfs ls /ipfs/$NEWSHARE/$file"
 
-echo "WRITE ~/.zen/ipfs/xbian/F$XZUID Films index"
+echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} "
 echo "-----------------------------------------------------------------"
 mkdir -p ~/.zen/ipfs/xbian
-echo "CAT;TITLE;URLS" > ~/.zen/ipfs/xbian/F${XZUID}
-for file in ~/astroport/films/*
-do 
-	filename=$(basename -- "$file")
-	extension="${filename##*.}"
-	filena="${filename%.*}"
-	echo "films;$filena;http://localhost:10021/ipfs/$AFSHARE/$filename" >> ~/.zen/ipfs/xbian/F${XZUID}
-	## TODO check extension, check URL & remove source file
-done
-ipfs cat /ipns/$NODEIPNS/xbian/F${XZUID}
 
-### Animes
-echo "ADDING ~/astroport/animes/ to IPFS"
-echo "-----------------------------------------------------------------"
-AASHARE=$(ipfs add -rq ~/astroport/animes/ | tail -n 1)
-[[ $AASHARE == "" ]] && echo "ipfs add ERROR" && exit 1
+## CHECK IF $NEWSHARE is NEW, or an already existing file upgrade?
+isFILEinINDEX=$(grep "$file" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
+isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
+
+# Init ${PREFIX}${XZUID} header
+[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TITLE;URLS" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+
+# If new file? add it to INDEX
+if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
+	echo "$TYPE;$filena;http://localhost:10021/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+else
+	[[ $isFILEinINDEX ]] && echo "$file already in index" ## TODO Update LINK ?
+	[[ $isLINKinINDEX ]] && echo "$NEWSHARE already in index" ## should not happen
+fi
 
-echo "WRITE ~/.zen/ipfs/xbian/A$XZUID Animes index"
-echo "-----------------------------------------------------------------"
-mkdir -p ~/.zen/ipfs/xbian
-echo "CAT;TITLE;URLS" > ~/.zen/ipfs/xbian/A${XZUID}
-for file in ~/astroport/animes/*
-do 
-	filename=$(basename -- "$file")
-	extension="${filename##*.}"
-	filena="${filename%.*}"
-	echo "animes;$filena;http://localhost:10021/ipfs/$AASHARE/$filename" >> ~/.zen/ipfs/xbian/A${XZUID}
-	## TODO check extension, check URL & remove source file
-done
-ipfs cat /ipns/$NODEIPNS/xbian/A${XZUID}
 
 ########################################################################
-echo "PUBLISH ~/.zen/ipfs to IPNS self"
+echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
 echo "-----------------------------------------------------------------"
 MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
 NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
 
-echo "SYNCing SWARM..."
+echo "NOW SYNCing my SWARM..."
 echo "-----------------------------------------------------------------"
 ~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh
 
-echo "PREPARE my local FASTRXBIAN (films) AASTRXBIAN (animes) global swarm list from ipfs_swarm"
+echo "CREATE my local ${PREFIX}ASTRXBIAN ($TYPE) from ALL ipfs_swarm"
 echo "-----------------------------------------------------------------"
 mkdir -p /tmp/xbian/
-echo 'CAT;TITLE;URL' > /tmp/xbian/FASTRXBIAN
-cat ~/.zen/ipfs_swarm/xbian/F* | grep -v -E 'CAT;TITLE;URL' >> /tmp/xbian/FASTRXBIAN
-cat /tmp/xbian/FASTRXBIAN | uniq > /tmp/xbian/FASTRXBIAN.uniq
-mv /tmp/xbian/FASTRXBIAN.uniq /tmp/xbian/FASTRXBIAN
+echo 'CAT;TITLE;URL' > /tmp/xbian/${PREFIX}ASTRXBIAN
+cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TITLE;URL' >> /tmp/xbian/${PREFIX}ASTRXBIAN
+cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq
+mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN
 
-echo 'CAT;TITLE;URL' > /tmp/xbian/AASTRXBIAN
-cat ~/.zen/ipfs_swarm/xbian/A* | grep -v -E 'CAT;TITLE;URL' >> /tmp/xbian/AASTRXBIAN
-cat /tmp/xbian/AASTRXBIAN | uniq > /tmp/xbian/AASTRXBIAN.uniq
-mv /tmp/xbian/AASTRXBIAN.uniq /tmp/xbian/AASTRXBIAN
+echo "NEW $TYPE INDEX UPDATED : http://localhost:10021/${PREFIX}ASTRXBIAN"
 
-echo "PUBLISH IPNS with 'xbian' key"
-echo "-----------------------------------------------------------------"
-ISTREAM=$(ipfs add -qrw /tmp/xbian/ | tail -n 1)
-ipfs name publish -k xbian $ISTREAM
+## INUTILE
+#echo "PUBLISH IPNS with 'xbian' key"
+#echo "-----------------------------------------------------------------"
+#ISTREAM=$(ipfs add -qrw /tmp/xbian/ | tail -n 1)
+#ipfs name publish -k xbian $ISTREAM