diff --git a/COMMUNITY.md b/COMMUNITY.md
index d85593f6..b3c7a0c4 100644
--- a/COMMUNITY.md
+++ b/COMMUNITY.md
@@ -47,3 +47,5 @@ FIX /\
 Ma VM qui contient l'os n'a pas assez d'espace disque et pour des raisons diverses elle refuse de m'écouté et ne veux pas augmenté son stockage je vais donc me concentré sur l'installeur et le mettre sur une autre vm avec une bonne config et pouvoir continué le dev !
 
 L'installeur avance tres bien ! Le contenu de l'iso sera sur le github a l'exception des font grub et du fichier .sfs de l'os pour des raisons évidentes de places.
+
+Toutes les modifications sur l'iso que j'ai fait depuis 10 jours sont portés sur github
diff --git a/testing/install/installer.sh b/testing/install/installer.sh
index 542c930f..5ed99484 100644
--- a/testing/install/installer.sh
+++ b/testing/install/installer.sh
@@ -9,6 +9,7 @@ RESET_COLOR="\e[0m"
 #			VARS			#
 
 IS_EFI=1
+SWAPUSED=0
 OLD_PASSWORD=""
 PARTITIONS=$(cat /proc/partitions | awk '$4 == "part" { print $4, $5 }' | sed '1d')
 partition_list=()
@@ -91,8 +92,8 @@ function get_language {
 	)
 
 	case "${language}" in
-		"en-US") export LANG="en_US.UTF-8";;
-		"fr-FR") export LANG="fr_FR.UTF-8";;
+		"en-US") loadkeys fr;;
+		"fr-FR") loadkeys us;;
 		*) ;;
 	esac
 
@@ -140,14 +141,16 @@ function configure_network {
 	    network_password="$(dialog --insecure --passwordbox "Enter network password:" 0 0 --stdout)"
 
 	    # Activating wireless interface
-	    log "Activating wireless interface"
+	    log "Configuration of the network."
+
 	    sudo ifconfig wlp3s0 up
 	    sudo wpa_passphrase WLAN_NAME WLAN_PASSWORD > /etc/wpa_supplicant.conf
 
 	    log "Connecting to network"
 	    wpa_supplicant -B -i wlp3s0 -c /etc/wpa_supplicant.conf -D wext
-            mv "/etc/unusedwirless" "/etc/systemd/network/25-wireless.network"
-	    log "Connected to network. Reboot necessary"
+     	    mkdir "/root/installdir"
+            mv "/etc/unusedwireless" "/root/installdir/25-wireless.network"
+	    log "Network configured. Reboot necessary."
         else
             rm -f "/etc/unusedwirless"
         fi
@@ -157,8 +160,8 @@ function configure_network {
 function GET_USER_INFOS {
 	section "GET USER INFOS"
 
-	get_informations
 	get_language
+	get_informations
 	configure_network
 
 	echo -e "\n"
@@ -179,6 +182,7 @@ function DISK_PARTITION {
     chosen_partition_size=$(lsblk -b -n -o SIZE -d "${chosen_partition}" | awk '{printf "%.2f", $1 / (1024 * 1024 * 1024)}')
     if [ "${chosen_partition_size}" -ge "25.00" ]; then
         if dialog --yesno "Do you want to create a swap partition?" 25 85 --stdout; then
+	    SWAPUSED=0
             for i in "${!partition_list[@]}"; do
                 if [ "${partition_list[i]}" = "${chosen_partition}" ]; then
                    unset 'partition_list[i]'
@@ -189,8 +193,16 @@ function DISK_PARTITION {
         fi
     
         if [ -d /sys/firmware/efi ]; then
-            dialog --title "Efi detected" --msgbox "EFI was been detected ! \n CydraLite will be in EFI \n\n But if you dont want disable it on the BIOS CydraLite will boot anyway"
-            IS_EFI = 0
+	    if dialog --title "Efi detected"  --yesno "EFI was been detected ! Do you want to create an EFI partition ?" 25 85 --stdout; then
+                for i in "${!partition_list[@]}"; do
+                    if [ "${partition_list[i]}" = "${swap_partition}" ]; then
+                        unset 'partition_list[i]'
+                        break
+                    fi
+                done
+		efi_partition=$(dialog --stdout --menu "Choose the swap partition" 15 60 10 "${partition_list[@]}")
+                IS_EFI = 0
+            fi
         fi
     else
 	dialog --msgbox "Error. The chosen partition is too little to contain the system. 25GB at least." 15 100
@@ -212,13 +224,52 @@ function GRUB_CONF {
 
 
     if [ IS_EFI = 1 ]; then
-        grub-install ${chosen_partition}
+        mainPartitionUuid=$(blid ${chosen_partion})
+	if [ SWAPUSED = 0 ]; then
+	    swapPartitionUuid=$(blid ${swap_partion})
+        fi
+	mkdir /mnt/install/boot
+        grub-install --root-directory=/mnt/install/boot ${chosen_partition}
     else
-        grub-install --target=x86_64-efi --removable
+        mainPartitionUuid=$(blid ${chosen_partion})
+	if [ SWAPUSED = 0 ]; then
+	    swapPartitionUuid=$(blid ${swap_partion})
+        fi
+        efiPartitionUuid=$(blid ${efi_partion})
+	mkfs.vfat ${efi_partition}
+	echo -e "t\n\nuefi\nw" | fdisk ${efi_partition}
+        mkdir /mnt/efi
+	mount ${efi_partition} /mnt/efi
+        grub-install ${efi_partition} --root-directory=/mnt/efi --target=x86_64-efi --removable
+	rm -f "${efi_partition}/boot/grub/grub.cfg"
     fi
     rm -rf /mnt/install/boot/grub/grub.cfg
-    grub-mkconfig –o /mnt/install/boot/grub/grub.cfg 
-
+    rm -rf /mnt/efi/boot/grub/grub.cfg
+    touch /mnt/install/boot/grub/grub.cfg
+    touch /mnt/efi/boot/grub/grub.cfg
+    chosen_partition_suffix="${chosen_partition#/dev/sd}"
+    chosen_partition_letter="${chosen_partition_suffix:0:1}"
+    grubrootnum0=$(( $(printf "%d" "'${chosen_partition_letter}") - 96 ))
+    grubrootnum1="${chosen_partition_suffix:1}"
+    echo "set default=0" > /mnt/efi/boot/grub/grub.cfg
+    echo "set timeout=5" > /mnt/efi/boot/grub/grub.cfg
+    echo "" > /mnt/efi/boot/grub/grub.cfg
+    echo "insmod part_gpt" > /mnt/efi/boot/grub/grub.cfg
+    echo "insmod ext2" > /mnt/efi/boot/grub/grub.cfg
+    echo "set root=(hd${grubrootnum0},${grubrootnum1})" > /mnt/efi/boot/grub/grub.cfg
+    echo "" > /mnt/efi/boot/grub/grub.cfg
+    echo "insmod all_video" > /mnt/efi/boot/grub/grub.cfg
+    echo "if loadfont /boot/grub/fonts/unicode.pf2; then" > /mnt/efi/boot/grub/grub.cfg
+    echo "  terminal_output gfxterm" > /mnt/efi/boot/grub/grub.cfg
+    echo "fi" > /mnt/efi/boot/grub/grub.cfg
+    echo "" > /mnt/efi/boot/grub/grub.cfg
+    echo 'menuentry "GNU/Linux, CydraLite Release V2.0"  {' > /mnt/efi/boot/grub/grub.cfg
+    echo "  linux   /boot/os root=UUID=${mainPartitionUuid} ro" > /mnt/efi/boot/grub/grub.cfg
+    echo "}" > /mnt/efi/boot/grub/grub.cfg
+    echo "" > /mnt/efi/boot/grub/grub.cfg
+    echo "menuentry "Firmware Setup" {" > /mnt/efi/boot/grub/grub.cfg
+    echo "  fwsetup" > /mnt/efi/boot/grub/grub.cfg
+    echo "}" > /mnt/efi/boot/grub/grub.cfg
 }
 
 #		CYDRA INSTALLATION		#
@@ -227,8 +278,26 @@ function INSTALL_CYDRA {
     section "INSTALLING CYDRA"
 
     mkdir /mnt/install
-    mount ${chosen_partition} /mnt/install
-    cp -r /* /mnt/install > /dev/null 2>&1;
+    mount ${chosenPartition} /mnt/install
+    mv "/etc/system.sfs" "/mnt/system.sfs"
+    mount -t squashfs "/mnt/system.sfs" /mnt/temp
+    cp -r "/mnt/temp/*" "/mnt/install"
+    rm -f /mnt/install/etc/fstab
+    touch /mnt/install/etc/fstab
+    echo "#CydraLite FSTAB File, Make a backup if you want to modify this file." > /mnt/install/etc/fstab
+    echo "" > /mnt/install/etc/fstab
+    echo "UUID=${mainPartitionUuid}     /            ext4    defaults            1     1" > /mnt/install/etc/fstab
+    if [ SWAPUSED = 0 ]; then
+	echo "UUID=${swapPartitionUuid}     swap         swap     pri=1               0     0" > /mnt/install/etc/fstab
+    fi
+    
+    if [ IS_EFI = 0 ]; then
+	echo "UUID=${efiPartitionUuid} /boot/efi vfat codepage=437,iocharset=iso8859-1 0 1" > /mnt/install/etc/fstab
+    fi
+    
+    if [[ ${WIRELESS} = 1 ]]; then
+	mv "/root/installdir/25-wireless.network" "/mnt/install/systemd/network/25-wireless.network"
+    fi
 }
 
 #		INIT SWAP		#
@@ -243,6 +312,8 @@ function CLEAN_LIVE {
     section "CLEANING LIVECD BEFORE REBOOTING"
 
     umount /mnt/install > /dev/null 2>&1;
+    umount /mnt/efi > /dev/null 2>&1;
+    umount /mnt/temp > /dev/null 2>&1;
 }
 
 
@@ -273,9 +344,9 @@ function main {
        			log "installation on '${chosen_partition}'"
 	                if dialog --yesno "!! WARNING !! \n\n EVERY DATA ON THE DISK WILL BE ERASED.\n Do you want to continue ?" 25 85 --stdout; then
             		     DISK_INSTALL
+		   	     GRUB_CONF
             		     INSTALL_CYDRA
             		     INIT_SWAP
-	    		     GRUB_CONF
 	    		     CLEAN_LIVE
 
 	     		     dialog --msgbox "Installation is finished, thanks for using CydraOS !" 0 0
diff --git a/testing/iso/boot/grub/SPLASH.PNG b/testing/iso/boot/grub/SPLASH.PNG
new file mode 100644
index 00000000..5a57d0ef
Binary files /dev/null and b/testing/iso/boot/grub/SPLASH.PNG differ
diff --git a/testing/iso/boot/grub/splash.png b/testing/iso/boot/grub/splash.png
deleted file mode 100644
index 5556ce03..00000000
Binary files a/testing/iso/boot/grub/splash.png and /dev/null differ
diff --git a/testing/iso/lfs/.nremovable b/testing/iso/lfs/.nremovable
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/testing/iso/lfs/.nremovable
@@ -0,0 +1 @@
+
diff --git a/testing/iso/rootfs/etc/fstab b/testing/iso/rootfs/etc/FSTAB
similarity index 100%
rename from testing/iso/rootfs/etc/fstab
rename to testing/iso/rootfs/etc/FSTAB
diff --git a/testing/iso/rootfs/etc/HOSTNAME b/testing/iso/rootfs/etc/HOSTNAME
new file mode 100644
index 00000000..511d196d
--- /dev/null
+++ b/testing/iso/rootfs/etc/HOSTNAME
@@ -0,0 +1 @@
+cydralive
\ No newline at end of file
diff --git a/testing/iso/rootfs/etc/issue b/testing/iso/rootfs/etc/ISSUE
similarity index 100%
rename from testing/iso/rootfs/etc/issue
rename to testing/iso/rootfs/etc/ISSUE
diff --git a/testing/iso/rootfs/etc/PASSWD b/testing/iso/rootfs/etc/PASSWD
new file mode 100644
index 00000000..732ccf4f
--- /dev/null
+++ b/testing/iso/rootfs/etc/PASSWD
@@ -0,0 +1,5 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/dev/null:/usr/bin/false
+uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/usr/bin/false
+nobody:x:65534:65534:Unprivileged User:/dev/null:/usr/bin/false
+sshd:x:50:50:sshd PrivSep:/var/lib/sshd:/bin/false
diff --git a/testing/iso/rootfs/etc/SHADOW b/testing/iso/rootfs/etc/SHADOW
new file mode 100644
index 00000000..a4fb9be5
--- /dev/null
+++ b/testing/iso/rootfs/etc/SHADOW
@@ -0,0 +1,7 @@
+root:$6$cx9IAhN36ehWALoK$JJNxBEWhVTU.vuOMu8PSuhgQpmktATG7ocphHT0Pn.Ag5SIGReF12YGgiykv/nbiPUv3OciVNKP7tYnHoidRb.:19616:0:99999:7:::
+bin:x:19616:0:99999:7:::
+daemon:x:19616:0:99999:7:::
+messagebus:x:19616:0:99999:7:::
+uuidd:x:19616:0:99999:7:::
+nobody:x:19616:0:99999:7:::
+sshd:!:19620:0:99999:7:::
diff --git a/testing/iso/rootfs/usr/bin/INSTALLER b/testing/iso/rootfs/usr/bin/INSTALLER
new file mode 100644
index 00000000..f4efc770
--- /dev/null
+++ b/testing/iso/rootfs/usr/bin/INSTALLER
@@ -0,0 +1,365 @@
+#!/bin/env bash
+
+
+BOLD_WHITE="\e[1;37m"
+BOLD_BLUE="\e[1;34m"
+BOLD_PURPLE="\e[1;35m"
+RESET_COLOR="\e[0m"
+
+#			VARS			#
+
+IS_EFI=1
+SWAPUSED=0
+OLD_PASSWORD=""
+PARTITIONS=$(cat /proc/partitions | awk '$4 == "part" { print $4, $5 }' | sed '1d')
+partition_list=()
+while read -r line; do
+    size=$(echo "$line" | awk '{ print $2 }')
+    partition_list+=("$size" "")
+done <<< "$partitions"
+WIRELESS=0
+declare -A AVAILIBLE_LANGUAGES=(
+	[1]=en-US
+	[2]=fr-FR
+)
+
+
+log() {
+	echo -e "[${BOLD_BLUE}LOG${RESET_COLOR}] $*"
+}
+
+section() {
+	echo -e "[${BOLD_PURPLE}${1}${RESET_COLOR}] Entering '${BOLD_WHITE}${1}${RESET_COLOR}' process"
+}
+
+# - - - - - - - - - - - - - #
+
+
+
+
+
+
+
+#		INFORMATIONS		#
+
+function welcome_menu {
+	log "Welcome menu"
+	dialog --msgbox "Welcome into CydraProject (Lite) installation guide!" 15 50
+}
+
+function print_licences {
+	log "Showing licenses"
+	dialog --msgbox "Licenses on: https://github.com/acth2/CydraProject/blob/main/LICENSE" 15 50
+}
+
+
+function print_credits {
+	log "Showing credits"
+	dialog --msgbox "Thanks to AinTea for the installer !\n Here the github of AinTea: https://github.com/AinTEAsports\n Here the github of CydraProject: https://github.com/acth2/CydraProject" 15 50
+}
+
+
+function INFORMATIONS {
+	section "INFORMATIONS"
+
+	welcome_menu
+	print_licences
+	print_credits
+}
+
+
+# - - - - - - - - - - - - - #
+
+
+function get_password {
+	log "Getting password"
+	password="$(dialog --insecure --passwordbox "Enter machine password:" 0 0 --stdout)"
+
+	# Set new root password
+	log "Setting password..."
+	[[ -n "${password}" ]] || echo -e "${OLD_PASSWORD}\n{password}\n{password}" | passwd
+	log "Password set"
+}
+
+
+function get_language {
+	log "Getting language"
+
+	language=$(dialog --radiolist "Select system language:" 0 0 0 \
+		1 "en-US" on \
+		2 "fr-FR" off \
+		--stdout
+	)
+
+	case "${language}" in
+		"en-US") loadkeys fr;;
+		"fr-FR") loadkeys us;;
+		*) ;;
+	esac
+
+	log "Language set to '${language}'"
+}
+
+
+function get_machine_name {
+	log "Getting machine name"
+	machine_name="$(dialog --title "Dialog title" --inputbox "Enter machine name:" 0 0 --stdout)"
+
+	# Set machine name to 'machine_name'
+	log "Setting machine name..."
+	sudo hostname "${machine_name}"
+	log "Machine name set"
+}
+
+function get_informations {
+	exec 3>&1
+
+	GLOBALVALUES=$(dialog --ok-label "Valider" \
+               --backtitle "System informations" \
+               --title "Enter the informations" \
+               --form "System informations" \
+               15 50 0 \
+               "Machine Name:" 1 1 "${machine_name}" 1 17 30 0 \
+               "Username:" 2 1 "${user_name}" 2 17 30 0 \
+               "Root Password:" 3 1 "${password}" 3 17 30 0 \
+               2>&1 1>&3)
+
+	exec 3>&-
+	machine_name=$(echo "${GLOBALVALUES}" | awk -F: '{print $1}')
+	user_name=$(echo "${GLOBALVALUES}" | awk -F: '{print $2}')
+	password=$(echo "${GLOBALVALUES}" | awk -F: '{print $3}')
+}
+
+
+function configure_network {
+	if dialog --yesno "Does the system use Wireless connection?" 0 0 --stdout; then
+            WIRELESS=1
+	    log "Configuring network"
+
+	    log "Getting network name and password"
+	    network_name="$(dialog --title "Dialog title" --inputbox "Enter network name:" 0 0 --stdout)"
+	    network_password="$(dialog --insecure --passwordbox "Enter network password:" 0 0 --stdout)"
+
+	    # Activating wireless interface
+	    log "Configuration of the network."
+
+	    sudo ifconfig wlp3s0 up
+	    sudo wpa_passphrase WLAN_NAME WLAN_PASSWORD > /etc/wpa_supplicant.conf
+
+	    log "Connecting to network"
+	    wpa_supplicant -B -i wlp3s0 -c /etc/wpa_supplicant.conf -D wext
+     	    mkdir "/root/installdir"
+            mv "/etc/unusedwireless" "/root/installdir/25-wireless.network"
+	    log "Network configured. Reboot necessary."
+        else
+            rm -f "/etc/unusedwirless"
+        fi
+}
+
+
+function GET_USER_INFOS {
+	section "GET USER INFOS"
+
+	get_language
+	get_informations
+	configure_network
+
+	echo -e "\n"
+}
+
+
+# - - - - - - - - - - - - - #
+
+
+
+
+#		DISK PARTITION		#
+
+function DISK_PARTITION {
+    section "DISK PARTITIONNING"
+
+    chosen_partition=$(dialog --stdout --menu "Choose the system partition" 15 60 10 "${partition_list[@]}")
+    chosen_partition_size=$(lsblk -b -n -o SIZE -d "${chosen_partition}" | awk '{printf "%.2f", $1 / (1024 * 1024 * 1024)}')
+    if [ "${chosen_partition_size}" -ge "25.00" ]; then
+        if dialog --yesno "Do you want to create a swap partition?" 25 85 --stdout; then
+	    SWAPUSED=0
+            for i in "${!partition_list[@]}"; do
+                if [ "${partition_list[i]}" = "${chosen_partition}" ]; then
+                   unset 'partition_list[i]'
+                   break
+                fi
+            done
+            swap_partition=$(dialog --stdout --menu "Choose the swap partition" 15 60 10 "${partition_list[@]}")
+        fi
+    
+        if [ -d /sys/firmware/efi ]; then
+	    if dialog --title "Efi detected"  --yesno "EFI was been detected ! Do you want to create an EFI partition ?" 25 85 --stdout; then
+                for i in "${!partition_list[@]}"; do
+                    if [ "${partition_list[i]}" = "${swap_partition}" ]; then
+                        unset 'partition_list[i]'
+                        break
+                    fi
+                done
+		efi_partition=$(dialog --stdout --menu "Choose the swap partition" 15 60 10 "${partition_list[@]}")
+                IS_EFI = 0
+            fi
+        fi
+    else
+	dialog --msgbox "Error. The chosen partition is too little to contain the system. 25GB at least." 15 100
+        unset chosen_partition chosen_partition_size
+	DISK_PARTITION
+    fi
+}
+
+function DISK_INSTALL {
+    section "INSTALL DISK"
+
+    mkfs.ext4 ${chosen_partition}
+}
+
+#		GRUB CONFIGURATION		#
+
+function GRUB_CONF {
+    section "GRUB CONFIGURING"
+
+
+    if [ IS_EFI = 1 ]; then
+        grub-install ${chosen_partition}
+    else
+        mainPartitionUuid=$(blid ${chosen_partion})
+	swapPartitionUuid=$(blid ${swap_partion})
+        efiPartitionUuid=$(blid ${efi_partion})
+	mkfs.vfat ${efi_partition}
+	echo -e "t\n\nuefi\nw" | fdisk ${efi_partition}
+        mkdir /mnt/efi
+	mount ${efi_partition} /mnt/efi
+        grub-install --root-directory=/mnt/efi --target=x86_64-efi --removable
+	rm -f "${efi_partition}/boot/grub/grub.cfg"
+	umount ${efi_partition}
+    fi
+    rm -rf /mnt/install/boot/grub/grub.cfg
+    rm -rf /mnt/efi/boot/grub/grub.cfg
+    touch /mnt/install/boot/grub/grub.cfg
+    touch /mnt/efi/boot/grub/grub.cfg
+    chosen_partition_suffix="${chosen_partition#/dev/sd}"
+    chosen_partition_letter="${chosen_partition_suffix:0:1}"
+    grubrootnum0=$(( $(printf "%d" "'${chosen_partition_letter}") - 96 ))
+    grubrootnum1="${chosen_partition_suffix:1}"
+    echo "set default=0" > /mnt/efi/boot/grub/grub.cfg
+    echo "set timeout=5" > /mnt/efi/boot/grub/grub.cfg
+    echo "" > /mnt/efi/boot/grub/grub.cfg
+    echo "insmod part_gpt" > /mnt/efi/boot/grub/grub.cfg
+    echo "insmod ext2" > /mnt/efi/boot/grub/grub.cfg
+    echo "set root=(hd${grubrootnum0},${grubrootnum1})" > /mnt/efi/boot/grub/grub.cfg
+    echo "" > /mnt/efi/boot/grub/grub.cfg
+    echo "insmod all_video" > /mnt/efi/boot/grub/grub.cfg
+    echo "if loadfont /boot/grub/fonts/unicode.pf2; then" > /mnt/efi/boot/grub/grub.cfg
+    echo "  terminal_output gfxterm" > /mnt/efi/boot/grub/grub.cfg
+    echo "fi" > /mnt/efi/boot/grub/grub.cfg
+    echo "" > /mnt/efi/boot/grub/grub.cfg
+    echo 'menuentry "GNU/Linux, CydraLite Release V2.0"  {' > /mnt/efi/boot/grub/grub.cfg
+    echo "  linux   /boot/os root=UUID=${mainPartitionUuid} ro" > /mnt/efi/boot/grub/grub.cfg
+    echo "}" > /mnt/efi/boot/grub/grub.cfg
+    echo "" > /mnt/efi/boot/grub/grub.cfg
+    echo "menuentry "Firmware Setup" {" > /mnt/efi/boot/grub/grub.cfg
+    echo "  fwsetup" > /mnt/efi/boot/grub/grub.cfg
+    echo "}" > /mnt/efi/boot/grub/grub.cfg
+}
+
+#		CYDRA INSTALLATION		#
+
+function INSTALL_CYDRA {
+    section "INSTALLING CYDRA"
+
+    mkdir /mnt/install
+    mount ${efiPartitionUuid} /mnt/install
+    mv "/etc/system.sfs" "/mnt/system.sfs"
+    mount -t squashfs "/mnt/system.sfs" /mnt/temp
+    cp -r "/mnt/temp/*" "/mnt/install"
+    rm -f /mnt/install/etc/fstab
+    touch /mnt/install/etc/fstab
+    echo "#CydraLite FSTAB File, Make a backup if you want to modify this file." > /mnt/install/etc/fstab
+    echo "" > /mnt/install/etc/fstab
+    echo "UUID=${mainPartitionUuid}     /            ext4    defaults            1     1" > /mnt/install/etc/fstab
+    if [ SWAPUSED = 0 ]; then
+	echo "UUID=${swapPartitionUuid}     swap         swap     pri=1               0     0" > /mnt/install/etc/fstab
+    fi
+    
+    if [ IS_EFI = 0 ]; then
+	echo "UUID=${efiPartitionUuid} /boot/efi vfat codepage=437,iocharset=iso8859-1 0 1" > /mnt/install/etc/fstab
+    fi
+    
+    if [[ ${WIRELESS} = 1 ]]; then
+	mv "/root/installdir/25-wireless.network" "/mnt/install/systemd/network/25-wireless.network"
+    fi
+}
+
+#		INIT SWAP		#
+
+function INIT_SWAP {
+    mkswap ${chosen_swap}
+}
+
+#		CLEAN UP		#
+
+function CLEAN_LIVE {
+    section "CLEANING LIVECD BEFORE REBOOTING"
+
+    umount /mnt/install > /dev/null 2>&1;
+    umount /mnt/efi > /dev/null 2>&1;
+    umount /mnt/temp > /dev/null 2>&1;
+}
+
+
+# - - - - - - - - - - - - - #
+
+
+
+function main {
+	section "INSTALLATION"
+	INFORMATIONS
+	GET_USER_INFOS
+	DISK_PARTITION
+
+
+	# If the user wants to continue the installation or return to the beginning
+	if dialog --yesno "Installation will start, do you want to continue ?" 15 75 --stdout; then
+
+		# If any field was left blank
+		if [[ -z "${password}" || -z "${language}" || -z "${machine_name}" || -z "${chosen_partition}" ]]; then
+			err  "$@"
+                        main "$@"
+		elif [[ ${WIRELESS} = 1 ]]; then
+                     if [[ -z "${network_name}" || -z "${network_password}" ]]; then
+        		     err  "$@"
+                             main "$@"
+                     fi	
+                else
+       			log "installation on '${chosen_partition}'"
+	                if dialog --yesno "!! WARNING !! \n\n EVERY DATA ON THE DISK WILL BE ERASED.\n Do you want to continue ?" 25 85 --stdout; then
+            		     DISK_INSTALL
+		   	     GRUB_CONF
+            		     INSTALL_CYDRA
+            		     INIT_SWAP
+	    		     CLEAN_LIVE
+
+	     		     dialog --msgbox "Installation is finished, thanks for using CydraOS !" 0 0
+	                else
+  			     if dialog --yesno "Do you want to exit the Installation ?" 15 35 --stdout; then
+			          main "$@"
+                             else
+                                  halt
+	                     fi
+                        fi
+			exit 0
+		fi
+	else
+		main "$@"
+	fi
+}
+
+function err {
+	dialog --msgbox "The installation failed. The user did not gived all of the needed informations for the installation." 15 100
+}
+
+main "$@"