2025-12-21 18:20:13 +01:00
70 changed files with 1221 additions and 7142 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1 +0,0 @@
 blank_issues_enabled: false
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@ -1,348 +1,168 @@
-## CHANGELOGS
+## Changelogs
 ## 10 December 2025
 - Updated:
    - Hyprland Build to v0.52.2
    - Thanks entirely to @sdegler
 - Fixed:
    - `qt5-style-kvantum-themes` failed to install
        - Wrong package name it's `qt-style-kvantume-themes`
    - `libdisplay-info2` failed to install
        - New package name: `libdisplay-info3`
 ## 10 October 2025
 ### Hyprland 0.51.x install support
 -     Hyprland builds 0.51.x from source
 -     Added documentation for upgrading from 0.49/0.50.x to 0.51.1.
 ### New scripts and modules
    - update-hyprland.sh: Manage the Hyprland stack with:
      - --install / --dry-run build modes
      - --only and --skip for selective components
      - --with-deps to (re)install build deps
      - --set {KEY=TAG} and --restore tag backup support
      - --fetch-latest to pull latest GitHub release tags
      - --via-helper to delegate summary-only dry-runs
    - dry-run-build.sh: Compile-only helper with summary output
    - install-scripts/wayland-protocols-src.sh: Build wayland-protocols from
      source (>= 1.45) to satisfy Hyprland 0.51.x requirements
 ### Core features
    - Centralized tag management via hypr-tags.env; tags exported to all
      modules. Environment overrides remain first priority.
    - Automatic dependency ordering for Hyprland 0.51.x:
      wayland-protocols-src → hyprland-protocols → hyprutils → hyprlang →
      aquamarine → hyprland
    - Optional auto-fetch of latest tags on install runs that include
      hyprland (can be disabled via --no-fetch)
    - Selective updates for targeted components and skip lists
    - Dry-run mode to validate builds without installing
 ### Installer integration
    - install.sh reads hypr-tags.env and optionally refreshes tags.
    - Ensures wayland-protocols-src is built before Hyprland.
    - Maintains proper sequencing for the Hyprland dependencies.
 ### Docs
    - Debian-Hyprland-Install-Upgrade.md and .es.md:
      - Add explicit section: Upgrade 0.49/0.50.x → 0.51.1
      - Recommend: `./update-hyprland.sh --install --only hyprland`
      - Provide optional `--with-deps` and `--dry-run` flows
    - Full install via install.sh is not required for this
      upgrade unless optional modules need refresh
 ### Usage highlights
    - Pin and upgrade to 0.51.1:
      ./update-hyprland.sh --set HYPRLAND=v0.51.1
      ./update-hyprland.sh --install --only hyprland
    - Optional:
      ./update-hyprland.sh --with-deps --install --only hyprland
      ./update-hyprland.sh --dry-run --only hyprland
 ### Notes
    - Target OS remains Debian Trixie/Testing/SID
    - Run as sudo-capable user (not root)
    - Ensure deb-src entries are enabled.
 ## 22 July 2025
 - Updated sddm theme and script to work with the updated simple_sddm_2 theme
 - Manual building process
 ## 21 June 2025
 - Added a warning message that support is now very limited
 ## 08 June 2025
 - updated SDDM theme.
 ## 20 March 2025
 - added findutils as dependencies
 ## 11 March 2025
 - Added uninstall script
 - forked AGS v1 into JakooLit repo. This is just incase Aylur decide to take down v1
 ## 10 March 2025
 - Dropped pyprland in favor of hyprland built in tool for a drop down like terminal and Desktop magnifier
 ## 06 March 2025
 - Switched to whiptail version for Y & N questions
 - switched eza to lsd
 ## 23 Feb 2025
 - added Victor Mono Font for proper hyprlock font rendering for Dots v2.3.12
 - added Fantasque Sans Mono Nerd for Kitty
 ## 22 Feb 2025
 - replaced eog with loupe
 - changed url for installing oh-my-zsh to get wider coverage. Some countries are blocking github raw url's
 ## 18 Feb 2025
 - Change default zsh theme to adnosterzak
 - pokemon coloscript integrated with fastfetch when opted with pokemon to add some bling
 - additional external oh-my-zsh theme
 ## 06 Feb 2025
 - added semi-unattended function.
 - move all the initial questions at the beginning
 ## 04 Feb 2025
 - Re-coded for better visibility
 - Offered a new SDDM theme.
 - script will automatically detect if you have nvidia but script still offer if you want to set up for user
 ## 30 Jan 2025
 - AGS (aylur's GTK shell) v1 for desktop overview is now optional
 ## 12 Jan 2025
 - switch to final version of aylurs-gtk-shell-v1
 ## 01 Jan 2025
 - Switched to download dots from KooL's Hyprland dots specific branch
 ## 26 Dec 2024
 - Removal of Bibata Ice cursor on assets since its integrated in the GTK Themes and Icons extract from a separate repo
 ## 10 Dec 2024
 - updated swww.sh to download from version v0.9.5
 ## 24 Nov 2024
 - switched to download rofi-wayland from releases instead from upstream
 ## 20 Sep 2024
 - User will be ask if they want to set Thunar as default file manager if they decided to install it
 ## 19 Sep 2024
 - updated xdph installation since it is now in Debian Repo
 - Added fastfetch on tty. However, will be disabled if user decided to install pokemon colorscripts
 ## 14 Sep 2024
 - Added Essential Packages final check in lieu of errors from Install log files in Install-Logs directory
 - nwg-look is now in Debian Repo
 ## 10 Sep 2024
 - added background check of known login managers if they are active if user chose to install sddm
 ## 08 Sep 2024
 - Added final error checks on install-logs
 ## 07 Sep 2024
 - Fix installation issue on hyprlock and xdph
 - disabled imagemagick compilation from source
 - dotfiles adjusted so it will be compatible for imagemagick v6
 ## 04 Sep 2024
 - added a function to check if it is Ubuntu or Based on Ubuntu and script will exit
 ## 28 Aug 2024
 - Added final check if hyprland is installed and will give an error to user
 ## 24 Aug 2024
 - Created a newer and compatible Hyprland-Dots repo
 - 
 ## 23 Aug 2024
 - Moved Ubuntu-Hyprland on a separate Github Repo
 ## 22 Aug 2024
 - refactor Debian-Hyprland script. As Hyprland is now in official repo
 ## 07 Jul 2024
 - added eza (ls replacement for tty). Note only on .zshrc
 ## 06 July 2024
 - Version bumps for Debian (Hyprland v0.41.2)
 ## 11 June 2024
 - adjusted script to install only Hyprland-Dots v2.2.14
 ## 10 June 2024
 - changed behaviour of rofi-wayland.sh. To redownload a new rofi-wayland from repo instead of pulling changes. (It proves giving issue)
 ## 04 June 2024
 - switched over to source install for imagemagick
 - removal of fzf for Debian and Ubuntu (headache)
 ## 26 May 2024
 - Added fzf for zsh (CTRL R to invoke FZF history)
 ## 23 May 2024
 - added qalculate-gtk to work with rofi-calc. Default keybinds (SUPER ALT C)
 - added power-profiles-daemon for ROG laptops. Note, I cant add to all since it conflicts with TLP, CPU-Auto-frequency etc.
 - Note: Fastfetch configs will be added from Hyprland-Dots v2.2.12. However, you need to install from Fastfetch github page
 ## 19 May 2024
 - Disabled the auto-login in .zprofile as it causes auto-login to Hyprland if any wayland was chosen. Can enabled if only using hyprland
 ## 15 May 2025
 - Backed down hyprland version to install as v0.40.0 is failing to install
 - removed from waybar-git to install. Instead to install from official repo
 - cliphist install script is removed as it is now on Debian repo
 - dependencies cleaned up and added
 ## 10 May 2024
 - added wallust-git and remove python-pywal for migration to wallust on Hyprland-Dots v2.2.11
 ## 07 May 2024
 - added ags.sh for upcoming ags overview for next Hyprland-Dots release. Will be installed form source
 - added manual installation of waybar since Debian is very slow in updating their packages
 ## 03 May 2024
 - Bump swww to v0.9.5
 - added python3-pyquery for new weather-waybar python based on Hyprland-Dots
 ## 02 May 2024
 - Added pyprland (hyprland plugin) - warning, I cant make it to properly run. Drop Down terminal not working, zoom is hit and miss
 ## 30 Apr 2024
 - Updated hyprland.sh to install v0.39.1 Hyprland
 - adding hypridle and hyprlock
 - dropping swaylock-effects and swayidle
 - adjusted to work with current Hyprland-Dots
 ## 22 Apr 2024
 - Change dotfiles to specific version only as Debian and Ubuntu cant keep up with Hyprland development
 ## 20 Apr 2024
 - Change default Oh-my-zsh theme to xiong-chiamiov-plus
 ## 11 Jan 2024
 - dropped wlsunset
 - added hyprlang build and install
 ## 02 Jan 2024
 - Readme updated for cliphist instruction for ubuntu 23.10 users
 - Created cliphist.sh for ubuntu 23.10 users (disabled by default and needs to be enabled on install.sh if desired)
 ## 30 December 2023
 - Code Cleaned up.
 - Pokemon Color Scripts now offered as optional
 ## 29 December 2023
 - Remove dunst in favor of swaync. NOTE: Part of the script is to also uninstall mako and dunst (if installed) as on my experience, dunst is sometimes taking over the notification even if it is not set to start
 ## 16 Dec 2023
 - zsh theme switched to `agnoster` theme by default
 - pywal tty color change disabled by default
 ## 13 Dec 2023
 - Added a script / function to force install packages. Some users reported that it is not installed.
 ## 11 Dec 2023
 - Changing over to zsh automatically if user opted
 - If chose to install zsh and have no login manager, zsh auto login will auto start Hyprland
 - added as optional, with zsh, pokemon colorscripts
 - improved zsh install scripts, so even the existing zsh users of can still opt for zsh and oh-my-zsh installation :)
 ## 03 Dec 2023
 - Added kvantum for qt apps theming
 - return of wlogout due to theming issues of rofi-power
 ## 1 Dec 2023
 - replace the Hyprland to specific branch/version as newest needed some new libraries and debian dont have those yet
 ## 26 Nov 2023
 - nvidia - Move to normal hyprland package as nvidia patches are doing nothing see [`commit`](https://github.com/hyprwm/Hyprland/commit/cd96ceecc551c25631783499bd92c6662c5d3616)
 ## 25 Nov 2023
 - drop wlogout since Hyprland-Dots v2.1.9 uses rofi-power
 ## 23-Nov-2023
 - Added Bibata cursor to install if opted for GTK Themes. However, it is not pre-applied. Use nwg-look utility to apply
 ## 19-Nov-2023
 - Adjust dotfiles script to download from releases instead of from upstream
 ## 14-Oct-2023
 - initial release. Added swappy for screenshots
 ## 12-Oct-2023
 - BETA release
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,6 +1,6 @@
-# Contributing to KooL Hyprland Projects
+# Contributing to Community Standards
-Thank you for your interest in contributing to KooL Hyprland Projects! We welcome any contributions, including bug fixes, feature enhancements, documentation improvements, and other general improvements.
+Thank you for your interest in contributing to Community Standards! We welcome any contributions, including bug fixes, feature enhancements, documentation improvements, and other general improvements.
 ## Getting Started
@ -55,9 +55,10 @@ Thank you for your interest in contributing to KooL Hyprland Projects! We welcom
 - Make sure all tests pass or fully tested before submitting your changes.
 - Keep your pull request focused and avoid including unrelated changes.
 - Remember to follow the following files before submitting your changes.
-  - [bug.yml](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/bug.yml) - Use this template to create a report to help us improve.
+  - [bug_report.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) - Use this template to create a report to help us improve.
-  - [feature.yml](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/feature.yml) - Use this template to suggest a feature for this project.
+  - [feature_request.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - Use this template to suggest a feature for this project.
-  - [documentation-update.yml](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/documentation-update.yml) - Use this template to propose a change to the documentation.
+  - [documentation_update.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/documentation_update.md) - Use this template to propose a change to the documentation.
  - [custom.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/custom.md) - Use this template to submit a custom issue.
  - [PULL_REQUEST_TEMPLATE.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/PULL_REQUEST_TEMPLATE.md) - Use this template to submit a pull request.
  - [COMMIT_MESSAGE_GUIDELINES.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/COMMIT_MESSAGE_GUIDELINES.md) - Read this file to learn about the commit message guidelines.
  - [CONTRIBUTING.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/CONTRIBUTING.md) - Read this file to learn about the contributing guidelines.
@ -66,4 +67,4 @@ Thank you for your interest in contributing to KooL Hyprland Projects! We welcom
 ## Contact
-If you have any questions, feel free to contact via [GitHub Discussions](https://github.com/JaKooLit/Debian-Hyprland/discussions) or [Through Discord Server](https://discord.gg/kool-tech-world)
+If you have any questions, feel free to contact via [GitHub Discussions](https://github.com/JaKooLit/Debian-Hyprland/discussions) or [Through Discord Server](https://discord.gg/V2SJ92vbEN)
--- a/Debian-Hyprland-Install-Upgrade.es.md
+++ b/Debian-Hyprland-Install-Upgrade.es.md
@ -1,423 +0,0 @@
 # Guía de Instalación y Actualización de Debian-Hyprland
 Esta guía cubre los flujos de instalación y actualización mejorados para el proyecto Debian-Hyprland de KooL, incluyendo nuevas funciones de automatización, gestión centralizada de versiones y capacidades de dry-run.
 ## Tabla de Contenidos
 1. [Resumen](#resumen)
 2. [Nuevas Funciones](#nuevas-funciones)
 3. [Gestión Central de Versiones](#gestión-central-de-versiones)
 4. [Métodos de Instalación](#métodos-de-instalación)
 5. [Flujos de Actualización](#flujos-de-actualización)
 6. [Pruebas con Dry-Run](#pruebas-con-dry-run)
 7. [Gestión de Logs](#gestión-de-logs)
 8. [Uso Avanzado](#uso-avanzado)
 9. [Solución de Problemas](#solución-de-problemas)
 ## Resumen
 El proyecto Debian-Hyprland ahora incluye herramientas de automatización y gestión mejoradas, manteniendo la compatibilidad con el script original install.sh. Las principales adiciones son:
 - **Gestión centralizada de versiones** mediante `hypr-tags.env`
 - **Orden automático de dependencias** para los requisitos de Hyprland 0.51.x
 - **Pruebas de compilación con dry-run** sin modificar el sistema
 - **Actualizaciones selectivas de componentes** con `update-hyprland.sh`
 - **Obtención automática de últimas versiones** desde GitHub
 ## Nuevas Funciones
 ### install.sh mejorado
 El script original ahora:
 - **Unifica versiones**: Lee `hypr-tags.env` y exporta variables de versión a todos los módulos
 - **wayland-protocols automático**: Instala wayland-protocols desde el código fuente (≥1.45) antes de Hyprland
 - **Orden robusto de dependencias**: Garantiza la secuencia correcta de requisitos
 ### Nuevos Scripts
 #### update-hyprland.sh
 Herramienta enfocada para gestionar y compilar solo el stack de Hyprland:
 ```bash
 chmod +x ./update-hyprland.sh
 ./update-hyprland.sh --help  # Ver todas las opciones
 ```
 #### dry-run-build.sh
 Herramienta de pruebas que compila componentes sin instalarlos:
 ```bash
 chmod +x ./dry-run-build.sh
 ./dry-run-build.sh --help  # Ver todas las opciones
 ```
 #### wayland-protocols-src.sh
 Módulo que compila wayland-protocols desde el origen para satisfacer los requisitos de Hyprland 0.51.x.
 ## Gestión Central de Versiones
 ### hypr-tags.env
 Archivo con etiquetas de versión para todos los componentes de Hyprland:
 ```bash
 # Versiones actuales (ejemplo)
 HYPRLAND_TAG=v0.51.1
 AQUAMARINE_TAG=v0.9.3
 HYPRUTILS_TAG=v0.8.2
 HYPRLANG_TAG=v0.6.4
 HYPRGRAPHICS_TAG=v0.1.5
 HYPRWAYLAND_SCANNER_TAG=v0.4.5
 HYPRLAND_PROTOCOLS_TAG=v0.6.4
 HYPRLAND_QT_SUPPORT_TAG=v0.1.0
 HYPRLAND_QTUTILS_TAG=v0.1.4
 WAYLAND_PROTOCOLS_TAG=1.45
 ```
 ### Prioridad de Sobrescritura de Versiones
 1. Variables de entorno (exportadas)
 2. Valores en el archivo `hypr-tags.env`
 3. Valores por defecto en cada módulo
 ## Métodos de Instalación
 ### Método 1: Instalación Completa Original
 ```bash
 # Instalación estándar con todos los componentes
 chmod +x install.sh
 ./install.sh
 ```
 Ahora, este método automáticamente:
 - Carga versiones desde `hypr-tags.env`
 - Instala wayland-protocols desde el origen antes de Hyprland
 - Mantiene el orden correcto de dependencias
 ### Método 2: Solo el Stack de Hyprland
 ```bash
 # Instala solo Hyprland y componentes esenciales
 ./update-hyprland.sh --install
 ```
 ### Método 3: Instalación Nueva con Últimas Versiones
 ```bash
 # Obtiene últimas versiones de GitHub e instala
 ./update-hyprland.sh --fetch-latest --install
 ```
 ### Método 4: Instalación con Preset
 ```bash
 # Usa un preset para elecciones automáticas
 ./install.sh --preset ./preset.sh
 ```
 ## Flujos de Actualización
 Enlace rápido: [Actualización 0.49/0.50.x → 0.51.1](#actualización-049050x--0511)
 ### Actualizar a la Última Versión de Hyprland
 #### Opción A: Descubrimiento Automático
 ```bash
 # Obtiene las últimas etiquetas e instala
 ./update-hyprland.sh --fetch-latest --install
 ```
 #### Opción B: Versión Específica
 ```bash
 # Establece una versión específica de Hyprland
 ./update-hyprland.sh --set HYPRLAND=v0.51.1 --install
 ```
 #### Opción C: Probar Antes de Instalar
 ```bash
 # Prueba la compilación primero, luego instala si es exitoso
 ./update-hyprland.sh --fetch-latest --dry-run
 # Si es exitoso:
 ./update-hyprland.sh --install
 ```
 ### Actualizar Componentes Individuales
 ```bash
 # Actualiza solo librerías núcleo (a menudo necesario para nuevas versiones de Hyprland)
 ./update-hyprland.sh --fetch-latest --install --only hyprutils,hyprlang
 # Actualiza aquamarine específicamente
 ./update-hyprland.sh --set AQUAMARINE=v0.9.3 --install --only aquamarine
 ```
 ### Actualizaciones Selectivas
 ```bash
 # Instalar todo excepto los componentes Qt
 ./update-hyprland.sh --install --skip hyprland-qt-support,hyprland-qtutils
 # Instalar solo componentes específicos
 ./update-hyprland.sh --install --only hyprland,aquamarine
 ```
 ### Actualización: 0.49/0.50.x ➜ 0.51.1
 Si actualmente estás en Hyprland 0.49 o 0.50.x, puedes actualizar directamente a 0.51.1 sin una reinstalación completa.
 Ruta recomendada:
 ```bash
 # Asegura que hypr-tags.env apunte a la versión objetivo (omitir si ya es v0.51.1)
 ./update-hyprland.sh --set HYPRLAND=v0.51.1
 # Actualiza Hyprland (los prerrequisitos se incluyen y ordenan automáticamente)
 ./update-hyprland.sh --install --only hyprland
 ```
 Notas:
 - El comando garantiza y ejecuta, según sea necesario: wayland-protocols-src, hyprland-protocols, hyprutils, hyprlang, aquamarine y luego hyprland.
 - No es necesario usar install.sh para esta actualización, a menos que también quieras instalar/actualizar módulos opcionales (p. ej., SDDM, Bluetooth, Thunar, AGS, dotfiles) o estés recuperándote de una instalación fallida/parcial.
 - Opcional: agrega --with-deps para reinstalar dependencias primero:
 ```bash
 ./update-hyprland.sh --with-deps --install --only hyprland
 ```
 - Puedes hacer un dry-run primero para validar:
 ```bash
 ./update-hyprland.sh --dry-run --only hyprland
 ```
 ## Pruebas con Dry-Run
 ### ¿Por qué usar Dry-Run?
 - Probar compatibilidad de compilación antes de instalar
 - Validar combinaciones de versiones
 - Depurar problemas de compilación sin cambios en el sistema
 - Integración en CI/CD
 ### Uso Básico de Dry-Run
 ```bash
 # Probar la configuración actual de versiones
 ./update-hyprland.sh --dry-run
 # Probar con últimas versiones de GitHub
 ./update-hyprland.sh --fetch-latest --dry-run
 # Probar una versión específica
 ./update-hyprland.sh --set HYPRLAND=v0.51.1 --dry-run
 ```
 ### Pruebas Avanzadas con Dry-Run
 ```bash
 # Formato alternativo de resumen
 ./update-hyprland.sh --via-helper
 # Probar con instalación de dependencias
 ./dry-run-build.sh --with-deps
 # Probar solo componentes específicos
 ./dry-run-build.sh --only hyprland,aquamarine
 ```
 ### Limitaciones de Dry-Run
 - **Las dependencias se instalan**: apt se ejecuta para asegurar la compilación
 - **Requisitos de pkg-config**: Algunos componentes necesitan requisitos instalados en el sistema
 - **Sin cambios en el sistema**: No instala archivos en /usr/local o /usr
 ## Gestión de Logs
 ### Ubicación de Logs
 Todas las actividades de construcción generan logs con sello de tiempo en:
 ```
 Install-Logs/
 ├── 01-Hyprland-Install-Scripts-YYYY-MM-DD-HHMMSS.log  # Log principal de instalación
 ├── install-DD-HHMMSS_module-name.log                   # Logs por módulo
 ├── build-dry-run-YYYY-MM-DD-HHMMSS.log                # Resumen de dry-run
 └── update-hypr-YYYY-MM-DD-HHMMSS.log                  # Resumen de actualización
 ```
 ### Análisis de Logs
 ```bash
 # Ver el log de instalación más reciente
 ls -t Install-Logs/*.log | head -1 | xargs less
 # Buscar errores en un módulo específico
 grep -i error Install-Logs/install-*hyprland*.log
 # Ver resumen de dry-run
 cat Install-Logs/build-dry-run-*.log
 ```
 ### Retención de Logs
 - Los logs se acumulan con el tiempo para referencia histórica
 - Se recomienda limpieza manual periódica:
 ```bash
 # Mantener solo logs de los últimos 30 días
 find Install-Logs/ -name "*.log" -mtime +30 -delete
 ```
 ## Uso Avanzado
 ### Gestión de Versiones
 #### Copia de Seguridad y Restauración
 ```bash
 # Las etiquetas se respaldan automáticamente cuando cambian
 # Restaurar la copia más reciente
 ./update-hyprland.sh --restore --dry-run
 ```
 #### Múltiples Conjuntos de Versiones
 ```bash
 # Guardar configuración actual
 cp hypr-tags.env hypr-tags-stable.env
 # Probar versiones experimentales
 ./update-hyprland.sh --fetch-latest --dry-run
 # Restaurar estable si es necesario
 cp hypr-tags-stable.env hypr-tags.env
 ```
 ### Integración con el Entorno
 #### PKG_CONFIG_PATH personalizado
 ```bash
 # Asegurar que /usr/local tenga prioridad
 export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:${PKG_CONFIG_PATH:-}"
 ./update-hyprland.sh --install
 ```
 #### Compilaciones en Paralelo
 ```bash
 # Controlar el paralelismo (por defecto: todos los núcleos)
 export MAKEFLAGS="-j4"
 ./update-hyprland.sh --install
 ```
 ### Flujo de Trabajo de Desarrollo
 #### Probar Nuevos Lanzamientos
 ```bash
 # 1. Crear entorno de pruebas
 cp hypr-tags.env hypr-tags.backup
 # 2. Probar nueva versión
 ./update-hyprland.sh --set HYPRLAND=v0.52.0 --dry-run
 # 3. Instalar si es exitoso
 ./update-hyprland.sh --install
 # 4. Revertir si hay problemas
 ./update-hyprland.sh --restore --install
 ```
 #### Desarrollo de Componentes
 ```bash
 # Solo instalar dependencias
 ./update-hyprland.sh --with-deps --dry-run
 # Pruebas manuales de módulo
 DRY_RUN=1 ./install-scripts/hyprland.sh
 # Ver logs de un módulo específico
 tail -f Install-Logs/install-*hyprland*.log
 ```
 ## Solución de Problemas
 ### Problemas Comunes
 #### Falla de Configuración con CMake
 **Síntomas**: "Package dependency requirement not satisfied"
 **Soluciones**:
 ```bash
 # Instalar requisitos faltantes
 ./update-hyprland.sh --install --only wayland-protocols-src,hyprutils,hyprlang
 # Limpiar caché de compilación
 rm -rf hyprland aquamarine hyprutils hyprlang
 # Reintentar instalación
 ./update-hyprland.sh --install --only hyprland
 ```
 #### Errores de Compilación
 **Síntomas**: "too many errors emitted"
 **Soluciones**:
 ```bash
 # Actualizar dependencias núcleo primero
 ./update-hyprland.sh --fetch-latest --install --only hyprutils,hyprlang
 # Revisar incompatibilidades de API en logs
 grep -A5 -B5 "error:" Install-Logs/install-*hyprland*.log
 ```
 #### Etiqueta No Encontrada
 **Síntomas**: "Remote branch X not found"
 **Soluciones**:
 ```bash
 # Ver etiquetas disponibles
 git ls-remote --tags https://github.com/hyprwm/Hyprland
 # Usar etiqueta confirmada
 ./update-hyprland.sh --set HYPRLAND=v0.50.1 --install
 ```
 ### Pasos de Depuración
 1. **Verificar compatibilidad del sistema**:
   ```bash
   # Verificar versión de Debian
   cat /etc/os-release
   # Asegurar deb-src habilitado
   grep -E "^deb-src" /etc/apt/sources.list
   ```
 2. **Verificar entorno**:
   ```bash
   # Ver etiquetas actuales
   cat hypr-tags.env
   # Probar dry-run primero
   ./update-hyprland.sh --dry-run --only hyprland
   ```
 3. **Analizar logs**:
   ```bash
   # Errores más recientes
   grep -i "error\|fail" Install-Logs/*.log | tail -20
   # Problemas por módulo
   ls -la Install-Logs/install-*[component]*.log
   ```
 ### Obtener Ayuda
 1. **Revisar logs**: Consulte siempre Install-Logs/ para detalles
 2. **Probar dry-run**: Valide antes de instalar
 3. **Soporte de la comunidad**: Envíe issues con extractos de logs
 4. **Documentación**: Consulte README.md del proyecto para requisitos base
 ## Migración desde Versiones Previas
 ### Instalaciones Existentes
 Las nuevas herramientas funcionan junto a instalaciones existentes:
 ```bash
 # Actualizar instalación existente
 ./update-hyprland.sh --install
 # Probar sin afectar el sistema actual
 ./update-hyprland.sh --dry-run
 ```
 ### Convertir a Gestión por Etiquetas
 ```bash
 # Las versiones actuales se guardan en hypr-tags.env automáticamente
 # Verificar con:
 cat hypr-tags.env
 # Modificar versiones según necesidad:
 ./update-hyprland.sh --set HYPRLAND=v0.51.1
 ```
 El flujo mejorado ofrece mayor control, capacidad de prueba y automatización, manteniendo la compatibilidad total con el proceso de instalación original.
--- a/Debian-Hyprland-Install-Upgrade.md
+++ b/Debian-Hyprland-Install-Upgrade.md
@ -1,423 +0,0 @@
 # Debian-Hyprland Install & Upgrade Guide
 This guide covers the enhanced installation and upgrade workflows for KooL's Debian-Hyprland project, including new automation features, centralized version management, and dry-run capabilities.
 ## Table of Contents
 1. [Overview](#overview)
 2. [New Features](#new-features)
 3. [Central Version Management](#central-version-management)
 4. [Installation Methods](#installation-methods)
 5. [Upgrade Workflows](#upgrade-workflows)
 6. [Dry-Run Testing](#dry-run-testing)
 7. [Log Management](#log-management)
 8. [Advanced Usage](#advanced-usage)
 9. [Troubleshooting](#troubleshooting)
 ## Overview
 The Debian-Hyprland project now includes enhanced automation and management tools while maintaining backward compatibility with the original install.sh script. The key additions are:
 - **Centralized version management** via `hypr-tags.env`
 - **Automated dependency ordering** for Hyprland 0.51.x requirements
 - **Dry-run compilation testing** without system modifications
 - **Selective component updates** via `update-hyprland.sh`
 - **GitHub latest tag fetching** for automatic version discovery
 ## New Features
 ### Enhanced install.sh
 The original install.sh script now includes:
 - **Tag consistency**: Reads `hypr-tags.env` and exports version variables to all modules
 - **Automatic wayland-protocols**: Installs wayland-protocols from source (≥1.45) before Hyprland
 - **Robust dependency ordering**: Ensures prerequisites are built in the correct sequence
 ### New Scripts
 #### update-hyprland.sh
 A focused tool for managing and building just the Hyprland stack:
 ```bash
 chmod +x ./update-hyprland.sh
 ./update-hyprland.sh --help  # View all options
 ```
 #### dry-run-build.sh
 A testing tool that compiles components without installing:
 ```bash
 chmod +x ./dry-run-build.sh
 ./dry-run-build.sh --help  # View all options
 ```
 #### wayland-protocols-src.sh
 A new module that builds wayland-protocols from source to satisfy Hyprland 0.51.x requirements.
 ## Central Version Management
 ### hypr-tags.env
 This file contains version tags for all Hyprland components:
 ```bash
 # Current versions (example)
 HYPRLAND_TAG=v0.51.1
 AQUAMARINE_TAG=v0.9.3
 HYPRUTILS_TAG=v0.8.2
 HYPRLANG_TAG=v0.6.4
 HYPRGRAPHICS_TAG=v0.1.5
 HYPRWAYLAND_SCANNER_TAG=v0.4.5
 HYPRLAND_PROTOCOLS_TAG=v0.6.4
 HYPRLAND_QT_SUPPORT_TAG=v0.1.0
 HYPRLAND_QTUTILS_TAG=v0.1.4
 WAYLAND_PROTOCOLS_TAG=1.45
 ```
 ### Version Override Priority
 1. Environment variables (exported)
 2. hypr-tags.env file values
 3. Default hardcoded values in each module
 ## Installation Methods
 ### Method 1: Original Full Installation
 ```bash
 # Standard installation with all components
 chmod +x install.sh
 ./install.sh
 ```
 This method now automatically:
 - Loads versions from `hypr-tags.env`
 - Installs wayland-protocols from source before Hyprland
 - Maintains proper dependency ordering
 ### Method 2: Hyprland Stack Only
 ```bash
 # Install only Hyprland and essential components
 ./update-hyprland.sh --install
 ```
 ### Method 3: Fresh Installation with Latest Versions
 ```bash
 # Fetch latest GitHub releases and install
 ./update-hyprland.sh --fetch-latest --install
 ```
 ### Method 4: Preset-Based Installation
 ```bash
 # Use preset file for automated choices
 ./install.sh --preset ./preset.sh
 ```
 ## Upgrade Workflows
 Quick link: [Upgrade 0.49/0.50.x → 0.51.1](#upgrade-049050x--0511)
 ### Upgrading to Latest Hyprland Release
 #### Option A: Automatic Discovery
 ```bash
 # Fetch latest tags and install
 ./update-hyprland.sh --fetch-latest --install
 ```
 #### Option B: Specific Version
 ```bash
 # Set specific Hyprland version
 ./update-hyprland.sh --set HYPRLAND=v0.51.1 --install
 ```
 #### Option C: Test Before Installing
 ```bash
 # Test compilation first, then install if successful
 ./update-hyprland.sh --fetch-latest --dry-run
 # If successful:
 ./update-hyprland.sh --install
 ```
 ### Upgrading Individual Components
 ```bash
 # Update only core libraries (often needed for new Hyprland versions)
 ./update-hyprland.sh --fetch-latest --install --only hyprutils,hyprlang
 # Update aquamarine specifically
 ./update-hyprland.sh --set AQUAMARINE=v0.9.3 --install --only aquamarine
 ```
 ### Selective Updates
 ```bash
 # Install everything except Qt components
 ./update-hyprland.sh --install --skip hyprland-qt-support,hyprland-qtutils
 # Install only specific components
 ./update-hyprland.sh --install --only hyprland,aquamarine
 ```
 ### Upgrade: 0.49/0.50.x ➜ 0.51.1
 If you’re currently on Hyprland 0.49 or 0.50.x, you can upgrade directly to 0.51.1 without a full reinstall.
 Recommended path:
 ```bash
 # Ensure hypr-tags.env pins the target version (skip if already v0.51.1)
 ./update-hyprland.sh --set HYPRLAND=v0.51.1
 # Upgrade Hyprland (prerequisites are auto-included and ordered)
 ./update-hyprland.sh --install --only hyprland
 ```
 Notes:
 - The command will automatically ensure and run, as needed: wayland-protocols-src, hyprland-protocols, hyprutils, hyprlang, aquamarine, then hyprland.
 - Full install via install.sh is not required for this upgrade unless you also want to install/refresh optional modules (e.g., SDDM, Bluetooth, Thunar, AGS, dotfiles) or you’re recovering from a failed/partial setup.
 - Optional: add --with-deps to re-run dependency installation first:
 ```bash
 ./update-hyprland.sh --with-deps --install --only hyprland
 ```
 - You can dry-run first to validate:
 ```bash
 ./update-hyprland.sh --dry-run --only hyprland
 ```
 ## Dry-Run Testing
 ### Why Use Dry-Run?
 - Test compilation compatibility before installing
 - Validate version combinations
 - Debug build issues without system changes
 - CI/CD pipeline integration
 ### Basic Dry-Run Usage
 ```bash
 # Test current tag configuration
 ./update-hyprland.sh --dry-run
 # Test with latest GitHub releases
 ./update-hyprland.sh --fetch-latest --dry-run
 # Test specific version
 ./update-hyprland.sh --set HYPRLAND=v0.51.1 --dry-run
 ```
 ### Advanced Dry-Run Testing
 ```bash
 # Use alternative summary format
 ./update-hyprland.sh --via-helper
 # Test with dependencies installation
 ./dry-run-build.sh --with-deps
 # Test only specific components
 ./dry-run-build.sh --only hyprland,aquamarine
 ```
 ### Dry-Run Limitations
 - **Dependencies still install**: apt operations run to ensure compilation succeeds
 - **pkg-config requirements**: Some components need system-installed prerequisites
 - **No system changes**: No files installed to /usr/local or /usr
 ## Log Management
 ### Log Location
 All build activities generate timestamped logs in:
 ```
 Install-Logs/
 ├── 01-Hyprland-Install-Scripts-YYYY-MM-DD-HHMMSS.log  # Main install log
 ├── install-DD-HHMMSS_module-name.log                   # Per-module logs
 ├── build-dry-run-YYYY-MM-DD-HHMMSS.log                # Dry-run summary
 └── update-hypr-YYYY-MM-DD-HHMMSS.log                  # Update tool summary
 ```
 ### Log Analysis
 ```bash
 # View most recent install log
 ls -t Install-Logs/*.log | head -1 | xargs less
 # Check for errors in specific module
 grep -i error Install-Logs/install-*hyprland*.log
 # View dry-run summary
 cat Install-Logs/build-dry-run-*.log
 ```
 ### Log Retention
 - Logs accumulate over time for historical reference
 - Manual cleanup recommended periodically:
 ```bash
 # Keep only logs from last 30 days
 find Install-Logs/ -name "*.log" -mtime +30 -delete
 ```
 ## Advanced Usage
 ### Tag Management
 #### Backup and Restore
 ```bash
 # Tags are automatically backed up on changes
 # Restore most recent backup
 ./update-hyprland.sh --restore --dry-run
 ```
 #### Multiple Version Sets
 ```bash
 # Save current configuration
 cp hypr-tags.env hypr-tags-stable.env
 # Try experimental versions
 ./update-hyprland.sh --fetch-latest --dry-run
 # Restore stable if needed
 cp hypr-tags-stable.env hypr-tags.env
 ```
 ### Environment Integration
 #### Custom PKG_CONFIG_PATH
 ```bash
 # Ensure /usr/local takes precedence
 export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:${PKG_CONFIG_PATH:-}"
 ./update-hyprland.sh --install
 ```
 #### Parallel Builds
 ```bash
 # Control build parallelism (default: all cores)
 export MAKEFLAGS="-j4"
 ./update-hyprland.sh --install
 ```
 ### Development Workflow
 #### Testing New Releases
 ```bash
 # 1. Create test environment
 cp hypr-tags.env hypr-tags.backup
 # 2. Test new version
 ./update-hyprland.sh --set HYPRLAND=v0.52.0 --dry-run
 # 3. Install if successful
 ./update-hyprland.sh --install
 # 4. Rollback if issues
 ./update-hyprland.sh --restore --install
 ```
 #### Component Development
 ```bash
 # Install dependencies only
 ./update-hyprland.sh --with-deps --dry-run
 # Manual module testing
 DRY_RUN=1 ./install-scripts/hyprland.sh
 # Check logs for specific module
 tail -f Install-Logs/install-*hyprland*.log
 ```
 ## Troubleshooting
 ### Common Issues
 #### CMake Configuration Fails
 **Symptoms**: "Package dependency requirement not satisfied"
 **Solutions**:
 ```bash
 # Install missing prerequisites
 ./update-hyprland.sh --install --only wayland-protocols-src,hyprutils,hyprlang
 # Clear build cache
 rm -rf hyprland aquamarine hyprutils hyprlang
 # Retry installation
 ./update-hyprland.sh --install --only hyprland
 ```
 #### Compilation Errors
 **Symptoms**: "too many errors emitted"
 **Solutions**:
 ```bash
 # Update core dependencies first
 ./update-hyprland.sh --fetch-latest --install --only hyprutils,hyprlang
 # Check for API mismatches in logs
 grep -A5 -B5 "error:" Install-Logs/install-*hyprland*.log
 ```
 #### Tag Not Found
 **Symptoms**: "Remote branch X not found"
 **Solutions**:
 ```bash
 # Check available tags
 git ls-remote --tags https://github.com/hyprwm/Hyprland
 # Use confirmed existing tag
 ./update-hyprland.sh --set HYPRLAND=v0.50.1 --install
 ```
 ### Debug Steps
 1. **Check system compatibility**:
   ```bash
   # Verify Debian version
   cat /etc/os-release
   # Ensure deb-src enabled
   grep -E "^deb-src" /etc/apt/sources.list
   ```
 2. **Verify environment**:
   ```bash
   # Check current tags
   cat hypr-tags.env
   # Test dry-run first
   ./update-hyprland.sh --dry-run --only hyprland
   ```
 3. **Analyze logs**:
   ```bash
   # Most recent errors
   grep -i "error\|fail" Install-Logs/*.log | tail -20
   # Module-specific issues
   ls -la Install-Logs/install-*[component]*.log
   ```
 ### Getting Help
 1. **Check logs**: Always review Install-Logs/ for detailed error information
 2. **Test dry-run**: Use --dry-run to validate before installing
 3. **Community support**: Submit issues with relevant log excerpts
 4. **Documentation**: Refer to main project README.md for base requirements
 ## Migration from Previous Versions
 ### Existing Installations
 The new tools work alongside existing installations:
 ```bash
 # Update existing installation
 ./update-hyprland.sh --install
 # Test without affecting current system
 ./update-hyprland.sh --dry-run
 ```
 ### Converting to Tag Management
 ```bash
 # Current versions are saved to hypr-tags.env automatically
 # Verify with:
 cat hypr-tags.env
 # Modify versions as needed:
 ./update-hyprland.sh --set HYPRLAND=v0.51.1
 ```
 The enhanced workflow provides better control, testing capabilities, and automation while maintaining full compatibility with the original installation process.
--- a/Debian-Install.png
+++ b/Debian-Install.png
--- a/README.md
+++ b/README.md
@ -1,14 +1,13 @@
 <div align="center">
 # 💌 KooL's Debian-Hyprland Install Script 💌
-
+#### For Debian 13 Trixie (Testing) and SID (unstable)
 #### For Debian 13 (Trixie) and above (testing, SID)
 <p align="center">
  <img src="https://raw.githubusercontent.com/JaKooLit/Hyprland-Dots/main/assets/latte.png" width="400" />
 </p>
-![GitHub Repo stars](https://img.shields.io/github/stars/JaKooLit/Debian-Hyprland?style=for-the-badge&color=cba6f7) ![GitHub last commit](https://img.shields.io/github/last-commit/JaKooLit/Debian-Hyprland?style=for-the-badge&color=b4befe) ![GitHub repo size](https://img.shields.io/github/repo-size/JaKooLit/Debian-Hyprland?style=for-the-badge&color=cba6f7) <a href="https://discord.gg/kool-tech-world"> <img src="https://img.shields.io/discord/1151869464405606400?style=for-the-badge&logo=discord&color=cba6f7&link=https%3A%2F%2Fdiscord.gg%kool-tech-world"> </a>
+![GitHub Repo stars](https://img.shields.io/github/stars/JaKooLit/Debian-Hyprland?style=for-the-badge&color=cba6f7) ![GitHub last commit](https://img.shields.io/github/last-commit/JaKooLit/Debian-Hyprland?style=for-the-badge&color=b4befe) ![GitHub repo size](https://img.shields.io/github/repo-size/JaKooLit/Debian-Hyprland?style=for-the-badge&color=cba6f7) <a href="https://discord.gg/9JEgZsfhex"> <img src="https://img.shields.io/discord/1151869464405606400?style=for-the-badge&logo=discord&color=cba6f7&link=https%3A%2F%2Fdiscord.gg%9JEgZsfhex"> </a>
 <br/>
 </div>
@ -30,12 +29,12 @@
 </div>
 <div align="center">
 <br>
-  <a href="https://github.com/JaKooLit/Hyprland-Dots/tree/Debian-Dots"><kbd> <br> Hyprland-Dots Debian repo <br> </kbd></a>&ensp;&ensp;
+  <a href="https://github.com/JaKooLit/Hyprland-Dots/tree/Deb-Untu-old-v-Hyprland"><kbd> <br> Hyprland-Dots Debian repo <br> </kbd></a>&ensp;&ensp;
  <a href="https://www.youtube.com/playlist?list=PLDtGd5Fw5_GjXCznR0BzCJJDIQSZJRbxx"><kbd> <br> Youtube <br> </kbd></a>&ensp;&ensp;
  <a href="https://github.com/JaKooLit/Hyprland-Dots/wiki"><kbd> <br> Wiki <br> </kbd></a>&ensp;&ensp;
  <a href="https://github.com/JaKooLit/Hyprland-Dots/wiki/Keybinds"><kbd> <br> Keybinds <br> </kbd></a>&ensp;&ensp;
  <a href="https://github.com/JaKooLit/Hyprland-Dots/wiki/FAQ"><kbd> <br> FAQ <br> </kbd></a>&ensp;&ensp;
-  <a href="https://discord.gg/kool-tech-world"><kbd> <br> Discord <br> </kbd></a>
+  <a href="https://discord.gg/9JEgZsfhex"><kbd> <br> Discord <br> </kbd></a>
 </div><br>
 <p align="center">
@ -50,114 +49,149 @@
 <div align="center">
-<https://github.com/user-attachments/assets/49bc12b2-abaf-45de-a21c-67aacd9bb872>
+https://github.com/user-attachments/assets/49bc12b2-abaf-45de-a21c-67aacd9bb872
 </div>
-### Gallery and Videos
+### NOTE: Ubuntu-Hyprland install script has its own repo now
-
+- [`Ubuntu-Hyprland LINK`](https://github.com/JaKooLit/Ubuntu-Hyprland)
 #### 🎥 Feb 2025 Video explanation of installation with preset
 - [YOUTUBE-LINK](https://youtu.be/wQ70lo7P6vA?si=_QcbrNKh_Bg0L3wC)
 - [YOUTUBE-Hyprland-Playlist](https://youtube.com/playlist?list=PLDtGd5Fw5_GjXCznR0BzCJJDIQSZJRbxx&si=iaNjLulFdsZ6AV-t)
 - [AGS overview DEMO](https://youtu.be/zY5SLNPBJTs)
 > [!IMPORTANT]
-> install a backup tool like `snapper` or `timeshift`. and Backup your system before installing hyprland using this script (**HIGHLY RECOMMENDED**).
+> install a backup tool like `snapper` or `timeshift`. and Backup your system before installing hyprland using this script. This script does NOT include uninstallation of packages
 > [!NOTE]
 > Main reason why I have not included an uninstallation script is simple. Some packages maybe already installed on your system by default. If I create an uninstall script with packages that I have set to install, you may end up a unrecoverable system. 
 > [!CAUTION] 
 > Download this script on a directory where you have write permissions. ie. HOME. Or any directory within your home directory. Else script will fail
-#### ⚠️ Pre-requisites and VERY Important
+#### ⚠️ Pre-requisites and VERY Important! ### 
 - Do not run this installer as sudo or as root
 - This Installer requires a user with a priviledge to install packages
- Needs a Debian 13 Trixie or greater. As it needs a newer wayland packages!
+- Needs a Debian 13 Testing (Trixie) Branch  as it needs a newer wayland packages! I have tried on Stable Debian 12 Bookworm in which, Hyprland wont build.
- edit your `/etc/apt/sources.list` and **remove** `#` on lines with `deb-src` to enable source packaging else will not install properly especially Hyprland
+- edit your /etc/apt/sources.list and remove # on lines with deb-src to enable source packaging else will not install properly especially Hyprland
 ```bash
 sudo nano /etc/apt/sources.list
 ```
 - delete # on the lines with 'deb-src' 
 - ensure to allow to install non-free drivers especially for users with NVIDIA gpus. You can also install non-free drivers if required. Edit install-scripts/nvidia.sh and change the nvidia stuff's if required
 - If you have login Manager already like GDM (gnome login manager), I highly advice not to install SDDM. But if you decide to install SDDM, see here [`Issue 2 - SDDM`](https://github.com/JaKooLit/Debian-Hyprland/issues/2)
 > [!IMPORTANT]
 > If you are using Gnome already, DO NOT install the SDDM. The GDM Login Manager works well with Hyprland. For some reason, during installation, you will be asked which login manager you wanted to use. But during my test, nothing happened.
 > [!WARNING] 
 > If you have GDM already as log-in manager, DO NOT install SDDM
 > You will encounter issues. See [`Issue 2 - SDDM`](https://github.com/JaKooLit/Debian-Hyprland/issues/2)
 ### Gallery and Videos
 <details>
 <summary>
 📷 Screenshots
 </summary>
 <p align="center">
    <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Distro-Hyprland/Debian/debian.png" /> <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Distro-Hyprland/Debian/debian2.png" />       
 </p>
 <p align="center">
    <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Hyprland-Dots-Showcase/default-waybar.png" /> <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Distro-Hyprland/Debian/debian4.png" />   
   <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Hyprland-Dots-Showcase/wlogout-dark.png" /> <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Distro-Hyprland/Debian/hyprlock.png"" /> 
   <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Hyprland-Dots-Showcase/waybar-layout.png" /> <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Hyprland-Dots-Showcase/waybar-style.png"" /> 
 </p>
 #### ❕ Installed on Kali Linux 😈
 ![alt text](https://github.com/JaKooLit/screenshots/blob/main/Hyprland-ScreenShots/Debian/Kali-Linux1.png)
 #### 📷 More updated Screenshots Here [`Link`](https://github.com/JaKooLit/screenshots/tree/main/Hyprland-Dots-Showcase)
 #### 📷 Older Screenshots: v1[`Link`](https://github.com/JaKooLit/screenshots/tree/main/Hyprland-ScreenShots/Debian) & v2[`Link`](https://github.com/JaKooLit/screenshots/tree/main/Hyprland-ScreenShots/Debian-v2)
 </details>
 <details>
 <summary>
 📽️ Youtube Videos
 </summary>
 #### ✨ Youtube presentation [`V1`](https://youtu.be/hGEWOif5D4Y?si=WQ-PrPwEhM5Og76Q)
 #### ✨ Youtube presentation [`V2`](https://youtu.be/Qc4VP9JFh2Y)
 #### ✨ A video walk through my dotfiles[`Link`](https://youtu.be/fO-RBHvVEcc?si=ijqxxnq_DLiyO8xb)
 #### ✨ A video walk through of My Hyprland-Dots v2[`Link`](https://youtu.be/yaVurRoXc-s?si=iDnBC5S3thPBX3ZE)
 #### 💯💯 Check out Installation Video coverage by KSK royal (Kali Linux xfce + nvidia). He have details regarding installing timeshift and switching to sddm from lightdm. He also covers removal of nouveau in favor of proprietary nvidia drivers
 - [`Link`](https://youtu.be/NtpRtSBjz3I?si=YGkS75u_7cW5D_zu)
 </details>
 ### 🪧🪧🪧 ANNOUNCEMENT 🪧🪧🪧
 - This Repo does not contain Hyprland Dots or configs! Pre-configured Dotfiles are on [`Hyprland-Dots`](https://github.com/JaKooLit/Hyprland-Dots) . During installation, if you opt to copy pre-configured dots, it will be downloaded from that centralized repo.
-[Debian-Hyprland Changelogs](https://github.com/JaKooLit/Debian-Hyprland/blob/main/CHANGELOGS.md)
+- Hyprland-Dots use are constantly evolving / improving. you can check CHANGELOGS here [`Hyprland-Dots-Changelogs`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Changelogs)
-
+- Since the Hyprland-Dots are evolving, some of the screenshots maybe old
- 10 October 2025 Update!
+- the wallpaper offered to be downloaded towards the end is from this [`WALLPAPER-REPO`](https://github.com/JaKooLit/Wallpaper-Bank)
 - Hyprland-Debian nows builds 0.51.1 from source!
  - The installer now can be used to install newer releases later
  - If you are currently running 0.49, or 0.50, you can upgrade to 0.51.1
  - You do not have to re-install everything, but re-running `install.sh` works also
  - Instructions are available in English and Spanish
 #### ✨  Some notes on this installer / Prerequisites
-
+- This script is meant to install in Debian Testing (Trixie) and Debian Unstable (SID). This script Will NOT work with Bookworm
- Recommend to install SDDM. Apart from GDM and SDDM, any other Login Manager may not work nor launch Hyprland. However, hyprland can be launched through tty by type Hyprland
+- If However, decided to try, recommend to install SDDM. Apart from GDM and SDDM, any other Login Manager may not work nor launch Hyprland. However, hyprland can be launched through tty by type Hyprland
- 🕯️ network-manager-gnome (nm-applet) *has been removed* from the packages to install. This is because it is known to restart the networkmanager causing issues in the installation process. After you boot up, inorder to get the network-manager applet, install network-manager-gnome. `sudo apt install network-manager-gnome` See below if your network or wifi became unmanaged after installation
+- 🕯️ network-manager-gnome (nm-applet) has been removed from the packages to install. This is because it is known to restart the networkmanager causing issues in the installation process. After you boot up, inorder to get the network-manager applet, install network-manager-gnome. `sudo apt install network-manager-gnome` See below if your network or wifi became unmanaged after installation
 ### 🚩 changing login manager to SDDM
 - if you really want to change login manager, there are couple of things you need to carry out before running this install script
 - first install sddm. the no-install-recommends is suggested else it will pull lots of plasma depencies.
 ```bash
 sudo apt install --no-install-recommends -y sddm
 ```
 - then ran `sudo dpkg-reconfigure sddm` choose sddm and then reboot.
 - once reboot done, you can ran the script and choose sddm & sddm theme
 - [LINK](https://www.simplified.guide/ubuntu/switch-to-gdm) for some guide
 #### 💫 SDDM and GTK Themes offered
 - If you opted to install SDDM theme, here's the [LINK](https://github.com/JaKooLit/simple-sddm-2) which is a modified fork of [LINK](https://github.com/Keyitdev/sddm-astronaut-theme)
 - If you opted to install GTK Themes, Icons,  here's the [LINK](https://github.com/JaKooLit/GTK-themes-icons). This also includes Bibata Modern Ice cursor.
 #### 🔔 NOTICE TO NVIDIA OWNERS ###
 - By default it is installing the latest and newest nvidia drivers. If you have an older nvidia-gpu (GTX 800 series and older), check out nvidia-debian website [LINK](https://wiki.debian.org/NvidiaGraphicsDrivers) and edit nvidia.sh in install-scripts directory to install proper gpu driver
 - If you have nvidia, and wanted to use proprietary drivers, uninstall nouveau first (if installed). This script will be installing proprietary nvidia drivers and will not deal with removal of nouveau.
 - NVIDIA users / owners, after installation, check [`THIS`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Notes_to_remember#--for-nvidia-gpu-users)
 #### ✨ Costumize the packages to be installed
 - inside the install-scripts directory, you can edit 01-hypr-pkgs.sh. Do not edit 00-dependencies.sh unless you know what you are doing. Care though as the Hyprland Dots may not work properly!
 #### 💫 SDDM and GTK Themes offered
 - If you opted to install SDDM theme, here's the [`LINK`](https://github.com/JaKooLit/simple-sddm)
 - If you opted to install GTK Themes, Icons,  here's the [`LINK`](https://github.com/JaKooLit/GTK-themes-icons). This also includes Bibata Modern Ice cursor.
 #### 🔔 NOTICE TO NVIDIA OWNERS ### 
 - by default it is installing the latest and newest nvidia drivers. If you have an older nvidia-gpu (GTX 800 series and older), check out nvidia-debian website [`LINK`](https://wiki.debian.org/NvidiaGraphicsDrivers) and edit nvidia.sh in install-scripts directory to install proper gpu driver
 > [!IMPORTANT]
-> If you wish to use the nouveau driver (installed by default in Debian), be sure to not select "Nvidia" in the installation options.
+> If you want to use nouveau driver, choose N when asked if you have nvidia gpu. This is because the nvidia installer part, it will blacklist nouveau. Hyprland will still be installed but it will skip blacklisting nouveau.
 > If you select this option, the NVIDIA installer part will attempt to blacklist nouveau; while Hyprland will still be installed, it will skip blacklisting nouveau if you don't select the NVIDIA option.
-## ✨ Auto clone and install
+> [!IMPORTANT]
->
+> Another important note for nvidia owners
-> [!CAUTION]
+> If you have nvidia, by default debian is installing nouveau or open-source nvidia driver. If you want to keep the default nvidia driver installed by Debian, choose N on the if you have nvidia question. Or else you will encounter same issue as SDDM above.
 > If you are using FISH SHELL, DO NOT use this function. Clone and run install.sh instead
 - you can use this command to automatically clone the installer and ran the script for you
 - NOTE: `curl` package is required before running this command
 ```bash
 sh <(curl -L https://raw.githubusercontent.com/JaKooLit/Debian-Hyprland/main/auto-install.sh)
 ```
 ## ✨ to use this script
-clone this repo, change directory, make executable and run the script:
+> clone this repo (latest commit only) by using git. Change directory, make executable and run the script
 ```bash
 git clone --depth=1 https://github.com/JaKooLit/Debian-Hyprland.git ~/Debian-Hyprland
 cd ~/Debian-Hyprland
 chmod +x install.sh
 ./install.sh
 ```
 <p align="center">
    <img align="center" width="100%" src="https://raw.githubusercontent.com/JaKooLit/Debian-Hyprland/main/Debian-Install.png" />
 #### ✨ for ZSH and OH-MY-ZSH installation
 > installer should auto change your default shell to zsh. However, if it does not, do this
 ```bash
 chsh -s $(which zsh)
 zsh
 source ~/.zshrc
 ```
 - reboot or logout
 - by default `xiong-chiamiov-plus` theme is installed. You can find more themes from this [`OH-MY-ZSH-THEMES`](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes)
 - to change the theme, edit ~/.zshrc ZSH_THEME="desired theme"
 #### ✨ TO DO once installation done and dotfiles copied
 - SUPER H for HINT or click on the waybar HINT! Button 
 - Head over to [`FAQ`](https://github.com/JaKooLit/Hyprland-Dots/wiki/FAQ) and [`TIPS`](https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS)
- Head over to [KooL Hyprland WIKI](https://github.com/JaKooLit/Hyprland-Dots/wiki)
+
 - if you installed in your laptop and Brightness and Keyboard brightness does not work you can execute this command `sudo chmod +s $(which brightnessctl)`
 #### ✨ Packages that are manually downloaded and build. These packages will not be updated by apt and have to be manually updated
 - Asus ROG asusctl [`LINK`](https://gitlab.com/asus-linux/asusctl) and superfxctl [`LINK`](https://gitlab.com/asus-linux/supergfxctl)
 - swww [`LINK`](https://github.com/Horus645/swww)
 - hyprlock [`LINK`](https://github.com/hyprwm/hyprlock) #22 Aug 2024 - still not on repo
@ -168,58 +202,54 @@ chmod +x install.sh
 > [!TIP]
 > To update to latest packages, re-running this script will auto update all. Script is configured to pull latest packages build for you.
 ### 💥   UNINSTALL SCRIPT / Removal of Config Files
 - 11 March 2025, due to popular request, created a guided `uninstall.sh` script. USE this with caution as it may render your system unstable.
 - I will not be responsible if your system breaks
 - The best still to revert to previous state of your system is via **timeshift or snapper**
 #### 🤬 FAQ
 #### Most common question I got is, Hey Ja, Why the heck it is taking long time to install? Other distro like Arch its only a minute or two. Why here takes like forever?!?!?!
 - Well, most of the core packages are downloaded and Build and compiled from SOURCE. Unlike Other distros, they already have prepacked binary that can just download and install.
-**Most common question I got is, Hey Ja, Why the heck it is taking long time to install? Other distro like Arch its only a minute or two. Why here takes like forever?!?!?**
+### 🛎 *** DEBIAN and UBUNTU Hyprland Dots UPDATING NOTES ***
 > [!IMPORTANT]
 > This is very Important for Debian and Ubuntu Dots
 - Some parts of KooL's Hyprland Dots [`LINK`](https://github.com/JaKooLit/Hyprland-Dots) are not compatible on Debian and Ubuntu especially the hyprland settings. 
 - That is the reason the DOTS for those distro's are "fixed" and they are being pulled on the releases. This releases are NOT in any of the branches of the KooL's Hyprland Dots. 
- Well, most of the core packages are downloaded and Build and compiled from *SOURCE*. Unlike Other distros, they already have prepacked binary that can just download and install.
+- for Debian and Ubuntu if you want to update from newest KooL's dots versions (main branch), after running copy.sh, you will have 100% error which will appear on top. However, Hyprland is very good in pin pointing those errors. 
 - You can simply just remove those lines or add # on those lines. Then, it should be ok.
-## 🛎 ***DEBIAN Hyprland Dots UPDATING NOTES***
+#### ❗ some known issues on this Installer
-
+- some users reported that they have to install some packages. It is in the install-scripts/force-install.sh
- With this new update to Debian-Hyprland the current Hyprland-Dots are now compatible with Debian. This applies only to Debian, not ubuntu.  
+- At this time the packages force to install are the following `imagemagick`
 > [!NOTE] 
 > This script does not setup audio. Kindly set up. If you have not, I recommend pipewire. `sudo apt install -y pipewire`
-#### 🙋 Got a questions regarding the Hyprland Dots or configurations? 🙋
+#### 🫥 Improving performance for Older Nvidia Cards using driver 470
  - [`SEE HERE`](https://github.com/JaKooLit/Hyprland-Dots/discussions/123#discussion-6035205)
-Head over to wiki Link [`WIKI`](https://github.com/JaKooLit/Hyprland-Dots/wiki)
+#### 🙋  Got a questions regarding the Hyprland Dots configurations? 🙋
 - Head over to Hyprland-Dots wiki Link [`KooL's DOTS WIKI`](https://github.com/JaKooLit/Hyprland-Dots/wiki)
 #### ⌨ Keybinds
-
+- Keybinds [`CLICK`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Keybinds)
 Keybinds [`CLICK`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Keybinds)
 > [!TIP]
 > KooL Hyprland has a searchable keybind function via rofi. (SUPER SHIFT K) or right click the `HINTS` waybar button
 #### 🙋 👋 Having issues or questions? 
 - for the install part, kindly open issue on this repo
 - for the Pre-configured Hyprland dots / configuration, submit issue [`here`](https://github.com/JaKooLit/Hyprland-Dots/issues)
 #### 🔧 Proper way to re-installing a particular script from install-scripts directory
-
+- CD into Debian-Hyprland DIrectory and then ran the below command. 
 - CD into Debian-Hyprland directory and then ran the below command.
 - i.e. `./install-scripts/gtk-themes.sh` - to reinstall GTK Themes or
 - `./install-scripts/sddm.sh` - to reinstall sddm
 > [!IMPORTANT]
 > DO NOT CD into install-scripts directory as script as it will fail. Scripts are designed to ran outside install-scripts directory for installation logging purposes.
-#### 🛣️ Roadmap
+#### 🎞️ AGS Overview DEMO
 - in case you wonder, here is a short demo of AGS overview [Youtube LINK](https://youtu.be/zY5SLNPBJTs)
 #### 🛣️ Roadmap:
 - [ ] possibly adding gruvbox themes, cursors, icons
 #### ❗ some known issues for nvidia
 - reports from members of my discord, states that some users of nvidia are getting stuck on sddm login. credit  to @Kenni Fix stated was 
 ```  
 while in sddm press ctrl+alt+F2 or F3
 log into your account
@ -228,84 +258,70 @@ log into your account
 `ls -l /dev/dri/by-path` to check where the symlink points to 
 )
 ```
 - add "env = WLR_DRM_DEVICES,/dev/dri/cardX" to the ENVvariables config `~/.config/hypr/UserConfigs/ENVariables.conf`  ; X being where the symlink of the gpu points to
 - more info from the hyprland wiki [`Hyprland Wiki Link`](https://wiki.hyprland.org/FAQ/#my-external-monitor-is-blank--doesnt-render--receives-no-signal-laptop)
 - reports from a member of discord for Nvidia for additional env's
 - remove # from the following env's on 
 ```
 env = GBM_BACKEND,nvidia-drm
 env = WLR_RENDERER_ALLOW_SOFTWARE,1
 ```
 #### 🫥 Improving performance for Older Nvidia Cards using driver 470
 - [`SEE HERE`](https://github.com/JaKooLit/Hyprland-Dots/discussions/123#discussion-6035205)
 #### ❗ other known issues
 > [!NOTE]
 > Auto start of Hyprland after login (no SDDM or GDM or any login managers)
 - This was disabled a few days ago. (19 May 2024). This was because some users, after they used the Distro-Hyprland scripts with other DE (gnome-wayland or plasma-wayland), if they choose to login into gnome-wayland for example, Hyprland is starting. 
 - to avoid this, I disabled it. You can re-enable again by editing `~/.zprofile` . Remove all the # on the first lines
 - [ ] ROFI issues (scaling, unexplained scaling etc). This is most likely to experience if you are installing on a system where rofi is currently installed. To fix it uninstall rofi and install rofi-wayland . `sudo apt autoremove rofi` . 
 - Install rofi-wayland with 
 ```bash
 cd ~/Debian-Hyprland
 ./install-scripts/rofi-wayland.sh
 ```
 - [ ] Rofi-wayland is compatible with x11 so no need to worry.
 - [ ] Does not work in Debian Bookworm
 - [ ] sddm blackscreen when log-out
 - [ ] Installing SDDM if or any other Login Manager installed. See [`Issue 2 - SDDM`](https://github.com/JaKooLit/Debian-Hyprland/issues/2)
 - [ ] network is down or become unmanaged [`This`](https://askubuntu.com/questions/71159/network-manager-says-device-not-managed) might help
 - [ ] pyprland is a hit and miss. Drop down not working, zooming is hit and miss
 #### 📒 Final Notes
-
+- join my discord channel [`Discord`](https://discord.com/invite/9JEgZsfhex)
 - join my discord channel [`Discord`](https://discord.com/invite/kool-tech-world)
 - Feel free to copy, re-distribute, and use this script however you want. Would appreciate if you give me some loves by crediting my work :)
 #### ✍️ Contributing
 #### ⏩ Contributing
 - As stated above, these script does not contain actual config files. These are only the installer of packages
 - The development branch of this script is pulling the latest "stable" releases of the Hyprland-Dotfiles.
 - If you want to contribute and/or test the Hyprland-Dotfiles (development branch), [`Hyprland-Dots-Development`](https://github.com/JaKooLit/Hyprland-Dots/tree/development) 
 - Want to contribute on KooL-Hyprland-Dots Click [`HERE`](https://github.com/JaKooLit/Hyprland-Dots/blob/main/CONTRIBUTING.md) for a guide how to contribute
 - Want to contribute on This Installer? Click [`HERE`](https://github.com/JaKooLit/Debian-Hyprland/blob/main/CONTRIBUTING.md) for a guide how to contribute
 #### 👍👍👍 Thanks and Credits
 #### 👍👍👍 Thanks and Credits!
 - [`Hyprland`](https://hyprland.org/) Of course to Hyprland and @vaxerski for this awesome Dynamic Tiling Manager.
 ### 💖 Support
 ### 💖 Support
 - a Star on my Github repos would be nice 🌟
 - Subscribe to my Youtube Channel [YouTube](https://www.youtube.com/@Ja.KooLit) 
- you can also give support through coffee's or btc 😊
+- You can also buy me Coffee Through ko-fi.com or Coffee.com 🤩
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/jakoolit)
+<a href='https://ko-fi.com/jakoolit' target='_blank'><img height='35' style='border:0px;height:46px;' src='https://az743702.vo.msecnd.net/cdn/kofi3.png?v=0' border='0' alt='Buy Me a Coffee at ko-fi.com' />
 or
 [!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/JaKooLit)
 Or you can donate cryto on my btc wallet :)  
 > 1N3MeV2dsX6gQB42HXU6MF2hAix1mqjo8i
 ![Bitcoin](https://github.com/user-attachments/assets/7ed32f8f-c499-46f0-a53c-3f6fbd343699)
 #### 📹 Youtube videos (Click to view and watch the playlist) 📹
 [![Youtube Playlist Thumbnail](https://raw.githubusercontent.com/JaKooLit/screenshots/main/Youtube.png)](https://youtube.com/playlist?list=PLDtGd5Fw5_GjXCznR0BzCJJDIQSZJRbxx&si=iaNjLulFdsZ6AV-t)
 ## 🥰🥰 💖💖 👍👍👍
 ## 🥰🥰 💖💖 👍👍👍
 [![Stargazers over time](https://starchart.cc/JaKooLit/Debian-Hyprland.svg?variant=adaptive)](https://starchart.cc/JaKooLit/Debian-Hyprland)
--- a/assets/.zshrc
+++ b/assets/.zshrc
@ -3,7 +3,7 @@
 export ZSH="$HOME/.oh-my-zsh"
-ZSH_THEME="agnosterzak"
+ZSH_THEME="xiong-chiamiov-plus"
 plugins=( 
    git
@ -16,16 +16,13 @@ source $ZSH/oh-my-zsh.sh
 # Display Pokemon-colorscripts
 # Project page: https://gitlab.com/phoneybadger/pokemon-colorscripts#on-other-distros-and-macos
-#pokemon-colorscripts --no-title -s -r #without fastfetch
+#pokemon-colorscripts --no-title -s -r
 #pokemon-colorscripts --no-title -s -r | fastfetch -c $HOME/.config/fastfetch/config-pokemon.jsonc --logo-type file-raw --logo-height 10 --logo-width 5 --logo -
 # fastfetch. Will be disabled if above colorscript was chosen to install
 fastfetch -c $HOME/.config/fastfetch/config-compact.jsonc
-# Set-up icons for files/directories in terminal using lsd
+# Set-up icons for files/folders in terminal using eza
-alias ls='lsd'
+alias ls='eza -a --icons'
-alias l='ls -l'
+alias ll='eza -al --icons'
-alias la='ls -a'
+alias lt='eza -a --tree --level=1 --icons'
 alias lla='ls -la'
 alias lt='ls --tree'
--- a/assets/0001-fix-hyprland-compile-issue.patch
+++ b/assets/0001-fix-hyprland-compile-issue.patch
@ -1,26 +0,0 @@
 diff --git a/hyprctl/main.cpp b/hyprctl/main.cpp
 index daf8d4a8..62ab8578 100644
 --- a/hyprctl/main.cpp
 +++ b/hyprctl/main.cpp
@@ -268,7 +268,7 @@ int requestIPC(std::string_view filename, std::string_view arg) {
     sockaddr_un serverAddress = {0};
     serverAddress.sun_family  = AF_UNIX;
 -    std::string socketPath = getRuntimeDir() + "/" + instanceSignature + "/" + filename;
 +    std::string socketPath = getRuntimeDir() + "/" + std::string(instanceSignature) + "/" + std::string(filename);
     strncpy(serverAddress.sun_path, socketPath.c_str(), sizeof(serverAddress.sun_path) - 1);
 diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
 index 4e5c4080..1944f22e 100644
 --- a/src/helpers/Monitor.cpp
 +++ b/src/helpers/Monitor.cpp
@@ -549,7 +549,7 @@ bool CMonitor::applyMonitorRule(SMonitorRule* pMonitorRule, bool force) {
         std::ranges::sort(sortedModes, sortFunc);
         if (sortedModes.size() > 3)
             sortedModes.erase(sortedModes.begin() + 3, sortedModes.end());
 -        requestedModes.insert_range(requestedModes.end(), sortedModes | std::views::reverse);
 +        requestedModes.insert(requestedModes.end(), sortedModes.rbegin(), sortedModes.rend());
     };
     // last fallback is always preferred mode
--- a/assets/add_zsh_theme/agnosterzak.zsh-theme
+++ b/assets/add_zsh_theme/agnosterzak.zsh-theme
@ -1,370 +0,0 @@
 # vim:ft=zsh ts=2 sw=2 sts=2
 #
 # agnoster's Theme - https://gist.github.com/3712874
 # A Powerline-inspired theme for ZSH
 #
 # # README
 #
 # In order for this theme to render correctly, you will need a
 # [Powerline-patched font](https://gist.github.com/1595572).
 #
 # In addition, I recommend the
 # [Solarized theme](https://github.com/altercation/solarized/) and, if you're
 # using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app -
 # it has significantly better color fidelity.
 #
 # # Goals
 #
 # The aim of this theme is to only show you *relevant* information. Like most
 # prompts, it will only show git information when in a git working directory.
 # However, it goes a step further: everything from the current user and
 # hostname to whether the last call exited with an error to whether background
 # jobs are running in this shell will all be displayed automatically when
 # appropriate.
 ### Segment drawing
 # A few utility functions to make it easy and re-usable to draw segmented prompts
 CURRENT_BG='NONE'
 # Characters
 SEGMENT_SEPARATOR="\ue0b0"
 PLUSMINUS="\u00b1"
 BRANCH="\ue0a0"
 DETACHED="\u27a6"
 CROSS="\u2718"
 LIGHTNING="\u26a1"
 GEAR="\u2699"
 # Begin a segment
 # Takes two arguments, background and foreground. Both can be omitted,
 # rendering default background/foreground.
 prompt_segment() {
  local bg fg
  [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
  [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
  if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
    print -n " %{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%} "
  else
    print -n "%{$bg%}%{$fg%} "
  fi
  CURRENT_BG=$1
  [[ -n $3 ]] && print -n $3
 }
 # End the prompt, closing any open segments
 prompt_end() {
  if [[ -n $CURRENT_BG ]]; then
    print -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
  else
    print -n "%{%k%}"
  fi
  print -n "%{%f%}"
  CURRENT_BG=''
 }
 ### Prompt components
 # Each component will draw itself, and hide itself if no information needs to be shown
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
  if [[ -n "$SSH_CLIENT" ]]; then
    prompt_segment magenta white "%{$fg_bold[white]%(!.%{%F{white}%}.)%}$USER@%m%{$fg_no_bold[white]%}"
  else
    prompt_segment yellow magenta "%{$fg_bold[magenta]%(!.%{%F{magenta}%}.)%}@$USER%{$fg_no_bold[magenta]%}"
  fi
 }
 # Battery Level
 prompt_battery() {
  HEART='♥ '
  if [[ $(uname) == "Darwin" ]] ; then
    function battery_is_charging() {
      [ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]
    }
    function battery_pct() {
      local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
      typeset -F maxcapacity=$(echo $smart_battery_status | grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
      typeset -F currentcapacity=$(echo $smart_battery_status | grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
      integer i=$(((currentcapacity/maxcapacity) * 100))
      echo $i
    }
    function battery_pct_remaining() {
      if battery_is_charging ; then
        battery_pct
      else
        echo "External Power"
      fi
    }
    function battery_time_remaining() {
      local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
      if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
        timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
        if [ $timeremaining -gt 720 ] ; then
          echo "::"
        else
          echo "~$((timeremaining / 60)):$((timeremaining % 60))"
        fi
      fi
    }
    b=$(battery_pct_remaining)
    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
      if [ $b -gt 50 ] ; then
        prompt_segment green white
      elif [ $b -gt 20 ] ; then
        prompt_segment yellow white
      else
        prompt_segment red white
      fi
      echo -n "%{$fg_bold[white]%}$HEART$(battery_pct_remaining)%%%{$fg_no_bold[white]%}"
    fi
  fi
  if [[ $(uname) == "Linux" && -d /sys/module/battery ]] ; then
    function battery_is_charging() {
      ! [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]]
    }
    function battery_pct() {
      if (( $+commands[acpi] )) ; then
        echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')"
      fi
    }
    function battery_pct_remaining() {
      if [ ! $(battery_is_charging) ] ; then
        battery_pct
      else
        echo "External Power"
      fi
    }
    function battery_time_remaining() {
      if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
        echo $(acpi | cut -f3 -d ',')
      fi
    }
    b=$(battery_pct_remaining)
    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
      if [ $b -gt 40 ] ; then
        prompt_segment green white
      elif [ $b -gt 20 ] ; then
        prompt_segment yellow white
      else
        prompt_segment red white
      fi
      echo -n "%{$fg_bold[white]%}$HEART$(battery_pct_remaining)%%%{$fg_no_bold[white]%}"
    fi
  fi
 }
 # Git: branch/detached head, dirty status
 prompt_git() {
 #«»±˖˗‑‐‒ ━ ✚‐↔←↑↓→↭⇎⇔⋆━◂▸◄►◆☀★☗☊✔✖❮❯⚑⚙
  local PL_BRANCH_CHAR
  () {
    local LC_ALL="" LC_CTYPE="en_US.UTF-8"
    PL_BRANCH_CHAR="$BRANCH"
  }
  local ref dirty mode repo_path clean has_upstream
  local modified untracked added deleted tagged stashed
  local ready_commit git_status bgclr fgclr
  local commits_diff commits_ahead commits_behind has_diverged to_push to_pull
  repo_path=$(git rev-parse --git-dir 2>/dev/null)
  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
    dirty=$(parse_git_dirty)
    git_status=$(git status --porcelain 2> /dev/null)
    ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"
    if [[ -n $dirty ]]; then
      clean=''
      bgclr='yellow'
      fgclr='magenta'
    else
      clean=' ✔'
      bgclr='green'
      fgclr='white'
    fi
    local upstream=$(git rev-parse --symbolic-full-name --abbrev-ref @{upstream} 2> /dev/null)
    if [[ -n "${upstream}" && "${upstream}" != "@{upstream}" ]]; then has_upstream=true; fi
    local current_commit_hash=$(git rev-parse HEAD 2> /dev/null)
    local number_of_untracked_files=$(\grep -c "^??" <<< "${git_status}")
    # if [[ $number_of_untracked_files -gt 0 ]]; then untracked=" $number_of_untracked_files◆"; fi
    if [[ $number_of_untracked_files -gt 0 ]]; then untracked=" $number_of_untracked_files☀"; fi
    local number_added=$(\grep -c "^A" <<< "${git_status}")
    if [[ $number_added -gt 0 ]]; then added=" $number_added✚"; fi
    local number_modified=$(\grep -c "^.M" <<< "${git_status}")
    if [[ $number_modified -gt 0 ]]; then
      modified=" $number_modified●"
      bgclr='red'
      fgclr='white'
    fi
    local number_added_modified=$(\grep -c "^M" <<< "${git_status}")
    local number_added_renamed=$(\grep -c "^R" <<< "${git_status}")
    if [[ $number_modified -gt 0 && $number_added_modified -gt 0 ]]; then
      modified="$modified$((number_added_modified+number_added_renamed))±"
    elif [[ $number_added_modified -gt 0 ]]; then
      modified=" ●$((number_added_modified+number_added_renamed))±"
    fi
    local number_deleted=$(\grep -c "^.D" <<< "${git_status}")
    if [[ $number_deleted -gt 0 ]]; then
      deleted=" $number_deleted‒"
      bgclr='red'
      fgclr='white'
    fi
    local number_added_deleted=$(\grep -c "^D" <<< "${git_status}")
    if [[ $number_deleted -gt 0 && $number_added_deleted -gt 0 ]]; then
      deleted="$deleted$number_added_deleted±"
    elif [[ $number_added_deleted -gt 0 ]]; then
      deleted=" ‒$number_added_deleted±"
    fi
    local tag_at_current_commit=$(git describe --exact-match --tags $current_commit_hash 2> /dev/null)
    if [[ -n $tag_at_current_commit ]]; then tagged=" ☗$tag_at_current_commit "; fi
    local number_of_stashes="$(git stash list -n1 2> /dev/null | wc -l)"
    if [[ $number_of_stashes -gt 0 ]]; then
      stashed=" ${number_of_stashes##*(  )}⚙"
      bgclr='magenta'
      fgclr='white'
    fi
    if [[ $number_added -gt 0 || $number_added_modified -gt 0 || $number_added_deleted -gt 0 ]]; then ready_commit=' ⚑'; fi
    local upstream_prompt=''
    if [[ $has_upstream == true ]]; then
      commits_diff="$(git log --pretty=oneline --topo-order --left-right ${current_commit_hash}...${upstream} 2> /dev/null)"
      commits_ahead=$(\grep -c "^<" <<< "$commits_diff")
      commits_behind=$(\grep -c "^>" <<< "$commits_diff")
      upstream_prompt="$(git rev-parse --symbolic-full-name --abbrev-ref @{upstream} 2> /dev/null)"
      upstream_prompt=$(sed -e 's/\/.*$/ ☊ /g' <<< "$upstream_prompt")
    fi
    has_diverged=false
    if [[ $commits_ahead -gt 0 && $commits_behind -gt 0 ]]; then has_diverged=true; fi
    if [[ $has_diverged == false && $commits_ahead -gt 0 ]]; then
      if [[ $bgclr == 'red' || $bgclr == 'magenta' ]] then
        to_push=" $fg_bold[white]↑$commits_ahead$fg_bold[$fgclr]"
      else
        to_push=" $fg_bold[black]↑$commits_ahead$fg_bold[$fgclr]"
      fi
    fi
    if [[ $has_diverged == false && $commits_behind -gt 0 ]]; then to_pull=" $fg_bold[magenta]↓$commits_behind$fg_bold[$fgclr]"; fi
    if [[ -e "${repo_path}/BISECT_LOG" ]]; then
      mode=" <B>"
    elif [[ -e "${repo_path}/MERGE_HEAD" ]]; then
      mode=" >M<"
    elif [[ -e "${repo_path}/rebase" || -e "${repo_path}/rebase-apply" || -e "${repo_path}/rebase-merge" || -e "${repo_path}/../.dotest" ]]; then
      mode=" >R>"
    fi
    prompt_segment $bgclr $fgclr
    print -n "%{$fg_bold[$fgclr]%}${ref/refs\/heads\//$PL_BRANCH_CHAR $upstream_prompt}${mode}$to_push$to_pull$clean$tagged$stashed$untracked$modified$deleted$added$ready_commit%{$fg_no_bold[$fgclr]%}"
  fi
 }
 prompt_hg() {
  local rev status
  if $(hg id >/dev/null 2>&1); then
    if $(hg prompt >/dev/null 2>&1); then
      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
        # if files are not added
        prompt_segment red white
        st='±'
      elif [[ -n $(hg prompt "{status|modified}") ]]; then
        # if any modification
        prompt_segment yellow black
        st='±'
      else
        # if working copy is clean
        prompt_segment green black
      fi
      print -n $(hg prompt "☿ {rev}@{branch}") $st
    else
      st=""
      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
      branch=$(hg id -b 2>/dev/null)
      if `hg st | grep -q "^\?"`; then
        prompt_segment red black
        st='±'
      elif `hg st | grep -q "^[MA]"`; then
        prompt_segment yellow black
        st='±'
      else
        prompt_segment green black
      fi
      print -n "☿ $rev@$branch" $st
    fi
  fi
 }
 # Dir: current working directory
 prompt_dir() {
  prompt_segment cyan white "%{$fg_bold[white]%}%~%{$fg_no_bold[white]%}"
 }
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
  local virtualenv_path="$VIRTUAL_ENV"
  if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
    prompt_segment blue black "(`basename $virtualenv_path`)"
  fi
 }
 prompt_time() {
  prompt_segment blue white "%{$fg_bold[white]%}%D{%a %e %b - %H:%M}%{$fg_no_bold[white]%}"
 }
 # Status:
 # - was there an error
 # - am I root
 # - are there background jobs?
 prompt_status() {
  local symbols
  symbols=()
  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}$CROSS"
  [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}$LIGHTNING"
  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$GEAR"
  [[ -n "$symbols" ]] && prompt_segment black default "$symbols"
 }
 ## Main prompt
 build_prompt() {
  RETVAL=$?
  print -n "\n"
  prompt_status
  #prompt_battery
  prompt_time
  prompt_virtualenv
  prompt_dir
  prompt_git
  prompt_hg
  prompt_end
  CURRENT_BG='NONE'
  print -n "\n"
  prompt_context
  prompt_end
 }
 PROMPT='%{%f%b%k%}$(build_prompt) '
--- a/assets/add_zsh_theme/antares.zsh-theme
+++ b/assets/add_zsh_theme/antares.zsh-theme
@ -1,392 +0,0 @@
 ###
 ### You can re-define the following variables in your .zshrc file
 ### in order to customize the appearance of the prompt
 ###
 # The indentation of the rprompt
 ZLE_RPROMPT_INDENT=${ZLE_RPROMPT_INDENT:-0}
 # Whether to use oh-my-zsh's git-prompt plugin
 # or the builtin logic written in this file
 ZSH_ANTARES_USE_OHMYZSH_GIT_PROMPT=""
 # Whether to gather additional details about the git status
 # This option only applies when using the builtin logic
 # Usefull when dealing with huge repositories to speed things up
 ZSH_ANTARES_USE_LIGHT_GIT_MODE=""
 # The colors to use for the various elements of the prompt
 ZSH_ANTARES_FG_EXECTIME="#dd00ff"
 ZSH_ANTARES_FG_ERRVAL="#c31a1a"
 ZSH_ANTARES_FG_DECO="#ffffff"
 ZSH_ANTARES_FG_PWD_OK="#ffffff"
 ZSH_ANTARES_BG_PWD_OK="#0055ff"
 ZSH_ANTARES_FG_PWD_ERR="#ffffff"
 ZSH_ANTARES_BG_PWD_ERR="#c31a1a"
 ZSH_ANTARES_FG_GIT_INIT="#000000"
 ZSH_ANTARES_BG_GIT_INIT="#b5f3a1"
 ZSH_ANTARES_FG_GIT_BARE="#000000"
 ZSH_ANTARES_BG_GIT_BARE="#b07a4e"
 ZSH_ANTARES_FG_GIT_BRANCH="#000000"
 ZSH_ANTARES_BG_GIT_BRANCH="#47cc2b"
 ZSH_ANTARES_FG_GIT_DETACH="#000000"
 ZSH_ANTARES_BG_GIT_DETACH="#eeaa22"
 ZSH_ANTARES_FG_GIT_CONFLICT="#000000"
 ZSH_ANTARES_BG_GIT_CONFLICT="#c31a1a"
 ZSH_ANTARES_FG_GIT_AHEAD="#cfcfcf"
 ZSH_ANTARES_FG_GIT_BEHIND="#9f9f9f"
 ZSH_ANTARES_FG_GIT_STAGED="#6cc6ee"
 ZSH_ANTARES_FG_GIT_ADDED="#04c304"
 ZSH_ANTARES_FG_GIT_DELETED="#e7165a"
 ZSH_ANTARES_FG_GIT_CHANGED="#ee9931"
 ZSH_ANTARES_FG_GIT_CONFLICTS="#ff0000"
 ZSH_ANTARES_FG_GIT_UNTRACKED="#bbffff"
 ZSH_ANTARES_FG_GIT_STASHED="#eaa0ff"
 ZSH_ANTARES_FG_GIT_TAG="#ffffff"
 ZSH_ANTARES_FG_JOBS="#9f9f9f"
 ZSH_ANTARES_FG_PRIVILEDGES="#ffdd44"
 # The characters (or strings, by will) to use for some of the elements
 ZSH_ANTARES_STR_GIT_BARE="⛁"
 ZSH_ANTARES_STR_GIT_AHEAD="￪"
 ZSH_ANTARES_STR_GIT_BEHIND="￬"
 ZSH_ANTARES_STR_GIT_STAGED="●"
 ZSH_ANTARES_STR_GIT_ADDED="✚"
 ZSH_ANTARES_STR_GIT_DELETED="━"
 ZSH_ANTARES_STR_GIT_CHANGED="✱"
 ZSH_ANTARES_STR_GIT_CONFLICTS="✖"
 ZSH_ANTARES_STR_GIT_UNTRACKED="❍"
 ZSH_ANTARES_STR_GIT_STASHED="⚑"
 ZSH_ANTARES_STR_GIT_TAG="🏲"
 ZSH_ANTARES_STR_JOBS="⚙"
 ZSH_ANTARES_STR_ROOT="#"
 ZSH_ANTARES_STR_USER="$"
 # The path expansion to use to display the pwd
 ZSH_ANTARES_PATHVAR='%~'
 # The minimum amount of time (in seconds) a command shall take to complete
 # in order to display the execution time in the prompt
 ZSH_ANTARES_MIN_EXEC_TIME=0
 # The control character used to insert a new line
 # You shouldn't edit this variable, but if you really want to...
 ZSH_ANTARES_LINEFEED=$'\n'
 ###
 ### End of the re-definable section
 ###
 antares_update_git_status()
 {
 	ZSH_ANTARES_GIT_STATUS=""
 	ZSH_ANTARES_GIT_IN_WORKING_TREE=0
 	ZSH_ANTARES_GIT_IS_INIT_REPO=0
 	ZSH_ANTARES_GIT_IS_BARE_REPO=0
 	ZSH_ANTARES_GIT_IS_DETACHED_HEAD=0
 	ZSH_ANTARES_GIT_HAS_CONFLICTS=0
 	ZSH_ANTARES_GIT_HAS_TAGS=0
 	ZSH_ANTARES_GIT_TAG=""
 	if ( $(git rev-parse --is-inside-work-tree 1>/dev/null 2>/dev/null) )
 	then
 		ZSH_ANTARES_GIT_IN_WORKING_TREE=1
 		private branch_name="$(git branch --show-current)"
 		if [ -n "$branch_name" ]
 		then
 			if [ -z "$ZSH_ANTARES_USE_OHMYZSH_GIT_PROMPT" ]
 			then
 				GIT_BRANCH="$branch_name"
 			fi
 			if ( ! $(git rev-parse --verify HEAD 1>/dev/null 2>/dev/null) )
 			then
 				ZSH_ANTARES_GIT_IS_INIT_REPO=1
 			fi
 			if [ $(git rev-parse --is-bare-repository) = "true" ]
 			then
 				ZSH_ANTARES_GIT_IS_BARE_REPO=1
 				GIT_BRANCH="$ZSH_ANTARES_STR_GIT_BARE"
 			fi
 		else
 			ZSH_ANTARES_GIT_IS_DETACHED_HEAD=1
 			if [ -z "$ZSH_ANTARES_USE_OHMYZSH_GIT_PROMPT" ]
 			then
 				GIT_BRANCH="$(git rev-parse --short HEAD)"
 				if [ -z "$ZSH_ANTARES_USE_LIGHT_GIT_MODE" ]
 				then
 					private git_tag="$(git tag --points-at=HEAD)"
 					if [ -n "$git_tag" ]
 					then
 						ZSH_ANTARES_GIT_HAS_TAGS=1
 						private n_tags="$(echo "$git_tag" | wc -l)"
 						if (( n_tags == 1 ))
 						then
 							ZSH_ANTARES_GIT_TAG=" $ZSH_ANTARES_STR_GIT_TAG $git_tag"
 						elif (( n_tags > 1 ))
 						then
 							ZSH_ANTARES_GIT_TAG=" $ZSH_ANTARES_STR_GIT_TAG $n_tags"
 						else
 						fi
 					fi
 				fi
 			fi
 		fi
 	else
 		antares_reset_git_info
 		return
 	fi
 	if (( ZSH_ANTARES_GIT_IS_BARE_REPO ))
 	then
 		antares_reset_git_counts
 		GIT_AHEAD=$(git rev-list --left-only HEAD..FETCH_HEAD --count)
 		GIT_BEHIND=$(git rev-list --right-only HEAD..FETCH_HEAD --count)
 		return
 	fi
 	if [ -n "$ZSH_ANTARES_USE_OHMYZSH_GIT_PROMPT" ]
 	then
 		GIT_ADDED=0
 	elif [ -n "$ZSH_ANTARES_USE_LIGHT_GIT_MODE" ]
 	then
 		antares_reset_git_counts
 		return
 	else
 		private git_status="$(git status -sb)"
 		if [ -n "$git_status" ]
 		then
 			GIT_STAGED=$(echo $git_status | grep '^[AMD]. ' | wc -l)
 			GIT_ADDED=$(echo $git_status | grep '^A  ' | wc -l)
 			GIT_DELETED=$(echo $git_status | grep -E '^(D |.D) ' | wc -l)
 			GIT_CHANGED=$(echo $git_status | grep -E '^(M |.M) ' | wc -l)
 			GIT_CONFLICTS=$(echo $git_status | grep '^U. ' | wc -l)
 			GIT_UNTRACKED=$(echo $git_status | grep '^?? ' | wc -l)
 			GIT_STASHED=$(git stash list | wc -l)
 			if (( ZSH_ANTARES_GIT_IS_DETACHED_HEAD ))
 			then
 				GIT_AHEAD=0
 				GIT_BEHIND=0
 			elif (( ! ZSH_ANTARES_GIT_IS_INIT_REPO ))
 			then
 				private left_right=$(echo $git_status | grep '^## ' | cut -d" " -f2)
 				GIT_AHEAD=$(git rev-list --left-only $left_right --count)
 				GIT_BEHIND=$(git rev-list --right-only $left_right --count)
 			fi
 		fi
 	fi
 	ZSH_ANTARES_GIT_HAS_CONFLICTS=$(( GIT_CONFLICTS > 0 ))
 }
 antares_reset_git_info()
 {
 	if [ -z "$ZSH_ANTARES_USE_OHMYZSH_GIT_PROMPT" ]
 	then
 		GIT_BRANCH=""
 	fi
 	antares_reset_git_counts
 }
 antares_reset_git_counts()
 {
 	if [ -n "$ZSH_ANTARES_USE_OHMYZSH_GIT_PROMPT" ]
 	then
 		GIT_ADDED=0
 	else
 		GIT_AHEAD=0
 		GIT_BEHIND=0
 		GIT_STAGED=0
 		GIT_ADDED=0
 		GIT_DELETED=0
 		GIT_CHANGED=0
 		GIT_CONFLICTS=0
 		GIT_UNTRACKED=0
 		GIT_STASHED=0
 	fi
 }
 antares_update_prompt()
 {
 	ZSH_ANTARES_RETURN=""
 	if [ -n "$ZSH_ANTARES_EXEC_FLAG" ]
 	then
 		if (( ZSH_ANTARES_MIN_EXEC_TIME >= 0 ))
 		then
 			private exec_time=$(( SECONDS - ZSH_ANTARES_EXEC_START ))
 			if (( exec_time >= ZSH_ANTARES_MIN_EXEC_TIME ))
 			then
 				ZSH_ANTARES_RETURN+="%F{$ZSH_ANTARES_FG_EXECTIME}%B⤷%b $exec_time%f"
 			fi
 		fi
 		if [[ "$ZSH_ANTARES_ERR_CODE" != "0" ]]
 		then
 			if [ -z "$ZSH_ANTARES_RETURN" ]
 			then
 				ZSH_ANTARES_RETURN+="%F{$ZSH_ANTARES_FG_ERRVAL}%B⤷%b%f"
 			fi
 			ZSH_ANTARES_RETURN+=" %F{$ZSH_ANTARES_FG_ERRVAL}✘%B${ZSH_ANTARES_ERR_CODE}%b%f"
 		fi
 		[ -n "$ZSH_ANTARES_RETURN" ] && ZSH_ANTARES_RETURN+="$ZSH_ANTARES_LINEFEED"
 	fi
 	ZSH_ANTARES_FILLER=""
 	private fillchar=" "
 	private width=$(( COLUMNS - ${ZLE_RPROMPT_INDENT:-1} ))
 	private decosize=7
 	private pwdsize=${#${(%):-$ZSH_ANTARES_PATHVAR}}
 	private pwdcut=""
 	private gitsize=${#${(%):-$GIT_BRANCH$ZSH_ANTARES_GIT_TAG}}
 	private gitcut=""
 	if (( pwdsize + gitsize + (decosize * 2) > width )); then
 		private half_width=$(( width / 2 ))
 		private pwd_over_half=$(( (pwdsize + decosize) > half_width ))
 		private git_over_half=$(( (gitsize + decosize) > half_width ))
 		if (( pwd_over_half > 0 )) && (( git_over_half > 0 ))
 		then
 			(( pwdcut = half_width - decosize ))
 			(( gitcut = half_width - decosize ))
 		elif (( pwd_over_half > 0 ))
 		then
 			(( pwdcut = width - gitsize - (decosize * 2) ))
 			ZSH_ANTARES_FILLER="\${(l:$(( width - pwdcut - gitsize - (decosize * 2) ))::$fillchar:)}"
 		elif (( git_over_half > 0 ))
 		then
 			(( gitcut = width - pwdsize - (decosize * 2) ))
 			ZSH_ANTARES_FILLER="\${(l:$(( width - pwdsize - gitcut - (decosize * 2) ))::$fillchar:)}"
 		else
 			ZSH_ANTARES_FILLER="\${(l:$(( width - pwdsize - gitsize - (decosize * 2) ))::$fillchar:)}"
 		fi
 	else
 		ZSH_ANTARES_FILLER="\${(l:$(( width - pwdsize - gitsize - (decosize * 2) ))::$fillchar:)}"
 	fi
 	if [ -n "$ZSH_ANTARES_EXEC_FLAG" ]
 	then
 		private pwd_fg_color="%(?.${ZSH_ANTARES_FG_PWD_OK}.${ZSH_ANTARES_FG_PWD_ERR})"
 		private pwd_bg_color="%(?.${ZSH_ANTARES_BG_PWD_OK}.${ZSH_ANTARES_BG_PWD_ERR})"
 	else
 		private pwd_fg_color="$ZSH_ANTARES_FG_PWD_OK"
 		private pwd_bg_color="$ZSH_ANTARES_BG_PWD_OK"
 	fi
 	ZSH_ANTARES_PWD="%K{$pwd_bg_color}%F{$pwd_fg_color} %${pwdcut}<...<${ZSH_ANTARES_PATHVAR}%<< %f%k%F{$pwd_bg_color}▓▒░%f"
 	ZSH_ANTARES_GIT_BRANCH=""
 	if (( ZSH_ANTARES_GIT_IN_WORKING_TREE ))
 	then
 		if (( ZSH_ANTARES_GIT_HAS_CONFLICTS ))
 		then
 			ZSH_ANTARES_GIT_BRANCH+="%F{$ZSH_ANTARES_BG_GIT_CONFLICT}░▒▓%f%K{$ZSH_ANTARES_BG_GIT_CONFLICT}%F{$ZSH_ANTARES_FG_GIT_CONFLICT}"
 		elif (( ZSH_ANTARES_GIT_IS_DETACHED_HEAD ))
 		then
 			ZSH_ANTARES_GIT_BRANCH+="%F{$ZSH_ANTARES_BG_GIT_DETACH}░▒▓%f%K{$ZSH_ANTARES_BG_GIT_DETACH}%F{$ZSH_ANTARES_FG_GIT_DETACH}"
 			if (( ZSH_ANTARES_GIT_HAS_TAGS ))
 			then
 				GIT_BRANCH+="%F{$ZSH_ANTARES_FG_GIT_TAG}${ZSH_ANTARES_GIT_TAG}%f"
 			fi
 		elif (( ZSH_ANTARES_GIT_IS_BARE_REPO ))
 		then
 			ZSH_ANTARES_GIT_BRANCH+="%F{$ZSH_ANTARES_BG_GIT_BARE}░▒▓%f%K{$ZSH_ANTARES_BG_GIT_BARE}%F{$ZSH_ANTARES_FG_GIT_BARE}"
 		elif (( ZSH_ANTARES_GIT_IS_INIT_REPO ))
 		then
 			ZSH_ANTARES_GIT_BRANCH+="%F{$ZSH_ANTARES_BG_GIT_INIT}░▒▓%f%K{$ZSH_ANTARES_BG_GIT_INIT}%F{$ZSH_ANTARES_FG_GIT_INIT}"
 		else
 			ZSH_ANTARES_GIT_BRANCH+="%F{$ZSH_ANTARES_BG_GIT_BRANCH}░▒▓%f%K{$ZSH_ANTARES_BG_GIT_BRANCH}%F{$ZSH_ANTARES_FG_GIT_BRANCH}"
 		fi
 		ZSH_ANTARES_GIT_BRANCH+=" %${gitcut}>...>$GIT_BRANCH%>> %f%k"
 		if [ -n "$ZSH_ANTARES_USE_LIGHT_GIT_MODE" ]
 		then
 			ZSH_ANTARES_GIT_BRANCH+="%F{$ZSH_ANTARES_FG_DECO}├╼%f"
 		else
 			ZSH_ANTARES_GIT_BRANCH+="%F{$ZSH_ANTARES_FG_DECO}├╮%f"
 		fi
 	fi
 	ZSH_ANTARES_JOBS="%(1j.%F{$ZSH_ANTARES_FG_JOBS}${ZSH_ANTARES_STR_JOBS}%j%f .)"
 	ZSH_ANTARES_PRIVILEDGES="%F{$ZSH_ANTARES_FG_PRIVILEDGES}%B%(!.${ZSH_ANTARES_STR_ROOT}.${ZSH_ANTARES_STR_USER})%b%f"
 }
 antares_update_rprompt()
 {
 	ZSH_ANTARES_GIT_STATUS=""
 	[ -n "$ZSH_ANTARES_USE_LIGHT_GIT_MODE" ] && return
 	(( ZSH_ANTARES_GIT_IN_WORKING_TREE )) || return
 	if (( GIT_CONFLICTS > 0 ))
 	then
 		ZSH_ANTARES_GIT_STATUS+=" %F{$ZSH_ANTARES_FG_GIT_CONFLICTS}${ZSH_ANTARES_STR_GIT_CONFLICTS}${GIT_CONFLICTS}%f"
 	fi
 	if (( GIT_STAGED > 0 ))
 	then
 		ZSH_ANTARES_GIT_STATUS+=" %F{$ZSH_ANTARES_FG_GIT_STAGED}${ZSH_ANTARES_STR_GIT_STAGED}${GIT_STAGED}%f"
 	fi
 	if (( GIT_DELETED > 0 ))
 	then
 		ZSH_ANTARES_GIT_STATUS+=" %F{$ZSH_ANTARES_FG_GIT_DELETED}${ZSH_ANTARES_STR_GIT_DELETED}${GIT_DELETED}%f"
 	fi
 	if (( GIT_CHANGED > 0 ))
 	then
 		ZSH_ANTARES_GIT_STATUS+=" %F{$ZSH_ANTARES_FG_GIT_CHANGED}${ZSH_ANTARES_STR_GIT_CHANGED}${GIT_CHANGED}%f"
 	fi
 	if (( GIT_ADDED > 0 ))
 	then
 		ZSH_ANTARES_GIT_STATUS+=" %F{$ZSH_ANTARES_FG_GIT_ADDED}${ZSH_ANTARES_STR_GIT_ADDED}${GIT_ADDED}%f"
 	fi
 	if (( GIT_UNTRACKED > 0 ))
 	then
 		ZSH_ANTARES_GIT_STATUS+=" %F{$ZSH_ANTARES_FG_GIT_UNTRACKED}${ZSH_ANTARES_STR_GIT_UNTRACKED}${GIT_UNTRACKED}%f"
 	fi
 	if (( GIT_STASHED > 0 ))
 	then
 		ZSH_ANTARES_GIT_STATUS+=" %F{$ZSH_ANTARES_FG_GIT_STASHED}${ZSH_ANTARES_STR_GIT_STASHED}${GIT_STASHED}%f"
 	fi
 	if (( ! ZSH_ANTARES_GIT_IS_DETACHED_HEAD ))
 	then
 		private ahead_behind=""
 		if (( GIT_AHEAD > 0 ))
 		then
 			ahead_behind+="%F{$ZSH_ANTARES_FG_GIT_AHEAD}${ZSH_ANTARES_STR_GIT_AHEAD}${GIT_AHEAD}%f"
 		fi
 		if (( GIT_BEHIND > 0 ))
 		then
 			ahead_behind+="%F{$ZSH_ANTARES_FG_GIT_BEHIND}${ZSH_ANTARES_STR_GIT_BEHIND}${GIT_BEHIND}%f"
 		fi
 		if [ -n "$ahead_behind" ]
 		then
 			ZSH_ANTARES_GIT_STATUS+=" $ahead_behind"
 		fi
 	fi
 	ZSH_ANTARES_GIT_STATUS+=" %F{$ZSH_ANTARES_FG_DECO}╾─╯%f"
 }
 antares_precmd()
 {
 	ZSH_ANTARES_ERR_CODE="$?"
 	antares_update_git_status
 	antares_update_prompt
 	antares_update_rprompt
 	ZSH_ANTARES_EXEC_FLAG=""
 }
 antares_preexec()
 {
 	ZSH_ANTARES_EXEC_FLAG="+"
 	ZSH_ANTARES_EXEC_START=$SECONDS
 }
 autoload -U add-zsh-hook
 add-zsh-hook precmd antares_precmd
 add-zsh-hook preexec antares_preexec
 PROMPT='${ZSH_ANTARES_RETURN}\
 %F{$ZSH_ANTARES_FG_DECO}╭┤%f${ZSH_ANTARES_PWD}${(e)ZSH_ANTARES_FILLER}${ZSH_ANTARES_GIT_BRANCH}
 %F{$ZSH_ANTARES_FG_DECO}╰─╼%f ${ZSH_ANTARES_JOBS}${ZSH_ANTARES_PRIVILEDGES} '
 RPROMPT='${ZSH_ANTARES_GIT_STATUS}'
--- a/assets/add_zsh_theme/bullet-train.zsh-theme
+++ b/assets/add_zsh_theme/bullet-train.zsh-theme
@ -1,696 +0,0 @@
 # README
 #
 # In order for this theme to render correctly, you will need a
 # [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts).
 #
 # In addition, I recommend the
 # [Tomorrow Night theme](https://github.com/chriskempson/tomorrow-theme) and, if
 # you're using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over
 # Terminal.app - it has significantly better color fidelity.
 # ------------------------------------------------------------------------------
 # CONFIGURATION
 # The default configuration, that can be overwrite in your .zshrc file
 # ------------------------------------------------------------------------------
 VIRTUAL_ENV_DISABLE_PROMPT=true
 # Define order and content of prompt
 if [ ! -n "${BULLETTRAIN_PROMPT_ORDER+1}" ]; then
  BULLETTRAIN_PROMPT_ORDER=(
    time
    status
    custom
    context
    dir
    screen
    perl
    ruby
    virtualenv
    nvm
    aws
    go
    rust
    elixir
    git
    hg
    cmd_exec_time
  )
 fi
 # PROMPT
 if [ ! -n "${BULLETTRAIN_PROMPT_CHAR+1}" ]; then
  BULLETTRAIN_PROMPT_CHAR="\$"
 fi
 if [ ! -n "${BULLETTRAIN_PROMPT_ROOT+1}" ]; then
  BULLETTRAIN_PROMPT_ROOT=true
 fi
 if [ ! -n "${BULLETTRAIN_PROMPT_SEPARATE_LINE+1}" ]; then
  BULLETTRAIN_PROMPT_SEPARATE_LINE=true
 fi
 if [ ! -n "${BULLETTRAIN_PROMPT_ADD_NEWLINE+1}" ]; then
  BULLETTRAIN_PROMPT_ADD_NEWLINE=true
 fi
 # STATUS
 if [ ! -n "${BULLETTRAIN_STATUS_EXIT_SHOW+1}" ]; then
  BULLETTRAIN_STATUS_EXIT_SHOW=false
 fi
 if [ ! -n "${BULLETTRAIN_STATUS_BG+1}" ]; then
  BULLETTRAIN_STATUS_BG=green
 fi
 if [ ! -n "${BULLETTRAIN_STATUS_ERROR_BG+1}" ]; then
  BULLETTRAIN_STATUS_ERROR_BG=red
 fi
 if [ ! -n "${BULLETTRAIN_STATUS_FG+1}" ]; then
  BULLETTRAIN_STATUS_FG=white
 fi
 # TIME
 if [ ! -n "${BULLETTRAIN_TIME_BG+1}" ]; then
  BULLETTRAIN_TIME_BG=white
 fi
 if [ ! -n "${BULLETTRAIN_TIME_FG+1}" ]; then
  BULLETTRAIN_TIME_FG=black
 fi
 # CUSTOM
 if [ ! -n "${BULLETTRAIN_CUSTOM_MSG+1}" ]; then
  BULLETTRAIN_CUSTOM_MSG=false
 fi
 if [ ! -n "${BULLETTRAIN_CUSTOM_BG+1}" ]; then
  BULLETTRAIN_CUSTOM_BG=black
 fi
 if [ ! -n "${BULLETTRAIN_CUSTOM_FG+1}" ]; then
  BULLETTRAIN_CUSTOM_FG=default
 fi
 # VIRTUALENV
 if [ ! -n "${BULLETTRAIN_VIRTUALENV_BG+1}" ]; then
  BULLETTRAIN_VIRTUALENV_BG=yellow
 fi
 if [ ! -n "${BULLETTRAIN_VIRTUALENV_FG+1}" ]; then
  BULLETTRAIN_VIRTUALENV_FG=white
 fi
 if [ ! -n "${BULLETTRAIN_VIRTUALENV_PREFIX+1}" ]; then
  BULLETTRAIN_VIRTUALENV_PREFIX=🐍
 fi
 # NVM
 if [ ! -n "${BULLETTRAIN_NVM_BG+1}" ]; then
  BULLETTRAIN_NVM_BG=green
 fi
 if [ ! -n "${BULLETTRAIN_NVM_FG+1}" ]; then
  BULLETTRAIN_NVM_FG=white
 fi
 if [ ! -n "${BULLETTRAIN_NVM_PREFIX+1}" ]; then
  BULLETTRAIN_NVM_PREFIX="⬡ "
 fi
 # AWS
 if [ ! -n "${BULLETTRAIN_AWS_BG+1}" ]; then
  BULLETTRAIN_AWS_BG=yellow
 fi
 if [ ! -n "${BULLETTRAIN_AWS_FG+1}" ]; then
  BULLETTRAIN_AWS_FG=black
 fi
 if [ ! -n "${BULLETTRAIN_AWS_PREFIX+1}" ]; then
  BULLETTRAIN_AWS_PREFIX="☁️"
 fi
 # RUBY
 if [ ! -n "${BULLETTRAIN_RUBY_BG+1}" ]; then
  BULLETTRAIN_RUBY_BG=red
 fi
 if [ ! -n "${BULLETTRAIN_RUBY_FG+1}" ]; then
  BULLETTRAIN_RUBY_FG=white
 fi
 if [ ! -n "${BULLETTRAIN_RUBY_PREFIX+1}" ]; then
  BULLETTRAIN_RUBY_PREFIX=♦️
 fi
 # Go
 if [ ! -n "${BULLETTRAIN_GO_BG+1}" ]; then
  BULLETTRAIN_GO_BG=cyan
 fi
 if [ ! -n "${BULLETTRAIN_GO_FG+1}" ]; then
  BULLETTRAIN_GO_FG=white
 fi
 if [ ! -n "${BULLETTRAIN_GO_PREFIX+1}" ]; then
  BULLETTRAIN_GO_PREFIX="go"
 fi
 # Rust
 if [ ! -n "${BULLETTRAIN_RUST_BG+1}" ]; then
  BULLETTRAIN_RUST_BG=black
 fi
 if [ ! -n "${BULLETTRAIN_RUST_FG+1}" ]; then
  BULLETTRAIN_RUST_FG=white
 fi
 if [ ! -n "${BULLETTRAIN_RUST_PREFIX+1}" ]; then
  BULLETTRAIN_RUST_PREFIX="🦀"
 fi
 # Kubernetes Context
 if [ ! -n "${BULLETTRAIN_KCTX_BG+1}" ]; then
  BULLETTRAIN_KCTX_BG=yellow
 fi
 if [ ! -n "${BULLETTRAIN_KCTX_FG+1}" ]; then
  BULLETTRAIN_KCTX_FG=white
 fi
 if [ ! -n "${BULLETTRAIN_KCTX_PREFIX+1}" ]; then
  BULLETTRAIN_KCTX_PREFIX="⎈"
 fi
 if [ ! -n "${BULLETTRAIN_KCTX_KCONFIG+1}" ]; then
  BULLETTRAIN_KCTX_KCONFIG="${HOME}/.kube/config"
 fi
 if [ ! -n "${BULLETTRAIN_KCTX_KUBECTL+1}" ]; then
  BULLETTRAIN_KCTX_KUBECTL="true"
 fi
 if [ ! -n "${BULLETTRAIN_KCTX_NAMESPACE+1}" ]; then
  BULLETTRAIN_KCTX_NAMESPACE="true"
 fi
 # ELIXIR
 if [ ! -n "${BULLETTRAIN_ELIXIR_BG+1}" ]; then
  BULLETTRAIN_ELIXIR_BG=magenta
 fi
 if [ ! -n "${BULLETTRAIN_ELIXIR_FG+1}" ]; then
  BULLETTRAIN_ELIXIR_FG=white
 fi
 if [ ! -n "${BULLETTRAIN_ELIXIR_PREFIX+1}" ]; then
  BULLETTRAIN_ELIXIR_PREFIX="💧"
 fi
 # DIR
 if [ ! -n "${BULLETTRAIN_DIR_BG+1}" ]; then
  BULLETTRAIN_DIR_BG=blue
 fi
 if [ ! -n "${BULLETTRAIN_DIR_FG+1}" ]; then
  BULLETTRAIN_DIR_FG=white
 fi
 if [ ! -n "${BULLETTRAIN_DIR_CONTEXT_SHOW+1}" ]; then
  BULLETTRAIN_DIR_CONTEXT_SHOW=false
 fi
 if [ ! -n "${BULLETTRAIN_DIR_EXTENDED+1}" ]; then
  BULLETTRAIN_DIR_EXTENDED=1
 fi
 # GIT
 if [ ! -n "${BULLETTRAIN_GIT_COLORIZE_DIRTY+1}" ]; then
  BULLETTRAIN_GIT_COLORIZE_DIRTY=false
 fi
 if [ ! -n "${BULLETTRAIN_GIT_COLORIZE_DIRTY_FG_COLOR+1}" ]; then
  BULLETTRAIN_GIT_COLORIZE_DIRTY_FG_COLOR=black
 fi
 if [ ! -n "${BULLETTRAIN_GIT_COLORIZE_DIRTY_BG_COLOR+1}" ]; then
  BULLETTRAIN_GIT_COLORIZE_DIRTY_BG_COLOR=yellow
 fi
 if [ ! -n "${BULLETTRAIN_GIT_BG+1}" ]; then
  BULLETTRAIN_GIT_BG=white
 fi
 if [ ! -n "${BULLETTRAIN_GIT_FG+1}" ]; then
  BULLETTRAIN_GIT_FG=black
 fi
 if [ ! -n "${BULLETTRAIN_GIT_EXTENDED+1}" ]; then
  BULLETTRAIN_GIT_EXTENDED=true
 fi
 if [ ! -n "${BULLETTRAIN_GIT_PROMPT_CMD+1}" ]; then
  BULLETTRAIN_GIT_PROMPT_CMD="\$(git_prompt_info)"
 fi
 # PERL
 if [ ! -n "${BULLETTRAIN_PERL_BG+1}" ]; then
  BULLETTRAIN_PERL_BG=yellow
 fi
 if [ ! -n "${BULLETTRAIN_PERL_FG+1}" ]; then
  BULLETTRAIN_PERL_FG=black
 fi
 if [ ! -n "${BULLETTRAIN_PERL_PREFIX+1}" ]; then
  BULLETTRAIN_PERL_PREFIX=🐪
 fi
 # CONTEXT
 if [ ! -n "${BULLETTRAIN_CONTEXT_BG+1}" ]; then
  BULLETTRAIN_CONTEXT_BG=black
 fi
 if [ ! -n "${BULLETTRAIN_CONTEXT_FG+1}" ]; then
  BULLETTRAIN_CONTEXT_FG=default
 fi
 if [ ! -n "${BULLETTRAIN_CONTEXT_HOSTNAME+1}" ]; then
  BULLETTRAIN_CONTEXT_HOSTNAME=%m
 fi
 # GIT PROMPT
 if [ ! -n "${BULLETTRAIN_GIT_PREFIX+1}" ]; then
  ZSH_THEME_GIT_PROMPT_PREFIX="\ue0a0 "
 else
  ZSH_THEME_GIT_PROMPT_PREFIX=$BULLETTRAIN_GIT_PREFIX
 fi
 if [ ! -n "${BULLETTRAIN_GIT_SUFFIX+1}" ]; then
  ZSH_THEME_GIT_PROMPT_SUFFIX=""
 else
  ZSH_THEME_GIT_PROMPT_SUFFIX=$BULLETTRAIN_GIT_SUFFIX
 fi
 if [ ! -n "${BULLETTRAIN_GIT_DIRTY+1}" ]; then
  ZSH_THEME_GIT_PROMPT_DIRTY=" %F{red}✘%F{black}"
 else
  ZSH_THEME_GIT_PROMPT_DIRTY=$BULLETTRAIN_GIT_DIRTY
 fi
 if [ ! -n "${BULLETTRAIN_GIT_CLEAN+1}" ]; then
  ZSH_THEME_GIT_PROMPT_CLEAN=" %F{green}✔%F{black}"
 else
  ZSH_THEME_GIT_PROMPT_CLEAN=$BULLETTRAIN_GIT_CLEAN
 fi
 if [ ! -n "${BULLETTRAIN_GIT_ADDED+1}" ]; then
  ZSH_THEME_GIT_PROMPT_ADDED=" %F{green}✚%F{black}"
 else
  ZSH_THEME_GIT_PROMPT_ADDED=$BULLETTRAIN_GIT_ADDED
 fi
 if [ ! -n "${BULLETTRAIN_GIT_MODIFIED+1}" ]; then
  ZSH_THEME_GIT_PROMPT_MODIFIED=" %F{blue}✹%F{black}"
 else
  ZSH_THEME_GIT_PROMPT_MODIFIED=$BULLETTRAIN_GIT_MODIFIED
 fi
 if [ ! -n "${BULLETTRAIN_GIT_DELETED+1}" ]; then
  ZSH_THEME_GIT_PROMPT_DELETED=" %F{red}✖%F{black}"
 else
  ZSH_THEME_GIT_PROMPT_DELETED=$BULLETTRAIN_GIT_DELETED
 fi
 if [ ! -n "${BULLETTRAIN_GIT_UNTRACKED+1}" ]; then
  ZSH_THEME_GIT_PROMPT_UNTRACKED=" %F{yellow}✭%F{black}"
 else
  ZSH_THEME_GIT_PROMPT_UNTRACKED=$BULLETTRAIN_GIT_UNTRACKED
 fi
 if [ ! -n "${BULLETTRAIN_GIT_RENAMED+1}" ]; then
  ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
 else
  ZSH_THEME_GIT_PROMPT_RENAMED=$BULLETTRAIN_GIT_RENAMED
 fi
 if [ ! -n "${BULLETTRAIN_GIT_UNMERGED+1}" ]; then
  ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
 else
  ZSH_THEME_GIT_PROMPT_UNMERGED=$BULLETTRAIN_GIT_UNMERGED
 fi
 if [ ! -n "${BULLETTRAIN_GIT_AHEAD+1}" ]; then
  ZSH_THEME_GIT_PROMPT_AHEAD=" ⬆"
 else
  ZSH_THEME_GIT_PROMPT_AHEAD=$BULLETTRAIN_GIT_AHEAD
 fi
 if [ ! -n "${BULLETTRAIN_GIT_BEHIND+1}" ]; then
  ZSH_THEME_GIT_PROMPT_BEHIND=" ⬇"
 else
  ZSH_THEME_GIT_PROMPT_BEHIND=$BULLETTRAIN_GIT_BEHIND
 fi
 if [ ! -n "${BULLETTRAIN_GIT_DIVERGED+1}" ]; then
  ZSH_THEME_GIT_PROMPT_DIVERGED=" ⬍"
 else
  ZSH_THEME_GIT_PROMPT_DIVERGED=$BULLETTRAIN_GIT_PROMPT_DIVERGED
 fi
 # SCREEN
 if [ ! -n "${BULLETTRAIN_SCREEN_BG+1}" ]; then
  BULLETTRAIN_SCREEN_BG=white
 fi
 if [ ! -n "${BULLETTRAIN_SCREEN_FG+1}" ]; then
  BULLETTRAIN_SCREEN_FG=black
 fi
 if [ ! -n "${BULLETTRAIN_SCREEN_PREFIX+1}" ]; then
  BULLETTRAIN_SCREEN_PREFIX="⬗"
 fi
 # COMMAND EXECUTION TIME
 if [ ! -n "${BULLETTRAIN_EXEC_TIME_ELAPSED+1}" ]; then
  BULLETTRAIN_EXEC_TIME_ELAPSED=5
 fi
 if [ ! -n "${BULLETTRAIN_EXEC_TIME_BG+1}" ]; then
  BULLETTRAIN_EXEC_TIME_BG=yellow
 fi
 if [ ! -n "${BULLETTRAIN_EXEC_TIME_FG+1}" ]; then
  BULLETTRAIN_EXEC_TIME_FG=black
 fi
 # ------------------------------------------------------------------------------
 # SEGMENT DRAWING
 # A few functions to make it easy and re-usable to draw segmented prompts
 # ------------------------------------------------------------------------------
 CURRENT_BG='NONE'
 SEGMENT_SEPARATOR=''
 # Begin a segment
 # Takes three arguments, background, foreground and text. All of them can be omitted,
 # rendering default background/foreground and no text.
 prompt_segment() {
  local bg fg
  [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
  [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
  if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
    echo -n " %{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%} "
  else
    echo -n "%{$bg%}%{$fg%} "
  fi
  CURRENT_BG=$1
  [[ -n $3 ]] && echo -n $3
 }
 # End the prompt, closing any open segments
 prompt_end() {
  if [[ -n $CURRENT_BG ]]; then
    echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
  else
    echo -n "%{%k%}"
  fi
  echo -n "%{%f%}"
  CURRENT_BG=''
 }
 # ------------------------------------------------------------------------------
 # PROMPT COMPONENTS
 # Each component will draw itself, and hide itself if no information needs
 # to be shown
 # ------------------------------------------------------------------------------
 # Context: user@hostname (who am I and where am I)
 context() {
  local user="$(whoami)"
  [[ "$user" != "$BULLETTRAIN_CONTEXT_DEFAULT_USER" || -n "$BULLETTRAIN_IS_SSH_CLIENT" ]] && echo -n "${user}@$BULLETTRAIN_CONTEXT_HOSTNAME"
 }
 prompt_context() {
  local _context="$(context)"
  [[ -n "$_context" ]] && prompt_segment $BULLETTRAIN_CONTEXT_BG $BULLETTRAIN_CONTEXT_FG "$_context"
 }
 # Based on http://stackoverflow.com/a/32164707/3859566
 function displaytime {
  local T=$1
  local D=$((T/60/60/24))
  local H=$((T/60/60%24))
  local M=$((T/60%60))
  local S=$((T%60))
  [[ $D > 0 ]] && printf '%dd' $D
  [[ $H > 0 ]] && printf '%dh' $H
  [[ $M > 0 ]] && printf '%dm' $M
  printf '%ds' $S
 }
 # Prompt previous command execution time
 preexec() {
  cmd_timestamp=`date +%s`
 }
 precmd() {
  local stop=`date +%s`
  local start=${cmd_timestamp:-$stop}
  let BULLETTRAIN_last_exec_duration=$stop-$start
  cmd_timestamp=''
 }
 prompt_cmd_exec_time() {
  [ $BULLETTRAIN_last_exec_duration -gt $BULLETTRAIN_EXEC_TIME_ELAPSED ] && prompt_segment $BULLETTRAIN_EXEC_TIME_BG $BULLETTRAIN_EXEC_TIME_FG "$(displaytime $BULLETTRAIN_last_exec_duration)"
 }
 # Custom
 prompt_custom() {
  if [[ $BULLETTRAIN_CUSTOM_MSG == false ]]; then
    return
  fi
  local custom_msg
  eval custom_msg=$BULLETTRAIN_CUSTOM_MSG
  [[ -n "${custom_msg}" ]] && prompt_segment $BULLETTRAIN_CUSTOM_BG $BULLETTRAIN_CUSTOM_FG "${custom_msg}"
 }
 # Git
 prompt_git() {
  if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" == "1" ]]; then
    return
  fi
  local ref dirty mode repo_path git_prompt
  repo_path=$(git rev-parse --git-dir 2>/dev/null)
  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
    if [[ $BULLETTRAIN_GIT_COLORIZE_DIRTY == true && -n $(git status --porcelain --ignore-submodules) ]]; then
      BULLETTRAIN_GIT_BG=$BULLETTRAIN_GIT_COLORIZE_DIRTY_BG_COLOR
      BULLETTRAIN_GIT_FG=$BULLETTRAIN_GIT_COLORIZE_DIRTY_FG_COLOR
    fi
    prompt_segment $BULLETTRAIN_GIT_BG $BULLETTRAIN_GIT_FG
    eval git_prompt=${BULLETTRAIN_GIT_PROMPT_CMD}
    if [[ $BULLETTRAIN_GIT_EXTENDED == true ]]; then
      echo -n ${git_prompt}$(git_prompt_status)
    else
      echo -n ${git_prompt}
    fi
  fi
 }
 prompt_hg() {
  local rev status
  if $(hg id >/dev/null 2>&1); then
    if $(hg prompt >/dev/null 2>&1); then
      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
        # if files are not added
        prompt_segment red white
        st='±'
      elif [[ -n $(hg prompt "{status|modified}") ]]; then
        # if any modification
        prompt_segment yellow black
        st='±'
      else
        # if working copy is clean
        prompt_segment green black
      fi
      echo -n $(hg prompt "☿ {rev}@{branch}") $st
    else
      st=""
      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
      branch=$(hg id -b 2>/dev/null)
      if $(hg st | grep -Eq "^\?"); then
        prompt_segment red black
        st='±'
      elif $(hg st | grep -Eq "^(M|A)"); then
        prompt_segment yellow black
        st='±'
      else
        prompt_segment green black
      fi
      echo -n "☿ $rev@$branch" $st
    fi
  fi
 }
 # Dir: current working directory
 prompt_dir() {
  local dir=''
  local _context="$(context)"
  [[ $BULLETTRAIN_DIR_CONTEXT_SHOW == true && -n "$_context" ]] && dir="${dir}${_context}:"
  if [[ $BULLETTRAIN_DIR_EXTENDED == 0 ]]; then
    #short directories
    dir="${dir}%1~"
  elif [[ $BULLETTRAIN_DIR_EXTENDED == 2 ]]; then
    #long directories
    dir="${dir}%0~"
  else
    #medium directories (default case)
    dir="${dir}%4(c:...:)%3c"
  fi
  prompt_segment $BULLETTRAIN_DIR_BG $BULLETTRAIN_DIR_FG $dir
 }
 # RUBY
 # RVM: only shows RUBY info if on a gemset that is not the default one
 # RBENV: shows current ruby version active in the shell; also with non-global gemsets if any is active
 # CHRUBY: shows current ruby version active in the shell
 prompt_ruby() {
  if command -v rvm-prompt > /dev/null 2>&1; then
    prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(rvm-prompt i v g)"
  elif command -v chruby > /dev/null 2>&1; then
    prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX"  $(chruby | sed -n -e 's/ \* //p')"
  elif command -v rbenv > /dev/null 2>&1; then
    current_gemset() {
      echo "$(rbenv gemset active 2&>/dev/null | sed -e 's/ global$//')"
    }
    if [[ -n $(current_gemset) ]]; then
      prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(rbenv version | sed -e 's/ (set.*$//')"@"$(current_gemset)"
    else
      prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(rbenv version | sed -e 's/ (set.*$//')"
    fi
  fi
 }
 # ELIXIR
 prompt_elixir() {
  if command -v elixir > /dev/null 2>&1; then
    prompt_segment $BULLETTRAIN_ELIXIR_BG $BULLETTRAIN_ELIXIR_FG $BULLETTRAIN_ELIXIR_PREFIX" $(elixir -v | tail -n 1 | awk '{print $2}')"
  fi
 }
 # PERL
 # PLENV: shows current PERL version active in the shell
 prompt_perl() {
  if command -v plenv > /dev/null 2>&1; then
    prompt_segment $BULLETTRAIN_PERL_BG $BULLETTRAIN_PERL_FG $BULLETTRAIN_PERL_PREFIX" $(plenv version | sed -e 's/ (set.*$//')"
  fi
 }
 # Go
 prompt_go() {
  setopt extended_glob
  if [[ (-f *.go(#qN) || -d Godeps || -f glide.yaml) ]]; then
    if command -v go > /dev/null 2>&1; then
      prompt_segment $BULLETTRAIN_GO_BG $BULLETTRAIN_GO_FG $BULLETTRAIN_GO_PREFIX" $(go version | grep --colour=never -oE '[[:digit:]].[[:digit:]]+')"
    fi
  fi
 }
 # Rust
 prompt_rust() {
  if [[ (-f Cargo.toml) ]]; then
    if command -v rustc > /dev/null 2>&1; then
      prompt_segment $BULLETTRAIN_RUST_BG $BULLETTRAIN_RUST_FG $BULLETTRAIN_RUST_PREFIX" $(rustc -V version | cut -d' ' -f2)"
    fi
  fi
 }
 # Kubernetes Context
 prompt_kctx() {
  if [[ "$BULLETTRAIN_KCTX_KUBECTL" == "true" ]] && command -v kubectl > /dev/null 2>&1; then
    local jsonpath='{.current-context}'
    if [[ "$BULLETTRAIN_KCTX_NAMESPACE" == "true" ]]; then
      jsonpath="${jsonpath}{':'}{..namespace}"
    fi
    prompt_segment $BULLETTRAIN_KCTX_BG $BULLETTRAIN_KCTX_FG $BULLETTRAIN_KCTX_PREFIX" $(kubectl config view --minify --output "jsonpath=${jsonpath}" 2>/dev/null)"
  elif [[ -f $BULLETTRAIN_KCTX_KCONFIG ]]; then
    prompt_segment $BULLETTRAIN_KCTX_BG $BULLETTRAIN_KCTX_FG $BULLETTRAIN_KCTX_PREFIX" $(cat $BULLETTRAIN_KCTX_KCONFIG | grep current-context | awk '{print $2}')"
  fi
 }
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
  local virtualenv_path="$VIRTUAL_ENV"
  if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
    prompt_segment $BULLETTRAIN_VIRTUALENV_BG $BULLETTRAIN_VIRTUALENV_FG $BULLETTRAIN_VIRTUALENV_PREFIX" $(basename $virtualenv_path)"
  elif which pyenv &> /dev/null; then
    if [[ "$(pyenv version | sed -e 's/ (set.*$//' | tr '\n' ' ' | sed 's/.$//')" != "system" ]]; then
      prompt_segment $BULLETTRAIN_VIRTUALENV_BG $BULLETTRAIN_VIRTUALENV_FG $BULLETTRAIN_VIRTUALENV_PREFIX" $(pyenv version | sed -e 's/ (set.*$//' | tr '\n' ' ' | sed 's/.$//')"
    fi
  fi
 }
 # NVM: Node version manager
 prompt_nvm() {
  local nvm_prompt
  if type nvm >/dev/null 2>&1; then
    nvm_prompt=$(nvm current 2>/dev/null)
    [[ "${nvm_prompt}x" == "x" || "${nvm_prompt}" == "system" ]] && return
  elif type node >/dev/null 2>&1; then
    nvm_prompt="$(node --version)"
  else
    return
  fi
  nvm_prompt=${nvm_prompt}
  prompt_segment $BULLETTRAIN_NVM_BG $BULLETTRAIN_NVM_FG $BULLETTRAIN_NVM_PREFIX$nvm_prompt
 }
 #AWS Profile
 prompt_aws() {
  local spaces="  "
  if [[ -n "$AWS_PROFILE" ]]; then
    prompt_segment $BULLETTRAIN_AWS_BG $BULLETTRAIN_AWS_FG $BULLETTRAIN_AWS_PREFIX$spaces$AWS_PROFILE
  fi
 }
 # SCREEN Session
 prompt_screen() {
  local session_name="$STY"
  if [[ "$session_name" != "" ]]; then
    prompt_segment $BULLETTRAIN_SCREEN_BG $BULLETTRAIN_SCREEN_FG $BULLETTRAIN_SCREEN_PREFIX" $session_name"
  fi
 }
 prompt_time() {
  if [[ $BULLETTRAIN_TIME_12HR == true ]]; then
    prompt_segment $BULLETTRAIN_TIME_BG $BULLETTRAIN_TIME_FG %D{%r}
  else
    prompt_segment $BULLETTRAIN_TIME_BG $BULLETTRAIN_TIME_FG %D{%T}
  fi
 }
 # Status:
 # - was there an error
 # - am I root
 # - are there background jobs?
 prompt_status() {
  local symbols
  symbols=()
  [[ $RETVAL -ne 0 && $BULLETTRAIN_STATUS_EXIT_SHOW != true ]] && symbols+="✘"
  [[ $RETVAL -ne 0 && $BULLETTRAIN_STATUS_EXIT_SHOW == true ]] && symbols+="✘ $RETVAL"
  [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡%f"
  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="⚙"
  if [[ -n "$symbols" && $RETVAL -ne 0 ]]; then
    prompt_segment $BULLETTRAIN_STATUS_ERROR_BG $BULLETTRAIN_STATUS_FG "$symbols"
  elif [[ -n "$symbols" ]]; then
    prompt_segment $BULLETTRAIN_STATUS_BG $BULLETTRAIN_STATUS_FG "$symbols"
  fi
 }
 # Prompt Character
 prompt_chars() {
  local bt_prompt_chars="${BULLETTRAIN_PROMPT_CHAR}"
  if [[ $BULLETTRAIN_PROMPT_ROOT == true ]]; then
    bt_prompt_chars="%(!.%F{red}# .%F{green}${bt_prompt_chars}%f)"
  fi
  if [[ $BULLETTRAIN_PROMPT_SEPARATE_LINE == false ]]; then
    bt_prompt_chars="${bt_prompt_chars}"
  fi
  echo -n "$bt_prompt_chars"
  if [[ -n $BULLETTRAIN_PROMPT_CHAR ]]; then
    echo -n " "
  fi
 }
 # Prompt Line Separator
 prompt_line_sep() {
  if [[ $BULLETTRAIN_PROMPT_SEPARATE_LINE == true ]]; then
    # newline wont print without a non newline character, so add a zero-width space
    echo -e '\n%{\u200B%}'
  fi
 }
 # ------------------------------------------------------------------------------
 # MAIN
 # Entry point
 # ------------------------------------------------------------------------------
 build_prompt() {
  RETVAL=$?
  for segment in $BULLETTRAIN_PROMPT_ORDER
  do
    prompt_$segment
  done
  prompt_end
 }
 NEWLINE='
 '
 PROMPT=''
 [[ $BULLETTRAIN_PROMPT_ADD_NEWLINE == true ]] && PROMPT="$PROMPT$NEWLINE"
 PROMPT="$PROMPT"'%{%f%b%k%}$(build_prompt)'
 [[ $BULLETTRAIN_PROMPT_SEPARATE_LINE == true ]] && PROMPT="$PROMPT$NEWLINE"
 PROMPT="$PROMPT"'%{${fg_bold[default]}%}'
 [[ $BULLETTRAIN_PROMPT_SEPARATE_LINE == false ]] && PROMPT="$PROMPT "
 PROMPT="$PROMPT"'$(prompt_chars)%{$reset_color%}'
--- a/assets/add_zsh_theme/color-input.zsh-theme
+++ b/assets/add_zsh_theme/color-input.zsh-theme
@ -1,38 +0,0 @@
 # Refer https://misc.flogisoft.com/bash/tip_colors_and_formatting for the ANSI/VT100 control sequences
 local user_color=026
 local dir_color=130
 local git_branch_color=010
 local input_color=220
 # Uncomment the following line to hide the virtual environment name.
 # export VIRTUAL_ENV_DISABLE_PROMPT=1
 # User details in green, bold
 local user='%B$FG[${user_color}]%}%n@%m%{$reset_color%}'
 # Directory details in cyan, bold
 local dir='%B$FG[${dir_color}]%~%{$reset_color%}'
 # git branch details in green
 local git_branch='$FG[${git_branch_color}]$(git_prompt_info)%{$reset_color%}'
 # Error message on command returning non-zero exit code
 error_msg="\e[0;31mCommand failed"
 PROMPT="${user}:${dir}:${git_branch}
 $ $FG[${input_color}]"
 # Resetting color to default white.
 preexec()
 {
  echo -ne "\e[0m"
 }
 # Printing error message if command failed.
 precmd()
 {
  # Command failed
  if [ $? -ne 0 ];
  then
    echo "${error_msg}"
  fi
 }
--- a/assets/add_zsh_theme/comfyline.zsh-theme
+++ b/assets/add_zsh_theme/comfyline.zsh-theme
@ -1,418 +0,0 @@
 ##########################################
 ###    Comfyline - theme for zsh       ###
 # Original Author: not pua ( imnotpua )  #
 # email: atp@tutamail.com                #
 ##########################################
 # make prompt work without oh-my-zsh
 setopt PROMPT_SUBST
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 # default segment seperators
 if [[ $COMFYLINE_SEGSEP == "" ]]; then
    COMFYLINE_SEGSEP='\ue0b4'
 fi
 if [[ $COMFYLINE_SEGSEP_REVERSE == "" ]]; then
    COMFYLINE_SEGSEP_REVERSE='\ue0b6'
 fi
 # date and time formats
 if [[ $COMFYLINE_DATE_FORMAT == "" ]]; then
    COMFYLINE_DATE_FORMAT="%A, %e %B %Y"
 fi
 if [[ $COMFYLINE_TIME_FORMAT == "" ]]; then
    COMFYLINE_TIME_FORMAT="%l:%M %p"
 fi
 # default light theme
 if [[ $RETVAL_RANK == "" ]]; then
    RETVAL_RANK=1
 fi
 if [[ $HOST_RANK == "" ]]; then
    HOST_RANK=2
 fi
 if [[ $USER_RANK == "" ]] then
    USER_RANK=3
 fi
 if [[ $DIR_RANK == "" ]]; then
    DIR_RANK=4
 fi
 if [[ $GIT_RANK == "" ]] then
    GIT_RANK=5
 fi
 if [[ $VENV_RANK = "" ]]; then
    VENV_RANK=6
 fi
 if [[ $BAT_RANK == "" ]] then
    BAT_RANK=-3
 fi
 if [[ $DATE_RANK == "" ]]; then
    DATE_RANK=-2
 fi
 if [[ $TIME_RANK == "" ]]; then
    TIME_RANK=-1
 fi
 # default colors
 if [[  $RETVAL_b == "" ]]; then
    RETVAL_b="#8a8bd8"
 fi
 if [[  $RETVAL_f == "" ]]; then
    RETVAL_f="#61355c"
 fi
 if [[  $HOST_b == "" ]]; then
    HOST_b="#b3b5fb"
 fi
 if [[  $HOST_f == "" ]]; then
    HOST_f="#4a4b87"
 fi
 if [[  $USER_b == "" ]]; then
    USER_b="#f8bbe5"
 fi
 if [[  $USER_f == "" ]]; then
    USER_f="#874c80"
 fi
 if [[  $GIT_b == "" ]]; then
    GIT_b="#f6b3b3"
 fi
 if [[  $GIT_f == "" ]]; then
    GIT_f="#d95353"
 fi
 if [[  $GIT_CLEAN_b == "" ]]; then
    GIT_CLEAN_b="#b3f58c"
 fi
 if [[  $GIT_CLEAN_f == "" ]]; then
    GIT_CLEAN_f="#568459"
 fi
 if [[  $DIR_b == "" ]]; then
    DIR_b="#e1bff2"
 fi
 if [[  $DIR_f == "" ]]; then
    DIR_f="#844189"
 fi
 if [[  $VENV_b == "" ]]; then
    VENV_b="#a8ddf9"
 fi
 if [[  $VENV_f == "" ]]; then
    VENV_f="#0066a4"
 fi
 if [[  $BAT_b == "" ]]; then
    BAT_b="#b3b5fb"
 fi
 if [[  $BAT_f == "" ]]; then
    BAT_f="#4a4b87"
 fi
 if [[  $DATE_b == "" ]]; then
    DATE_b="#f8bbe5"
 fi
 if [[  $DATE_f == "" ]]; then
    DATE_f="#874c80"
 fi
 if [[  $TIME_b == "" ]]; then
    TIME_b="#e1bff2"
 fi
 if [[  $TIME_f == "" ]]; then
    TIME_f="#844189"
 fi
 # basic functions
 #function takes 4 arguments, background, foreground, text and rank (for edge cases)
 function create_segment(){
    if [[ $4 -lt $RIGHTMOST_RANK ]]; then
        local segment="%F{$1}$COMFYLINE_SEGSEP_REVERSE"
        echo -n "$segment%K{$1}%F{$2} $3 "
    elif [[ $4 -gt $LEFTMOST_RANK ]]; then
        local segment="%K{$1}$COMFYLINE_SEGSEP "
        echo -n "$segment%F{$2}$3%F{$1} "
    elif [[ $4 -eq $RIGHTMOST_RANK ]]; then
 	if [[ $COMFYLINE_NO_START -eq 1 ]]; then
 	    local segment="%F{$1}$COMFYLINE_SEGSEP_REVERSE"
 	    echo -n "$segment%K{$1}%F{$2} $3"
 	else
 	    local segment="%F{$1}$COMFYLINE_SEGSEP_REVERSE"
 	    echo -n "$segment%K{$1}%F{$2} $3 %k%F{$1}$COMFYLINE_SEGSEP"
 	fi
    elif [[ $4 -eq $LEFTMOST_RANK ]]; then
 	if [[ $COMFYLINE_NO_START -eq 1 ]]; then
 	    local segment="%K{$1} "
            echo -n "$segment%F{$2}$3%F{$1} "
 	else
 	    local segment="%F{$1}$COMFYLINE_SEGSEP_REVERSE%K{$1} "
 	    echo -n "$segment%F{$2}$3%F{$1} "
 	fi
    fi
 }
 ###  explanation: creates segment seperator with new bg but fg as old bg.
 ###               then prints contents in new fg and prepares for next fg as current bg
 # segment functions
 function retval(){
    if [[ $COMFYLINE_RETVAL_NUMBER -eq 2 ]]; then
        symbol="%(?..✘ %?)"
    elif [[ $COMFYLINE_RETVAL_NUMBER -eq 1 ]]; then
        symbol="%?"
    else
        symbol="%(?..✘)"
    fi
    create_segment $RETVAL_b $RETVAL_f $symbol $RETVAL_RANK
 }
 function hostname(){
    if [[ $COMFYLINE_FULL_HOSTNAME -eq 1 ]]; then
        create_segment $HOST_b $HOST_f "%M" $HOST_RANK
    else
        create_segment $HOST_b $HOST_f "%m" $HOST_RANK
    fi
 }
 function username(){
    create_segment $USER_b $USER_f "%n" $USER_RANK
 }
 function dir(){
    if [[ $COMFYLINE_FULL_DIR -eq 1 ]]; then
        symbol="%d"
    else
        symbol="%~"
    fi
    create_segment $DIR_b $DIR_f $symbol $DIR_RANK
 }
 # variables to set git_prompt info and status
 ZSH_THEME_GIT_PROMPT_PREFIX=" \ue0a0 "
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
 ZSH_THEME_GIT_PROMPT_MODIFIED=" ±"
 ZSH_THEME_GIT_PROMPT_DELETED=" \u2796"
 ZSH_THEME_GIT_PROMPT_UNTRACKED=" !"
 ZSH_THEME_GIT_PROMPT_RENAMED=" \u21b7"
 ZSH_THEME_GIT_PROMPT_UNMERGED=" \u21e1"
 ZSH_THEME_GIT_PROMPT_AHEAD=" \u21c5"
 ZSH_THEME_GIT_PROMPT_BEHIND=" \u21b1"
 ZSH_THEME_GIT_PROMPT_DIVERGED=" \u21b0"
 function gitrepo(){
 	if [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
 		if [[ $(git status --porcelain) == "" ]]; then
            if [[ $(command -v git_prompt_info 2> /dev/null) ]]; then
    	        create_segment $GIT_CLEAN_b $GIT_CLEAN_f "$(git_prompt_info)$(git_prompt_status)" $GIT_RANK
            else
    	        create_segment $GIT_CLEAN_b $GIT_CLEAN_f "$ZSH_THEME_GIT_PROMPT_PREFIX$(git rev-parse --abbrev-ref HEAD)" $GIT_RANK
            fi
    	else
            if [[ $(command -v git_prompt_info 2> /dev/null) ]]; then
    	        create_segment $GIT_b $GIT_f "$(git_prompt_info)$(git_prompt_status)" $GIT_RANK
            else
    	        create_segment $GIT_b $GIT_f "$ZSH_THEME_GIT_PROMPT_PREFIX$(git rev-parse --abbrev-ref HEAD)" $GIT_RANK
            fi
    	fi
 	fi
 }
 function venv(){
    if [ -n "$VIRTUAL_ENV" ]; then
        create_segment $VENV_b $VENV_f ${VIRTUAL_ENV:t:gs/%/%%} $VENV_RANK
    fi
 }
 # battery function
 # variables
 if [[ $COMFYLINE_BATTERY_LOW == "" ]]; then
    COMFYLINE_BATTERY_LOW=15
 fi
 if [[ $COMFYLINE_BATTERY_HIGH == "" ]]; then
    COMFYLINE_BATTERY_HIGH=90
 fi
 if [[ $COMFYLINE_CHARGING_ICON == "" ]];  then
    COMFYLINE_CHARGING_ICON="⚡️"
 fi
 if [[ $COMFYLINE_HIGHCHARGE_ICON == "" ]]; then
    COMFYLINE_HIGHCHARGE_ICON="󰁹"
 fi
 if [[ $COMFYLINE_MIDCHARGE_ICON == "" ]]; then
    COMFYLINE_MIDCHARGE_ICON="󰁽"
 fi
 if [[ $COMFYLINE_LOWCHARGE_ICON == "" ]]; then
    COMFYLINE_LOWCHARGE_ICON="󰂃"
 fi
 function calcbat(){
    BAT=""
    if [[ $(uname) == "Linux" ]]; then
        number=$(ls /sys/class/power_supply/ | grep 'BAT' | wc -l )
        if [[ $number -eq 0 ]]; then
            return 0
        fi
        for ((i=0;i<$number;i++));do
            capacity=$(cat /sys/class/power_supply/BAT${i}/capacity)
            stats=$(cat /sys/class/power_supply/BAT${i}/status)
            if [[ $stats == "Charging" ]]; then
                stats="$COMFYLINE_CHARGING_ICON"
            elif [[ $stats == "Discharging" ]]; then
                if [ $capacity -gt $COMFYLINE_BATTERY_HIGH ]; then
                    stats="$COMFYLINE_HIGHCHARGE_ICON"
                elif  [ $capacity -lt $COMFYLINE_BATTERY_LOW ]; then
                    stats="$COMFYLINE_LOWCHARGE_ICON"
                else
                    stats="$COMFYLINE_MIDCHARGE_ICON"
                fi
            elif [[ $stats == "Not charging" ]]; then
                stats="$COMFYLINE_HIGHCHARGE_ICON"
            fi
            BAT="$BAT$capacity%% $stats "
        done
    elif [[ $(uname) == "Darwin" ]]; then
        battery_details = $(pmset -g batt)
 	charged=$(echo "$battery_details" | grep -w 'charged')
 	charging=$(echo "$battery_details" | grep -w 'AC Power')
 	discharging=$(echo "$battery_details" | grep -w 'Battery Power')
 	capacity=$(echo "$battery_details" | grep -o "([0-9]*)"%)
        if [ -n "$charging" ]; then
            stats="$COMFYLINE_CHARGING_ICON"
        elif [[ -n "$discharging" ]]; then
            if [ $capacity -gt $COMFYLINE_BATTERY_HIGH ]; then
                stats="$COMFYLINE_HIGHCHARGE_ICON"
            elif  [ $capacity -lt $COMFYLINE_BATTERY_LOW ]; then
                stats="$COMFYLINE_LOWCHARGE_ICON"
            else
                stats="$COMFYLINE_MIDCHARGE_ICON"
            fi
        fi
        BAT="$capacity%% $stats"
    elif [[ $(uname) == "FreeBSD" || $(uname) == "OpenBSD" ]]; then
    	capacity=$(apm -l)
    	stats=$(apm -b)
    	if [ $stats -eq 3 ]; then
            stats="$COMFYLINE_CHARGING_ICON"
        else
            if [[ $capacity -gt $COMFYLINE_BATTERY_HIGH ]]; then
                stats="$COMFYLINE_HIGHCHARGE_ICON"
            elif  [[ $capacity -lt $COMFYLINE_BATTERY_LOW ]]; then
                stats="$COMFYLINE_LOWCHARGE_ICON"
            else
                stats="$COMFYLINE_MIDCHARGE_ICON"
            fi
    	fi
        BAT="$capacity%% $stats"
    fi
 }
 # function to call battery calculation
 function currbat(){
    if [[ $COMFYLINE_BATTERY_PLUGIN -eq 1 ]]; then
        create_segment $BAT_b $BAT_f "$(battery_pct_prompt)" $BAT_RANK
    else
    	calcbat
        create_segment $BAT_b $BAT_f "$BAT" $BAT_RANK
    fi
 }
 function currdate(){
    info="%D{$COMFYLINE_DATE_FORMAT}"
    create_segment $DATE_b $DATE_f $info $DATE_RANK
 }
 function currtime(){
    info="%D{$COMFYLINE_TIME_FORMAT}"
    create_segment $TIME_b $TIME_f $info $TIME_RANK
 }
 function endleft(){
    echo -n "%k$COMFYLINE_SEGSEP%f"
 }
 # parse variables
 segments=("retval" "hostname" "username" "dir" "gitrepo" "venv" "currbat" "currtime" "currdate")
 segment_ranks=($RETVAL_RANK $HOST_RANK $USER_RANK $DIR_RANK $GIT_RANK $VENV_RANK $BAT_RANK $TIME_RANK $DATE_RANK)
 # split into left and right
 left_prompt=()
 right_prompt=()
 left_ranks=()
 right_ranks=()
 for ((i=1;i<=${#segments[@]};i++)); do
    if [[ segment_ranks[$i] -gt 0 ]]; then
        left_prompt+=(${segments[$i]})
        left_ranks+=(${segment_ranks[$i]})
    elif [[ segment_ranks[$i] -lt 0 ]]; then
        right_prompt+=(${segments[$i]})
        right_ranks+=(${segment_ranks[$i]#-})
    fi
 done
 # sort the prompts according to ranks and find the leftmost and rightmost
 # I use the traditional iterative method to find max/min and using count-sort for sorting
 LEFTMOST_RANK=100
 declare -A sorted_left
 for ((i=1;i<=${#left_prompt[@]};i++)); do
    if [[ $left_ranks[$i] -lt $LEFTMOST_RANK ]]; then LEFTMOST_RANK=$left_ranks[$i] fi
    sorted_left[$left_ranks[$i]]="$left_prompt[$i]"
 done
 RIGHTMOST_RANK=100
 declare -A sorted_right
 for ((i=1;i<=${#right_prompt[@]};i++)); do
    if [[ $right_ranks[$i] -lt $RIGHTMOST_RANK ]]; then RIGHTMOST_RANK=$right_ranks[$i] fi
    sorted_right[$right_ranks[$i]]="$right_prompt[$i]"
 done
 ((RIGHTMOST_RANK*=-1))
 # finally make_prompt which makes prompts
 make_left_prompt(){
    for ((j = 1; j <= ${#left_prompt[@]}; j++)); do
        type $sorted_left[$j] &>/dev/null && $sorted_left[$j]
    done
 }
 make_right_prompt(){
    for ((j = ${#right_prompt[@]}; j>0; j--)); do
        type $sorted_right[$j] &>/dev/null && $sorted_right[$j]
    done
 }
 export PROMPT='%{%f%b%k%}$(make_left_prompt)$(endleft) '
 export RPROMPT='      %{%f%b%k%}$(make_right_prompt)'    # spaces left so that hiding is triggered
 if [[ $COMFYLINE_NEXT_LINE_CHAR == "" ]]; then
    COMFYLINE_NEXT_LINE_CHAR='➟'
 fi
 if [[ $COMFYLINE_NEXT_LINE_CHAR_COLOR == "" ]]; then
    COMFYLINE_NEXT_LINE_CHAR_COLOR="grey"
 fi
 next_line_maker(){
    echo -n "%F{$COMFYLINE_NEXT_LINE_CHAR_COLOR}$COMFYLINE_NEXT_LINE_CHAR %f"
 }
 # setting up typing area
 if [[ COMFYLINE_START_NEXT_LINE -eq 2 ]]; then
 PROMPT=$PROMPT'
 '$(next_line_maker)
 elif [[ COMFYLINE_NO_GAP_LINE -eq 1 ]]; then
 else
    PROMPT='
 '$PROMPT
 fi
--- a/assets/add_zsh_theme/emoji.zsh-theme
+++ b/assets/add_zsh_theme/emoji.zsh-theme
@ -1,7 +0,0 @@
 PROMPT=" %(?:%{$fg_bold[green]%}➜:%{$fg_bold[red]%}➜)"
 PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)'
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✏️ "
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) ✅"
--- a/assets/add_zsh_theme/fishbone++.zsh-theme
+++ b/assets/add_zsh_theme/fishbone++.zsh-theme
@ -1,60 +0,0 @@
 local username="%n"
 local path_prefix="%{$fg[yellow]%}["
 local path_string="%{$fg[blue]%}%~"
 local path_postfix="%{$fg[yellow]%}]"
 local prompt_string="❯❯ "
 local local_time="%T"
 local newline=$'\n'
 local line_mode=$'\n'
 # customize user settings
 # prompt symbol
 if [ ! -z "$FISHBONEPP_PROMPT" ]; then
 	prompt_string="$FISHBONEPP_PROMPT"
 fi
 # username
 if [ ! -z "$FISHBONEPP_USER" ]; then
 	username="$FISHBONEPP_USER"
 fi
 # time mode
 if [ "$FISHBONEPP_TIME" = "12HR" ]; then
 	local_time="%t"
 elif [ "$FISHBONEPP_TIME" = "FULL" ]; then
 	local_time="%*"
 else
 	local_time="%T"
 fi
 # new line on start
 if [ "$FISHBONEPP_NEWLINE" = false ]; then
 	newline=''
 fi
 # line mode
 if [ "$FISHBONEPP_LINE_MODE" = "singleline" ]; then
 	line_mode=''
 fi
 local host_name="%{$fg[blue]%}${username}"
 local time_string="%{$fg[blue]%}${local_time}"
 # Make prompt_string red if the previous command failed.
 local return_status="%(?:%{$fg[cyan]%}$prompt_string:%{$fg[red]%}$prompt_string%}"
 # set the git_prompt_info text
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue](%{$reset_color%}%{$fg[yellow]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%{$fg[blue])%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="⚡"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 PROMPT='${newline}\
 ${host_name}${hosr}%{$reset_color%}@${time_string} ${line_mode}\
 ${path_prefix}${path_string}${path_postfix}$(git_prompt_info)$(git_prompt_status) \
 ${return_status} %{$reset_color%}'
 ZSH_THEME_GIT_PROMPT_ADDED="➕"
 ZSH_THEME_GIT_PROMPT_MODIFIED="✒️ "
 ZSH_THEME_GIT_PROMPT_DELETED="➖"
 ZSH_THEME_GIT_PROMPT_RENAMED="⁉️ "
 ZSH_THEME_GIT_PROMPT_UNMERGED="🥺"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="🚝"
--- a/assets/fastfetch/config-pokemon.jsonc
+++ b/assets/fastfetch/config-pokemon.jsonc
@ -1,73 +0,0 @@
 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
 "logo": {
  "height": 5,
  "width": 10,
  "padding": {
    "top": 1
    }
  },
    "display": {
        "separator": " -> "
    },
    "modules": [
        "break",
        {
            "type": "title",
            "keyWidth": 10,
 			"format": "         {6}{7}{8}"
        },
        {
            "type": "custom",
            "format": " ─────────────────────────── "
        },
        {
            "type": "kernel",
            "key": " ",
            "keyColor": "yellow"
        },
        {
            "type": "wm",
            "key": " ",
            "keyColor": "blue"
        },
        {
            "type": "shell",
            "key": " ",
            "keyColor": "yellow"
        },
        {
            "type": "terminal",
            "key": " ",
            "keyColor": "blue"
        },
        /*
        {
            "type": "packages",
            "key": "󰏖 ",
            "keyColor": "yellow"
        },
        */
        {
            "type": "memory",
            "key": "󰍛 ",
            "keyColor": "magenta",
            // format: used / total
            "format": "{1} / {2}"
        },
        {
            "type": "uptime",
            "key": "󰔛 ",
            "keyColor": "green"
        },
        {
            "type": "custom",
            "format": " ─────────────────────────── "
        },
        {
            "type": "custom",
            "format": "   \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[90m "
        },
 		"break",
    ]
 }
--- a/assets/hyprland.desktop
+++ b/assets/hyprland.desktop
@ -0,0 +1,5 @@
 [Desktop Entry]
 Name=Hyprland
 Comment=An intelligent dynamic tiling Wayland compositor
 Exec=Hyprland
 Type=Application
--- a/assets/libglaze-dev_4.4.3-1_all.deb
+++ b/assets/libglaze-dev_4.4.3-1_all.deb
--- a/assets/sddm.png
+++ b/assets/sddm.png
--- a/auto-install.sh
+++ b/auto-install.sh
@ -1,50 +0,0 @@
 #!/bin/bash
 # https://github.com/JaKooLit
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
 ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
 NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
 INFO="$(tput setaf 4)[INFO]$(tput sgr0)"
 WARN="$(tput setaf 1)[WARN]$(tput sgr0)"
 CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
 MAGENTA="$(tput setaf 5)"
 ORANGE="$(tput setaf 214)"
 WARNING="$(tput setaf 1)"
 YELLOW="$(tput setaf 3)"
 GREEN="$(tput setaf 2)"
 BLUE="$(tput setaf 4)"
 SKY_BLUE="$(tput setaf 6)"
 RESET="$(tput sgr0)"
 # Variables
 Distro="Debian-Hyprland"
 Github_URL="https://github.com/JaKooLit/$Distro.git"
 Distro_DIR="$HOME/$Distro"
 printf "\n%.0s" {1..1}
 if ! command -v git &> /dev/null
 then
    echo "${INFO} Git not found! ${SKY_BLUE}Installing Git...${RESET}"
    if ! sudo apt install -y git; then
        echo "${ERROR} Failed to install Git. Exiting."
        exit 1
    fi
 fi
 printf "\n%.0s" {1..1}
 if [ -d "$Distro_DIR" ]; then
    echo "${YELLOW}$Distro_DIR exists. Updating the repository... ${RESET}"
    cd "$Distro_DIR"
    git stash && git pull
    chmod +x install.sh
    ./install.sh
 else
    echo "${MAGENTA}$Distro_DIR does not exist. Cloning the repository...${RESET}"
    git clone --depth=1 "$Github_URL" "$Distro_DIR"
    cd "$Distro_DIR"
    chmod +x install.sh
    ./install.sh
 fi
--- a/dry-run-build.sh
+++ b/dry-run-build.sh
@ -1,151 +0,0 @@
 #!/usr/bin/env bash
 # Dry-run orchestrator for Hyprland and companion modules
 # - Compiles components but skips installation (uses DRY_RUN=1)
 # - Summarizes PASS/FAIL per module to Install-Logs/
 #
 # Usage:
 #   chmod +x ./dry-run-build.sh
 #   ./dry-run-build.sh                  # run full stack dry-run
 #   ./dry-run-build.sh --with-deps      # install dependencies first, then dry-run build
 #   ./dry-run-build.sh --only hyprland  # run a subset (comma-separated allowed)
 #   ./dry-run-build.sh --skip qtutils   # skip one or more (comma-separated)
 #
 # Notes:
 # - Run from the repository root. Do not cd into install-scripts/.
 # - You can also call modules directly, e.g., DRY_RUN=1 ./install-scripts/hyprland.sh
 set -u
 set -o pipefail
 REPO_ROOT=$(pwd)
 LOG_DIR="$REPO_ROOT/Install-Logs"
 mkdir -p "$LOG_DIR"
 TS=$(date +%F-%H%M%S)
 SUMMARY_LOG="$LOG_DIR/build-dry-run-$TS.log"
 # Default module order (core first, then Hyprland)
 DEFAULT_MODULES=(
  hyprutils
  hyprlang
  wayland-protocols-src
  aquamarine
  hyprgraphics
  hyprwayland-scanner
  hyprland-protocols
  hyprland-qt-support
  hyprland-qtutils
  hyprland
 )
 WITH_DEPS=0
 ONLY_LIST=""
 SKIP_LIST=""
 usage() {
  grep '^# ' "$0" | sed 's/^# \{0,1\}//'
 }
 # Parse args
 while [[ $# -gt 0 ]]; do
  case "$1" in
    -h|--help)
      usage
      exit 0
      ;;
    --with-deps)
      WITH_DEPS=1
      shift
      ;;
    --only)
      ONLY_LIST=${2:-}
      shift 2
      ;;
    --skip)
      SKIP_LIST=${2:-}
      shift 2
      ;;
    *)
      echo "Unknown argument: $1" >&2
      exit 2
      ;;
  esac
 done
 # Build module list based on --only/--skip
 MODULES=()
 if [[ -n "$ONLY_LIST" ]]; then
  IFS=',' read -r -a MODULES <<< "$ONLY_LIST"
 else
  MODULES=("${DEFAULT_MODULES[@]}")
 fi
 if [[ -n "$SKIP_LIST" ]]; then
  IFS=',' read -r -a _SKIPS <<< "$SKIP_LIST"
  FILTERED=()
  for m in "${MODULES[@]}"; do
    skip_it=0
    for s in "${_SKIPS[@]}"; do
      if [[ "$m" == "$s" ]]; then
        skip_it=1
        break
      fi
    done
    if [[ $skip_it -eq 0 ]]; then
      FILTERED+=("$m")
    fi
  done
  MODULES=("${FILTERED[@]}")
 fi
 # Optionally install dependencies (not a dry-run)
 if [[ $WITH_DEPS -eq 1 ]]; then
  echo "[INFO] Installing dependencies via 00-dependencies.sh" | tee -a "$SUMMARY_LOG"
  if ! "$REPO_ROOT/install-scripts/00-dependencies.sh"; then
    echo "[ERROR] Dependencies installation failed. See logs under Install-Logs/." | tee -a "$SUMMARY_LOG"
    exit 1
  fi
 fi
 # Run each module with DRY_RUN=1 and capture exit codes
 declare -A RESULTS
 echo "[INFO] Starting dry-run build at $TS" | tee -a "$SUMMARY_LOG"
 for mod in "${MODULES[@]}"; do
  script_path="$REPO_ROOT/install-scripts/$mod.sh"
  echo "\n=== $mod (DRY RUN) ===" | tee -a "$SUMMARY_LOG"
  if [[ ! -x "$script_path" ]]; then
    # Try to make executable if it exists
    if [[ -f "$script_path" ]]; then
      chmod +x "$script_path" || true
    fi
  fi
  if [[ ! -f "$script_path" ]]; then
    echo "[WARN] Missing script: $script_path" | tee -a "$SUMMARY_LOG"
    RESULTS[$mod]="MISSING"
    continue
  fi
  if DRY_RUN=1 "$script_path"; then
    RESULTS[$mod]="PASS"
  else
    RESULTS[$mod]="FAIL"
  fi
 done
 # Summary
 {
  echo "\nSummary (dry-run):"
  for mod in "${MODULES[@]}"; do
    printf "%-24s %s\n" "$mod" "${RESULTS[$mod]:-SKIPPED}"
  done
  echo "\nLogs: individual module logs are under Install-Logs/. This summary: $SUMMARY_LOG"
 } | tee -a "$SUMMARY_LOG"
 # Exit non-zero if any FAIL occurred
 failed=0
 for mod in "${MODULES[@]}"; do
  if [[ "${RESULTS[$mod]:-}" == "FAIL" ]]; then
    failed=1
  fi
 done
 exit $failed
--- a/hypr-tags.env
+++ b/hypr-tags.env
@ -1,15 +0,0 @@
 # Central tag overrides for the Hyprland stack
 # You can edit these values or let update-hyprland.sh manage them.
 # Each module script reads its TAG from these environment variables if set.
 HYPRLAND_TAG=v0.52.2
 AQUAMARINE_TAG=v0.10.0
 HYPRUTILS_TAG=v0.10.4
 HYPRLANG_TAG=v0.6.7
 HYPRGRAPHICS_TAG=v0.4.0
 HYPRTOOLKIT_TAG=v0.4.1
 HYPRWAYLAND_SCANNER_TAG=v0.4.5
 HYPRLAND_PROTOCOLS_TAG=v0.7.0
 HYPRLAND_QT_SUPPORT_TAG=v0.1.0
 HYPRLAND_GUIUTILS_TAG=v0.2.0
 WAYLAND_PROTOCOLS_TAG=1.46
--- a/install-scripts/00-dependencies.sh
+++ b/install-scripts/00-dependencies.sh
@ -3,86 +3,21 @@
 # main dependencies #
 # 22 Aug 2024 - NOTE will trim this more down
 # packages neeeded
 dependencies=(
    build-essential
    cmake
    cmake-extras
    curl
    findutils
    gawk
    gettext
    gir1.2-graphene-1.0
    git
    glslang-tools
    gobject-introspection
    golang
    hwdata
    jq
    libavcodec-dev
    libavformat-dev
    libavutil-dev
    libcairo2-dev
    libdeflate-dev
    libdisplay-info-dev
    libdrm-dev
    libegl-dev
    libegl1-mesa-dev
    libgbm-dev
    libgdk-pixbuf-2.0-dev
    libgdk-pixbuf2.0-bin
    libgirepository1.0-dev
    libgl1-mesa-dev
    libgraphene-1.0-0
    libgraphene-1.0-dev
    libgtk-3-dev
    libgulkan-0.15-0t64
    libgulkan-dev
    libinih-dev
    libiniparser-dev
    libinput-dev
    libjbig-dev
    libjpeg-dev
    libjpeg62-turbo-dev
    liblerc-dev
    libliftoff-dev
    liblzma-dev
    libnotify-bin
    libpam0g-dev
    libpango1.0-dev
    libpipewire-0.3-dev
    libqt6svg6
    libsdbus-c++-dev
    libseat-dev
    libstartup-notification0-dev
    libswresample-dev
    libsystemd-dev
    libtiff-dev
    libtiffxx6
    libtomlplusplus-dev
    libudev-dev
    libvkfft-dev
    libvulkan-dev
    libvulkan-volk-dev
    libwayland-dev
    libwebp-dev
    libxcb-composite0-dev
    libxcb-cursor-dev
    libxcb-dri3-dev
    libxcb-ewmh-dev
    libxcb-icccm4-dev
    libxcb-present-dev
    libxcb-render-util0-dev
    libxcb-res0-dev
    libxcb-util-dev
    libxcb-xinerama0-dev
    libxcb-xinput-dev
    libxcb-xkb-dev
    libxkbcommon-dev
    libxkbcommon-x11-dev
    libxkbregistry-dev
    libxml2-dev
    libxxhash-dev
    meson
    ninja-build
    openssl
@ -90,81 +25,39 @@ dependencies=(
    python3-mako
    python3-markdown
    python3-markupsafe
    python3-pyquery
    python3-yaml
    python3-pyquery
    qt6-base-dev
    scdoc
    seatd
    spirv-tools
    unzip
    vulkan-utility-libraries-dev
    vulkan-validationlayers
    vulkan-utility-libraries-dev
    wayland-protocols
    xdg-desktop-portal
    xwayland
 )
 # hyprland dependencies
 hyprland_dep=(
    bc
    binutils
    libc6
    libcairo2-dev
    libdisplay-info3
    libdrm2
    libjpeg-dev
    libjxl-dev
    libmagic-dev
    libpixman-1-dev
    libpugixml-dev
    libre2-dev
    librsvg2-dev
    libspng-dev
    libtomlplusplus-dev
    libwebp-dev
    libzip-dev
    libpam0g-dev
    libxcursor-dev
    qt6-declarative-dev
    qt6-base-private-dev
    qt6-wayland-dev
    qt6-wayland-private-dev
 )
 build_dep=(
    wlroots
 )
 ## 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" || {
+cd "$PARENT_DIR" || exit 1
    echo "${ERROR} Failed to change directory to $PARENT_DIR"
    exit 1
 }
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
    echo "Failed to source Global_functions.sh"
    exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_dependencies.log"
 # Installation of main dependencies
-printf "\n%s - Installing ${SKY_BLUE}main dependencies....${RESET} \n" "${NOTE}"
+printf "\n%s - Installing main dependencies.... \n" "${NOTE}"
-for PKG1 in "${dependencies[@]}" "${hyprland_dep[@]}"; do
+for PKG1 in "${dependencies[@]}"; do
-    install_package "$PKG1" "$LOG"
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
-printf "\n%.0s" {1..1}
+clear
 for PKG1 in "${build_dep[@]}"; do
    build_dep "$PKG1" "$LOG"
 done
 printf "\n%.0s" {1..2}
--- a/install-scripts/01-hypr-pkgs.sh
+++ b/install-scripts/01-hypr-pkgs.sh
@ -10,7 +10,7 @@ Extra=(
 )
-# packages needed
+# packages neeeded
 hypr_package=( 
  cliphist
  grim
@ -20,6 +20,7 @@ hypr_package=(
  imagemagick
  kitty
  nano
  nwg-look
  pavucontrol
  playerctl
  polkit-kde-agent-1
@ -27,12 +28,11 @@ hypr_package=(
  python3-pip
  qt5ct
  qt5-style-kvantum
-    qt-style-kvantum-themes
+  qt5-style-kvantum-themes
  qt6ct
  slurp
    swappy
  sway-notification-center
-    unzip
+  swappy
  waybar
  wget
  wl-clipboard
@ -47,23 +47,16 @@ hypr_package_2=(
  brightnessctl
  btop
  cava
  eog
  fastfetch
    loupe
  gnome-system-monitor
  mousepad
  mpv
  mpv-mpris
    nwg-look
    nwg-displays
  nvtop
  pamixer
  qalculate-gtk
-)
+  vim
 # packages to force reinstall
 force=(
    imagemagick
    wayland-protocols
 )
 # List of packages to uninstall as it conflicts with swaync or causing swaync to not function properly
@ -74,74 +67,58 @@ uninstall=(
  cargo
 )
 # List packages to force reinstall
 force=(
  yad
 )
 ## 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" || {
+cd "$PARENT_DIR" || exit 1
    echo "${ERROR} Failed to change directory to $PARENT_DIR"
    exit 1
 }
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
    echo "Failed to source Global_functions.sh"
    exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypr-pkgs.log"
-# conflicting packages removal
+# Installation of main components
-overall_failed=0
+printf "\n%s - Installing hyprland packages.... \n" "${NOTE}"
-printf "\n%s - ${SKY_BLUE}Removing some packages${RESET} as it conflicts with KooL's Hyprland Dots \n" "${NOTE}"
+
 for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${Extra[@]}"; do
  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 printf "\n%s - Uninstalling some packages inorder for dots to work properly \n" "${NOTE}"
 for PKG in "${uninstall[@]}"; do
  uninstall_package "$PKG" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
-        overall_failed=1
+    echo -e "\e[1A\e[K${ERROR} - $PKG uninstallation had failed, please check the log"
    exit 1
  fi
 done
 if [ $overall_failed -ne 0 ]; then
    echo -e "${ERROR} Some packages failed to uninstall. Please check the log."
 fi
 printf "\n%.0s" {1..1}
 # Installation of main components
 printf "\n%s - Installing ${SKY_BLUE}KooL's hyprland necessary packages${RESET} .... \n" "${NOTE}"
 for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${Extra[@]}"; do
    install_package "$PKG1" "$LOG"
 done
 printf "\n%.0s" {1..1}
 for PKG2 in "${force[@]}"; do
-    re_install_package "$PKG2" "$LOG"
+  re_install_package "$PKG2" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - Force reinstall of $PKG2 failed"
    exit 1
  fi
 done
 printf "\n%.0s" {1..1}
 # install YAD from assets. NOTE This is downloaded from SID repo and sometimes
 # Trixie is removing YAD for some strange reasons
 # Check if yad is installed
 if ! command -v yad &>/dev/null; then
    echo "${INFO} Installing ${YELLOW}YAD from assets${RESET} ..."
    sudo dpkg -i assets/yad_0.40.0-1+b2_amd64.deb
    sudo apt install -f -y
    echo "${INFO} ${YELLOW}YAD from assets${RESET} succesfully installed ..."
 fi
 printf "\n%.0s" {1..2}
 # Install up-to-date Rust
-echo "${INFO} Installing most ${YELLOW}up to date Rust compiler${RESET} ..."
+echo "Installing most up to date Rust compiler..."
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 2>&1 | tee -a "$LOG"
 source "$HOME/.cargo/env"
 ## making brightnessctl work
 sudo chmod +s $(which brightnessctl) 2>&1 | tee -a "$LOG" || true
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/02-pre-cleanup.sh
+++ b/install-scripts/02-pre-cleanup.sh
@ -3,12 +3,16 @@
 # This script is cleaning up previous manual installation files / directories
 # 22 Aug 2024
-# Files to be removed from /usr/local/bin
+# Files to be removed rom /usr/local/bin
 TARGET_DIR="/usr/local/bin"
 # Define packages to manually remove (was manually installed previously)
 PACKAGES=(
  hyprctl
  hyprpm
  hyprland
  Hyprland
  cliphist
  pypr
  swappy
@ -16,32 +20,15 @@ PACKAGES=(
  magick
 )
 # List of packages installed from Debian-Hyprland repo
 uninstall=(
  hyprland
  xdg-desktop-portal-hyprland
  libhhyprland-dev
  libhyprutils-dev
  libhyprutils0
  hyprwayland-scanner
  hyprland-protocols
  hyprctl
  hyprpm
  Hyprland
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_pre-clean-up.log"
@ -61,19 +48,3 @@ for PKG_NAME in "${PACKAGES[@]}"; do
  fi
 done
 # packages removal installed from Debian-Hyprland repo
 overall_failed=0
 printf "\n%s - ${SKY_BLUE}Removing some packages${RESET} installed from Debian Hyprland official repo \n" "${NOTE}"
 for PKG in "${uninstall[@]}"; do
  uninstall_package "$PKG" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    overall_failed=1
  fi
 done
 if [ $overall_failed -ne 0 ]; then
  echo -e "${ERROR} Some packages failed to uninstall. Please check the log."
 fi
 printf "\n%.0s" {1..1}
--- a/install-scripts/03-Final-Check.sh
+++ b/install-scripts/03-Final-Check.sh
@ -11,11 +11,11 @@ packages=(
  cliphist
  wlogout
  kitty
  hyprland
 )
 # Local packages that should be in /usr/local/bin/
 local_pkgs_installed=(
  hyprland
  rofi
  hypridle
  hyprlock
@ -27,17 +27,14 @@ local_pkgs_installed_2=(
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/00_CHECK-$(date +%d-%H%M%S)_installed.log"
@ -77,7 +74,7 @@ done
 # Log missing packages
 if [ ${#missing[@]} -eq 0 ] && [ ${#local_missing[@]} -eq 0 ] && [ ${#local_missing_2[@]} -eq 0 ]; then
-    echo "${OK} GREAT! All ${YELLOW}essential packages${RESET} have been successfully installed." | tee -a "$LOG"
+    echo "${OK} All essential packages are installed." | tee -a "$LOG"
 else
    if [ ${#missing[@]} -ne 0 ]; then
        echo "${WARN} The following packages are not installed and will be logged:"
--- a/install-scripts/Global_functions.sh
+++ b/install-scripts/Global_functions.sh
@ -2,125 +2,81 @@
 # 💫 https://github.com/JaKooLit 💫 #
 # Global Functions for Scripts #
 # Create Directory for Install Logs
 if [ ! -d Install-Logs ]; then
    mkdir Install-Logs
 fi
 set -e
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
 ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
 NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
 INFO="$(tput setaf 4)[INFO]$(tput sgr0)"
 WARN="$(tput setaf 1)[WARN]$(tput sgr0)"
 CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-MAGENTA="$(tput setaf 5)"
+MAGENTA=$(tput setaf 5)
-ORANGE="$(tput setaf 214)"
+WARNING=$(tput setaf 1)
-WARNING="$(tput setaf 1)"
+YELLOW=$(tput setaf 3)
-YELLOW="$(tput setaf 3)"
+RESET=$(tput sgr0)
 GREEN="$(tput setaf 2)"
 BLUE="$(tput setaf 4)"
 SKY_BLUE="$(tput setaf 6)"
 RESET="$(tput sgr0)"
-# Create Directory for Install Logs
+
-if [ ! -d Install-Logs ]; then
+# Function for installing packages
-    mkdir Install-Logs
+install_package() {
  # Checking if package is already installed
  if sudo dpkg -l | grep -q -w "$1" ; then
    echo -e "${OK} $1 is already installed. Skipping..."
  else
    # Package not installed
    echo -e "${NOTE} Installing $1 ..."
    sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG"
    # Making sure the package is installed
    if sudo dpkg -l | grep -q -w "$1" ; then
      echo -e "\e[1A\e[K${OK} Package ${YELLOW}$1${RESET} has been successfully installed!"
    else
      # Something is missing, exiting to review the log
      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry, I have tried :("
      exit 1
    fi
  fi
 # Show progress function
 show_progress() {
    local pid=$1
    local package_name=$2
    local spin_chars=("●○○○○○○○○○" "○●○○○○○○○○" "○○●○○○○○○○" "○○○●○○○○○○" "○○○○●○○○○" \
                      "○○○○○●○○○○" "○○○○○○●○○○" "○○○○○○○●○○" "○○○○○○○○●○" "○○○○○○○○○●") 
    local i=0
    tput civis 
    printf "\r${INFO} Installing ${YELLOW}%s${RESET} ..." "$package_name"
    while ps -p $pid &> /dev/null; do
        printf "\r${INFO} Installing ${YELLOW}%s${RESET} %s" "$package_name" "${spin_chars[i]}"
        i=$(( (i + 1) % 10 ))  
        sleep 0.3  
    done
    printf "\r${INFO} Installing ${YELLOW}%s${RESET} ... Done!%-20s \n\n" "$package_name" ""
    tput cnorm  
 }
 # Function for re-installing packages
 re_install_package() {
    echo -e "${NOTE} Force installing $1 ..."
-# Function for installing packages with a progress bar
+    # Try to reinstall the package
-install_package() { 
+    if sudo apt-get install --reinstall -y "$1" 2>&1 | tee -a "$LOG"; then
-  if dpkg -l | grep -q -w "$1" ; then
+        # Check if the package was installed successfully
    echo -e "${INFO} ${MAGENTA}$1${RESET} is already installed. Skipping..."
  else 
    (
      stdbuf -oL sudo apt install -y "$1" 2>&1
    ) >> "$LOG" 2>&1 &
    PID=$!
    show_progress $PID "$1" 
    # Double check if the package successfully installed
        if dpkg -l | grep -q -w "$1"; then
            echo -e "\e[1A\e[K${OK} Package ${YELLOW}$1${RESET} has been successfully installed!"
        else
-        echo -e "\e[1A\e[K${ERROR} ${YELLOW}$1${RESET} failed to install. Please check the install.log. You may need to install it manually. Sorry, I have tried :("
+            # Package was not found, installation failed
            echo -e "${ERROR} $1 failed to install. Please check the install.log. You may need to install it manually. Sorry, I have tried :("
            exit 1
        fi
  fi
 }
 # Function for build depencies with a progress bar
 build_dep() { 
  echo -e "${INFO} building dependencies for ${MAGENTA}$1${RESET} "
    (
      stdbuf -oL sudo apt build-dep -y "$1" 2>&1
    ) >> "$LOG" 2>&1 &
    PID=$!
    show_progress $PID "$1" 
 }
 # Function for cargo install with a progress bar
 cargo_install() { 
  echo -e "${INFO} installing ${MAGENTA}$1${RESET} using cargo..."
    (
      stdbuf -oL cargo install "$1" 2>&1
    ) >> "$LOG" 2>&1 &
    PID=$!
    show_progress $PID "$1" 
 }
 # Function for re-installing packages with a progress bar
 re_install_package() {
    (
        stdbuf -oL sudo apt install --reinstall -y "$1" 2>&1
    ) >> "$LOG" 2>&1 &
    PID=$!
    show_progress $PID "$1" 
    if dpkg -l | grep -q -w "$1"; then
        echo -e "\e[1A\e[K${OK} Package ${YELLOW}$1${RESET} has been successfully re-installed!"
    else
-        # Package not found, reinstallation failed
+        # Installation command failed
-        echo -e "${ERROR} ${YELLOW}$1${RESET} failed to re-install. Please check the install.log. You may need to install it manually. Sorry, I have tried :("
+        echo -e "${ERROR} Failed to reinstall $1. Please check the install.log. You may need to install it manually. Sorry, I have tried :("
        exit 1
    fi
 }
 # Function for removing packages
 uninstall_package() {
-  local pkg="$1"
+  # Check if package is installed
  # Checking if package is installed
  if sudo dpkg -l | grep -q -w "^ii  $1" ; then
-    echo -e "${NOTE} removing $pkg ..."
+    # Package is installed, attempt to uninstall
-    sudo apt autoremove -y "$1" >> "$LOG" 2>&1 | grep -v "error: target not found"
+    echo -e "${NOTE} Uninstalling $1 ..."
    # Attempt to uninstall the package and its configuration files
    sudo apt-get autoremove -y "$1" >> "$LOG" 2>&1
    # Check if the package is still installed after removal attempt
    if ! dpkg -l | grep -q -w "^ii  $1" ; then
-      echo -e "\e[1A\e[K${OK} ${MAGENTA}$1${RESET} removed."
+      echo -e "\e[1A\e[K${OK} $1 was uninstalled."
    else
-      echo -e "\e[1A\e[K${ERROR} $pkg Removal failed. No actions required."
+      echo -e "\e[1A\e[K${ERROR} $1 failed to uninstall. Please check the uninstall.log."
-      return 1
+      exit 1
    fi
  else
    echo -e "${INFO} Package $pkg not installed, skipping."
  fi
  return 0
 }
--- a/install-scripts/InputGroup.sh
+++ b/install-scripts/InputGroup.sh
@ -1,34 +1,54 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
-# Adding users into input group #
+# Adding user in input group for waybar keyboard state module #
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # 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"
-# Check if the 'input' group exists
+while true; do
-if grep -q '^input:' /etc/group; then
+    echo "${WARN} This script will add your user to the 'input' group."
-    echo "${OK} ${MAGENTA}input${RESET} group exists."
+    echo "${NOTE} Please note that adding yourself to the 'input' group might be necessary for waybar keyboard-state functionality."
 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
 # 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"
    printf "\n%.0s" {1..2}
    read -p "${YELLOW}Do you want to proceed? (y/n): ${RESET}" choice
    if [[ $choice == "y" || $choice == "Y" ]]; then
        # Check if the 'input' group exists
        if grep -q '^input:' /etc/group; then
            echo "${OK} 'input' group exists." 2>&1 | tee -a "$LOG"
        else
            echo "${NOTE} 'input' group doesn't exist. Creating 'input' group..." 2>&1 | tee -a "$LOG"
            sudo groupadd input
            # Log the creation of the 'input' group
            echo "${NOTE} 'input' group created" 2>&1 | tee -a "$LOG"
        fi
        # Add the user to the input group
        sudo usermod -aG input "$(whoami)"
        echo "${OK} User added to the 'input' group. Changes will take effect after you log out and log back in." 2>&1 | tee -a "$LOG"
        # Log the addition of the user to the 'input' group
        echo "${NOTE} - User added to 'input' group" 2>&1 | tee -a "$LOG"
        break  # Break out of the loop if 'yes' is chosen
    elif [[ $choice == "n" || $choice == "N" ]]; then
        echo "${NOTE} No changes made. Exiting the script." 2>&1 | tee -a "$LOG"
        break  # Break out of the loop if 'no' is chosen
    else
        echo "${ERROR} Invalid choice. Please enter 'y' for yes or 'n' for no."
    fi
 done
 clear
--- a/install-scripts/ags.sh
+++ b/install-scripts/ags.sh
@ -8,207 +8,71 @@ ags=(
    meson 
    libgjs-dev 
    gjs 
    gobject-introspection
    libgirepository1.0-dev
    gir1.2-gtk-4.0
    gir1.2-gtklayershell-0.1
    libgtk-layer-shell-dev 
    libgtk-3-dev
    libadwaita-1-dev
    libpam0g-dev 
    libpulse-dev 
    libdbusmenu-gtk3-dev 
    libsoup-3.0-dev
    ninja-build
    build-essential
    pkg-config
 )
 f_ags=(
    npm
 )
 build_dep=(
    pam
 )
 # specific tags to download
 ags_tag="v1.9.0"
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_ags.log"
 MLOG="install-$(date +%d-%H%M%S)_ags2.log"
 # Check if AGS is installed
 if command -v ags &>/dev/null; then
    AGS_VERSION=$(ags -v | awk '{print $NF}')
    if [[ "$AGS_VERSION" == "1.9.0" ]]; then
        printf "${INFO} ${MAGENTA}Aylur's GTK Shell v1.9.0${RESET} is already installed.\n"
        read -r -p "Reinstall v1.9.0 anyway? [y/N]: " REPLY
        case "$REPLY" in
          [yY]|[yY][eE][sS])
            printf "${NOTE} Reinstalling Aylur's GTK Shell v1.9.0...\n"
            ;;
          *)
            printf "Skipping reinstallation.\n"
            printf "\n%.0s" {1..2}
            exit 0
            ;;
        esac
    fi
 fi
 # Installation of main components
 printf "\n%s - Installing ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET} Dependencies \n" "${INFO}"
 # Installing ags Dependencies
 for PKG1 in "${ags[@]}"; do
-  install_package "$PKG1" "$LOG"
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
-done
+  if [ $? -ne 0 ]; then
-
+    echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
-for force_ags in "${f_ags[@]}"; do
+    exit 1
-   re_install_package "$force_ags" 2>&1 | tee -a "$LOG"
+  fi
  done
 printf "\n%.0s" {1..1}
 for PKG1 in "${build_dep[@]}"; do
  build_dep "$PKG1" "$LOG"
 done
 #install typescript by npm
 sudo npm install --global typescript 2>&1 | tee -a "$LOG"
-# ags v1
+# ags
 printf "${NOTE} Install and Compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET}..\n"
-# Remove previous sources (both legacy "ags" and tagged "ags_v1.9.0")
+printf "${NOTE} Install and Compiling Aylurs GTK shell $ags_tag.. \n"
-for SRC_DIR in "ags" "ags_v1.9.0"; do
+
-    if [ -d "$SRC_DIR" ]; then
+# Check if folder exists and remove it
-        printf "${NOTE} Removing existing %s directory...\\n" "$SRC_DIR"
+if [ -d "ags" ]; then
-        rm -rf "$SRC_DIR"
+    printf "${NOTE} Removing existing ags folder...\n"
    rm -rf "ags"
 fi
 done
-printf "\n%.0s" {1..1}
+# Clone nwg-look repository with the specified tag
-printf "${INFO} Kindly Standby...cloning and compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET}...\n"
+if git clone --recursive -b "$ags_tag" --depth 1 https://github.com/Aylur/ags.git; then
-printf "\n%.0s" {1..1}
+    cd ags || exit 1
-# Clone repository with the specified tag and capture git output into MLOG
+    # Build and install ags
 if git clone --depth=1 https://github.com/JaKooLit/ags_v1.9.0.git; then
    cd ags_v1.9.0 || exit 1
 	npm install
 	meson setup build
    if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then
-    printf "\n${OK} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
+        printf "${OK} ags installed successfully.\n" 2>&1 | tee -a "$MLOG"
    # Patch installed AGS launchers to ensure GI typelibs in /usr/local/lib are discoverable in GJS ESM
    printf "${NOTE} Applying AGS launcher patch for GI typelibs search path...\n"
    patch_ags_launcher() {
      local target="$1"
      if ! sudo test -f "$target"; then
        return 1
      fi
      # 1) Remove deprecated GIR Repository path tweaks and GIRepository import (harmless if absent)
      sudo sed -i \
        -e '/Repository\.prepend_search_path/d' \
        -e '/Repository\.prepend_library_path/d' \
        -e '/gi:\/\/GIRepository/d' \
        "$target"
      # 2) Ensure GLib import exists (insert after first import line, or at top if none)
      if ! sudo grep -q '^import GLib from "gi://GLib";' "$target"; then
        TMPF=$(sudo mktemp)
        sudo awk 'BEGIN{added=0} {
          if (!added && $0 ~ /^import /) { print; print "import GLib from \"gi://GLib\";"; added=1; next }
          print
        } END { if (!added) print "import GLib from \"gi://GLib\";" }' "$target" | sudo tee "$TMPF" >/dev/null
        sudo mv "$TMPF" "$target"
      fi
      # 3) Inject GI_TYPELIB_PATH export right after the GLib import (once)
      if ! sudo grep -q 'GLib.setenv("GI_TYPELIB_PATH"' "$target"; then
        TMPF=$(sudo mktemp)
        sudo awk '{print} $0 ~ /^import GLib from "gi:\/\/GLib";$/ {print "const __old = GLib.getenv(\"GI_TYPELIB_PATH\");"; print "GLib.setenv(\"GI_TYPELIB_PATH\", \"/usr/local/lib/x86_64-linux-gnu:/usr/local/lib64:/usr/local/lib:/usr/local/lib64/girepository-1.0:/usr/local/lib/girepository-1.0:/usr/local/lib/x86_64-linux-gnu/girepository-1.0:/usr/lib/x86_64-linux-gnu/girepository-1.0:/usr/lib/girepository-1.0:/usr/lib/ags:/usr/local/lib/ags:/usr/lib64/ags\" + (__old ? \":\" + __old : \"\"), true);"; print "const __oldld = GLib.getenv(\"LD_LIBRARY_PATH\");"; print "GLib.setenv(\"LD_LIBRARY_PATH\", \"/usr/local/lib/x86_64-linux-gnu:/usr/local/lib64:/usr/local/lib\" + (__oldld ? \":\" + __oldld : \"\"), true);"}' "$target" | sudo tee "$TMPF" >/dev/null
        sudo mv "$TMPF" "$target"
      fi
      # 4) Ensure LD_LIBRARY_PATH export exists even if GI_TYPELIB_PATH was already present
      if ! sudo grep -q 'GLib.setenv("LD_LIBRARY_PATH"' "$target"; then
        TMPF=$(sudo mktemp)
        sudo awk '{print} $0 ~ /^import GLib from "gi:\/\/GLib";$/ {print "const __oldld = GLib.getenv(\"LD_LIBRARY_PATH\");"; print "GLib.setenv(\"LD_LIBRARY_PATH\", \"/usr/local/lib64:/usr/local/lib\" + (__oldld ? \":\" + __oldld : \"\"), true);"}' "$target" | sudo tee "$TMPF" >/dev/null
        sudo mv "$TMPF" "$target"
      fi
      # Restore executable bit for bin wrappers (mv from mktemp resets mode to 0600)
      case "$target" in
        */bin/ags)
          sudo chmod 0755 "$target" || true
          ;;
      esac
      printf "${OK} Patched: %s\n" "$target"
      return 0
    }
    # Try common locations
    for CAND in \
      "/usr/local/share/com.github.Aylur.ags/com.github.Aylur.ags" \
      "/usr/share/com.github.Aylur.ags/com.github.Aylur.ags" \
      "/usr/local/bin/ags" \
      "/usr/bin/ags"; do
      patch_ags_launcher "$CAND" || true
    done
    # Create an env-setting wrapper for AGS to ensure GI typelibs/libs are discoverable
    printf "${NOTE} Creating env wrapper /usr/local/bin/ags...\n"
    sudo tee /usr/local/bin/ags >/dev/null <<'WRAP'
 #!/usr/bin/env bash
 set -euo pipefail
 cd "$HOME" 2>/dev/null || true
 # Locate AGS ESM entry
 MAIN_JS="/usr/local/share/com.github.Aylur.ags/com.github.Aylur.ags"
 if [ ! -f "$MAIN_JS" ]; then
  MAIN_JS="/usr/share/com.github.Aylur.ags/com.github.Aylur.ags"
 fi
 if [ ! -f "$MAIN_JS" ]; then
  echo "Unable to find AGS entry script (com.github.Aylur.ags) in /usr/local/share or /usr/share" >&2
  exit 1
 fi
 # Ensure GI typelibs and native libs are discoverable before gjs ESM loads
 export GI_TYPELIB_PATH="/usr/local/lib/x86_64-linux-gnu:/usr/local/lib64:/usr/local/lib:/usr/local/lib64/girepository-1.0:/usr/local/lib/girepository-1.0:/usr/local/lib/x86_64-linux-gnu/girepository-1.0:/usr/lib/x86_64-linux-gnu/girepository-1.0:/usr/lib/girepository-1.0:/usr/lib64/girepository-1.0:/usr/lib/ags:/usr/local/lib/ags:/usr/lib64/ags:${GI_TYPELIB_PATH-}"
 export LD_LIBRARY_PATH="/usr/local/lib/x86_64-linux-gnu:/usr/local/lib64:/usr/local/lib:${LD_LIBRARY_PATH-}"
 exec /usr/bin/gjs -m "$MAIN_JS" "$@"
 WRAP
    sudo chmod 0755 /usr/local/bin/ags
    # Ensure ESM entry is readable by gjs
    sudo chmod 0644 /usr/local/share/com.github.Aylur.ags/com.github.Aylur.ags 2>/dev/null || true
    sudo chmod 0644 /usr/share/com.github.Aylur.ags/com.github.Aylur.ags 2>/dev/null || true
    printf "${OK} AGS wrapper installed at /usr/local/bin/ags\n"
    else
-    echo -e "\n${ERROR} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Installation failed\n " 2>&1 | tee -a "$MLOG"
+        echo -e "${ERROR} Installation failed for ags" 2>&1 | tee -a "$MLOG"
    fi
    # Move logs to Install-Logs directory
    mv "$MLOG" ../Install-Logs/ || true
    cd ..
 else
-    echo -e "\n${ERROR} Failed to download ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Please check your connection\n" 2>&1 | tee -a "$LOG"
+    echo -e "${ERROR} Failed to download ags Please check your connection" 2>&1 | tee -a "$LOG"
    mv "$MLOG" ../Install-Logs/ || true
    exit 1
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/aquamarine.sh
+++ b/install-scripts/aquamarine.sh
@ -1,66 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # aquamarine #
 #specific branch or release
 tag="v0.10.0"
 # Allow environment override
 if [ -n "${AQUAMARINE_TAG:-}" ]; then tag="$AQUAMARINE_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_aquamarine.log"
 MLOG="install-$(date +%d-%H%M%S)_aquamarine.log"
 # Installation of dependencies
 printf "\n%s - Installing ${YELLOW}aquamarine dependencies${RESET} .... \n" "${INFO}"
 # Check if aquamarinedirectory exists and remove it
 if [ -d "aquamarine" ]; then
    rm -rf "aquamarine"
 fi
 # Clone and build 
 printf "${INFO} Installing ${YELLOW}aquamarine $tag${RESET} ...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/aquamarine.git; then
    cd aquamarine || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -S . -B ./build
 	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
    if [ $DO_INSTALL -eq 1 ]; then
        if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
            printf "${OK} ${MAGENTA}aquamarine $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
        else
            echo -e "${ERROR} Installation failed for ${YELLOW}aquamarine $tag${RESET}" 2>&1 | tee -a "$MLOG"
        fi
    else
        echo "${NOTE} DRY RUN: Skipping installation of aquamarine $tag."
    fi
    #moving the addional logs to Install-Logs directory
    [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
    cd ..
 else
    echo -e "${ERROR} Download failed for ${YELLOW}aquamarine $tag${RESET}" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/bluetooth.sh
+++ b/install-scripts/bluetooth.sh
@ -8,28 +8,26 @@ blue=(
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_bluetooth.log"
 # Bluetooth
-printf "${NOTE} Installing ${SKY_BLUE}Bluetooth${RESET} Packages...\n"
+printf "${NOTE} Installing Bluetooth Packages...\n"
 for BLUE in "${blue[@]}"; do
-   install_package "$BLUE" "$LOG"
+   install_package "$BLUE" 2>&1 | tee -a "$LOG"
   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $BLUE Package installation failed, Please check the installation logs"; exit 1; }
  done
-printf " Activating ${YELLOW}Bluetooth${RESET} Services...\n"
+printf " Activating Bluetooth Services...\n"
 sudo systemctl enable --now bluetooth.service 2>&1 | tee -a "$LOG"
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/dotfiles-branch.sh
+++ b/install-scripts/dotfiles-branch.sh
@ -3,41 +3,30 @@
 # Hyprland-Dots to download from main #
 #specific branch or release
-dots_tag="main"
+dots_tag="Deb-Untu-old-v-Hyprland"
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# Change the working directory to the parent directory of the script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || {
    echo "${ERROR} Failed to change directory to $PARENT_DIR"
    exit 1
 }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
    echo "Failed to source Global_functions.sh"
    exit 1
 fi
 # Check if Hyprland-Dots exists
-printf "${NOTE} Cloning and Installing ${SKY_BLUE}KooL's Hyprland Dots for Debian${RESET}....\n"
+printf "${NOTE} Downloading KooL's Hyprland Dots for Debian....\n"
 # Check if Hyprland-Dots exists
 if [ -d Hyprland-Dots-Debian ]; then
  cd Hyprland-Dots-Debian
-    git stash && git pull
+  git stash
  git pull
  git stash apply
  chmod +x copy.sh
  ./copy.sh 
 else
-    if git clone --depth=1 https://github.com/JaKooLit/Hyprland-Dots Hyprland-Dots-Debian; then
+  if git clone --depth 1 -b $dots_tag https://github.com/JaKooLit/Hyprland-Dots Hyprland-Dots-Debian; then
    cd Hyprland-Dots-Debian || exit 1
    chmod +x copy.sh
    ./copy.sh 
  else
-        echo -e "$ERROR Can't download ${YELLOW}KooL's Hyprland-Dots-Debian${RESET}"
+    echo -e "$ERROR Can't download Hyprland-Dots-Debian"
  fi
 fi
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/dotfiles.sh
+++ b/install-scripts/dotfiles.sh
@ -3,8 +3,7 @@
 # Hyprland-Dots to download a specific release #
 # Define the specific release version to download
-specific_version="v2.3.16"
+specific_version="v2.3.3-Deb-Untu-Hyprland-0.41.2"
 #specific_version="v2.3.3-Deb-Untu-Hyprland-0.41.2"
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
@ -57,7 +56,7 @@ if curl -L "$tarball_url" -o "Hyprland-Dots-${specific_version}.tar.gz"; then
  chmod +x copy.sh
  ./copy.sh 
-    echo -e "${OK} Hyprland-Dots-${specific_version} release downloaded, extracted, and processed successfully. Check JaKooLit-Hyprland-Dots directory for more detailed install logs" 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
+  echo -e "${OK} Hyprland-Dots-${specific_version} release downloaded, extracted, and processed successfully. Check JaKooLit-Hyprland-Dots folder for more detailed install logs" 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
 else
  echo -e "${ERROR} Failed to download Hyprland-Dots-${specific_version} release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
  exit 1
--- a/install-scripts/fonts.sh
+++ b/install-scripts/fonts.sh
@ -11,70 +11,51 @@ fonts=(
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_fonts.log"
 # Installation of main components
-printf "\n%s - Installing necessary ${SKY_BLUE}fonts${RESET}.... \n" "${NOTE}"
+printf "\n%s - Installing fonts.... \n" "${NOTE}"
 for PKG1 in "${fonts[@]}"; do
-  install_package "$PKG1" "$LOG"
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 printf "\n%.0s" {1..2}
 # jetbrains nerd font. Necessary for waybar
 printf "\n%s - Downloading and Extracting Jetbrains Mono Nerd Font.... \n" "${NOTE}"
 DOWNLOAD_URL="https://github.com/ryanoasis/nerd-fonts/releases/latest/download/JetBrainsMono.tar.xz"
 # Maximum number of download attempts
-MAX_ATTEMPTS=2
+MAX_ATTEMPTS=3
 for ((ATTEMPT = 1; ATTEMPT <= MAX_ATTEMPTS; ATTEMPT++)); do
    curl -OL "$DOWNLOAD_URL" 2>&1 | tee -a "$LOG" && break
-    echo "Download ${YELLOW}DOWNLOAD_URL${RESET} attempt $ATTEMPT failed. Retrying in 2 seconds..." 2>&1 | tee -a "$LOG"
+    echo "Download attempt $ATTEMPT failed. Retrying in 2 seconds..." 2>&1 | tee -a "$LOG"
    sleep 2
 done
-# Check if the JetBrainsMono directory exists and delete it if it does
+# Check if the JetBrainsMono folder exists and delete it if it does
 if [ -d ~/.local/share/fonts/JetBrainsMonoNerd ]; then
    rm -rf ~/.local/share/fonts/JetBrainsMonoNerd 2>&1 | tee -a "$LOG"
 fi
-mkdir -p ~/.local/share/fonts/JetBrainsMonoNerd 2>&1 | tee -a "$LOG"
+mkdir -p ~/.local/share/fonts/JetBrainsMonoNerd
-# Extract the new files into the JetBrainsMono directory and log the output
+
 # Extract the new files into the JetBrainsMono folder and log the output
 tar -xJkf JetBrainsMono.tar.xz -C ~/.local/share/fonts/JetBrainsMonoNerd 2>&1 | tee -a "$LOG"
 # Fantasque Mono Nerd Font
 if wget -q https://github.com/ryanoasis/nerd-fonts/releases/download/v3.3.0/FantasqueSansMono.zip; then
    mkdir -p "$HOME/.local/share/fonts/FantasqueSansMonoNerd" && unzip -o -q "FantasqueSansMono.zip" -d "$HOME/.local/share/fonts/FantasqueSansMono" && echo "FantasqueSansMono installed successfully" | tee -a "$LOG"
 else
    echo -e "\n${ERROR} Failed to download ${YELLOW}Fantasque Sans Mono Nerd Font${RESET} Please check your connection\n" | tee -a "$LOG"
 fi
 # Victor Mono-Font
 if wget -q https://rubjo.github.io/victor-mono/VictorMonoAll.zip; then
    mkdir -p "$HOME/.local/share/fonts/VictorMono" && unzip -o -q "VictorMonoAll.zip" -d "$HOME/.local/share/fonts/VictorMono" && echo "Victor Font installed successfully" | tee -a "$LOG"
 else
    echo -e "\n${ERROR} Failed to download ${YELLOW}Victor Mono Font${RESET} Please check your connection\n" | tee -a "$LOG"
 fi
 # Update font cache and log the output
 fc-cache -v 2>&1 | tee -a "$LOG"
-# clean up 
+clear
 if [ -d "JetBrainsMono.tar.xz" ]; then
 	rm -r JetBrainsMono.tar.xz 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/gtk_themes.sh
+++ b/install-scripts/gtk_themes.sh
@ -8,17 +8,14 @@ engine=(
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_themes.log"
@ -26,24 +23,28 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_themes.log"
 # installing engine needed for gtk themes
 for PKG1 in "${engine[@]}"; do
-    install_package "$PKG1" "$LOG"
+    install_package "$PKG1" 2>&1 | tee -a "$LOG"
    if [ $? -ne 0 ]; then
        echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
        exit 1
    fi
 done
 # Check if the directory exists and delete it if present
 if [ -d "GTK-themes-icons" ]; then
-    echo "$NOTE GTK themes and Icons directory exist..deleting..." 2>&1 | tee -a "$LOG"
+    echo "$NOTE GTK themes and Icons folder exist..deleting..." 2>&1 | tee -a "$LOG"
    rm -rf "GTK-themes-icons" 2>&1 | tee -a "$LOG"
 fi
-echo "$NOTE Cloning ${SKY_BLUE}GTK themes and Icons${RESET} repository..." 2>&1 | tee -a "$LOG"
+echo "$NOTE Cloning GTK themes and Icons repository..." 2>&1 | tee -a "$LOG"
-if git clone --depth=1 https://github.com/JaKooLit/GTK-themes-icons.git ; then
+if git clone --depth 1 https://github.com/JaKooLit/GTK-themes-icons.git ; then
    cd GTK-themes-icons
    chmod +x auto-extract.sh
    ./auto-extract.sh
    cd ..
-    echo "$OK Extracted GTK Themes & Icons to ~/.icons & ~/.themes directories" 2>&1 | tee -a "$LOG"
+    echo "$OK Extracted GTK Themes & Icons to ~/.icons & ~/.themes folders" 2>&1 | tee -a "$LOG"
 else
    echo "$ERROR Download failed for GTK themes and Icons.." 2>&1 | tee -a "$LOG"
 fi
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/hyprcursor.sh
+++ b/install-scripts/hyprcursor.sh
@ -1,68 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hyprcursor #
 cursor=(
 libzip-dev
 librsvg2-dev
 )
 #specific branch or release
 tag="v0.1.13"
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprcursor.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprcursor.log"
 # Installation of dependencies
 printf "\n%s - Installing hyprcursor dependencies.... \n" "${NOTE}"
 for PKG1 in "${cursor[@]}"; do
  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 # Check if hyprcursor folder exists and remove it
 if [ -d "hyprcursor" ]; then
    printf "${NOTE} Removing existing hyprcursor folder...\n"
    rm -rf "hyprcursor"
 fi
 # Clone and build 
 printf "${NOTE} Installing hyprcursor...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/hyprcursor.git; then
    cd hyprcursor || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
 	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
    if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
        printf "${OK} hyprcursor installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
        echo -e "${ERROR} Installation failed for hyprcursor." 2>&1 | tee -a "$MLOG"
    fi
    #moving the addional logs to Install-Logs directory
    mv $MLOG ../Install-Logs/ || true 
    cd ..
 else
    echo -e "${ERROR} Download failed for hyprcursor." 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprgraphics.sh
+++ b/install-scripts/hyprgraphics.sh
@ -1,78 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hyprgraphics #
 hyprgraphics=(
 	libmagic
 )
 #specific branch or release
 tag="v0.4.0"
 # Allow environment override
 if [ -n "${HYPRGRAPHICS_TAG:-}" ]; then tag="$HYPRGRAPHICS_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprgraphics.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprgraphics2.log"
 # Installation of dependencies
 printf "\n%s - Installing ${YELLOW}hyprgraphics dependencies${RESET} .... \n" "${INFO}"
 for PKG1 in "${hyprgraphics[@]}"; do
  re_install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 printf "\n%.0s" {1..1}
 # Check if hyprgraphics directory exists and remove it
 if [ -d "hyprgraphics" ]; then
    rm -rf "hyprgraphics"
 fi
 # Clone and build 
 printf "${INFO} Installing ${YELLOW}hyprgraphics $tag${RESET} ...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/hyprgraphics.git; then
    cd hyprgraphics || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
 	cmake --build ./build --config Release --target hyprgraphics -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
    if [ $DO_INSTALL -eq 1 ]; then
        if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
            printf "${OK} ${MAGENTA}hyprgraphics $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
        else
            echo -e "${ERROR} Installation failed for ${YELLOW}hyprgraphics $graphics${RESET}" 2>&1 | tee -a "$MLOG"
        fi
    else
        echo "${NOTE} DRY RUN: Skipping installation of hyprgraphics $tag."
    fi
    #moving the addional logs to Install-Logs directory
    [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
    cd ..
 else
    echo -e "${ERROR} Download failed for ${YELLOW}hyprgraphics $graphics${RESET}" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hypridle.sh
+++ b/install-scripts/hypridle.sh
@ -4,60 +4,61 @@
 idle=(
    libsdbus-c++-dev
    libhyprlang-dev
 )
 #specific branch or release
-tag="v0.1.6"
+idle_tag="v0.1.2"
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypridle.log"
 MLOG="install-$(date +%d-%H%M%S)_hypridle2.log"
 # Installation of dependencies
-printf "\n%s - Installing ${YELLOW}hypridle dependencies${RESET} .... \n" "${INFO}"
+printf "\n%s - Installing hypridle dependencies.... \n" "${NOTE}"
 for PKG1 in "${idle[@]}"; do
-  re_install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
-    echo -e "\e[1A\e[K${ERROR} - ${YELLOW}$PKG1${RESET} Package installation failed, Please check the installation logs"
+    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
-# Check if hypridle directory exists and remove it
+# Check if hypridle folder exists and remove it
 if [ -d "hypridle" ]; then
    printf "${NOTE} Removing existing hypridle folder...\n"
    rm -rf "hypridle"
 fi
 # Clone and build 
-printf "${INFO} Installing ${YELLOW}hypridle $tag${RESET} ...\n"
+printf "${NOTE} Installing hypridle...\n"
-if git clone --recursive -b $tag https://github.com/hyprwm/hypridle.git; then
+if git clone --recursive -b $idle_tag https://github.com/hyprwm/hypridle.git; then
    cd hypridle || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -S . -B ./build
 	cmake --build ./build --config Release --target hypridle -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
    if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
-        printf "${OK} ${MAGENTA}hypridle $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
+        printf "${OK} hypridle installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
-        echo -e "${ERROR} Installation failed for ${YELLOW}hypridle $tag${RESET}" 2>&1 | tee -a "$MLOG"
+        echo -e "${ERROR} Installation failed for hypridle." 2>&1 | tee -a "$MLOG"
    fi
    #moving the addional logs to Install-Logs directory
    mv $MLOG ../Install-Logs/ || true 
    cd ..
 else
-    echo -e "${ERROR} Download failed for ${YELLOW}hypridle $tag${RESET}" 2>&1 | tee -a "$LOG"
+    echo -e "${ERROR} Download failed for hypridle." 2>&1 | tee -a "$LOG"
 fi
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/hyprland-guiutils.sh
+++ b/install-scripts/hyprland-guiutils.sh
@ -1,88 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hypland-guiutils #
 guiutils=(
 	libqt6core5compat6
    qt6-base-dev
 	qt6-wayland-dev
    qt6-wayland
 	qt6-declarative-dev
 	qml6-module-qtcore
 	qt6-3d-dev
 	qt6-5compat-dev
    libqt6waylandclient6
    qml6-module-qtwayland-client-texturesharing
 )
 #specific branch or release
 tag="v0.2.0"
 # Allow environment override
 if [ -n "${HYPRLAND_GUIUTILS_TAG:-}" ]; then tag="$HYPRLAND_GUIUTILS_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland-guiutils.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprland-guiutils2.log"
 # Installation of dependencies
 printf "\n%s - Installing ${YELLOW}hyprland-guiutils dependencies${RESET} .... \n" "${INFO}"
 for PKG1 in "${guiutils[@]}"; do
  re_install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - ${YELLOW}$PKG1${RESET} Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 printf "\n%.0s" {1..1}
 # Check if hyprland-guiutils directory exists and remove it
 if [ -d "hyprland-guiutils" ]; then
    rm -rf "hyprland-guiutils"
 fi
 # Clone and build 
 printf "${INFO} Installing ${YELLOW}hyprland-guiutils $tag${RESET} ...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/hyprland-guiutils.git; then
    cd hyprland-guiutils || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
 	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
    if [ $DO_INSTALL -eq 1 ]; then
        if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
            printf "${OK} ${MAGENTA}hyprland-guiutils $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
        else
            echo -e "${ERROR} Installation failed for ${YELLOW}hyprland-guiutils $tag${RESET}" 2>&1 | tee -a "$MLOG"
        fi
    else
        echo "${NOTE} DRY RUN: Skipping installation of hyprland-guiutils $tag."
    fi
    #moving the addional logs to Install-Logs directory
    [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
    cd ..
 else
    echo -e "${ERROR} Download failed for ${YELLOW}hyprland-guiutils $tag${RESET}" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprland-protocols.sh
+++ b/install-scripts/hyprland-protocols.sh
@ -1,65 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hypland-protocols #
 #specific branch or release
 tag="v0.7.0"
 # Allow environment override
 if [ -n "${HYPRLAND_PROTOCOLS_TAG:-}" ]; then tag="$HYPRLAND_PROTOCOLS_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_protocols.log"
 MLOG="install-$(date +%d-%H%M%S)_protocols2.log"
 # Installation of dependencies
 printf "\n%s - Installing ${YELLOW}hyprland-protocols dependencies${RESET} .... \n" "${INFO}"
 # Check if hyprland-protocols directory exists and remove it
 if [ -d "hyprland-protocols" ]; then
    rm -rf "hyprland-protocols"
 fi
 # Clone and build 
 printf "${INFO} Installing ${YELLOW}hyprland-protocols $tag${RESET} ...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/hyprland-protocols.git; then
    cd hyprland-protocols || exit 1
 	meson setup build
    if [ $DO_INSTALL -eq 1 ]; then
        if sudo meson install -C build 2>&1 | tee -a "$MLOG" ; then
            printf "${OK} ${MAGENTA}hyprland-protocols $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
        else
            echo -e "${ERROR} Installation failed for ${YELLOW}hyprland-protocols $tag${RESET}" 2>&1 | tee -a "$MLOG"
        fi
    else
        echo "${NOTE} DRY RUN: Skipping installation of hyprland-protocols $tag."
    fi
    #moving the addional logs to Install-Logs directory
    [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
    cd ..
 else
    echo -e "${ERROR} Download failed for ${YELLOW}hyprland-protocols tag${RESET}" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprland-qt-support.sh
+++ b/install-scripts/hyprland-qt-support.sh
@ -1,86 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hypland-qt-support #
 qt_support=(
    qt6-base-dev
    qt6-wayland
    qt6-declarative-dev
    qml6-module-qtcore
    qml6-module-qtquick-layouts
    qt6-tools-dev
    qt6-tools-dev-tools
    qt6-charts-dev
 )
 #specific branch or release
 tag="v0.1.0"
 # Allow environment override
 if [ -n "${HYPRLAND_QT_SUPPORT_TAG:-}" ]; then tag="$HYPRLAND_QT_SUPPORT_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland-qt-support.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprland-qt-support2.log"
 # Installation of dependencies
 printf "\n%s - Installing ${YELLOW}hyprland-qt-support dependencies${RESET} .... \n" "${INFO}"
 for PKG1 in "${qt_support[@]}"; do
  re_install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - ${YELLOW}$PKG1${RESET} Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 printf "\n%.0s" {1..1}
 # Check if hyprland-qt-support directory exists and remove it
 if [ -d "hyprland-qt-support" ]; then
    rm -rf "hyprland-qt-support"
 fi
 # Clone and build 
 printf "${INFO} Installing ${YELLOW}hyprland-qt-support $tag${RESET} ...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/hyprland-qt-support.git; then
    cd hyprland-qt-support || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
 	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
    if [ $DO_INSTALL -eq 1 ]; then
        if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
            printf "${OK} ${MAGENTA}hyprland-qt-support $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
        else
            echo -e "${ERROR} Installation failed for ${YELLOW}hyprland-qt-support $tag${RESET}" 2>&1 | tee -a "$MLOG"
        fi
    else
        echo "${NOTE} DRY RUN: Skipping installation of hyprland-qt-support $tag."
    fi
    #moving the addional logs to Install-Logs directory
    [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
    cd ..
 else
    echo -e "${ERROR} Download failed for ${YELLOW}hyprland-qt-support $tag${RESET}" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprland.sh
+++ b/install-scripts/hyprland.sh
@ -2,29 +2,20 @@
 # 💫 https://github.com/JaKooLit 💫 #
 # Main Hyprland Package #
-#specific branch or release
+hypr=(
-tag="v0.52.2"
+  libhyprutils0
-# Allow environment override
+  libhyprlang-dev
-if [ -n "${HYPRLAND_TAG:-}" ]; then tag="$HYPRLAND_TAG"; fi
+  hyprwayland-scanner
  hyprland-protocols
 )
-# Dry-run support
+# forcing to reinstall. Had experience it says hyprland is already installed
-DO_INSTALL=1
+f_hypr=(
-if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
+  hyprland
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 hyprland=(
  clang
  llvm
  libxcb-errors-dev
  libre2-dev
  libglaze-dev
  libudis86-dev
  libinotify-ocaml-dev
 )
 ## 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 )"
@ -32,102 +23,23 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 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)_hyprland.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprland2.log"
-# Installation of dependencies
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 printf "\n%s - Installing hyprland additional dependencies.... \n" "${NOTE}"
-for PKG1 in "${hyprland[@]}"; do
+# Hyprland
-  install_package "$PKG1" 2>&1 | tee -a "$LOG"
+printf "${NOTE} Installing additional Hyprland packages .......\n"
-  if [ $? -ne 0 ]; then
+ for HYPR in "${hypr[@]}"; do
-    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
+   install_package "$HYPR" 2>&1 | tee -a "$LOG"
-    exit 1
+   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $HYPR Package installation failed, Please check the installation logs"; exit 1; }
  fi
 done
-printf "\n%.0s" {1..1}
+# force
 printf "${NOTE} Force Installing Hyprland .......\n"
 for HYPR1 in "${f_hypr[@]}"; do
   re_install_package "$HYPR1" 2>&1 | tee -a "$LOG"
   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $HYPR1 Package installation failed, Please check the installation logs"; exit 1; }
 done
-# Installation of dependencies (glaze)
+clear 
 printf "\n%s - Installing Hyprland additional dependencies (glaze).... \n" "${NOTE}"
 # Check if /usr/include/glaze exists
 if [ ! -d /usr/include/glaze ]; then
    echo "${INFO} ${YELLOW}Glaze${RESET} is not installed. Installing ${YELLOW}glaze from assets${RESET} ..."
    sudo dpkg -i assets/libglaze-dev_4.4.3-1_all.deb 2>&1 | tee -a "$LOG"
    sudo apt-get install -f -y 2>&1 | tee -a "$LOG"
    echo "${INFO} ${YELLOW}libglaze-dev from assets${RESET} installed."
 fi
 printf "\n%.0s" {1..1}
 # Clone, build, and install Hyprland using Cmake
 printf "${NOTE} Cloning and Installing ${YELLOW}Hyprland $tag${RESET} ...\n"
 # Check if Hyprland folder exists and remove it
 if [ -d "Hyprland" ]; then
  printf "${NOTE} Removing existing Hyprland folder...\n"
  rm -rf "Hyprland" 2>&1 | tee -a "$LOG"
 fi
 if git clone --recursive -b $tag "https://github.com/hyprwm/Hyprland"; then
  cd "Hyprland" || exit 1
  # Apply patch only if it applies cleanly; otherwise skip
  if [ -f ../assets/0001-fix-hyprland-compile-issue.patch ]; then
    if patch -p1 --dry-run < ../assets/0001-fix-hyprland-compile-issue.patch >/dev/null 2>&1; then
      patch -p1 < ../assets/0001-fix-hyprland-compile-issue.patch
    else
      echo "${NOTE} Hyprland compile patch does not apply on $tag; skipping."
    fi
  fi
  # By default, build Hyprland with bundled hyprutils/hyprlang to avoid version mismatches
  # You can force system libs by exporting USE_SYSTEM_HYPRLIBS=1 before running this script.
 USE_SYSTEM=${USE_SYSTEM_HYPRLIBS:-1}
  if [ "$USE_SYSTEM" = "1" ]; then
    export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:${PKG_CONFIG_PATH:-}"
    export CMAKE_PREFIX_PATH="/usr/local:${CMAKE_PREFIX_PATH:-}"
    SYSTEM_FLAGS=("-DUSE_SYSTEM_HYPRUTILS=ON" "-DUSE_SYSTEM_HYPRLANG=ON")
  else
    # Ensure we do not accidentally pick up mismatched system headers
    unset PKG_CONFIG_PATH || true
    SYSTEM_FLAGS=("-DUSE_SYSTEM_HYPRUTILS=OFF" "-DUSE_SYSTEM_HYPRLANG=OFF")
  fi
  # Make sure submodules are present when building bundled deps
  git submodule update --init --recursive || true
  # Force Clang toolchain to support required language features and flags
  export CC="${CC:-clang}"
  export CXX="${CXX:-clang++}"
  CONFIG_FLAGS=(
    -DCMAKE_BUILD_TYPE=Release
    -DCMAKE_C_COMPILER="${CC}"
    -DCMAKE_CXX_COMPILER="${CXX}"
    -DCMAKE_CXX_STANDARD=26
    -DCMAKE_CXX_STANDARD_REQUIRED=ON
    -DCMAKE_CXX_EXTENSIONS=ON
    "${SYSTEM_FLAGS[@]}"
  )
  cmake -S . -B build "${CONFIG_FLAGS[@]}"
  cmake --build build -j "$(nproc 2>/dev/null || getconf _NPROCESSORS_CONF)"
  if [ $DO_INSTALL -eq 1 ]; then
    if sudo cmake --install build 2>&1 | tee -a "$MLOG"; then
      printf "${OK} ${MAGENTA}Hyprland tag${RESET}  installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
      echo -e "${ERROR} Installation failed for ${YELLOW}Hyprland $tag${RESET}" 2>&1 | tee -a "$MLOG"
    fi
  else
    echo "${NOTE} DRY RUN: Skipping installation of Hyprland $tag."
  fi
  [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
  cd ..
 else
  echo -e "${ERROR} Download failed for ${YELLOW}Hyprland $tag${RESET}" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprlang.sh
+++ b/install-scripts/hyprlang.sh
@ -1,66 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hyplang #
 #specific branch or release
 tag="v0.6.7"
 # Allow environment override
 if [ -n "${HYPRLANG_TAG:-}" ]; then tag="$HYPRLANG_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprlang.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprlang2.log"
 # Installation of dependencies
 printf "\n%s - Installing ${YELLOW}hyprlang dependencies${RESET} .... \n" "${INFO}"
 # Check if hyprlang directory exists and remove it
 if [ -d "hyprlang" ]; then
    rm -rf "hyprlang"
 fi
 # Clone and build 
 printf "${INFO} Installing ${YELLOW}hyprlang $tag${RESET} ...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/hyprlang.git; then
    cd hyprlang || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -S . -B ./build
 	cmake --build ./build --config Release --target hyprlang -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
    if [ $DO_INSTALL -eq 1 ]; then
        if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
            printf "${OK} ${MAGENTA}hyprlang tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
        else
            echo -e "${ERROR} Installation failed for ${YELLOW}hyprlang $tag${RESET}" 2>&1 | tee -a "$MLOG"
        fi
    else
        echo "${NOTE} DRY RUN: Skipping installation of hyprlang $tag."
    fi
    #moving the addional logs to Install-Logs directory
    [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
    cd ..
 else
    echo -e "${ERROR} Download failed for ${YELLOW}hyprlang $tag${RESET}" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprlock.sh
+++ b/install-scripts/hyprlock.sh
@ -7,66 +7,61 @@ lock=(
 	libgbm-dev
 	libdrm-dev
    libmagic-dev
-    libaudit-dev
+    libhyprlang-dev
-    libsdbus-c++-dev
+    libhyprutils-dev
 )
 build_dep=(
    pam
 )
 #specific branch or release
-tag="v0.9.1"
+lock_tag="v0.4.0"
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprlock.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprlock2.log"
 # Installation of dependencies
-printf "\n%s - Installing ${YELLOW}hyprlock dependencies${RESET} .... \n" "${INFO}"
+printf "\n%s - Installing hyprlock dependencies.... \n" "${NOTE}"
 for PKG1 in "${lock[@]}"; do
-  re_install_package "$PKG1" "$LOG"
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
-for PKG1 in "${build_dep[@]}"; do
+# Check if hyprlock folder exists and remove it
  build_dep "$PKG1" "$LOG"
 done
 # Check if hyprlock directory exists and remove it
 if [ -d "hyprlock" ]; then
    printf "${NOTE} Removing existing hyprlock folder...\n"
    rm -rf "hyprlock"
 fi
 # Clone and build hyprlock
-printf "${INFO} Installing ${YELLOW}hyprlock $tag${RESET} ...\n"
+printf "${NOTE} Installing hyprlock...\n"
-if git clone --recursive -b $tag https://github.com/hyprwm/hyprlock.git; then
+if git clone --recursive -b $lock_tag https://github.com/hyprwm/hyprlock.git; then
    cd hyprlock || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -S . -B ./build
 	cmake --build ./build --config Release --target hyprlock -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
    if sudo cmake --install build 2>&1 | tee -a "$MLOG" ; then
-        printf "${OK} ${YELLOW}hyprlock $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
+        printf "${OK} hyprlock installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
-        echo -e "${ERROR} Installation failed for ${YELLOW}hyprlock $tag${RESET}" 2>&1 | tee -a "$MLOG"
+        echo -e "${ERROR} Installation failed for hyprlock." 2>&1 | tee -a "$MLOG"
    fi
    #moving the addional logs to Install-Logs directory
    mv $MLOG ../Install-Logs/ || true 
    cd ..
 else
-    echo -e "${ERROR} Download failed for ${YELLOW}hyprlock $tag${RESET}" 2>&1 | tee -a "$LOG"
+    echo -e "${ERROR} Download failed for hyprlock." 2>&1 | tee -a "$LOG"
 fi
-printf "\n%.0s" {1..2}
+
--- a/install-scripts/hyprpolkitagent.sh
+++ b/install-scripts/hyprpolkitagent.sh
@ -1,72 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hyprpolkitagent #
 polkitagent=(
 	libpolkit-agent-1-dev
 	libpolkit-qt6-1-dev
  qml6-module-qtquick-layouts
  qt6-tools-dev
  qt6-tools-dev-tools
  qt6-charts-dev
 )
 #specific branch or release
 tag="v0.1.3"
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprpolkitagent.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprpolkitagent.log"
 # Installation of dependencies
 printf "\n%s - Installing hyprpolkitagent dependencies.... \n" "${NOTE}"
 for PKG1 in "${polkitagent[@]}"; do
  re_install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 # Check if hyprpolkitagent folder exists and remove it
 if [ -d "hyprpolkitagent" ]; then
    printf "${NOTE} Removing existing hyprpolkitagent folder...\n"
    rm -rf "hyprpolkitagent"
 fi
 # Clone and build 
 printf "${NOTE} Installing hyprpolkitagent...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/hyprpolkitagent.git; then
    cd hyprpolkitagent || exit 1
 	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
 	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
    if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
        printf "${OK} hyprpolkitagent installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
        echo -e "${ERROR} Installation failed for hyprpolkitagent." 2>&1 | tee -a "$MLOG"
    fi
    #moving the addional logs to Install-Logs directory
    mv $MLOG ../Install-Logs/ || true 
    cd ..
 else
    echo -e "${ERROR} Download failed for hyprpolkitagent." 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprtoolkit.sh
+++ b/install-scripts/hyprtoolkit.sh
@ -1,65 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hyprtoolkit #
 #specific branch or release
 tag="v0.4.1"
 # Allow environment override
 if [ -n "${HYPRTOOLKIT_TAG:-}" ]; then tag="$HYPRTOOLKIT_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprtoolkit.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprtoolkit2.log"
 # Clone, build, and install using Cmake
 printf "${NOTE} Cloning hyprtoolkit...\n"
 # Check if hyprtoolkit folder exists and remove it
 if [ -d "hyprtoolkit" ]; then
  printf "${NOTE} Removing existing hyprtoolkit folder...\n"
  rm -rf "hyprtoolkit" 2>&1 | tee -a "$LOG"
 fi
 if git clone -b $tag "https://github.com/hyprwm/hyprtoolkit.git"; then
  cd "hyprtoolkit" || exit 1
  cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -S . -B ./build
  cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
  if [ $DO_INSTALL -eq 1 ]; then
    if sudo cmake --install build 2>&1 | tee -a "$MLOG"; then
      printf "${OK} hyprtoolkit installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
      echo -e "${ERROR} Installation failed for hyprtoolkit." 2>&1 | tee -a "$MLOG"
    fi
  else
    echo "${NOTE} DRY RUN: Skipping installation of hyprtoolkit $tag."
  fi
  [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
  cd ..
 else
  echo -e "${ERROR} Download failed for hyprtoolkit" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprutils.sh
+++ b/install-scripts/hyprutils.sh
@ -1,65 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hyprutils #
 #specific branch or release
 tag="v0.10.4"
 # Allow environment override
 if [ -n "${HYPRUTILS_TAG:-}" ]; then tag="$HYPRUTILS_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprutils.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprutils2.log"
 # Clone, build, and install using Cmake
 printf "${NOTE} Cloning hyprutils...\n"
 # Check if hyprutils folder exists and remove it
 if [ -d "hyprutils" ]; then
  printf "${NOTE} Removing existing hyprutils folder...\n"
  rm -rf "hyprutils" 2>&1 | tee -a "$LOG"
 fi
 if git clone -b $tag "https://github.com/hyprwm/hyprutils.git"; then
  cd "hyprutils" || exit 1
  cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -S . -B ./build
  cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
  if [ $DO_INSTALL -eq 1 ]; then
    if sudo cmake --install build 2>&1 | tee -a "$MLOG"; then
      printf "${OK} hyprutils installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
      echo -e "${ERROR} Installation failed for hyprutils." 2>&1 | tee -a "$MLOG"
    fi
  else
    echo "${NOTE} DRY RUN: Skipping installation of hyprutils $tag."
  fi
  [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
  cd ..
 else
  echo -e "${ERROR} Download failed for hyprutils" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/hyprwayland-scanner.sh
+++ b/install-scripts/hyprwayland-scanner.sh
@ -1,82 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # hyprwayland-scanner #
 scan_depend=(
    libpugixml-dev
 )
 #specific branch or release
 tag="v0.4.5"
 # Allow environment override
 if [ -n "${HYPRWAYLAND_SCANNER_TAG:-}" ]; then tag="$HYPRWAYLAND_SCANNER_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprwayland-scanner.log"
 MLOG="install-$(date +%d-%H%M%S)_hyprwayland-scanner2.log"
 ##
 # Installation of dependencies
 printf "\n%s - Installing hyprwayland-scanner dependencies.... \n" "${NOTE}"
 for PKG1 in "${scan_depend[@]}"; do
  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 printf "${NOTE} Installing hyprwayland-scanner...\n"  
 # Check if hyprwayland-scanner folder exists and remove it
 if [ -d "hyprwayland-scanner" ]; then
    printf "${NOTE} Removing existing hyprwayland-scanner folder...\n"
    rm -rf "hyprwayland-scanner"
 fi
 # Clone and build hyprlang
 printf "${NOTE} Installing hyprwayland-scanner...\n"
 if git clone --recursive -b $tag https://github.com/hyprwm/hyprwayland-scanner.git; then
    cd hyprwayland-scanner || exit 1
 	cmake -DCMAKE_INSTALL_PREFIX=/usr -B build
 	cmake --build build -j `nproc`
    if [ $DO_INSTALL -eq 1 ]; then
        if sudo cmake --install build 2>&1 | tee -a "$MLOG" ; then
            printf "${OK} hyprwayland-scanner installed successfully.\n" 2>&1 | tee -a "$MLOG"
        else
            echo -e "${ERROR} Installation failed for hyprwayland-scanner." 2>&1 | tee -a "$MLOG"
        fi
    else
        echo "${NOTE} DRY RUN: Skipping installation of hyprwayland-scanner $tag."
    fi
    #moving the addional logs to Install-Logs directory
    [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
    cd ..
 else
    echo -e "${ERROR} Download failed for hyprwayland-scanner. Please check log." 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/imagemagick.sh
+++ b/install-scripts/imagemagick.sh
@ -0,0 +1,67 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # imagemagick from source #
 depend=(
    build-essential
 )
 ## 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)_image.log"
 MLOG="install-$(date +%d-%H%M%S)_image2.log"
 # Installing depencies
 for PKG1 in "${depend[@]}"; do
  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 # check if Imagemagick is already installed manually 
 if [ -f "/usr/local/bin/magick" ]; then
    echo "${NOTE} /usr/local/bin/magick already exists. skipping installation of Imagemagick." 2>&1 | tee -a "$LOG"
    exit 0
 fi
 printf "${NOTE} Installing ImageMagick from source...\n"  
 # Check if folder exists and remove it
 if [ -d "ImageMagick" ]; then
    printf "${NOTE} Removing existing ImageMagick folder...\n"
    rm -rf "ImageMagick"
 fi
 # Clone and build ImageMagick
 printf "${NOTE} Installing ImageMagick...\n"
 if git clone --depth 1 https://github.com/ImageMagick/ImageMagick.git; then
    cd ImageMagick || exit 1
 	./configure
 	make
    if sudo make install 2>&1 | tee -a "$MLOG" ; then
 		sudo ldconfig /usr/local/lib
        printf "${OK} ImageMagick installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
        echo -e "${ERROR} Installation failed for ImageMagick." 2>&1 | tee -a "$MLOG"
    fi
    #moving the addional logs to Install-Logs directory
    mv $MLOG ../Install-Logs/ || true 
    cd ..
 else
    echo -e "${ERROR} Download failed for ImageMagick." 2>&1 | tee -a "$LOG"
 fi
 clear
--- a/install-scripts/nvidia.sh
+++ b/install-scripts/nvidia.sh
@ -14,18 +14,18 @@ nvidia_pkg=(
  nvidia-vaapi-driver
 )
 # for ubuntu-nvidia owners! just delete #
 # sudo ubuntu-drivers install
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # 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"
@ -57,13 +57,13 @@ add_to_file() {
 }
 # Install additional Nvidia packages
-printf "${YELLOW} Installing ${SKY_BLUE}Nvidia packages${RESET} ...\n"
+printf "${YELLOW} Installing Nvidia packages...\n"
  for NVIDIA in "${nvidia_pkg[@]}"; do
-    install_package "$NVIDIA" "$LOG"
+    install_package "$NVIDIA" 2>&1 | tee -a "$LOG"
  done
-# adding additional nvidia-stuff
+
-printf "${YELLOW} adding ${SKY_BLUE}nvidia-stuff${RESET} to /etc/default/grub..."
+printf "${YELLOW} nvidia-stuff to /etc/default/grub..."
  # Additional options to add to GRUB_CMDLINE_LINUX
  additional_options="rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1 rcutree.rcu_idle_gp_delay=1"
@ -106,4 +106,4 @@ printf "${YELLOW} adding ${SKY_BLUE}nvidia-stuff${RESET} to /etc/default/grub...
    echo "Modules file ($modules_file) not found." 2>&1 | tee -a "$LOG"
   fi
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/nwg-look.sh
+++ b/install-scripts/nwg-look.sh
@ -0,0 +1,68 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # nwg-look ) #
 # nwg-look is now in trixie repo 14-Sep-2024
 nwg_look=(
  golang
  libgtk-3-dev
  libcairo2-dev
  libglib2.0-bin
 )
 # specific tags to download
 nwg_tag="v0.2.7"
 ## 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')_nwg-look.log"
 MLOG="install-$(date +'%d-%H%M%S')_nwg-look2.log"
 # Installing NWG-Look Dependencies
 for PKG1 in "${nwg_look[@]}"; do
  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 printf "${NOTE} Installing nwg-look\n"
 # Check if nwg-look folder exists and remove it
 if [ -d "nwg-look" ]; then
    printf "${NOTE} Removing existing nwg-look folder...\n"
    rm -rf "nwg-look"
 fi
 # Clone nwg-look repository with the specified tag
 if git clone --recursive -b "$nwg_tag" --depth 1 https://github.com/nwg-piotr/nwg-look.git; then
    cd nwg-look || exit 1
    # Build nwg-look
    make build
    if sudo make install 2>&1 | tee -a "$MLOG"; then
        printf "${OK} nwg-look installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
        echo -e "${ERROR} Installation failed for nwg-look" 2>&1 | tee -a "$MLOG"
    fi
    # Move logs to Install-Logs directory
    mv "$MLOG" ../Install-Logs/ || true
    cd ..
 else
    echo -e "${ERROR} Failed to download nwg-look. Please check your connection" 2>&1 | tee -a "$LOG"
    mv "$MLOG" ../Install-Logs/ || true
    exit 1
 fi
 clear
--- a/install-scripts/rofi-wayland.sh
+++ b/install-scripts/rofi-wayland.sh
@ -8,19 +8,10 @@ rofi=(
  pandoc
  doxygen
  cppcheck
  imagemagick
  libmpdclient-dev
  libnl-3-dev
  libasound2-dev
  libstartup-notification0-dev
  libwayland-client++1
  libwayland-dev
  libcairo-5c-dev
  libcairo2-dev
  libpango1.0-dev
  libgdk-pixbuf-2.0-dev
  libxcb-keysyms1-dev
  libwayland-client0
  libxcb-ewmh-dev
  libxcb-cursor-dev
  libxcb-icccm4-dev
@ -31,68 +22,75 @@ rofi=(
  libxcb-xinerama0-dev
  libxkbcommon-dev
  libxkbcommon-x11-dev
-  ohcount
+  imagemagick
  wget
 )
 # variables 
 rofi_tag="1.7.9+wayland1"
 release_url="https://github.com/lbonn/rofi/releases/download/1.7.9%2Bwayland1/rofi-1.7.9+wayland1.tar.gz"
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_rofi_wayland.log"
 MLOG="install-$(date +%d-%H%M%S)_rofi_wayland2.log"
-# Installation of main components
+# uninstall other rofi
-printf "\n%s - Re-installing ${SKY_BLUE}rofi-wayland dependencies${RESET}.... \n" "${INFO}"
+for PKG in "rofi" "bison"; do
-
+  uninstall_package "$PKG" 2>&1 | tee -a "$LOG"
- for FORCE in "${rofi[@]}"; do
+  if [ $? -ne 0 ]; then
-   re_install_package "$FORCE" "$LOG"
+    echo -e "\e[1A\e[K${ERROR} - $PKG uninstallation had failed, please check the log"
    exit 1
  fi
 done
-printf "\n%.0s" {1..2}
+sleep 1
-# Clone and build rofi - wayland
+printf "\n"
-printf "${NOTE} Building and Installing ${SKY_BLUE}rofi-wayland${RESET} $rofi_tag ...\n"
+# Installation of main components
 printf "\n%s - Installing rofi-wayland dependencies.... \n" "${NOTE}"
-# Check if rofi directory exists
+printf "${NOTE} Force installing packages...\n"
-if [ -d "rofi-$rofi_tag" ]; then
+ for FORCE in "${rofi[@]}"; do
-  rm -rf "rofi-$rofi_tag"
+   sudo apt-get --reinstall install -y "$FORCE" 2>&1 | tee -a "$LOG"
   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $FORCE Package installation failed, Please check the installation logs"; exit 1; }
  done
 printf "\n\n"
 # Clone and build rofi - wayland
 printf "${NOTE} Installing rofi-wayland...\n"
 # Check if rofi folder exists
 if [ -d "rofi-1.7.5+wayland3" ]; then
  rm -rf "rofi-1.7.5+wayland3"
 fi
 # cloning rofi-wayland
-printf "${NOTE} Downloading ${YELLOW}rofi-wayland $rofi_tag${RESET} from releases...\n"
+printf "${NOTE} Downloading rofi-wayland v1.7.5+wayland3 from releases...\n"
-wget $release_url
+wget https://github.com/lbonn/rofi/releases/download/1.7.5%2Bwayland3/rofi-1.7.5+wayland3.tar.gz
-if [ -f "rofi-$rofi_tag.tar.gz" ]; then
+if [ -f "rofi-1.7.5+wayland3.tar.gz" ]; then
-  printf "${OK} ${YELLOW}rofi-wayland $rofi_tag${RESET} downloaded successfully.\n" 2>&1 | tee -a "$LOG"
+  printf "rofi-wayland downloaded successfully.\n" 2>&1 | tee -a "$LOG"
-  tar xf rofi-$rofi_tag.tar.gz
+  tar xf rofi-1.7.5+wayland3.tar.gz
 fi
-cd rofi-$rofi_tag || exit 1
+cd rofi-1.7.5+wayland3 || exit 1
 # Proceed with the installation steps
 if meson setup build && ninja -C build ; then
  if sudo ninja -C build install 2>&1 | tee -a "$MLOG"; then
    printf "${OK} rofi-wayland installed successfully.\n" 2>&1 | tee -a "$MLOG"
  else
-    echo -e "${ERROR} Installation failed for ${YELLOW}rofi-wayland $rofi_tag${RESET}" 2>&1 | tee -a "$MLOG"
+    echo -e "${ERROR} Installation failed for rofi-wayland." 2>&1 | tee -a "$MLOG"
  fi
 else
-  echo -e "${ERROR} Meson setup or ninja build failed for ${YELLOW}rofi-wayland $rofi_tag${RESET}" 2>&1 | tee -a "$MLOG"
+  echo -e "${ERROR} Meson setup or ninja build failed for rofi-wayland." 2>&1 | tee -a "$MLOG"
 fi
 # Move logs to Install-Logs directory
@ -100,6 +98,6 @@ mv "$MLOG" ../Install-Logs/ || true
 cd .. || exit 1
 # clean up
-rm -rf rofi-$rofi_tag.tar.gz
+rm -rf rofi-1.7.5+wayland3.tar.gz
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/rog.sh
+++ b/install-scripts/rog.sh
@ -7,17 +7,14 @@ asus=(
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="install-$(date +%d-%H%M%S)_rog.log"
@ -71,4 +68,4 @@ install_and_log "asusctl" "https://gitlab.com/asus-linux/asusctl.git"
 # Download and build supergfxctl
 install_and_log "supergfxctl" "https://gitlab.com/asus-linux/supergfxctl.git"
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/sddm.sh
+++ b/install-scripts/sddm.sh
@ -8,77 +8,111 @@ sddm1=(
 )
 sddm2=(
-  libqt6svg6
+  qml-module-qtgraphicaleffects
-  qt6-declarative-dev
+  qml-module-qtquick-controls 
-  qt6-svg-dev
+  qml-module-qtquick-controls2
-  qt6-virtualkeyboard-plugin
+  qml-module-qtquick-extras 
-  libqt6multimedia6
+  qml-module-qtquick-layouts
  qml6-module-qtquick-controls
  qml6-module-qtquick-effects
 )
 # login managers to attempt to disable
 login=(
  lightdm 
  gdm3 
  gdm 
  lxdm 
  lxdm-gtk3
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_sddm.log"
 # Install SDDM (no-recommends)
-printf "\n%s - Installing ${SKY_BLUE}SDDM and dependencies${RESET} .... \n" "${NOTE}"
+printf "\n%s - Installing sddm.... \n" "${NOTE}"
 for PKG1 in "${sddm1[@]}" ; do
-  sudo apt install --no-install-recommends -y "$PKG1" | tee -a "$LOG"
+  sudo apt-get install --no-install-recommends -y "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 # Installation of additional sddm stuff
 printf "\n%s - Installing sddm additional stuff.... \n" "${NOTE}"
 for PKG2 in "${sddm2[@]}"; do
-  install_package "$PKG2"  "$LOG"
+  install_package "$PKG2" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG2 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
-# Check if other login managers are installed and disable their service before enabling SDDM
+# Check if other login managers are installed and disabling their service before enabling sddm
-for login_manager in "${login[@]}"; do
+for login_manager in lightdm gdm lxdm lxdm-gtk3; do
-  if dpkg -l | grep -q "^ii  $login_manager"; then
+  if sudo apt-get list installed "$login_manager" &>> /dev/null; then
    echo "Disabling $login_manager..."
-    sudo systemctl disable "$login_manager.service" >> "$LOG" 2>&1 || echo "Failed to disable $login_manager" >> "$LOG"
+    sudo systemctl disable "$login_manager" 2>&1 | tee -a "$LOG"
    echo "$login_manager disabled."
  fi
 done
-# Double check with systemctl
+printf " Activating sddm service........\n"
-for manager in "${login[@]}"; do
+sudo systemctl enable sddm
  if systemctl is-active --quiet "$manager.service" > /dev/null 2>&1; then
    echo "$manager.service is active, disabling it..." >> "$LOG" 2>&1
    sudo systemctl disable "$manager.service" --now >> "$LOG" 2>&1 || echo "Failed to disable $manager.service" >> "$LOG"
  else
    echo "$manager.service is not active" >> "$LOG" 2>&1
  fi
 done
-printf "\n%.0s" {1..1}
+# Set up SDDM
-printf "${INFO} Activating sddm service........\n"
+echo -e "${NOTE} Setting up the login screen."
-sudo systemctl set-default graphical.target 2>&1 | tee -a "$LOG"
+sddm_conf_dir=/etc/sddm.conf.d
-sudo systemctl enable sddm.service 2>&1 | tee -a "$LOG"
+[ ! -d "$sddm_conf_dir" ] && { printf "$CAT - $sddm_conf_dir not found, creating...\n"; sudo mkdir -p "$sddm_conf_dir" 2>&1 | tee -a "$LOG"; }
 wayland_sessions_dir=/usr/share/wayland-sessions
 [ ! -d "$wayland_sessions_dir" ] && { printf "$CAT - $wayland_sessions_dir not found, creating...\n"; sudo mkdir -p "$wayland_sessions_dir" 2>&1 | tee -a "$LOG"; }
 sudo cp assets/hyprland.desktop "$wayland_sessions_dir/" 2>&1 | tee -a "$LOG"
 printf "\n%.0s" {1..2}
 # SDDM-themes
 valid_input=false
 while [ "$valid_input" != true ]; do
  read -n 1 -r -p "${CAT} OPTIONAL - Would you like to install SDDM themes? (y/n)" install_sddm_theme
  if [[ $install_sddm_theme =~ ^[Yy]$ ]]; then
    printf "\n%s - Installing Simple SDDM Theme\n" "${NOTE}"
    # Check if /usr/share/sddm/themes/simple-sddm exists and remove if it does
    if [ -d "/usr/share/sddm/themes/simple-sddm" ]; then
      sudo rm -rf "/usr/share/sddm/themes/simple-sddm"
      echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm' directory." 2>&1 | tee -a "$LOG"
    fi
    # Check if simple-sddm directory exists in the current directory and remove if it does
    if [ -d "simple-sddm" ]; then
      rm -rf "simple-sddm"
      echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm' directory from the current location." 2>&1 | tee -a "$LOG"
    fi
    if git clone https://github.com/JaKooLit/simple-sddm.git; then
      while [ ! -d "simple-sddm" ]; 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 simple-sddm /usr/share/sddm/themes/
      echo -e "[Theme]\nCurrent=simple-sddm" | sudo tee "$sddm_conf_dir/theme.conf.user" &>> "$LOG"
     else
      echo -e "\e[1A\e[K${ERROR} - Failed to clone the theme repository. Please check your internet connection or repository availability." | 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          		
 clear
--- a/install-scripts/sddm_theme.sh
+++ b/install-scripts/sddm_theme.sh
@ -1,132 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # SDDM themes #
 source_theme="https://github.com/JaKooLit/simple-sddm-2.git"
 theme_name="simple_sddm_2"
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # 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/$theme_name exists and remove if it does
 if [ -d "/usr/share/sddm/themes/$theme_name" ]; then
  sudo rm -rf "/usr/share/sddm/themes/$theme_name"
  echo -e "\e[1A\e[K${OK} - Removed existing $theme_name directory." 2>&1 | tee -a "$LOG"
 fi
 # Check if $theme_name directory exists in the current directory and remove if it does
 if [ -d "$theme_name" ]; then
  rm -rf "$theme_name"
  echo -e "\e[1A\e[K${OK} - Removed existing $theme_name directory from the current location." 2>&1 | tee -a "$LOG"
 fi
 # Clone the repository
 if git clone --depth=1 "$source_theme" "$theme_name"; then
  if [ ! -d "$theme_name" ]; then
    echo "${ERROR} Failed to clone the repository." | tee -a "$LOG"
  fi
  # Create themes directory if it doesn't exist
  if [ ! -d "/usr/share/sddm/themes" ]; then
    sudo mkdir -p /usr/share/sddm/themes
    echo "${OK} - Directory '/usr/share/sddm/themes' created." | tee -a "$LOG"
  fi
  # Move cloned theme to the themes directory
  sudo mv "$theme_name" "/usr/share/sddm/themes/$theme_name" 2>&1 | tee -a "$LOG"
  # setting up SDDM theme
  sddm_conf="/etc/sddm.conf"
  BACKUP_SUFFIX=".bak"
  echo -e "${NOTE} Setting up the login screen." | tee -a "$LOG"
  # Backup the sddm.conf file if it exists
  if [ -f "$sddm_conf" ]; then
    echo "Backing up $sddm_conf" | tee -a "$LOG"
    sudo cp "$sddm_conf" "$sddm_conf$BACKUP_SUFFIX" 2>&1 | tee -a "$LOG"
  else
    echo "$sddm_conf does not exist, creating a new one." | tee -a "$LOG"
    sudo touch "$sddm_conf" 2>&1 | tee -a "$LOG"
  fi
  # Check if the [Theme] section exists
  if grep -q '^\[Theme\]' "$sddm_conf"; then
    # Update the Current= line under [Theme]
    sudo sed -i "/^\[Theme\]/,/^\[/{s/^\s*Current=.*/Current=$theme_name/}" "$sddm_conf" 2>&1 | tee -a "$LOG"
    # If no Current= line was found and replaced, append it after the [Theme] section
    if ! grep -q '^\s*Current=' "$sddm_conf"; then
      sudo sed -i "/^\[Theme\]/a Current=$theme_name" "$sddm_conf" 2>&1 | tee -a "$LOG"
      echo "Appended Current=$theme_name under [Theme] in $sddm_conf" | tee -a "$LOG"
    else
      echo "Updated Current=$theme_name in $sddm_conf" | tee -a "$LOG"
    fi
  else
    # Append the [Theme] section at the end if it doesn't exist
    echo -e "\n[Theme]\nCurrent=$theme_name" | sudo tee -a "$sddm_conf" > /dev/null
    echo "Added [Theme] section with Current=$theme_name in $sddm_conf" | tee -a "$LOG"
  fi
  # Add [General] section with InputMethod=qtvirtualkeyboard if it doesn't exist
  if ! grep -q '^\[General\]' "$sddm_conf"; then
    echo -e "\n[General]\nInputMethod=qtvirtualkeyboard" | sudo tee -a "$sddm_conf" > /dev/null
    echo "Added [General] section with InputMethod=qtvirtualkeyboard in $sddm_conf" | tee -a "$LOG"
  else
    # Update InputMethod line if section exists
    if grep -q '^\s*InputMethod=' "$sddm_conf"; then
      sudo sed -i '/^\[General\]/,/^\[/{s/^\s*InputMethod=.*/InputMethod=qtvirtualkeyboard/}' "$sddm_conf" 2>&1 | tee -a "$LOG"
      echo "Updated InputMethod to qtvirtualkeyboard in $sddm_conf" | tee -a "$LOG"
    else
      sudo sed -i '/^\[General\]/a InputMethod=qtvirtualkeyboard' "$sddm_conf" 2>&1 | tee -a "$LOG"
      echo "Appended InputMethod=qtvirtualkeyboard under [General] in $sddm_conf" | tee -a "$LOG"
    fi
  fi
  # Replace current background from assets
  sudo cp -r assets/sddm.png "/usr/share/sddm/themes/$theme_name/Backgrounds/default" 2>&1 | tee -a "$LOG"
  sudo sed -i 's|^wallpaper=".*"|wallpaper="Backgrounds/default"|' "/usr/share/sddm/themes/$theme_name/theme.conf" 2>&1 | tee -a "$LOG"
  printf "\n%.0s" {1..1}
  printf "${NOTE} copying ${YELLOW}JetBrains Mono Nerd Font${RESET} to ${YELLOW}/usr/local/share/fonts${RESET} .......\n"
  printf "${NOTE} necessary for the new SDDM theme to work properly........\n"
  sudo mkdir -p /usr/local/share/fonts/JetBrainsMonoNerd && \
  sudo cp -r "$HOME/.local/share/fonts/JetBrainsMonoNerd" /usr/local/share/fonts/JetBrainsMonoNerd
  if [ $? -eq 0 ]; then
    echo "Fonts copied successfully."
  else
    echo "Failed to copy fonts."
  fi
  # Update font cache and log the output
  fc-cache -v -f 2>&1 | tee -a "$LOG"
  printf "\n%.0s" {1..1}
  echo "${OK} - ${MAGENTA}Additional ${YELLOW}$theme_name SDDM Theme${RESET} successfully installed." | tee -a "$LOG"
 else
  echo "${ERROR} - Failed to clone the sddm theme repository. Please check your internet connection." | tee -a "$LOG" >&2
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/swww.sh
+++ b/install-scripts/swww.sh
@ -2,62 +2,53 @@
 # 💫 https://github.com/JaKooLit 💫 #
 # SWWW - Wallpaper Utility #
 # specific branch or release
 swww_tag="v0.11.2"
 # Check if 'swww' is installed
 if command -v swww &>/dev/null; then
    SWWW_VERSION=$(swww -V | awk '{print $NF}')
    if [[ "$SWWW_VERSION" == "$swww_tag" ]]; then
        echo -e "${OK} ${MAGENTA}swww ${swww_tag}${RESET} is already installed. Skipping installation."
        exit 0
    fi
 else
    echo -e "${NOTE} ${MAGENTA}swww${RESET} is not installed. Proceeding with installation."
 fi
 swww=(
    liblz4-dev
 )
 # specific branch or release
 swww_tag="v0.9.5"
 ## 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" || {
+cd "$PARENT_DIR" || exit 1
    echo "${ERROR} Failed to change directory to $PARENT_DIR"
    exit 1
 }
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
    echo "Failed to source Global_functions.sh"
    exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_swww.log"
 MLOG="install-$(date +%d-%H%M%S)_swww2.log"
 # Installation of swww compilation needed
-printf "\n%s - Installing ${SKY_BLUE}swww $swww_tag and dependencies${RESET} .... \n" "${NOTE}"
+printf "\n%s - Installing swww dependencies.... \n" "${NOTE}"
 for PKG1 in "${swww[@]}"; do
-    install_package "$PKG1" "$LOG"
+    install_package "$PKG1" 2>&1 | tee -a "$LOG"
    if [ $? -ne 0 ]; then
        echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
        exit 1
    fi
 done
 printf "\n%.0s" {1..2}
-# Check if swww directory exists
+printf "${NOTE} Installing swww\n"
 # Check if swww folder exists
 if [ -d "swww" ]; then
    printf "${NOTE} swww folder exists. Pulling latest changes...\n"
    cd swww || exit 1
    git pull origin main 2>&1 | tee -a "$MLOG"
 else
    printf "${NOTE} Cloning swww repository...\n"
    if git clone --recursive -b $swww_tag https://github.com/LGFae/swww.git; then
        cd swww || exit 1
    else
-        echo -e "${ERROR} Download failed for ${YELLOW}swww $swww_tag${RESET}" 2>&1 | tee -a "$LOG"
+        echo -e "${ERROR} Download failed for swww" 2>&1 | tee -a "$LOG"
        exit 1
    fi
 fi
@ -97,4 +88,4 @@ sudo cp -r completions/_swww /usr/share/zsh/site-functions/_swww 2>&1 | tee -a "
 mv "$MLOG" ../Install-Logs/ || true 
 cd - || exit 1
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/thunar.sh
+++ b/install-scripts/thunar.sh
@ -12,38 +12,49 @@ thunar=(
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_thunar.log"
-# Thunar
+printf "${NOTE} Installing Thunar Packages...\n"  
 printf "${NOTE} Installing ${SKY_BLUE}Thunar${RESET} Packages...\n\n"  
  for THUNAR in "${thunar[@]}"; do
-    install_package "$THUNAR" "$LOG"
+    install_package "$THUNAR" 2>&1 | tee -a "$LOG"
    [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $THUNAR Package installation failed, Please check the installation logs"; exit 1; }
  done
-printf "\n%.0s" {1..1}
+printf "\n%.0s" {1..2}
 # Ask the user if they want to use Thunar as the default file manager
 read -p "${CAT} Do you want to set Thunar as the default file manager? (y/n): " thunar_default
 if [[ "$thunar_default" == [Yy] ]]; then
    # Setting Thunar as the default file manager
    xdg-mime default thunar.desktop inode/directory
    xdg-mime default thunar.desktop application/x-wayland-gnome-saved-search
    echo "${OK} Thunar has been set as the default file manager." 2>&1 | tee -a "$LOG"
 else
    echo "${NOTE} you choose not to set Thunar as default file manager." 2>&1 | tee -a "$LOG"
 fi
 printf "\n"
 # Check for existing configs and copy if does not exist
 for DIR1 in gtk-3.0 Thunar xfce4; do
  DIRPATH=~/.config/$DIR1
  if [ -d "$DIRPATH" ]; then
-    echo -e "${NOTE} Config for ${MAGENTA}$DIR1${RESET} found, no need to copy." 2>&1 | tee -a "$LOG"
+    echo -e "${NOTE} Config for $DIR1 found, no need to copy." 2>&1 | tee -a "$LOG"
  else
-    echo -e "${NOTE} Config for ${YELLOW}$DIR1${RESET} not found, copying from assets." 2>&1 | tee -a "$LOG"
+    echo -e "${NOTE} Config for $DIR1 not found, copying from assets." 2>&1 | tee -a "$LOG"
-    cp -r assets/$DIR1 ~/.config/ && echo "${OK} Copy $DIR1 completed!" || echo "${ERROR} Failed to copy $DIR1 config files." 2>&1 | tee -a "$LOG"
+    cp -r assets/$DIR1 ~/.config/ && echo "Copy $DIR1 completed!" || echo "Error: Failed to copy $DIR1 config files." 2>&1 | tee -a "$LOG"
  fi
 done
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/thunar_default.sh
+++ b/install-scripts/thunar_default.sh
@ -1,28 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Thunar-default #
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # 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}
--- a/install-scripts/wallust.sh
+++ b/install-scripts/wallust.sh
@ -2,21 +2,15 @@
 # 💫 https://github.com/JaKooLit 💫 #
 # wallust - pywal colors replacement #
-wallust=(
+# Determine the directory where the script is located
  wallust
 )
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+# Source external functions, adjust path as necessary
-if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_wallust.log"
@ -25,7 +19,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_wallust.log"
 mkdir -p "$(dirname "$LOG")"
 # Install up-to-date Rust
-echo "${INFO} Installing most ${YELLOW}up to date Rust compiler${RESET} ..."
+echo "Installing most up to date Rust compiler..."
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 2>&1 | tee -a "$LOG"
 source "$HOME/.cargo/env"
@ -40,24 +34,16 @@ fi
 printf "\n%.0s" {1..2} 
 # Install Wallust using Cargo
-for WALL in "${wallust[@]}"; do
+echo "Installing Wallust using Cargo..." | tee -a "$LOG"
-    cargo_install "$WALL" "$LOG"
+if cargo install wallust 2>&1 | tee -a "$LOG" ; then
-    if [ $? -eq 0 ]; then  
+    echo "Wallust installed successfully." | tee -a "$LOG"
-        echo "${OK} ${MAGENTA}Wallust${RESET} installed successfully." | tee -a "$LOG"
+
    else
        echo "${ERROR} Installation of ${MAGENTA}$WALL${RESET} failed. Check the log file $LOG for details." | tee -a "$LOG"
        exit 1
    fi
 done
 printf "\n%.0s" {1..1} 
    # Move the newly compiled binary to /usr/local/bin
    echo "Moving Wallust binary to /usr/local/bin..." | tee -a "$LOG"
-if sudo mv "$HOME/.cargo/bin/wallust" /usr/local/bin 2>&1 | tee -a "$LOG"; then
+    sudo mv "$HOME/.cargo/bin/wallust" /usr/local/bin 2>&1 | tee -a "$LOG"
    echo "${OK} Wallust binary moved successfully to /usr/local/bin." | tee -a "$LOG"
 else
-    echo "${ERROR} Failed to move Wallust binary. Check the log file $LOG for details." | tee -a "$LOG"
+    echo "Error: Wallust installation failed. Check the log file $LOG for details." | tee -a "$LOG"
    exit 1
 fi
-
+clear
 printf "\n%.0s" {1..2}
--- a/install-scripts/wayland-protocols-src.sh
+++ b/install-scripts/wayland-protocols-src.sh
@ -1,83 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Build and install wayland-protocols from source
 # Provides a newer wayland-protocols.pc for pkg-config when distro version is too old
 #specific tag or release (e.g., 1.45, 1.46)
 tag="1.45"
 # Allow environment override
 if [ -n "${WAYLAND_PROTOCOLS_TAG:-}" ]; then tag="$WAYLAND_PROTOCOLS_TAG"; fi
 # Dry-run support
 DO_INSTALL=1
 if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
    DO_INSTALL=0
    echo "${NOTE} DRY RUN: install step will be skipped."
 fi
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_wayland-protocols.log"
 MLOG="install-$(date +%d-%H%M%S)_wayland-protocols2.log"
 printf "\n%s - Installing ${YELLOW}wayland-protocols (from source)${RESET} .... \n" "${INFO}"
 # Clean previous clone
 if [ -d "wayland-protocols" ]; then
    rm -rf "wayland-protocols"
 fi
 # Clone and build (meson)
 # Upstream: https://gitlab.freedesktop.org/wayland/wayland-protocols.git
 printf "${INFO} Installing ${YELLOW}wayland-protocols $tag${RESET} ...\n"
 repo_url="https://gitlab.freedesktop.org/wayland/wayland-protocols.git"
 if git clone --depth=1 --filter=blob:none "$repo_url" wayland-protocols; then
    cd wayland-protocols || exit 1
    # Fetch tags and attempt to checkout the requested tag, trying both raw and v-prefixed
    git fetch --tags --depth=1 >/dev/null 2>&1 || true
    checked_out=0
    for candidate in "$tag" "v$tag"; do
        if git rev-parse -q --verify "refs/tags/$candidate" >/dev/null; then
            git checkout -q "refs/tags/$candidate"
            checked_out=1
            break
        fi
    done
    if [ "$checked_out" -ne 1 ]; then
        echo "${ERROR} Tag $tag not found in $repo_url" | tee -a "$LOG"
        echo "${NOTE} Available tags (truncated):" | tee -a "$LOG"
        git tag --list | tail -n 20 | tee -a "$LOG" || true
        exit 1
    fi
    # Install to /usr/local so pkg-config can prefer it over distro /usr
    meson setup build --prefix=/usr/local
    meson compile -C build -j"$(nproc 2>/dev/null || getconf _NPROCESSORS_CONF)"
    if [ $DO_INSTALL -eq 1 ]; then
        if sudo meson install -C build 2>&1 | tee -a "$MLOG" ; then
            printf "${OK} ${MAGENTA}wayland-protocols $tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
        else
            echo -e "${ERROR} Installation failed for ${YELLOW}wayland-protocols $tag${RESET}" 2>&1 | tee -a "$MLOG"
        fi
    else
        echo "${NOTE} DRY RUN: Skipping installation of wayland-protocols $tag."
    fi
    # Move additional logs to Install-Logs directory if they exist
    [ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/ || true
    cd ..
 else
    echo -e "${ERROR} Download failed for ${YELLOW}wayland-protocols $tag${RESET}" 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/xdph.sh
+++ b/install-scripts/xdph.sh
@ -3,69 +3,55 @@
 # XDG-Desktop-Portals for hyprland #
 xdg=(
  libdrm-dev
  libpipewire-0.3-dev
  libspa-0.2-dev
  libsdbus-c++-dev
  libwayland-client0
  wayland-protocols
    xdg-desktop-portal-gtk
    xdg-desktop-portal-hyprland
 )
 #specific branch or release
 tag="v1.3.10"
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_xdph.log"
 # Check if the file exists and remove it
 [[ -f "/usr/lib/xdg-desktop-portal-hyprland" ]] && sudo rm "/usr/lib/xdg-desktop-portal-hyprland"
-# XDG-DESKTOP-PORTAL-HYPRLAND
+printf "${NOTE} Installing xdg-desktop-portals...\n"  
-printf "${NOTE} Installing ${SKY_BLUE}xdg-desktop-portal-hyprland dependencies${RESET}\n\n" 
+for portal in "${xdg[@]}"; do
-
+    install_package "$portal" 2>&1 | tee -a "$LOG"
-for PKG1 in "${xdg[@]}"; do
+    [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $portal Package installation failed, Please check the installation logs"; exit 1; }
  re_install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
-# Clone, build, and install XDPH
+printf "\n\n${NOTE} Checking for other XDG-Desktop-Portal-Implementations...\n"
-printf "${NOTE} Cloning and Installing ${YELLOW}XDG Desktop Portal Hyprland $tag${RESET} ...\n"
+sleep 1
 printf "${NOTE} XDG-desktop-portal-KDE & GNOME (if installed) should be manually disabled or removed! I can't remove it... sorry...\n"
-# Check if xdg-desktop-portal-hyprland folder exists and remove it
+while true; do
-if [ -d "xdg-desktop-portal-hyprland" ]; then
+    read -rp "${CAT} Would you like to try to remove other XDG-Desktop-Portal-Implementations? (y/n) " XDPH1
-  printf "${NOTE} Removing existing xdg-desktop-portal-hyprland folder...\n"
+    echo
-  rm -rf "xdg-desktop-portal-hyprland" 2>&1 | tee -a "$LOG"
+    sleep 1
 fi
-if git clone --recursive -b $tag "https://github.com/hyprwm/xdg-desktop-portal-hyprland.git"; then
+    case $XDPH1 in
-  cd "xdg-desktop-portal-hyprland" || exit 1
+      [Yy])
-  cmake -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr -B build
+        printf "${NOTE} Clearing any other xdg-desktop-portal implementations...\n"
-  cmake --build build
+        for portal in xdg-desktop-portal-wlr xdg-desktop-portal-lxqt; do
-  if sudo cmake --install build 2>&1 | tee -a "$MLOG"; then
+            if dpkg -l | grep -q "$portal"; then
-    printf "${OK} ${MAGENTA}xdph $tag${RESET}  installed successfully.\n" 2>&1 | tee -a "$MLOG"
+                echo "Removing $portal..."
-  else
+                sudo apt-get remove -y "$portal" 2>&1 | tee -a "$LOG"
    echo -e "${ERROR} Installation failed for ${YELLOW}xdph $tag${RESET}" 2>&1 | tee -a "$MLOG"
  fi
  mv $MLOG ../Install-Logs/ || true   
  cd ..
 else
  echo -e "${ERROR} Download failed for ${YELLOW}xdph $tag${RESET}" 2>&1 | tee -a "$LOG"
            fi
        done
        break
        ;;
      [Nn])
        echo "No other XDG-implementations will be removed." 2>&1 | tee -a "$LOG"
        break
        ;;
      *)
        echo "Invalid input. Please enter 'y' for yes or 'n' for no."
        ;;
    esac
 done
-printf "\n%.0s" {1..2}
+clear
--- a/install-scripts/xkbcommon.sh
+++ b/install-scripts/xkbcommon.sh
@ -1,69 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # Hypr Ecosystem #
 # xkbcommon #
 xkbcommon=(
 bison
 libzip-dev
 librsvg2-dev
 )
 #specific branch or release
 tag="xkbcommon-1.13.1"
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_xkbcommon.log"
 MLOG="install-$(date +%d-%H%M%S)_xkbcommon.log"
 # Installation of dependencies
 printf "\n%s - Installing xkbcommon dependencies.... \n" "${NOTE}"
 for PKG1 in "${xkbcommon[@]}"; do
  install_package "$PKG1" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
    exit 1
  fi
 done
 # Check if xkbcommon folder exists and remove it
 if [ -d "libxkbcommon" ]; then
    printf "${NOTE} Removing existing libxkbcommon folder...\n"
    rm -rf "libxkbcommon"
 fi
 # Clone and build 
 printf "${NOTE} Installing xkbcommon...\n"
 if git clone --recursive -b $tag https://github.com/xkbcommon/libxkbcommon.git; then
    cd libxkbcommon || exit 1
    meson setup build --libdir=/usr/local/lib
    meson compile -C build
    if sudo meson install -C build 2>&1 | tee -a "$MLOG" ; then
        printf "${OK} xkbcommon installed successfully.\n" 2>&1 | tee -a "$MLOG"
    else
        echo -e "${ERROR} Installation failed for xkbcommon." 2>&1 | tee -a "$MLOG"
    fi
    #moving the addional logs to Install-Logs directory
    mv $MLOG ../Install-Logs/ || true 
    cd ..
 else
    echo -e "${ERROR} Download failed for xkbcommon." 2>&1 | tee -a "$LOG"
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/zsh.sh
+++ b/install-scripts/zsh.sh
@ -3,24 +3,20 @@
 # Zsh and Oh my Zsh + Optional Pokemon ColorScripts#
 zsh=(
-  lsd
+    eza
    zsh
  mercurial
    zplug 
 )
 ## 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+cd "$PARENT_DIR" || exit 1
-# Source the global functions script
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh.log"
@ -35,31 +31,64 @@ done
 # Installing zsh packages
 printf "${NOTE} Installing core zsh packages...${RESET}\n"
 for ZSHP in "${zsh[@]}"; do
-  install_package "$ZSHP"
+  install_package "$ZSHP" 2>&1 | tee -a "$LOG"
  if [ $? -ne 0 ]; then
     echo -e "\e[1A\e[K${ERROR} - $ZSHP Package installation failed, Please check the installation logs"
  fi
 done
-printf "\n%.0s" {1..1}
+printf "\n%.0s" {1..2}
 ## Optional Pokemon color scripts
 while true; do
    read -p "${CAT} Do you want to install Pokemon color scripts? (y/n): " choice
    case "$choice" in
        [Yy]*)
            if [ -d "pokemon-colorscripts" ]; then
                cd pokemon-colorscripts && git pull && sudo ./install.sh && cd ..
            else
                git clone https://gitlab.com/phoneybadger/pokemon-colorscripts.git &&
                cd pokemon-colorscripts && sudo ./install.sh && cd ..
            fi
            sed -i '/#pokemon-colorscripts --no-title -s -r/s/^#//' assets/.zshrc >> "$LOG" 2>&1
 			# commenting out fastfetch since pokemon was chosen to install
            sed -i '/^fastfetch -c $HOME\/.config\/fastfetch\/config-compact.jsonc/s/^/#/' assets/.zshrc >> "$LOG" 2>&1
 			echo "${NOTE} Pokemon Installation process completed" 2>&1 | tee -a "$LOG"
            break
            ;;
        [Nn]*) 
            echo "${MAGENTA} You chose not to install Pokemon Color Scripts." 2>&1 | tee -a "$LOG"
            break
            ;;
        *)
            echo "Please enter 'y' for yes or 'n' for no." 2>&1 | tee -a "$LOG"
            ;;
    esac
 done
 printf "\n"
 # 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"
+  printf "${NOTE} Installing Oh My Zsh and plugins...\n"
 	if [ ! -d "$HOME/.oh-my-zsh" ]; then
-    sh -c "$(curl -fsSL https://install.ohmyz.sh)" "" --unattended  	       
+  		sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended || true
 	else
-    echo "${INFO} Directory .oh-my-zsh already exists. Skipping re-installation." 2>&1 | tee -a "$LOG"
+		echo "Directory .oh-my-zsh already exists. Skipping re-installation." 2>&1 | tee -a "$LOG"
 	fi
 	# Check if the directories exist before cloning the repositories
 	if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions" ]; then
-      git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions 
+    	git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions || true
 	else
-      echo "${INFO} Directory zsh-autosuggestions already exists. Cloning Skipped." 2>&1 | tee -a "$LOG"
+    	echo "Directory zsh-autosuggestions already exists. Skipping cloning." 2>&1 | tee -a "$LOG"
 	fi
 	if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" ]; then
-      git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting 
+    	git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting || true
 	else
-      echo "${INFO} Directory zsh-syntax-highlighting already exists. Cloning Skipped." 2>&1 | tee -a "$LOG"
+    	echo "Directory zsh-syntax-highlighting already exists. Skipping cloning." 2>&1 | tee -a "$LOG"
 	fi
 	# Check if ~/.zshrc and .zprofile exists, create a backup, and copy the new configuration
@ -71,32 +100,18 @@ if command -v zsh >/dev/null; then
    	cp -b "$HOME/.zprofile" "$HOME/.zprofile-backup" || true
 	fi
  # Copying the preconfigured zsh themes and profile
    cp -r 'assets/.zshrc' ~/
    cp -r 'assets/.zprofile' ~/
-  # Check if the current shell is zsh
+    printf "${NOTE} Changing default shell to zsh...\n"
  current_shell=$(basename "$SHELL")
  if [ "$current_shell" != "zsh" ]; then
    printf "${NOTE} Changing default shell to ${MAGENTA}zsh${RESET}..."
    printf "\n%.0s" {1..2}
-    # Loop to ensure the chsh command succeeds
+	while ! chsh -s $(which zsh); do
-    while ! chsh -s "$(command -v zsh)"; do
+    echo "${ERROR} Authentication failed. Please enter the correct password."
      echo "${ERROR} Authentication failed. Please enter the correct password." 2>&1 | tee -a "$LOG"
    sleep 1	
 	done
-
+	printf "\n"
-    printf "${INFO} Shell changed successfully to ${MAGENTA}zsh${RESET}" 2>&1 | tee -a "$LOG"
+	printf "${NOTE} Shell changed successfully to zsh.\n" 2>&1 | tee -a "$LOG"
  else
    echo "${NOTE} Your shell is already set to ${MAGENTA}zsh${RESET}."
  fi
 fi
-# copy additional oh-my-zsh themes from assets
+clear
 if [ -d "$HOME/.oh-my-zsh/themes" ]; then
    cp -r assets/add_zsh_theme/* ~/.oh-my-zsh/themes >> "$LOG" 2>&1
 fi
 printf "\n%.0s" {1..2}
--- a/install-scripts/zsh_pokemon.sh
+++ b/install-scripts/zsh_pokemon.sh
@ -1,38 +0,0 @@
 #!/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! ##
 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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
 # Source the global functions script
 if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
  echo "Failed to source Global_functions.sh"
  exit 1
 fi
 # 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} ..."
 if [ -d "pokemon-colorscripts" ]; then
    cd pokemon-colorscripts && git pull && sudo ./install.sh && cd ..
    else
    git clone --depth=1 https://gitlab.com/phoneybadger/pokemon-colorscripts.git &&
    cd pokemon-colorscripts && sudo ./install.sh && cd ..
 fi
 # Check if ~/.zshrc exists
 if [ -f "$HOME/.zshrc" ]; then
 	sed -i 's|^#pokemon-colorscripts --no-title -s -r \| fastfetch -c \$HOME/.config/fastfetch/config-pokemon.jsonc --logo-type file-raw --logo-height 10 --logo-width 5 --logo -|pokemon-colorscripts --no-title -s -r \| fastfetch -c \$HOME/.config/fastfetch/config-pokemon.jsonc --logo-type file-raw --logo-height 10 --logo-width 5 --logo -|' "$HOME/.zshrc" >> "$LOG" 2>&1
 	sed -i "s|^fastfetch -c \$HOME/.config/fastfetch/config-compact.jsonc|#fastfetch -c \$HOME/.config/fastfetch/config-compact.jsonc|" "$HOME/.zshrc" >> "$LOG" 2>&1
 else
    echo "$HOME/.zshrc not found. Cant enable ${YELLOW}Pokemon color scripts${RESET}" >> "$LOG" 2>&1
 fi
 printf "\n%.0s" {1..2}
--- a/install.sh
+++ b/install.sh
@ -1,91 +1,15 @@
 #!/bin/bash
 # https://github.com/JaKooLit
 clear
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
 ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
 NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
 INFO="$(tput setaf 4)[INFO]$(tput sgr0)"
 WARN="$(tput setaf 1)[WARN]$(tput sgr0)"
 CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
 MAGENTA="$(tput setaf 5)"
 ORANGE="$(tput setaf 214)"
 WARNING="$(tput setaf 1)"
 YELLOW="$(tput setaf 3)"
 GREEN="$(tput setaf 2)"
 BLUE="$(tput setaf 4)"
 SKY_BLUE="$(tput setaf 6)"
 RESET="$(tput sgr0)"
 # Function to print colorful text
 print_color() {
    printf "%b%s%b\n" "$1" "$2" "$RESET"
 }
 # Warning: End of Life Support
 printf "\n%.0s" {1..2}
 print_color $YELLOW "
        █▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█
              KooL's Debian - Hyprland October 2025 Update
            Most Hyprland packages are built from Source
                                NOTICE
        █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█
    All Hyprland and associated packages set to install using this script are downloaded and built from source (github)
    However, do note that it is downloaded from each individual releases. You can set versions by editing the scripts
    located install-scripts directory.
    These packages are NOT updated automatically. 
    See the HOWTO documentation on how to get next release of Hyprland installed 
    BE WARNED!!!!!  Installation will take longer!!
        █▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█
                                NOTE:
                    Hyprland and Dependencies versions              
        █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█
    Thank you!
 "
 printf "\n%.0s" {1..2}
 # Prompt user to continue or exit
 read -rp "Do you want to continue with the installation? [y/N]: " confirm
 case "$confirm" in
 [yY][eE][sS] | [yY])
    echo -e "${OK} Continuing with installation..."
    ;;
 *)
    echo -e "${NOTE} You chose not to continue. Exiting..."
    exit 1
    ;;
 esac
 # Create Directory for Install Logs
 if [ ! -d Install-Logs ]; then
    mkdir Install-Logs
 fi
 # Set the name of the log file to include the current date and time
 LOG="Install-Logs/01-Hyprland-Install-Scripts-$(date +%d-%H%M%S).log"
 # Check if running as root. If root, script will exit
 if [[ $EUID -eq 0 ]]; then
-    echo "${ERROR}  This script should ${WARNING}NOT${RESET} be executed as root!! Exiting......." | tee -a "$LOG"
+    echo "This script should not be executed as root! Exiting......."
    printf "\n%.0s" {1..2}
    exit 1
 fi
 clear
 # Function to check if the system is Ubuntu
 is_ubuntu() {
    # Check for 'Ubuntu' in /etc/os-release
@ -97,56 +21,116 @@ is_ubuntu() {
 # Check if the system is Ubuntu
 if is_ubuntu; then
-    echo "${WARN}This script is ${WARNING}NOT intended for Ubuntu / Ubuntu Based${RESET}. Refer to ${YELLOW}README for the correct link for Ubuntu-Hyprland project${RESET}" | tee -a "$LOG"
+    echo "This script is NOT intended for Ubuntu / Ubuntu Based. Refer to README for the correct link for Ubuntu-Hyprland project."
    exit 1
 fi
-# install whiptails if detected not installed. Necessary for this version
+clear
 if ! command -v whiptail >/dev/null; then
    echo "${NOTE} - whiptail is not installed. Installing..." | tee -a "$LOG"
    sudo apt install -y whiptail
    printf "\n%.0s" {1..1}
 fi
 # ASCII art
 printf "\n%.0s" {1..3}
 echo "   |  _.   |/  _   _  |  o _|_ "
 echo " \_| (_| o |\ (_) (_) |_ |  |_ "
 printf "\n%.0s" {1..2}
 echo -e "\e[35m
 	╦╔═┌─┐┌─┐╦    ╦ ╦┬ ┬┌─┐┬─┐┬  ┌─┐┌┐┌┌┬┐
 	╠╩╗│ ││ │║    ╠═╣└┬┘├─┘├┬┘│  ├─┤│││ ││ July 2025
 	╩ ╩└─┘└─┘╩═╝  ╩ ╩ ┴ ┴  ┴└─┴─┘┴ ┴┘└┘─┴┘ Debian Trixie / SiD
 \e[0m"
 printf "\n%.0s" {1..1}
-# Welcome message using whiptail (for displaying information)
+# Welcome message
-whiptail --title "KooL Debian-Hyprland Trixie+ (2025) Install Script" \
+echo "$(tput setaf 6)Welcome to JaKooLit's Debian Trixie/SID Hyprland Install Script!$(tput sgr0)"
-    --msgbox "Welcome to KooL Debian-Hyprland Trixie+  (2025) Install Script!!!\n\n\
+echo
-ATTENTION: Run a full system update and Reboot first !!! (Highly Recommended)\n\n\
+echo "$(tput setaf 166)ATTENTION: Run a full system update and reboot first!! (Highly Recommended)$(tput sgr0)"
-NOTE: If you are installing on a VM, ensure to enable 3D acceleration otherwise Hyprland may NOT start!" \
+echo
-    15 80
+echo "$(tput setaf 3)NOTE: You will be required to answer some questions during the installation!$(tput sgr0)"
 echo
 echo "$(tput setaf 3)NOTE: If you are installing on a VM, ensure to enable 3D acceleration; otherwise, Hyprland won't start!$(tput sgr0)"
 echo
-# Ask if the user wants to proceed
+# Prompt user to proceed
-if ! whiptail --title "Proceed with Installation?" \
+read -p "$(tput setaf 6)Would you like to proceed? (y/n): $(tput sgr0)" proceed
-    --yesno "VERY IMPORTANT!!!\n\nYou must be able to install from source by uncommenting deb-src on /etc/apt/sources.list else script may fail to install Hyprland.\n\n\nShall we proceed?" 15 60; then
+
-    echo -e "\n"
+if [[ "$proceed" != "y" ]]; then
-    echo "❌ ${INFO} You 🫵 chose ${YELLOW}NOT${RESET} to proceed. ${YELLOW}Exiting...${RESET}" | tee -a "$LOG"
+    echo "Installation aborted."
    echo -e "\n"
    exit 1
 fi
 echo "👌 ${OK} 🇵🇭 ${MAGENTA}KooL..${RESET} ${SKY_BLUE}lets continue with the installation...${RESET}" | tee -a "$LOG"
-sleep 1
+read -p "$(tput setaf 6)Have you edited your /etc/apt/sources.list? [Very Important] (y/n): $(tput sgr0)" proceed2
 printf "\n%.0s" {1..1}
-# install pciutils if detected not installed. Necessary for detecting GPU
+if [ "$proceed2" != "y" ]; then
-if ! dpkg -l | grep -w pciutils >/dev/null; then
+    echo "Installation aborted Kindly edit your sources.list first. Refer to readme."
-    echo "pciutils is not installed. Installing..." | tee -a "$LOG"
+    exit 1
    sudo apt install -y pciutils
    printf "\n%.0s" {1..1}
 fi
-# Path to the install-scripts directory
+# Create Directory for Install Logs
 if [ ! -d Install-Logs ]; then
    mkdir Install-Logs
 fi
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
 ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
 NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
 WARN="$(tput setaf 1)[WARN]$(tput sgr0)"
 CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
 MAGENTA=$(tput setaf 5)
 WARNING=$(tput setaf 1)
 YELLOW=$(tput setaf 3)
 RESET=$(tput sgr0)
 # Function to colorize prompts
 colorize_prompt() {
    local color="$1"
    local message="$2"
    echo -n "${color}${message}$(tput sgr0)"
 }
 # Set the name of the log file to include the current date and time
 LOG="install-$(date +%d-%H%M%S).log"
 # Initialize variables to store user responses
 bluetooth=""
 dots=""
 gtk_themes=""
 nvidia=""
 nwg=""
 rog=""
 sddm=""
 thunar=""
 xdph=""
 zsh=""
 # Export PKG_CONFIG_PATH for libinput
 export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
 # Define the directory where your scripts are located
 script_directory=install-scripts
 # Function to ask a yes/no question and set the response in a variable
 ask_yes_no() {
    while true; do
        read -p "$(colorize_prompt "$CAT"  "$1 (y/n): ")" choice
        case "$choice" in
            [Yy]* ) eval "$2='Y'"; return 0;;
            [Nn]* ) eval "$2='N'"; return 1;;
            * ) echo "Please answer with y or n.";;
        esac
    done
 }
 # Function to ask a custom question with specific options and set the response in a variable
 ask_custom_option() {
    local prompt="$1"
    local valid_options="$2"
    local response_var="$3"
    while true; do
        read -p "$(colorize_prompt "$CAT"  "$prompt ($valid_options): ")" choice
        if [[ " $valid_options " == *" $choice "* ]]; then
            eval "$response_var='$choice'"
            return 0
        else
            echo "Please choose one of the provided options: $valid_options"
        fi
    done
 }
 # Function to execute a script if it exists and make it executable
 execute_script() {
    local script="$1"
@ -154,365 +138,142 @@ execute_script() {
    if [ -f "$script_path" ]; then
        chmod +x "$script_path"
        if [ -x "$script_path" ]; then
-            env "$script_path"
+            "$script_path"
        else
-            echo "Failed to make script '$script' executable." | tee -a "$LOG"
+            echo "Failed to make script '$script' executable."
        fi
    else
-        echo "Script '$script' not found in '$script_directory'." | tee -a "$LOG"
+        echo "Script '$script' not found in '$script_directory'."
    fi
 }
-# Load centralized Hyprland stack tags if present and export for child scripts
+# Collect user responses to all questions
-if [ -f "./hypr-tags.env" ]; then
+printf "\n"
-    # shellcheck disable=SC1091
+ask_yes_no "-Do you have any nvidia gpu in your system?" nvidia
-    source "./hypr-tags.env"
+printf "\n"
-    # If core tags are set to auto/latest, refresh to resolve concrete versions
+ask_yes_no "-Install GTK themes (required for Dark/Light function)?" gtk_themes
-    if [ "${HYPRUTILS_TAG:-}" = "auto" ] || [ "${HYPRUTILS_TAG:-}" = "latest" ] || [ -z "${HYPRUTILS_TAG:-}" ] ||
+printf "\n"
-        [ "${HYPRLANG_TAG:-}" = "auto" ] || [ "${HYPRLANG_TAG:-}" = "latest" ] || [ -z "${HYPRLANG_TAG:-}" ]; then
+ask_yes_no "-Do you want to configure Bluetooth?" bluetooth
-        if [ -f ./refresh-hypr-tags.sh ]; then
+printf "\n"
-            chmod +x ./refresh-hypr-tags.sh || true
+ask_yes_no "-Do you want to install Thunar file manager?" thunar
-            ./refresh-hypr-tags.sh
+printf "\n"
-            # reload after refresh
+ask_yes_no "-Install AGS (aylur's gtk shell) v1 for Desktop Like Overview?" ags
-            # shellcheck disable=SC1091
+printf "\n"
-            source "./hypr-tags.env"
+ask_yes_no "-Install & configure SDDM log-in Manager plus (OPTIONAL) SDDM Theme?" sddm
-        fi
+printf "\n"
-    fi
+ask_yes_no "-Install XDG-DESKTOP-PORTAL-HYPRLAND? (For proper Screen Share ie OBS)" xdph
-    export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_TAG WAYLAND_PROTOCOLS_TAG
+printf "\n"
-fi
+ask_yes_no "-Install zsh & oh-my-zsh plus (OPTIONAL) pokemon-colorscripts for tty?" zsh
 printf "\n"
-#################
+# 14 Sep 2024, now in Debian repo
-## Default values for the options (will be overwritten by preset file if available)
+#ask_yes_no "-Install nwg-look? (a GTK Theming app - lxappearance-like) WARN! This Package Takes long time to build!" nwg
-gtk_themes="OFF"
+#printf "\n"
 bluetooth="OFF"
 thunar="OFF"
 ags="OFF"
 sddm="OFF"
 sddm_theme="OFF"
 xdph="OFF"
 zsh="OFF"
 pokemon="OFF"
 rog="OFF"
 dots="OFF"
 input_group="OFF"
 nvidia="OFF"
-# Function to load preset file
+ask_yes_no "-Installing on Asus ROG Laptops?" rog
-load_preset() {
+printf "\n"
-    if [ -f "$1" ]; then
+ask_yes_no "-Do you want to download and install pre-configured Hyprland-dotfiles?" dots
-        echo "✅ Loading preset: $1"
+printf "\n"
        source "$1"
    else
        echo "⚠️ Preset file not found: $1. Using default values."
    fi
 }
-# Check if --preset argument is passed
+# Ensuring all in the scripts folder are made executable
-if [[ "$1" == "--preset" && -n "$2" ]]; then
+chmod +x install-scripts/*
    load_preset "$2"
 fi
-# List of services to check for active login managers
+printf "\n%.0s" {1..3}
-services=("gdm.service" "gdm3.service" "lightdm.service" "lxdm.service")
+# check if any known login managers are active when users choose to install sddm
 if [ "$sddm" == "Y" ]; then
    # List of services to check
    services=("gdm.service" "gdm3.service" "lightdm.service" "xdm.service" "lxdm.service")
-# Function to check if any login services are active
+    # Loop through each service
 check_services_running() {
    active_services=() # Array to store active services
    for svc in "${services[@]}"; do
        if systemctl is-active --quiet "$svc"; then
-            active_services+=("$svc")
+            echo "${ERROR} $svc is active. Please stop or disable it first or do not choose SDDM to install."
            echo "${NOTE} If you have GDM, no need to install SDDM. GDM will work fine as Login Manager for Hyprland."
            printf "\n%.0s" {1..3}
            exit 1  
        fi
    done
    if [ ${#active_services[@]} -gt 0 ]; then
        return 0
    else
        return 1
    fi
 }
 if check_services_running; then
    active_list=$(printf "%s\n" "${active_services[@]}")
    # Display the active login manager(s) in the whiptail message box
    whiptail --title "Active non-SDDM login manager(s) detected" \
        --msgbox "The following login manager(s) are active:\n\n$active_list\n\nIf you want to install SDDM and SDDM theme, stop and disable first the active services above, and reboot before running this script\nRefer to README on switching to SDDM if you really want SDDM\n\nNOTE: Your option to install SDDM and SDDM theme has now been removed\n\n- Ja " 28 80
 fi
 # Check if NVIDIA GPU is detected
 nvidia_detected=false
 if lspci | grep -i "nvidia" &>/dev/null; then
    nvidia_detected=true
    whiptail --title "NVIDIA GPU Detected" --msgbox "NVIDIA GPU detected in your system.\n\nNOTE: The script will install nvidia-dkms, nvidia-utils, and nvidia-settings if you choose to configure." 12 60
 fi
 # Initialize the options array for whiptail checklist
 options_command=(
    whiptail --title "Select Options" --checklist "Choose options to install or configure\nNOTE: 'SPACEBAR' to select & 'TAB' key to change selection" 28 85 20
 )
 # Add NVIDIA options if detected
 if [ "$nvidia_detected" == "true" ]; then
    options_command+=(
        "nvidia" "Do you want script to configure NVIDIA GPU?" "OFF"
    )
 fi
 # Check if user is already in the 'input' group
 input_group_detected=false
 if ! groups "$(whoami)" | grep -q '\binput\b'; then
    input_group_detected=true
    whiptail --title "Input Group" --msgbox "You are not currently in the input group.\n\nAdding you to the input group might be necessary for the Waybar keyboard-state functionality." 12 60
 fi
 # Add 'input_group' option if user is not in input group
 if [ "$input_group_detected" == "true" ]; then
    options_command+=(
        "input_group" "Add your USER to input group for some waybar functionality?" "OFF"
    )
 fi
 # Conditionally add SDDM and SDDM theme options if no active login manager is found
 if ! check_services_running; then
    options_command+=(
        "sddm" "Install & configure SDDM login manager?" "OFF"
        "sddm_theme" "Download & Install Additional SDDM theme?" "OFF"
    )
 fi
 # Add the remaining static options
 options_command+=(
    "gtk_themes" "Install GTK themes (required for Dark/Light function)" "OFF"
    "bluetooth" "Do you want script to configure Bluetooth?" "OFF"
    "thunar" "Do you want Thunar file manager to be installed?" "OFF"
    "ags" "Install AGS v1 for Desktop-Like Overview" "OFF"
    "xdph" "Install XDG-DESKTOP-PORTAL-HYPRLAND (for screen share)?" "OFF"
    "zsh" "Install zsh shell with Oh-My-Zsh?" "OFF"
    "pokemon" "Add Pokemon color scripts to your terminal?" "OFF"
    "rog" "Are you installing on Asus ROG laptops?" "OFF"
    "dots" "Download and install pre-configured KooL Hyprland dotfiles?" "OFF"
 )
 # Capture the selected options before the while loop starts
 while true; do
    selected_options=$("${options_command[@]}" 3>&1 1>&2 2>&3)
    # Check if the user pressed Cancel (exit status 1)
    if [ $? -ne 0 ]; then
        echo -e "\n"
        echo "❌ ${INFO} You 🫵 cancelled the selection. ${YELLOW}Goodbye!${RESET}" | tee -a "$LOG"
        exit 0 # Exit the script if Cancel is pressed
    fi
    # If no option was selected, notify and restart the selection
    if [ -z "$selected_options" ]; then
        whiptail --title "Warning" --msgbox "No options were selected. Please select at least one option." 10 60
        continue # Return to selection if no options selected
    fi
    # Strip the quotes and trim spaces if necessary (sanitize the input)
    selected_options=$(echo "$selected_options" | tr -d '"' | tr -s ' ')
    # Convert selected options into an array (preserving spaces in values)
    IFS=' ' read -r -a options <<<"$selected_options"
    # Check if the "dots" option was selected
    dots_selected="OFF"
    for option in "${options[@]}"; do
        if [[ "$option" == "dots" ]]; then
            dots_selected="ON"
            break
        fi
    done
    # If "dots" is not selected, show a note and ask the user to proceed or return to choices
    if [[ "$dots_selected" == "OFF" ]]; then
        # Show a note about not selecting the "dots" option
        if ! whiptail --title "KooL Hyprland Dot Files" --yesno \
            "You have not selected to install the pre-configured KooL Hyprland dotfiles.\n\nKindly NOTE that if you proceed without Dots, Hyprland will start with default vanilla Hyprland configuration and I won't be able to give you support.\n\nWould you like to continue install without KooL Hyprland Dots or return to choices/options?" \
            --yes-button "Continue" --no-button "Return" 15 90; then
            echo "🔙 Returning to options..." | tee -a "$LOG"
            continue
        else
            # User chose to continue
            echo "${INFO} ⚠️ Continuing WITHOUT the dotfiles installation..." | tee -a "$LOG"
            printf "\n%.0s" {1..1}
        fi
    fi
    # Prepare the confirmation message
    confirm_message="You have selected the following options:\n\n"
    for option in "${options[@]}"; do
        confirm_message+=" - $option\n"
    done
    confirm_message+="\nAre you happy with these choices?"
    # Confirmation prompt
    if ! whiptail --title "Confirm Your Choices" --yesno "$(printf "%s" "$confirm_message")" 25 80; then
        echo -e "\n"
        echo "❌ ${SKY_BLUE}You're not 🫵 happy${RESET}. ${YELLOW}Returning to options...${RESET}" | tee -a "$LOG"
        continue
    fi
    echo "👌 ${OK} You confirmed your choices. Proceeding with ${SKY_BLUE}KooL 🇵🇭 Hyprland Installation...${RESET}" | tee -a "$LOG"
    break
 done
 printf "\n%.0s" {1..1}
 echo "${INFO} Running a ${SKY_BLUE}full system update...${RESET}" | tee -a "$LOG"
 sudo apt update
 sleep 1
 sudo apt update
 # execute pre clean up
 execute_script "02-pre-cleanup.sh"
-echo "${INFO} Installing ${SKY_BLUE}necessary dependencies...${RESET}" | tee -a "$LOG"
+# Install hyprland packages
 sleep 1
 execute_script "00-dependencies.sh"
 echo "${INFO} Installing ${SKY_BLUE}necessary fonts...${RESET}" | tee -a "$LOG"
 sleep 1
 execute_script "fonts.sh"
 # Optional: refresh tags before building the Hyprland stack
 # Set FETCH_LATEST=1 to opt-in (default is no-refresh to honor pinned tags)
 if [ "${FETCH_LATEST:-0}" = "1" ] && [ -f ./refresh-hypr-tags.sh ]; then
    chmod +x ./refresh-hypr-tags.sh || true
    ./refresh-hypr-tags.sh
 fi
 echo "${INFO} Installing ${SKY_BLUE}KooL Hyprland packages...${RESET}" | tee -a "$LOG"
 sleep 1
 execute_script "01-hypr-pkgs.sh"
-sleep 1
+execute_script "fonts.sh"
 execute_script "hyprutils.sh"
 sleep 1
 execute_script "hyprlang.sh"
 sleep 1
 execute_script "hyprcursor.sh"
 sleep 1
 execute_script "hyprwayland-scanner.sh"
 sleep 1
 execute_script "hyprgraphics.sh"
 sleep 1
 execute_script "aquamarine.sh"
 sleep 1
 execute_script "hyprland-qt-support.sh"
 sleep 1
 execute_script "hyprtoolkit.sh"
 sleep 1
 execute_script "hyprland-guiutils.sh"
 sleep 1
 execute_script "hyprland-protocols.sh"
 sleep 1
 # Ensure wayland-protocols (from source) is installed to satisfy Hyprland's >= 1.45 requirement
 execute_script "wayland-protocols-src.sh"
 sleep 1
 execute_script "xkbcommon.sh"
 sleep 1
 execute_script "hyprland.sh"
 sleep 1
 execute_script "hyprpolkitagent.sh"
 sleep 1
 execute_script "wallust.sh"
 sleep 1
 execute_script "swww.sh"
 sleep 1
 execute_script "rofi-wayland.sh"
 sleep 1
 execute_script "hyprlock.sh"
 sleep 1
 execute_script "hypridle.sh"
 #execute_script "imagemagick.sh" #this is for compiling from source. 07 Sep 2024
-# execute_script "waybar-git.sh" only if waybar on repo is old
+
 execute_script "swww.sh"
 execute_script "rofi-wayland.sh"
 sleep 1
-# Clean up the selected options (remove quotes and trim spaces)
+execute_script "hyprland.sh"
-selected_options=$(echo "$selected_options" | tr -d '"' | tr -s ' ')
+execute_script "hyprlock.sh"
 execute_script "hypridle.sh"
 # execute_script "waybar-git.sh" only if waybar on repo is old
 # Convert selected options into an array (splitting by spaces)
 IFS=' ' read -r -a options <<<"$selected_options"
-# Loop through selected options
+if [ "$nvidia" == "Y" ]; then
-for option in "${options[@]}"; do
+    execute_script "nvidia.sh"
-    case "$option" in
+fi
-    sddm)
+
-        if check_services_running; then
+if [ "$gtk_themes" == "Y" ]; then
-            active_list=$(printf "%s\n" "${active_services[@]}")
+    execute_script "gtk_themes.sh"
-            whiptail --title "Error" --msgbox "One of the following login services is running:\n$active_list\n\nPlease stop & disable it or DO not choose SDDM." 12 60
+fi
-            exec "$0"
+
-        else
+if [ "$bluetooth" == "Y" ]; then
-            echo "${INFO} Installing and configuring ${SKY_BLUE}SDDM...${RESET}" | tee -a "$LOG"
+    execute_script "bluetooth.sh"
 fi
 if [ "$thunar" == "Y" ]; then
    execute_script "thunar.sh"
 fi
 if [ "$ags" == "Y" ]; then
    execute_script "ags.sh"
 fi
 if [ "$sddm" == "Y" ]; then
    execute_script "sddm.sh"
 fi
        ;;
    nvidia)
        echo "${INFO} Configuring ${SKY_BLUE}nvidia stuff${RESET}" | tee -a "$LOG"
        execute_script "nvidia.sh"
        ;;
    gtk_themes)
        echo "${INFO} Installing ${SKY_BLUE}GTK themes...${RESET}" | tee -a "$LOG"
        execute_script "gtk_themes.sh"
        ;;
    input_group)
        echo "${INFO} Adding user into ${SKY_BLUE}input group...${RESET}" | tee -a "$LOG"
        execute_script "InputGroup.sh"
        ;;
    ags)
        echo "${INFO} Installing ${SKY_BLUE}AGS v1 for Desktop Overview...${RESET}" | tee -a "$LOG"
        execute_script "ags.sh"
        ;;
    xdph)
        echo "${INFO} Installing ${SKY_BLUE}xdg-desktop-portal-hyprland...${RESET}" | tee -a "$LOG"
        execute_script "xdph.sh"
        ;;
    bluetooth)
        echo "${INFO} Configuring ${SKY_BLUE}Bluetooth...${RESET}" | tee -a "$LOG"
        execute_script "bluetooth.sh"
        ;;
    thunar)
        echo "${INFO} Installing ${SKY_BLUE}Thunar file manager...${RESET}" | tee -a "$LOG"
        execute_script "thunar.sh"
        execute_script "thunar_default.sh"
        ;;
    sddm_theme)
        echo "${INFO} Downloading & Installing ${SKY_BLUE}Additional SDDM theme...${RESET}" | tee -a "$LOG"
        execute_script "sddm_theme.sh"
        ;;
    zsh)
        echo "${INFO} Installing ${SKY_BLUE}zsh with Oh-My-Zsh...${RESET}" | tee -a "$LOG"
        execute_script "zsh.sh"
        ;;
    pokemon)
        echo "${INFO} Adding ${SKY_BLUE}Pokemon color scripts to terminal...${RESET}" | tee -a "$LOG"
        execute_script "zsh_pokemon.sh"
        ;;
    rog)
        echo "${INFO} Installing ${SKY_BLUE}ROG laptop packages...${RESET}" | tee -a "$LOG"
        execute_script "rog.sh"
        ;;
    dots)
        echo "${INFO} Installing pre-configured ${SKY_BLUE}KooL Hyprland dotfiles...${RESET}" | tee -a "$LOG"
        execute_script "dotfiles-branch.sh"
        ;;
    *)
        echo "Unknown option: $option" | tee -a "$LOG"
        ;;
    esac
 done
-# Perform cleanup
+if [ "$xdph" == "Y" ]; then
-printf "\n${OK} Performing some clean up.\n"
+    execute_script "xdph.sh"
-files_to_delete=("JetBrainsMono.tar.xz" "VictorMonoAll.zip" "FantasqueSansMono.zip")
+fi
-for file in "${files_to_delete[@]}"; do
+
-    if [ -e "$file" ]; then
+if [ "$zsh" == "Y" ]; then
-        echo "$file found. Deleting..." | tee -a "$LOG"
+    execute_script "zsh.sh"
-        rm "$file"
+fi
-        echo "$file deleted successfully." | tee -a "$LOG"
+
 #if [ "$nwg" == "Y" ]; then
 #    execute_script "nwg-look.sh"
 #fi
 if [ "$rog" == "Y" ]; then
    execute_script "rog.sh"
 fi
 execute_script "InputGroup.sh"
 if [ "$dots" == "Y" ]; then
    execute_script "dotfiles-branch.sh"
 fi
 # Clean up
 printf "\n${OK} performing some clean up.\n"
 if [ -e "JetBrainsMono.tar.xz" ]; then
    echo "JetBrainsMono.tar.xz found. Deleting..."
    rm JetBrainsMono.tar.xz
    echo "JetBrainsMono.tar.xz deleted successfully."
 fi
 done
 clear
@ -527,46 +288,27 @@ execute_script "03-Final-Check.sh"
 printf "\n%.0s" {1..1}
-# Check if either hyprland or Hyprland files exist in /usr/local/bin/
+# Check if either hyprland or hyprland-git is installed
-if [ -e /usr/local/bin/hyprland ] || [ -f /usr/local/bin/Hyprland ]; then
+if dpkg -l | grep -qw hyprland; then
-    printf "\n ${OK} 👌 Hyprland is installed. However, some essential packages may not be installed. Please see above!"
+    printf "\n${OK} Hyprland is installed. However, some essential packages may not be installed Please see above!"
-    printf "\n${CAT} Ignore this message if it states ${YELLOW}All essential packages${RESET} are installed as per above\n"
+    printf "\n${CAT} Ignore this message if it states 'All essential packages are installed.'\n"
    sleep 2
-    printf "\n%.0s" {1..2}
+    printf "\n${NOTE} You can start Hyprland by typing 'Hyprland' (IF SDDM is not installed) (note the capital H!).\n"
    printf "\n${NOTE} However, it is highly recommended to reboot your system.\n\n"
-    printf "${SKY_BLUE}Thank you${RESET} 🫰 for using 🇵🇭 ${MAGENTA}KooL's Hyprland Dots${RESET}. ${YELLOW}Enjoy and Have a good day!${RESET}"
+    # Prompt user to reboot
-    printf "\n%.0s" {1..2}
+    read -rp "${CAT} Would you like to reboot now? (y/n): " HYP
-    printf "\n${NOTE} You can start Hyprland by typing ${SKY_BLUE}Hyprland${RESET} (IF SDDM is not installed) (note the capital H!).\n"
+    # Check if the user answered 'y' or 'Y'
-    printf "\n${NOTE} However, it is ${YELLOW}highly recommended to reboot${RESET} your system.\n\n"
+    if [[ "$HYP" =~ ^[Yy]$ ]]; then
-
+        if [[ "$nvidia" == "Y" ]]; then
-    while true; do
+            echo "${NOTE} NVIDIA GPU detected. Rebooting the system..."
-        echo -n "${CAT} Would you like to reboot now? (y/n): "
+        fi
        read HYP
        HYP=$(echo "$HYP" | tr '[:upper:]' '[:lower:]')
        if [[ "$HYP" == "y" || "$HYP" == "yes" ]]; then
            echo "${INFO} Rebooting now..."
        systemctl reboot
            break
        elif [[ "$HYP" == "n" || "$HYP" == "no" ]]; then
            echo "👌 ${OK} You chose NOT to reboot"
            printf "\n%.0s" {1..1}
            # Check if NVIDIA GPU is present
            if lspci | grep -i "nvidia" &>/dev/null; then
                echo "${INFO} HOWEVER ${YELLOW}NVIDIA GPU${RESET} detected. Reminder that you must REBOOT your SYSTEM..."
                printf "\n%.0s" {1..1}
    fi
            break
        else
            echo "${WARN} Invalid response. Please answer with 'y' or 'n'."
        fi
    done
 else
    # Print error message if neither package is installed
-    printf "\n${WARN} Hyprland is NOT installed. Please check 00_CHECK-time_installed.log and other files in the Install-Logs/ directory..."
+    printf "\n${WARN} Hyprland failed to install. Please check 00_CHECK-time_installed.log and other files Install-Logs/ directory...\n\n"
    printf "\n%.0s" {1..3}
    exit 1
 fi
 printf "\n%.0s" {1..2}
--- a/preset.sh
+++ b/preset.sh
@ -1,46 +0,0 @@
 # 💫 https://github.com/JaKooLit 💫 #
 # Define the options you want to preselect (either ON or OFF)
 # IMPORTANT: answer should be inside ""
 ### Script will install nvidia-dkms nvidia-utils & nvidia-settings
 ###-Would you like script to Configure NVIDIA for you?
 nvidia="OFF"
 ###-Install GTK themes (required for Dark/Light function)?
 gtk_themes="ON"
 ###-Do you want to configure Bluetooth?
 bluetooth="ON"
 ###-Do you want to install Thunar file manager?
 thunar="ON"
 ### Adding user to the 'input' group might be necessary for waybar keyboard-state functionality
 input_group="ON"
 ### Desktop overview Demo Link in README
 ### Desktop overview Demo Link in README
 ### Install AGS (aylur's GTK shell) v1 for Desktop-Like Overview?" 
 ags="ON"
 ###-Install & configure SDDM log-in Manager
 sddm="ON"
 ### install and download SDDM themes
 sddm_theme="ON"
 ###-Install XDG-DESKTOP-PORTAL-HYPRLAND? (For proper Screen Share ie OBS)
 xdph="ON"
 ### Shell extension. Bash alternative
 ###-Install zsh, oh-my-zsh
 zsh="ON"
 ### add Pokemon color scripts to terminal 
 pokemon="ON"
 ### This will install ASUSCTL & SUPERGFXCTL
 ###-Installing on Asus ROG Laptops?
 rog="OFF"
 ###-Download and Add pre-configured Hyprland dotfiles?
 dots="ON"
--- a/refresh-hypr-tags.sh
+++ b/refresh-hypr-tags.sh
@ -1,92 +0,0 @@
 #!/usr/bin/env bash
 # Refresh hypr-tags.env with latest release tags from upstream
 # Safe to run multiple times; creates timestamped backups
 set -euo pipefail
 REPO_ROOT=$(pwd)
 TAGS_FILE="$REPO_ROOT/hypr-tags.env"
 LOG_DIR="$REPO_ROOT/Install-Logs"
 mkdir -p "$LOG_DIR"
 TS=$(date +%F-%H%M%S)
 SUMMARY_LOG="$LOG_DIR/refresh-tags-$TS.log"
 # Ensure tags file exists
 if [[ ! -f "$TAGS_FILE" ]]; then
  cat > "$TAGS_FILE" <<'EOF'
 HYPRLAND_TAG=v0.51.1
 AQUAMARINE_TAG=v0.9.3
 HYPRUTILS_TAG=v0.8.2
 HYPRLANG_TAG=v0.6.4
 HYPRGRAPHICS_TAG=v0.1.5
 HYPRWAYLAND_SCANNER_TAG=v0.4.5
 HYPRLAND_PROTOCOLS_TAG=v0.6.4
 HYPRLAND_QT_SUPPORT_TAG=v0.1.0
 HYPRLAND_QTUTILS_TAG=v0.1.4
 WAYLAND_PROTOCOLS_TAG=1.45
 EOF
 fi
 # Backup
 cp "$TAGS_FILE" "$TAGS_FILE.bak-$TS"
 echo "[INFO] Backed up $TAGS_FILE to $TAGS_FILE.bak-$TS" | tee -a "$SUMMARY_LOG"
 if ! command -v curl >/dev/null 2>&1; then
  echo "[ERROR] curl is required to refresh tags" | tee -a "$SUMMARY_LOG"
  exit 1
 fi
 # Map of env var -> repo
 declare -A repos=(
  [HYPRLAND_TAG]="hyprwm/Hyprland"
  [AQUAMARINE_TAG]="hyprwm/aquamarine"
  [HYPRUTILS_TAG]="hyprwm/hyprutils"
  [HYPRLANG_TAG]="hyprwm/hyprlang"
  [HYPRGRAPHICS_TAG]="hyprwm/hyprgraphics"
  [HYPRWAYLAND_SCANNER_TAG]="hyprwm/hyprwayland-scanner"
  [HYPRLAND_PROTOCOLS_TAG]="hyprwm/hyprland-protocols"
  [HYPRLAND_QT_SUPPORT_TAG]="hyprwm/hyprland-qt-support"
  [HYPRLAND_QTUTILS_TAG]="hyprwm/hyprland-qtutils"
 )
 # Read existing
 declare -A cur
 while IFS='=' read -r k v; do
  [[ -z "${k:-}" || "$k" =~ ^# ]] && continue
  cur[$k]="$v"
 edone < "$TAGS_FILE"
 # Fetch latest, but only update keys set to 'auto' or 'latest' unless forced
 FORCE=${FORCE:-0}
 for key in "${!repos[@]}"; do
  repo="${repos[$key]}"
  url="https://api.github.com/repos/$repo/releases/latest"
  echo "[INFO] Checking latest tag for $repo" | tee -a "$SUMMARY_LOG"
  body=$(curl -fsSL "$url" || true)
  [[ -z "$body" ]] && { echo "[WARN] Empty response for $repo" | tee -a "$SUMMARY_LOG"; continue; }
  if command -v jq >/dev/null 2>&1; then
    tag=$(printf '%s' "$body" | jq -r '.tag_name // empty')
  else
    tag=$(printf '%s' "$body" | grep -m1 '"tag_name"' | sed -E 's/.*"tag_name"\s*:\s*"([^"]+)".*/\1/')
  fi
  if [[ -z "$tag" ]]; then
    echo "[WARN] Could not parse tag for $repo" | tee -a "$SUMMARY_LOG"
    continue
  fi
  existing="${cur[$key]:-}"
  if [[ $FORCE -eq 1 ]] || [[ "$existing" =~ ^(auto|latest)$ ]] || [[ -z "$existing" ]]; then
    cur[$key]="$tag"
    echo "[OK] $key := $tag" | tee -a "$SUMMARY_LOG"
  else
    echo "[SKIP] $key pinned ($existing), not overriding" | tee -a "$SUMMARY_LOG"
  fi
 done
 # Write back
 {
  for k in "${!cur[@]}"; do
    echo "$k=${cur[$k]}"
  done | sort
 } > "$TAGS_FILE"
 echo "[OK] Refreshed tags written to $TAGS_FILE" | tee -a "$SUMMARY_LOG"
--- a/uninstall.sh
+++ b/uninstall.sh
@ -1,255 +0,0 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
 # KooL Debian-Hyprland uninstall script #
 clear
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
 ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
 NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
 INFO="$(tput setaf 4)[INFO]$(tput sgr0)"
 WARN="$(tput setaf 1)[WARN]$(tput sgr0)"
 CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
 MAGENTA="$(tput setaf 5)"
 ORANGE="$(tput setaf 214)"
 WARNING="$(tput setaf 1)"
 YELLOW="$(tput setaf 3)"
 GREEN="$(tput setaf 2)"
 BLUE="$(tput setaf 4)"
 SKY_BLUE="$(tput setaf 6)"
 RESET="$(tput sgr0)"
 printf "\n%.0s" {1..2}
 echo -e "\e[35m
 	╦╔═┌─┐┌─┐╦    ╦ ╦┬ ┬┌─┐┬─┐┬  ┌─┐┌┐┌┌┬┐
 	╠╩╗│ ││ │║    ╠═╣└┬┘├─┘├┬┘│  ├─┤│││ ││ UNINSTALL
 	╩ ╩└─┘└─┘╩═╝  ╩ ╩ ┴ ┴  ┴└─┴─┘┴ ┴┘└┘─┴┘ Debian
 \e[0m"
 printf "\n%.0s" {1..1}
 # Show welcome message using whiptail with Yes/No options
 whiptail --title "Debian-Hyprland KooL Dots Uninstall Script" --yesno \
 "Hello! This script will uninstall KooL Hyprland packages and configs.
 You can choose packages and directories you want to remove.
 NOTE: This will remove configs from ~/.config
 WARNING: After uninstallation, your system may become unstable.
 Shall we Proceed?" 20 80
 if [ $? -eq 1 ]; then
    echo "$INFO uninstall process canceled."
    exit 0
 fi
 # Function to remove selected packages on Debian/Ubuntu
 remove_packages() {
    local selected_packages_file=$1
    while read -r package; do
        # Check if the package is installed using dpkg (apt's underlying tool)
        if dpkg -l | grep -q "^ii  $package "; then
            echo "Removing package: $package"
            if ! sudo apt remove -y "$package"; then
                echo "$ERROR Failed to remove package: $package"
            else
                echo "$OK Successfully removed package: $package"
            fi
        else
            echo "$INFO Package ${YELLOW}$package${RESET} not found. Skipping."
        fi
    done < "$selected_packages_file"
 }
 # Function to remove selected directories
 remove_directories() {
    local selected_dirs_file=$1
    while read -r dir; do
        pattern="$HOME/.config/$dir*"        
        # Loop through directories matching the pattern
        for dir_to_remove in $pattern; do
            if [ -d "$dir_to_remove" ]; then
                echo "Removing directory: $dir_to_remove"
                if ! rm -rf "$dir_to_remove"; then
                    echo "$ERROR Failed to remove directory: $dir_to_remove"
                else
                    echo "$OK Successfully removed directory: $dir_to_remove"
                fi
            else
                echo "$INFO Directory ${YELLOW}$dir_to_remove${RESET} not found. Skipping."
            fi
        done
    done < "$selected_dirs_file"
 }
 # Define the list of packages to choose from (with options_command tags)
 packages=(
    "btop" "resource monitor" "off"
    "brightnessctl" "brightnessctl" "off"
    "cava" "Cross-platform Audio Visualizer" "off"
    "cliphist" "clipboard manager" "off"
    "fastfetch" "fastfetch" "off"
    "ffmpegthumbnailer" "FFmpeg Thumbnailer" "off"
    "grim" "screenshot tool" "off"
    "polkit-kde-agent-1" "polkit agent" "off"
    "imagemagick" "Image manipulation tool" "off"
    "kitty" "kitty-terminal" "off"
    "qt5-style-kvantum" "QT apps theming" "off"
    "qt5-style-kvantum-themes" "QT apps theming" "off"
    "mousepad" "simple text editor" "off"
    "mpv" "multi-media player" "off"
    "mpv-mpris" "mpv-plugin" "off"
    "nvtop" "gpu resource monitor" "off"
    "nwg-displays" "display monitor configuration app" "off"
    "nwg-look" "gtk settings app" "off"
    "pamixer" "pamixer" "off"
    "pavucontrol" "pavucontrol" "off"
    "playerctl" "playerctl" "off"
    "qalculate-gtk" "calculater - QT" "off"
    "qt5ct" "qt5ct" "off"
    "qt6-svg" "qt6-svg" "off"
    "qt6ct" "qt6ct" "off"
    "slurp" "screenshot tool" "off"
    "swappy" "screenshot tool" "off"
    "sway-notification-center" "notification agent" "off"
    "swww" "wallpaper engine" "off"
    "thunar" "File Manager" "off"
    "thunar-archive-plugin" "Archive Plugin" "off"
    "thunar-volman" "Volume Management" "off"
    "tumbler" "Thumbnail Service" "off"
    "wallust" "color pallete generator" "off"
    "waybar" "wayland bar" "off"
    "wl-clipboard" "clipboard manager" "off"
    "wlogout" "logout menu" "off"
    "xdg-desktop-portal-hyprland" "hyprland file picker" "off"
    "yad" "dialog box" "off"
    "yt-dlp" "video downloader" "off"
    "xarchiver" "Archive Manager" "off"
    "hyprland" "hyprland main package" "off"
 )
 # Define the list of directories to choose from (with options_command tags)
 directories=(
    "ags" "AGS desktop overview configuration" "off"
    "btop" "btop configuration" "off"
    "cava" "cava configuration" "off"
    "fastfetch" "fastfetch configuration" "off"
    "hypr" "main hyprland configuration" "off"
    "kitty" "kitty terminal configuration" "off"
    "Kvantum" "Kvantum-manager configuration" "off"
    "qt5ct" "qt5ct configuration" "off"
    "qt6ct" "qt6ct configuration" "off"
    "rofi" "rofi configuration" "off"
    "swappy" "swappy (screenshot tool) configuration" "off"
    "swaync" "swaync (notification agent) configuration" "off"
    "Thunar" "Thunar file manager configuration" "off"
    "wallust" "wallust (color pallete) configuration" "off"
    "waybar" "waybar configuration" "off"
    "wlogout" "wlogout (logout menu) configuration" "off"    
 )
 # Loop for package selection until user selects something or cancels
 while true; do
    package_choices=$(whiptail --title "Select Packages to Uninstall" --checklist \
    "Select the packages you want to remove\nNOTE: 'SPACEBAR' to select & 'TAB' key to change selection" 35 90 25 \
    "${packages[@]}" 3>&1 1>&2 2>&3)
    # Check if the user canceled the operation
    if [ $? -eq 1 ]; then
        echo "$INFO uninstall process canceled."
        exit 0
    fi
    # If no packages are selected, ask again
    if [[ -z "$package_choices" ]]; then
        echo "$NOTE No packages selected. Please select at least one package."
    else
        echo "$package_choices" | tr -d '"' | tr ' ' '\n' > /tmp/selected_packages.txt
        echo "Packages to remove: $package_choices"
        break
    fi
 done
 # Loop for directory selection until user selects something or cancels
 while true; do
    dir_choices=$(whiptail --title "Select Directories to Remove" --checklist \
    "Select the directories you want to remove\nNOTE: This will remove configs from ~/.config\n\nNOTE: 'SPACEBAR' to select & 'TAB' key to change selection" 28 90 18 \
    "${directories[@]}" 3>&1 1>&2 2>&3)
    # Check if the user canceled the operation
    if [ $? -eq 1 ]; then
        echo "$INFO uninstall process canceled."
        exit 0
    fi
    # If no directories are selected, ask again
    if [[ -z "$dir_choices" ]]; then
        echo "$NOTE No directories selected. Please select at least one directory."
    else
        # Save each selected directory to a new line in the temporary file
        echo "$dir_choices" | tr -d '"' | tr ' ' '\n' > /tmp/selected_directories.txt
        echo "Directories to remove: $dir_choices"
        break
    fi
 done
 # First confirmation - Warning about potential instability
 if ! whiptail --title "Warning" --yesno \
 "Warning: Removing these packages and directories may cause your system to become unstable and you may not be able to recover it.\n\nAre you sure you want to proceed?" \
 10 80; then
    echo "$INFO uninstall process canceled."
    exit 0
 fi
 # Second confirmation - Final confirmation to proceed
 if ! whiptail --title "Final Confirmation" --yesno \
 "Are you absolutely sure you want to remove the selected packages and directories?\n\nWARNING! This action is irreversible." \
 10 80; then
    echo "$INFO uninstall process canceled."
    exit 0
 fi
 printf "\n%.0s" {1..1}
 printf "\n%s${SKY_BLUE}Attempting to remove selected packages${RESET}\n" "${NOTE}"
 MAX_ATTEMPTS=2
 ATTEMPT=0
 while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
    # Remove packages
    remove_packages /tmp/selected_packages.txt
    # Check if any packages still need to be removed, retry if needed
    MISSING_PACKAGE_COUNT=0
    while read -r package; do
        if dpkg -l | grep -q "^ii  $package "; then
            MISSING_PACKAGE_COUNT=$((MISSING_PACKAGE_COUNT + 1))
        fi
    done < /tmp/selected_packages.txt
    if [ $MISSING_PACKAGE_COUNT -gt 0 ]; then
        ATTEMPT=$((ATTEMPT + 1))
        echo "Attempt #$ATTEMPT failed, retrying..."
    else
        break
    fi
 done
 printf "\n%.0s" {1..1}
 printf "\n%s${SKY_BLUE}Attempting to remove locally installed packages${RESET}\n" "${NOTE}"
 for file in ags hypridle hyprlock rofi wallust; do
    if [ -f "/usr/local/bin/$file" ]; then
        sudo rm "/usr/local/bin/$file"
        echo "$file removed."
    fi
 done
 printf "\n%.0s" {1..1}
 printf "\n%s${SKY_BLUE}Attempting to remove selected directories${RESET}\n" "${NOTE}"
 remove_directories /tmp/selected_directories.txt
 printf "\n%.0s" {1..1}
 echo -e "$MAGENTA Hyprland and related components have been uninstalled.$RESET"
 echo -e "$YELLOW It is recommended to reboot your system now.$RESET"
 printf "\n%.0s" {1..1}
--- a/update-hyprland.sh
+++ b/update-hyprland.sh
@ -1,522 +0,0 @@
 #!/usr/bin/env bash
 # update-hyprland.sh
 # Manage and build just the Hyprland stack (Hyprland + companion apps/libs)
 # - Maintains a central tag file (hypr-tags.env) with versions
 # - Can fetch latest release tags from GitHub and update hypr-tags.env
 # - Can restore tags from a backup
 # - Can run a dry-run build (compile only) or install build of the stack
 #
 # Usage examples:
 #   chmod +x ./update-hyprland.sh
 #   ./update-hyprland.sh --dry-run                 # compile-only using current tags
 #   ./update-hyprland.sh --install                 # compile + install using current tags
 #   ./update-hyprland.sh --fetch-latest --dry-run  # refresh tags to latest, then dry-run
 #   ./update-hyprland.sh --set HYPRLAND=v0.51.1 --dry-run  # set one or more tags
 #   ./update-hyprland.sh --restore --dry-run       # restore most recent backup of tags and dry-run
 #   ./update-hyprland.sh --only hyprland,hyprutils --dry-run
 #   ./update-hyprland.sh --skip aquamarine --install
 #   ./update-hyprland.sh --with-deps --dry-run
 #   ./update-hyprland.sh --fetch-latest --via-helper   # use dry-run-build.sh for a summary-only run
 #
 # Notes:
 # - Requires curl; for --fetch-latest, jq is recommended (installed by 00-dependencies.sh)
 # - Works from repo root; do not cd into install-scripts/
 set -euo pipefail
 REPO_ROOT=$(pwd)
 TAGS_FILE="$REPO_ROOT/hypr-tags.env"
 LOG_DIR="$REPO_ROOT/Install-Logs"
 mkdir -p "$LOG_DIR"
 TS=$(date +%F-%H%M%S)
 SUMMARY_LOG="$LOG_DIR/update-hypr-$TS.log"
 # Default module order (core first, then Hyprland)
 DEFAULT_MODULES=(
    xkbcommon
    hyprutils
    hyprlang
    hyprtoolkit
    wayland-protocols-src
    aquamarine
    hyprgraphics
    hyprwayland-scanner
    hyprland-protocols
    hyprland-qt-support
    hyprland-guiutils
    hyprland
 )
 WITH_DEPS=0
 DO_INSTALL=0
 DO_DRY_RUN=0
 FETCH_LATEST=0
 RESTORE=0
 VIA_HELPER=0
 NO_FETCH=0
 ONLY_LIST=""
 SKIP_LIST=""
 SET_ARGS=()
 usage() {
    sed -n '2,120p' "$0" | sed -n '/^# /p' | sed 's/^# \{0,1\}//'
 }
 ensure_tags_file() {
    if [[ ! -f "$TAGS_FILE" ]]; then
        echo "[INFO] Creating default tags file: $TAGS_FILE" | tee -a "$SUMMARY_LOG"
        cat >"$TAGS_FILE" <<'EOF'
 HYPRLAND_TAG=v0.50.1
 AQUAMARINE_TAG=v0.9.2
 HYPRUTILS_TAG=v0.8.2
 HYPRLANG_TAG=v0.6.4
 HYPRGRAPHICS_TAG=v0.1.5
 HYPRWAYLAND_SCANNER_TAG=v0.4.5
 HYPRLAND_PROTOCOLS_TAG=v0.6.4
 HYPRLAND_QT_SUPPORT_TAG=v0.1.0
 HYPRLAND_QTUTILS_TAG=v0.1.4
 EOF
    fi
 }
 backup_tags() {
    ensure_tags_file
    cp "$TAGS_FILE" "$TAGS_FILE.bak-$TS"
    echo "[INFO] Backed up $TAGS_FILE to $TAGS_FILE.bak-$TS" | tee -a "$SUMMARY_LOG"
 }
 restore_tags() {
    latest_bak=$(ls -1t "$TAGS_FILE".bak-* 2>/dev/null | head -n1 || true)
    if [[ -z "$latest_bak" ]]; then
        echo "[ERROR] No backup tags file found." | tee -a "$SUMMARY_LOG"
        exit 1
    fi
    cp "$latest_bak" "$TAGS_FILE"
    echo "[INFO] Restored tags from $latest_bak" | tee -a "$SUMMARY_LOG"
 }
 set_tags_from_args() {
    ensure_tags_file
    backup_tags
    # load existing into assoc map
    declare -A map
    while IFS='=' read -r k v; do
        [[ -z "$k" || "$k" =~ ^# ]] && continue
        map[$k]="$v"
    done <"$TAGS_FILE"
    for kv in "${SET_ARGS[@]}"; do
        key="${kv%%=*}"
        val="${kv#*=}"
        case "$key" in
        HYPRLAND | hyprland) key=HYPRLAND_TAG ;;
        AQUAMARINE | aquamarine) key=AQUAMARINE_TAG ;;
        HYPRUTILS | hyprutils) key=HYPRUTILS_TAG ;;
        HYPRLANG | hyprlang) key=HYPRLANG_TAG ;;
        HYPRGRAPHICS | hyprgraphics) key=HYPRGRAPHICS_TAG ;;
        HYPRWAYLAND_SCANNER | hyprwayland-scanner | hyprwayland_scanner) key=HYPRWAYLAND_SCANNER_TAG ;;
        HYPRLAND_PROTOCOLS | hyprland-protocols | hyprland_protocols) key=HYPRLAND_PROTOCOLS_TAG ;;
        HYPRLAND_QT_SUPPORT | hyprland-qt-support | hyprland_qt_support) key=HYPRLAND_QT_SUPPORT_TAG ;;
        HYPRLAND_QTUTILS | hyprland-qtutils | hyprland_qtutils) key=HYPRLAND_QTUTILS_TAG ;;
        esac
        map[$key]="$val"
    done
    {
        for k in "${!map[@]}"; do
            echo "$k=${map[$k]}"
        done | sort
    } >"$TAGS_FILE"
    echo "[INFO] Updated $TAGS_FILE with provided tags" | tee -a "$SUMMARY_LOG"
 }
 # Fetch latest release tags from GitHub for the stack
 fetch_latest_tags() {
    ensure_tags_file
    backup_tags
    # Require curl; jq is preferred. Fallback to grep/sed if jq is missing.
    if ! command -v curl >/dev/null 2>&1; then
        echo "[ERROR] curl is required." | tee -a "$SUMMARY_LOG"
        exit 1
    fi
    # Read existing to respect pinned values (only update keys set to 'auto' or 'latest')
    declare -A existing
    while IFS='=' read -r k v; do
        [[ -z "$k" || "$k" =~ ^# ]] && continue
        existing[$k]="$v"
    done <"$TAGS_FILE"
    declare -A repos=(
        [HYPRLAND_TAG]="hyprwm/Hyprland"
        [AQUAMARINE_TAG]="hyprwm/aquamarine"
        [HYPRUTILS_TAG]="hyprwm/hyprutils"
        [HYPRLANG_TAG]="hyprwm/hyprlang"
        [HYPRGRAPHICS_TAG]="hyprwm/hyprgraphics"
        [HYPRWAYLAND_SCANNER_TAG]="hyprwm/hyprwayland-scanner"
        [HYPRLAND_PROTOCOLS_TAG]="hyprwm/hyprland-protocols"
        [HYPRLAND_QT_SUPPORT_TAG]="hyprwm/hyprland-qt-support"
        [HYPRLAND_QTUTILS_TAG]="hyprwm/hyprland-qtutils"
    )
    declare -A tags
    for key in "${!repos[@]}"; do
        repo="${repos[$key]}"
        url="https://api.github.com/repos/$repo/releases/latest"
        echo "[INFO] Fetching latest tag for $repo" | tee -a "$SUMMARY_LOG"
        body=$(curl -fsSL "$url" || true)
        if [[ -z "$body" ]]; then
            echo "[WARN] Empty response for $repo; leaving $key unchanged" | tee -a "$SUMMARY_LOG"
            continue
        fi
        if command -v jq >/dev/null 2>&1; then
            tag=$(printf '%s' "$body" | jq -r '.tag_name // empty')
        else
            tag=$(printf '%s' "$body" | grep -m1 '"tag_name"' | sed -E 's/.*"tag_name"\s*:\s*"([^"]+)".*/\1/')
        fi
        if [[ -n "$tag" ]]; then
            tags[$key]="$tag"
        else
            echo "[WARN] Could not parse tag for $repo; leaving $key unchanged" | tee -a "$SUMMARY_LOG"
        fi
    done
    # Merge into existing file
    declare -A map
    while IFS='=' read -r k v; do
        [[ -z "$k" || "$k" =~ ^# ]] && continue
        map[$k]="$v"
    done <"$TAGS_FILE"
    for k in "${!tags[@]}"; do
        # Only override if pinned value is 'auto' or 'latest'
        if [[ "${existing[$k]:-}" =~ ^(auto|latest)$ ]] || [[ -z "${existing[$k]:-}" ]]; then
            map[$k]="${tags[$k]}"
        fi
    done
    {
        for k in "${!map[@]}"; do
            echo "$k=${map[$k]}"
        done | sort
    } >"$TAGS_FILE"
    echo "[INFO] Refreshed tags written to $TAGS_FILE" | tee -a "$SUMMARY_LOG"
 }
 # Build runner using module scripts. Uses env vars from TAGS_FILE.
 run_stack() {
    # shellcheck disable=SC1090
    source "$TAGS_FILE"
    # Export tags so child scripts inherit them
    export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_TAG WAYLAND_PROTOCOLS_TAG
    # Optionally install dependencies (not dry-run)
    if [[ $WITH_DEPS -eq 1 ]]; then
        echo "[INFO] Installing dependencies via 00-dependencies.sh" | tee -a "$SUMMARY_LOG"
        if ! "$REPO_ROOT/install-scripts/00-dependencies.sh"; then
            echo "[ERROR] Dependencies installation failed." | tee -a "$SUMMARY_LOG"
            exit 1
        fi
    fi
    # Build module list based on --only/--skip
    local modules
    if [[ -n "$ONLY_LIST" ]]; then
        IFS=',' read -r -a modules <<<"$ONLY_LIST"
    else
        modules=("${DEFAULT_MODULES[@]}")
    fi
    if [[ -n "$SKIP_LIST" ]]; then
        IFS=',' read -r -a _skips <<<"$SKIP_LIST"
        local filtered=()
        for m in "${modules[@]}"; do
            local skip_it=0
            for s in "${_skips[@]}"; do
                [[ "$m" == "$s" ]] && {
                    skip_it=1
                    break
                }
            done
            [[ $skip_it -eq 0 ]] && filtered+=("$m")
        done
        modules=("${filtered[@]}")
    fi
    # Ensure core prerequisites are installed before hyprland on install runs
    # Order: wayland-protocols-src, hyprland-protocols, hyprutils, hyprlang, aquamarine, hyprland
    if [[ $DO_INSTALL -eq 1 ]]; then
        # Auto-fetch latest tags for Hyprland stack unless disabled
        if [[ $NO_FETCH -eq 0 ]]; then
            # Detect whether hyprland is part of the run
            need_fetch=0
            for m in "${modules[@]}"; do
                [[ "$m" == "hyprland" ]] && need_fetch=1
            done
            if [[ $need_fetch -eq 1 ]]; then
                echo "[INFO] Auto-fetching latest tags for Hyprland stack" | tee -a "$SUMMARY_LOG"
                fetch_latest_tags
            fi
        fi
        local has_hl=0 has_aqua=0 has_wp=0 has_utils=0 has_lang=0 has_hlprot=0
        for m in "${modules[@]}"; do
            [[ "$m" == "hyprland" ]] && has_hl=1
            [[ "$m" == "aquamarine" ]] && has_aqua=1
            [[ "$m" == "wayland-protocols-src" ]] && has_wp=1
            [[ "$m" == "hyprland-protocols" ]] && has_hlprot=1
            [[ "$m" == "hyprutils" ]] && has_utils=1
            [[ "$m" == "hyprlang" ]] && has_lang=1
        done
        if [[ $has_hl -eq 1 ]]; then
            # ensure each prerequisite is present
            [[ $has_wp -eq 0 ]] && modules=("wayland-protocols-src" "${modules[@]}")
            [[ $has_hlprot -eq 0 ]] && modules=("hyprland-protocols" "${modules[@]}")
            [[ $has_utils -eq 0 ]] && modules=("hyprutils" "${modules[@]}")
            [[ $has_lang -eq 0 ]] && modules=("hyprlang" "${modules[@]}")
            [[ $has_aqua -eq 0 ]] && modules=("aquamarine" "${modules[@]}")
            # Reorder to exact sequence before hyprland
            # Remove existing occurrences and rebuild in correct order
            local tmp=()
            local inserted_wp=0 inserted_hlprot=0 inserted_utils=0 inserted_lang=0 inserted_aqua=0
            for m in "${modules[@]}"; do
                if [[ "$m" == "wayland-protocols-src" ]]; then
                    if [[ $inserted_wp -eq 0 ]]; then
                        tmp+=("wayland-protocols-src")
                        inserted_wp=1
                    fi
                elif [[ "$m" == "hyprland-protocols" ]]; then
                    if [[ $inserted_hlprot -eq 0 ]]; then
                        # ensure wayland-protocols-src before hyprland-protocols
                        if [[ $inserted_wp -eq 0 ]]; then
                            tmp+=("wayland-protocols-src")
                            inserted_wp=1
                        fi
                        tmp+=("hyprland-protocols")
                        inserted_hlprot=1
                    fi
                elif [[ "$m" == "hyprutils" ]]; then
                    if [[ $inserted_utils -eq 0 ]]; then
                        # ensure protocols before utils
                        if [[ $inserted_wp -eq 0 ]]; then
                            tmp+=("wayland-protocols-src")
                            inserted_wp=1
                        fi
                        if [[ $inserted_hlprot -eq 0 ]]; then
                            tmp+=("hyprland-protocols")
                            inserted_hlprot=1
                        fi
                        tmp+=("hyprutils")
                        inserted_utils=1
                    fi
                elif [[ "$m" == "hyprlang" ]]; then
                    if [[ $inserted_lang -eq 0 ]]; then
                        # ensure utils before lang
                        if [[ $inserted_utils -eq 0 ]]; then
                            if [[ $inserted_wp -eq 0 ]]; then
                                tmp+=("wayland-protocols-src")
                                inserted_wp=1
                            fi
                            if [[ $inserted_hlprot -eq 0 ]]; then
                                tmp+=("hyprland-protocols")
                                inserted_hlprot=1
                            fi
                            tmp+=("hyprutils")
                            inserted_utils=1
                        fi
                        tmp+=("hyprlang")
                        inserted_lang=1
                    fi
                elif [[ "$m" == "aquamarine" ]]; then
                    if [[ $inserted_aqua -eq 0 ]]; then
                        # ensure lang before aquamarine
                        if [[ $inserted_lang -eq 0 ]]; then
                            if [[ $inserted_utils -eq 0 ]]; then
                                if [[ $inserted_wp -eq 0 ]]; then
                                    tmp+=("wayland-protocols-src")
                                    inserted_wp=1
                                fi
                                if [[ $inserted_hlprot -eq 0 ]]; then
                                    tmp+=("hyprland-protocols")
                                    inserted_hlprot=1
                                fi
                                tmp+=("hyprutils")
                                inserted_utils=1
                            fi
                            tmp+=("hyprlang")
                            inserted_lang=1
                        fi
                        tmp+=("aquamarine")
                        inserted_aqua=1
                    fi
                elif [[ "$m" == "hyprland" ]]; then
                    # ensure all prerequisites already present
                    if [[ $inserted_wp -eq 0 ]]; then
                        tmp+=("wayland-protocols-src")
                        inserted_wp=1
                    fi
                    if [[ $inserted_hlprot -eq 0 ]]; then
                        tmp+=("hyprland-protocols")
                        inserted_hlprot=1
                    fi
                    if [[ $inserted_utils -eq 0 ]]; then
                        tmp+=("hyprutils")
                        inserted_utils=1
                    fi
                    if [[ $inserted_lang -eq 0 ]]; then
                        tmp+=("hyprlang")
                        inserted_lang=1
                    fi
                    if [[ $inserted_aqua -eq 0 ]]; then
                        tmp+=("aquamarine")
                        inserted_aqua=1
                    fi
                    tmp+=("hyprland")
                else
                    tmp+=("$m")
                fi
            done
            modules=("${tmp[@]}")
        fi
    fi
    declare -A results
    for mod in "${modules[@]}"; do
        local script="$REPO_ROOT/install-scripts/$mod.sh"
        echo "\n=== $mod ===" | tee -a "$SUMMARY_LOG"
        [[ -f "$script" ]] || {
            echo "[WARN] Missing $script" | tee -a "$SUMMARY_LOG"
            results[$mod]="MISSING"
            continue
        }
        chmod +x "$script" || true
        if [[ $DO_DRY_RUN -eq 1 ]]; then
            if DRY_RUN=1 "$script"; then results[$mod]="PASS"; else results[$mod]="FAIL"; fi
        else
            if "$script"; then results[$mod]="INSTALLED"; else results[$mod]="FAIL"; fi
        fi
    done
    {
        echo "\nSummary:"
        for mod in "${modules[@]}"; do
            printf "%-24s %s\n" "$mod" "${results[$mod]:-SKIPPED}"
        done
        echo "\nLogs under: $LOG_DIR. This run: $SUMMARY_LOG"
    } | tee -a "$SUMMARY_LOG"
    # Non-zero on any FAILs
    local failed=0
    for mod in "${modules[@]}"; do
        [[ "${results[$mod]:-}" == FAIL ]] && failed=1
    done
    return $failed
 }
 # Parse args
 while [[ $# -gt 0 ]]; do
    case "$1" in
    -h | --help)
        usage
        exit 0
        ;;
    --with-deps)
        WITH_DEPS=1
        shift
        ;;
    --dry-run)
        DO_DRY_RUN=1
        shift
        ;;
    --install)
        DO_INSTALL=1
        shift
        ;;
    --fetch-latest)
        FETCH_LATEST=1
        shift
        ;;
    --restore)
        RESTORE=1
        shift
        ;;
    --via-helper)
        VIA_HELPER=1
        shift
        ;;
    --no-fetch)
        NO_FETCH=1
        shift
        ;;
    --only)
        ONLY_LIST=${2:-}
        shift 2
        ;;
    --skip)
        SKIP_LIST=${2:-}
        shift 2
        ;;
    --set)
        shift
        while [[ $# -gt 0 && "$1" != --* ]]; do
            SET_ARGS+=("$1")
            shift
        done
        ;;
    *)
        echo "Unknown argument: $1"
        exit 2
        ;;
    esac
 done
 # Validate options
 if [[ $DO_INSTALL -eq 1 && $DO_DRY_RUN -eq 1 ]]; then
    echo "[ERROR] Use either --dry-run or --install, not both." | tee -a "$SUMMARY_LOG"
    exit 2
 fi
 ensure_tags_file
 # Apply tag operations
 if [[ $RESTORE -eq 1 ]]; then
    restore_tags
 fi
 if [[ ${#SET_ARGS[@]} -gt 0 ]]; then
    set_tags_from_args
 fi
 if [[ $FETCH_LATEST -eq 1 ]]; then
    fetch_latest_tags
 fi
 # Run the stack
 if [[ $DO_DRY_RUN -eq 0 && $DO_INSTALL -eq 0 ]]; then
    echo "[INFO] No build option specified. Defaulting to --dry-run." | tee -a "$SUMMARY_LOG"
    DO_DRY_RUN=1
 fi
 # If using helper, delegate to dry-run-build.sh for summary-only output
 if [[ $VIA_HELPER -eq 1 ]]; then
    if [[ $DO_INSTALL -eq 1 ]]; then
        echo "[ERROR] --via-helper cannot be combined with --install (helper is dry-run only)." | tee -a "$SUMMARY_LOG"
        exit 2
    fi
    # shellcheck disable=SC1090
    source "$TAGS_FILE"
    export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_TAG WAYLAND_PROTOCOLS_TAG
    helper="$REPO_ROOT/dry-run-build.sh"
    if [[ ! -x "$helper" ]]; then
        echo "[ERROR] dry-run-build.sh not found or not executable at $helper" | tee -a "$SUMMARY_LOG"
        exit 1
    fi
    args=()
    [[ $WITH_DEPS -eq 1 ]] && args+=("--with-deps")
    [[ -n "$ONLY_LIST" ]] && args+=("--only" "$ONLY_LIST")
    [[ -n "$SKIP_LIST" ]] && args+=("--skip" "$SKIP_LIST")
    echo "[INFO] Delegating to dry-run-build.sh ${args[*]}" | tee -a "$SUMMARY_LOG"
    "$helper" "${args[@]}"
    exit $?
 fi
 run_stack