diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 2baac3b2..4cfec04f 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -213,7 +213,7 @@
     # corners.
     # The radius will be automatically lowered if it exceeds half of the
     # notification height to avoid clipping text and/or icons.
-    corner_radius = 0
+    corner_radius = 10
 
     ### Legacy
 
diff --git a/.config/fuzzel/fuzzel.ini b/.config/fuzzel/fuzzel.ini
index 8047f1e0..c77ab7b2 100644
--- a/.config/fuzzel/fuzzel.ini
+++ b/.config/fuzzel/fuzzel.ini
@@ -15,4 +15,4 @@ border=b8bb26ff
 
 [border]
 width=2
-radius=10
+radius=20
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index b4501ff3..701bfde3 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -1,7 +1,7 @@
 background {
     monitor =
     path = screenshot
-    blur_passes = 2
+    blur_passes = 3
     blur_size = 10
 }
 
@@ -50,19 +50,6 @@ label {
     halign = left
     valign = bottom
 }
-label {
-    monitor =
-    text = cmd[update:500] num=5; echo $num; num=$num-1
-    text_align = center
-    color = rgba(200, 200, 200, 1.0)
-    font_size = 20
-    font_family = Noto Sans
-    rotate = 0
-
-    position = 30, -30
-    halign = left
-    valign = top
-}
 
 label {
     monitor =
@@ -96,7 +83,7 @@ input-field {
     rounding = -1
     check_color = rgb(204, 136, 34)
     fail_color = rgb(204, 34, 34)
-    fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
+    fail_text = <i>😬Ohhhh, that was wrong mate ⚠️</i>
     fail_timeout = 2000
     fail_transition = 300
     capslock_color = -1
diff --git a/.config/waybar/.config.swp b/.config/waybar/.config.swp
index 6d48226f..43a930c7 100644
Binary files a/.config/waybar/.config.swp and b/.config/waybar/.config.swp differ
diff --git a/.config/waybar/.style.css.swp b/.config/waybar/.style.css.swp
deleted file mode 100644
index 3e6f4a13..00000000
Binary files a/.config/waybar/.style.css.swp and /dev/null differ
diff --git a/.config/waybar/config b/.config/waybar/config
index 986e5137..82248b65 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -2,14 +2,18 @@
 	{
 		"layer": "top",
 		"position": "bottom",
-		"height": 40,
-		"modules-center": ["wlr/taskbar"],
-
+		"modules-center": ["image#pfp", "wlr/taskbar"],
+		"image#pfp": {
+			"path": "/home/deadvey/pictures/pfp.png",
+			"size": 30,
+			"interval": 20,
+			"on-click": "fuzzel",
+		},
 		"wlr/taskbar": {
 		    "format": "{icon}",
 		    "icon-size": 30,
 		    "icon-theme": "Gruvbox-Dark",
-		    "tooltip-format": "{title}",
+		    "tooltip-format": "{name}",
 		    "on-click": "activate",
 		    "on-click-right": "minimize",
 		    "on-click-middle": "close",
@@ -29,9 +33,28 @@
 		"layer": "top",
 		"position": "top",
 		"height": 30,
-		"modules-left": ["hyprland/workspaces", "custom/temperature", "cpu", "memory", "custom/time"],
-		"modules-center": ["clock"],
-		"modules-right": ["pulseaudio/slider","pulseaudio", "tray"],
+		"mode": "dock",
+		"modules-left": [
+			"hyprland/workspaces", 
+		],
+		"modules-center": [
+			"clock"
+		],
+		"modules-right": [
+			"custom/cmusinfo",
+			"pulseaudio/slider",
+			"network",
+			"tray",
+		],
+		"custom/cmusinfo": {
+			"exec": "ssh max@192.168.1.193 cmus-remote -Q | grep title | sed 's/tag title //'",
+			"format": "   {}",
+			"interval": 1,
+			"on-click": "ssh max@192.168.1.193 cmus-remote -u",
+			"on-click-right": "ssh max@192.168.1.193 cmus-remote -n",
+			"on-scroll-down": "ssh max@192.168.1.193 cmus-remote -v -10%",
+			"on-scroll-up": "ssh max@192.168.1.193 cmus-remote -v +10%",
+		},
 		"hyprland/workspaces": {
 			"disable-scroll": true,
 			"show-special": true,
@@ -46,6 +69,26 @@
 				"default": ""
 			}
 		},
+		"network": {
+		    "interface": "enp5s0",
+		    "format": "{ifname}",
+		    "format-wifi": " ",
+		    "format-ethernet": " ",
+		    "format-disconnected": "", //An empty format will hide the module.
+		    "tooltip-format": "{ifname} via {gwaddr} 󰊗",
+		    "tooltip-format-wifi": "{essid} ({signalStrength}%) ",
+		    "tooltip-format-ethernet": "{ipaddr}   {ifname}",
+		    "tooltip-format-disconnected": " ",
+		    "max-length": 50
+		},
+		"custom/seperator": {
+			"format": "|",
+		},
+		"server-cava": {
+			"exec": "ssh max@192.168.1.193 bash /home/max/caway.sh",
+			"format": "{}",
+			"interval": 30,
+		},
 		"pulseaudio/slider": {
 		    "min": 0,
 		    "max": 100,
@@ -73,7 +116,28 @@
 		},
 		"clock": {
 			"format": "{:%a, %d %b %Y %H:%M:%S %p}",
-			"interval": 1
+			"interval": 1,
+			"tooltip-format": "<tt><small>{calendar}</small></tt>",
+			"calendar": {
+			    "mode"          : "year",
+			    "mode-mon-col"  : 3,
+			    "weeks-pos"     : "right",
+			    "on-scroll"     : 1,
+			    "format": {
+			      "months":     "<span color='#ffead3'><b>{}</b></span>",
+			      "days":       "<span color='#ecc6d9'><b>{}</b></span>",
+			      "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
+			      "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
+			      "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
+			    }
+			},
+			"actions":  {
+			    "on-click-right": "mode",
+			    "on-scroll-up": "tz_up",
+			    "on-scroll-down": "tz_down",
+			    "on-scroll-up": "shift_up",
+			    "on-scroll-down": "shift_down"
+			}
 		},
 		"custom/temperature": {
 			"format": "{} ",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 2ad6013d..42b7653b 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -9,6 +9,12 @@
     box-shadow: none;
     background-color:  #ebdbb2;
 }
+#pulseaudio-slider slider:hover {
+	background-color: #a89984;
+}
+#pulseaudio-slider slider:active {
+	background-color: #b8bb26;
+}
 #pulseaudio-slider trough {
     min-height: 10px;
     min-width: 80px;
@@ -20,15 +26,22 @@
     border-radius: 5px;
     background-color: #b8bb26;
 }
+#taskbar button {
+	border-radius: 10px;
+	padding: 8px 8px 8px 8px;
+}
 #taskbar button.active {
 	background-color: #8ec07c;
 }
-window#waybar.screenBorder {
-	border: 2px solid #b8bb26;
-	background-color: transparent;
-	box-shadow: 0px 0px 0px 60px black, 0px 0px 0px 0.5px #ebdbb2;
+#taskbar button:hover {
+	background-color: #282828;
+}
+#image {
+	padding: 8px 8px 8px 8px;
 	border-radius: 10px;
-	margin: 20px;
+}
+#image:hover {
+	background-color: #282828;
 }
 window#waybar.top,
 window#waybar.bottom,
@@ -43,7 +56,8 @@ window#waybar.left {
 	margin: 5px;
 }
 #workspaces button:hover {
-	color: #b8bb26;
+	color: #1d2021;
+	background: #98971a;
 }
 #workspaces button.active {
 	color: #282828;
@@ -54,30 +68,21 @@ window#waybar.left {
 	background: #ebdbb2;
 }
 #workspaces,
-#custom-clock,
 #clock,
-#custom-time,
 #network,
-#disk,
-#memory,
-#cpu,
 #pulseaudio,
-#custom-metar,
-#custom-uptime,
-#custom-cmus-artist,
-#custom-cmus-song,
-#custom-playerctl,
-#custom-cava-waybar-local,
-#window,
-#custom-temperature,
 #tray,
-#custom-server-cava {
+#custom-cmusinfo {
 	color: #ebdbb2;
-	background: transparent;
-	/*border: 2px solid #b8bb26;
-	border-radius: 15;
-	box-shadow: 12px 12px 0px 2px #282828;*/
-	padding-left: 3px;
-	padding-right: 3px;
+	border-radius: 20px;
+	padding-left: 8px;
+	padding-right: 8px;
 	margin: 6px;
 }
+#clock:hover,
+#network:hover,
+#pulseaudio:hover,
+#tray:hover,
+#custom-cmusinfo:hover {
+	background-color: #282828;
+}