diff --git a/hmModules/waybar/config.json b/hmModules/waybar/config.json
index 05953f2..8d220da 100644
--- a/hmModules/waybar/config.json
+++ b/hmModules/waybar/config.json
@@ -1,95 +1,78 @@
-[
-  {
-    "backlight": {
-      "device": "ddcci2",
-      "format": "{percent}% {icon}",
-      "format-icons": [" ", " "]
-    },
-    "battery": {
-      "format": "{capacity}% {icon}",
-      "format-alt": "{time} {icon}",
-      "format-charging": "{capacity}% ",
-      "format-icons": [" ", " ", " ", " ", " "],
-      "format-plugged": "{capacity}%  ",
-      "states": {
-        "critical": 15,
-        "warning": 30
-      }
-    },
-    "clock": {
-      "format-alt": "{:%Y-%m-%d}",
-      "tooltip-format": "{:%Y-%m-%d | %H:%M}"
-    },
-    "cpu": {
-      "format": "{usage}% ",
-      "tooltip": false
-    },
-    "height": 30,
-    "hyprland/workspaces": {
-      "all-outputs": true,
-      "disable-scroll-wraparound": true,
-      "on-click": "activate"
-    },
-    "ipc": true,
-    "layer": "top",
-    "memory": {
-      "format": "{}% "
-    },
-    "modules-center": ["hyprland/window", "niri/window"],
-    "modules-left": ["wlr/mode", "hyprland/workspaces", "niri/workspaces"],
-    "modules-right": [
-      "network",
-      "tray",
-      "pulseaudio",
-      "cpu",
-      "memory",
-      "temperature",
-      "backlight",
-      "battery",
-      "clock"
-    ],
-    "network": {
-      "format-alt": "{ifname}: {ipaddr}/{cidr}",
-      "format-disconnected": "Disconnected ⚠",
-      "format-ethernet": "{ifname}: {ipaddr}/{cidr} 󰈀  up: {bandwidthUpBits:>4} down: {bandwidthDownBits:>4}",
-      "format-linked": "{ifname} (No IP) ",
-      "format-wifi": "{essid} ({signalStrength}%)   {ipaddr}/{cidr} up: {bandwidthUpBits:>4} down: {bandwidthDownBits:>4}",
-      "interval": 1
-    },
-    "position": "top",
-    "pulseaudio": {
-      "format": "{volume}% {icon} {format_source}",
-      "format-bluetooth": "{volume}% {icon} {format_source}",
-      "format-bluetooth-muted": " {icon} {format_source}",
-      "format-icons": {
-        "car": "",
-        "default": [" ", " ", " "],
-        "handsfree": "",
-        "headphones": " ",
-        "headset": "",
-        "phone": "",
-        "portable": ""
-      },
-      "format-muted": " {format_source}",
-      "format-source": "{volume}% ",
-      "format-source-muted": "",
-      "on-click": "/nix/store/rya5a9r0ryh9x8yf03m3s420r4ay6ysg-pavucontrol-6.1/bin/pavucontrol"
-    },
-    "temperature": {
-      "critical-threshold": 80,
-      "format": "{temperatureC}°C {icon}",
-      "format-icons": ["", "", ""],
-      "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input"
-    },
-    "tray": {
-      "spacing": 10
-    },
-    "wlr/mode": {
-      "format": "<span style=\"italic\">{}</span>",
-      "tooltip": false
-    },
-    "wlr/window": {
-      "max_length": 50
+{
+  "layer": "top",
+  "position": "left",
+  "width": 36,
+  "margin": "12 0 12 0",
+  "spacing": 2,
+  "modules-left": ["clock", "custom/sep", "niri/window"],
+  "modules-center": ["niri/workspaces"],
+  "modules-right": [
+    "tray",
+    "custom/sep",
+    "temperature",
+    "custom/sep",
+    "pulseaudio",
+    "custom/powermenu"
+  ],
+  "custom/sep": {
+    "format": "──"
+    // "format": ""
+  },
+  "custom/powermenu": {
+    "on-click": "rofi -show menu -modi menu:rofi-power-menu",
+    "format": "",
+    "tooltip": false
+  },
+  "niri/workspaces": {
+    "format": "{icon}",
+    "on-click": "activate",
+    "format-icons": {
+      "active": "",
+      "urgent": "",
+      "default": ""
     }
+  },
+  "niri/window": {
+    "rotate": 90,
+    "rewrite": {
+      "(.*) — Mozilla Firefox": " $1",
+      "(.*) - Emacs": " $1",
+      "(.*) - Slack": " $1"
+    }
+  },
+  "clock": {
+    "tooltip": true,
+    "format": "{:%H\n%M}",
+    "tooltip-format": "{:%Y-%m-%d}"
+  },
+  "tray": {
+    "icon-size": 20,
+    "spacing": 5,
+    "show-passive-items": "false"
+  },
+  "temperature": {
+    "rotate": 90,
+    "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+    "critical-threshold": 80,
+    "format": "{icon} {temperatureC}°C",
+    "format-icons": ["", "", ""]
+  },
+  "pulseaudio": {
+    "rotate": 90,
+    "format": "{icon} {volume}%",
+    "format-bluetooth": "{icon} {volume}%",
+    "format-muted": "MUTE ",
+    "format-icons": {
+      "headphones": "",
+      "handsfree": "",
+      "headset": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": ["", ""]
+    },
+    "scroll-step": 3,
+    "on-click": "pavucontrol",
+    "on-click-right": "pactl set-source-mute @DEFAULT_SOURCE@ toggle"
   }
-]
+}
diff --git a/hmModules/waybar/style.css b/hmModules/waybar/style.css
index 1358583..dc40a39 100644
--- a/hmModules/waybar/style.css
+++ b/hmModules/waybar/style.css
@@ -1,54 +1,71 @@
 * {
   border: none;
-  border-radius: 0;
-  min-height: 0;
-  font-family: Fira Code;
+  font-family: "Iosevka Comfy", "FontAwesome", "Nerd Font";
+  font-size: 1.35rem;
+  font-weight: 600;
+  background: none;
 }
 
 window#waybar {
-  background: rgba(255, 255, 255, 0.05);
-  color: white;
-  font-size: 1.2rem;
+  color: #a5adcb;
+  background-color: #181926;
+
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+.modules-left,
+.modules-right,
+.modules-center {
+  padding: 12px 4px;
 }
 
-#workspaces button {
-  padding: 0 10px;
-  background: transparent;
-  color: white;
-  font-size: 2rem;
+tooltip {
+  color: #a5adcb;
+  background-color: #181926;
+  text-shadow: none;
 }
 
-#workspaces button.active {
-  box-shadow: inset 0 -5px red;
+tooltip * {
+  color: #a5adcb;
+  text-shadow: none;
 }
 
-#workspaces button.focused,
+#custom-sep {
+  color: #494d64;
+}
 #workspaces button:hover {
-  box-shadow: inset 0 -5px white;
+  box-shadow: inherit;
+  text-shadow: inherit;
+}
+#workspaces button {
+  color: #5b6078;
+  background: none;
+  padding: 0;
+}
+#workspaces button:hover {
+  color: #a6da95;
+}
+#workspaces button.active {
+  color: #f5bde6;
+}
+#temperature {
+  color: #eed49f;
+}
+#clock {
+  font-weight: 600;
+  color: #8bd5ca;
+}
+#custom-bluetooth_devices {
+  color: #8aadf4;
+}
+#pulseaudio {
+  color: #a6da95;
+}
+#pulseaudio.muted {
+  color: #ed8796;
 }
 
-#workspaces button.urgent {
-  /* background: @theme_fg_color; */
-  /* color: @theme_selected_bg_color; */
-}
-
-#mode {
-  margin: 0 4px;
-  padding: 0 4px;
-  /* background: @theme_fg_color; */
-  /* color: @unfocused_borders; */
-}
-
-#pulseaudio,
-#network,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#battery,
-#language,
-#clock,
-#tray {
-  margin: 0 4px;
-  padding: 0 2px;
+#custom-powermenu {
+  margin: 12px 0 0 0;
+  color: #6e738d;
 }