From 3ba9b67dda2958247574d8249274f09369bdea36 Mon Sep 17 00:00:00 2001
From: JKANetwork <contacto@jkanetwork.com>
Date: Mon, 16 Jan 2017 16:55:47 +0100
Subject: [PATCH] New installer

---
 archinstall/archinstall.sh | 1456 +++++++++++++++++++-----------------
 1 file changed, 758 insertions(+), 698 deletions(-)

diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh
index ba2a7d3..0772907 100755
--- a/archinstall/archinstall.sh
+++ b/archinstall/archinstall.sh
@@ -17,213 +17,282 @@ if [[ ! -z "$2" ]];then
 fi
 
 function pause {
-echo "$(T "Press enter to continue...")"
-read
+	echo "$(T "Press enter to continue...")"
+	read
 }
 
 function mostrardialog {
-local titled
-local msgd
-titled=$1
-msgd=$2
-dialog --title "$titled" --msgbox "$msgd" 15 60
+	local titled
+	local msgd
+	titled=$1
+	msgd=$2
+	dialog --title "$titled" --msgbox "$msgd" 15 60
+}
+
+function yesnobox {
+	local title=$1
+	#Return Y or N
+	echo `dialog --stdout --nocancel --menu "$title" 0 0 4 Y "$(T "Yes")" N "No"`
 }
 
 function fatalerror {
-razon=$1
-mostrardialog "Error" "$(T "An error has ocurred, setup will be stopped") $razon"
-mostrardialog "Log" "$(T "You have a install log in") /tmp/install.log"
-exit
+	razon=$1
+	mostrardialog "Error" "$(T "An error has ocurred, setup will be stopped") $razon"
+	mostrardialog "Log" "$(T "You have a install log in") /tmp/install.log"
+	exit
 }
+
 function isanetworkerror {
-if [[ $? != 0 ]];then
-fatalerror "$(T "Network connection error, please check it")"
-fi
+	if [[ $? != 0 ]];then
+	fatalerror "$(T "Network connection error, please check it")"
+	fi
 }
+
 function pacmanerror {
-if [[ $? != 0 ]];then
-fatalerror "$(T "Pacman error, problems in repositories, apologizes. You have to try later...")"
-fi
+	if [[ $? != 0 ]];then
+	fatalerror "$(T "Pacman error, problems in repositories, apologizes. You have to try later...")"
+	fi
 }
 
+##This function logs and execute commands 
+function execl { 
+	local command
+	echo "------" >> "/tmp/install.log"
+	if [[ $1 != "chroot" && $1 != "chuser" ]];then #If it runs normally
+	command="$1"
+	for (( i=2; i<=$#; i++ ))
+	do
+		command="$command $(echo $* | cut -f$i -d" ")"
+	done
+	echo "$command" >> "/tmp/install.log"
+	$command
+	else #There is a "First word", avoid it
+	for (( i=2; i<=$#; i++ ))
+	do
+		command="$command $(echo $* | cut -f$i -d" ")"
+	done
+	fi
 
-function execl { ##This function logs and execute commands 
-local command
-echo "------" >> "/tmp/install.log"
-if [[ $1 != "chroot" && $1 != "chuser" ]];then #If it runs normally
-command="$1"
-for (( i=2; i<=$#; i++ ))
-do
-	command="$command $(echo $* | cut -f$i -d" ")"
-done
-echo "$command" >> "/tmp/install.log"
-$command
-else #There is a "First word", avoid it
-for (( i=2; i<=$#; i++ ))
-do
-	command="$command $(echo $* | cut -f$i -d" ")"
-done
-fi
+	if [[ $1 = "chroot" ]];then #If it runs in chroot
+	echo "(In the install partition/chroot) $command" >> "/tmp/install.log"
+	chroot /mnt /bin/bash -c "$command"
+	elif [[ $1 = "chuser" ]];then #If it has to run in chroot but in the user name
+	echo "(In a 'user' chroot in install partition) $command" >> "/tmp/install.log"
+	chroot /mnt /bin/bash -c "su $nameuser -c \"$command\" "
+	fi
 
-if [[ $1 = "chroot" ]];then #If it runs in chroot
-echo "(In the install partition/chroot) $command" >> "/tmp/install.log"
-chroot /mnt /bin/bash -c "$command"
-elif [[ $1 = "chuser" ]];then #If it has to run in chroot but in the user name
-echo "(In a 'user' chroot in install partition) $command" >> "/tmp/install.log"
-chroot /mnt /bin/bash -c "su $nameuser -c \"$command\" "
-fi
-
-#Log result of the command
-if [[ $? == 0 ]];then
-echo "Result Ok " >> "/tmp/install.log"
-else
-echo "Error: Code $?" >> "/tmp/install.log"
-fi
+	#Log result of the command
+	if [[ $? == 0 ]];then
+	echo "Result Ok " >> "/tmp/install.log"
+	else
+	echo "Error: Code $?" >> "/tmp/install.log"
+	fi
 }
 
-
+##Function for show to the user if an option is on or off
 function optstate {
-if [[ $1 =~ "$2" ]];then 
-	echo "on"
-else 
-	echo "off"
-fi
+	if [[ $1 =~ "$2" ]];then 
+		echo "on"
+	else 
+		echo "off"
+	fi
 }
 
+# End of functions that are user interactive for configuring system
 
+##Function to select by the user the partitions for the system install
 function particiones {
-clear
-mostrardialog "$(T "Questions about partitions where system will be installed")" "$(T "Questions about partitions dialog. Text")"
-clear
-if [[ ! $(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd') ]];then
-	mostrardialog "ERROR" "$(T "ERROR: You dont have HDD, insert one, poweroff")"
-	reboot
-fi
-optpa=`dialog --stdout --nocancel --menu "$(T "¿Do you want to edit partitions?¿How?")" 0 0 5 1 "Grafico con Gparted (Recomendado)" 2 "Terminal (Pequeño asistente o por tu cuenta)" 3 "Borrar un disco duro e instalar JKArch en el (usar con cuidado!)" 4 "No editar nada"`
-case $optpa in
-	1) 
-		#Abrir gparted grafico
-		mostrardialog "Gparted" "$(T "Gparted will be opened. Help text")"
-		startx;;
-	2)
-		#Terminal
-		echo $(T "Select hard disk to edit")
-		echo "Aviso, el soporte a GPT no es del 100%, si no vas a instalar mas SO y tu HDD no tiene mas de 2Tb, elija MBR/DOS"
-		lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL
-		options=($(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd') "No editar" "Terminal")
-		select opt in "${options[@]}"
-		do
-			case $opt in
-			"Terminal") 
-			echo "Haga los cambios pertinentes, asegurese, y escriba exit continuar la instalación"
-			bash
-			break;;
-			"No editar") break;;
-			*) cfdisk /dev/$opt;break;;
-			esac
-		done
-		;;
-	3)
-		mostrardialog "$(T "Full hard disk install")" "$(T "Full hard disk install. Text")"
-		clear
+	clear
+	mostrardialog "$(T "Questions about partitions where system will be installed")" "$(T "Questions about partitions dialog. Text")"
+	clear
+	if [[ ! $(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd') ]];then
+		mostrardialog "ERROR" "$(T "ERROR: You dont have HDD, insert one, poweroff")"
+		reboot
+	fi
+	optpa=`dialog --stdout --nocancel --menu "$(T "¿Do you want to edit partitions?¿How?")" 0 0 5 1 "Grafico con Gparted (Recomendado)" 2 "Terminal (Pequeño asistente o por tu cuenta)" 3 "Borrar un disco duro e instalar JKArch en el (usar con cuidado!)" 4 "No editar nada"`
+	case $optpa in
+		1) 
+			#Abrir gparted grafico
+			mostrardialog "Gparted" "$(T "Gparted will be opened. Help text")"
+			startx;;
+		2)
+			#Terminal
+			echo $(T "Select hard disk to edit")
+			echo "Aviso, el soporte a GPT no es del 100%, si no vas a instalar mas SO y tu HDD no tiene mas de 2Tb, elija MBR/DOS"
+			lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL
+			options=($(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd') "No editar" "Terminal")
+			select opt in "${options[@]}"
+			do
+				case $opt in
+				"Terminal") 
+				echo "Haga los cambios pertinentes, asegurese, y escriba exit continuar la instalación"
+				bash
+				break;;
+				"No editar") break;;
+				*) cfdisk /dev/$opt;break;;
+				esac
+			done
+			;;
+		3)
+			mostrardialog "$(T "Full hard disk install")" "$(T "Full hard disk install. Text")"
+			clear
+			tput setaf 6 ; echo "$(T "Your partition scheme")" ; tput setaf 9
+			lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL
+			tput setaf 6 ; echo "$(T "Select hard disk to delete and use by JKArch")" ; tput setaf 9
+			options=($(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd') "$(T "Exit")")
+			select opt in "${options[@]}"
+			do
+				case $opt in
+				"$(T "Exit")")
+					mostrardialog "Instalacion detenida" "Se detuvo la instalacion. No se hicieron cambios. Al aceptar, reiniciara la instalacion"
+					exec ./selectlang.sh
+					;;
+				*) 
+					if [[ -z $opt ]];then
+						echo "$(T "Not valid")"
+					else
+						optseg=`dialog --stdout --nocancel --menu "¿Estas seguro de borrar todo /dev/$opt y meter JKArch aqui? No es reversible" 0 0 4 1 "No" 2 "No" 3 "Si, estoy seguro" 4 "No"`
+						case $optseg in
+							3)
+								echo -e "o\nn\np\n1\n\n\nw\n"  | fdisk /dev/$opt
+								particionraiz=${opt}1
+								hd="sda"  #This is for GRUB install
+								formatoraiz="mkfs.ext4 -F"
+								ram=$(free -m | grep Mem: | awk '1 {print $2 }')
+								if [[ $ram -le 7500 ]];then
+									swaptype=1
+									swapamount=$(expr $ram / 3)
+									if [[ $ram -le 3700 ]];then
+										swapamount=$(expr $swapamount \* 2)
+									fi
+									if [[ $ram -le 1500 ]];then
+										swapamount=$(expr $swapamount \* 2)
+									fi
+									if [[ $ram -le 700 ]];then
+										swapamount=$(expr $swapamount \* 2)
+									fi
+								fi
+								break;;
+							*)
+								mostrardialog "Instalacion detenida" "Se detuvo la instalacion. No se hicieron cambios. Al aceptar, reiniciara la instalacion"
+								exec ./selectlang.sh
+								;;
+						esac
+					fi;;
+				esac
+			done
+			;;
+	esac
+	clear
+	# Solo pedir datos si no esta en modo automatico, evidentemente.
+	if [[ ! $optpa -eq 3 ]];then
+
 		tput setaf 6 ; echo "$(T "Your partition scheme")" ; tput setaf 9
 		lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL
-		tput setaf 6 ; echo "$(T "Select hard disk to delete and use by JKArch")" ; tput setaf 9
-		options=($(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd') "$(T "Exit")")
-		select opt in "${options[@]}"
+		tput setaf 6 ; echo "$(T "I recommend to take notes before continue. Next, you will have the questions about it")" ; tput setaf 9
+		pause
+		
+		harddisks=$(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd')
+		i=3
+		for addr in $(echo $harddisks | tr " " "\n")
 		do
-			case $opt in
-			"$(T "Exit")")
-				mostrardialog "Instalacion detenida" "Se detuvo la instalacion. No se hicieron cambios. Al aceptar, reiniciara la instalacion"
-				exec ./selectlang.sh
-				;;
-			*) 
-				if [[ -z $opt ]];then
-					echo "$(T "Not valid")"
-				else
-					optseg=`dialog --stdout --nocancel --menu "¿Estas seguro de borrar todo /dev/$opt y meter JKArch aqui? No es reversible" 0 0 4 1 "No" 2 "No" 3 "Si, estoy seguro" 4 "No"`
-					case $optseg in
-						3)
-							echo -e "o\nn\np\n1\n\n\nw\n"  | fdisk /dev/$opt
-							particionraiz=${opt}1
-							hd="sda"  #This is for GRUB install
-							formatoraiz="mkfs.ext4 -F"
-							ram=$(free -m | grep Mem: | awk '1 {print $2 }')
-							if [[ $ram -le 7500 ]];then
-								swaptype=1
-								swapamount=$(expr $ram / 3)
-								if [[ $ram -le 3700 ]];then
-									swapamount=$(expr $swapamount \* 2)
-								fi
-								if [[ $ram -le 1500 ]];then
-									swapamount=$(expr $swapamount \* 2)
-								fi
-								if [[ $ram -le 700 ]];then
-									swapamount=$(expr $swapamount \* 2)
-								fi
-							fi
-							break;;
-						*)
-							mostrardialog "Instalacion detenida" "Se detuvo la instalacion. No se hicieron cambios. Al aceptar, reiniciara la instalacion"
-							exec ./selectlang.sh
-							;;
-					esac
-				fi;;
-			esac
+			varx+=" $addr '- $(lsblk --output SIZE /dev/$addr | sed '1d' | head -1)'"
 		done
-		;;
-esac
-clear
-# Solo pedir datos si no esta en modo automatico, evidentemente.
-if [[ ! $optpa -eq 3 ]];then
+		varf="dialog --stdout --nocancel --menu \"Selecciona disco duro a utilizar para seleccionar las particiones\" 0 0 5 $varx"
+		hd=`bash -c "$varf"`
+		
+		# Detectar tipo de tabla de particiones (gpt o msdos) y si es gpt, preparar para UEFI
+		tabletype="$(parted /dev/${hd} p | grep "Partition Table" | awk '1 {print $3}')"
 
-	tput setaf 6 ; echo "$(T "Your partition scheme")" ; tput setaf 9
-	lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL
-	tput setaf 6 ; echo "$(T "I recommend to take notes before continue. Next, you will have the questions about it")" ; tput setaf 9
-	pause
-	
-	harddisks=$(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd')
-	i=3
-	for addr in $(echo $harddisks | tr " " "\n")
-	do
-		varx+=" $addr '- $(lsblk --output SIZE /dev/$addr | sed '1d' | head -1)'"
-	done
-	varf="dialog --stdout --nocancel --menu \"Selecciona disco duro a utilizar para seleccionar las particiones\" 0 0 5 $varx"
-	hd=`bash -c "$varf"`
-	
-	#Detectar tipo de tabla de particiones (gpt o msdos) y si es gpt, preparar para UEFI
-	tabletype="$(parted /dev/${hd} p | grep "Partition Table" | awk '1 {print $3}')"
+		if [[ $tabletype = "gpt" ]];then
+			mostrardialog "$(T "GPT Partition Table")" "$(T "You are using GPT, you will have to select EFI")"
+		fi
+		clear
+		
+		variable=$(lsblk --output KNAME /dev/${hd} | cut -c1-4 | tail -n +3)
+		i=3
+		varx=""
+		for addr in $(echo $variable | tr " " "\n")
+		do
+			varx+=" $addr '$(lsblk --output KNAME,FSTYPE,SIZE,LABEL /dev/${hd} | tail -n +$i | head -1)'"
+			i=$((i+1))
+		done
+		varf="dialog --stdout --nocancel --menu \"Selecciona la particion raiz(/)\" 0 0 5 $varx"
+		particionraiz=`bash -c "$varf"`
+		
+		optfr=`dialog --stdout --nocancel --menu "Formato para la particion raiz(/)" 0 0 4 1 "EXT4 (Recomendado)" 2 "BTRFS" 3 "XFS" 4 "No formatear (Si ya esta formateada)"`
+		case $optfr in
+			1) formatoraiz="mkfs.ext4 -F";;
+			2) formatoraiz="mkfs.btrfs -f";;
+			3) formatoraiz="mkfs.xfs -f";;		
+			4) formatoraiz="echo No formatear ";;
+		esac
 
-	if [[ $tabletype = "gpt" ]];then
-		mostrardialog "$(T "GPT Partition Table")" "$(T "You are using GPT, you will have to select EFI")"
-	fi
-	clear
-	
-	variable=$(lsblk --output KNAME /dev/${hd} | cut -c1-4 | tail -n +3)
-	i=3
-	varx=""
-	for addr in $(echo $variable | tr " " "\n")
-	do
-		varx+=" $addr '$(lsblk --output KNAME,FSTYPE,SIZE,LABEL /dev/${hd} | tail -n +$i | head -1)'"
-		i=$((i+1))
-	done
-	varf="dialog --stdout --nocancel --menu \"Selecciona la particion raiz(/)\" 0 0 5 $varx"
-	particionraiz=`bash -c "$varf"`
-	
-	optfr=`dialog --stdout --nocancel --menu "Formato para la particion raiz(/)" 0 0 4 1 "EXT4 (Recomendado)" 2 "BTRFS" 3 "XFS" 4 "No formatear (Si ya esta formateada)"`
-	case $optfr in
-		1) formatoraiz="mkfs.ext4 -F";;
-		2) formatoraiz="mkfs.btrfs -f";;
-		3) formatoraiz="mkfs.xfs -f";;		
-		4) formatoraiz="echo No formatear ";;
-	esac
+		clear
 
-	clear
+		opthpart=`dialog --stdout --nocancel --menu "¿Quieres separar la particion /home de /?" 0 0 4 1 "No (Por defecto)" 2 "Si (Tendras que elegir la particion)"`
+		case $opthpart in
+			2)
+				# Selección de home
+				variable=$(lsblk --output KNAME /dev/${hd} | cut -c1-4 | tail -n +3)
+				i=3
+				varx=""
+				for addr in $(echo $variable | tr " " "\n")
+				do
+					varx+=" $addr '$(lsblk --output KNAME,FSTYPE,SIZE,LABEL /dev/${hd} | tail -n +$i | head -1)'"
+					i=$((i+1))
+				done
+				varf="dialog --stdout --nocancel --menu \"Selecctiona la particion home (/home)\" 0 0 5 $varx"
+				particionhome=`bash -c "$varf"`
+				
+				if [[ $particionhome ]];then
+					optfh=`dialog --stdout --nocancel --menu "Formato para la particion home (/home)" 0 0 4 1 "EXT4 (Recomendado)" 2 "BTRFS" 3 "XFS" 4 "No formatear (Si ya esta formateada)"`
+					case $optfh in
+						1) formatohome="mkfs.ext4 -F";;
+						2) formatohome="mkfs.btrfs -f";;
+						3) formatohome="mkfs.xfs -f";;
+						4) formatohome="echo No formatear ";;
+					esac
+				fi
+				;;
+		esac
+		
+		if [[ $formatoraiz -eq "mkfs.btrfs -f" ]];then
+			mostrardialog "No swapfile" "Es contraproducente hacer un fichero swap en una particion btrfs, no debes hacerlo, pero si antes creaste una particion swap, se puede utilizar"
+		fi
+		ram=$(free -m | grep Mem: | awk '1 {print $2 }')
+		optswap=`dialog --stdout --nocancel --menu "¿Quieres crear un archivo swap (Memoria virtual)?" 0 0 4 1 "Si (Con valores por defecto, recomendado)" 2 "Si (Valores a mano)" 3 "Si, pero con una particion que ya cree" 4 "No"`
+		case $optswap in
+			1)
+				# This count the ammount of swap to create dependent of computer RAM
+				if [[ $ram -le 7500 ]];then
+					swaptype=1
+					swapamount=$(expr $ram / 3)
+					if [[ $ram -le 3700 ]];then
+						swapamount=$(expr $swapamount \* 2)
+					fi
+					if [[ $ram -le 1500 ]];then
+						swapamount=$(expr $swapamount \* 2)
+					fi
+					if [[ $ram -le 700 ]];then
+						swapamount=$(expr $swapamount \* 2)
+					fi
+				else
+					# No es que sea necesario, pero como ha pulsado en si, se crea un archivo minimo"
+					swaptype=1
+					swapamount="512"
+				fi
+				;;
+			2)	swapamount=`dialog --stdout --inputbox  "RAM: $(echo $ram) . $(T "Enter how much memory you want to use for swap (MB)")" 9 50`;;
+			3)	mostrardialog "Swap" "$(T "JKArch autodetects swap partitions")";;
+		esac
 
-	opthpart=`dialog --stdout --nocancel --menu "¿Quieres separar la particion /home de /?" 0 0 4 1 "No (Por defecto)" 2 "Si (Tendras que elegir la particion)"`
-	case $opthpart in
-		2)
-			#Selección de home
+		clear
+
+
+		if [[ $tabletype = "gpt" ]];then
+		
+			# Seleccion de particion EFI
 			variable=$(lsblk --output KNAME /dev/${hd} | cut -c1-4 | tail -n +3)
 			i=3
 			varx=""
@@ -232,477 +301,485 @@ if [[ ! $optpa -eq 3 ]];then
 				varx+=" $addr '$(lsblk --output KNAME,FSTYPE,SIZE,LABEL /dev/${hd} | tail -n +$i | head -1)'"
 				i=$((i+1))
 			done
-			varf="dialog --stdout --nocancel --menu \"Selecctiona la particion home (/home)\" 0 0 5 $varx"
-			particionhome=`bash -c "$varf"`
-			
-			if [[ $particionhome ]];then
-				optfh=`dialog --stdout --nocancel --menu "Formato para la particion home (/home)" 0 0 4 1 "EXT4 (Recomendado)" 2 "BTRFS" 3 "XFS" 4 "No formatear (Si ya esta formateada)"`
-				case $optfh in
-					1)
-						formatohome="mkfs.ext4 -F";;
-					2)
-						formatohome="mkfs.btrfs -f";;
-					3)
-						formatohome="mkfs.xfs -f";;
-					4)
-						formatohome="echo No formatear ";;
-				esac
-			fi
-			;;
-	esac
-	
-	if [[ $formatoraiz -eq "mkfs.btrfs -f" ]];then
-		mostrardialog "No swapfile" "Es contraproducente hacer un fichero swap en una particion btrfs, no debes hacerlo, pero si antes creaste una particion swap, se puede utilizar"
-	fi
-	ram=$(free -m | grep Mem: | awk '1 {print $2 }')
-	optswap=`dialog --stdout --nocancel --menu "¿Quieres crear un archivo swap (Memoria virtual)?" 0 0 4 1 "Si (Con valores por defecto, recomendado)" 2 "Si (Valores a mano)" 3 "Si, pero con una particion que ya cree" 4 "No"`
-	case $optswap in
-		1)
-			if [[ $ram -le 7500 ]];then
-				swaptype=1
-				swapamount=$(expr $ram / 3)
-				if [[ $ram -le 3700 ]];then
-					swapamount=$(expr $swapamount \* 2)
-				fi
-				if [[ $ram -le 1500 ]];then
-					swapamount=$(expr $swapamount \* 2)
-				fi
-				if [[ $ram -le 700 ]];then
-					swapamount=$(expr $swapamount \* 2)
-				fi
-			else
-				#No es que sea necesario, pero como ha pulsado en si, se crea un archivo minimo"
-				swaptype=1
-				swapamount="512"
-			fi
-			;;
-		2)	swapamount=`dialog --stdout --inputbox  "RAM: $(echo $ram) . $(T "Enter how much memory you want to use for swap (MB)")" 9 50`;;
-		3)	mostrardialog "Swap" "$(T "JKArch autodetects swap partitions")";;
-	esac
+			varf="dialog --stdout --nocancel --menu \"$(T 'Select EFI partition')\" 0 0 5 $varx"
+			partefi=`bash -c "$varf"`
+		fi
 
+	fi
+}
+
+## Date and language
+function horaidioma {
+	while [[ $confirm != "Y" ]];do
+		varx="" #Empty var
+		langs=$(cat /etc/locale.gen | grep '^#[a-zA-Z]' | cut -f1 -d" " | cut -c2-30 | sort | uniq)
+		for addr in $(echo $langs | tr " " "\n")
+		do
+			varx+=" $addr $addr"
+		done
+		varf="dialog --stdout --nocancel --menu \"$(T "Select language for JKArch")\" 0 0 5 $varx"
+		opclang=`bash -c "$varf"`
+		varx="" #Empty varx
+		langabr=$(echo $opclang | cut -f1 -d"_")
+
+		langinst=$(cat /etc/locale.gen | grep -m1 '^#'$opclang | cut -c2-40)
+		
+		#Confirm
+		confirm=`yesnobox "$(T "Your language:") $opclang. Correcto?"`
+	done #End of selecting lang
+	confirm="" #Erase var
+	
+	echo "$(T "Now select your timezone for adjusting the clock")"
+	while [[ $confirm != "Y" ]];do
+	NEW_TIMEZONE=$(execl tzselect)
+	confirm=`yesnobox "$(T "Your timezone is") $NEW_TIMEZONE ?"`
+	done
+	confirm="" #Erase var
+}
+
+##Function for make user select their user
+function userpass {
 	clear
 
+	nameuser=`dialog --stdout --inputbox  "Nombre para tu usuario principal:" 10 50`
 
-	if [[ $tabletype = "gpt" ]];then
-		lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL
-		tput setaf 6 ; echo "$(T "Select EFI partition")" ; tput setaf 9
-		options=($(lsblk --output KNAME | sed '1d' | grep 'sd\|hd' | grep '[1-9]$'))
-		select opt in "${options[@]}"
-		do
-			case $opt in
-			*) 
-				if [[ -z $opt ]];then
-					echo "$(T "Not valid")"
-				else
-					partefi=$opt
-					break
-				fi;;
-			esac
-		done	
-	fi
+	until [[ $pass1 = $pass2 && $pass1 != "" ]]
+	do
+		pass1=`dialog --stdout --insecure --passwordbox  "$(T "Password for ") $nameuser" 9 50`
+		pass2=`dialog --stdout --insecure --passwordbox  "$(T "Repeat password")" 9 50`
+		if ! [[  $pass1 = $pass2 && $pass1 != "" ]];then
+			mostrardialog "$(T "Password")" "$(T "Passwords do not match")"
+		fi
+	done
+	passuser=${pass1}
+	pass1="" #Reiniciar pass1, por si hace falta de nuevo que el until funcione
 
-fi
-#fin del if de pedir los datos si no esta en automatico
-}
 
-### Base install of the system ###
-function baseinstall {
-clear
-tput setaf 2 ; echo "$(T "Installing system, this can take about 10 minutes, wait")" ; tput setaf 9
-sleep 2
-tput setaf 2 ; echo "$(T "Formatting and mounting partitions")" ; tput setaf 9
-execl $formatoraiz /dev/$particionraiz
-e2label /dev/$particionraiz "JKArch"
-execl mount /dev/$particionraiz /mnt/
-if [[ $particionhome ]];then
-execl $formatohome /dev/$particionhome
-mkdir -p /mnt/home/
-execl mount /dev/$particionhome /mnt/home/
-fi
-if [[ $partefi ]];then
-mkdir -p /mnt/boot/efi
-execl mount /dev/$partefi /mnt/boot/efi/
-fi
-if [[ $isoffline = "0" ]];then
-	wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/pacman.conf -O pacman.conf
-	isanetworkerror #Comprueba si hubo un error de descarga
-	tput setaf 2 ; echo "$(T "Optimizing download")" ; tput setaf 9
-	execl reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist
-	tput setaf 2 ; echo "$(T "Downloading")" ; tput setaf 9
-	execl pacman -Sy archlinux-keyring --noconfirm #Keyring update before download
-	execl pacstrap -C pacman.conf /mnt/ base btrfs-progs jkarch-mirrorlist
-	pacmanerror
-	mv pacman.conf /mnt/etc/pacman.conf
-fi
-if [[ $isoffline = "1" ]];then
-	tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9
-	execl pacstrap -C pacman-offline.conf /mnt/ base btrfs-progs jkarch-mirrorlist
-	mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location
-fi
-
-#Create fstab
-genfstab -U /mnt > /mnt/etc/fstab
-#Create or activate swap if neccesary
-if [[ $swaptype ]];then
-	case $swaptype in
-		1)
-			echo "$(T "Creating swap file")"
-			dd if=/dev/zero of=/mnt/swapfile bs=1M count=$swapamount
-			chmod 600 /mnt/swapfile
-			mkswap /mnt/swapfile
-			echo "/swapfile none swap defaults 0 0" >> /mnt/etc/fstab
+	#See if user wants to edit root password or not.
+	opt=`dialog --stdout --nocancel --menu "$(T "You want to edit root (admin) password or set same as user?")" 0 0 4 1 "$(T "Same as user")" 2 "$(T "Edit")"`
+	case $opt in
+		1) passroot=${pass2};;
+		2) until [[ $pass1 = $pass2 && $pass1 != "" ]]
+			do
+				pass1=`dialog --stdout --insecure --passwordbox  "$(T "Password for ") . root" 9 50`
+				pass2=`dialog --stdout --insecure --passwordbox  "$(T "Repeat password")" 9 50`
+				if ! [[  $pass1 = $pass2 && $pass1 != "" ]];then
+					mostrardialog "$(T "Password")" "$(T "Passwords do not match")"
+				fi
+			done
+			passroot=${pass2}
+			pass1="" #Reiniciar pass1, por si hace falta de nuevo que el until funcione
 			;;
 	esac
-fi
-
-if [[ $isoffline = 0 ]];then
-	cp -r /etc/netctl/* /mnt/etc/netctl/
-	cp -f /etc/resolv.conf /mnt/etc/resolv.conf
-fi
-mount --bind /sys /mnt/sys
-mount --bind /proc /mnt/proc
-mount --bind /dev /mnt/dev
-mount --bind /run /mnt/run
-if [[ $isoffline = 1 ]];then
-	mount --bind /run/archiso/bootmnt/ /mnt/run/archiso/bootmnt/ # CD bind
-fi
-
-execl chroot pacman -Syu jka-toolkit git wget netctl iw wpa_supplicant reflector dialog sudo alsa-utils dosfstools ntfs-3g bash-completion --noconfirm --needed #Install base packages , reflector is for updating mirrorlist
-}
-
-### Date and language ###
-function horaidioma {
-while [[ $opclang == "" ]];do
-varx="" #Empty var
-langs=$(cat /mnt/etc/locale.gen | grep '^#[a-zA-Z]' | cut -f1 -d" " | cut -c2-30 | sort | uniq)
-for addr in $(echo $langs | tr " " "\n")
-do
-	varx+=" $addr $addr"
-done
-varf="dialog --stdout --nocancel --menu \"$(T "Select language for JKArch")\" 0 0 5 $varx"
-opclang=`bash -c "$varf"`
-varx="" #Empty varx
-langabr=$(echo $opclang | cut -f1 -d"_")
-
-langinst=$(cat /mnt/etc/locale.gen | grep -m1 '^#'$opclang | cut -c2-40)
-opt=`dialog --stdout --nocancel --menu "$(T "Your language:") $opclang" 0 0 4 1 "$(T "It's right")" 2 "$(T "No,edit")"`
-case $opt in
-	2) opclang="";;
-esac
-
-done #End of selecting lang
-
-sed -i "s/\#$langinst/$langinst/g" /mnt/etc/locale.gen
-echo "LANG=$opclang" > /mnt/etc/locale.conf
-echo "LANGUAGE=$opclang" >> /mnt/etc/locale.conf
-echo "LC_COLLATE=$opclang" >> /mnt/etc/locale.conf
-echo "KEYMAP=$langabr" > /mnt/etc/vconsole.conf
-execl chroot locale-gen
-clear
-echo "$(T "Now select your timezone for adjusting the clock")"
-while [[ $NEW_TIMEZONE == "" ]];do
-NEW_TIMEZONE=$(execl chroot tzselect)
-opt=`dialog --stdout --nocancel --menu "$(T "Your timezone:") $NEW_TIMEZONE" 0 0 4 1 "$(T "It's right")" 2 "$(T "No,edit")"`
-case $opt in
-	2) NEW_TIMEZONE="";;
-esac
-done
-
-test -n "$NEW_TIMEZONE" && cp -fp /mnt/usr/share/zoneinfo/"$NEW_TIMEZONE" /mnt/etc/localtime
-execl chroot hwclock --systohc --utc
-execl chroot pacman -S ntp --noconfirm
-execl chroot systemctl enable ntpd
-if [[ $isoffline = 0 ]];then #Only sync if its online
-echo "$(T "Syncing hour to internet")";
-execl chroot ntpd -qg
-execl chroot hwclock -w
-else
-echo "Clock will not be okay until restart and configure manually because you dont have net"
-fi
-}
-
-
-function userpass {
-if [[ $isoffline = 1 ]];then # Is an offline installation?
-tar xJf mods/skel.tar.xz -C /mnt/
-else #online
-wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.xz -O- | tar xJf - -C /mnt/
-fi
-
-clear
-#Aqui hay que añadir los comandos para crear un usuario, aunque esto correrá dentro del chroot y no aqui
-nameuser=`dialog --stdout --inputbox  "Ahora crearemos tu usuario \nNombre para tu usuario:" 10 50`
-execl chroot useradd -m -G wheel -s /bin/bash $nameuser
-until [[ $pass1 = $pass2 && $pass1 != "" ]]
-do
-	pass1=`dialog --stdout --insecure --passwordbox  "$(T "Password for ") $nameuser" 9 50`
-	pass2=`dialog --stdout --insecure --passwordbox  "$(T "Repeat password")" 9 50`
-	if ! [[  $pass1 = $pass2 && $pass1 != "" ]];then
-		mostrardialog "$(T "Password")" "$(T "Passwords do not match")"
-	fi
-done
-echo "${nameuser}:${pass1}" | execl chroot chpasswd
-pass1="" #Reiniciar pass1, por si hace falta de nuevo que el until funcione
-
-#For some strange login bugs
-echo "Cambio de permisos por si se quedaron mal en algún momento"
-execl chroot chmod 755 /
-execl chroot chmod 755 /bin
-#
-
-#See if user wants to edit root password or not.
-opt=`dialog --stdout --nocancel --menu "$(T "You want to edit root (admin) password or set same as user?")" 0 0 4 1 "$(T "Same as user")" 2 "$(T "Edit")"`
-case $opt in
-	1) echo "root:${pass2}" | execl chroot chpasswd;;
-	2) until [[ $pass1 = $pass2 && $pass1 != "" ]]
-		do
-			pass1=`dialog --stdout --insecure --passwordbox  "$(T "Password for ") . root" 9 50`
-			pass2=`dialog --stdout --insecure --passwordbox  "$(T "Repeat password")" 9 50`
-			if ! [[  $pass1 = $pass2 && $pass1 != "" ]];then
-				mostrardialog "$(T "Password")" "$(T "Passwords do not match")"
-			fi
-		done
-		echo "root:${pass1}" | execl chroot chpasswd
-		pass1="" #Reiniciar pass1, por si hace falta de nuevo que el until funcione
-		;;
-esac
-
-#Añadir soporte sudo para este nuevo usuario
-sed -i "s/\# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" /mnt/etc/sudoers
-
 }
 
+##User graphics select
 function graficos {
-optgrafica=`dialog --stdout --nocancel --scrollbar --menu "$(T "What is your graphics card brand?")" 0 0 6 1 "Nvidia" 2 "AMD/ATI" 3 "Intel" 4 "VIA" 5 "Estoy usando VirtualBox" 6 "Estoy usando VMWare" 7 "No se la marca/Otra (Se instalaran todos los drivers graficos estandar)"`
+	optgrafica=`dialog --stdout --nocancel --scrollbar --menu "$(T "What is your graphics card brand?")" 0 0 6 1 "Nvidia" 2 "AMD/ATI" 3 "Intel" 4 "VIA" 5 "Estoy usando VirtualBox" 6 "Estoy usando VMWare" 7 "No se la marca/Otra (Se instalaran todos los drivers graficos estandar)"`
 
-case $optgrafica in
-	1) execl chroot pacman -S xf86-video-nouveau libva-vdpau-driver mesa-vdpau --noconfirm;;
-	2) execl chroot pacman -S xf86-video-ati xf86-video-amdgpu libva-mesa-driver libva-vdpau-driver mesa-vdpau --noconfirm;;
-	3) execl chroot pacman -S xf86-video-intel libva-intel-driver libvdpau-va-gl --noconfirm;;
-	4) execl chroot pacman -S xf86-video-openchrome --noconfirm;;
-	5) execl chroot pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --noconfirm;;
-	6) execl chroot pacman -S xf86-video-vmware xf86-input-vmmouse open-vm-tools --noconfirm;;
-	7) execl chroot pacman -S $(execl chroot pacman -Ssq xf86-video-*) --noconfirm;;
-esac
-#Instalar siempre la estandar, por se acaso
-execl chroot pacman -S xf86-video-vesa mesa-libgl --noconfirm
+	case $optgrafica in
+		1) allpackages=$allpackages" xf86-video-nouveau libva-vdpau-driver mesa-vdpau";;
+		2) allpackages=$allpackages" xf86-video-ati xf86-video-amdgpu libva-mesa-driver libva-vdpau-driver mesa-vdpau";;
+		3) allpackages=$allpackages" xf86-video-intel libva-intel-driver libvdpau-va-gl";;
+		4) allpackages=$allpackages" xf86-video-openchrome";;
+		5) allpackages=$allpackages" virtualbox-guest-utils virtualbox-guest-modules-arch";;
+		6) allpackages=$allpackages" xf86-video-vmware xf86-input-vmmouse open-vm-tools";;
+		7) allpackages=$allpackages" "$(execl chroot pacman -Ssq xf86-video-*);;
+	esac
+
+	#Instalar siempre la estandar, por se acaso
+	allpackages=$allpackages" xf86-video-vesa mesa-libgl"
 }
 
+##Interactive function for make user select programs
 function programasguiuser {
-clear
-#Seleccion de programas predeterminados
-opt1="1 6"
-opt2="1 5"
-opt3="1"
-opt5="1 2"
-opt6="1 2 3 4 5 6"
-mostrardialog "Leer" "Ahora se le presenta la opcion de elegir que programas quieres que sean instalados, cosa que recomendamos, aunque, dejamos tambien una opcion rapida, que instalara lo basico y recomendado desde nuestro punto de vista."
-tipoinstall=`dialog --stdout --nocancel --menu "¿Elegir los programas que quiere?" 0 0 5 1 "Si, elegir (Muy recomendado)" 2 "No, instalar preseleccion de programas (Opcion rapida)" 3 "No, no instalar ninguno (Solo tendras el entorno y poco más)"`
-case $tipoinstall in
-	1)
-		until [[ $surep -eq 1 ]]
-		do
-		optprogramas=`dialog --stdout --nocancel --scrollbar --menu "Categorías" 0 0 11 1 "Navegadores web ($(echo $opt1 | wc -w) seleccionados)" 2 "Editores de texto y Office ($(echo $opt2 | wc -w) seleccionados)" 3 "Audio y Video ($(echo $opt3 | wc -w) seleccionados)" 4 "Editores de imagen ($(echo $opt4 | wc -w) seleccionado)" 5 "Fuentes/Tipos de letra ($(echo $opt5 | wc -w) seleccionado)" 6 "Utilidades basicas ($(echo $opt6 | wc -w) seleccionado)" 7 "Soportes (Impresoras,Bluetooth...) ($(echo $opt7 | wc -w) seleccionado)" 8 "Utilidades varias ($(echo $opt8 | wc -w) seleccionado)" 9 "Programacion (IDEs) ($(echo $opt9 | wc -w) seleccionado)" A "Programacion (programas) ($(echo $optA | wc -w) seleccionado)" I "Instalar"`
-		#Menu con cada una de las categorias
-		case $optprogramas in
-			# La variable optstate "$optX" Y es una funcion que devuelve on o off, para mostrar la ultima seleccion bien
-			1)	opt1=`dialog --stdout --checklist "Navegadores web" 0 0 6 1 "Firefox" $(optstate "$opt1" 1) 2 "Chrome" $(optstate "$opt1" 2) 3 "Chromium" $(optstate "$opt1" 3) 4 "Opera" $(optstate "$opt1" 4) 5 "Otter Browser" $(optstate "$opt1" 5) 6 "Soporte Flash Player" $(optstate "$opt1" 6)`;;
-			2)	opt2=`dialog --stdout --scrollbar --checklist "Editores de texto y Office" 0 0 7 1 "Libreoffice (Recomendado)" $(optstate "$opt2" 1) 2 "AbiWord" $(optstate "$opt2" 2) 3 "Gnumeric" $(optstate "$opt2" 3) 4 "WPS Office" $(optstate "$opt2" 4) 5 "leafpad (Bloc de notas)" $(optstate "$opt2" 5) 6 "gedit" $(optstate "$opt2" 6) 7 "notepadqq" $(optstate "$opt2" 7)`;;
-			3)	opt3=`dialog --stdout --checklist "Audio y Video" 0 0 6 1 "VLC (Recomendado)" $(optstate "$opt3" 1) 2 "SMPlayer" $(optstate "$opt3" 2) 3 "Totem" $(optstate "$opt3" 3) 4 "Clementine" $(optstate "$opt3" 4)`;;
-			4)	opt4=`dialog --stdout --checklist "Imagen" 0 0 6 1 "GIMP" $(optstate "$opt4" 1) 2 "Inkscape" $(optstate "$opt4" 2) 3 "Pinta" $(optstate "$opt4" 3) 4 "Krita (Dibujo)" $(optstate "$opt4" 4)`;;
-			5)	opt5=`dialog --stdout --checklist "Fuentes/Tipos de letra" 0 0 6 1 "Fuentes basicas (Noto,devaju,liberation..)" $(optstate "$opt5" 1) 2 "Microsoft Fonts" $(optstate "$opt5" 2) 3 "Recopilatorio de fuentes de Google (mas de 300)" $(optstate "$opt5" 3)`;;
-			6)	opt6=`dialog --stdout --checklist "Recomendado pulsar todos \nUtilidades basicas" 0 0 6 1 "Evince (Lector PDF)" $(optstate "$opt6" 1) 2 "Ristretto (imagenes jpg,png...)" $(optstate "$opt6" 2) 3 "Cacluladora" $(optstate "$opt6" 3) 4 "Montar ISO/IMG" $(optstate "$opt6" 4) 5 "(Des)compresor de archivos (ZIP,RAR...)" $(optstate "$opt6" 5) 6 "Miniaturas mejoradas de ficheros" $(optstate "$opt6" 6)`;;
-			7)	opt7=`dialog --stdout --checklist "Soportes (Impresoras,Bluetooth...)" 0 0 6 1 "CUPS (Soporte impresoras)" $(optstate "$opt7" 1) 2 "HPLIP (Soporte impresoras HP)" $(optstate "$opt7" 2) 3 "Bluetooth" $(optstate "$opt7" 3)`;;
-			8)	opt8=`dialog --stdout --scrollbar --checklist "Utilidades varias" 0 0 8 1 "Dropbox" $(optstate "$opt8" 1) 2 "MEGA" $(optstate "$opt8" 2) 3 "Visor de correo Evolution" $(optstate "$opt8" 3) 4 "Grabador de discos (k3b)" $(optstate "$opt8" 4) 5 "Java (jre8)" $(optstate "$opt8" 5) 6 "Wine ('Emulador' de programas de Windows)" $(optstate "$opt8" 6) 7 "BleachBit (Limpiador de disco duro)" $(optstate "$opt8" 7)`;;
-			9)	opt9=`dialog --stdout --scrollbar --checklist "Programacion (IDEs)" 0 0 8 1 "Sublime Text 3" $(optstate "$opt9" 1) 2 "Sublime Text 2" $(optstate "$opt9" 2) 3 "Visual Studio Code" $(optstate "$opt9" 3) 4 "Eclipse" $(optstate "$opt9" 4) 5 "Monodevelop" $(optstate "$opt9" 5) 6 "Brackets" $(optstate "$opt9" 6) 7 "Atom" $(optstate "$opt9" 7) 8 "Gamedevelop" $(optstate "$opt9" 8) 9 "Poedit (gettext)" $(optstate "$opt9" 9) A "Arduino IDE" $(optstate "$opt9" A)`;;
-			"A")	optA=`dialog --stdout --checklist "Programacion (Programas)" 0 0 6 1 "base-devel (standard utils like GCC)" $(optstate "$optA" 1) 2 "Java (OpenJDK 8)" $(optstate "$optA" 2)`;;
-	"I")
-				#Instalar
-				surep=1
-				break;;
+	clear
+	# Default selected apps
+	opt1="1 6"
+	opt2="1 5"
+	opt3="1"
+	opt5="1 2"
+	opt6="1 2 3 4 5 6"
+	mostrardialog "Leer" "Ahora se le presenta la opcion de elegir que programas quieres que sean instalados, cosa que recomendamos, aunque, dejamos tambien una opcion rapida, que instalara lo basico y recomendado desde nuestro punto de vista."
+	tipoinstall=`dialog --stdout --nocancel --menu "¿Elegir los programas que quiere?" 0 0 5 1 "Si, elegir (Muy recomendado)" 2 "No, instalar preseleccion de programas (Opcion rapida)" 3 "No, no instalar ninguno (Solo tendras el entorno y poco más)"`
+	case $tipoinstall in
+		1)
+			until [[ $surep -eq 1 ]]
+			do
+			optprogramas=`dialog --stdout --nocancel --scrollbar --menu "Categorías" 0 0 11 1 "Navegadores web ($(echo $opt1 | wc -w) seleccionados)" 2 "Editores de texto y Office ($(echo $opt2 | wc -w) seleccionados)" 3 "Audio y Video ($(echo $opt3 | wc -w) seleccionados)" 4 "Editores de imagen ($(echo $opt4 | wc -w) seleccionado)" 5 "Fuentes/Tipos de letra ($(echo $opt5 | wc -w) seleccionado)" 6 "Utilidades basicas ($(echo $opt6 | wc -w) seleccionado)" 7 "Soportes (Impresoras,Bluetooth...) ($(echo $opt7 | wc -w) seleccionado)" 8 "Utilidades varias ($(echo $opt8 | wc -w) seleccionado)" 9 "Programacion (IDEs) ($(echo $opt9 | wc -w) seleccionado)" A "Programacion (programas) ($(echo $optA | wc -w) seleccionado)" I "Instalar"`
+			#Menu con cada una de las categorias
+			case $optprogramas in
+				# La variable optstate "$optX" Y es una funcion que devuelve on o off, para mostrar la ultima seleccion bien
+				1)	opt1=`dialog --stdout --checklist "Navegadores web" 0 0 6 1 "Firefox" $(optstate "$opt1" 1) 2 "Chrome" $(optstate "$opt1" 2) 3 "Chromium" $(optstate "$opt1" 3) 4 "Opera" $(optstate "$opt1" 4) 5 "Otter Browser" $(optstate "$opt1" 5) 6 "Soporte Flash Player" $(optstate "$opt1" 6)`;;
+				2)	opt2=`dialog --stdout --scrollbar --checklist "Editores de texto y Office" 0 0 7 1 "Libreoffice (Recomendado)" $(optstate "$opt2" 1) 2 "AbiWord" $(optstate "$opt2" 2) 3 "Gnumeric" $(optstate "$opt2" 3) 4 "WPS Office" $(optstate "$opt2" 4) 5 "leafpad (Bloc de notas)" $(optstate "$opt2" 5) 6 "gedit" $(optstate "$opt2" 6) 7 "notepadqq" $(optstate "$opt2" 7)`;;
+				3)	opt3=`dialog --stdout --checklist "Audio y Video" 0 0 6 1 "VLC (Recomendado)" $(optstate "$opt3" 1) 2 "SMPlayer" $(optstate "$opt3" 2) 3 "Totem" $(optstate "$opt3" 3) 4 "Clementine" $(optstate "$opt3" 4)`;;
+				4)	opt4=`dialog --stdout --checklist "Imagen" 0 0 6 1 "GIMP" $(optstate "$opt4" 1) 2 "Inkscape" $(optstate "$opt4" 2) 3 "Pinta" $(optstate "$opt4" 3) 4 "Krita (Dibujo)" $(optstate "$opt4" 4)`;;
+				5)	opt5=`dialog --stdout --checklist "Fuentes/Tipos de letra" 0 0 6 1 "Fuentes basicas (Noto,devaju,liberation..)" $(optstate "$opt5" 1) 2 "Microsoft Fonts" $(optstate "$opt5" 2) 3 "Recopilatorio de fuentes de Google (mas de 300)" $(optstate "$opt5" 3)`;;
+				6)	opt6=`dialog --stdout --checklist "Recomendado pulsar todos \nUtilidades basicas" 0 0 6 1 "Evince (Lector PDF)" $(optstate "$opt6" 1) 2 "Ristretto (imagenes jpg,png...)" $(optstate "$opt6" 2) 3 "Cacluladora" $(optstate "$opt6" 3) 4 "Montar ISO/IMG" $(optstate "$opt6" 4) 5 "(Des)compresor de archivos (ZIP,RAR...)" $(optstate "$opt6" 5) 6 "Miniaturas mejoradas de ficheros" $(optstate "$opt6" 6)`;;
+				7)	opt7=`dialog --stdout --checklist "Soportes (Impresoras,Bluetooth...)" 0 0 6 1 "CUPS (Soporte impresoras)" $(optstate "$opt7" 1) 2 "HPLIP (Soporte impresoras HP)" $(optstate "$opt7" 2) 3 "Bluetooth" $(optstate "$opt7" 3)`;;
+				8)	opt8=`dialog --stdout --scrollbar --checklist "Utilidades varias" 0 0 8 1 "Dropbox" $(optstate "$opt8" 1) 2 "MEGA" $(optstate "$opt8" 2) 3 "Visor de correo Evolution" $(optstate "$opt8" 3) 4 "Grabador de discos (k3b)" $(optstate "$opt8" 4) 5 "Java (jre8)" $(optstate "$opt8" 5) 6 "Wine ('Emulador' de programas de Windows)" $(optstate "$opt8" 6) 7 "BleachBit (Limpiador de disco duro)" $(optstate "$opt8" 7)`;;
+				9)	opt9=`dialog --stdout --scrollbar --checklist "Programacion (IDEs)" 0 0 8 1 "Sublime Text 3" $(optstate "$opt9" 1) 2 "Sublime Text 2" $(optstate "$opt9" 2) 3 "Visual Studio Code" $(optstate "$opt9" 3) 4 "Eclipse" $(optstate "$opt9" 4) 5 "Monodevelop" $(optstate "$opt9" 5) 6 "Brackets" $(optstate "$opt9" 6) 7 "Atom" $(optstate "$opt9" 7) 8 "Gamedevelop" $(optstate "$opt9" 8) 9 "Poedit (gettext)" $(optstate "$opt9" 9) A "Arduino IDE" $(optstate "$opt9" A)`;;
+				"A")	optA=`dialog --stdout --checklist "Programacion (Programas)" 0 0 6 1 "base-devel (standard utils like GCC)" $(optstate "$optA" 1) 2 "Java (OpenJDK 8)" $(optstate "$optA" 2)`;;
+		"I")
+					#Instalar
+					surep=1
+					break;;
+			esac
+			done
+			;;
+		2) mostrardialog "Programas predeterminados" "Se instalaran los programas predeterminados";;
+		3) mostrardialog "Ningun programa" "No se instalara ningun programa opcional."
+			nooptprogs="1" # Not install anything
+			;;
+	esac
+
+	if [[ $nooptprogs != "1" ]];then
+		packages="" #Erase var before
+		case $opt1 in
+			*1*)	packages="firefox";;&
+			*2*)	packages="$packages google-chrome";;&
+			*3*)	packages="$packages chromium";;&
+			*4*)	packages="$packages opera";;&
+			*5*)	packages="$packages otter-browser";;&
+			*6*)	packages="$packages flashplugin";;&
 		esac
-		done
-		;;
-	2) mostrardialog "Programas predeterminados" "Ahora se van a instalar los programas predeterminados, espere";;
-	3) mostrardialog "Ningun programa" "No se instalara ningun programa opcional."
-		nooptprogs="1" # Not install anything
-		;;
-esac
-
-if [[ $nooptprogs != "1" ]];then
-	packages="" #Erase var before
-	case $opt1 in
-		*1*)	packages="firefox";;&
-		*2*)	packages="$packages google-chrome";;&
-		*3*)	packages="$packages chromium";;&
-		*4*)	packages="$packages opera";;&
-		*5*)	packages="$packages otter-browser";;&
-		*6*)	packages="$packages flashplugin";;&
-	esac
-	case $opt2 in
-		*1*)	packages="$packages libreoffice-fresh";;&
-		*2*)	packages="$packages abiword";;&
-		*3*)	packages="$packages gnumeric";;&
-		*4*)	packages="$packages wps-office";;&
-		*5*)	packages="$packages leafpad";;&
-		*6*)	packages="$packages gedit";;&
-		*7*)	packages="$packages notepadqq";;&
-	esac
-	case $opt3 in
-		*1*)	packages="$packages vlc qt4";;&
-		*2*)	packages="$packages smplayer";;&
-		*3*)	packages="$packages totem";;&
-		*4*)	packages="$packages clementine";;&
-	esac
-	case $opt4 in
-		*1*)	packages="$packages gimp";;&
-		*2*)	packages="$packages inkscape";;&
-		*3*)	packages="$packages pinta";;&
-		*4*)	packages="$packages krita";;&
-	esac
-	case $opt5 in
-		*1*)	packages="$packages noto-fonts noto-fonts-cjk noto-fonts-emoji ttf-dejavu ttf-liberation";;&
-		*2*)	packages="$packages ttf-ms-fonts";;&
-		*3*)	packages="$packages ttf-google-fonts-git"
-				#Delete (Package per line) possible packages that conficts with ttf-google-fonts-git
-                execl chroot pacman -Rdd noto-fonts --noconfirm
-				execl chroot pacman -Rdd ttf-inconsolata --noconfirm #This is because ttf-google-fonts provides noto-fonts (But not noto-fonts-cjk neither noto-fonts-emoji
-				;;&
-	esac
-	case $opt6 in
-		*1*)	packages="$packages evince";;&
-		*2*)	packages="$packages ristretto librsvg";;&
-		*3*)	packages="$packages gnome-calculator";;&
-		*4*)	packages="$packages gnome-disk-utility";;&
-		*5*)	packages="$packages file-roller lrzip p7zip unace unrar";;&
-		*6*)	packages="$packages tumbler poppler-glib ffmpegthumbnailer libgsf";;&
-	esac
-	case $opt7 in
-		*1*)	packages="$packages cups cups-filters";;&
-		*2*)	packages="$packages hplip";;&
-		*3*)	packages="$packages bluez bluez-utils bluez-cups bluez-firmware bluez-libs blueberry";;&
-	esac
-	case $opt8 in
-		*1*)	packages="$packages dropbox";;&
-		*2*)	packages="$packages megasync";;&
-		*3*)	packages="$packages geary";;&
-		*4*)	packages="$packages k3b";;&
-		*5*)	packages="$packages jre8-openjdk";;&
-		*6*)	packages="$packages wine-staging wine_gecko winetricks"
-				packages="$packages lib32-libpng lib32-libldap lib32-gnutls lib32-mpg123 lib32-libpulse lib32-ncurses lib32-openal lib32-alsa-lib lib32-gst-plugins-base-libs" #Some 32bit libs for winearch 32 work better
-					inswine=1;;&
-		*7*)	packages="$packages bleachbit";;&
-	esac
-	case $opt9 in
-		*1*)	packages="$packages sublime-text-dev";;&
-		*2*)	packages="$packages sublime-text";;&
-		*3*)	packages="$packages visual-studio-code";;&
-		*4*)	packages="$packages jdk8-openjdk eclipse-java";;&
-		*5*)	packages="$packages monodevelop";;&
-		*6*)	packages="$packages brackets";;&
-		*7*)	packages="$packages atom-editor-bin";;&
-		*8*)	packages="$packages gdevelop";;&
-		*9*)	packages="$packages poedit";;&
-		*A*)	packages="$packages arduino";;&
-	esac
-	case $optA in
-		*1*)	packages="$packages base-devel";;&
-		*2*)	packages="$packages jdk8-openjdk";;&
-	esac
-	execl chroot pacman -S $packages --noconfirm --needed
-	if [[ $inswine = 1 ]];then
-		echo "$(T "Configuring wine for better experience") (32 bit winearch)"
-		execl chuser WINEARCH=win32 wineboot -u
+		case $opt2 in
+			*1*)	packages="$packages libreoffice-fresh";;&
+			*2*)	packages="$packages abiword";;&
+			*3*)	packages="$packages gnumeric";;&
+			*4*)	packages="$packages wps-office";;&
+			*5*)	packages="$packages leafpad";;&
+			*6*)	packages="$packages gedit";;&
+			*7*)	packages="$packages notepadqq";;&
+		esac
+		case $opt3 in
+			*1*)	packages="$packages vlc qt4";;&
+			*2*)	packages="$packages smplayer";;&
+			*3*)	packages="$packages totem";;&
+			*4*)	packages="$packages clementine";;&
+		esac
+		case $opt4 in
+			*1*)	packages="$packages gimp";;&
+			*2*)	packages="$packages inkscape";;&
+			*3*)	packages="$packages pinta";;&
+			*4*)	packages="$packages krita";;&
+		esac
+		case $opt5 in
+			*1*)	packages="$packages noto-fonts noto-fonts-cjk noto-fonts-emoji ttf-dejavu ttf-liberation";;&
+			*2*)	packages="$packages ttf-ms-fonts";;&
+			*3*)	packages="$packages ttf-google-fonts-git"
+					;;&
+		esac
+		case $opt6 in
+			*1*)	packages="$packages evince";;&
+			*2*)	packages="$packages ristretto librsvg";;&
+			*3*)	packages="$packages gnome-calculator";;&
+			*4*)	packages="$packages gnome-disk-utility";;&
+			*5*)	packages="$packages file-roller lrzip p7zip unace unrar";;&
+			*6*)	packages="$packages tumbler poppler-glib ffmpegthumbnailer libgsf";;&
+		esac
+		case $opt7 in
+			*1*)	packages="$packages cups cups-filters";;&
+			*2*)	packages="$packages hplip";;&
+			*3*)	packages="$packages bluez bluez-utils bluez-cups bluez-firmware bluez-libs blueberry";;&
+		esac
+		case $opt8 in
+			*1*)	packages="$packages dropbox";;&
+			*2*)	packages="$packages megasync";;&
+			*3*)	packages="$packages geary";;&
+			*4*)	packages="$packages k3b";;&
+			*5*)	packages="$packages jre8-openjdk";;&
+			*6*)	packages="$packages wine-staging wine_gecko winetricks"
+					packages="$packages lib32-libpng lib32-libldap lib32-gnutls lib32-mpg123 lib32-libpulse lib32-ncurses lib32-openal lib32-alsa-lib lib32-gst-plugins-base-libs" #Some 32bit libs for winearch 32 work better
+						inswine=1;;&
+			*7*)	packages="$packages bleachbit";;&
+		esac
+		case $opt9 in
+			*1*)	packages="$packages sublime-text-dev";;&
+			*2*)	packages="$packages sublime-text";;&
+			*3*)	packages="$packages visual-studio-code";;&
+			*4*)	packages="$packages jdk8-openjdk eclipse-java";;&
+			*5*)	packages="$packages monodevelop";;&
+			*6*)	packages="$packages brackets";;&
+			*7*)	packages="$packages atom-editor-bin";;&
+			*8*)	packages="$packages gdevelop";;&
+			*9*)	packages="$packages poedit";;&
+			*A*)	packages="$packages arduino";;&
+		esac
+		case $optA in
+			*1*)	packages="$packages base-devel";;&
+			*2*)	packages="$packages jdk8-openjdk";;&
+		esac
+		allpackages=$allpackages" "$packages
+		packages=""
 	fi
-	packages=""
-fi
 }
 
-### Install base graphic programs ###
-function baseconX {
-tput setaf 2 ;echo "$(T "Installing desktop and basic programs, please wait")" ; tput setaf 9
-sleep 2
-execl chroot pacman -S xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb gvfs-afc udisks networkmanager network-manager-applet gnome-keyring xdialog --noconfirm
-execl chroot pacman -S lxterminal ttf-inconsolata octopi octopi-notifier gksu pulseaudio pavucontrol xdg-user-dirs --noconfirm # Basic programs and audio support
-#Instalar pulseaudio si tiene entorno grafico, sino es tonteria
-execl chroot xdg-user-dirs-update
-#Gestor de energia
-execl chroot pacman -S xfce4-power-manager --noconfirm
-#Habilitamos ciertos servicios
-execl chroot systemctl enable lightdm
-execl chroot systemctl enable NetworkManager
-#Parte visual
-execl chroot pacman -S jkarch-appearance --noconfirm
-clear
-}
 
-### Simply put keyboard layout configs ###
-function keyboardlayout {
-echo "KEYMAP=$langabr" > /mnt/etc/vconsole.conf
-echo "# Read and parsed by systemd-localed. It's probably wise not to edit this file" > /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
-echo "# manually too freely." >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
-echo 'Section "InputClass"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
-echo '    Identifier "system-keyboard"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
-echo '    MatchIsKeyboard "on"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
-echo '    Option "XkbLayout" "'$langabr'"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
-echo 'EndSection' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
-}
-
-### Install desktop enviroment and their style in some cases ###
+##Function to select environment
 function entorno {
-clear
-optentorno=`dialog --stdout --nocancel --menu "$(T "Select your desktop enviroment")" 0 0 5 1 "LXDE (Muy ligero)" 2 "XFCE (Ligero)" 3 "Cinnamon (Facil para antiguos usuarios de Windows)" 4 "Gnome (Complejo, pero practico)" 5 "MATE (Tradicional)" 6 "Plasma/KDE (Pesado aunque bonito) " 7 "No instalar entorno de escritorio"`
+	clear
+	optentorno=`dialog --stdout --nocancel --menu "$(T "Select your desktop enviroment")" 0 0 5 1 "LXDE (Muy ligero)" 2 "XFCE (Ligero)" 3 "Cinnamon (Facil para antiguos usuarios de Windows)" 4 "Gnome (Complejo, pero practico)" 5 "MATE (Tradicional)" 6 "Plasma/KDE (Pesado aunque bonito) " 7 "No instalar entorno de escritorio"`
 
-case $optentorno in
-    1)
-		baseconX
-		execl chroot pacman -S lxappearance lxappearance-obconf lxde-common lxinput lxpanel lxrandr lxsession lxtask lxterminal openbox pcmanfm xfce4-notifyd --noconfirm
-        execl chroot pacman -S gtk-engine-aurora faenza-icon-theme --noconfirm
+	case $optentorno in
+		1)
+			allpackages=$allpackages" lxappearance lxappearance-obconf lxde-common lxinput lxpanel lxrandr lxsession lxtask lxterminal openbox pcmanfm xfce4-notifyd gtk-engine-aurora faenza-icon-theme"
+			#Themes: gtk-engine-aurora faenza-icon-theme
+			;;
+		2)	allpackages=$allpackages" xfce4 faenza-icon-theme";;
+		3)	allpackages=$allpackages" cinnamon";;
+		4)
+			optgnome=`dialog --stdout --nocancel --menu "¿Gnome base o gnome con sus extras?" 0 0 5 1 "Gnome base" 2 "Gnome+extras"`
+			case $optgnome in
+				1) allpackages=$allpackages" gnome";;
+				2) allpackages=$allpackages" gnome gnome-extra";;
+			esac
+			#In installconf, it has to remove gdm
+			;;
+		5)
+			optmate=`dialog --stdout --nocancel --menu "¿MATE base o MATE con sus extras?" 0 0 5 1 "MATE base" 2 "MATE+extras"`
+			case $optmate in
+				1) allpackages=$allpackages" mate gtk-engine-murrine";;
+				2) allpackages=$allpackages" mate mate-extra gtk-engine-murrine";;
+			esac
+			;;
+		6)
+			allpackages=$allpackages" plasma"
+			#Remove plasma-mediacenter ksshaskpass after, in installconf
+			;;
+	esac
+
+	# Basic programs (Xorg) and audio support if there is selected any 
+	if [[ $optentorno != 7 ]];then
+	#Gestor de energia xfce4-power-manager
+	allpackages=$allpackages" xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb gvfs-afc udisks networkmanager network-manager-applet gnome-keyring xdialog lxterminal ttf-inconsolata octopi octopi-notifier gksu pulseaudio pavucontrol xdg-user-dirs jkarch-appearance xfce4-power-manager"
+	fi
+}
+# End of functions that are user interactive for configuring system
+
+
+
+##Install and configure all of the system, this function is NOT interactive, it works alone
+function installconf {
+	clear
+	tput setaf 2 ; echo "$(T "Installing system, this can take about 20 minutes, wait")" ; tput setaf 9
+	sleep 2
+	tput setaf 2 ; echo "$(T "Formatting and mounting partitions")" ; tput setaf 9
+
+	# Format and mount partitions
+	execl $formatoraiz /dev/$particionraiz
+	e2label /dev/$particionraiz "JKArch"
+	execl mount /dev/$particionraiz /mnt/
+	if [[ $particionhome ]];then
+		execl $formatohome /dev/$particionhome
+		mkdir -p /mnt/home/
+		execl mount /dev/$particionhome /mnt/home/
+	fi
+	if [[ $partefi ]];then
+		mkdir -p /mnt/boot/efi
+		execl mount /dev/$partefi /mnt/boot/efi/
+	fi
+
+	# Download or install base system.
+	if [[ $isoffline = "0" ]];then
+		wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/pacman.conf -O pacman.conf
+		isanetworkerror # Comprueba si hubo un error de descarga
+		tput setaf 2 ; echo "$(T "Optimizing download")" ; tput setaf 9
+		execl reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist
+		tput setaf 2 ; echo "$(T "Downloading")" ; tput setaf 9
+		# Reflector and rsync is for updating mirrorlist #
+		execl pacman -Sy archlinux-keyring --noconfirm #Keyring for avoid fail sig of some packages
+		execl pacstrap -C pacman.conf /mnt/ base jkarch-mirrorlist reflector rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers
+		pacmanerror
+		mv pacman.conf /mnt/etc/pacman.conf
+	fi
+	if [[ $isoffline = "1" ]];then
+		tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9
+		execl pacstrap -C pacman-offline.conf /mnt/ base btrfs-progs jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers
+		mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location
+	fi
+
+	# Create fstab
+	execl genfstab -U /mnt > /mnt/etc/fstab
+	# Create or activate swap if neccesary
+	if [[ $swaptype ]];then
+		case $swaptype in
+			1)
+				echo "$(T "Creating swap file")"
+				dd if=/dev/zero of=/mnt/swapfile bs=1M count=$swapamount
+				chmod 600 /mnt/swapfile
+				mkswap /mnt/swapfile
+				echo "/swapfile none swap defaults 0 0" >> /mnt/etc/fstab
+				;;
+		esac
+	fi
+
+	# Create bind mountpoints for the rest of the install (Chroot)
+	if [[ $isoffline = 0 ]];then
+		cp -r /etc/netctl/* /mnt/etc/netctl/
+		cp -f /etc/resolv.conf /mnt/etc/resolv.conf
+	fi
+	# CD bind if is offline
+	if [[ $isoffline = 1 ]];then
+		mount --bind /run/archiso/bootmnt/ /mnt/run/archiso/bootmnt/
+	fi
+	mount --bind /sys /mnt/sys
+	mount --bind /proc /mnt/proc
+	mount --bind /dev /mnt/dev
+	mount --bind /run /mnt/run
+	#
+
+	# Var allpackages have in this moment all the packages selected by user, and will be the install packages list for pacman #
+	# Do allpackages var contain base packages and NTP daemon (Hour sync)
+	allpackages=$allpackages" jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils bash-completion ntp"
+
+	# GUI and apps selected in "entorno{}"
+
+
+	# Before install, configure mirrorlist if its online
+	if [[ $isoffline = 0 ]];then
+	execl chroot reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist
+	fi
+	# Here, allpackages have the user selected packages because selected before. Then, install it
+	execl chroot pacman -Syu $allpackages --noconfirm --needed 
+
+	# Language
+	sed -i "s/\#$langinst/$langinst/g" /mnt/etc/locale.gen
+	echo "LANG=$opclang" > /mnt/etc/locale.conf
+	echo "LANGUAGE=$opclang" >> /mnt/etc/locale.conf
+	echo "LC_COLLATE=$opclang" >> /mnt/etc/locale.conf
+	echo "KEYMAP=$langabr" > /mnt/etc/vconsole.conf
+	execl chroot locale-gen
+	clear
+
+	# Timezone
+	test -n "$NEW_TIMEZONE" && cp -fp /mnt/usr/share/zoneinfo/"$NEW_TIMEZONE" /mnt/etc/localtime
+	execl chroot hwclock --systohc --utc
+	execl chroot systemctl enable ntpd
+	if [[ $isoffline = 0 ]];then #Only sync if its online
+		echo "$(T "Syncing hour to internet")";
+		execl chroot ntpd -qg
+		execl chroot hwclock -w
+	else
+	echo "Clock will not be okay until restart and configure manually because you dont have net"
+	fi
+
+
+	# User skel move
+	if [[ $isoffline = 1 ]];then # Is an offline installation?
+	tar xJf mods/skel.tar.xz -C /mnt/
+	else # Online
+	wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.xz -O- | tar xJf - -C /mnt/
+	fi
+
+	# Themes skel before creating user and remove some progs
+	if [[ $optentorno = 1 ]];then #LXDE
 		if [[ $isoffline = 1 ]];then # Is an offline installation?
 		tar xJf mods/LXDE.tar.xz -C /mnt/
 		else #online
 		wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/LXDE.tar.xz -O- | tar xJf - -C /mnt/
 		fi
-		;;
-    2)
-		baseconX
-		execl chroot pacman -S xfce4 --noconfirm
-		execl chroot pacman -S faenza-icon-theme --noconfirm
+	fi
+
+	if [[ $optentorno = 2 ]];then #XFCE4
 		if [[ $isoffline = 1 ]];then # Is an offline installation?
 		tar xJf mods/XFCE4.tar.xz -C /mnt/
 		else #online
 		wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/XFCE4.tar.xz -O- | tar xJf - -C /mnt/
 		fi
-        ;;
-	3)
-		baseconX
-		execl chroot pacman -S cinnamon --noconfirm
-        ;;
-	4)
-		optgnome=`dialog --stdout --nocancel --menu "¿Gnome base o gnome con sus extras?" 0 0 5 1 "Gnome base" 2 "Gnome+extras"`
-		baseconX
-		case $optgnome in
-			1) execl chroot pacman -S gnome --noconfirm;;
-			2) execl chroot pacman -S gnome gnome-extra --noconfirm;;
-		esac
-		execl chroot pacman -R gdm --noconfirm
-        ;;
-	5)
-		optmate=`dialog --stdout --nocancel --menu "¿MATE base o MATE con sus extras?" 0 0 5 1 "MATE base" 2 "MATE+extras"`
-		baseconX
-		case $optmate in
-			1) execl chroot pacman -S mate gtk-engine-murrine --noconfirm;;
-			2) execl chroot pacman -S mate mate-extra gtk-engine-murrine --noconfirm;;
-		esac
-        ;;
-	6)
-		baseconX
-		execl chroot pacman -S plasma --noconfirm
-		execl chroot pacman -R plasma-mediacenter ksshaskpass --noconfirm
-        ;;
-esac
+	fi
+
+	if [[ $optentorno = 4 ]];then #GDM remove in gnome
+		execl chroot pacman -R gdm --noconfirm
+	fi
+
+	if [[ $optentorno = 6 ]];then #Plasma, remove 2 apps
+		execl chroot pacman -R plasma-mediacenter ksshaskpass --noconfirm
+	fi
+
+
+	# Create user
+	execl chroot useradd -m -G wheel -s /bin/bash $nameuser
+	echo "${nameuser}:${passuser}" | execl chroot chpasswd
+
+	# Root password
+	echo "root:${passroot}" | execl chroot chpasswd
+	# Fix for some strange login bugs
+	execl chroot chmod 755 /
+	execl chroot chmod 755 /bin
+
+	# Add sudo support for wheel users like user added
+	sed -i "s/\# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" /mnt/etc/sudoers
+
+	# User directory (Photos, Desktop..) create
+	execl chroot xdg-user-dirs-update
+	# Turn on some services
+	execl chroot systemctl enable lightdm
+	execl chroot systemctl enable NetworkManager
+	execl chroot systemctl enable dhcpcd
+
+
+	# Configure wine if neccesary
+	if [[ $inswine = 1 ]];then
+		echo "$(T "Configuring wine for better experience") (32 bit winearch)"
+		execl chuser WINEARCH=win32 wineboot -u
+	fi
+
+
+	# Set X11 keyboard, and user GKSU, if there is any enviroment installed
+	if [[ $optentorno != 7 ]];then
+		keyboardlayout
+		# Modify gksu for ask user password and not root one
+		execl chuser gconftool-2  --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser)
+	fi
+
+	# Install and configure bootloader GRUB/rEFInd
+	if [[ -z $partefi ]];then #If it dont have EFI
+		case $optboot in
+			1)
+				execl chroot pacman -S grub os-prober --noconfirm
+				#Arranque silencioso
+				sed -i 's/\GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=3 vga=current"/g' /mnt/etc/default/grub
+				echo "Instalando GRUB para BIOS/MBR"
+				#Se usa la variable ${hd} que se escogió al principio
+				execl chroot grub-install --target=i386-pc /dev/${hd}
+				execl chroot grub-mkconfig -o /boot/grub/grub.cfg
+				;;
+		esac
+	else #With EFI
+		case $optboot in
+			1)
+				echo "Instalando rEFInd para UEFI"
+				execl chroot pacman -S efibootmgr dosfstools refind-efi --noconfirm
+				execl chroot refind-install
+				rootuuid=$(blkid -o value -s UUID /dev/$(echo $particionraiz))
+				echo '"Boot with standard options"        "root=UUID='$(echo $rootuuid)' rw add_efi_memmap quiet loglevel=3 vga=current"' > /mnt/boot/refind_linux.conf
+				echo '"Boot in nomodeset mode"          "root=UUID='$(echo $rootuuid)' rw add_efi_memmap quiet loglevel=3 vga=current nomodeset"' >> /mnt/boot/refind_linux.conf
+				echo '"Boot to single-user mode"          "root=UUID='$(echo $rootuuid)' rw add_efi_memmap quiet single"' >> /mnt/boot/refind_linux.conf
+				echo '"Boot with minimal options"         "root=UUID='$(echo $rootuuid)' rw add_efi_memmap"' >> /mnt/boot/refind_linux.conf
+				;;
+			2)
+				echo "Instalando GRUB en modo UEFI, puede fallar"
+				execl chroot pacman -S grub os-prober efibootmgr dosfstools --noconfirm
+				sed -i 's/\GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=3 vga=current"/g' /mnt/etc/default/grub
+				execl chroot grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=grub_uefi --recheck
+				execl chroot grub-mkconfig -o /boot/grub/grub.cfg
+				mostrardialog "GRUB" "GRUB fue instalado. Si no funciona, verificar en la bios que este seleccionado grub_uefi o grub como arranque, y no Windows u otro"
+				;;
+		esac
+	fi
+
+	# Hostname
+	echo "JKArch" > /mnt/etc/hostname
+
+	# Linux kernel
+	execl chroot mkinitcpio -p linux #Hacemos el mkinitcpio después de tener instalados los gráficos
+
+	# Clean pacman
+	echo "$(T "Cleaning")"
+	execl chroot pacman -Sc --noconfirm
+} # Fin installconf
 
-}
 
 ### More optional configs ###
 function otrasconfig {
@@ -738,54 +815,38 @@ do
 done
 }
 
-function bootinstall {
+## Set X11 keyboard 
+function keyboardlayout {
+	echo "KEYMAP=$langabr" > /mnt/etc/vconsole.conf
+	echo "# Read and parsed by systemd-localed. It's probably wise not to edit this file" > /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
+	echo "# manually too freely." >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
+	echo 'Section "InputClass"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
+	echo '    Identifier "system-keyboard"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
+	echo '    MatchIsKeyboard "on"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
+	echo '    Option "XkbLayout" "'$langabr'"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
+	echo 'EndSection' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
+}
 
-if [[ -z $partefi ]];then
-	#Si no usa EFI, preguntar por instalar GRUB
-	optboot=`dialog --stdout --nocancel --menu "¿Instalar bootloader/gestor de arranque?" 0 0 4 1 "Si (GRUB)" 2 "No, no instalar gestor de arranque"`
-	case $optboot in
-		1)
-			execl chroot pacman -S grub os-prober --noconfirm
-			#Arranque silencioso
-			sed -i 's/\GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=3 vga=current"/g' /mnt/etc/default/grub
-			echo "Instalando GRUB para BIOS/MBR"
-			#Se usa la variable ${hd} que se escogió al principio
-			execl chroot grub-install --target=i386-pc /dev/${hd}
-			execl chroot grub-mkconfig -o /boot/grub/grub.cfg
-			;;
-		2)
-			#No hará nada
-			echo "$(T "No new bootloader installed")"
-			;;
-	esac
-else
-	#Si usa EFI, preguntar por instalar rEFInd
-	optboot=`dialog --stdout --nocancel --menu "¿Instalar bootloader/gestor de arranque?" 0 0 4 1 "Si (rEFInd) (Recomendado)" 2 "Si (GRUB) (Suele fallar)" 3 "No, no instalar gestor de arranque"`
-	case $optboot in
-		1)
-			echo "Instalando rEFInd para UEFI"
-			execl chroot pacman -S efibootmgr dosfstools refind-efi --noconfirm
-			execl chroot refind-install
-			rootuuid=$(blkid -o value -s UUID /dev/$(echo $particionraiz))
-			echo '"Boot with standard options"        "root=UUID='$(echo $rootuuid)' rw add_efi_memmap quiet loglevel=3 vga=current"' > /mnt/boot/refind_linux.conf
-			echo '"Boot in nomodeset mode"          "root=UUID='$(echo $rootuuid)' rw add_efi_memmap quiet loglevel=3 vga=current nomodeset"' >> /mnt/boot/refind_linux.conf
-			echo '"Boot to single-user mode"          "root=UUID='$(echo $rootuuid)' rw add_efi_memmap quiet single"' >> /mnt/boot/refind_linux.conf
-			echo '"Boot with minimal options"         "root=UUID='$(echo $rootuuid)' rw add_efi_memmap"' >> /mnt/boot/refind_linux.conf
-			;;
-		2)
-			echo "Instalando GRUB en modo UEFI, puede fallar"
-			execl chroot pacman -S grub os-prober efibootmgr dosfstools --noconfirm
-			sed -i 's/\GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=3 vga=current"/g' /mnt/etc/default/grub
-			execl chroot grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=grub_uefi --recheck
-			execl chroot grub-mkconfig -o /boot/grub/grub.cfg
-			mostrardialog "GRUB" "GRUB fue instalado. Si no funciona, verificar en la bios que este seleccionado grub_uefi o grub como arranque, y no Windows u otro"
-			;;
-		3)
-			#No hará nada
-			echo "$(T "No new bootloader installed")"
-			;;
-	esac
-fi
+function bootselect {
+	if [[ -z $partefi ]];then
+		#Si no usa EFI, preguntar por instalar GRUB
+		optboot=`dialog --stdout --nocancel --menu "¿Instalar bootloader/gestor de arranque?" 0 0 4 1 "Si (GRUB)" 2 "No, no instalar gestor de arranque"`
+		case $optboot in
+			2)
+				#No hará nada
+				mostrardialog "Bootloader" "$(T "No new bootloader will be installed")"
+				;;
+		esac
+	else
+		#Si usa EFI, preguntar por instalar rEFInd
+		optboot=`dialog --stdout --nocancel --menu "¿Instalar bootloader/gestor de arranque?" 0 0 4 1 "Si (rEFInd) (Recomendado)" 2 "Si (GRUB) (Suele fallar)" 3 "No, no instalar gestor de arranque"`
+		case $optboot in
+			3)
+				#No hará nada
+				mostrardialog "Bootloader" "$(T "No new bootloader will be installed")"
+				;;
+		esac
+	fi
 }
 
 ##End of declaring functions, start of script
@@ -801,10 +862,32 @@ echo "Desmontando posibles particiones"
 umount /mnt/boot/efi/
 umount /mnt/*
 umount /mnt/
+
+# Start questions, functions for timezone, enviroment, programs...
+
 particiones
+horaidioma 
+entorno
+
+#Programas de usuario si hay entorno escogido
+if [[ $optentorno != "7" ]];then
+graficos
+#Variable para poner el teclado bien en x11
+hastosetxkb=1
+
+#Aqui va la personalizacion de programas, ya que son graficos.
+programasguiuser
+
+fi
+
+# Ask for user and password for the new system
+userpass
+
+#GRUB/rEFInd select
+bootselect
 
 clear
-#Resumen de los cambios
+#                 Resumen de los cambios
 tput setaf 6
 echo "$(T "Ok, last thing before start installing, summary of changes")"
 echo "$(T "Partition scheme before your changes")"
@@ -840,7 +923,8 @@ fi
 if [[ $partefi ]];then
 	echo "$(T "EFI partition in") $partefi"
 fi
-#Log options
+
+#  Log options
 echo "------" >> "/tmp/install.log"
 echo "Install partition options" >> "/tmp/install.log"
 if [[ $mosfraiz != "$(T "not formatted")" ]];then
@@ -855,9 +939,9 @@ if [[ $particionhome ]];then
 	echo "Home partition $particionhome not formatted" >> "/tmp/install.log"
 	fi
 fi
-
 #
 
+
 #Pregunta si instalar o no
 tput setaf 1 
 echo "¿Estas de acuerdo con los cambios y quieres comenzar la instalacion?"
@@ -878,49 +962,24 @@ do
 done
 tput setaf 9
 
-#Instalación
+# Real install
 pause
-baseinstall
-horaidioma #Configure hour/timezone
 
-echo "JKArch" > /mnt/etc/hostname
+installconf
 
-#Configuraciones varias, en entorno se instala el entorno
-entorno
-
-#Se crea el usuario despues del entorno pero antes de instalar más (para una correcta configuración) y se añaden los ficheros de configuracion de skel
-userpass
-
-#Programas de usuario si hay entorno escogido
-if [[ $optentorno != "7" ]];then
-graficos
-#Poner el teclado bien en x11
-keyboardlayout
-#Aqui va la personalizacion de programas, ya que son graficos.
-programasguiuser
-
-#Modificar gksu para preguntar por contraseña del usuario
-execl chuser gconftool-2  --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser)
-fi
-
-execl chroot mkinitcpio -p linux #Hacemos el mkinitcpio después de tener instalados los gráficos
-
-
-bootinstall
+#End install, other user configs (If it wants it)
 otrasconfig
-echo "$(T "Last tweaks and cleaning")"
-execl chroot systemctl enable dhcpcd
-execl chroot rm -rf /var/cache/pacman/pkg/* #Remove downloads (Freeing space)
 
+# Unmount and tweak pacman if necessary (If offline)
 if [[ $isoffline = 1 ]];then # Is an offline installation?
-echo "Configurando pacman para usar servidores web en los siguientes arranques..."
-mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf
+	echo "Configurando pacman para usar servidores web en los siguientes arranques..."
+	mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf
 fi
 
 echo "Sincronizando datos al disco duro, puede tardar unos segundos"
 sync
 
-#Unmounting partitions
+# Unmounting partitions
 umount /mnt/*
 umount /mnt
 #
@@ -928,4 +987,5 @@ umount /mnt
 clear
 mostrardialog "$(T "End")" "$(T "Setup finished, press enter to reboot.")"
 mv /tmp/install.log /mnt/home/$nameuser/install.log
+# Reboot, finished
 reboot