diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 377dae6..55bc78c 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,5 +1,8 @@
 ## Changelogs
 
+## 05 Feb 2025
+- move all the initial questions at the beginning
+
 ## 03 Feb 2025
 - offering a new SDDM theme from here [SDDM](https://codeberg.org/minMelody/sddm-sequoia)
 
diff --git a/install-scripts/InputGroup.sh b/install-scripts/InputGroup.sh
index 6ff61fd..8c5e5b7 100755
--- a/install-scripts/InputGroup.sh
+++ b/install-scripts/InputGroup.sh
@@ -2,11 +2,6 @@
 # 💫 https://github.com/JaKooLit 💫 #
 # Adding users into input group #
 
-if [[ $USE_PRESET = [Yy] ]]; then
-  source ./preset.sh
-fi
-
-
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 # Determine the directory where the script is located
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -20,43 +15,17 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_input.log"
 
-# Checking if current user is in the 'input' group
-if groups "$(whoami)" | grep -q '\binput\b'; then
-    echo "USER $(whoami) is already in the 'input' group." 2>&1 > "$LOG"
-    exit 0
+# Check if the 'input' group exists
+if grep -q '^input:' /etc/group; then
+    echo "${OK} ${MAGENTA}input${RESET} group exists."
+else
+    echo "${NOTE} ${MAGENTA}input${RESET} group doesn't exist. Creating ${MAGENTA}input${RESET} group..."
+    sudo groupadd input
+    echo "${MAGENTA}input${RESET} group created" >> "$LOG"
 fi
 
-while true; do
-    echo "${WARN} This script will add your ${YELLOW}user${RESET} to the ${MAGENTA}input${RESET} group."
-    echo "${NOTE} Please note that adding yourself to the ${MAGENTA}input${RESET} group might be necessary for ${MAGENTA}waybar keyboard-state functionality${RESET} ."
-    
-    printf "\n%.0s" {1..1}
-    
-    if [[ -z $input_group_choid ]]; then
-      read -p "${YELLOW}Do you want to proceed? (y/n): ${RESET}" input_group_choid
-    fi
+# Add the user to the 'input' group
+sudo usermod -aG input "$(whoami)"
+echo "${OK} ${YELLOW}user${RESET} added to the ${MAGENTA}input${RESET} group. Changes will take effect after you log out and log back in." >> "$LOG"
 
-    if [[ $input_group_choid == "y" || $input_group_choid == "Y" ]]; then
-        if grep -q '^input:' /etc/group; then
-            echo "${OK} ${MAGENTA}input${RESET} group exists."
-        else
-            echo "${NOTE} ${MAGENTA}input${RESET} group doesn't exist. Creating ${MAGENTA}input${RESET} group..."
-            sudo groupadd input
-
-            echo "${MAGENTA}input${RESET} group created" >> "$LOG"
-        fi
-
-        sudo usermod -aG input "$(whoami)"
-        echo "${OK} ${YELLOW}user${RESET} added to the ${MAGENTA}input${RESET} group. Changes will take effect after you log out and log back in."
-
-        echo "User added to 'input' group" >> "$LOG"
-        break 
-    elif [[ $input_group_choid == "n" || $input_group_choid == "N" ]]; then
-        echo "${NOTE} No changes made. Exiting the script."
-        break 
-    else
-        echo "${ERROR} Invalid choice. Please enter 'y' for yes or 'n' for no."
-    fi
-done
-
-printf "\n%.0s" {1..2}
\ No newline at end of file
+printf "\n%.0s" {1..2}
diff --git a/install-scripts/nvidia.sh b/install-scripts/nvidia.sh
index 103bddc..9792d9e 100755
--- a/install-scripts/nvidia.sh
+++ b/install-scripts/nvidia.sh
@@ -120,30 +120,4 @@ if [ -f /boot/loader/loader.conf ]; then
     fi
 fi
 
-printf "\n%.0s" {1..1} 
-
-# Blacklist nouveau
-    if [[ -z $blacklist_nouveau ]]; then
-      read -n1 -rep "${CAT} Would you like to ${YELLOW}blacklist nouveau${RESET}? (y/n)" blacklist_nouveau
-    fi
-echo
-if [[ $blacklist_nouveau =~ ^[Yy]$ ]]; then
-  NOUVEAU="/etc/modprobe.d/nouveau.conf"
-  if [ -f "$NOUVEAU" ]; then
-    printf "${OK} Seems like ${YELLOW}nouveau${RESET} is already blacklisted..moving on.\n"
-  else
-    echo "blacklist nouveau" | sudo tee -a "$NOUVEAU" 2>&1 | tee -a "$LOG"
-    printf "${INFO} has been added to $NOUVEAU.\n"
-
-    # To completely blacklist nouveau (See wiki.archlinux.org/title/Kernel_module#Blacklisting 6.1)
-    if [ -f "/etc/modprobe.d/blacklist.conf" ]; then
-      echo "install nouveau /bin/true" | sudo tee -a "/etc/modprobe.d/blacklist.conf" 2>&1 | tee -a "$LOG"
-    else
-      echo "install nouveau /bin/true" | sudo tee "/etc/modprobe.d/blacklist.conf" 2>&1 | tee -a "$LOG"
-    fi
-  fi
-else
-  printf "${NOTE} Skipping ${YELLOW}nouveau blacklisting${RESET} ..." 2>&1 | tee -a "$LOG"
-fi
-
-printf "\n%.0s" {1..2}
\ No newline at end of file
+printf "\n%.0s" {1..2} 
\ No newline at end of file
diff --git a/install-scripts/nvidia_nouveau.sh b/install-scripts/nvidia_nouveau.sh
new file mode 100755
index 0000000..82e5413
--- /dev/null
+++ b/install-scripts/nvidia_nouveau.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Nvidia Blacklist #
+
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+# Determine the directory where the script is located
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_nvidia.log"
+
+printf "${INFO} ${SKY_BLUE}blacklist nouveau${RESET}...\n"
+# Blacklist nouveau
+NOUVEAU="/etc/modprobe.d/nouveau.conf"
+if [ -f "$NOUVEAU" ]; then
+  printf "${OK} Seems like ${YELLOW}nouveau${RESET} is already blacklisted..moving on.\n"
+else
+  echo "blacklist nouveau" | sudo tee -a "$NOUVEAU" 2>&1 | tee -a "$LOG"
+
+  # To completely blacklist nouveau (See wiki.archlinux.org/title/Kernel_module#Blacklisting 6.1)
+  if [ -f "/etc/modprobe.d/blacklist.conf" ]; then
+    echo "install nouveau /bin/true" | sudo tee -a "/etc/modprobe.d/blacklist.conf" 2>&1 | tee -a "$LOG"
+  else
+    echo "install nouveau /bin/true" | sudo tee "/etc/modprobe.d/blacklist.conf" 2>&1 | tee -a "$LOG"
+  fi
+fi
+
+printf "\n%.0s" {1..2}
diff --git a/install-scripts/sddm.sh b/install-scripts/sddm.sh
index ec4369b..095d5b3 100755
--- a/install-scripts/sddm.sh
+++ b/install-scripts/sddm.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # SDDM Log-in Manager #
-if [[ $USE_PRESET = [Yy] ]]; then
-  source ./preset.sh
-fi
 
 sddm=(
   qt6-5compat 
@@ -13,7 +10,6 @@ sddm=(
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
-
 # Determine the directory where the script is located
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -52,59 +48,4 @@ sddm_conf_dir=/etc/sddm.conf.d
 wayland_sessions_dir=/usr/share/wayland-sessions
 [ ! -d "$wayland_sessions_dir" ] && { printf "$CAT - $wayland_sessions_dir not found, creating...\n"; sudo mkdir "$wayland_sessions_dir" 2>&1 | tee -a "$LOG"; }
 
-printf "\n%.0s" {1..2}
-    
-# SDDM-themes
-valid_input=false
-while [ "$valid_input" != true ]; do
-    if [[ -z $install_sddm_theme ]]; then
-      read -n 1 -r -p "${CAT} OPTIONAL - Would you like to install ${YELLOW}additional SDDM themes?${RESET} (y/n)" install_sddm_theme
-    fi
-  if [[ $install_sddm_theme =~ ^[Yy]$ ]]; then
-    printf "\n%s - Installing ${SKY_BLUE}Additional SDDM Theme${RESET}\n" "${NOTE}"
-
-    # Check if /usr/share/sddm/themes/sequoia_2 exists and remove if it does
-    if [ -d "/usr/share/sddm/themes/sequoia_2" ]; then
-      sudo rm -rf "/usr/share/sddm/themes/sequoia_2"
-      echo -e "\e[1A\e[K${OK} - Removed existing 'sequoia_2' directory." 2>&1 | tee -a "$LOG"
-    fi
-
-    # Check if sequoia_2 directory exists in the current directory and remove if it does
-    if [ -d "sequoia_2" ]; then
-      rm -rf "sequoia_2"
-      echo -e "\e[1A\e[K${OK} - Removed existing 'sequoia_2' directory from the current location." 2>&1 | tee -a "$LOG"
-    fi
-
-    if git clone --depth 1 https://codeberg.org/JaKooLit/sddm-sequoia sequoia_2; then
-      while [ ! -d "sequoia_2" ]; do
-        sleep 1
-      done
-
-      if [ ! -d "/usr/share/sddm/themes" ]; then
-        sudo mkdir -p /usr/share/sddm/themes
-        echo -e "\e[1A\e[K${OK} - Directory '/usr/share/sddm/themes' created." 2>&1 | tee -a "$LOG"
-      fi
-
-      sudo mv sequoia_2 /usr/share/sddm/themes/sequoia_2
-      echo -e "[Theme]\nCurrent=sequoia_2" | sudo tee "$sddm_conf_dir/theme.conf.user" &>> "$LOG"
-
-      # replace current background from assets
-      sudo cp -r assets/sddm.png /usr/share/sddm/themes/sequoia_2/backgrounds/default
-      sudo sed -i 's|^wallpaper=".*"|wallpaper="backgrounds/default"|' /usr/share/sddm/themes/sequoia_2/theme.conf
-      
-      echo -e "\e[1A\e[K${OK} - ${MAGENTA}Additional SDDM Theme${RESET} successfully installed" | tee -a "$LOG" >&2
-
-    else
-      echo -e "\e[1A\e[K${ERROR} - Failed to clone the sddm theme repository. Please check your internet connection" | tee -a "$LOG" >&2
-    fi
-    valid_input=true
-  elif [[ $install_sddm_theme =~ ^[Nn]$ ]]; then
-    printf "\n%s - No SDDM themes will be installed.\n" "${NOTE}" 2>&1 | tee -a "$LOG"
-    valid_input=true
-  else
-    printf "\n%s - Invalid input. Please enter 'y' for Yes or 'n' for No.\n" "${ERROR}" 2>&1 | tee -a "$LOG"
-    install_sddm_theme=""
-  fi
-done
-
 printf "\n%.0s" {1..2}
\ No newline at end of file
diff --git a/install-scripts/sddm_theme.sh b/install-scripts/sddm_theme.sh
new file mode 100755
index 0000000..6382e6c
--- /dev/null
+++ b/install-scripts/sddm_theme.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# SDDM themes #
+
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+# Determine the directory where the script is located
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_sddm_theme.log"
+    
+# SDDM-themes
+printf "${INFO} Installing ${SKY_BLUE}Additional SDDM Theme${RESET}\n"
+
+# Check if /usr/share/sddm/themes/sequoia_2 exists and remove if it does
+if [ -d "/usr/share/sddm/themes/sequoia_2" ]; then
+  sudo rm -rf "/usr/share/sddm/themes/sequoia_2"
+  echo -e "\e[1A\e[K${OK} - Removed existing 'sequoia_2' directory." 2>&1 | tee -a "$LOG"
+fi
+
+# Check if sequoia_2 directory exists in the current directory and remove if it does
+if [ -d "sequoia_2" ]; then
+  rm -rf "sequoia_2"
+  echo -e "\e[1A\e[K${OK} - Removed existing 'sequoia_2' directory from the current location." 2>&1 | tee -a "$LOG"
+fi
+
+if git clone --depth 1 https://codeberg.org/JaKooLit/sddm-sequoia sequoia_2; then
+  while [ ! -d "sequoia_2" ]; do
+    sleep 1
+  done
+
+  if [ ! -d "/usr/share/sddm/themes" ]; then
+    sudo mkdir -p /usr/share/sddm/themes
+    echo -e "\e[1A\e[K${OK} - Directory '/usr/share/sddm/themes' created." 2>&1 | tee -a "$LOG"
+  fi
+
+  sudo mv sequoia_2 /usr/share/sddm/themes/sequoia_2
+  echo -e "[Theme]\nCurrent=sequoia_2" | sudo tee "$sddm_conf_dir/theme.conf.user" &>> "$LOG"
+
+  # replace current background from assets
+  sudo cp -r assets/sddm.png /usr/share/sddm/themes/sequoia_2/backgrounds/default
+  sudo sed -i 's|^wallpaper=".*"|wallpaper="backgrounds/default"|' /usr/share/sddm/themes/sequoia_2/theme.conf
+
+  echo -e "\e[1A\e[K${OK} - ${MAGENTA}Additional SDDM Theme${RESET} successfully installed" | tee -a "$LOG" >&2
+
+else
+  echo -e "\e[1A\e[K${ERROR} - Failed to clone the sddm theme repository. Please check your internet connection" | tee -a "$LOG" >&2
+fi
+
+
+printf "\n%.0s" {1..2}
\ No newline at end of file
diff --git a/install-scripts/thunar.sh b/install-scripts/thunar.sh
index 8101006..5e8d3f8 100755
--- a/install-scripts/thunar.sh
+++ b/install-scripts/thunar.sh
@@ -30,39 +30,11 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_thunar.log"
 
 # Thunar
-printf "${NOTE} Installing ${SKY_BLUE}Thunar${RESET} Packages...\n"  
+printf "${INFO} Installing ${SKY_BLUE}Thunar${RESET} Packages...\n"  
   for THUNAR in "${thunar[@]}"; do
     install_package "$THUNAR" "$LOG"
   done
 
-printf "\n%.0s" {1..1}
-
-if [[ $USE_PRESET = [Yy] ]]; then
-  source ./preset.sh
-fi
-
-# Confirm if wanted to set as default
-while true; do
-    if [[ -z $thunar_choice ]]; then
-        read -p "${CAT} want to set ${MAGENTA}Thunar${RESET} as the default file manager? (y/n): " thunar_choice
-    fi
-    case "$thunar_choice" in
-        [Yy]*)
-            xdg-mime default thunar.desktop inode/directory
-            xdg-mime default thunar.desktop application/x-wayland-gnome-saved-search
-            echo "${OK} ${MAGENTA}Thunar${RESET} is now set as the default file manager." | tee -a "$LOG"
-            break
-            ;;
-        [Nn]*)
-            echo "${NOTE} You chose not to set ${MAGENTA}Thunar${RESET} as the default file manager." | tee -a "$LOG"
-            break
-            ;;
-        *)
-            echo "${WARN} Invalid input. Please enter 'y' or 'n'."
-            ;;
-    esac
-done
-
 printf "\n%.0s" {1..1}
 
  # Check for existing configs and copy if does not exist
diff --git a/install-scripts/thunar_default.sh b/install-scripts/thunar_default.sh
new file mode 100755
index 0000000..576e76c
--- /dev/null
+++ b/install-scripts/thunar_default.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Thunar-default #
+
+
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+# Determine the directory where the script is located
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_thunar-default.log"
+
+printf "${INFO} Setting ${SKY_BLUE}Thunar${RESET} as default file manager...\n"  
+ 
+xdg-mime default thunar.desktop inode/directory
+xdg-mime default thunar.desktop application/x-wayland-gnome-saved-search
+echo "${OK} ${MAGENTA}Thunar${RESET} is now set as the default file manager." | tee -a "$LOG"
+
+printf "\n%.0s" {1..2}
diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh
index 7c03ad9..a3da1af 100755
--- a/install-scripts/zsh.sh
+++ b/install-scripts/zsh.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
-# zsh and oh my zsh including pokemon-color-scripts#
-
-if [[ $USE_PRESET = [Yy] ]]; then
-  source ./preset.sh
-fi
+# zsh and oh my zsh#
 
 zsh_pkg=(
   eza
@@ -32,36 +28,6 @@ for ZSH in "${zsh_pkg[@]}"; do
   install_package "$ZSH" "$LOG"
 done 
 
-## Optional Pokemon color scripts
-while true; do
-    if [[ -z $pokemon_choice ]]; then
-       read -p "${CAT} OPTIONAL - Do you want to add ${YELLOW}Pokemon color scripts${RESET}? (y/n): " pokemon_choice
-    fi
-    case "$pokemon_choice" in
-        [Yy]*)
-            sed -i '/#pokemon-colorscripts --no-title -s -r/s/^#//' assets/.zshrc >> "$LOG" 2>&1
-            sed -i '/^fastfetch -c $HOME\/.config\/fastfetch\/config-compact.jsonc/s/^/#/' assets/.zshrc >> "$LOG" 2>&1
-            
-            break
-            ;;
-        [Nn]*)
-            echo "${NOTE}Skipping Pokemon color scripts installation.${RESET}" 2>&1 | tee -a "$LOG"
-            break
-            ;;
-        *)
-            echo "${WARN}Please enter 'y' for yes or 'n' for no.${RESET}"
-            pokemon_choice=""  
-            ;;
-    esac
-done
-
-
-# Install the Pokemon color scripts if user choose Y
-if [[ "$pokemon_choice" =~ [Yy] ]]; then
-  echo "${NOTE} Installing ${SKY_BLUE}Pokemon color scripts${RESET} ..."
-  install_package 'pokemon-colorscripts-git' "$LOG"
-fi
-
 # Install Oh My Zsh, plugins, and set zsh as default shell
 if command -v zsh >/dev/null; then
   printf "${NOTE} Installing ${SKY_BLUE}Oh My Zsh and plugins${RESET} ...\n"
diff --git a/install-scripts/zsh_pokemon.sh b/install-scripts/zsh_pokemon.sh
new file mode 100755
index 0000000..54cbe39
--- /dev/null
+++ b/install-scripts/zsh_pokemon.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# pokemon-color-scripts#
+
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+# Determine the directory where the script is located
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh_pokemon.log"
+
+printf "${INFO} Installing ${SKY_BLUE}Pokemon color scripts${RESET} ..."
+install_package 'pokemon-colorscripts-git' "$LOG"
+
+# Check if ~/.zshrc exists
+if [ -f "$HOME/.zshrc" ]; then
+    sed -i '/#pokemon-colorscripts --no-title -s -r/s/^#//' "$HOME/.zshrc" >> "$LOG" 2>&1
+    sed -i '/^fastfetch -c $HOME\/.config\/fastfetch\/config-compact.jsonc/s/^/#/' "$HOME/.zshrc" >> "$LOG" 2>&11
+else
+    echo "$HOME/.zshrc not found. Cant enable ${YELLOW}Pokemon color scripts${RESET}" >> "$LOG" 2>&1
+fi
+  
+printf "\n%.0s" {1..2}
diff --git a/install.sh b/install.sh
index fb773bf..a684494 100755
--- a/install.sh
+++ b/install.sh
@@ -187,32 +187,67 @@ if lspci | grep -i "nvidia" &> /dev/null; then
     printf "${NOTE} Script will install ${YELLOW}nvidia-dkms nvidia-utils and nvidia-settings${RESET} \n"
     ask_yes_no "-Do you want script to configure ${YELLOW}NVIDIA${RESET} for you?" nvidia
 fi
-# Check first if yay or paru is installed before askiing aur helper
+
+if [[ "$nvidia" == "Y" ]]; then
+    ask_yes_no "-Would you like to ${YELLOW}blacklist nouveau?${RESET} (y/n): " nouveau
+fi
+
+# AUR helper
 if ! command -v yay &>/dev/null && ! command -v paru &>/dev/null; then
     printf "\n"
-    ask_custom_option "-Type ${YELLOW}AUR helper${RESET} wanted" "paru or yay" aur_helper
+    ask_custom_option "-Which ${YELLOW}AUR helper${RESET} would you like to use? (paru or yay): " "paru or yay" aur_helper
 fi
+
 printf "\n"
 ask_yes_no "-Install ${YELLOW}GTK themes${RESET} (required for Dark/Light function)?" gtk_themes
+
 printf "\n"
 ask_yes_no "-Do you want to configure ${YELLOW}Bluetooth${RESET}?" bluetooth
+
 printf "\n"
 ask_yes_no "-Do you want to install ${YELLOW}Thunar file manager${RESET}?" thunar
+
+if [[ "$thunar" == "Y" ]]; then
+    ask_yes_no "-Set ${YELLOW}Thunar${RESET} as the default file manager? (y/n): " thunar_choice
+fi
+
+# Input group
+printf "\n"
+if ! groups "$(whoami)" | grep -q '\binput\b'; then
+    printf "${NOTE} Please note that adding yourself to the ${YELLOW}input${RESET} group might be necessary for ${YELLOW}waybar keyboard-state functionality${RESET} \n."
+    ask_yes_no "-Would you like to be added to the ${YELLOW}input${RESET} group? (y/n)" input_group
+fi
+
 printf "\n"
 printf "${NOTE} ${YELLOW}AGS Desktop Overview DEMO link${RESET} on README\n"
 ask_yes_no "-Install ${YELLOW}AGS (aylur's GTK shell) v1${RESET} for Desktop-Like Overview?" ags
+
 printf "\n"
-ask_yes_no "-Install & configure ${YELLOW}SDDM${RESET} login manager, plus (OPTIONAL) SDDM theme?" sddm
+ask_yes_no "-Install & configure ${YELLOW}SDDM${RESET} as login manager?" sddm
+
+if [[ "$sddm" == "Y" ]]; then
+    ask_yes_no "-Download and Install ${YELLOW}SDDM Theme?${RESET} (y/n): " sddm_theme
+fi
+
 printf "\n"
 ask_yes_no "-Install ${YELLOW}XDG-DESKTOP-PORTAL-HYPRLAND${RESET}? (For proper Screen Share, e.g., OBS)" xdph
+
 printf "\n"
-ask_yes_no "-Install ${YELLOW}zsh${RESET}, ${YELLOW}oh-my-zsh${RESET} & (Optional) ${YELLOW}pokemon-colorscripts${RESET}?" zsh
+ask_yes_no "-Install ${YELLOW}zsh${RESET} with ${YELLOW}oh-my-zsh?${RESET}" zsh
+
+if [[ "$zsh" == "Y" ]]; then
+    ask_yes_no "-Add ${YELLOW}Pokemon color scripts${RESET}? in your terminal? (y/n): " pokemon_choice
+fi
+
 printf "\n"
 ask_yes_no "-Installing on ${YELLOW}Asus ROG laptops${RESET}?" rog
+
 printf "\n"
-ask_yes_no "-Do you want to download pre-configured ${YELLOW}KooL's Hyprland dotfiles?${RESET}" dots
+ask_yes_no "-Do you want to add pre-configured ${YELLOW}KooL's Hyprland dotfiles?${RESET}" dots
+
 printf "\n"
 
+
 # Ensuring all in the scripts folder are made executable
 chmod +x install-scripts/*
 
@@ -244,6 +279,9 @@ execute_script "hyprland.sh"
 if [ "$nvidia" == "Y" ]; then
     execute_script "nvidia.sh"
 fi
+if [ "$nouveau" == "Y" ]; then
+    execute_script "nvidia_nouveau.sh"
+fi
 
 if [ "$gtk_themes" == "Y" ]; then
     execute_script "gtk_themes.sh"
@@ -256,6 +294,10 @@ fi
 if [ "$thunar" == "Y" ]; then
     execute_script "thunar.sh"
 fi
+if [ "$thunar_choice" == "Y" ]; then
+    execute_script "thunar_default.sh"
+fi
+
 if [ "$ags" == "Y" ]; then
     execute_script "ags.sh"
 fi
@@ -264,6 +306,10 @@ if [ "$sddm" == "Y" ]; then
     execute_script "sddm.sh"
 fi
 
+if [ "$sddm_theme" == "Y" ]; then
+    execute_script "sddm_theme.sh"
+fi
+
 if [ "$xdph" == "Y" ]; then
     execute_script "xdph.sh"
 fi
@@ -272,7 +318,13 @@ if [ "$zsh" == "Y" ]; then
     execute_script "zsh.sh"
 fi
 
-execute_script "InputGroup.sh"
+if [ "$pokemon_choice" == "Y" ]; then
+    execute_script "zsh_pokemon.sh"
+fi
+
+if [ "$input_group" == "Y" ]; then
+    execute_script "InputGroup.sh"
+fi
 
 if [ "$rog" == "Y" ]; then
     execute_script "rog.sh"
diff --git a/preset.sh b/preset.sh
index e30e992..c9e37d2 100644
--- a/preset.sh
+++ b/preset.sh
@@ -6,41 +6,46 @@
 # Make sure proper AUR Helper is use NO Upperscript. Either paru or yay only is accepted
 # The rest Change to Y for Yes and N for No. 
 
-### -Type AUR helper
+###-Configure NVIDIA
+nvidia="Y"
+### Would you like to blacklist nouveau? (y/n)
+blacklist_nouveau="Y"
+
 ### yay or paru 
 aur_helper="yay"
-###-Do you have any nvidia gpu in your system?
-nvidia="Y"
+
 ###-Install GTK themes (required for Dark/Light function)?
 gtk_themes="Y"
+
 ###-Do you want to configure Bluetooth?
 bluetooth="Y"
+
 ###-Do you want to install Thunar file manager?
 thunar="Y"
+### Do you want to set Thunar as the default file manager? (y/n): "
+thunar_choice="Y"
+
+
+### " Please note that adding yourself to the 'input' group might be necessary for waybar keyboard-state functionality."
+input_group="Y"
+
 ### Install ${YELLOW}AGS (aylur's GTK shell) v1${RESET} for Desktop-Like Overview?" 
 ags="Y"
+
 ###-Install & configure SDDM log-in Manager plus (OPTIONAL) SDDM Theme?
 sddm="Y"
+### Would you like to install SDDM themes? (y/n)
+sddm_theme="Y"
+
 ###-Install XDG-DESKTOP-PORTAL-HYPRLAND? (For proper Screen Share ie OBS)
 xdph="Y"
+
 ###-Install zsh, oh-my-zsh & (Optional) pokemon-colorscripts?
 zsh="Y"
+### OPTIONAL - Do you want to add Pokemon color scripts? (y/n): 
+pokemon_choice="Y"
+
 ###-Installing in a Asus ROG Laptops?
 rog="N"
 ###-Do you want to download pre-configured Hyprland dotfiles?
 dots="Y"
-
-### These are the sub-questions of the above choices
-### Would you like to blacklist nouveau? (y/n)
-blacklist_nouveau="Y"
-### Do you want to set Thunar as the default file manager? (y/n): "
-thunar_choice="Y"
-### OPTIONAL - Would you like to install SDDM themes? (y/n)
-install_sddm_theme="Y"
-### " This script will add your user to the 'input' group."
-### " Please note that adding yourself to the 'input' group might be necessary for waybar keyboard-state functionality."
-input_group_choid="Y"
-### OPTIONAL - Do you want to add Pokemon color scripts? (y/n): 
-pokemon_choice="Y"
-### Do you want to upgrade to the latest version? (y/n) - This is for the dotfiles
-upgrade_choice="Y"
\ No newline at end of file