diff --git a/README.md b/README.md
index e9d95da..71fe2c2 100755
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ config here](https://github.com/Frost-Phoenix/nixos-config/tree/catppuccin)
 
 ![desktop-neofetch](./assets/screens/desktop-neofetch.png)
 ![busy-desktop](./assets/screens/desktop-busy.png)
-Screenshots up to date as of [this commit](https://github.com/pagedMov/nixos-config/commit/4541ca49feae0ae2a4323ce712133bca9cbf6e1c)
+Screenshots up to date as of [this commit](https://github.com/pagedMov/nixos-config/commit/0bb0b6ce81a4b214158b5fb4bb0da7105f8d9a17)
 
 ## Programs
 
diff --git a/assets/screens/desktop-busy.png b/assets/screens/desktop-busy.png
index ce0106b..6cc73d3 100755
Binary files a/assets/screens/desktop-busy.png and b/assets/screens/desktop-busy.png differ
diff --git a/assets/screens/desktop-neofetch.png b/assets/screens/desktop-neofetch.png
index 1644701..eb939dc 100755
Binary files a/assets/screens/desktop-neofetch.png and b/assets/screens/desktop-neofetch.png differ
diff --git a/flake.nix b/flake.nix
index 3a0e7e3..09a18d1 100755
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,7 @@
           inherit pkgs;
           extraSpecialArgs = {
             host = "oganesson";
-            inherit self username inputs nur;
+            inherit self username inputs;
           };
 
           # Specific Home Manager config for oganesson
@@ -52,6 +52,8 @@
             ./hosts/desktop/home.nix
             ./modules/home
             stylix.homeManagerModules.stylix
+            nixvim.homeManagerModules.nixvim
+            nur.nixosModules.nur
           ];
         };
 
@@ -86,7 +88,6 @@
             ./modules/sys
             home-manager.nixosModules.home-manager
             stylix.nixosModules.stylix
-            nixvim.nixosModules.nixvim
             nur.nixosModules.nur
           ];
         };
diff --git a/modules/home/environment/waybar.nix b/modules/home/environment/waybar.nix
index 6f24eb7..195d098 100755
--- a/modules/home/environment/waybar.nix
+++ b/modules/home/environment/waybar.nix
@@ -365,7 +365,8 @@ in {
 
           #workspaces {
             margin: 3px;
-            background: #${bg.dark};
+            background: #${bg.darker};
+            border: 3px solid #${bg.dark};
             border-radius: 8px;
           }
 
@@ -380,8 +381,9 @@ in {
           }
 
           #cava {
-            background: #${bg.dark};
+            background: #${bg.darker};
             border-radius: 8px;
+            border: 3px solid #${bg.dark};
             margin: 3px 3px 3px 6px;
             padding: 0px 15px 0px 15px;
             color: #${colors.color6};
@@ -389,8 +391,9 @@ in {
 
           #window {
             margin: 3px;
-            background: #${bg.dark};
+            background: #${bg.darker};
             border-radius: 8px;
+            border: 3px solid #${bg.dark};
             padding: 0 15px 0 15px;
             font-weight: bold;
           }
@@ -398,8 +401,9 @@ in {
           #hardware {
             margin: 3px;
             padding: 0 10px 0 10px;
-            background: #${bg.dark};
+            background: #${bg.darker};
             border-radius: 8px;
+            border: 3px solid #${bg.dark};
           }
 
           #custom-disk-icon, #cpu, #memory {
@@ -422,16 +426,18 @@ in {
 
           #clock {
             font-weight: bold;
-            background: #${bg.dark};
+            background: #${bg.darker};
             border-radius: 8px;
+            border: 3px solid #${bg.dark};
             margin: 3px;
             padding: 0 10px 0 10px;
             font-size: 18px;
           }
 
           #powerbtns {
-            background: #${bg.dark};
+            background: #${bg.darker};
             border-radius: 8px;
+            border: 3px solid #${bg.dark};
             margin: 3px;
             padding: 0 5px 0 10px;
           }
@@ -452,8 +458,9 @@ in {
           }
 
           #audio {
-            background: #${bg.dark};
+            background: #${bg.darker};
             border-radius: 8px;
+            border: 3px solid #${bg.dark};
             margin: 3px;
             padding: 5px 0 10px 0;
           }
@@ -487,15 +494,17 @@ in {
           #network {
             color: #${colors.color1};
             font-size: 20px;
-            background: #${bg.dark};
+            background: #${bg.darker};
             border-radius: 8px;
+            border: 3px solid #${bg.dark};
             margin: 3px;
             padding: 5px 0 5px 6px;
           }
 
           #brightness {
-            background: #${bg.dark};
+            background: #${bg.darker};
             border-radius: 8px;
+            border: 3px solid #${bg.dark};
             margin: 3px;
             padding: 10px 0px 5px 0;
           }
@@ -509,7 +518,8 @@ in {
           #battery {
             color: #${colors.color4};
             font-size: 20px;
-            background: #${bg.dark};
+            background: #${bg.darker};
+            border: 3px solid #${bg.dark};
             border-radius: 8px;
             margin: 3px;
             padding: 5px 0 5px 0px;