diff --git a/install.sh b/install.sh
index 88c6fa9..41a0b52 100755
--- a/install.sh
+++ b/install.sh
@@ -13,17 +13,21 @@ parted -s "$PART" set 1 esp on
 parted -s "$PART" mkpart primary linux-swap 3GB 27GB
 parted -s "$PART" mkpart primary ext4 27GB 100%
 
-echo -n "$LUKS_PASS" | cryptsetup luksFormat --type luks2 --iter-time 5000 "${PART}3"
-echo -n "$LUKS_PASS" | cryptsetup open "${PART}3" roothome
+PART_BOOT = "${PART}1"
+PART_SWAP = "${PART}2"
+PART_ROOTHOME = "${PART}3"
 
-mkfs.fat -F 32 "${PART}1"
+echo -n "$LUKS_PASS" | cryptsetup luksFormat --type luks2 --iter-time 5000 "${PART_ROOTHOME}"
+echo -n "$LUKS_PASS" | cryptsetup open "${PART_ROOTHOME}" roothome
+
+mkfs.fat -F 32 "${PART_BOOT}"
 mkfs.ext4 /dev/mapper/roothome
-mkswap "${PART}2"
+mkswap "${PART_SWAP}"
 
 mount /dev/mapper/roothome /mnt
 mkdir -p /mnt/boot
-mount "${PART}1" /mnt/boot
-swapon "${PART}2"
+mount "${PART_BOOT}" /mnt/boot
+swapon "${PART_SWAP}"
 
 pacstrap /mnt base linux linux-firmware
 genfstab -U /mnt >> /mnt/etc/fstab
@@ -36,8 +40,8 @@ echo "$HOSTNAME" >> /etc/hostname
 echo "KEYMAP=trq" >> /etc/vconsole.conf
 
 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 ttf-jetbrains-mono
+pacman -S --noconfirm networkmanager alsa-utils bluez bluez-utils bridge-utils nvidia-open nvidia-utils pavucontrol pipewire pipewire-alsa pipewire-jack pipewire-pulse polykit-gnome usbutils
+pacman -S --noconfirm alacritty firefox eog flameshot keepassxc ly sway swaybg zip unzip ttf-jetbrains-mono i3status
 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
@@ -48,7 +52,6 @@ systemctl enable clamav-daemon
 systemctl disable getty@tty0.service
 systemctl disable getty@tty1.service
 systemctl enable ly@tty1.service
-systemctl enable bluetooth
 
 ufw default deny incoming
 ufw default allow outgoing
@@ -74,7 +77,7 @@ 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")
+UUID=\$(blkid -s UUID -o value "${PART_ROOTHOME}")
 
 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