Merge pull request #300 from JaKooLit/development

Pre-release stage: Development to Main

73 files changed, 1347 insertions, 863 deletions

diff --git a/config/ags/modules/.configuration/user_options.js b/config/ags/modules/.configuration/user_options.js
index ba8c5ab6..db194395 100644
--- a/config/ags/modules/.configuration/user_options.js
+++ b/config/ags/modules/.configuration/user_options.js
@@ -75,8 +75,11 @@ let configOptions = {
             'Minecraft* 1.20.1': "minecraft",
             'gnome-tweaks': "org.gnome.tweaks",
             'pavucontrol-qt': "pavucontrol",
+			'thunderbird-esr': "thunderbird",
             'wps': "wps-office2019-kprometheus",
             'wpsoffice': "wps-office2019-kprometheus",
+			'firefox-esr': "firefox",
+			'soffice' : "libreoffice",
             '': "image-missing",
         }
     },
diff --git a/config/ags/variables.js b/config/ags/variables.js
index ec4aedec..803b9157 100644
--- a/config/ags/variables.js
+++ b/config/ags/variables.js
@@ -6,8 +6,8 @@ const { exec, execAsync } = Utils;
 Gtk.IconTheme.get_default().append_search_path(`${App.configDir}/assets/icons`);
 
 // Screen size
-export const SCREEN_WIDTH = Number(exec(`bash -c "xrandr --current | grep '*' | uniq | awk '{print $1}' | cut -d 'x' -f1 | head -1" | awk '{print $1}'`));
-export const SCREEN_HEIGHT = Number(exec(`bash -c "xrandr --current | grep '*' | uniq | awk '{print $1}' | cut -d 'x' -f2 | head -1" | awk '{print $1}'`));
+export const SCREEN_WIDTH = Number(exec(`bash -c "hyprctl monitors -j | jq '.[0].width'"`));
+export const SCREEN_HEIGHT = Number(exec(`bash -c "hyprctl monitors -j | jq '.[0].height'"`));
 
 // Mode switching
 export const currentShellMode = Variable('normal', {}) // normal, focus
diff --git a/config/fastfetch/config-compact.jsonc b/config/fastfetch/config-compact.jsonc
new file mode 100644
index 00000000..f8b1e12e
--- /dev/null
+++ b/config/fastfetch/config-compact.jsonc
@@ -0,0 +1,72 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "padding": {
+            "top": 2
+        },
+        "type": "small"
+    },
+    "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",
+    ]
+}
diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc
new file mode 100644
index 00000000..c6eb694b
--- /dev/null
+++ b/config/fastfetch/config.jsonc
@@ -0,0 +1,147 @@
+// Load with --load-config examples/2.jsonc
+// Note that you must replace the image path to an existing image to display it.
+
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "padding": {
+            "top": 3
+        }
+    },
+    "display": {
+        "separator": " 󰑃  "
+    },
+    "modules": [
+        {
+            "type": "custom",
+            "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"
+        },
+        {
+            "type": "title",
+            "keyWidth": 10,
+			"format": "                          {6}{7}{8}"
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m  \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[38m  \u001b[39m        \u001b[38m  \u001b[37m  \u001b[36m  \u001b[35m  \u001b[34m  \u001b[33m  \u001b[32m  \u001b[31m  \u001b[90m "
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"
+        },
+        {
+            "type": "os",
+            "key": " DISTRO",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "kernel",
+            "key": "│ ├",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "packages",
+            "key": "│ ├󰏖",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "shell",
+            "key": "│ └",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "wm",
+            "key": "  DE/WM",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wmtheme",
+            "key": "│ ├󰉼",
+            "keyColor": "blue"
+        },
+        {
+            "type": "icons",
+            "key": "│ ├󰀻",
+            "keyColor": "blue"
+        },
+        {
+            "type": "terminal",
+            "key": "│ ├",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wallpaper",
+            "key": "│ └󰸉",
+            "keyColor": "blue"
+        },
+        {
+            "type": "host",
+            "key": "󰌢 SYSTEM",
+            "keyColor": "green"
+        },
+        {
+            "type": "cpu",
+            "key": "│ ├󰻠",
+            "keyColor": "green"
+        },
+        {
+            "type": "gpu",
+            "key": "│ ├󰻑",
+            "keyColor": "green"
+        },
+		{
+			"type": "display",
+            "key": "│ ├󰍹",
+            "keyColor": "green",
+            "compactType": "original-with-refresh-rate"
+        },
+        {
+            "type": "memory",
+            "key": "│ ├󰾆",
+            "keyColor": "green"
+        },
+        {
+            "type": "swap",
+            "key": "│ ├󰓡",
+            "keyColor": "green"
+        },
+        {
+            "type": "uptime",
+            "key": "│ ├󰅐",
+            "keyColor": "green"
+        },
+        {
+            "type": "display",
+            "key": "│ └󰍹",
+            "keyColor": "green"
+        },
+        {
+            "type": "sound",
+            "key": "  AUDIO",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "player",
+            "key": "│ ├󰥠",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "media",
+            "key": "│ └󰝚",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m  \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[38m  \u001b[39m        \u001b[38m  \u001b[37m  \u001b[36m  \u001b[35m  \u001b[34m  \u001b[33m  \u001b[32m  \u001b[31m  \u001b[90m "
+        },
+		"break",
+    ]
+}
diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 1d60c24b..8681eb30 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -1,4 +1,5 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Environment variables. See https://wiki.hyprland.org/Configuring/Environment-variables/
 
 #environment-variables
 env = CLUTTER_BACKEND,wayland
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index eede1669..85f3c1c3 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -19,7 +19,9 @@ bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,r
 bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview'
 
 bind = $mainMod, Return, exec, $term  # Launch terminal
-bind = $mainMod, T, exec, $files
+bind = $mainMod, T, exec, $files # Launch file manager
+
+bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate)
 
 # pyprland
 bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal
@@ -27,6 +29,7 @@ bind = $mainMod, Z, exec, pypr zoom # Toggle Zoom
 
 # User Added Keybinds
 bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
+bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Changing the keyboard layout
 
 # For passthrough keyboard into a VM
 # bind = $mainMod ALT, P, submap, passthru
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index b3193e49..1ca9b5d8 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -1,6 +1,7 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # User Settings
-# This is where you put your own settings as this will not be touched during update
+# This is where you put your own settings as this will not be touched during update 
+# if the upgrade.sh is used.
 
 # refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
 
@@ -25,7 +26,7 @@ master {
 general {
   sensitivity=1.00
   apply_sens_to_raw=1
-  gaps_in = 4
+  gaps_in = 6
   gaps_out = 8
   border_size = 2
   resize_on_border = true
@@ -33,7 +34,7 @@ general {
   col.active_border = $color0 $color2 $color9 $color12 $color15 90deg
   col.inactive_border = $backgroundCol
 
-  layout = master
+  layout = dwindle
 }
 
 group {
@@ -45,7 +46,7 @@ group {
 }
 
 decoration {
-  rounding = 8
+  rounding = 10
          
   active_opacity = 1.0
   inactive_opacity = 0.9
@@ -63,7 +64,7 @@ decoration {
 
   blur {
   enabled = true	
-  size = 5
+  size = 6
   passes = 2
   ignore_opacity = true
   new_optimizations = true
@@ -74,32 +75,26 @@ decoration {
 animations {
   enabled = yes
 
-  bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-  bezier = linear, 0.0, 0.0, 1.0, 1.0
   bezier = wind, 0.05, 0.9, 0.1, 1.05
   bezier = winIn, 0.1, 1.1, 0.1, 1.1
   bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = slow, 0, 0.85, 0.3, 1
-  bezier = overshot, 0.7, 0.6, 0.1, 1.1
-  bezier = bounce, 1.1, 1.6, 0.1, 0.85
-  bezier = sligshot, 1, -1, 0.15, 1.25
-  bezier = nice, 0, 6.9, 0.5, -4.20
+  bezier = liner, 1, 1, 1, 1
   
-  animation = windowsIn, 1, 5, slow, popin
-  animation = windowsOut, 1, 5, winOut, popin
+  animation = windows, 1, 6, wind, slide
+  animation = windowsIn, 1, 6, winIn, slide
+  animation = windowsOut, 1, 5, winOut, slide
   animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 10, linear
-  animation = borderangle, 1, 180, linear, loop #used by rainbow borders and rotating colors
-  animation = fade, 1, 5, overshot
+  animation = border, 1, 1, liner
+  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
+  animation = fade, 1, 10, default
   animation = workspaces, 1, 5, wind
-  animation = windows, 1, 5, bounce, popin
 }
 
 input {
   kb_layout=us
   kb_variant=
   kb_model=
-  kb_options=grp:alt_shift_toggle
+  kb_options=
   kb_rules=
   repeat_rate=50
   repeat_delay=300
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 09cc8ec2..3193d26c 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -13,16 +13,19 @@ windowrulev2 = workspace 2, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-es
 windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 #windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
-windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$
-windowrulev2 = workspace 5 silent, class:^(lutris)$
+windowrulev2 = workspace 5, class:^([Ss]team)$
+windowrulev2 = workspace 5, class:^([Ll]utris)$
+windowrulev2 = workspace 7, class:^([Dd]iscord)$
+windowrulev2 = workspace 7, class:^([Ww]ebCord)$
+windowrulev2 = workspace 7, class:^([Vv]esktop)$
+
+# windowrule v2 move to workspace (silent)
 windowrulev2 = workspace 6 silent, class:^(virt-manager)$
-windowrulev2 = workspace 7 silent, class:^(discord)$
-windowrulev2 = workspace 7 silent, class:^(WebCord)$
 windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$
 
 # windowrule v2 - float
 windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ 
-windowrulev2 = float, class:([Zz)oom|onedriver|onedriver-launcher)$
+windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$
 windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress)
 windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files)
 windowrulev2 = float, class:(xdg-desktop-portal-gtk)
@@ -40,6 +43,12 @@ windowrulev2 = float, class:^(evince)$ # document viewer
 windowrulev2 = float, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
 windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer
 windowrulev2 = float, title:(Kvantum Manager)
+windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ettings)$
+windowrulev2 = float, class:^([Qq]alculate-gtk)$
+
+# windowrule v2 - position
+windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress)
+windowrulev2 = center, class:([Tt]hunar), title:(Confirm to replace files)
 
 # windowrule v2 - opacity #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
@@ -62,12 +71,12 @@ windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$
 windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$
 windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.Nautilus)$
 windowrulev2 = opacity 0.9 0.8, class:^(VSCode|code-url-handler)$
-windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-studio)$ # Android Studio
-windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-phpstorm)$ # PHPStorm
-windowrulev2 = opacity 0.94 0.86, class:^(discord)$
-windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop)$
+windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-.+)$ # JetBrains IDEs
+windowrulev2 = opacity 0.94 0.86, class:^([Dd]iscord|[Vv]esktop)$
+windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
 windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks|evince|wihotspot-gui|org.gnome.baobab)$
 windowrulev2 = opacity 0.9 0.8, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
+windowrulev2 = opacity 0.8 0.7, class:^(app.drey.Warp)$ # Warp file transfer
 windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
 windowrulev2 = opacity 0.82 0.75, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
 windowrulev2 = opacity 0.9 0.8, class:^(xdg-desktop-portal-gtk)$ # gnome-keyring gui
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 1cf2a445..7fed687f 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# For Rofi Beats to play online Music or Locally save media files
 
-# Directory music folder
+# Directory local music folder
 mDIR="$HOME/Music/"
 
 # Directory for icons
 iDIR="$HOME/.config/swaync/icons"
 
-# Online Stations
+# Online Stations. Edit as required
 declare -A online_music=(
   ["AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ"
   ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio"
@@ -22,7 +24,6 @@ declare -A online_music=(
   ["Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ"
 )
 
-# Local Music
 # Populate local_music array with files from music directory and subdirectories
 populate_local_music() {
   local_music=()
@@ -49,18 +50,33 @@ play_local_music() {
     exit 1
   fi
 
-  # Find the corresponding file path based on user's choice
-  for (( i=0; i<"${#filenames[@]}"; i++ )); do
+  # Find the corresponding file path based on user's choice and set that to play the song then continue on the list
+  for (( i=0; i<"${#filenames[@]}"; ++i )); do
     if [ "${filenames[$i]}" = "$choice" ]; then
-      file="${local_music[$i]}"
+		
+	    notification "$choice"
+
+      # For some reason wont start playlist at 0
+      if [[ $i -eq 0 ]]; then
+        # Play the selected local music file using mpv
+        mpv --loop-playlist --vid=no "$mDIR" 
+      	
+      else
+        file=$i
+        # Play the selected local music file using mpv
+        mpv --playlist-start="$file" --loop-playlist --vid=no "$mDIR"
+      fi
       break
     fi
   done
+}
 
-  notification "$choice"
+# Main function for shuffling local music
+shuffle_local_music() {
+  notification "Shuffle local music"
 
-  # Play the selected local music file using mpv
-  mpv --shuffle --vid=no "$file"
+  # Play music in $mDIR on shuffle
+  mpv --shuffle --loop-playlist --vid=no "$mDIR"
 }
 
 # Main function for playing online music
@@ -80,10 +96,10 @@ play_online_music() {
 }
 
 # Check if an online music process is running and send a notification, otherwise run the main function
-pkill mpv && notify-send -u low -i "$iDIR/music.png" "Online Music stopped" || {
+pkill mpv && notify-send -u low -i "$iDIR/music.png" "Music stopped" || {
 
 # Prompt the user to choose between local and online music
-user_choice=$(printf "Play from Online Stations\nPlay from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source")
+user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source")
 
   case "$user_choice" in
     "Play from Music Folder")
@@ -92,6 +108,9 @@ user_choice=$(printf "Play from Online Stations\nPlay from Music Folder" | rofi
     "Play from Online Stations")
       play_online_music
       ;;
+    "Shuffle Play from Music Folder")
+      shuffle_local_music
+      ;;
     *)
       echo "Invalid choice"
       ;;
diff --git a/config/hypr/UserScripts/RofiCalc.sh b/config/hypr/UserScripts/RofiCalc.sh
new file mode 100755
index 00000000..355130de
--- /dev/null
+++ b/config/hypr/UserScripts/RofiCalc.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+# /* Calculator (using qalculate) and rofi */
+# /* Submitted by: https://github.com/JosephArmas */
+
+rofi_config="$HOME/.config/rofi/config-calc.rasi"
+
+# Kill Rofi if already running before execution
+if pgrep -x "rofi" >/dev/null; then
+    pkill rofi
+    exit 0
+fi
+
+# main function
+
+while true; do
+    result=$(
+        rofi -i -dmenu \
+            -config "$rofi_config" \
+            -mesg "$result      =    $calc_result"
+    )
+
+    if [ $? -ne 0 ]; then
+        exit
+    fi
+
+    if [ -n "$result" ]; then
+        calc_result=$(qalc -t "$result")
+        echo "$calc_result" | wl-copy
+    fi
+done
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 9a087c7d..06859112 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
-# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ 
 # This script for selecting wallpapers (SUPER W)
 
-SCRIPTSDIR="$HOME/.config/hypr/scripts"
-
-focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}')
-
 # WALLPAPERS PATH
 wallDIR="$HOME/Pictures/wallpapers"
 
-# Transition config
-FPS=30
-TYPE="wipe"
-DURATION=1
+# variables
+SCRIPTSDIR="$HOME/.config/hypr/scripts"
+focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}')
+
+# swww transition config
+FPS=60
+TYPE="any"
+DURATION=2
 BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION"
 
@@ -22,31 +22,36 @@ if pidof swaybg > /dev/null; then
 fi
 
 # Retrieve image files
-PICS=($(ls "${wallDIR}" | grep -E ".jpg$|.jpeg$|.png$|.gif$"))
+PICS=($(find "${wallDIR}" -type f \( -iname \*.jpg -o -iname \*.jpeg -o -iname \*.png -o -iname \*.gif \)))
 RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
-RANDOM_PIC_NAME="${#PICS[@]}. random"
+RANDOM_PIC_NAME=". random"
 
 # Rofi command
 rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
 
+
+# Sorting Wallpapers
 menu() {
-  for i in "${!PICS[@]}"; do
+  sorted_options=($(printf '%s\n' "${PICS[@]}" | sort))
+  # Place ". random" at the beginning
+  printf "%s\n" "$RANDOM_PIC_NAME"
+  for pic_path in "${sorted_options[@]}"; do
+    pic_name=$(basename "$pic_path")
     # Displaying .gif to indicate animated images
-    if [[ -z $(echo "${PICS[$i]}" | grep .gif$) ]]; then
-      printf "$(echo "${PICS[$i]}" | cut -d. -f1)\x00icon\x1f${wallDIR}/${PICS[$i]}\n"
+    if [[ -z $(echo "$pic_name" | grep -i "\.gif$") ]]; then
+      printf "%s\x00icon\x1f%s\n" "$(echo "$pic_name" | cut -d. -f1)" "$pic_path"
     else
-      printf "${PICS[$i]}\n"
+      printf "%s\n" "$pic_name"
     fi
   done
-
-  printf "$RANDOM_PIC_NAME\n"
 }
 
+# initiate swww if not running
 swww query || swww-daemon --format xrgb
 
+# Choice of wallpapers
 main() {
   choice=$(menu | ${rofi_command})
-
   # No choice case
   if [[ -z $choice ]]; then
     exit 0
@@ -54,7 +59,8 @@ main() {
 
   # Random choice case
   if [ "$choice" = "$RANDOM_PIC_NAME" ]; then
-    swww img "${wallDIR}/${RANDOM_PIC}" $SWWW_PARAMS
+    RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
+    swww img -o $focused_monitor "${RANDOM_PIC}" $SWWW_PARAMS
     exit 0
   fi
 
@@ -69,7 +75,7 @@ main() {
   done
 
   if [[ $pic_index -ne -1 ]]; then
-    swww img -o $focused_monitor "${wallDIR}/${PICS[$pic_index]}" $SWWW_PARAMS
+    swww img -o $focused_monitor "${PICS[$pic_index]}" $SWWW_PARAMS
   else
     echo "Image not found."
     exit 1
diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py
index 5cd11a66..1d2ea30b 100755
--- a/config/hypr/UserScripts/Weather.py
+++ b/config/hypr/UserScripts/Weather.py
@@ -8,12 +8,12 @@ import os
 # original code https://gist.github.com/Surendrajat/ff3876fd2166dd86fb71180f4e9342d7
 # weather icons
 weather_icons = {
-    "sunnyDay": "",
-    "clearNight": "",
-    "cloudyFoggyDay": "",
-    "cloudyFoggyNight": "",
-    "rainyDay": "",
-    "rainyNight": "",
+    "sunnyDay": "󰖙",
+    "clearNight": "󰖔",
+    "cloudyFoggyDay": "",
+    "cloudyFoggyNight": "",
+    "rainyDay": "",
+    "rainyNight": "",
     "snowyIcyDay": "",
     "snowyIcyNight": "",
     "severe": "",
@@ -116,14 +116,14 @@ tooltip_text = str.format(
 
 # print waybar module data
 out_data = {
-    "text": f"{icon} {temp}",
+    "text": f"{icon}  {temp}",
     "alt": status,
     "tooltip": tooltip_text,
     "class": status_code,
 }
 print(json.dumps(out_data))
 
-simple_weather =f"{icon} {status}\n" + \
+simple_weather =f"{icon}  {status}\n" + \
                 f"  {temp} ({temp_feel_text})\n" + \
                 f"{wind_text} \n" + \
                 f"{humidity_text} \n" + \
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 2cdd9cde..142de86a 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -29,7 +29,6 @@ bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF
 bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
 bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
 bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel
-bind = SHIFT, ALT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout
 
 # FEATURES / EXTRAS (UserScripts)
 bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings
@@ -75,7 +74,7 @@ bind = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop
 bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now
 bind = $mainMod SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --area
 bind = $mainMod CTRL, Print, exec, $scriptsDir/ScreenShot.sh --in5 #screenshot in 5 secs
-bind = $mainMod ALT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 10 secs
+bind = $mainMod CTRL SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 10 secs
 bind = ALT, Print, exec, $scriptsDir/ScreenShot.sh --active #take screenshot of active window
 
 # screenshot with swappy (another screenshot tool)
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 162ad65f..b05d6865 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -10,6 +10,11 @@ scriptsDir=$HOME/.config/hypr/scripts
 wallpaper=$HOME/Pictures/wallpapers/Fantasy-Waterfall.png
 waybar_style="$HOME/.config/waybar/style/[Dark] Latte-Wallust combined.css"
 kvantum_theme="Catppuccin-Mocha"
+color_scheme="prefer-dark"
+gtk_theme="Andromeda-dark"
+icon_theme="Flat-Remix-Blue-Dark"
+cursor_theme="Bibata-Modern-Ice"
+
 
 swww="swww img"
 effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2"
@@ -25,10 +30,10 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
 	fi
      
     # initiate GTK dark mode and apply icon and cursor theme
-    gsettings set org.gnome.desktop.interface color-scheme prefer-dark > /dev/null 2>&1 &
-    gsettings set org.gnome.desktop.interface gtk-theme Tokyonight-Dark-Moon-BL-LB > /dev/null 2>&1 &
-    gsettings set org.gnome.desktop.interface icon-theme Flat-Remix-Blue-Dark > /dev/null 2>&1 &
-    gsettings set org.gnome.desktop.interface cursor-theme Bibata-Modern-Ice > /dev/null 2>&1 &
+    gsettings set org.gnome.desktop.interface color-scheme $color_scheme > /dev/null 2>&1 &
+    gsettings set org.gnome.desktop.interface gtk-theme $gtk_theme > /dev/null 2>&1 &
+    gsettings set org.gnome.desktop.interface icon-theme $icon_theme > /dev/null 2>&1 &
+    gsettings set org.gnome.desktop.interface cursor-theme $cursor_theme > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface cursor-size 24 > /dev/null 2>&1 &
     
     # initiate kvantum theme
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index 9d29dda4..55ed6903 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -58,6 +58,8 @@ yad --width=$dynamic_width --height=$dynamic_height \
 " Print" "screenshot" "(grim)" \
 " Shift Print" "screenshot region" "(grim + slurp)" \
 " Shift S" "screenshot region" "(swappy)" \
+" CTRL Print" "screenshot timer 5 secs " "(grim)" \
+" CTRL SHIFT Print" "screenshot timer 10 secs " "(grim)" \
 "ALT Print" "Screenshot active window" "active window only" \
 "CTRL ALT P" "power-menu" "(wlogout)" \
 "CTRL ALT L" "screen lock" "(hyprlock)" \
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index 0145e262..cbacd74f 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -41,5 +41,38 @@ new_layout="${layout_mapping[next_index]}"
 hyprctl switchxkblayout "at-translated-set-2-keyboard" "$new_layout"
 echo "$new_layout" > "$layout_f"
 
-# Notification for the new keyboard layout
-notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
+# Created by T-Crypt
+
+get_keyboard_names() {
+    hyprctl devices -j | jq -r '.keyboards[].name'
+}
+
+change_layout() {
+    local got_error=false
+
+    while read -r name; do
+        hyprctl switchxkblayout "$name" next
+        if [[ $? -eq 0 ]]; then
+            echo "Switched the layout for $name."
+        else
+            >&2 echo "Error while switching the layout for $name."
+            got_error=true
+        fi
+    done <<< "$(get_keyboard_names)"
+
+    if [ "$got_error" = true ]; then
+        >&2 echo "Some errors were found during the process..."
+        return 1
+    fi
+
+    return 0 # All layouts had been cycled successfully
+}
+
+if ! change_layout; then
+    notify-send -u low -t 2000 'Keyboard layout' 'Error: Layout change failed'
+    >&2 echo "Layout change failed."
+    exit 1
+else
+    # Notification for the new keyboard layout
+	  notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
+fi
diff --git a/config/hypr/v2.2.11 b/config/hypr/v2.2.12
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.2.11
+++ b/config/hypr/v2.2.12
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index f178d462..1437ce07 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -1,14 +1,18 @@
 font_family     Fira Code SemiBold
-font_size 	    13.0
+font_size 		16.0
 bold_font       auto
 italic_font      auto
 bold_italic_font auto
 
 background_opacity 0.7
-
 confirm_os_window_close 0
 
+scrollback_lines 2000
+wheel_scroll_min_lines 1
+
 enable_audio_bell no
 
 selection_foreground #000000
-selection_background #F5FBFF
\ No newline at end of file
+selection_background #F5FBFF
+
+window_padding_width 4
\ No newline at end of file
diff --git a/config/rofi/.current_wallpaper b/config/rofi/.current_wallpaper
index f2470dcf..6d4a09c3 120000
--- a/config/rofi/.current_wallpaper
+++ b/config/rofi/.current_wallpaper
@@ -1 +1 @@
-/home/ja/Pictures/wallpapers/Fantasy-Waterfall.png
\ No newline at end of file
+/home/ja/Pictures/wallpapers/Scifi-Room.png
\ No newline at end of file
diff --git a/config/rofi/config-calc.rasi b/config/rofi/config-calc.rasi
new file mode 100644
index 00000000..bcb0f665
--- /dev/null
+++ b/config/rofi/config-calc.rasi
@@ -0,0 +1,22 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Main Config Calculator */
+/* Submitted by: https://github.com/JosephArmas */
+
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Entry ---- */
+entry {
+  width: 27%;
+  placeholder: "🧮 Calculate";
+}
+
+/* ---- Window ---- */
+window {
+    width:	30%;
+}
+
+/* ---- Message ---- */
+textbox {
+    background-color:            @selected;
+    text-color:                  @background;
+}
\ No newline at end of file
diff --git a/config/rofi/config-clipboard.rasi b/config/rofi/config-clipboard.rasi
index 9573262e..2a002a29 100644
--- a/config/rofi/config-clipboard.rasi
+++ b/config/rofi/config-clipboard.rasi
@@ -1,10 +1,16 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Clipboard Config (long) - Clipboard */
+/* Clipboard Config - Clipboard */
 
-@import "~/.config/rofi/config-long.rasi" 
+@import "~/.config/rofi/config.rasi" 
 
 /* ---- Entry ---- */
 entry {
-  width: 45%;
+  width: 37%;
   placeholder: "📋 Search Clipboard **note** 👀 CTRL Del - Cliphist del or Alt Del - cliphist wipe";
 }
+
+/* ---- Listview ---- */
+listview {
+  columns: 1;
+  lines: 8;
+}
\ No newline at end of file
diff --git a/config/rofi/config-emoji.rasi b/config/rofi/config-emoji.rasi
index 3f0be0e4..8aca6aa2 100644
--- a/config/rofi/config-emoji.rasi
+++ b/config/rofi/config-emoji.rasi
@@ -1,10 +1,16 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (long) - emoji */
+/* Main Config - emoji */
 
-@import "~/.config/rofi/config-long.rasi" 
+@import "~/.config/rofi/config.rasi" 
 
 /* ---- Entry ---- */
 entry {
-  width: 45%;
+  width: 37%;
   placeholder: "💫 Search Emoji's  **note** 👀 Click or Return to choose | Ctrl V to Paste";
 }
+
+/* ---- Listview ---- */
+listview {
+  columns: 1;
+  lines: 8;
+}
\ No newline at end of file
diff --git a/config/rofi/config-long.rasi b/config/rofi/config-long.rasi
deleted file mode 100644
index 2341e5f6..00000000
--- a/config/rofi/config-long.rasi
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (long) */
-
-@import "~/.config/rofi/config.rasi" 
-
-/* ---- Window ---- */
-window {
-  width: 50%;
-}
-
-/* ---- Entry ---- */
-entry {
-  placeholder: "🔎 Search       ";
-}
-
-/* ---- Listview ---- */
-listview {
-  columns: 1;
-  lines: 8;
-  scrollbar: true;
-}
\ No newline at end of file
diff --git a/config/rofi/config-rofi-Beats-menu.rasi b/config/rofi/config-rofi-Beats-menu.rasi
index 6cdd6e99..fd2e194e 100644
--- a/config/rofi/config-rofi-Beats-menu.rasi
+++ b/config/rofi/config-rofi-Beats-menu.rasi
@@ -18,5 +18,5 @@ window {
 listview {
   fixed-columns: false;
   colums: 1;
-  lines: 2;
-}
\ No newline at end of file
+  lines: 3;
+}
diff --git a/config/rofi/config-rofi-Beats.rasi b/config/rofi/config-rofi-Beats.rasi
index a45006c8..2bf99e2b 100644
--- a/config/rofi/config-rofi-Beats.rasi
+++ b/config/rofi/config-rofi-Beats.rasi
@@ -11,5 +11,4 @@ entry {
 /* ---- Listview ---- */
 listview {
   lines: 6;
-  scrollbar: true;
 }
diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi
index 9dc8b74c..3be6c9e9 100644
--- a/config/rofi/config-waybar-style.rasi
+++ b/config/rofi/config-waybar-style.rasi
@@ -23,5 +23,4 @@ entry {
 listview {
   columns: 2;
   lines: 6;
-  scrollbar: true;
 }
diff --git a/config/rofi/config-zsh-theme.rasi b/config/rofi/config-zsh-theme.rasi
index ffa8bd14..2684d109 100644
--- a/config/rofi/config-zsh-theme.rasi
+++ b/config/rofi/config-zsh-theme.rasi
@@ -39,9 +39,8 @@ entry {
 /* ---- Listview ---- */
 listview {
   columns: 3;
-  lines: 4;
+  lines: 3;
   spacing: 4px;
-  scrollbar: false;
   border-radius: 10px;
 }
 
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index 2042f9c5..59576860 100755
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -1,236 +1,14 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config 1080p */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/master-config.rasi" 
 
+/* ---- Configuration ---- */
 configuration {
-	modi:                       "drun,run,filebrowser";
-	font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-	drun-display-format:        "{name}";
-	hover-select:               true;
-	me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-	window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-}
-
-/* ---- Load wallust colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons backgroundr
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
-}
-
-/* ---- Window ---- */
-window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     2px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      50%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 15px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 200px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               25px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Entry input ---- */
-entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       20%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 "🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       6;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   false;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
+	font: "Fira Code SemiBold 12";
 }
 
-/* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
-button {
-    width:                       5%;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
-}
-
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    size:                        36px;
-    cursor:                      inherit;
-}
 element-text {
-    background-color:            transparent;
-    font:                       "Fira Code SemiBold 14";
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-
+    font:	"Fira Code SemiBold 14";
 }
 
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/master-config.rasi b/config/rofi/master-config.rasi
new file mode 100644
index 00000000..fe24cd61
--- /dev/null
+++ b/config/rofi/master-config.rasi
@@ -0,0 +1,233 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Master Config */
+
+/* ---- Configuration ---- */
+
+configuration {
+	modi:                       "drun,run,filebrowser";
+    show-icons:                 true;
+    display-drun:               "Apps";
+    display-run:                "Run";
+    display-filebrowser:        "Files";
+    display-window:             "Windows";
+	drun-display-format:        "{name}";
+	hover-select:               true;
+	me-select-entry:            "MouseSecondary";
+    me-accept-entry:            "MousePrimary";
+	window-format:              "{w} · {c} · {t}";
+	dpi:						1;
+}
+
+/* ---- Load wallust colors ---- */
+@theme "~/.config/rofi/wallust/colors-rofi.rasi"
+
+/* ---- Global Properties ---- */
+* {
+
+    background-alt:              @selected-active-background; // Buttons background
+    selected:                    @selected-urgent-background; // Button selected
+    active:                      @selected-normal-background; // Window activated
+    urgent:                      @selected; // When hovering the activated window (maybe more?)
+
+    text-selected:               @background;
+    text-color:                  @foreground;
+    border-color:                @selected;
+}
+
+/* ---- Window ---- */
+window {
+    // Default
+    enabled:                    true;
+    fullscreen:                 false;
+    transparency:               "real";
+    cursor:                     "default";
+    spacing:                    0px;
+    border:                     2px;
+    border-radius:              30px;
+    location:                   center;
+    anchor:                     center;
+
+    // Style Values
+    width:                      50%;
+    background-color:           @background;
+}
+
+/* ----- Main Box ----- */
+mainbox {
+	padding:					 15px;
+    enabled:                     true;
+    orientation:                 vertical;
+    children:                    [ "inputbar", "listbox" ];
+    background-color:            transparent;
+}
+
+
+/* ---- Inputbar ---- */
+inputbar {
+    enabled:                     true;
+    padding:                     10px 10px 100px 10px;
+    margin:                      10px;
+    background-color:            transparent;
+    border-radius:               25px;
+    orientation:                 horizontal;
+    children:                    ["entry", "dummy", "mode-switcher" ];
+    background-image:            url("~/.config/rofi/.current_wallpaper", width);
+}
+
+/* ---- Entry input ---- */
+entry {
+    enabled:                     true;
+    expand:                      false;
+    width:                       20%;
+    padding:                     10px;
+    border-radius:               12px;
+    background-color:            @selected;
+    text-color:                  @text-selected;
+    cursor:                      text;
+    placeholder:                 "🖥️ Search "; // << Search symbol
+    placeholder-color:           inherit;
+}
+
+/* ---- Listbox ---- */
+listbox {
+    spacing:                     10px;
+    padding:                     10px;
+    background-color:            transparent;
+    orientation:                 vertical;
+    children:                    [ "message", "listview" ];
+}
+
+/* ---- Listview ---- */
+listview {
+    enabled:                     true;
+    columns:                     2;
+    lines:                       6;
+    cycle:                       true;
+    dynamic:                     true;
+    scrollbar:                   true;
+    layout:                      vertical;
+    reverse:                     false;
+    fixed-height:                false;
+    fixed-columns:               true;    
+    spacing:                     10px;
+    background-color:            transparent;
+
+//  Adapt rofi theme
+    border:                      0px;
+}
+
+/* ---- Dummy ---- */
+dummy {
+    expand:                      true;
+    background-color:            transparent;
+}
+
+/* ---- Mode Switcher ---- */
+mode-switcher{
+    enabled:                     true;
+    spacing:                     10px;
+    background-color:            transparent;
+}
+button {
+    width:                       5%;
+    padding:                     12px;
+    border-radius:               12px;
+    background-color:            @text-selected;
+    text-color:                  @text-color;
+    cursor:                      pointer;
+}
+button selected {
+    background-color:            @selected;
+    text-color:                  @text-selected;
+}
+
+/* ---- Scrollbar ---- */
+scrollbar {
+    width:        4px ;
+    border:       0;
+    handle-color: @border-color;
+    handle-width: 8px ;
+    padding:      0;
+}
+
+/* ---- Elements ---- */
+element {
+    enabled:                     true;
+    spacing:                     10px;
+    padding:                     10px;
+    border-radius:               12px;
+    background-color:            transparent;
+    cursor:                      pointer;
+}
+
+element normal.normal {
+    background-color:            inherit;
+    text-color:                  inherit;
+}
+element normal.urgent {
+    background-color:            @urgent;
+    text-color:                  @foreground;
+}
+element normal.active {
+    background-color:            @active;
+    text-color:                  @foreground;
+}
+
+element selected.normal {
+    background-color:            @selected;
+    text-color:                  @text-selected;
+}
+element selected.urgent {
+    background-color:            @urgent;
+    text-color:                  @text-selected;
+}
+element selected.active {
+    background-color:            @urgent;
+    text-color:                  @text-selected;
+}
+// Adapt rofi theme
+element alternate.normal {
+    background-color:            transparent;
+    text-color:                  inherit;
+}
+element alternate.urgent {
+    background-color:            transparent;
+    text-color:                  inherit;
+}
+element alternate.active {
+    background-color:            transparent;
+    text-color:                  inherit;
+}
+element-icon {
+    background-color:            transparent;
+    text-color:                  inherit;
+    size:                        36px;
+    cursor:                      inherit;
+}
+element-text {
+    background-color:            transparent;
+    text-color:                  inherit;
+    cursor:                      inherit;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+}
+
+/* ---- Message ---- */
+message {
+    background-color:            transparent;
+    border:                      0px;
+}
+textbox {
+    padding:                     12px;
+    border-radius:               10px;
+    background-color:            @background-alt;
+    text-color:                  @background;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+}
+error-message {
+    padding:                     12px;
+    border-radius:               20px;
+    background-color:            @background-alt;
+    text-color:                  @background;
+}
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
index 2042f9c5..59576860 100755
--- a/config/rofi/resolution/1080p/config.rasi
+++ b/config/rofi/resolution/1080p/config.rasi
@@ -1,236 +1,14 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config 1080p */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/master-config.rasi" 
 
+/* ---- Configuration ---- */
 configuration {
-	modi:                       "drun,run,filebrowser";
-	font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-	drun-display-format:        "{name}";
-	hover-select:               true;
-	me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-	window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-}
-
-/* ---- Load wallust colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons backgroundr
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
-}
-
-/* ---- Window ---- */
-window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     2px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      50%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 15px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 200px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               25px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Entry input ---- */
-entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       20%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 "🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       6;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   false;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
+	font: "Fira Code SemiBold 12";
 }
 
-/* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
-button {
-    width:                       5%;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
-}
-
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    size:                        36px;
-    cursor:                      inherit;
-}
 element-text {
-    background-color:            transparent;
-    font:                       "Fira Code SemiBold 14";
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-
+    font:	"Fira Code SemiBold 14";
 }
 
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
index 3f7a2dc6..b72c1001 100755
--- a/config/rofi/resolution/1440p/config.rasi
+++ b/config/rofi/resolution/1440p/config.rasi
@@ -1,235 +1,33 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config 1440p */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/master-config.rasi" 
 
+/* ---- Configuration ---- */
 configuration {
-	modi:                       "drun,run,filebrowser";
-	font:                       "Fira Code SemiBold 13";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-	drun-display-format:        "{name}";
-	hover-select:               true;
-	me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-	window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-}
-
-/* ---- Load pywal colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons backgroundr
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
+	font:	"Fira Code SemiBold 13";
 }
-
 /* ---- Window ---- */
 window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     2px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      40%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 15px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 200px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               25px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
+    width:	40%;
 }
 
 /* ---- Entry input ---- */
 entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       18%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 "🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
+    width:	18%;
 }
 
 /* ---- Listview ---- */
 listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       8;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   false;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
+    lines:	8;
 }
 
 /* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
 button {
-    width:                       110px;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
+    width:	110px;
 }
 
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    size:                        36px;
-    cursor:                      inherit;
-}
 element-text {
-    background-color:            transparent;
-    font:                       "Fira Code SemiBold 16";
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-
+    font:	"Fira Code SemiBold 16";
 }
 
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/wallust/colors-rofi.rasi b/config/rofi/wallust/colors-rofi.rasi
index 15a0b742..d1361a1e 100644
--- a/config/rofi/wallust/colors-rofi.rasi
+++ b/config/rofi/wallust/colors-rofi.rasi
@@ -1,28 +1,28 @@
 * {
-active-background: #A38A46;
-active-foreground: #D1F8FD;
-normal-background: #060402;
-normal-foreground: #D1F8FD;
-urgent-background: #CCBA98;
-urgent-foreground: #D1F8FD;
+active-background: #112D69;
+active-foreground: #C8DFF1;
+normal-background: #030915;
+normal-foreground: #C8DFF1;
+urgent-background: #386CB1;
+urgent-foreground: #C8DFF1;
 
-alternate-active-background: #94A7B8;
-alternate-active-foreground: #D1F8FD;
-alternate-normal-background: #060402;
-alternate-normal-foreground: #D1F8FD;
-alternate-urgent-background: #060402;
-alternate-urgent-foreground: #D1F8FD;
+alternate-active-background: #77659C;
+alternate-active-foreground: #C8DFF1;
+alternate-normal-background: #030915;
+alternate-normal-foreground: #C8DFF1;
+alternate-urgent-background: #030915;
+alternate-urgent-foreground: #C8DFF1;
 
-selected-active-background: #A38A46;
-selected-active-foreground: #D1F8FD;
-selected-normal-background: #B5EDF4;
-selected-normal-foreground: #D1F8FD;
-selected-urgent-background: #CCBA98;
-selected-urgent-foreground: #D1F8FD;
+selected-active-background: #112D69;
+selected-active-foreground: #C8DFF1;
+selected-normal-background: #A9C9E3;
+selected-normal-foreground: #C8DFF1;
+selected-urgent-background: #386CB1;
+selected-urgent-foreground: #C8DFF1;
 
-background-color: #060402;
+background-color: #030915;
 background: rgba(0,0,0,0.7);
-foreground: #B5EDF4;
-border-color: #A38A46;
+foreground: #A9C9E3;
+border-color: #112D69;
 }
 
diff --git a/config/swaync/config.json b/config/swaync/config.json
index 64e24561..baf68066 100755
--- a/config/swaync/config.json
+++ b/config/swaync/config.json
@@ -64,15 +64,11 @@
             "actions": [
                 {
                     "label": "󰐥",
-                    "command": "systemctl poweroff"
-                },
-                {
-                    "label": "󰜉",
-                    "command": "systemctl reboot"
+                    "command": "bash -c $HOME/.config/hypr/scripts/Wlogout.sh"
                 },
                 {
                     "label": "󰌾",
-                    "command": "~/.config/hypr/scripts/LockScreen.sh"
+                    "command": "bash -c $HOME/.config/hypr/scripts/LockScreen.sh"
                 },
                 {
                     "label": "󰍃",
@@ -80,17 +76,13 @@
                 },
                 {
                     "label": "󰀝",
-                    "command": "~/.config/hypr/scripts/AirplaneMode.sh"
+                    "command": "bash -c $HOME/.config/hypr/scripts/AirplaneMode.sh"
                 },
                 {
-                    "label": "󰕾",
+                    "label": "󰝟",
                     "command": "pactl set-sink-mute @DEFAULT_SINK@ toggle"
                 },
                 {
-                    "label": "󰍬",
-                    "command": "pactl set-source-mute @DEFAULT_SOURCE@ toggle"
-                },
-                {
                     "label": "󰂯",
                     "command": "blueman-manager"
                 }
diff --git a/config/swaync/style.css b/config/swaync/style.css
index 6a4f565d..790bac39 100755
--- a/config/swaync/style.css
+++ b/config/swaync/style.css
@@ -65,7 +65,7 @@
 
 
 .notification-action {
-    border: 2px solid @noti-border-color;
+    border: 1px solid @noti-border-color;
     border-top: none;
     border-radius: 10px;
 }
@@ -161,7 +161,7 @@
 
 .control-center {
     background: @noti-bg;
-    border: 2px solid @noti-border-color;
+    border: 1px solid @noti-border-color;
 	color: @text-color;
     border-radius: 10px;
 }
diff --git a/config/waybar/configs/[BOT] Sleek b/config/waybar/configs/[BOT] Sleek
index 10b62db6..b1cfc1ae 100644
--- a/config/waybar/configs/[BOT] Sleek
+++ b/config/waybar/configs/[BOT] Sleek
@@ -14,23 +14,31 @@
 "modules-left": [
 	"custom/menu",
 	"custom/separator#blank_2",
-	"mpris", 
-	"hyprland/window"
+	"hyprland/workspaces",
+	"custom/separator#blank_2",
+	"mpris",
+	"tray"
 ],
 
-"modules-center": [		
-	"hyprland/workspaces"	
+"modules-center": [
+	"idle_inhibitor",
+	"custom/separator#blank",
+	"clock",
+	"custom/separator#blank",
+	"custom/swaync"
 ],
 		
 "modules-right": [
-	"tray",
-	"custom/swaync",
+	"hyprland/window",
+	"custom/separator#blank",
+	"custom/separator#blank", 
 	"pulseaudio",
-	"clock",
-	"custom/power"				
+	"custom/separator#blank",
+	"custom/power",					
 	],
 
 
+
 // Additional format / customize modules
 
 "custom/power": {
diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit b/config/waybar/configs/[TOP & BOT] SummitSplit
index 62cb449d..6e9cac28 100644
--- a/config/waybar/configs/[TOP & BOT] SummitSplit
+++ b/config/waybar/configs/[TOP & BOT] SummitSplit
@@ -24,8 +24,8 @@
 	],
   
 "modules-center": [
-	"idle_inhibitor", 
-	"hyprland/workspaces#4", 
+	"idle_inhibitor",
+	"clock",  
 	"custom/light_dark",
 	], 
 
@@ -35,7 +35,7 @@
 	"backlight",
 	"bluetooth",
 	"network",
-	//"custom/updater",
+	"custom/updater",
 	"custom/cycle_wall",
 	"custom/lock", 
 	],
@@ -54,6 +54,7 @@
 "height": 0,
 "margin-left": 8,
 "margin-right": 8,
+//"gtk-layer-shell": true,
 //"margin-bottom": 0,
 
 "modules-left": [
@@ -62,7 +63,7 @@
 	 ],
 
 "modules-center": [
-	"clock", 
+	"hyprland/workspaces#rw", 
 	],
 
 "modules-right": [
@@ -75,6 +76,5 @@
 	//"wireplumber", 
 	"pulseaudio#microphone",	  
 	"custom/power",
-	],
-
-}]
\ No newline at end of file
+	],  
+}],
diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2
index 9021f0b1..6ddab7d8 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v2
+++ b/config/waybar/configs/[TOP] Default Laptop_v2
@@ -19,7 +19,8 @@
 	"custom/menu",
 	"custom/light_dark",
 	"custom/separator#dot-line",
-	"group/motherboard",
+	"power-profiles-daemon",
+	"group/mobo_drawer",
 	"custom/separator#blank",
 	"group/laptop",
 	"custom/separator#line",
@@ -40,15 +41,15 @@
 
 "modules-right": [
 	"network#speed",
+	"group/connections",
 	"custom/separator#line",
 	"tray",
 	"mpris", 
-	"bluetooth",
 	"group/audio",
+	"custom/separator#line",
 	"keyboard-state",
 	"custom/keyboard",
 	"custom/lock",
-	"custom/separator#dot-line",
 	"custom/power",
 	],
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default Laptop_v3 b/config/waybar/configs/[TOP] Default Laptop_v3
new file mode 100644
index 00000000..6ddab7d8
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default Laptop_v3
@@ -0,0 +1,55 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT v2 (Laptop)  - Top ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 3,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"custom/menu",
+	"custom/light_dark",
+	"custom/separator#dot-line",
+	"power-profiles-daemon",
+	"group/mobo_drawer",
+	"custom/separator#blank",
+	"group/laptop",
+	"custom/separator#line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/swaync",
+	"custom/cava_mviz",
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#line",
+	"hyprland/workspaces#roman",
+	"custom/separator#dot-line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"group/connections",
+	"custom/separator#line",
+	"tray",
+	"mpris", 
+	"group/audio",
+	"custom/separator#line",
+	"keyboard-state",
+	"custom/keyboard",
+	"custom/lock",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default_v3 b/config/waybar/configs/[TOP] Default_v3
new file mode 100644
index 00000000..d32f24eb
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default_v3
@@ -0,0 +1,54 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT v3  - Top ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 3,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"custom/menu",
+	"custom/light_dark",
+	"custom/separator#dot-line",
+	"power-profiles-daemon",
+	"group/mobo_drawer",
+	"custom/separator#blank",
+	"custom/separator#line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/swaync",
+	"custom/cava_mviz",
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#line",
+	"hyprland/workspaces#roman",
+	"custom/separator#dot-line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"group/connections",
+	"custom/separator#line",
+	"tray",
+	"mpris", 
+	"group/audio",
+	"custom/separator#line",
+	"keyboard-state",
+	"custom/keyboard",
+	"custom/lock",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Simple b/config/waybar/configs/[TOP] Simple
new file mode 100644
index 00000000..09488c54
--- /dev/null
+++ b/config/waybar/configs/[TOP] Simple
@@ -0,0 +1,35 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+// ### TOP Simple ## //
+
+{
+"include": "~/.config/waybar/modules",
+"layer": "top", 
+"position": "top", 
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"gtk-layer-shell": true,
+"margin-left": 6,
+"margin-right": 6,
+"margin-top": 2,
+
+"modules-left": [	
+	"idle_inhibitor",
+	"group/mobo_drawer",
+	"hyprland/workspaces#rw",
+	"tray",
+	"mpris", 
+	],
+    
+"modules-center": [
+	"clock#2"
+	],
+    
+"modules-right": [
+	"hyprland/window",  
+	"battery",
+ 	"group/audio", 
+	"custom/power",
+	],
+}
+
diff --git a/config/waybar/configs/[TOP] Sleek b/config/waybar/configs/[TOP] Sleek
index dbd8a7e0..fda6aca2 100644
--- a/config/waybar/configs/[TOP] Sleek
+++ b/config/waybar/configs/[TOP] Sleek
@@ -13,21 +13,23 @@
 "modules-left": [
 	"custom/menu",
 	"custom/separator#blank_2",
-	"clock",
+	"hyprland/workspaces",
 	"custom/separator#blank_2",
-	"hyprland/window"
+	"mpris",
+	"tray"
 ],
 
-"modules-center": [		
-	"hyprland/workspaces"	
+"modules-center": [
+	"idle_inhibitor",
+	"custom/separator#blank",
+	"clock",
+	"custom/separator#blank",
+	"custom/swaync"
 ],
 		
 "modules-right": [
-	"custom/swaync",
-	"custom/separator#blank",
-	"tray",
+	"hyprland/window",
 	"custom/separator#blank",
-	"mpris",
 	"custom/separator#blank", 
 	"pulseaudio",
 	"custom/separator#blank",
diff --git a/config/waybar/modules b/config/waybar/modules
index 93c7f3c1..071efb34 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -126,6 +126,40 @@
 		"default": "",
 	},
 },
+// NUMBERS and ICONS style with window rewrite
+"hyprland/workspaces#rw": {
+	"disable-scroll": true,
+	"all-outputs": true,
+	"warp-on-scroll": false,
+	"sort-by-number": true,
+	"show-special": true,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"format": "{icon} {windows}",
+	"format-window-separator": " ",
+	"window-rewrite-default": " ",
+	"window-rewrite": {
+		"title<.*youtube.*>": " ",
+		"title<.*amazon.*>": " ",
+		"title<.*reddit.*>": " ",
+		"title<.*Picture-in-Picture.*>": " ",
+		"class<firefox>": " ",
+		"class<kitty>": " ",
+		"class<konsole>": " ",
+		"class<thunar>": "󰝰 ",
+		"class<discord>": " ",
+		"class<subl>": "󰅳 ",
+		"class<celluloid>": " ",
+		"class<Cider>": "󰎆 ",
+		"class<code-oss>": "󰨞 ",
+		"class<codium|codium-url-handler|VSCodium>": "󰨞 ",
+		"class<codeblocks>": "󰅩 ",
+		"class<mousepad>": " ",
+		"class<libreoffice-writer>": " ",
+		"class<libreoffice-startcenter>": "󰏆 "
+		}   
+},
 // GROUP
 "group/motherboard": {
 	"orientation": "horizontal",
@@ -136,20 +170,51 @@
 		"disk",
 	]
 },
+"group/mobo_drawer": {
+	"orientation": "inherit",
+	"drawer": {
+		"transition-duration": 500,
+		"children-class": "cpu",
+		"transition-left-to-right": true
+        },
+	"modules": [
+		"temperature",		
+		"cpu",	
+		"memory",
+		"disk",
+	]
+},
 "group/laptop": {
-	"orientation": "horizontal",
+	"orientation": "inherit",
 	"modules": [
 		"backlight",
 		"battery",
 	]
 },
 "group/audio": {
-	"orientation": "horizontal",
+	"orientation": "inherit",
+	"drawer": {
+		"transition-duration": 500,
+		"children-class": "pulseaudio",
+		"transition-left-to-right": true
+        },
 	"modules": [
 		"pulseaudio",
 		"pulseaudio#microphone",
 	]
 },
+"group/connections": {
+	"orientation": "inherit",
+	"drawer": {
+		"transition-duration": 500,
+		"children-class": "bluetooth",
+		"transition-left-to-right": true
+        },
+	"modules": [
+		"network",
+		"bluetooth",
+	]
+},
 "backlight": {
 	"interval": 2,
 	"align": 0,
@@ -241,6 +306,13 @@
 	"on-scroll-up": "shift_up",
 	"on-scroll-down": "shift_down"
 },
+"clock#2": {
+	// "timezone": "America/New_York",
+	//"format": " {:%I:%M %p}", // AM PM format
+	"format": "  {:%H:%M}",
+    "format-alt": "{:%A  |  %H:%M  |  %e %B}",
+    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+},
 "cpu": {
 	"format": "{usage}% 󰍛",
 	"interval": 1,
@@ -273,7 +345,7 @@
 },
 "hyprland/window": {
 	"format": "{}",
-	"max-length": 40,
+	"max-length": 20,
 	"separate-outputs": true,
 	"offscreen-css": true,
 	"offscreen-css-text": "(inactive)",
@@ -354,7 +426,8 @@
 	"max-length": 50,
 	"format-icons": [
 		"󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
-	]
+	],
+	"on-click-right": "kitty nmtui"
 },
 "network#speed": {
 	"interval": 1,
@@ -372,6 +445,17 @@
 		"󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
 	]
 },
+"power-profiles-daemon": {
+  "format": "{icon}",
+  "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+  "tooltip": true,
+  "format-icons": {
+    "default": "",
+    "performance": "",
+    "balanced": "",
+    "power-saver": ""
+  }
+},
 "pulseaudio": {
 	"format": "{icon} {volume}%",
 	"format-bluetooth": "{icon} 󰂰 {volume}%",
diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
index d4ee32df..430289c6 100644
--- a/config/waybar/style/[Black & White] Monochrome.css
+++ b/config/waybar/style/[Black & White] Monochrome.css
@@ -118,6 +118,7 @@ tooltip label{
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Catppuccin] Latte.css b/config/waybar/style/[Catppuccin] Latte.css
index 3f344079..c8d50dc4 100644
--- a/config/waybar/style/[Catppuccin] Latte.css
+++ b/config/waybar/style/[Catppuccin] Latte.css
@@ -57,6 +57,7 @@ window#waybar.hidden {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/style/[Catppuccin] Mocha.css b/config/waybar/style/[Catppuccin] Mocha.css
index 5ce97eac..c8401815 100644
--- a/config/waybar/style/[Catppuccin] Mocha.css
+++ b/config/waybar/style/[Catppuccin] Mocha.css
@@ -63,6 +63,7 @@ window#waybar.hidden {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
index 1a995dec..f8649a8f 100644
--- a/config/waybar/style/[Colored] Chroma Glow.css
+++ b/config/waybar/style/[Colored] Chroma Glow.css
@@ -106,6 +106,7 @@ tooltip label{
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css
index 37931d58..c8ca561f 100644
--- a/config/waybar/style/[Colored] Translucent.css
+++ b/config/waybar/style/[Colored] Translucent.css
@@ -116,6 +116,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
index d785453c..6b0b65c4 100644
--- a/config/waybar/style/[Colorful] Aurora Blossom.css
+++ b/config/waybar/style/[Colorful] Aurora Blossom.css
@@ -107,6 +107,7 @@ tooltip label{
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
index 3c17abfd..8fe0e3f1 100644
--- a/config/waybar/style/[Colorful] Aurora.css
+++ b/config/waybar/style/[Colorful] Aurora.css
@@ -97,6 +97,7 @@ tooltip label{
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
index df8808b4..e862d490 100644
--- a/config/waybar/style/[Colorful] Rainbow Spectrum.css
+++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css
@@ -61,6 +61,7 @@ tooltip label{
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css
index 00baff3e..c80c9486 100644
--- a/config/waybar/style/[Dark] Golden Noir.css
+++ b/config/waybar/style/[Dark] Golden Noir.css
@@ -132,6 +132,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css
index 5bb872a0..947bde9b 100644
--- a/config/waybar/style/[Dark] Half-Moon.css
+++ b/config/waybar/style/[Dark] Half-Moon.css
@@ -128,6 +128,7 @@ color: #F3F4F5;
 	padding: 2px 15px;
 }
 
+#power-profiles-daemon,
 #custom-cycle_wall,
 #cpu {
 	color: #F3F4F5;
@@ -235,6 +236,7 @@ color: #F3F4F5;
 	padding: 2px 15px;
 }
 
+#custom-power_vertical,
 #keyboard-state {
 	color: green;
 	background: #0F1419;
diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
index ad8d1b7f..aa85b75d 100644
--- a/config/waybar/style/[Dark] Latte-Wallust combined.css
+++ b/config/waybar/style/[Dark] Latte-Wallust combined.css
@@ -163,6 +163,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/[Dark] Purpl.css
index 0e463834..976cd86f 100644
--- a/config/waybar/style/[Dark] Purpl.css
+++ b/config/waybar/style/[Dark] Purpl.css
@@ -129,6 +129,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Dark] Wallust Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
index 1a507fe4..39b84cca 100644
--- a/config/waybar/style/[Dark] Wallust Obsidian Edge.css
+++ b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
@@ -125,6 +125,7 @@ tooltip label {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Extra] Crimson.css b/config/waybar/style/[Extra] Crimson.css
index c6530e11..79fc2fbe 100644
--- a/config/waybar/style/[Extra] Crimson.css
+++ b/config/waybar/style/[Extra] Crimson.css
@@ -119,6 +119,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Extra] Mauve.css b/config/waybar/style/[Extra] Mauve.css
index 685025fc..af90af8e 100644
--- a/config/waybar/style/[Extra] Mauve.css
+++ b/config/waybar/style/[Extra] Mauve.css
@@ -5,7 +5,7 @@
 /* --- 👍 designed by https://github.com/CelestiaKai  👍 --- */
 
 * {
-	font-family: "FiraCode Mono Nerd Font";
+	font-family: "JetBrainsMono Nerd Font";
 	font-weight: bold;
 	min-height: 0;		
 	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
@@ -140,6 +140,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Extra] Rose Pine.css b/config/waybar/style/[Extra] Rose Pine.css
index 783ea1da..9954cf4a 100644
--- a/config/waybar/style/[Extra] Rose Pine.css
+++ b/config/waybar/style/[Extra] Rose Pine.css
@@ -110,6 +110,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #temperature,
diff --git a/config/waybar/style/[Extra] Simple Pink.css b/config/waybar/style/[Extra] Simple Pink.css
index 2f41cbb4..df7056b9 100644
--- a/config/waybar/style/[Extra] Simple Pink.css
+++ b/config/waybar/style/[Extra] Simple Pink.css
@@ -133,6 +133,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css
index 9b3d5687..18eefd93 100644
--- a/config/waybar/style/[Light] Monochrome Contrast.css
+++ b/config/waybar/style/[Light] Monochrome Contrast.css
@@ -119,6 +119,7 @@ tooltip label{
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css
index c245a596..d41742c5 100644
--- a/config/waybar/style/[Light] Obsidian Glow.css
+++ b/config/waybar/style/[Light] Obsidian Glow.css
@@ -94,6 +94,7 @@ tooltip label {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css
index ca811682..83c26494 100644
--- a/config/waybar/style/[Retro] Simple Style.css
+++ b/config/waybar/style/[Retro] Simple Style.css
@@ -56,6 +56,7 @@ window#waybar {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css
index 0003efed..84788e7a 100644
--- a/config/waybar/style/[Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Transparent] Crystal Clear.css
@@ -98,6 +98,7 @@ window#waybar.empty #window {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #taskbar,
 #temperature,
diff --git a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
index 0a418ad4..ec3ecbf7 100644
--- a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
@@ -68,6 +68,7 @@ tooltip {
 #memory,
 #mode,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/style/[Wallust Bordered] Chroma Simple.css b/config/waybar/style/[Wallust Bordered] Chroma Simple.css
new file mode 100644
index 00000000..8fcf4514
--- /dev/null
+++ b/config/waybar/style/[Wallust Bordered] Chroma Simple.css
@@ -0,0 +1,298 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* Wallust Bordered*/
+
+@import '../../.config/waybar/wallust/colors-waybar.css';
+
+
+* {
+	font-family: "JetBrainsMono Nerd Font";
+	font-weight: bold;
+	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+	font-size: 97%;
+    min-height: 0;
+}
+
+window#waybar {
+    background-color: transparent;
+    color: @foreground;
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+window#waybar.empty #window {
+    background-color: transparent;
+    border-color: transparent;
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+tooltip {
+    background-color: @color12;
+    color: @foreground;
+    border-radius: 10px;
+    border-width: 1.5px;
+    border-style: solid;
+    border-color: @color9;
+    transition: 0.3s;
+    opacity: 0.9;
+}
+
+#workspaces {
+	border-radius: 20px;
+    background: @background;
+    opacity: 1;
+    padding: 0px 10px;
+    margin: 0;
+    margin-top: 5px;
+	border: 2px solid @color12;
+}
+
+#workspaces button {
+    color: @color10;
+    box-shadow: none;
+	text-shadow: none;
+    padding-right: 12px;
+    border-radius: 9px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button.active,
+#workspaces button.active {
+    color: @color12;
+    padding-right: 12px;
+    background-color: @background;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button.urgent {
+    color: #11111b;
+    border-radius: 10px;
+}
+
+#taskbar button:hover,
+#workspaces button:hover {
+    color: @color12;
+    padding-left: 0px;
+    padding-right: 2px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#custom-backlight,
+#custom-cava_mviz,
+#custom-cycle_wall,
+#custom-hint,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-swaync,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default,
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+	border-radius: 20px;
+    background: @background;
+    opacity: 1;
+    padding: 0px 10px;
+    margin: 0;
+    margin-top: 5px;
+	border: 2px solid @color13;
+}
+
+#cpu {
+    border: 2px solid @color5;
+	color: @foreground;
+    background: @color12;
+}
+
+#memory {
+	color: @foreground;
+    background: @color12;
+}
+
+#disk {
+	color: @foreground;
+    background: @color12;
+    border: 2px solid @color13;
+}
+
+#temperature{
+	color: @foreground;
+    background: @color12;
+}
+
+#temperature.critical {
+    color: red;
+	border: 2px solid red;
+}
+
+#custom-power {
+    color: red;
+    padding-left: 10px;
+	padding-right: 2px;
+	border: 2px solid red;
+}
+
+#backlight {
+    color: #f9e2af;
+    padding-right: 5px;
+}
+
+#tray {
+    border-radius: 20px;
+    margin-right: 5px;
+/*    padding: 0px 4px; */
+    padding-left: 15px;
+    padding-right: 15px;
+    border: 2px solid @color7;
+}
+
+#mpris {
+    padding-left: 15px;	
+}
+#tray.empty {
+    background-color: transparent;
+    border-color: transparent;
+    border: 0px;
+}
+
+#window {
+    margin-left: 5px;
+    margin-right: 5px;
+    border: 2px solid @color9;
+}
+
+#clock {
+    color: #fab387;
+}
+
+
+#bluetooth {
+    color: #b4befe;
+    margin-right: 10px
+} 
+
+#pulseaudio.microphone,
+#pulseaudio {
+    background-color: @color12;
+    color: #89b4fa;
+	border: 2px solid @color13;
+}
+
+#pulseaudio.muted {
+    color: #f38ba8;
+    padding-right: 20px;
+}
+
+#battery {
+    color: #a6e3a1;
+    margin-right: 5px;
+    padding-right: 15px;
+	border: 2px solid @color14;
+}
+
+#idle_inhibitor.activated {
+	color: @color12;
+	border: 2px solid @color12;
+}
+
+#battery.good {
+    color: #ffd57a;
+	border: 2px solid @color15;
+}
+
+#battery.warning {
+    color: #fab387;
+    border-left: 0px;
+	border: 2px solid @color12;
+}
+
+#battery.charging {
+    color: #a6e3a1;
+}
+
+#battery.critical {
+    color: #f38ba8;
+    border-left: 0px;
+	border: 2px solid @color8;
+}
+
+#custom-weather {
+    color: #8eacf3;
+    border-right: 0px;
+    margin-left: 0px;
+    margin-right: 5px;
+}
+
+#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+	min-width: 80px;
+	min-height: 5px;
+	border-radius: 5px;
+}
+
+#pulseaudio-slider highlight {
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#backlight-slider trough {
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+}	
diff --git a/config/waybar/style/[Wallust Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
index 189be61f..8b9ded8d 100644
--- a/config/waybar/style/[Wallust Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
@@ -108,6 +108,7 @@ window#waybar.empty #window {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #temperature,
 #tray,
diff --git a/config/waybar/style/[Wallust] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css
index 9ee29a21..f24db6fd 100644
--- a/config/waybar/style/[Wallust] Chroma Edge.css
+++ b/config/waybar/style/[Wallust] Chroma Edge.css
@@ -99,6 +99,7 @@ tooltip label{
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Wallust] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css
index e8a04270..519dd5c6 100644
--- a/config/waybar/style/[Wallust] Chroma Fusion.css
+++ b/config/waybar/style/[Wallust] Chroma Fusion.css
@@ -67,6 +67,7 @@ tooltip {
 #memory,
 #mode,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/style/[Wallust] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css
index 24f08dfd..98c13984 100644
--- a/config/waybar/style/[Wallust] Chroma Tally.css
+++ b/config/waybar/style/[Wallust] Chroma Tally.css
@@ -81,6 +81,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Wallust] Colored.css b/config/waybar/style/[Wallust] Colored.css
index 8bc12221..5b78d073 100644
--- a/config/waybar/style/[Wallust] Colored.css
+++ b/config/waybar/style/[Wallust] Colored.css
@@ -126,6 +126,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar,
diff --git a/config/waybar/style/[Wallust] Simple.css b/config/waybar/style/[Wallust] Simple.css
index 77d39c60..b69f686a 100644
--- a/config/waybar/style/[Wallust] Simple.css
+++ b/config/waybar/style/[Wallust] Simple.css
@@ -113,6 +113,7 @@ tooltip {
 #mode,
 #mpris,
 #network,
+#power-profiles-daemon,
 #pulseaudio,
 #pulseaudio-slider,
 #taskbar button,
diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css
index a9c70909..8a28025e 100644
--- a/config/waybar/wallust/colors-waybar.css
+++ b/config/waybar/wallust/colors-waybar.css
@@ -1,20 +1,20 @@
-@define-color foreground #D1F8FD;
-@define-color background rgba(6,4,2,0.25);
-@define-color cursor #D1F8FD;
+@define-color foreground #FDF1E6;
+@define-color background rgba(1,4,7,0.25);
+@define-color cursor #FDF1E6;
 
-@define-color color0 #060402;
-@define-color color1 #7A6835;
-@define-color color2 #677762;
-@define-color color3 #2586B5;
-@define-color color4 #998C72;
-@define-color color5 #94A7B8;
-@define-color color6 #5CB1BC;
-@define-color color7 #B5EDF4;
-@define-color color8 #7EA6AB;
-@define-color color9 #A38A46;
-@define-color color10 #899F83;
-@define-color color11 #31B2F1;
-@define-color color12 #CCBA98;
-@define-color color13 #C6DEF5;
-@define-color color14 #7BECFA;
-@define-color color15 #B5EDF4;
+@define-color color0 #010407;
+@define-color color1 #6F2229;
+@define-color color2 #5B4E57;
+@define-color color3 #A63D3A;
+@define-color color4 #1B6C77;
+@define-color color5 #9B6F77;
+@define-color color6 #BBA189;
+@define-color color7 #F4E2D3;
+@define-color color8 #AA9E93;
+@define-color color9 #942D37;
+@define-color color10 #7A6874;
+@define-color color11 #DE514D;
+@define-color color12 #24909F;
+@define-color color13 #CF949F;
+@define-color color14 #F9D6B7;
+@define-color color15 #F4E2D3;
diff --git a/config/wlogout/style.css b/config/wlogout/style.css
index cd07718d..362c2f3f 100644
--- a/config/wlogout/style.css
+++ b/config/wlogout/style.css
@@ -34,7 +34,7 @@ button:hover {
     margin: 30px;
     border-radius: 80px; 
     transition: all 0.3s cubic-bezier(.55, 0.0, .28, 1.682), box-shadow 0.2s ease-in-out, background-color 0.2s ease-in-out;
-    box-shadow: 0 0 50px @color9; 
+    box-shadow: 0 0 50px @color7; 
 	
 }