diff --git a/.install/install-yay.sh b/.install/install-yay.sh
new file mode 100644
index 0000000..7b7b98e
--- /dev/null
+++ b/.install/install-yay.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if sudo pacman -Qs yay > /dev/null ; then
+    echo ":: yay is already installed!"
+else
+    echo ":: yay is not installed. Starting the installation!"
+    _installPackagesPacman "base-devel"
+    SCRIPT=$(realpath "$0")
+    temp_path=$(dirname "$SCRIPT")
+    echo $temp_path
+    git clone https://aur.archlinux.org/yay-git.git ~/yay-git
+    cd ~/yay-git
+    makepkg -si
+    cd $temp_path
+    echo ":: yay has been installed successfully."
+fi
+
diff --git a/.install/packages/general.sh b/.install/packages/general.sh
index bb1c41f..9d7879c 100644
--- a/.install/packages/general.sh
+++ b/.install/packages/general.sh
@@ -1,4 +1,5 @@
 packagesPacman=(
+  "thunar"
   "zsh"
   "bitwarden"
   "firefox"
@@ -13,11 +14,14 @@ packagesPacman=(
   "xclip"
   "ripgrep"
   "waybar"
-  "swaylock"
-  "swayidle"
+  "hypridle"
+  "hyprlock"
+  "btop"
+  "dunst"
 )
 
 packagesYay=(
+  "cava"
 )
 
 packagesBrew=(