diff --git a/ajouter_video.sh b/ajouter_video.sh
index b1c7b78..1e280ec 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -63,7 +63,7 @@ else
 fi
 
 ## GET XZUID
-[[ "$XZUID" == "" ]] && XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)
+[[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(hostname)
 
 zenity --warning --width 300 --text "Ajoutez une vidéo à ASTROPORT/KODI"
 
@@ -96,15 +96,16 @@ PREFIX=$(echo "${CAT}" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, S, A
 TITLE=$(zenity --entry --width 300 --title "Titre" --text "Indiquez le titre de la vidéo" --entry-text="${FILE_TITLE}")
 [[ $TITLE == "" ]] && exit 1
 # VIDEO YEAR
-YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la vidéo. Exemple: 1972" --entry-text="")
+YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la vidéo. Exemple: 1985" --entry-text="")
 
 # VIDEO RESOLUTION
 FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${FILE}" | cut -d "x" -f 2)p
-RES=$(zenity --entry --width 300 --title="Résolution" --text="Indiquez la résolution de la vidéo" --entry-text="${FILE_RES}" SD HD 4K 360p 480p 720p 1080p)
+RES=$FILE_RES
+#RES=$(zenity --entry --width 300 --title="Résolution" --text="Résolution de la vidéo" --entry-text="${FILE_RES}" SD HD 4K 360p 480p 720p 1080p)
 
 # VIDEO SEASON or SAGA
 [[ "${CAT}" == "serie" || "${CAT}" == "anime" ]] && SAISON=$(zenity --entry --width 300 --title "${CHOICE} Saison" --text "Indiquez SAISON et EPISODE. Exemple: S02E05" --entry-text="")
-[[ "${CAT}" == "film" ]] && SAISON=$(zenity --entry --width 300 --title "${CHOICE} Saga" --text "Indiquez la SAGA (optionnel). Exemple: James Bond" --entry-text="")
+[[ "${CAT}" == "film" ]] && SAISON=$(zenity --entry --width 300 --title "${CHOICE} Saga" --text "Indiquez une SAGA (optionnel). Exemple: James Bond" --entry-text="")
 
 # VIDEO GENRES
 FILM_GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut}\
@@ -156,50 +157,66 @@ GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]"
 [[ $GENRES == "" ]] && exit 1
 
 # VIDEO GROUP
-GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="${XZUID}")
+# GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="${XZUID}")
 
-# VERIFICATION
+# DEBUG VERIFICATION
 zenity --question --width ${large} --title "Vérifiez les informations: CAT; TMDB; YEAR; TITLE; SAISON; GENRES; GROUPES; RES"\
  --text "${CAT}; ${TMDB}; ${YEAR}; ${TITLE}; ${SAISON}; ${GENRES}; ${GROUPES}; ${RES}"
-[ $? == 1 ] && exit 1
+[ $? == 1 ] && echo "ANNULATION." && exit 1
 
 ########################################################################
 # ADD $FILE to IPFS / ASTROPORT / KODI
 ########################################################################
-if [ $? = 0 ]
-then
-	echo "OK! Ajout de ${TITLE} dans ASTROPORT/KODI"
-	NEWSHARE=$(ipfs add -wq "${FILE}" | tail -n 1)
-	echo "ipfs ls /ipfs/$NEWSHARE"
+IPFSREPFILEID=$(ipfs add -wq "${FILE_PATH}${FILE_NAME}" | tail -n 1)
+[[ $IPFSREPFILEID == "" ]] && echo "ipfs add ERROR" && exit 1
+echo "-----------------------------------------------------------------"
+echo "CHECK IPFS $FILE_NAME : ipfs ls /ipfs/$IPFSREPFILEID"
+echo "-----------------------------------------------------------------"
+echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN "
+mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
 
-	mkdir -p ~/.zen/ipfs/xbian
-	## FIRST FILE ADDED: Create ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
-	[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri)
 
-	# CHECK DUPLICATE
-	isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs_swarm/xbian/${PREFIX}*)
-	isLINKinMYINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
-	# ADD FILE TO INDEX
-	if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
-		URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri)
-		echo "${CAT};${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/${NEWSHARE}/${URLENCODE_FILE_NAME}" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
-	else
-		echo "$NEWSHARE already in ASTROPORT. DO NOTHING"
-	fi
+# Init ${PREFIX}ASTRXBIAN header
+mv ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN # MOVE OLD FS
+[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 
-	echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ~/.zen/ipfs*/xbian/${PREFIX}*"
-	echo "-----------------------------------------------------------------"
-	cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+## CHECK IF $IPFSREPFILEID is NEW, or an already existing in SWARMs?
+isFILEinINDEX=$(grep "$URLENCODE_FILE_NAME" ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/*ASTRXBIAN)
+isLINKinINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/*ASTRXBIAN)
 
-	echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
-	echo "-----------------------------------------------------------------"
-	echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/_timestamp
-	MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
-	echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain ## THIS SIMPLE LINE IS BLOCKCHAIN POWERING ANY DATA PUBLISHED TO IPFS !!!
-	NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
+isFILEinMYINDEX=$(grep "$URLENCODE_FILE_NAME" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN)
+isLINKinMYINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN)
 
-	echo "$CAT ${FILE_NAME} ADDED"
-	echo "CHECK INDEX : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"	
+# Is it a new file? Add it to INDEX
+if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
+	mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/$G1PUB/
+	# SIMILAR with "ipfs ls /ipns/${IPFSNODEID}/.${IPFSNODEID}/PIN/ (...)"
+	echo "${CAT};$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 else
-	echo "NON ! ANNULATION."
+	if [[ $isFILEinMYINDEX ]]; then
+		echo "$FILE_NAME already in index" ## File was updated => Change OLDLINK
+		OLDLINK=$(echo $isFILEinMYINDEX | cut -d ";" -f 9  | cut -d "/" -f 3 | tail -n 1) # GRAB old ipfs id
+		sed -i "s/$OLDLINK/$IPFSREPFILEID/g" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
+	fi
+	[[ $isLINKinINDEX ]] && echo "$IPFSREPFILEID already in index. DO NOTHING"
 fi
+
+echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ~/.zen/ipfs*/xbian/${PREFIX}*"
+echo "-----------------------------------------------------------------"
+cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+
+########################################################################
+echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
+echo "-----------------------------------------------------------------"
+echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/.timestamp
+MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
+echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/.chain ## THIS SIMPLE LINE IS BLOCKCHAIN POWERING ANY DATA PUBLISHED TO IPFS !!!
+NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
+
+echo "NEW $TYPE ($FILE_NAME) ADDED."
+echo "INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"
+
+# OLD FILE STRUCTURE CLEANING
+rm -f ~/.zen/ipfs/.${IPFSNODEID}/_timestamp
+rm -f ~/.zen/ipfs/.${IPFSNODEID}/_chain
diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh
index 001bd94..98e46cc 100755
--- a/zen/gchange_INIT.sh
+++ b/zen/gchange_INIT.sh
@@ -48,7 +48,7 @@ rm -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title
 title=$(curl -s ${GCHANGE}/user/profile/${G1PUB} | jq -r '._source.title')
 [[ $title ]] && echo "$title"  > ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title
 
-# CREATE _g1.astroport_title
+# CREATE _g1.astroport_title with city
 rm -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.astroport_title
 title="Station $USER@$(hostname)"
 city=$(curl -s ${GCHANGE}/user/profile/${G1PUB} | jq -r '._source.city')
diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index 465e783..8545193 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -91,24 +91,24 @@ ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$IPFSNODEID
 # REFRESH xbian Film Serie Anime ASTRXBIAN index
 ########################################################################
 PREFIX="F"
-cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 
 PREFIX="S"
-cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 
 PREFIX="A"
-cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 
 ########################################################################
 
 ########################################################################
 echo "PUBLISHING ~/.zen/ipfs SELF /ipns/$IPFSNODEID"
 MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
-OLDCHAIN=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_chain)
+OLDCHAIN=$(cat ~/.zen/ipfs/.${IPFSNODEID}/.chain)
 if [[ "$OLDCHAIN" != "$MIPFS" ]] # MODIFY CHAIN only if something was changed
 then
-	echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/_timestamp
-	echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain
+	echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/.timestamp
+	echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/.chain
 fi
 NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
 
diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh
index 8607cb8..36e3dce 100755
--- a/zen/mint_youtube.sh
+++ b/zen/mint_youtube.sh
@@ -4,93 +4,92 @@
 # Version: 2020.12.15
 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
 ########################################################################
-# Transfert ~/astroport/youtube and mp3 files to IPFS
-# Create index in ~/.zen/ipfs/xbian/Y$XZUID
+# COPY ~/astroport/* files to IPFS
+# Publish INDEX ~/.zen/ipfs/.*/${PREFIX}ASTRXBIAN
 ######## #### ### ## #
 
-# 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://127.0.0.1:8181/.$IPFNODEID/
-# Using Vstream/Pastebin file format
+# ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
+# Astropot/Kodi/Vstream source reads ${PREFIX}ASTRXBIAN from http://127.0.0.1:8181/.$IPFNODEID/
+# Index File Format (could be enhanced) is using Kodi TMDB enhancement
 # 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
+## RUN BY inotifywait process ~/astroport/ NEW FILE DETECT
 mkdir -p ~/astroport/youtube
 mkdir -p ~/astroport/mp3
 ########################################################################
 path="$1"
 file="$2"
-echo "~/.zen/astrXbian/zen/mint_youtube.sh \"$path\" \"$file\""
-[[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameters missing. xbian_vstream.sh file=$file? path=$path?"
+fileipfs="$3"
+echo "~/.zen/astrXbian/zen/mint_youtube.sh \"$path\" \"$file\" \"$fileipfs\""
+[[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameter missing.file=$file path=$path"
+
 extension="${file##*.}"
 TITLE="${file%.*}"
-[[ ! -f "${path}${file}" ]] && file="${TITLE%.*}" && extension="${TITLE##*.}"
+# .part file false flag correcting
+[[ ! -f "${path}${file}" ]] && file="${TITLE%.*}" && extension="${TITLE##*.}" && [[ ! -f "${path}${file}" ]] && exit 1
 
 # GET XZUID
-[[ -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid) || XZUID=$(hostname)
+[[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(hostname)
+rm-f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid # CLEANING OLD FILE STRUCTURE (TO BE REMOVED AFTER SWARM CODE UPGRADE)
+rm -f ~/.zen/ipfs/xbian/_${XZUID}
 
 TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/astroport/... films, youtube, mp3
 PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, Y, M
 TMDB=$(echo "$path" | cut -d '/' -f 6 )
 RES=$(echo "$path" | cut -d '/' -f 7 )
 
-# file is placed in ROOT ~/astroport
-[[ $PREFIX == "" ]] && echo "WARNING. $TYPE root files untreated" && exit 1
+# File is placed in ROOT ~/astroport ?
+[[ $PREFIX == "" ]] && echo "WARNING. $TYPE is root file UNTREATED" && exit 1
 
-
-echo "ADDING ${path}${file} IPFS INDEX to ~/.zen/ipfs/xbian/${PREFIX}${XZUID}"
+echo "ADDING ${path}${file} to IPFS and ${PREFIX}ASTRXBIAN INDEX"
+echo "~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN"
 echo "-----------------------------------------------------------------"
 
-NEWSHARE=$(ipfs add -wq "${path}${file}" | tail -n 1)
-[[ $NEWSHARE == "" ]] && echo "ipfs add ERROR" && exit 1
+IPFSREPFILEID=$(ipfs add -wq "${path}${file}" | tail -n 1)
+[[ $IPFSREPFILEID == "" ]] && echo "ipfs add ERROR" && exit 1
 echo "-----------------------------------------------------------------"
-echo "CHECK IPFS $file : ipfs ls /ipfs/$NEWSHARE"
+echo "CHECK IPFS $file : ipfs ls /ipfs/$IPFSREPFILEID"
 echo "-----------------------------------------------------------------"
-echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} "
-mkdir -p ~/.zen/ipfs/xbian
+echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN "
+mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
 
-# 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;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+URLENCODE_FILE_NAME=$(echo ${file} | jq -Rr @uri)
 
-## CHECK IF $NEWSHARE is NEW, or an already existing in SWARMs?
-isFILEinINDEX=$(grep "$file" ~/.zen/ipfs_swarm/xbian/${PREFIX}*)
-isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs_swarm/xbian/${PREFIX}*)
+# Init ${PREFIX}ASTRXBIAN header
+mv ~/.zen/ipfs/xbian/$PREFIX$XZUID ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN # MOVE OLD FS
+[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 
+## CHECK IF $IPFSREPFILEID is NEW, or an already existing in SWARMs?
+isFILEinINDEX=$(grep "$URLENCODE_FILE_NAME" ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/*ASTRXBIAN)
+isLINKinINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/*ASTRXBIAN)
 
-isFILEinMYINDEX=$(grep "$file" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
-isLINKinMYINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
+isFILEinMYINDEX=$(grep "$URLENCODE_FILE_NAME" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN)
+isLINKinMYINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN)
 
 # Is it a new file? Add it to INDEX
 if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
-	URLENCODE_FILE_NAME=$(echo ${file} | jq -Rr @uri)
-	echo "ipfs get -o ~/astroport/$TYPE/ \"/ipfs/$NEWSHARE/$file\"" >> ~/.zen/ipfs/xbian/_${XZUID} # "_ASTRXBIAN" is listing ipfs get commands
-	echo "film;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$NEWSHARE/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+	mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/$G1PUB/
+	# SIMILAR with "ipfs ls /ipns/${IPFSNODEID}/.${IPFSNODEID}/PIN/ (...)"
+	echo "film;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 else
 	if [[ $isFILEinMYINDEX ]]; then
 		echo "$file already in index" ## File was updated => Change OLDLINK
-		OLDLINK=$(echo $isFILEinMYINDEX | cut -d "/" -f 3 | tail -n 1) # GRAB old ipfs id
-		sed -i "s/$OLDLINK/$NEWSHARE/g" ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
-		sed -i "s/$OLDLINK/$NEWSHARE/g" ~/.zen/ipfs/xbian/_${XZUID}
+		OLDLINK=$(echo $isFILEinMYINDEX | cut -d ";" -f 9  | cut -d "/" -f 3 | tail -n 1) # GRAB old ipfs id
+		sed -i "s/$OLDLINK/$IPFSREPFILEID/g" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 	fi
-	[[ $isLINKinINDEX ]] && echo "$NEWSHARE already in index. DO NOTHING"
+	[[ $isLINKinINDEX ]] && echo "$IPFSREPFILEID already in index. DO NOTHING"
 fi
 
-## REMOVE DUPLICATE FROM ipfs get commands
-cat ~/.zen/ipfs/xbian/_${XZUID} | sort | uniq > /tmp/xbian/_${XZUID}
-mv /tmp/xbian/_${XZUID} ~/.zen/ipfs/xbian/_${XZUID}
-
 echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ~/.zen/ipfs*/xbian/${PREFIX}*"
 echo "-----------------------------------------------------------------"
-cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 
 ########################################################################
 echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
 echo "-----------------------------------------------------------------"
-echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/_timestamp
+echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/.timestamp
 MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
-echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain ## THIS SIMPLE LINE IS BLOCKCHAIN POWERING ANY DATA PUBLISHED TO IPFS !!!
+echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/.chain ## THIS SIMPLE LINE IS BLOCKCHAIN POWERING ANY DATA PUBLISHED TO IPFS !!!
 NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
 
 echo "NEW $TYPE ($file) ADDED."