diff --git a/.install/packages/base.sh b/.install/packages/base.sh
new file mode 100644
index 0000000..4dc3a96
--- /dev/null
+++ b/.install/packages/base.sh
@@ -0,0 +1,34 @@
+packagesPacman=(
+  "git"
+  "grep"
+  "wget"
+  "curl"
+  "xclip"
+  "ripgrep"
+	"hyprland"
+  "pipewire"
+  "wireplumber"
+  "pipewire-audio"
+  "pipewire-alsa"
+  "pipewire-pulse"
+	"xdg-desktop-portal-hyprland"
+  "gtk3"
+  "thunar"
+  "kitty"
+  "wofi"
+	"dunst"
+	"waybar"
+	"grim"
+	"slurp"
+	"swappy"
+	"cliphist"
+)
+
+packagesYay=(
+	"swww"
+	"wlogout"
+	"nwg-look"
+	"emote"
+	"hypridle"
+	"hyprlock"
+)
diff --git a/.install/packages/general.sh b/.install/packages/general.sh
index 88037e5..38d6f8f 100644
--- a/.install/packages/general.sh
+++ b/.install/packages/general.sh
@@ -1,26 +1,14 @@
 packagesPacman=(
-  "grep"
-  "thunar"
   "zsh"
   "bitwarden"
   "firefox"
-  "git"
   "github-cli"
   "lazygit"
   "neofetch"
   "neovim"
-  "ttf-jetbrains-mono-nerd"
-  "wget"
-  "curl"
-  "xclip"
-  "ripgrep"
-  "waybar"
-  "hypridle"
-  "hyprlock"
+  "ttf-jetbrains-mono-nerd" 
   "btop"
-  "dunst"
   "cmatrix"
-  "swappy"
   "spotify-launcher"
   "discord"
   "caprine"
diff --git a/install.sh b/install.sh
index d5dd384..6054d44 100644
--- a/install.sh
+++ b/install.sh
@@ -20,7 +20,12 @@ mkdir ~/Development/
 source .install/install-yay.sh
 source .install/brew-install.sh
 
-# Install packages
+# Install base packages
+source .install/packages/base.sh
+source .install/install-packages.sh
+
+# Install general packages
+source .install/packages/general.sh
 source .install/install-packages.sh
 
 # Symantic links