diff --git a/install.sh b/install.sh
index 91b5e6e..283012f 100755
--- a/install.sh
+++ b/install.sh
@@ -16,7 +16,7 @@ echo '
 set -eux pipefail
 
 # Install prerequisites
-sudo pacman -Syu git zsh curl git
+sudo pacman -Syu git zsh curl git --noconfirm
 
 # Do not exit on fail
 set +eux
@@ -43,11 +43,12 @@ curl -fsSL https://get.docker.com | sh
 set -eux
 
 # Install rootless mode
-sudo sh -eux <<EOF
-# Install newuidmap & newgidmap binaries
-pacman -S uidmap --no-confirm
-EOF
-dockerd-rootless-setuptool.sh install
+set +eux
+#sudo sh -eux <<EOF
+## Install newuidmap & newgidmap binaries
+#pacman -S uidmap
+#EOF
+#dockerd-rootless-setuptool.sh install
 
 # Do not print commands
 set +x
@@ -60,21 +61,25 @@ set -x
 # Do not print commands
 set +x
 echo '
-    --------------- packages Install  ---------------
+    --------------- Packages Install  ---------------
 
 '
 set -x
 # Install personal packages
-sudo pacman -S figlet irssi cmatrix neofetch cowsay fortune-mod samba cifs-utils tty-clock lolcat libsass1 dpkg npm lynx wget tmux asciinema cava btop micro obsidian syncthing wine neovim
+#sudo pacman -S --needed --noconfirm kdeconnect figlet irssi cmatrix neofetch cowsay fortune-mod samba cifs-utils tty-clock lolcat libsass1 dpkg npm lynx wget tmux asciinema cava btop micro obsidian syncthing wine neovim
 
-sudo pacman -S adobe-source-code-pro-fonts amd-ucode asciinema atomicparsley base bc bcachefs-tools blueman bluez-utils brightnessctl btop cava cliphist cowsay cuda-tools cython discord electron faac faad2 fastfetch firefox flatpak fzf gnome-2048 gnome-calculator gnome-chess  gnome-clocks gnome-disk-utility gnome-font-viewer gnome-online-accounts gnome-remote-desktop gnome-system-monitor gnome-weather gobject-introspection grub gst-plugins-base gst-plugins-ugly gst-python gtk-engine-murrine htop hypridle hyprland hyprlock hyprpolkitagent inxi jfsutils jq kdeconnect kitty kvantum libde265 libmp4v2 libmpcdec libreoffice-fresh libtorrent libva-nvidia-driver loupe lsd lutris lxc magic-wormhole mercurial mousepad mplayer mpv-mpris nano nvidia-dkms nvtop nwg-displays nwg-look obsidian pacman-contrib pamixer pavucontrol proton-pass-bin proton-vpn-gtk-app python-build python-hatchling python-installer python-pyquery python-wxpython qalculate-gtk qbittorrent qt5ct qt6ct rofi-wayland rust scdoc schroedinger screenfetch sddm sof-firmware swappy swaync swww syncthing ttf-fantasque-nerd ttf-fira-code ttf-jetbrains-mono ttf-jetbrains-mono-nerd typescript umockdev uriparser virtualbox waybar wayvnc wine yad zram-generator zsh-completions
+curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/configs/PackagesPacman.txt | sudo pacman -S - --needed --noconfirm
 
-sudo pacman -S git base-devel --needed
-git clone https://aur.archlinux.org/yay.git
-cd yay
-makepkg -si
+#sudo pacman -S --needed --noconfirm adobe-source-code-pro-fonts amd-ucode asciinema atomicparsley base bc bcachefs-tools blueman bluez-utils brightnessctl btop cava cliphist cowsay cuda-tools cython discord electron faac faad2 fastfetch firefox flatpak fzf gnome-2048 gnome-calculator gnome-chess  gnome-clocks gnome-disk-utility gnome-font-viewer gnome-online-accounts gnome-remote-desktop gnome-system-monitor gnome-weather gobject-introspection grub gst-plugins-base gst-plugins-ugly gst-python gtk-engine-murrine htop hypridle hyprland hyprlock hyprpolkitagent inxi jfsutils jq kdeconnect kitty kvantum libde265 libmp4v2 libmpcdec libreoffice-fresh libtorrent libva-nvidia-driver loupe lsd lutris lxc magic-wormhole mercurial mousepad mplayer mpv-mpris nano nvidia-dkms nvtop nwg-displays nwg-look obsidian pacman-contrib pamixer pavucontrol proton-pass-bin proton-vpn-gtk-app python-build python-hatchling python-installer python-pyquery python-wxpython qalculate-gtk qbittorrent qt5ct qt6ct rofi-wayland rust scdoc schroedinger screenfetch sddm sof-firmware swappy swaync swww syncthing ttf-fantasque-nerd ttf-fira-code ttf-jetbrains-mono ttf-jetbrains-mono-nerd typescript umockdev uriparser virtualbox waybar wayvnc wine yad zram-generator zsh-completions
 
-yay -S uidmap asciinema-agg asciinema-agg-debug celt celt-debug cloudflare-warp-bin cloudflare-warp-bin-debug davs2 davs2-debug dirb lib32-blas lib32-lzo lib32-lzo-debug mingw-w64-tools mingw-w64-tools-debug proton-pass-bin proton-pass-bin-debug python-ufonormalizer steam-devices-git websockify websockify-debug xwaylandvideobridge xwaylandvideobridge-debug zen-browser-bin
+
+if ! command -v yay > /dev/null; then
+    echo "yay is NOT installed. Running installation commands..."
+    git clone https://aur.archlinux.org/yay.git
+    makepkg -si ./yay
+fi
+
+curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/configs/PackagesPacman.txt | yay -S - --needed --save --answerclean All --answerdiff All 
 
 # Do not print commands
 set +x