diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index 7cc88e3..f96ecd1 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -2,19 +2,31 @@
   "layer": "top",           // Waybar at top layer
   "position": "top",        // Waybar position (top|bottom|left|right)
   "modules-left": [
+    // "custom/launcher",
     "sway/workspaces",
-    "sway/window"
+    "temperature",
+    "idle_inhibitor",
+    "mpd",
   ],
   "modules-center": [
     "clock"
   ],
   "modules-right": [
+    "memory",
+    "cpu",
     "pulseaudio",
-    "tray",
+    "backlight",
+    "network",
     "bluetooth",
     "battery",
-    "custom/power"
+    "custom/powermenu",
+    "tray"
   ],
+  "custom/launcher": {
+    "format": " ",
+    "on-click": "~/.config/waybar/launcher.sh",
+    "tooltip": false
+  },
   "sway/workspaces": {
     "disable-scroll": true,
     "disable-markup": false,
@@ -32,65 +44,20 @@
       "active": "",
       "default": ""
     },
-  "persistent-workspaces": {
-      "1": [
-        "HDMI-A-1"
-      ],
-      "2": [
-        "HDMI-A-1"
-      ],
-      "3": [
-        "HDMI-A-1"
-      ],
-      "4": [
-        "HDMI-A-1"
-      ],
-      "5": [
-        "HDMI-A-1"
-      ],
-      "6": [
-        "HDMI-A-1"
-      ],
-      "7": [
-        "HDMI-A-1"
-      ],
-      "8": [
-        "HDMI-A-1"
-      ],
-      "9": [
-        "HDMI-A-1"
-      ],
-      "10": [
-        "eDP-1"
-      ]
-    }
   },
-  "sway/window": {
-    "format": "<span>{}</span>",
-    "max-length": 50
-  },
-  "tray": {
-    "icon-size": 24,
-    "spacing": 5
-  },
-  "custom/spotify": {
-    "format": "  {}",
-    "escape": true,
-    "interval": 5,
-    "tooltip": false,
-    "exec": "playerctl metadata --format='{{ title }}'",
-    "on-click": "playerctl play-pause",
-    "max-length": 50
-  },
-  "clock": {
-    "timezone": "Europe/Rome",
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-    "format-alt": "{:%d/%m/%Y}",
-    "format": "{:%a %b %d %I:%M %p}"
+  "idle_inhibitor": {
+    "format": "{icon}",
+    "format-icons": {
+      "activated": "",
+      "deactivated": ""
+    },
+    "tooltip": false
   },
   "backlight": {
     "device": "intel_backlight",
-    "format": "{icon} {percent}%",
+    "on-scroll-up": "light -A 5",
+    "on-scroll-down": "light -U 5",
+    "format": "{percent}% {icon}",
     "format-icons": [
       "",
       "",
@@ -103,15 +70,33 @@
       ""
     ]
   },
-  "battery": {
-    "states": {
-      "warning": 30,
-      "critical": 15
+  "pulseaudio": {
+    "scroll-step": 1,
+    "format": "{volume}% {icon}", 
+    "format-muted": "  {format_source}",
+    "format-icons": {
+      "headphone": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": [
+        "",
+        "",
+        " "
+      ]
     },
-    "format": "{icon} {capacity}%",
-    "format-charging": "󰂄",
-    "format-plugged": "󰂄",
-    "format-alt": "{icon}",
+    "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+  },
+  "battery": {
+    "interval": 10,
+    "states": {
+      "warning": 20,
+      "critical": 10
+    },
+    "format": "{capacity}% {icon}",
+    "format-charging": "{capacity}% 󰂄",
+    "format-plugged": "{capacity}% ",
+    "format-alt": "{time} {icon}",
     "format-icons": [
       "󰁺",
       "󰁻",
@@ -124,33 +109,65 @@
       "󰂂"
     ]
   },
-  "pulseaudio": {
-    // "scroll-step": 1, // %, can be a float
-    "format": "{icon} {volume}%",
-    "format-muted": "",
-    "format-icons": {
-      "default": [
-        "",
-        "",
-        " "
-      ]
+  "clock": {
+    "interval": 1,
+    "timezone": "Europe/Rome",
+    "format": "{:%I:%M %p  %A %b %d}",
+    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+    "format-alt": "{:%d/%m/%Y}",
+  },
+  "memory": {
+    "interval": 1,
+    "format": "{percentage}% ",
+    "states": {
+      "warning": 85,
     },
-    "on-click": "pavucontrol"
   },
-  "custom/lock": {
-    "tooltip": false,
-    "on-click": "sh -c '(sleep 0.5s; swaylock --grace 0)' & disown",
-    "format": ""
+  "cpu": {
+    "interval": 1,
+    "format": "{usage}% ",
+    "tooltip": false
   },
-  "custom/power": {
+  "mpd": {
+    "max-length": 25,
+    "format": "<span foreground='#bb9af7'></span> {title}",
+    "format-paused": " {title}",
+    "format-stopped":"<span foreground='#bb9af7'></span>",
+    "format-disconnected": "",
+    "on-click": "mpc --quiet toggle",
+    "on-click-right": "mpc ls | mpc add",
+    "on-click-middle": "kitty ncmpcpp",
+    "on-scroll-up": "mpc --quiet prev",
+    "on-scroll-down": "mpc --quiet next",
+    "smooth-scrolling-threshold":5,
+    "tooltip-format": "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})"
+  },
+  "network": {
+    "interval": 1,
+    "format-wifi": "{essid} ",
+    "format-ethernet": "{ifname} ({ipaddr})",
+    "format-linked": "{essid} (No IP)",
+    "format-disconnected": "Disconnected ⚠",
+    "tooltip": false
+  },
+  "temperature": {
+    "hwmon-path": "/sys/class/hwmon/hwmon6/temp2_input",
     "tooltip": false,
+    "format": "{temperatureC}°C "
+  },
+  "custom/powermenu": {
+    "format": "",
     "on-click": "wlogout &",
-    "format": ""
+    "tooltip": false
+  },
+  "tray": {
+    "icon-size": 15,
+    "spacing": 5
   },
   "bluetooth": {
-    "format": " {status}",
-    "format-connected": " {device_alias}",
-    "format-connected-battery": " {device_alias} {device_battery_percentage}%",
+    "format": "{status} ",
+    "format-connected": "{device_alias} ",
+    "format-connected-battery": "{device_alias} {device_battery_percentage}% ",
     "format-off": "󰂲", // "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device
     "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
     "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 8343fd8..c779698 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,107 +1,132 @@
 @import "themes/mocha.css";
 
 * {
-  font-family: FiraCode Nerd Font;
-  font-size: 12px;
-  min-height: 0;
+  font-family: "JetBrainsMono Nerd Font";
+  font-size: 12pt;
+  font-weight: bold;
+  border-radius: 0px;
+  transition-property: background-color;
+  transition-duration: 0.5s;
 }
-
-#waybar {
-  /*background: transparent;*/
-  color: @text;
-  /*margin: 5px 5px;*/
+@keyframes blink_red {
+  to {
+    background-color: rgb(242, 143, 173);
+    color: rgb(26, 24, 38);
+  }
+}
+.warning, .critical, .urgent {
+  animation-name: blink_red;
+  animation-duration: 1s;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+}
+window#waybar {
+  background-color: transparent;
+}
+window > box {
+  margin-left: 5px;
+  margin-right: 5px;
+  margin-top: 5px;
+  background-color: rgb(30, 30, 46);
 }
-
 #workspaces {
-  border-radius: 1rem;
-  margin: 5px;
-  background-color: @surface0;
-  margin-left: 1rem;
+  padding-left: 0px;
+  padding-right: 4px;
 }
-
 #workspaces button {
-  color: @lavender;
-  border-radius: 1rem;
-  padding: 0.4rem;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  padding-left: 6px;
+  padding-right: 6px;
 }
-
-#workspaces button.active {
-  color: @sky;
-  border-radius: 1rem;
+#workspaces button.focused {
+  background-color: rgb(181, 232, 224);
+  color: rgb(26, 24, 38);
+}
+#workspaces button.urgent {
+  color: rgb(26, 24, 38);
 }
-
 #workspaces button:hover {
-  color: @sapphire;
-  border-radius: 1rem;
+  background-color: rgb(248, 189, 150);
+  color: rgb(26, 24, 38);
 }
-
-#custom-music,
-#tray,
-#backlight,
-#bluetooth,
-#clock,
-#battery,
-#pulseaudio,
-#custom-lock,
-#custom-power {
-  background-color: @surface0;
-  padding: 0.5rem 1rem;
-  margin: 5px 0;
+tooltip {
+  background: rgb(48, 45, 65);
+}
+tooltip label {
+  color: rgb(217, 224, 238);
+}
+#custom-launcher {
+  padding-left: 8px;
+  padding-right: 6px;
+  color: rgb(201, 203, 255);
+}
+#mode, #clock, #memory, #temperature, #cpu, #mpd, #idle_inhibitor, #temperature, #backlight, #pulseaudio, #network, #battery, #custom-powermenu, #bluetooth {
+  padding-left: 10px;
+  padding-right: 10px;
+}
+#memory {
+  color: rgb(181, 232, 224);
+}
+#cpu {
+  color: rgb(245, 194, 231);
 }
-
 #clock {
-  border-radius: 0px 1rem 1rem 0px;
-  margin-right: 1rem;
+  color: rgb(217, 224, 238);
+}
+#idle_inhibitor {
+  color: rgb(221, 182, 242);
+}
+#temperature {
+  color: rgb(150, 205, 251);
+}
+#backlight {
+  color: rgb(248, 189, 150);
+}
+#pulseaudio {
+  color: rgb(245, 224, 220);
+}
+#network {
+  color: #ABE9B3;
+}
+#network.disconnected {
+  color: rgb(255, 255, 255);
 }
-
 #battery {
-  color: @green;
+    color: @sky;
 }
-
 #battery.charging {
-  color: @green;
+    color: @green;
 }
-
-#battery.warning:not(.charging) {
+#battery.full, #battery.discharging {
+  color: rgb(250, 227, 176);
+}
+#battery.critical:not(.charging) {
   color: @red;
+  animation-name: blink;
+  animation-duration: 0.5s;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+}
+#custom-powermenu {
+  color: rgb(242, 143, 173);
+}
+#tray {
+  padding-right: 8px;
+  padding-left: 10px;
+}
+#mpd.paused {
+  color: #414868;
+  font-style: italic;
+}
+#mpd.stopped {
+  background: transparent;
+}
+#mpd {
+  color: #c0caf5;
 }
-
 #bluetooth {
   color: @blue;
 }
-
-#bluetooth, #battery {
-    border-radius: 0;
-}
-
-#pulseaudio {
-  color: @maroon;
-  border-radius: 1rem 0px 0px 1rem;
-  margin-left: 1rem;
-}
-
-#clock, #custom-music {
-  color: @mauve;
-  border-radius: 1rem;
-}
-
-#custom-lock {
-    border-radius: 1rem 0px 0px 1rem;
-    color: @lavender;
-}
-
-#custom-power {
-    margin-right: 1rem;
-    border-radius: 0px 1rem 1rem 0px;
-    color: @red;
-}
-
-#tray {
-  margin-right: 1rem;
-  border-radius: 1rem;
-}
-
-window#waybar {
-  background-color: shade(@base, 0.9);
-  border: 2px solid alpha(@crust, 0.3);
-}