diff --git a/ISOconfig.sh b/ISOconfig.sh
index bfdef5f..dce2527 100755
--- a/ISOconfig.sh
+++ b/ISOconfig.sh
@@ -229,6 +229,27 @@ echo "IPFS_SYNC_DIR=$IPFS_sync_directory" > ~/.zen/ipfs.sync
 
 # RESIZING / partition
 # sudo btrfs filesystem resize max /
+# DHT PUBSUB mode
+ipfs config Pubsub.Router gossipsub
+# MAXSTORAGE = 1/2 available
+availableDiskSize=$(df -P ~/ | awk 'NR>1{sum+=$4}END{print sum}')
+diskSize="$((availableDiskSize / 2))"
+ipfs config Datastore.StorageMax $diskSize
+## Activate Rapid "ipfs p2p"
+ipfs config --json Experimental.Libp2pStreamMounting true
+ipfs config --json Experimental.P2pHttpProxy true
+
+######### MAKE DEFAULT BOOTSTRAP TO oasis.astroport.com 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS ###########
+ipfs bootstrap rm --all
+ipfs bootstrap add /dnsaddr/oasis.astroport.com/tcp/4001/ipfs/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN
+ipfs bootstrap add /ip4/51.15.166.54/tcp/4001/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN
+ipfs bootstrap add /ip4/51.15.166.54/udp/4001/quic/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN
+ipfs bootstrap add /ip6/fe80::208:a2ff:fe0c:20d8/tcp/4001/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN
+###########################################
+# TODO: ADD some other bootstrap NODES
+###########################################
+# AVOID CONFLICT WITH KODI REMOTE
+ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/8181"
 
 ########################################################################
 echo 'REBOOT NOW...'
diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh
index 23196cb..294f3cd 100755
--- a/zen/mint_youtube.sh
+++ b/zen/mint_youtube.sh
@@ -21,15 +21,14 @@ 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?"
 extension="${file##*.}"
 TITLE="${file%.*}"
 
-# Partial file download
-[[ $extension == "part" ]] && echo "PARTIAL DOWNLOAD please check $file" && exit 1
 
 # GET XZUID
-[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid) || XZUID=$(hostname)
+[[ -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID="$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)" || XZUID="$(hostname)"
 # TODO use ~/.zen/ipfs/.$IPFSNODEID/
 
 TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: youtube, mp3
@@ -44,23 +43,24 @@ echo "-----------------------------------------------------------------"
 
 NEWSHARE=$(ipfs add -wq "${path}${file}" | tail -n 1)
 [[ $NEWSHARE == "" ]] && echo "ipfs add ERROR" && exit 1
-echo "CHECK IPFS $file : ipfs ls /ipfs/$NEWSHARE"
-
-echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} "
 echo "-----------------------------------------------------------------"
+echo "CHECK IPFS $file : ipfs ls /ipfs/$NEWSHARE"
+echo "-----------------------------------------------------------------"
+echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} "
 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;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://localhost:10021" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
 
+rm ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
 ## 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;$TMDB;$YEAR;$TITLE;$SAISON;$GENRES;${XZUID};$RES;/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
+	echo "ipfs get -o ~/astroport/$TYPE/ /ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
 else
 	if [[ $isFILEinINDEX ]]; then
 		echo "$file already in index" ## File was updated => Change OLDLINK
@@ -84,8 +84,8 @@ echo "-----------------------------------------------------------------"
 echo "CREATE my local ${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm found indexes"
 echo "-----------------------------------------------------------------"
 mkdir -p /tmp/xbian/
-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
+echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://localhost:10021" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER
+cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' | cut -d ';' -f 9 >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET ipfs get commands
 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