diff --git a/.config/waybar/config b/.config/waybar/config
index f53b8b4..959770a 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -2,20 +2,35 @@
 	"layer": "top",
 	"position": "top",
 	"spacing": 0,
-	"modules-left": ["sway/workspaces", "hyprland/workspaces"],
-	"modules-center": ["clock"],
-	"modules-right": ["custom/recording", "cpu", "disk", "disk#sda", "disk#mount", "idle_inhibitor", "tray", "custom/transmission", "network"],
+	"modules-left": ["cpu", "disk", "disk#sda", "disk#nocturnal"],
+	"modules-center": ["sway/workspaces"],
+	"modules-right": ["idle_inhibitor", "tray", "clock"],
 	"sway/workspaces": {
-		"format": "{name}",
+		"format": "<span size=\"16pt\" line_height=\"0.8\" baseline_shift=\"5pt\">{name}</span><span size=\"26pt\" line_height=\"0.8\">{windows}</span>",
 		"all-outputs": false,
 		"on-click": "activate",
-		"sort-by-number": true
-	},
-	"hyprland/workspaces": {
-		"format": "{name}",
-		"all-outputs": false,
-		"on-click": "activate",
-		"sort-by-number": true
+		"sort-by-number": true,
+		"window-rewrite-default": "󰘔",
+		"window-format": "{}",
+		"format-window-separator": "",
+		"window-rewrite": {
+		    "class<equibop>": "",
+			"class<firefox>": "󰈹",
+			"(.*)talos(.*)": "T",
+			"(.*)kitty(.*)": "",
+			"(.*)nocturnal(.*)": "N",
+			//"class<kitty>": "",
+			"class<dev.zed.Zed>": "",
+			"class<thunar>": "",
+			"class<mpv>": "",
+			"class<eom>": "",
+			"(.*)Steam(.*)": "",
+			"class<godot>": "",
+			"(.*)bottles(.*)": "",
+			"class<teams-for-linux>": "󰊻",
+			"class<spotify>": "",
+			"class<glava>": "󰝚",
+		}
 	},
 	"custom/recording": {
 		"format": "●",
@@ -24,56 +39,40 @@
 		"exec-if": "pgrep wf-recorder",
 		"interval": 1
 	},
-	"network": {
-		"interface": "moz0",
-		"format": "🕵️",
-		"format-disconnected": ""
-	},
-	"custom/gpu": {
-		"exec": "cat /sys/class/hwmon/hwmon2/device/gpu_busy_percent",
-		"format": "{icon}",
-		"format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
-		"interval": 1
-	},
-	"custom/transmission": {
-		"exec": "/home/mark/.scripts/transmission",
-		"format": "{icon}",
-		"format-icons": ["", ""],
-		"interval": 5
-	},
 	"cpu": {
 		"interval": 1,
 		"format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}",
-	"format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
+    	"format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
 	},
 	"disk": {
 		"path": "/",
-		"format": "{free}",
+		"format": "<span size=\"30pt\" line_height=\"0.3\" baseline_shift=\"-8pt\">󱊟</span> {free}",
 		"tooltip-format": "{free} available on {path}"
 	},
 	"disk#sda": {
 		"path": "/home/mark/Files",
-		"format": "{free}",
+		"format": "<span size=\"26pt\" line_height=\"0.3\" baseline_shift=\"-7pt\">󰋊</span> {free}",
 		"interval": 5,
 		"tooltip-format": "{free} available on {path}"
 	},
-	"disk#mount": {
-		"path": "/home/mark/Files/Downloads/mount",
-		"format": "{free}",
+	"disk#nocturnal": {
+		"path": "/nasfw",
+		"format": "<span size=\"30pt\" line_height=\"0.3\" baseline_shift=\"-9pt\">󰣳</span> {free}",
 		"interval": 5,
 		"tooltip-format": "{free} available on {path}"
 	},
 	"idle_inhibitor": {
 		"format": "{icon}",
 		"format-icons": {
-			"deactivated": "💤",
-			"activated": "🦉",
+			"deactivated": "󰒲",
+			"activated": "󰒳",
 			"default": ""
 		 }
 	},
 	"tray": {
-		"icon-size": 26,
-		"spacing": 8
+		"icon-size": 28,
+		"spacing": 8,
+		"show-passive-items": true
 	},
 	"clock": {
 		"format": "{:%H:%M}",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index a0c3fde..3b33f54 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -4,32 +4,44 @@
     border: none;
     margin: 0;
     color: @foreground;
-    font-family: 'Space Mono';
+    font-family: "BlexMono Nerd Font Mono";
     text-shadow: 0 0 2px @background;
-    font-weight: bold;
-    font-size: 16px;
 }
 
 window {
-    background-color: alpha(@background, 0.8);
+    background-color: transparent;
 }
 
-.modules-right, .modules-center, .modules-left {
+.modules-right,
+.modules-center,
+.modules-left {
     padding: 0;
-    margin-top: 0;
+    margin: 8px;
+    margin-bottom: 0;
+    border-radius: 8px;
+}
+.modules-left {
+    font-size: 18px;
+}
+.modules-center {
+}
+.modules-right {
+    font-size: 18px;
 }
 
 #workspaces button {
-    padding: 0 15px;
-    font-size:20px;
-    margin: 0;
-    font-weight:bold;
+    padding: 0 8px;
+    margin-right: 8px;
+    font-size: 30px;
+    letter-spacing: 8px;
     /*background-color: alpha(@background, 1.0);*/
-    background: transparent;
-    color: alpha(@foreground, 1.0);
+    border-radius: 8px;
+    background-color: @color6;
+    color: alpha(@foreground, 1);
 }
 
-#workspaces button.focused, #workspaces button.active {
+#workspaces button.focused,
+#workspaces button.active {
     background-color: alpha(@color4, 0.8);
     color: @foreground;
 }
@@ -52,59 +64,87 @@ window {
 #custom-transmission,
 #custom-recording,
 #network,
-#wireplumber
-{
-    padding: 0 10px;
+#wireplumber {
+    padding: 0 8px;
     color: @foreground;
 }
 
+#cpu {
+    background: @color2;
+    border-radius: 8px;
+    margin-right: 8px;
+}
+
+#disk {
+    border-radius: 8px;
+    margin-right: 8px;
+    background: @color3;
+}
+
 #custom-recording {
     color: red;
 }
 #custom-transmission {
-    color:#FEE;
+    color: #fee;
+}
+#idle_inhibitor {
+    font-size: 32px;
 }
 
 #clock {
-    background-color: alpha(@background, 0.8);
-    background: transparent;
-    padding: 0 20px 5px 20px;
-    margin: 0;
     font-size: 20px;
 }
 
-#workspaces *:last-child {
-    border-bottom-right-radius: 0px;
+#tray {
+    padding: 0 8px;
 }
 
-.modules-right > *:first-child > * {
-    border-bottom-left-radius: 0px;
+#tray > * {
+    padding: 0;
+    -gtk-icon-shadow: 0px 0px 2px @foreground;
+}
+
+.modules-left #disk.nocturnal {
+    border-top-right-radius: 8px;
+    border-bottom-right-radius: 8px;
+}
+#workspaces button:first-child {
+    border-top-left-radius: 8px;
+    border-bottom-left-radius: 8px;
+}
+
+.modules-right > * > *,
+.modules-left > * > *,
+.modules-center > * > * > * {
+    border-radius: 8px;
+    margin-left: 8px;
+    border: 1px solid @foreground;
 }
 
 .modules-right > *:nth-child(1) > * {
-    background-color: alpha(@color1, 1.0);
+    background-color: alpha(@color1, 1);
 }
 .modules-right > *:nth-child(2) > * {
-    background-color: alpha(@color2, 1.0);
+    background-color: alpha(@color2, 1);
 }
 .modules-right > *:nth-child(3) > * {
-    background-color: alpha(@color3, 1.0);
+    background-color: alpha(@color3, 1);
 }
 .modules-right > *:nth-child(4) > * {
-    background-color: alpha(@color4, 1.0);
+    background-color: alpha(@color4, 1);
 }
 .modules-right > *:nth-child(5) > * {
-    background-color: alpha(@color5, 1.0);
+    background-color: alpha(@color5, 1);
 }
 .modules-right > *:nth-child(6) > * {
-    background-color: alpha(@color6, 1.0);
+    background-color: alpha(@color6, 1);
 }
 .modules-right > *:nth-child(7) > * {
-    background-color: alpha(@color7, 1.0);
+    background-color: alpha(@color7, 1);
 }
 .modules-right > *:nth-child(8) > * {
-    background-color: alpha(@color7, 1.0);
+    background-color: alpha(@color7, 1);
 }
 .modules-right > *:nth-child(9) > * {
-    background-color: alpha(@color7, 1.0);
+    background-color: alpha(@color7, 1);
 }