diff --git a/hypr/autostart.conf b/hypr/autostart.conf
index ec9b86e..197f77e 100644
--- a/hypr/autostart.conf
+++ b/hypr/autostart.conf
@@ -2,7 +2,4 @@ $statusbar = waybar
 $statusBarConf = ~/.config/waybar/config.jsonc
 $statusBarStyle = ~/.config/waybar/style.css
 
-$wallpapers = waypaper
-
-exec-once = $wallpapers
 exec-once = $statusbar -c $statusBarConf -s $statusBarStyle
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 712d6fb..9b93442 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -68,8 +68,7 @@ env = HYPRCURSOR_SIZE,24
 #####################
 
 # Refer to https://wiki.hyprland.org/Configuring/Variables/
-$red = rgb(C6716F)
-$navy = rgb(4C546C)
+
 # https://wiki.hyprland.org/Configuring/Variables/#general
 general {
     gaps_in = 5
@@ -78,9 +77,8 @@ general {
     border_size = 2
 
     # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-    # col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.active_border = $red
-    col.inactive_border = $navy
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
 
     # Set to true enable resizing windows by clicking and dragging on borders and gaps
     resize_on_border = false
@@ -93,7 +91,7 @@ general {
 
 # https://wiki.hyprland.org/Configuring/Variables/#decoration
 decoration {
-    rounding = 8
+    rounding = 10
 
     # Change transparency of focused and unfocused windows
     active_opacity = 1.0
@@ -145,7 +143,6 @@ animations {
     animation = workspacesIn, 1, 1.21, almostLinear, fade
     animation = workspacesOut, 1, 1.94, almostLinear, fade
 }
-windowrulev2 = opacity 0.6 override 0.6 override,class:^(kitty)$
 
 # Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
 # "Smart gaps" / "No gaps when only"
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 98c4e24..b3b6d45 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -16,14 +16,16 @@
         "hyprland/window"
     ],
     "modules-right": [
-        "clock",
-        "mpris",
+        "mpd",
+       // "idle_inhibitor",
+	"mpris",
         "pulseaudio",
         "cpu",
         "memory",
         "hyprland/language",
-        "tray"
-        //"custom/power"
+        "clock",
+        "tray",
+        "custom/power"
     ],
     "hyprland/workspaces": {
 	"format": "{icon}",
@@ -34,7 +36,7 @@
 	"separate-outputs": true
     },
     "hyprland/language": {
-	"format": " {}",
+	"format": "🌏 {}",
 	"format-en": "EN",
 	"format-ru": "RU"
     },
@@ -129,6 +131,49 @@
         "format": "{temperatureC}°C {icon}",
         "format-icons": ["", "", ""]
     },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-full": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "power-profiles-daemon": {
+      "format": "{icon}",
+      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+      "tooltip": true,
+      "format-icons": {
+        "default": "",
+        "performance": "",
+        "balanced": "",
+        "power-saver": ""
+      }
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
         "format": "{volume}% {icon} {format_source}",
diff --git a/waybar/style.css b/waybar/style.css
index 51fef3e..34ada21 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,21 +1,3 @@
-@define-color waybar-bg rgba(0, 0, 0, 0.0);
-@define-color waybar-fg #FFFFFF;
-
-/* Buildings.png */
-@define-color red #C6716F;
-@define-color navy #4C546C;
-@define-color grey #3C4454;
-@define-color yellow #E9CC90;
-@define-color pink #B48CAC;
-@define-color blue #5C84AC;
-@define-color light-blue #85A7C3;
-
-@define-color workspaces-color rgba(0, 0, 0, 0.0);
-@define-color workspaces-hover-bg rgba(0, 0, 0, 0.2);
-@define-color workspaces-hover-fg #FFFFFF;
-@define-color workspaces-active-bg rgba(0, 0, 0, 0.5);
-@define-color workspaces-active-fg #FFFFFF;
-
 * {
     /* `otf-font-awesome` is required to be installed for icons */
     font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
@@ -23,8 +5,9 @@
 }
 
 window#waybar {
-    background-color: @waybar-bg;
-    color: @waybar-fg;
+    /* background-color: rgba(43, 48, 59, 0.5); */
+    /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
+    color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
 }
@@ -33,6 +16,15 @@ window#waybar.hidden {
     opacity: 0.2;
 }
 
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
+
 window#waybar.termite {
     background-color: #3F3F3F;
 }
@@ -56,28 +48,34 @@ button:hover {
     box-shadow: inset 0 -3px #ffffff;
 }
 
+/* you can set a style on hover for any module like this */
+#pulseaudio:hover {
+    background-color: #a37800;
+}
+
 #workspaces button {
-    padding: 0 10px;
-    background-color: @workspaces-color;
+    padding: 0 5px;
+    background-color: transparent;
     color: #ffffff;
 }
 
 #workspaces button:hover {
-    background-color: @workspaces-hover-bg;
-    box-shadow: inset 0 2px #ffffff;
-
+    background: rgba(0, 0, 0, 0.2);
 }
 
-#workspaces button.active {
-    background-color: @workspaces-active-bg;
-    color: @workspaces-active-fg;
-    box-shadow: inset 0 2px @red;
-}
-
-/*#mode {
+#workspaces button.focused {
     background-color: #64727D;
     box-shadow: inset 0 -3px #ffffff;
-}*/
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    box-shadow: inset 0 -3px #ffffff;
+}
 
 #clock,
 #battery,
@@ -95,52 +93,16 @@ button:hover {
 #idle_inhibitor,
 #scratchpad,
 #power-profiles-daemon,
+#mpd {
+    padding: 0 10px;
+    color: #ffffff;
+}
+
 #window,
 #workspaces {
     margin: 0 4px;
 }
 
-#window {
-    color: @red;
-    box-shadow: inset 0 2px @red;
-}
-
-#clock {
-    color: @yellow;
-    box-shadow: inset 0 2px @yellow;
-}
-
-#mpris {
-    color: @pink;
-    box-shadow: inset 0 2px @pink;
-}
-
-#pulseaudio {
-    color: @blue;
-    box-shadow: inset 0 2px @blue;
-}
-
-#cpu {
-    color: @red;
-    box-shadow: inset 0 2px @red;
-}
-
-#memory {
-    color: @red;
-    box-shadow: inset 0 2px @red;
-}
-
-#language {
-    color: @yellow;
-    box-shadow: inset 0 2px @yellow;
-}
-
-#tray {
-    color: @navy;
-    box-shadow: inset 0 2px @navy;
-}
-
-
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left > widget:first-child > #workspaces {
     margin-left: 0;
@@ -151,6 +113,20 @@ button:hover {
     margin-right: 0;
 }
 
+#clock {
+    background-color: #64727D;
+}
+
+#battery {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+#battery.charging, #battery.plugged {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
 @keyframes blink {
     to {
         background-color: #ffffff;
@@ -158,7 +134,194 @@ button:hover {
     }
 }
 
+/* Using steps() instead of linear as a timing function to limit cpu usage */
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: steps(12);
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#power-profiles-daemon {
+    padding-right: 15px;
+}
+
+#power-profiles-daemon.performance {
+    background-color: #f53c3c;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.balanced {
+    background-color: #2980b9;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.power-saver {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
 label:focus {
     background-color: #000000;
 }
 
+#cpu {
+    background-color: #2ecc71;
+    color: #FFFFFF;
+}
+
+#memory {
+    background-color: #9b59b6;
+}
+
+#disk {
+    background-color: #964B00;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}
+
+#network {
+    background-color: #2980b9;
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#pulseaudio {
+    background-color: #f1c40f;
+    color: #000000;
+}
+
+#pulseaudio.muted {
+    background-color: #90b1b1;
+    color: #2a5c45;
+}
+
+#wireplumber {
+    background-color: #fff0f5;
+    color: #000000;
+}
+
+#wireplumber.muted {
+    background-color: #f53c3c;
+}
+
+#custom-media {
+    background-color: #66cc99;
+    color: #2a5c45;
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+    background-color: #ffa000;
+}
+
+#temperature {
+    background-color: #f0932b;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    background-color: #2980b9;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#mpd {
+    background-color: #66cc99;
+    color: #2a5c45;
+}
+
+#mpd.disconnected {
+    background-color: #f53c3c;
+}
+
+#mpd.stopped {
+    background-color: #90b1b1;
+}
+
+#mpd.paused {
+    background-color: #51a37a;
+}
+
+#language {
+    background: #00b093;
+    color: #740864;
+    padding: 0 5px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state {
+    background: #97e1ad;
+    color: #000000;
+    padding: 0 0px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state > label {
+    padding: 0 5px;
+}
+
+#keyboard-state > label.locked {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad.empty {
+	background-color: transparent;
+}
+
+#privacy {
+    padding: 0;
+}
+
+#privacy-item {
+    padding: 0 5px;
+    color: white;
+}
+
+#privacy-item.screenshare {
+    background-color: #cf5700;
+}
+
+#privacy-item.audio-in {
+    background-color: #1ca000;
+}
+
+#privacy-item.audio-out {
+    background-color: #0069d4;
+}