diff --git a/modules/desktop/i3.nix b/modules/desktop/i3.nix
index 96e4efb..b39cac7 100644
--- a/modules/desktop/i3.nix
+++ b/modules/desktop/i3.nix
@@ -2,7 +2,12 @@
 
   config = lib.mkIf config.services.xserver.enable {
 
-    services.xserver.windowManager = { i3 = { enable = true; }; };
+    services.xserver.windowManager = {
+      i3 = {
+        enable = true;
+        package = pkgs.i3-gaps;
+      };
+    };
 
     environment.systemPackages = with pkgs; [
       dmenu # Launcher
@@ -12,6 +17,7 @@
 
     home-manager.users.${identity.user}.xsession.windowManager.i3 = {
       enable = true;
+      package = pkgs.i3-gaps;
       config = let
         modifier = "Mod4"; # Super key
         ws1 = "I";
@@ -24,16 +30,6 @@
         ws8 = "VIII";
         ws9 = "IX";
         ws10 = "X";
-        # ws1 = "1:";
-        # ws2 = "2:";
-        # ws3 = "3:";
-        # ws4 = "4:";
-        # ws5 = "5:";
-        # ws6 = "6:";
-        # ws7 = "7:";
-        # ws8 = "8:";
-        # ws9 = "9:";
-        # ws10 = "10:";
       in {
         modifier = modifier;
         assigns = {
@@ -46,21 +42,23 @@
         colors = let
           background = "#2f343f";
           inactiveBackground = "#2f343f";
+          border = "#F0C674";
+          inactiveBorder = "#E2B860";
           text = "#f3f4f5";
           inactiveText = "#676E7D";
           urgentBackground = "#E53935";
-          indicator = "#00ff00";
+          # indicator = "#00ff00";
+          indicator = "#00000000";
         in {
           background = background;
           focused = {
-            inherit background indicator text;
-            border = background;
+            inherit background indicator text border;
             childBorder = background;
           };
           focusedInactive = {
             inherit indicator;
             background = inactiveBackground;
-            border = inactiveBackground;
+            border = inactiveBorder;
             childBorder = inactiveBackground;
             text = inactiveText;
           };
@@ -68,7 +66,7 @@
           unfocused = {
             inherit indicator;
             background = inactiveBackground;
-            border = inactiveBackground;
+            border = inactiveBorder;
             childBorder = inactiveBackground;
             text = inactiveText;
           };
@@ -214,12 +212,24 @@
           }
         ];
         window = {
-          border = 1;
-          hideEdgeBorders = "both";
+          border = 0;
+          hideEdgeBorders = "smart";
           titlebar = false;
         };
         workspaceAutoBackAndForth = false;
         workspaceOutputAssign = [ ];
+        gaps = {
+          bottom = 0;
+          top = 0;
+          left = 0;
+          right = 0;
+          horizontal = 0;
+          vertical = 0;
+          inner = 0;
+          outer = 0;
+          smartBorders = "off";
+          smartGaps = false;
+        };
       };
       extraConfig = "";
     };
diff --git a/modules/desktop/picom.nix b/modules/desktop/picom.nix
index c7bb81d..02728f6 100644
--- a/modules/desktop/picom.nix
+++ b/modules/desktop/picom.nix
@@ -7,20 +7,20 @@
         enable = true;
         blur = false;
         blurExclude = [ ];
-        extraOptions = ''
-          shadow-radius = 60
-          corner-radius = 20
-        '';
+        # extraOptions = ''
+        # shadow-radius = 60
+        # corner-radius = 20
+        # '';
         fade = false;
         experimentalBackends = true;
-        inactiveDim = "0.2";
+        inactiveDim = "0.05";
         inactiveOpacity = "1.0";
         menuOpacity = "1.0";
         noDNDShadow = false;
         opacityRule = [
           "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'" # Hide tabbed windows
         ];
-        shadow = true;
+        shadow = false;
         shadowExclude = [ ];
         shadowOffsets = [ (-30) (-30) ];
         shadowOpacity = "0.25";
diff --git a/modules/desktop/polybar.nix b/modules/desktop/polybar.nix
index 07503be..b73491b 100644
--- a/modules/desktop/polybar.nix
+++ b/modules/desktop/polybar.nix
@@ -34,7 +34,7 @@
             radius = 0;
             # offset-y = "5%";
             # dpi = 96;
-            background = colors.background;
+            background = "#00000000";
             foreground = colors.foreground;
             line-size = "3pt";
             border-top-size = 0;
@@ -96,6 +96,8 @@
             # format-volume-prefix = "VOL ";
             # format-volume-prefix-foreground = colors.primary;
             format-volume = "<ramp-volume> <label-volume>";
+            # format-volume-background = colors.background;
+            # label-volume-background = colors.background;
             label-volume = "%percentage%%";
             label-muted = "ﱝ ---";
             label-muted-foreground = colors.disabled;
@@ -151,6 +153,7 @@
             date-alt = "%Y-%m-%d %H:%M:%S";
             label = " %date%";
             label-foreground = colors.primary;
+            # format-background = colors.background;
           };
           "settings" = {
             screenchange-reload = true;
diff --git a/nvim.configlink/init.lua b/nvim.configlink/init.lua
index c1461eb..2a570a3 100644
--- a/nvim.configlink/init.lua
+++ b/nvim.configlink/init.lua
@@ -41,7 +41,10 @@ require("packer").startup(function(use)
         "morhetz/gruvbox",
         config = function()
             vim.g.gruvbox_italic = 1
-            vim.cmd([[colorscheme gruvbox]])
+            vim.cmd([[
+              autocmd ColorScheme * highlight Normal ctermbg=NONE guibg=NONE
+              colorscheme gruvbox
+            ]])
         end,
     })