diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc
index e20c4cc..74d500d 100755
--- a/config/dunst/dunstrc
+++ b/config/dunst/dunstrc
@@ -281,7 +281,7 @@
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#00000080"
+    background = "#00000095"
     foreground = "#fafafa"
     frame_color = "#3C27C7"
     timeout = 2
@@ -289,7 +289,7 @@
     icon = $HOME/.config/dunst/images/bell.png
 
 [urgency_normal]
-    background = "#00000080"
+    background = "#00000095"
     foreground = "#fafafa"
     frame_color = "#3C27C7"
     timeout = 5
@@ -297,7 +297,7 @@
     icon = $HOME/.config/dunst/images/bell.png
 
 [urgency_critical]
-    background = "#00000080"
+    background = "#00000095"
     foreground = "#fafafa"
     frame_color = "#3C27C7"
     timeout = 0
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
old mode 100644
new mode 100755
index d5ce323..797f49c
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -1,30 +1,39 @@
 #!/bin/bash
 
-# THIS SCRIPT CAN BE DELETED ONCE BOOTED!!
+# A bash script designed to run only once dotfiles installed
+
+# THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Execs.conf
+# not necessary to do since this script is only designed to run only once as long as the marker exists
+
+# Variables
+scriptsDir=$HOME/.config/hypr/scripts
+wallpaper=$HOME/Pictures/wallpapers/anime-girl-abyss.png
+
+swww="swww img"
+effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2"
 
-# A bash script designed to ran it only once dotfiles installed
 # Check if a marker file exists.
 if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
 
-	# Check if the ~/.cache/wal directory exists
-	if [ ! -d ~/.cache/wal ]; then
-    	printf " Initializing pywal........\n\n"
-    	# Check if the ~/Pictures/wallpapers directory exists
-    	if [ -d ~/Pictures/wallpapers ]; then
-        	# Run wal with random wallpapers from ~/Pictures/wallpapers
-        	wal -i ~/Pictures/wallpapers/mecha-nostalgia.png 
-        	echo "Pywal initialized"
-		fi
-	fi
-
-	#initial symlink for Pywal Dark and Light for Rofi Themes
-	ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
-	
-	# Initial scripts to load inorder to have a proper wallpaper waybar and pywal themes
-	exec $HOME/.config/hypr/scripts/Wallpaper.sh &
-	
+    # Initialize pywal
+    printf " Initializing pywal........\n\n"
+    wal -i "$wallpaper"
+
+    # Initial symlink for Pywal Dark and Light for Rofi Themes
+    ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
+
+    # Initial scripts to load in order to have a proper wallpaper waybar and pywal themes
+    pkill swww && swww init || swww query && $swww "$wallpaper" $effect
+
+    # Refreshing waybar, dunst, rofi etc. 
+    "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 &
+    "$scriptsDir/Refresh.sh" > /dev/null 2>&1 &
+    
+    # initiate the kb_layout (for some reason) waybar cant launch it
+    "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 &
+
     # Create a marker file to indicate that the script has been executed.
     touch ~/.config/hypr/.initial_startup_done
-fi
-
 
+    exit
+fi
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 2072e1b..dc7adda 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -46,7 +46,7 @@ notify_user "$next_mode"
 
 # Change background for dunst
 if [ "$next_mode" = "dark" ]; then
-    sed -i '/background = /s/.*/    background = "#00000080"/' "${dunst_config}/dunstrc"
+    sed -i '/background = /s/.*/    background = "#00000095"/' "${dunst_config}/dunstrc"
 	sed -i '/foreground = /s/.*/    foreground = "#fafafa"/' "${dunst_config}/dunstrc"
 else
     sed -i '/background = /s/.*/    background = "#FFFFFF80"/' "${dunst_config}/dunstrc"
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
new file mode 100755
index 0000000..e7c56b4
--- /dev/null
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+layout_f="$HOME/.cache/kb_layout"
+settings_file="$HOME/.config/hypr/configs/Settings.conf"
+
+# Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found
+if [ ! -f "$layout_f" ]; then
+  default_layout=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null)
+  if [ -z "$default_layout" ]; then
+    default_layout="us" # Default to 'us' layout if Settings.conf or 'kb_layout' is not found
+  fi
+  echo "$default_layout" > "$layout_f"
+fi
+
+current_layout=$(cat "$layout_f")
+
+# Read keyboard layout settings from Settings.conf
+if [ -f "$settings_file" ]; then
+  kb_layout_line=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2)
+  IFS=',' read -ra layout_mapping <<< "$kb_layout_line"
+fi
+
+layout_count=${#layout_mapping[@]}
+
+# Find the index of the current layout in the mapping
+for ((i = 0; i < layout_count; i++)); do
+  if [ "$current_layout" == "${layout_mapping[i]}" ]; then
+    current_index=$i
+    break
+  fi
+done
+
+# Calculate the index of the next layout
+next_index=$(( (current_index + 1) % layout_count ))
+new_layout="${layout_mapping[next_index]}"
+
+# Update the keyboard layout
+hyprctl keyword input:kb_layout "$new_layout"
+echo "$new_layout" > "$layout_f"
diff --git a/config/hypr/v2.1.16 b/config/hypr/v2.1.17
similarity index 100%
rename from config/hypr/v2.1.16
rename to config/hypr/v2.1.17
diff --git a/config/waybar/configs/Camellia [Bottom] b/config/waybar/configs/Camellia [Bottom]
index 02118d3..a7b995c 100644
--- a/config/waybar/configs/Camellia [Bottom]	
+++ b/config/waybar/configs/Camellia [Bottom]	
@@ -43,7 +43,7 @@
 	"on-click": "activate",
 	"on-scroll-up": "hyprctl dispatch workspace e+1",
 	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"persistent_workspaces":{
+	"persistent-workspaces":{
 		"1": [],
 		"2": [],
 		"3": [],
diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/Camellia [TOP]
index cb265b7..2aa21cb 100644
--- a/config/waybar/configs/Camellia [TOP]	
+++ b/config/waybar/configs/Camellia [TOP]	
@@ -43,7 +43,7 @@
 	"on-click": "activate",
 	"on-scroll-up": "hyprctl dispatch workspace e+1",
 	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"persistent_workspaces":{
+	"persistent-workspaces":{
 		"1": [],
 		"2": [],
 		"3": [],
diff --git a/config/waybar/configs/Def[Bottom]-Laptop b/config/waybar/configs/Def[Bottom]-Laptop
new file mode 100644
index 0000000..47df83c
--- /dev/null
+++ b/config/waybar/configs/Def[Bottom]-Laptop
@@ -0,0 +1,67 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Bottom - Laptop### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "bottom",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+//"margin-top": 6,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"hyprland/workspaces#pacman",
+	"custom/separator#dot-line",
+	"cpu",
+	"custom/separator#dot-line", 
+	"temperature",
+	"custom/separator#dot-line", 
+	"memory",
+	"custom/separator#dot-line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/menu",
+	"custom/separator#dot-line",
+	"idle_inhibitor", 
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#dot-line",
+	"custom/light_dark",
+	"custom/separator#dot-line",	
+	"custom/lock",
+	//],
+	"custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
+
+"modules-right": [
+	//"hyprland/window", 
+	"tray",
+	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
+	"network#speed",
+	"custom/separator#dot-line", 
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
+	"pulseaudio",
+	"custom/separator#dot-line",
+	"pulseaudio#microphone",
+	"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
diff --git a/config/waybar/configs/Def[TOP]-Laptop b/config/waybar/configs/Def[TOP]-Laptop
new file mode 100644
index 0000000..b322a75
--- /dev/null
+++ b/config/waybar/configs/Def[TOP]-Laptop
@@ -0,0 +1,67 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Top -Laptop ### //
+{
+"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": [
+	"hyprland/workspaces#pacman",
+	"custom/separator#dot-line",
+	"cpu",
+	"custom/separator#dot-line", 
+	"temperature",
+	"custom/separator#dot-line", 
+	"memory",
+	"custom/separator#dot-line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/menu",
+	"custom/separator#dot-line",
+	"idle_inhibitor", 
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#dot-line",
+	"custom/light_dark",
+	"custom/separator#dot-line",	
+	"custom/lock",
+	//],
+	"custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
+
+"modules-right": [
+	//"hyprland/window", 
+	"tray",
+	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
+	"network#speed",
+	"custom/separator#dot-line", 
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
+	"pulseaudio",
+	"custom/separator#dot-line",
+	"pulseaudio#microphone",
+	"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom]
index 8bf8ecd..35ff7f2 100644
--- a/config/waybar/configs/Default [Bottom]	
+++ b/config/waybar/configs/Default [Bottom]	
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT ### //
+// ### DEFAULT Bottom ### //
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
@@ -50,17 +50,14 @@
 	"custom/separator#dot-line",
 	"network#speed",
 	"custom/separator#dot-line", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
-	//"wireplumber", 
 	"pulseaudio#microphone",
 	"custom/separator#dot-line",
 	"keyboard-state",
 	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
 	"custom/power",
 	],
 }
diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP]
index eabaf37..69e1046 100644
--- a/config/waybar/configs/Default [TOP]	
+++ b/config/waybar/configs/Default [TOP]	
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT ### //
+// ### DEFAULT - Top ### //
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
@@ -50,17 +50,14 @@
 	"custom/separator#dot-line",
 	"network#speed",
 	"custom/separator#dot-line", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
-	//"wireplumber", 
 	"pulseaudio#microphone",
 	"custom/separator#dot-line",
 	"keyboard-state",
 	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
 	"custom/power",
 	],
 }
\ No newline at end of file
diff --git a/config/waybar/modules b/config/waybar/modules
index a4567c0..093d188 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -11,7 +11,7 @@
     "on-click": "activate",
     "on-scroll-up": "hyprctl dispatch workspace e+1",
     "on-scroll-down": "hyprctl dispatch workspace e-1",
-    "persistent_workspaces": {
+    "persistent-workspaces": {
       "1": [],
       "2": [],
       "3": [],
@@ -32,7 +32,7 @@
     "on-click": "activate",
     "on-scroll-up": "hyprctl dispatch workspace e+1",
     "on-scroll-down": "hyprctl dispatch workspace e-1",
-    "persistent_workspaces":{
+    "persistent-workspaces":{
         "1": [],
         "2": [],
         "3": [],
@@ -62,7 +62,7 @@
     "on-scroll-up": "hyprctl dispatch workspace e+1",
     "on-scroll-down": "hyprctl dispatch workspace e-1",
     "show-special": false,
-    "persistent_workspaces":{
+    "persistent-workspaces":{
         "1": [],
         "2": [],
         "3": [],
@@ -81,7 +81,7 @@
     "disable-scroll": true,
     "all-outputs": true,
     "format": "{icon}",
-    "persistent_workspaces": {
+    "persistent-workspaces": {
       "1": [],
       "2": [],
       "3": [],
@@ -446,7 +446,7 @@
   "custom/cycle_wall":{
     "format":" ",
     "on-click": "~/.config/hypr/scripts/WallpaperSelect.sh",
-    "on-click-right": "~/.config/hypr/scripts/Wallpaper.sh swww",
+    "on-click-right": "~/.config/hypr/scripts/Wallpaper.sh",
     "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh",
     "tooltip": true,
     "tooltip-format": "Change wallpaper or style"
@@ -457,12 +457,21 @@
     "tooltip": false,
     "on-click": "~/.config/hypr/scripts/KeyHints.sh",
   },
+
+  "custom/keyboard": {
+	"exec": "cat ~/.cache/kb_layout",
+	"interval": 1,
+	"format": " {}",
+	"on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
+	"tooltip": false,
+  },
+
     
   "custom/light_dark": {
     "format": "",
     "on-click": "~/.config/hypr/scripts/DarkLight.sh",
     "on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh",
-    "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh swww",
+    "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh",
     "tooltip": false,
   },
       
@@ -640,7 +649,7 @@
   "temperature#vertical": {
     "interval": 10,
     "tooltip": true,
-    "hwmon-path": ["/sys/class/hwmon/hwmon1/temp1_input", "/sys/class/thermal/thermal_zone0/temp"],
+    "hwmon-path": ["/sys/class/hwmon/hwmon6/temp1_input", "/sys/class/thermal/thermal_zone0/temp"],
     //"thermal-zone": 0,
     "critical-threshold": 80,
     "format-critical": "{icon}\n{temperatureC}°C",
diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css
index 619b24a..1f12b54 100644
--- a/config/waybar/style/Catppuccin-Latte.css
+++ b/config/waybar/style/Catppuccin-Latte.css
@@ -17,7 +17,7 @@ window#waybar {
   transition-property: background-color;
   transition-duration: 0.5s;
   /*background: transparent;*/
-  border-bottom: 3px solid @sapphire;
+  border-bottom: 2px solid @sapphire;
   background: @theme_base_color;
   border-radius: 10px;
 }
@@ -53,8 +53,6 @@ window#waybar.hidden {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -72,6 +70,7 @@ window#waybar.hidden {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
@@ -133,6 +132,7 @@ window#waybar.hidden {
   color: @green;
 }
 
+#custom-keyboard,
 #memory {
   color: @sky;
 }
diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css
index eceb569..93f5fda 100644
--- a/config/waybar/style/Catppuccin-Mocha.css
+++ b/config/waybar/style/Catppuccin-Mocha.css
@@ -59,8 +59,6 @@ window#waybar.hidden {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -78,6 +76,7 @@ window#waybar.hidden {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
@@ -139,6 +138,7 @@ window#waybar.hidden {
   color: @green;
 }
 
+#custom-keyboard,
 #memory {
   color: @sky;
 }
@@ -178,7 +178,7 @@ window#waybar.hidden {
 }
 
 #workspaces button:hover {
-	border-radius: 8px;
+	border-radius: 10px;
 	color: @overlay0;
 	background-color: @surface0;
  	padding-left: 2px;
@@ -188,13 +188,13 @@ window#waybar.hidden {
 }
 
 #workspaces button.persistent {
-  	color: @surface1;
-  	border-radius: 10px;
+	color: @surface1;
+	border-radius: 10px;
 }
 
 #workspaces button.active {
-  	color: @peach;
-  	border-radius: 8px;
+	color: @peach;
+  	border-radius: 10px;
     padding-left: 8px;
     padding-right: 8px;
     animation: gradient_f 20s ease-in infinite;
@@ -202,8 +202,8 @@ window#waybar.hidden {
 }
 
 #workspaces button.urgent {
-  color: @red;
-  border-radius: 0px;
+	color: @red;
+ 	border-radius: 0px;
 }
 
 #taskbar button.active {
diff --git a/config/waybar/style/Chroma Edge.css b/config/waybar/style/Chroma Edge.css
index fac5035..797d0d6 100644
--- a/config/waybar/style/Chroma Edge.css	
+++ b/config/waybar/style/Chroma Edge.css	
@@ -49,9 +49,10 @@ tooltip {
 tooltip label{
 	color: #cdd6f4;
 }
+
 #workspaces button {
-	color: #7984a4;
-	background-color: transparent;
+    background-color: transparent;
+    color: grey;
     box-shadow: none;
 	text-shadow: none;
     padding: 0px;
@@ -62,21 +63,24 @@ tooltip label{
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
-#workspace button.hover {
-	background-color: transparent;
-    padding-left: 2px;
-    padding-right: 2px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
 #workspaces button.active {
-	color: white;
+    background-color: transparent;
+    color: #D3D3D3;
     padding-left: 8px;
     padding-right: 8px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+	color: #D3D3D3;
+    padding-left: 2px;
+    padding-right: 2px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
 #workspaces button.urgent {
 	background-color: #eb4d4b;
 }
@@ -107,6 +111,7 @@ tooltip label{
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
@@ -162,6 +167,7 @@ tooltip label{
 	background-color: rgba(50, 50, 50, 0.1);
 }
 
+#custom-keyboard,
 #memory {
 	color: #ebcb8b;
 }
diff --git a/config/waybar/style/Chroma Glow.css b/config/waybar/style/Chroma Glow.css
index 46cfe7c..90a2677 100644
--- a/config/waybar/style/Chroma Glow.css	
+++ b/config/waybar/style/Chroma Glow.css	
@@ -72,6 +72,7 @@ tooltip label{
 
 #workspaces button:hover {
     background: rgba(0, 0, 0, 0.2);
+	color: #D3D3D3;
     padding-left: 2px;
     padding-right: 2px;
     animation: gradient_f 20s ease-in infinite;
@@ -102,8 +103,6 @@ tooltip label{
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -121,6 +120,7 @@ tooltip label{
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
@@ -194,6 +194,7 @@ label:focus {
     background-color: #000000;
 }
 
+#custom-keyboard,
 #custom-menu{
     color: yellow;
     /*padding: 3px;*/
diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css
index 04b68dc..3302a66 100644
--- a/config/waybar/style/Chroma Tally.css	
+++ b/config/waybar/style/Chroma Tally.css	
@@ -15,8 +15,8 @@ padding: 1px;
 
 window#waybar {
     background: rgba (0, 0, 0, 0.5);
-    border-radius: 20px 20px 20px 20px;
-	border-bottom: 3px;
+    border-radius: 12px;
+	border-bottom: 2px;
     border-style: solid;
 	border-color: @color2; 
 }
@@ -43,6 +43,7 @@ window#waybar {
 }
 
 #workspaces button:hover {
+	color: @color2;
 	background-color: rgba(0,153,153,0);
     padding-left: 2px;
     padding-right: 2px;
@@ -59,8 +60,6 @@ window#waybar {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -78,6 +77,7 @@ window#waybar {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
@@ -147,6 +147,8 @@ window#waybar {
 #disk {
 	color: #94e2d5;
 }
+
+#custom-keyboard,
 #memory {
     color: #d3869b;
 }
diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css
index 44c20e0..8d139d1 100644
--- a/config/waybar/style/Crimson.css
+++ b/config/waybar/style/Crimson.css
@@ -116,8 +116,6 @@ tooltip {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -135,6 +133,7 @@ tooltip {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Crystal Clear.css b/config/waybar/style/Crystal Clear.css
index 324c7aa..566b196 100644
--- a/config/waybar/style/Crystal Clear.css	
+++ b/config/waybar/style/Crystal Clear.css	
@@ -102,8 +102,6 @@ tooltip {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -119,6 +117,7 @@ tooltip {
 #workspaces,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Golden Noir.css b/config/waybar/style/Golden Noir.css
index 2540188..42ae216 100644
--- a/config/waybar/style/Golden Noir.css	
+++ b/config/waybar/style/Golden Noir.css	
@@ -128,8 +128,6 @@ tooltip {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -147,6 +145,7 @@ tooltip {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Monochrome Contrast.css b/config/waybar/style/Monochrome Contrast.css
index a8832e6..33d85bf 100644
--- a/config/waybar/style/Monochrome Contrast.css	
+++ b/config/waybar/style/Monochrome Contrast.css	
@@ -40,7 +40,7 @@ tooltip label{
 .modules-right {
 	background-color: white;
 	color: black;
-	border-bottom: 4px;
+	border-bottom: 2px;
 	border-style: solid;
 	border-color: black;
 	border-radius: 10px;
@@ -52,7 +52,7 @@ tooltip label{
 .modules-center {
 	background-color: white;
 	color: black;
-	border-bottom: 4px;
+	border-bottom: 2px;
 	border-style: solid;
 	border-color: black;
 	border-radius: 10px;
@@ -64,7 +64,7 @@ tooltip label{
 .modules-left {
 	background-color: white;
 	color: black;
-	border-bottom: 4px;
+	border-bottom: 2px;
 	border-style: solid;
 	border-color: black;
 	border-radius: 10px;
@@ -115,8 +115,6 @@ tooltip label{
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -134,6 +132,7 @@ tooltip label{
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Monochrome Manifest.css b/config/waybar/style/Monochrome Manifest.css
index 2d4cafd..073f727 100644
--- a/config/waybar/style/Monochrome Manifest.css	
+++ b/config/waybar/style/Monochrome Manifest.css	
@@ -85,7 +85,7 @@ tooltip label{
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 #workspaces button:hover {
-	color: grey;
+	color: white;
 	background-color: rgba(0,153,153,0.2);
     padding-left: 2px;
     padding-right: 2px;
@@ -114,8 +114,6 @@ tooltip label{
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -133,6 +131,7 @@ tooltip label{
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Obsidian Edge.css b/config/waybar/style/Obsidian Edge.css
index 59f5828..53aa79b 100644
--- a/config/waybar/style/Obsidian Edge.css	
+++ b/config/waybar/style/Obsidian Edge.css	
@@ -121,8 +121,6 @@ tooltip label {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -140,6 +138,7 @@ tooltip label {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Obsidian Glow.css b/config/waybar/style/Obsidian Glow.css
index e790730..df6a968 100644
--- a/config/waybar/style/Obsidian Glow.css	
+++ b/config/waybar/style/Obsidian Glow.css	
@@ -90,8 +90,6 @@ tooltip label {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -109,6 +107,7 @@ tooltip label {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css
index 3a6c690..7d89f32 100644
--- a/config/waybar/style/Purpl.css
+++ b/config/waybar/style/Purpl.css
@@ -125,8 +125,6 @@ tooltip {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -144,6 +142,7 @@ tooltip {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Pywal Simple.css b/config/waybar/style/Pywal Simple.css
index 83d73cd..321f6e8 100644
--- a/config/waybar/style/Pywal Simple.css	
+++ b/config/waybar/style/Pywal Simple.css	
@@ -106,8 +106,6 @@ tooltip {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -125,6 +123,7 @@ tooltip {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Pywal.css b/config/waybar/style/Pywal.css
index 411cf42..74e71a6 100644
--- a/config/waybar/style/Pywal.css
+++ b/config/waybar/style/Pywal.css
@@ -122,8 +122,6 @@ tooltip {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -141,6 +139,7 @@ tooltip {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Rainbow Spectrum.css b/config/waybar/style/Rainbow Spectrum.css
index 9f0c704..aa140f0 100644
--- a/config/waybar/style/Rainbow Spectrum.css	
+++ b/config/waybar/style/Rainbow Spectrum.css	
@@ -57,8 +57,6 @@ tooltip label{
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -76,6 +74,7 @@ tooltip label{
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
@@ -138,6 +137,7 @@ tooltip label{
 	background-color: #a6e3a1;
 }
 
+#custom-keyboard,
 #keyboard-state,
 #keyboard-state label,
 #keyboard-state label.locked,
diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css
index 261f4b6..856edc0 100644
--- a/config/waybar/style/Rose Pine.css	
+++ b/config/waybar/style/Rose Pine.css	
@@ -107,8 +107,6 @@ tooltip {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -123,6 +121,7 @@ tooltip {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css
index b21c4ac..32831fe 100644
--- a/config/waybar/style/Simple Pink.css	
+++ b/config/waybar/style/Simple Pink.css	
@@ -129,8 +129,6 @@ tooltip {
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -148,6 +146,7 @@ tooltip {
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
diff --git a/config/waybar/style/Translucent Chromatic.css b/config/waybar/style/Translucent Chromatic.css
index b6f3c41..afe0c10 100644
--- a/config/waybar/style/Translucent Chromatic.css	
+++ b/config/waybar/style/Translucent Chromatic.css	
@@ -76,7 +76,7 @@ tooltip label{
 
 #workspaces button.active {
     background-color: transparent;
-    color: #D3D3D3;
+    color: @accent1;
     padding-left: 8px;
     padding-right: 8px;
     animation: gradient_f 20s ease-in infinite;
@@ -85,6 +85,7 @@ tooltip label{
 
 #workspaces button:hover {
     background: rgba(0, 0, 0, 0.2);
+	color: @accent3;
     padding-left: 2px;
     padding-right: 2px;
     animation: gradient_f 20s ease-in infinite;
@@ -93,7 +94,7 @@ tooltip label{
 
 #workspaces button.focused {
     background-color: #bbccdd;
-    color: #323232;
+    color: @accent2;
     /* box-shadow: inset 0 -3px #ffffff; */
 }
 
@@ -115,8 +116,6 @@ tooltip label{
 #cpu,
 #disk,
 #idle_inhibitor,
-#keyboard-state label,
-#keyboard-state label.locked,
 #keyboard-state,
 #memory,
 #mode,
@@ -134,6 +133,7 @@ tooltip label{
 #custom-backlight,
 #custom-cycle_wall,
 #custom-keybinds,
+#custom-keyboard,
 #custom-light_dark,
 #custom-lock,
 #custom-menu,
@@ -212,6 +212,7 @@ label:focus {
     /*padding: 3px;*/
 }
 
+#custom-keyboard,
 #cpu {
     color: @accent1;
 }
@@ -279,6 +280,7 @@ label:focus {
     color: #ffa000;
 }
 
+#keyboard-state,
 #temperature {
     color: @accent6;
     /* background-color: #f0932b; */
diff --git a/copy.sh b/copy.sh
index 2efc116..bb5e769 100755
--- a/copy.sh
+++ b/copy.sh
@@ -173,10 +173,7 @@ cp -r config/* ~/.config/ && { echo "${OK}Copy completed!"; } || { echo "${ERROR
 mkdir -p ~/Pictures/wallpapers
 cp -r wallpapers ~/Pictures/ && { echo "${OK}Copy completed!"; } || { echo "${ERROR} Failed to copy wallpapers."; exit 1; } 2>&1 | tee -a "$LOG"
 
-# Initial Symlinks to avoid errors
-# symlinks for waybar
-ln -sf "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/config" && \
-ln -sf "$HOME/.config/waybar/style/Golden Noir.css" "$HOME/.config/waybar/style.css" && \
+
 
   
 # Set some files as executable
@@ -206,8 +203,25 @@ if [[ $WALL =~ ^[Yy]$ ]]; then
   fi
 fi
 
+# Initial Symlinks to avoid errors
+
+# Detect machine type and set Waybar configurations accordingly, logging the output
+if hostnamectl | grep -q 'Chassis: desktop'; then
+    # Configurations for a desktop
+    ln -sf "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/Def[TOP]-Laptop" "$HOME/.config/waybar/configs/Def[Bottom]-Laptop" 2>&1 | tee -a "$LOG"
+else
+    # Configurations for a laptop or any system other than desktop
+    ln -sf "$HOME/.config/waybar/configs/Def[TOP]-Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/configs/Default [Bottom]" 2>&1 | tee -a "$LOG"
+fi
+
+
+# symlinks for waybar style
+ln -sf "$HOME/.config/waybar/style/Golden Noir.css" "$HOME/.config/waybar/style.css" && \
+
 # initialize pywal to avoid config error on hyprland
-wal -i ~/Pictures/wallpapers/mecha-nostalgia.png 2>&1 | tee -a "$LOG"
+wal -i ~/Pictures/wallpapers/anime-girl-abyss.png 2>&1 | tee -a "$LOG"
 
 #initial symlink for Pywal Dark and Light for Rofi Themes
 ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
diff --git a/wallpapers/anime-girl-abyss.png b/wallpapers/anime-girl-abyss.png
new file mode 100644
index 0000000..6871f0e
Binary files /dev/null and b/wallpapers/anime-girl-abyss.png differ