diff --git a/aif b/aif
index 7f4347c..d58d159 100755
--- a/aif
+++ b/aif
@@ -1589,7 +1589,7 @@ install_base() {
 			check_for_error
 			# Use mhwd to install selected kernels with right kernel modules
 			# This is as of yet untested
-			arch_chroot "mhwd-kernel -i $(cat ${PACKAGES} | grep "^linux")" 2>/tmp/.errlog
+			arch_chroot "mhwd-kernel -i $(cat ${PACKAGES} | xargs -n1 | grep "^linux" | xargs)" 2>/tmp/.errlog
 			check_for_error
 			# If the virtual console has been set, then copy config file to installation
 			[[ -e /tmp/vconsole.conf ]] && cp -f /tmp/vconsole.conf ${MOUNTPOINT}/etc/vconsole.conf 2>/tmp/.errlog
@@ -2645,13 +2645,13 @@ install_base_menu() {
 	   fi
 	fi
 
-   dialog --default-item ${HIGHLIGHT_SUB} --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstBsMenuTitle " --menu "$_InstBseMenuBody" 0 0 5 \
+   dialog --default-item ${HIGHLIGHT_SUB} --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstBsMenuTitle " --menu "$_InstBseMenuBody" 0 0 6 \
  	"1"	"$_PrepMirror" \
  	"2" "$_PrepPacKey" \
  	"3" "$_InstBse" \
 	"4" "$_InstBootldr" \
-	"5" "Install desktop environment" \
-	"6" "$_Back" \ 2>${ANSWER}	
+	"5" "Install a manjaro desktop" \
+	"6" "$_Back" 2>${ANSWER}	
 	
 	HIGHLIGHT_SUB=$(cat ${ANSWER})
 	case $(cat ${ANSWER}) in
@@ -2659,7 +2659,7 @@ install_base_menu() {
 		;;
 	"2") clear
 		 pacman-key --init
-		 pacman-key --populate archlinux manjaro
+		 pacman-key --populate archlinux
 		 pacman-key --refresh-keys
 		;;
 	"3") install_base
diff --git a/package-lists/Packages-Bspwm b/package-lists/Packages-Bspwm
index 4d16755..314d4ae 100755
--- a/package-lists/Packages-Bspwm
+++ b/package-lists/Packages-Bspwm
@@ -1,56 +1,28 @@
-## Xorg Packages
 inxi
 libdnet
 mesa-demos
-# >x86_64 lib32-mesa-demos
 uriparser
-xf86-input-acecad
-xf86-input-aiptek
-xf86-input-evdev
-xf86-input-joystick
-xf86-input-keyboard
-xf86-input-mouse
-xf86-input-synaptics
-xf86-input-libinput
-xf86-input-void
-xf86-input-wacom
-xinetd
-xorg-server
-xorg-server-utils
-xorg-twm
-xorg-utils
-xorg-xinit
-xorg-xinput
-
-## Basic packages
 dconf
 desktop-file-utils
 
-## Packages for Sound and Audio
-manjaro-alsa	# containes 32bit libraries
+manjaro-alsa
 #alsa-lib
 #alsa-utils
 #alsa-plugins
 #manjaro-pulse
 #pavucontrol
-#pulseaudio-ctl
-
-## Artwork
 xcursor-breeze
 breeze-maia-icon-themes
 console-solarized
 bspwm-wallpapers
 adwaita-maia-gtk3
 
-## Network
-#networkmanager
-#networkmanager-dispatcher-ntpd
-#openresolv
-#networkmanager-dmenu
+networkmanager
+networkmanager-dispatcher-ntpd
+openresolv
 dhcpd
 wpa_tui
 
-##Bspwm packages
 manjaro-bspwm-settings
 bspwm-manjaro
 sxhkd
@@ -68,9 +40,6 @@ compton
 i3lock
 bspwm-ruler
 
-##Applications
-
-##Desktop 
 spacefm
 udevil
 gvfs
@@ -83,10 +52,6 @@ gufw
 zathura-pdf-poppler
 morc_menu
 
-##terminal
-#rxvt-unicode
-#urxvt-perls
-#command-not-found
 roxterm
 zsh
 zsh-completions
@@ -96,7 +61,6 @@ fisherman
 dash
 mpv
 
-##Command line utilities
 downgrade
 mhwd-tui
 bmenu
@@ -108,7 +72,7 @@ bc
 ps_mem
 htop
 mhwd-chroot
-ranger # The rest are ranger optdepends
+ranger
 w3m
 atool
 poppler
@@ -120,7 +84,4 @@ clonezilla
 dfc
 ncdu
 speedtest-cli
-
-## AUR Access
-# base-devel
 yaourt