diff --git a/1-setup.sh b/1-setup.sh
index 22c19e8..be68785 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -20,6 +20,9 @@ install_xorg() {
     install_pkg xorg xorg-server xorg-xinit
 }
 
+install_services() {
+    install_pkg cups bluez bluez-utils cronie ntp dhcpcd
+}
 TOTALMEM="$(grep -i "memtotal" "/proc/meminfo" | grep -o '[[:digit:]]*')"
 CPU="$(grep -c ^processor /proc/cpuinfo)"
 if [[ $TOTALMEM -gt 8000000 ]]; then
@@ -68,31 +71,37 @@ case "$DESKTOP" in
 "gnome")
     install_xorg
     install_pkg gnome gnome-extra gnome-software gnome-initial-setup gnome-tweak-tool gnome-power-manager
+    install_services
     systemctl enable gdm.service
     ;;
 "xfce")
     install_xorg
     install_pkg xfce4 xfce4-goodies lightdm lightdm-gtk-greeter pavucontrol pulseaudio
+    install_services
     systemctl enable lightdm.service
     ;;
 "mate")
     install_xorg
     install_pkg mate mate-extra lightdm lightdm-gtk-greeter
+    install_services
     systemctl enable lightdm.service
     ;;
 "lxqt")
     install_xorg
     install_pkg lxqt breeze-icons sddm
+    install_services
     systemctl enable sddm.service
     ;;
 "openbox")
     install_xorg
     install_pkg openbox obconf xterm lightdm lightdm-gtk-greeter
+    install_services
     systemctl enable lightdm.service
     ;;
 "awesome")
     install_xorg
     install_pkg awesome vicious xterm lightdm lightdm-gtk-greeter
+    install_services
     systemctl enable lightdm.service
     ;;
 "minimal")
@@ -101,22 +110,26 @@ case "$DESKTOP" in
 "i3")
     install_xorg
     install_pkg i3-wm i3blocks i3lock i3status dmenu rxvt-unicode lightdm lightdm-gtk-greeter
+    install_services
     systemctl enable lightdm.service
     ;;
 "i3-gaps")
     install_xorg
     install_pkg i3-gaps i3blocks i3lock i3status dmenu rxvt-unicode lightdm lightdm-gtk-greeter
+    install_services
     systemctl enable lightdm.service
     ;;
 "deepin")
     install_xorg
     install_pkg deepin deepin-extra deepin-kwin
+    install_services
     sed -i 's/^#greeter-session=.*/greeter-session=lightdm-deepin-greeter/' /etc/lightdm/lightdm.conf
     systemctl enable lightdm.service
     ;;
 "budgie")
     install_xorg
     install_pkg budgie-desktop budgie-desktop-view budgie-screensaver gnome-control-center network-manager-applet gnome
+    install_services
     systemctl enable gdm.service
     ;;
 *)
diff --git a/2-user.sh b/2-user.sh
index 4a3b6e0..8d00c35 100755
--- a/2-user.sh
+++ b/2-user.sh
@@ -39,17 +39,20 @@ case "$AURHELPER" in
 "pikaur")
     git clone "https://aur.archlinux.org/pikaur.git"
     ;;
-none)
+"none")
     echo "No AUR helper is selected. Skipping..."
     ;;
 *)
     something_failed
     ;;
 esac
-
-cd "$AURHELPER" || exit 0
-makepkg -si --noconfirm
-cd "$HOME" || exit 0
+if [[ "$AURHELPER" =~ "none" ]]; then
+    echo "Continue no directory"
+else
+    cd "$AURHELPER" || exit 0
+    makepkg -si --noconfirm
+    cd "$HOME" || exit 0
+fi
 
 if [[ "$LAYOUT" -eq 1 ]]; then
     while IFS= read -r LINE; do
diff --git a/3-post-setup.sh b/3-post-setup.sh
index ab26afe..6814baa 100755
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -47,8 +47,8 @@ systemctl enable cups.service
 systemctl enable cronie.service
 ntpd -qg
 systemctl enable ntpd.service
-systemctl disable dhcpcd.service
 systemctl stop dhcpcd.service
+systemctl disable dhcpcd.service
 systemctl enable NetworkManager.service
 systemctl enable bluetooth
 
diff --git a/startup.sh b/startup.sh
index 0e5b6ff..3c2d30d 100644
--- a/startup.sh
+++ b/startup.sh
@@ -206,7 +206,6 @@ echo -ne "
 "
 }
 
-# TODO ask user for mount points i.e. boot may be home etc
 BOOT=EFIBOOT
 ROOT=ROOT
 MOUNTPOINT=/mnt