diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85118b7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.env
+*.pyc
diff --git a/G1BILLETS.sh b/G1BILLETS.sh
index 563d94c..0c10bdc 100755
--- a/G1BILLETS.sh
+++ b/G1BILLETS.sh
@@ -12,14 +12,25 @@ ME="${0##*/}"
 # ${MY_PATH}/G1BILLETS.sh 5 986397643 ticket
 ################################################################################
 MONTANT="$1"
+[[ $MONTANT == "" ]] && MONTANT="___"
+
 UNIQID="$2"
+[[ $UNIQID == "" ]] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)${RANDOM:0:2}$(${MY_PATH}/diceware.sh 1 | xargs)
+
 STYLE="$3"
 
+                ## CHECK STYLE IS EMAIL
+                if [[ "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
+                    echo "PLAYER : $STYLE"
+                    EMAIL=${STYLE}
+                    STYLE="astro"
+                else
+                    echo "STYLE=${STYLE}"
+                fi
+
 ## PLANCHE DE 6 BILLETS PAR DEFAUT
 NBbillets=6
 
-[[ $MONTANT == "" ]] && MONTANT="___"
-[[ $UNIQID == "" ]] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)${RANDOM:0:2}$(${MY_PATH}/diceware.sh 1 | xargs)
 [[ "$STYLE" == "xbian" ]] && NBbillets=1 ## STYLE=xbian => 1 BILLET
 [[ "$STYLE" == "1" ]] && NBbillets=1 && STYLE="" ## 1 BILLET PDF
 [[ "$STYLE" == "ticket" ]] && NBbillets=1 && echo "TICKET" ## 1 BILLET JPG
@@ -31,6 +42,8 @@ NBbillets=6
 [[ ! -f ${MY_PATH}/images/g1${STYLE}.png ]] && echo "missing g1${STYLE}.jpg" && exit 1
 [[ ! -f ${MY_PATH}/images/logo${STYLE}.png ]] && echo "missing logo${STYLE}.jpg" && exit 1
 
+mkdir -p "/tmp/g1billet/${UNIQID}"
+
 # CREATION DE $NBbillets BILLETS DE $MONTANT DU
 boucle=0;
 while [ $boucle -lt $NBbillets ]
@@ -43,15 +56,14 @@ do
     BILLETPUBKEY=$(python3 ${MY_PATH}/key_create_dunikey.py "$NUMBER" "$SECRET")
     rm -f /tmp/secret.dunikey
 
-    mkdir -p "/tmp/g1billet/${UNIQID}"
-    # CREATION FICHIER IMAGE BILLET
-    $(${MY_PATH}/MAKE_G1BILLET.sh "${NUMBER}" "${SECRET}" "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}")
-
-    [ "$STYLE" == "astro" ]] \
+    [[ "$STYLE" == "astro" ]] \
     && ${MY_PATH}/keygen -t ipfs -o /tmp/g1billet/${UNIQID}.ipns.key "$NUMBER" "$SECRET" \
     && ASTRONAUTENS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext /tmp/g1billet/${UNIQID}.ipns.key) \
-    && curl -s "https://astroport.copylaradio.com/?salt=$NUMBER$pepper=$SECRET&g1pub=on&email=$EMAIL" \
-    && echo "TW : /ipns/${ASTRONAUTENS}"
+    && ipfs key rm ${UNIQID} && rm /tmp/g1billet/${UNIQID}.ipns.key \
+    && [[ $EMAIL ]] && curl -s "https://astroport.copylaradio.com/?salt=$NUMBER$pepper=$SECRET&g1pub=on&email=$EMAIL" \
+
+    # CREATION FICHIER IMAGE BILLET
+    $(${MY_PATH}/MAKE_G1BILLET.sh "${NUMBER}" "${SECRET}" "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}" "${ASTRONAUTENS}")
 
 done
 
diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh
index ff33dfc..6a3a979 100755
--- a/MAKE_G1BILLET.sh
+++ b/MAKE_G1BILLET.sh
@@ -19,6 +19,7 @@ MONTANT="$3"
 NOTERIB="$4"
 UNIQID="$5"
 STYLE="$6"
+ASTRONAUTENS="$7"
 
 if [[ "$NUMERO" == "" || "$SECRET" == "" || "$MONTANT" == "" || "$NOTERIB" == "" || "$UNIQID" == "" ]]
 then
@@ -28,16 +29,7 @@ fi
 mkdir -p /tmp/g1billet/$UNIQID
 BILLETNAME=$(echo $NUMERO | sed 's/ /_/g')
 
-# Add ${MY_PATH}/images/logo.png (250px)
-composite -compose Over -gravity SouthWest -geometry +50+50 -dissolve 70% "${MY_PATH}/images/logo${STYLE}.png" "${MY_PATH}/images/fond${STYLE}.jpg" "/tmp/${BILLETNAME}.jpg"
-
-# Prepare BILLET qrcode verification URL
-qrencode -s 6 -o "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB"
-
-# Add verification QRCode
-composite -compose Over -gravity SouthEast -geometry +35+50 "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg"
-
-# Change June logo color
+# Prepare June logo color
 case "$MONTANT" in
     1)
         convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill grey -opaque '#e5912b' "/tmp/g1billet/${UNIQID}/g1.png"
@@ -65,15 +57,30 @@ case "$MONTANT" in
         ;;
 esac
 
+
+# Add ${MY_PATH}/images/logo.png (250px)
+composite -compose Over -gravity SouthWest -geometry +50+50 -dissolve 70% "${MY_PATH}/images/logo${STYLE}.png" "${MY_PATH}/images/fond${STYLE}.jpg" "/tmp/${BILLETNAME}.jpg"
+
+
+if [[ $ASTRONAUTENS ]]; then
+    ## IT IS AN ASTRONAUTENS IPNS LINK
+    qrencode -s 6 -o "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS"
+    composite -compose Over -gravity SouthEast -geometry +200+45 "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg"
+else
+    # G1PUB QR CODE
+    qrencode -s 6 -o "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB"
+    composite -compose Over -gravity SouthEast -geometry +35+50 "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg"
+fi
+
 # Add June LOGO to Billet
 composite -compose Over -gravity NorthEast -geometry +50+25  -dissolve 90% "/tmp/g1billet/${UNIQID}/g1.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg"
 
 # xbian style (ASTROPORT/KODI) + JEU
-if [[ "${STYLE}" == "xbian" || "${STYLE}" == "jeu" ]]
+if [[ "${STYLE}" == "xbian" || "${STYLE}" == "jeu" || "${STYLE}" == "astro" ]]
 then
     # CREATE PSEUDO for Gchange.fr
-    XZUID=$(${MY_PATH}/diceware.sh 1 | xargs)${RANDOM:0:2}$(${MY_PATH}/diceware.sh 1 | xargs)
-    BOTTOM="VISA MadeInZion       -- ASTROPORT ONE --"
+    XZUID="________@____________"
+    BOTTOM="ACTIVER TW : https://astroport.copylaradio.com"
 else
     XZUID="G1 BILLET"
     BOTTOM="Porte Monnaie Libre!!          https://gchange.fr         https://cesium.app"
@@ -93,8 +100,8 @@ else
 convert -font 'Liberation-Sans' \
 -pointsize 40 -fill black -draw 'text 70,60 "'"$XZUID"'"' \
 -pointsize 20 -fill black -draw 'text 380,30 "'"${NOTERIB}"'"' \
--pointsize 30 -draw 'text 50,100 "'"Identifiant: $NUMERO"'"' \
--pointsize 22 -fill black -draw 'text 50,130 "'"Code Secret:  $SECRET"'"' \
+-pointsize 30 -draw 'text 50,100 "'"Secret 1: $NUMERO"'"' \
+-pointsize 30 -fill black -draw 'text 50,130 "'"Secret 2: $SECRET"'"' \
 -pointsize 25 -fill black -draw 'text 150,440 "'"$BOTTOM"'"' \
 "/tmp/${BILLETNAME}.jpg" "/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 fi
diff --git a/images/fondastro.jpg b/images/fondastro.jpg
index 5c98d53..8920f0a 100644
Binary files a/images/fondastro.jpg and b/images/fondastro.jpg differ
diff --git a/index.php b/index.php
index a266c74..78f909c 100644
--- a/index.php
+++ b/index.php
@@ -5,25 +5,25 @@ $timestamp = $mytime->format('U').rand();
 // CREATE 6 G1BILLETS in /tmp/g1billet/$timestamp
 $page = shell_exec(dirname(__FILE__)."/G1BILLETS.sh '".$_REQUEST['montant']."' '".$timestamp."' '".$_REQUEST['style']."'");
 
-if ( $_REQUEST['style'] == 'ticket' || $_REQUEST['style'] == 'xbian' ) {
-	$file_type = "jpg";
+if ( $_REQUEST['style'] == 'ticket' || $_REQUEST['style'] == 'xbian' || $_REQUEST['style'] == 'astro' ) {
+    $file_type = "jpg";
 } else {
-	$file_type = "pdf";
+    $file_type = "pdf";
 }
 $attachment_location = "/tmp/g1billet/".$timestamp.".".$file_type;
 
 if (file_exists($attachment_location)) {
-	header($_SERVER["SERVER_PROTOCOL"] . " 200 OK");
+    header($_SERVER["SERVER_PROTOCOL"] . " 200 OK");
     header("Cache-Control: public"); // needed for internet explorer
     header("Content-Type: application/".$file_type);
     header("Content-Transfer-Encoding: Binary");
     header("Content-Length:".filesize($attachment_location));
     header("Content-Disposition: attachment; filename=".$timestamp.".".$file_type);
-	readfile($attachment_location);
-	unlink("/tmp/g1billet/".$timestamp.".".$file_type);
-	die();        
+    readfile($attachment_location);
+    unlink("/tmp/g1billet/".$timestamp.".".$file_type);
+    die();
 } else {
-	die("Error: File not found.");
+    die("Error: File not found.");
 }
 ?>