diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix
index 61486f4..0d38b77 100644
--- a/home/modules/gui/sway.nix
+++ b/home/modules/gui/sway.nix
@@ -43,7 +43,11 @@ in {
           cfg.monitors;
 
         modifier = "Mod4";
-        focus.followMouse = true;
+        
+        focus = {
+          followMouse = true;
+          wrapping = "workspace";
+        };
 
         input = {
           "*" = {
@@ -59,8 +63,10 @@ in {
         };
 
         gaps = {
-          inner = 10;
+          inner = 8;
           outer = -10;
+          smartBorders = "on";
+          smartGaps = true;
         };
 
         bars = singleton {
@@ -71,17 +77,52 @@ in {
         window = {
           hideEdgeBorders = "both";
           titlebar = false;
+          border = 2;
+        };
+
+        floating = {
+          border = 0;
+          titlebar = false;
         };
 
         workspaceLayout = "tabbed";
 
         colors = {
+          background = "#141414";
           focused = {
-            background = "#222222";
-            border = "#4c7899";
-            childBorder = "#222222";
-            indicator = "#292d2e";
-            text = "#888888";
+            border = "#1c1c1c";
+            background = "#000000";
+            text = "#eaeaea";
+            indicator = "#000000";
+            childBorder = "#000000";
+          };
+          focusedInactive = {
+            border = "#000000";
+            background = "#000000";
+            text = "#eaeaea";
+            indicator = "#000000";
+            childBorder = "#000000";
+          };
+          unfocused = {
+            border = "#000000";
+            background = "#000000";
+            text = "#eaeaea";
+            indicator = "#000000";
+            childBorder = "#000000";
+          };
+          urgent = {
+            border = "#ff6666";
+            background = "#ff6666";
+            text = "#eaeaea";
+            indicator = "#ff6666";
+            childBorder = "#ff6666";
+          };
+          placeholder = {
+            border = "#000000";
+            background = "#000000";
+            text = "#eaeaea";
+            indicator = "#000000";
+            childBorder = "#000000";
           };
         };
 
@@ -135,7 +176,6 @@ in {
 
       swaynag.enable = true;
       systemd.enable = true;
-
       xwayland = true;
     };
   };