diff --git a/swaync/style.css b/swaync/style.css
index 07d9b23..3374717 100644
--- a/swaync/style.css
+++ b/swaync/style.css
@@ -63,7 +63,7 @@
 }
 
 .notification-row .notification-background .notification.normal {
-  border: 2px solid #98971a;
+  /* border: 2px solid #bdae93; */
 }
 
 .notification-row .notification-background .notification.critical {
@@ -397,7 +397,9 @@
 
 .control-center .control-center-list .notification .notification-default-action,
 .control-center .control-center-list .notification .notification-action {
-  transition: opacity 400ms ease-in-out, background 0.15s ease-in-out;
+  transition:
+    opacity 400ms ease-in-out,
+    background 0.15s ease-in-out;
 }
 
 .control-center
diff --git a/waybar/config b/waybar/config
index 7e7a034..af01cf4 100644
--- a/waybar/config
+++ b/waybar/config
@@ -6,9 +6,10 @@
   "modules-left": [
     "custom/os",
     "hyprland/workspaces",
-    "wlr/taskbar"
   ],
-  "modules-center": [],
+  "modules-center": [
+    "wlr/taskbar"
+	],
   "modules-right": [
     "network",
     "bluetooth",
@@ -86,8 +87,8 @@
     "spacing": 10
   },
   "clock": {
-    "format": "{:󰖉 %H:%M }",
-    "format-alt": "{: %d/%m/%Y}"
+    "format": "{:%H:%M }",
+    "format-alt": "{:%d/%m/%Y}"
   },
   "cpu": {
     "format": "cpu {usage}%",
@@ -107,7 +108,7 @@
   },
   "backlight": {
     "device": "acpi_video1",
-    "format": "{icon}{percent}%",
+    "format": "bl {percent}%",
     "format-icons": [
       "󰪞 ",
       "󰪟 ",
@@ -123,9 +124,9 @@
       "warning": 30,
       "critical": 15
     },
-    "format": "{icon} {capacity}%",
-    "format-charging": "󰂈 {capacity}%",
-    "format-plugged": "󰂄 {capacity}%",
+    "format": "batt {capacity}%",
+    "format-charging": "batt (ch){capacity}%",
+    "format-plugged": "batt {capacity}%",
     "format-icons": [
       "󰁻",
       "󰁼",
@@ -138,7 +139,7 @@
     "bat": "BAT2"
   },
   "network": {
-    "format-wifi": "󰖩 ",
+    "format-wifi": "󰖩  {essid}",
     "format-ethernet": "{ipaddr}/{cidr}",
     "tooltip-format": "{ifname} via {gwaddr}",
     "format-linked": "{ifname} (No IP)",
@@ -173,10 +174,10 @@
   },
   "bluetooth": {
     "controller": "bluetoothctl",
-    "format": " ",
-    "format-connected": " ",
+    "format": " active",
+    "format-connected": " connected",
     "format-alt": " {device_alias}",
-    "format-connected-battery": " ",
+    "format-connected-battery": " {device_battery_percentage}%",
     "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}",
     "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
@@ -198,7 +199,7 @@
   },
   "custom/wakatime": {
     "exec": "source $HOME/dotfiles/.env && python3 $HOME/.config/waybar/resources/custom_modules/wakatime_waybar.py",
-    "format": "󰅱 {}",
+    "format": "code {}",
     "return-type": "json",
     "interval": 600
   },
diff --git a/waybar/style.css b/waybar/style.css
index 89f600c..ad30c4c 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -14,9 +14,9 @@ tooltip {
   color: #ebdbb2;
   border-radius: 0;
   font-weight: 400;
-  background-color: #282828;
+  background-color: rgba(40, 40, 40, 0.8);
   box-shadow: none;
-  font-family: "Sys TT";
+  font-family: "PragmataPro Mono";
   padding: 20px;
 }
 
@@ -34,7 +34,7 @@ button {
 #workspaces button.active {
   color: #282828;
   background-color: #98971a;
-  border: 2px solid #504945;
+  border: 2px solid #79740e;
 }
 
 #workspaces button {
@@ -53,8 +53,8 @@ button {
 }
 
 #taskbar button {
-  color: #ebdbb2;
-  background-color: #3c3836;
+  /* color: #ebdbb2; */
+  /* background-color: #3c3836; */
   padding: 3px 8px;
   margin-top: 6px;
   margin-bottom: 6px;
@@ -129,7 +129,8 @@ button {
 }
 
 #clock {
-  color: #98971a;
+  border: 1px solid #458588;
+  color: #458588;
   font-weight: 400;
   padding-top: 3px;
   padding-bottom: 3px;
@@ -140,33 +141,37 @@ button {
   margin-top: 6px;
   margin-bottom: 6px;
 
-  border-right: 1px solid #504945;
+  /* border-right: 1px solid #504945; */
   /* color: #1d2021; */
 }
 
 #bluetooth {
   padding-right: 16px;
-  border-right: 1px solid #504945;
-  color: #458588;
+  /* border-right: 1px solid #504945; */
+  color: #98971a;
+
+  border: 1px solid #98971a;
   /* color: #282828; */
 }
 
 #battery {
-  color: #b16286;
-  border-right: 1px solid #504945;
+  border: 1px solid #458588;
+  color: #458588;
+  /* border-right: 1px solid #504945; */
   padding-right: 14px;
   /* color: #282828; */
 }
 
 #battery.charging,
 #battery.plugged {
-  color: #b16286;
+  border: 1px solid #458588;
+  color: #458588;
   /* color: #282828; */
 }
 
 #battery.critical:not(.charging) {
-  background-color: #fb4934;
-  color: #f2e5bc;
+  border: 1px solid #fb4934;
+  color: #fb4934;
   animation-name: blink;
   animation-duration: 0.5s;
   animation-timing-function: linear;
@@ -175,30 +180,34 @@ button {
 }
 
 #cpu {
-  color: #d79921;
+  border: 1px solid #458588;
+  color: #458588;
   /* color: #282828; */
   /* color: #282828; */
 }
 
 #memory {
-  color: #d79921;
+  border: 1px solid #458588;
+  color: #458588;
   /* color: #282828; */
 }
 
 #disk,
 #custom-diskBackup {
-  color: #d79921;
+  border: 1px solid #458588;
+  color: #458588;
   /* color: #282828; */
 }
 
 #backlight {
-  color: #b16286;
+  border: 1px solid #458588;
+  color: #458588;
   /* color: #282828; */
 }
 
 #network {
-  padding-right: 0;
-  color: #458588;
+  border: 1px solid #98971a;
+  color: #98971a;
   /* color: #282828; */
 }
 
@@ -221,8 +230,9 @@ button {
 }
 
 #temperature {
-  color: #d79921;
-  border-right: 1px solid #504945;
+  border: 1px solid #458588;
+  color: #458588;
+  /* border-right: 1px solid #504945; */
   padding-right: 14px;
 }
 
@@ -241,18 +251,21 @@ button {
 #idle_inhibitor.activated {
   background-color: #98971a;
   color: #282828;
+  border: 2px solid #79740e;
 }
 
 #custom-os {
   font-size: 16px;
   background-color: #458588;
   color: #f2e5bc;
-  border: 2px solid #504945;
+  border: 2px solid #076678;
 }
 
 #custom-wakatime {
-  color: #d65d0e;
-  border-right: 1px solid #504945;
+  color: #458588;
+
+  border: 1px solid #458588;
+  /* border-right: 1px solid #504945; */
   padding-right: 14px;
 }
 
@@ -263,7 +276,7 @@ button {
 #custom-timewarrior.active {
   background-color: #98971a;
   color: #282828;
-  border: 2px solid #504945;
+  border: 2px solid #79740e;
 }
 
 #custom-timewarrior.inactive {