diff --git a/.install/packages/base.sh b/.install/packages/base.sh
index 4d93371..8180b69 100644
--- a/.install/packages/base.sh
+++ b/.install/packages/base.sh
@@ -1,45 +1,19 @@
 packagesPacman=(
-  "git"
-  "grep"
-  "wget"
-  "curl"
-  "unzip"
-  "xclip"
-  "ripgrep"
-  "inotify-tools"
-  "hyprland"
-  "pipewire"
-  "wireplumber"
-  "pipewire-audio"
-  "pipewire-alsa"
-  "pipewire-pulse"
-  "bluez"
-  "bluez-utils"
-  "blueman"
-  "xdg-desktop-portal-wlr"
-  "xdg-desktop-portal-hyprland"
-  "python-pywal"
-  "gtk3"
-  "gtk4"
-  "thunar"
-  "kitty"
-  "waybar"
-  "grim"
-  "slurp"
-  "swappy"
-  "cliphist"
-  "xorg-xrdb"
-  "vulkan-icd-loader"
-  "lib32-vulkan-icd-loader"
+	"grep"
+	"wget"
+	"curl"
+	"unzip"
+	"wl-clipboard"
+	"inotify-tools"
+	"pipewire"
+	"wireplumber"
+	"pipewire-audio"
+	"pipewire-alsa"
+	"pipewire-pulse"
+	"python-pywal"
+	"vulkan-icd-loader"
+	"lib32-vulkan-icd-loader"
 )
 
 packagesYay=(
-  "rofi-lbonn-wayland-git"
-  "swaync"
-  "swww"
-  "wlogout"
-  "nwg-look"
-  "emote"
-  "hypridle"
-  "hyprlock"
 )
diff --git a/.install/packages/general.sh b/.install/packages/general.sh
index 608d25f..6e4af18 100644
--- a/.install/packages/general.sh
+++ b/.install/packages/general.sh
@@ -1,32 +1,18 @@
 packagesPacman=(
-  "zsh"
-  "bitwarden"
-  "firefox"
-  "github-cli"
-  "lazygit"
-  "neofetch"
-  "neovim"
-  "ttf-jetbrains-mono-nerd" 
-  "btop"
-  "cmatrix"
-  "discord"
-  "caprine"
-  "obsidian"
-  "glow"
-  "lutris"
-  "steam"
+	"bitwarden"
+	"firefox"
+	"discord"
+	"caprine"
+	"obsidian"
+	"lutris"
+	"steam"
 )
 
 packagesYay=(
-  "cava"
-  "emote"
-  "spotify"
-  "spicetify-cli"
+	"emote"
 )
 
 packagesBrew=(
-  "zsh-autosuggestions"
-  "zsh-syntax-highlighting"
-  "asdf"
-  "lazydocker"
+	"asdf"
+	"lazydocker"
 )
diff --git a/.install/packages/hyprland.sh b/.install/packages/hyprland.sh
new file mode 100644
index 0000000..1ce888f
--- /dev/null
+++ b/.install/packages/hyprland.sh
@@ -0,0 +1,28 @@
+packagesPacman=(
+	"hyprland"
+	"rofi-wayland"
+	"swaync"
+	"swww"
+	"bluez"
+	"bluez-utils"
+	"blueman"
+	"xdg-desktop-portal-wlr"
+	"xdg-desktop-portal-hyprland"
+	"gtk3"
+	"gtk4"
+	"thunar"
+	"waybar"
+	"grim"
+	"slurp"
+	"swappy"
+	"cliphist"
+	"xorg-xrdb"
+)
+
+packagesYay=(
+	"wlogout"
+	"nwg-look"
+	"emote"
+	"hypridle"
+	"hyprlock"
+)
diff --git a/.install/packages/shell.sh b/.install/packages/shell.sh
new file mode 100644
index 0000000..ee39867
--- /dev/null
+++ b/.install/packages/shell.sh
@@ -0,0 +1,20 @@
+packagesPacman=(
+	"kitty"
+	"zsh"
+	"zsh-autosuggestions"
+	"zsh-syntax-highlighting"
+	"git"
+	"github-cli"
+	"lazygit"
+	"neofetch"
+	"ripgrep"
+	"neovim"
+	"ttf-jetbrains-mono-nerd"
+	"btop"
+	"cmatrix"
+)
+
+packagesYay=(
+	"asdf-vm"
+	"cava"
+)