diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index c9cfa04aa66dbd093d40706c37b971bc2b0b4850..199f4ea943ca5a6fbb9d0001cf390ead6307d5d1 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,26 +1,46 @@
-[
+// -*- mode: jsonc -*-
 {
     "ipc": true,
     "id": "bar-0",
-	// "layer": "top", // Waybar at top layer
-	"position": "top", // Waybar position (top|bottom|left|right)
-	// "height": 10, // Waybar height (to be removed for auto height)
-	// "width": 1280, // Waybar width
+    // "layer": "top", // Waybar at top layer
+    "position": "top", // Waybar position (top|bottom|left|right)
+    // "height": 10, // Waybar height (to be removed for auto height)
+    // "width": 1280, // Waybar width
 
-	// Choose the order of the modules
-	"modules-left": [
-		"sway/hide", // Hiding support via sway IPC
-		"sway/workspaces",
-		"sway/mode"
-	],
-	//"modules-center": ["sway/window"],
-	"modules-center": ["clock"],
-	"modules-right": ["custom/disk_home", "temperature", "cpu", "memory", "network", "backlight", "pulseaudio", "sway/language", "battery", "idle_inhibitor", "tray"],
+    // Choose the order of the modules
+    "modules-left": [
+        "sway/hide", // Hiding support via sway IPC
+        "sway/workspaces",
+        "sway/mode",
+        "sway/scratchpad",
+        "custom/media"
+    ],
+    //"modules-center": ["sway/window"],
+    "modules-center": [
+        "clock",
+        "idle_inhibitor",
+    ],
+    "modules-right": [
+        "custom/disk_home",
+        "temperature",
+        "cpu",
+        "memory",
+        "network",
+        "backlight",
+        "pulseaudio",
+        "keyboard-state",
+        "sway/language",
+        "battery",
+        "battery#bat2",
+        "tray"
+    ],
+    
 
     // Modules configuration
     "sway/workspaces": {
          "disable-scroll": true,
          "all-outputs": false,
+         "warp-on-scroll": false,
          "numeric-first": true,
          //"format": "{name}: {icon}",
          "format": "{index}"
@@ -35,154 +55,31 @@
              //"default": ""
          //}
      },
-	// Modules configuration
-	// "sway/workspaces": {
-	// 	"disable-scroll": true,
-	// 	"all-outputs": true,
-	// 	"format": "{name}: {icon}",
-	// 	"format-icons": {
-	// 		"1": "",
-	// 		"2": "",
-	// 		"3": "",
-	// 		"4": "",
-	// 		"5": "",
-	// 		"urgent": "",
-	// 		"focused": "",
-	// 		"default": ""
-	// 	}
-	// },
-	"sway/mode": {
-		"format": "{}"
-	},
-	"custom/arch_update": {
-		"format": "<span color='#589df6'></span>{}",
-		"interval": 30,
-		"exec": "~/.config/i3blocks/bin/arch_update.py -b '#e4e4e4' -u '#e4e4e4' -q"
-	},
-	"custom/disk_home": {
-		"format": "🏠 {} ",
-		"interval": 30,
-		"exec": "df -h --output=avail $HOME | tail -1 | tr -d ' '"
-	},
-	"custom/disk_root": {
-		"format": "💽 {} ",
-		"interval": 30,
-		"exec": "df -h --output=avail / | tail -1 | tr -d ' '"
-	},
-	"temperature": {
-		// "thermal-zone": 2,
-		// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-		"critical-threshold": 80,
-		// "format-critical": "{temperatureC}°C {icon}",
-		"format": "<span color='#e88939'>{icon}</span> {temperatureC}°C",
-		"format-icons": ["", "", ""]
-	},
-	"cpu": {
-		"format": "🏭 {usage}%",
-		"tooltip": true
-	},
-	"memory": {
-		"format": "💾 {used:0.1f}G"
-	},
-	"custom/mail": {
-		"format": "📩{}",
-		"interval": 30,
-		"exec": "notmuch count tag:flagged OR tag:inbox AND NOT tag:killed"
-	},
-	"network": {
-		"family": "ipv4",
-		// "interface": "wlp2*", // (Optional) To force the use of this interface
-		"format-wifi": "<span color='#589df6'></span> <span color='gray'>{essid}</span> {frequency} <span color='#589df6'>{signaldBm} dB</span> <span color='#589df6'>⇵</span>",
-		//"format-wifi": "<span color='#589df6'></span> <span color='gray'>{essid}</span> {frequency} <span color='#589df6'>{signaldBm} dB</span> <span color='#589df6'>⇵</span> {bandwidthUpBits}/{bandwidthDownBits}",
-		"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
-		"format-linked": "{ifname} (No IP) ",
-		"format-disconnected": "Disconnected ⚠",
-		"format-alt": "{ifname}: {ipaddr}/{cidr}",
-		"interval": 5
-	},
-	"backlight": {
-		// "device": "acpi_video1",
-		"format": "{icon} {percent}%",
-		"format-icons": ["🔅", "🔆"]
-	},
-	"pulseaudio": {
-		// "scroll-step": 1, // %, can be a float
-		"format": "{icon} {volume}% {format_source}",
-		"format-muted": "🔇 {format_source}",
-		"format-bluetooth": "{icon} {volume}% {format_source}",
-		"format-bluetooth-muted": "🔇 {format_source}",
-
-		"format-source": " {volume}%",
-		"format-source-muted": "",
-
-		"format-icons": {
-			"headphones": "",
-			"handsfree": "",
-			"headset": "",
-			"phone": "",
-			"portable": "",
-			"car": "",
-			"default": ["🔈", "🔉", "🔊"]
-		},
-		"on-click": "ponymix -N -t sink toggle",
-		"on-click-right": "ponymix -N -t source toggle"
-	},
-	"sway/language": {
-		"format": "{flag}",
-		"tooltip-format": "{flag} {long}"
-	},
-	"clock": {
-		"interval": 1,
-		"format": "⏰ {:%H:%M:%S 🗓️ %Y-%m-%d 📆 %W - Day: %a}",
-		"tooltip-format": "{:%Y-%m-%d | %H:%M:%S}",
-		"format-alt": "{:%Y-%m-%d}"
-	},
-	"battery": {
-		"states": {
-			// "good": 95,
-			"warning": 20,
-			"critical": 10
-		},
-		"format": "<span color='#e88939'>{icon}</span> {capacity}% ({time})",
-		"format-charging": "<span color='#e88939'> </span> {capacity}%",
-		"format-plugged":  "<span color='#e88939'>{icon} </span> {capacity}% ({time})",
-		// "format-good": "", // An empty format will hide the module
-		// "format-full": "",
-		"format-icons": ["", "", "", "", ""]
-	},
-	"battery#bat2": {
-		"bat": "BAT2"
-	},
-	"idle_inhibitor": {
-		"format": "<span color='#589df6'>{icon}</span>",
-		"format-icons": {
-			"activated": "",
-			"deactivated": ""
-		},
-		"on-click-right": "swaylock -eFfki ~/.config/lockscreen-origin.png"
-	},
-	"tray": {
-		// "icon-size": 21,
-		"spacing": 10
-	},
-    "custom/media": {
-        "format": "{icon} {}",
-        "return-type": "json",
-        "max-length": 40,
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": false,
+        "format": "{name} {icon}",
         "format-icons": {
-            "spotify": "",
-            "default": "🎜"
-        },
-        "escape": true,
-        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
-        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "sway/scratchpad": {
+        "format": "{icon} {count}",
+        "show-empty": false,
+        "format-icons": ["", ""],
+        "tooltip": true,
+        "tooltip-format": "{app}: {title}"
     },
     "mpd": {
-        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
         "format-disconnected": "Disconnected ",
         "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
         "unknown-tag": "N/A",
-        "interval": 2,
+        "interval": 5,
         "consume-icons": {
             "on": " "
         },
@@ -202,52 +99,135 @@
         },
         "tooltip-format": "MPD (connected)",
         "tooltip-format-disconnected": "MPD (disconnected)"
-    }
-}
-//,
-//{
-    //"ipc": true,
-    //"id": "bar-1",
-	//// "layer": "top", // Waybar at top layer
-	//"position": "bottom", // Waybar position (top|bottom|left|right)
-	//// "height": 10, // Waybar height (to be removed for auto height)
-	//"width": 280, // Waybar width
+    },
+    "idle_inhibitor": {
+        "format": "<span color='#589df6'>{icon}</span>",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        },
+        "on-click-right": "swaylock -eFfki ~/.config/lockscreen-origin.png"
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        "interval": 1,
+        "format": "⏰ {:%H:%M:%S 🗓️ %Y-%m-%d 📆 %W - Day: %a}",
+        "tooltip-format": "{:%Y-%m-%d | %H:%M:%S}",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "🏭 {usage}%",
+        "tooltip": true
+    },
+    "memory": {
+        "format": "💾 {used:0.1f}G"
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "<span color='#e88939'>{icon}</span> {temperatureC}°C",
+        "format-icons": ["", "", ""]
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{icon} {percent}%",
+        "format-icons": ["🔅", "🔆"]
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "<span color='#e88939'>{icon}</span> {capacity}% ({time})",
+        // "format-full": "{capacity}% {icon}",
+        "format-charging": "<span color='#e88939'> </span> {capacity}%",
+        "format-plugged":  "<span color='#e88939'>{icon} </span> {capacity}% ({time})",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "power-profiles-daemon": {
+      "format": "{icon}",
+      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+      "tooltip": true,
+      "format-icons": {
+        "default": "",
+        "performance": "",
+        "balanced": "",
+        "power-saver": ""
+      }
+    },
+    "network": {
+        "family": "ipv4",
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "<span color='#589df6'></span> <span color='gray'>{essid}</span> {frequency} <span color='#589df6'>{signaldBm} dB</span> <span color='#589df6'>⇵</span>",
+        //"format-wifi": "<span color='#589df6'></span> <span color='gray'>{essid}</span> {frequency} <span color='#589df6'>{signaldBm} dB</span> <span color='#589df6'>⇵</span> {bandwidthUpBits}/{bandwidthDownBits}",
+        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "interval": 5
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{icon} {volume}% {format_source}",
+        "format-muted": "🔇 {format_source}",
+        "format-bluetooth": "{icon} {volume}% {format_source}",
+        "format-bluetooth-muted": "🔇 {format_source}",
 
-	//// Choose the order of the modules
-	//"modules-left": [
-		//"sway/hide" // Hiding support via sway IPC
-	//],
-	//"modules-center": ["clock"],
+        "format-source": " {volume}%",
+        "format-source-muted": "",
 
-	//"clock": {
-		//"interval": 1,
-		//"format": "⏰ {:%H:%M:%S 🗓️ %Y-%m-%d 📆 %W - Day: %a}",
-		//"tooltip-format": "{:%Y-%m-%d | %H:%M:%S}",
-		//"format-alt": "{:%Y-%m-%d}"
-	//},
-	//"battery": {
-		//"states": {
-			//// "good": 95,
-			//"warning": 20,
-			//"critical": 10
-		//},
-		//"format": "<span color='#e88939'>{icon}</span> {capacity}% ({time})",
-		//"format-charging": "<span color='#e88939'> </span> {capacity}%",
-		//"format-plugged":  "<span color='#e88939'>{icon} </span> {capacity}% ({time})",
-		//// "format-good": "", // An empty format will hide the module
-		//// "format-full": "",
-		//"format-icons": ["", "", "", "", ""]
-	//},
-	//"battery#bat2": {
-		//"bat": "BAT2"
-	//},
-	//"idle_inhibitor": {
-		//"format": "<span color='#589df6'>{icon}</span>",
-		//"format-icons": {
-			//"activated": "",
-			//"deactivated": ""
-		//},
-		//"on-click-right": "swaylock -eFfki ~/.config/lockscreen-origin.png"
-	//}
-//}
-]
+        "format-icons": {
+            "headphones": "",
+            "handsfree": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
+        "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    },
+    "sway/language": {
+        "format": "{flag}",
+        "tooltip-format": "{flag} {long}"
+    },
+    "custom/mail": {
+        "format": "📩{}",
+        "interval": 30,
+        "exec": "notmuch count tag:flagged OR tag:inbox AND NOT tag:killed"
+    },
+    "custom/disk_home": {
+        "format": "🏠 {} ",
+        "interval": 30,
+        "exec": "df -h --output=avail $HOME | tail -1 | tr -d ' '"
+    },
+    "custom/disk_root": {
+        "format": "💽 {} ",
+        "interval": 30,
+        "exec": "df -h --output=avail / | tail -1 | tr -d ' '"
+    },
+}