diff --git a/install.sh b/install.sh
index 283012f..e8d96c4 100755
--- a/install.sh
+++ b/install.sh
@@ -16,12 +16,12 @@ echo '
 set -eux pipefail
 
 # Install prerequisites
-sudo pacman -Syu git zsh curl git --noconfirm
+sudo pacman -Syu git zsh curl git --noconfirm --needed
 
 # Do not exit on fail
 set +eux
 
-# mv ~/.oh-my-zsh ~/OhMyZshOld
+mv ~/.oh-my-zsh ~/OhMyZshOld
 
 curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/zsh.sh | bash
 
@@ -37,26 +37,12 @@ set -x
 
 # Do not fail (in case the OS is not supported)
 set +eux
-curl -fsSL https://get.docker.com | sh
 
-# Fail on any command.
-set -eux
-
-# Install rootless mode
-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
-echo '
-    --------------- Homebrew Install  ---------------
-
-'
-set -x
+if ! command -v docker >/dev/null; then
+  echo "docker is NOT installed. Running installation commands..."
+  curl -fsSL https://get.docker.com | sh
+  sudo usermod -aG docker $USER
+fi
 
 # Do not print commands
 set +x
@@ -65,21 +51,17 @@ echo '
 
 '
 set -x
-# Install personal packages
-#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
+# Install personal Packages
 
 curl -fsSL https://raw.githubusercontent.com/alvinlollo/Single-install-script/refs/heads/main/configs/PackagesPacman.txt | sudo pacman -S - --needed --noconfirm
 
-#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
-
-
-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
+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 
+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