diff --git a/install.sh b/install.sh
index 97d4e73..88c6fa9 100755
--- a/install.sh
+++ b/install.sh
@@ -35,10 +35,9 @@ hwclock --systohc
 echo "$HOSTNAME" >> /etc/hostname
 echo "KEYMAP=trq" >> /etc/vconsole.conf
 
-pacman -S --noconfirm base-devel sudo # base programs
+pacman -S --noconfirm base-devel sudo
 pacman -S --noconfirm alsa-utils bluez bluez-utils bridge-utils networkmanager nvidia-open nvidia-utils pantum-universal-driver pavucontrol pipewire pipewire-alsa pipewire-jack pipewire-pulse polykit-gnome usbutils
-pacman -S --noconfirm alacritty firefox eog flameshot keepassxc ly sway swaybg zip unzip
-
+pacman -S --noconfirm alacritty firefox eog flameshot keepassxc ly sway swaybg zip unzip ttf-jetbrains-mono
 pacman -S --noconfirm ufw clamav
 
 pacman -S --noconfirm cmake cloc vim emacs cups docker docker-compose efibootmgr gdb ghidra ghostscript git git-lfs man-db man-pages mkcert nasm net-tools openssh qemu-base qemu-full rustup valgrind virt-manager virt-viewer wireplumber wireguard-tools wireshark-qt wmenu wofi xdg-desktop-portal-gtk xdg-desktop-portal-wlr xorg-xwayland
@@ -62,22 +61,21 @@ printf "Configuring users..."
 
 echo -n "root:$ROOT_PASS" | chpasswd
 useradd -m -G wheel,docker,libvirt,video,audio "$USERNAME"
-echo "$USERNAME:$PASS" | chpasswd
-
-printf "Configure dotfiles"
-git clone https://universe.0xinfinity.dev/0x221E/dotfiles.git "/home/$USERNAME/dotfiles"
-
-mkdir -p "/home/$USERNAME/.config"
-cp -rs "/home/$USERNAME/dotfiles/*" "/home/$USERNAME/.config/"
-
 sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
 
+su - "$USERNAME" -c "git clone https://universe.0xinfinity.dev/0x221E/dotfiles.git /home/$USERNAME/dotfiles"
+
+su - "$USERNAME" -c "mkdir -p /home/$USERNAME/.config"
+su - "$USERNAME" -c "cp -sr /home/$USERNAME/dotfiles/* /home/$USERNAME/.config/"
+
+echo "$USERNAME:$PASS" | chpasswd
+
 bootctl install
 
 printf "default  arch.conf\ntimeout  3\nconsole-mode max\neditor   no" >> /boot/loader/loader.conf
 
 UUID=\$(blkid -s UUID -o value "${PART}3")
 
-printf "title   Arch Linux\nlinux   /vmlinuz-linux\ninitrd  /initramfs-linux.img\noptions rd.luks.name=\$UUID:roothome root=/dev/mapper/roothome rw" > /boot/loader/entries/arch.conf
+printf "title   Arch Linux\nlinux   /vmlinuz-linux\ninitrd  /initramfs-linux.img\noptions rd.luks.name=\$UUID=roothome root=/dev/mapper/roothome rw" > /boot/loader/entries/arch.conf
 
 EOF