diff --git a/modules/config/default.nix b/modules/config/default.nix
index ebffaee..a7ee82e 100755
--- a/modules/config/default.nix
+++ b/modules/config/default.nix
@@ -96,6 +96,7 @@ let
   themesSubmodule = lib.types.submodule {
     options = {
       currentTheme = genOptions stringType "theme";
+      wmGaps = intType;
       fonts = {
         names = genOptions stringType "name";
         sizes = {
diff --git a/modules/config/themes/default.nix b/modules/config/themes/default.nix
index 1df9fc5..4027134 100755
--- a/modules/config/themes/default.nix
+++ b/modules/config/themes/default.nix
@@ -24,6 +24,7 @@ let
 in
 {
   themes = {
+    wmGaps = 6;
     currentTheme = {
       theme0 = currentTheme0; # User0 Theme
       theme1 = currentTheme1; # User1 Theme
diff --git a/modules/home/gui/apps/tools/espanso/default.nix b/modules/home/gui/apps/tools/espanso/default.nix
index 631396f..86cc192 100755
--- a/modules/home/gui/apps/tools/espanso/default.nix
+++ b/modules/home/gui/apps/tools/espanso/default.nix
@@ -11,7 +11,6 @@
         show_notifications = false;
       };
     };
-
     package = pkgs.espanso-wayland;
     matches = {
       base = {
diff --git a/modules/home/gui/desktop/hypr/land/config/general.nix b/modules/home/gui/desktop/hypr/land/config/general.nix
index 5fcc401..ffdc546 100755
--- a/modules/home/gui/desktop/hypr/land/config/general.nix
+++ b/modules/home/gui/desktop/hypr/land/config/general.nix
@@ -5,7 +5,7 @@
 }:
 let
 
-  inherit (flake.config.aesthetics.themes) currentTheme palettes;
+  inherit (flake.config.aesthetics.themes) currentTheme palettes wmGaps;
 
   inherit (flake.config.people) user0 user1 user2;
 
@@ -24,8 +24,8 @@ let
   el = palettes.${themeLogic}.colours;
 in
 {
-  gaps_in = 2.5;
-  gaps_out = 5;
+  gaps_in = wmGaps / 2;
+  gaps_out = wmGaps;
   border_size = 2;
   "col.active_border" = "rgb(${el.base0E})";
   "col.inactive_border" = "0xff${el.base02}";
diff --git a/modules/home/gui/desktop/niri/config/layout.nix b/modules/home/gui/desktop/niri/config/layout.nix
index 8fad340..e2b5822 100755
--- a/modules/home/gui/desktop/niri/config/layout.nix
+++ b/modules/home/gui/desktop/niri/config/layout.nix
@@ -1,4 +1,7 @@
-{ colourHelpers, ... }:
+{ colourHelpers, flake, ... }:
+let
+  inherit (flake.config.aesthetics.themes) wmGaps;
+in
 {
   layout = {
     default-column-width = {
@@ -16,7 +19,7 @@
       active.color = colourHelpers.makeColour colourHelpers.el.base0E;
       inactive.color = colourHelpers.makeColour colourHelpers.el.base02;
     };
-    gaps = 5;
+    gaps = wmGaps;
     shadow = {
       enable = true;
       color = colourHelpers.el.base11;
diff --git a/modules/home/gui/desktop/niri/default.nix b/modules/home/gui/desktop/niri/default.nix
index 5af4064..7620a21 100755
--- a/modules/home/gui/desktop/niri/default.nix
+++ b/modules/home/gui/desktop/niri/default.nix
@@ -50,7 +50,7 @@ let
           osConfig
           ;
       };
-      layout = import (configPath + /layout.nix) { inherit colourHelpers; };
+      layout = import (configPath + /layout.nix) { inherit colourHelpers flake; };
       main = import (configPath + /main.nix);
       outputs = import (configPath + /outputs.nix) {
         inherit
diff --git a/modules/home/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
index 7dccbd1..77059cb 100755
--- a/modules/home/gui/desktop/wayland/waybar/config/settings.nix
+++ b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
@@ -1,6 +1,7 @@
-{ config, ... }:
+{ config, flake, ... }:
 let
   user = config.home.username;
+  inherit (flake.config.aesthetics.themes) wmGaps;
 in
 {
   mainBar = {
@@ -8,9 +9,9 @@ in
     layer = "top";
     height = 5;
     margin-top = 0;
-    margin-bottom = 5;
-    margin-left = 5;
-    margin-right = 5;
+    margin-bottom = wmGaps;
+    margin-left = wmGaps;
+    margin-right = wmGaps;
     modules-left = [
       "custom/launcher"
       "hyprland/workspaces"
diff --git a/modules/home/gui/desktop/wayland/waybar/default.nix b/modules/home/gui/desktop/wayland/waybar/default.nix
index 4ecf198..cf8371a 100755
--- a/modules/home/gui/desktop/wayland/waybar/default.nix
+++ b/modules/home/gui/desktop/wayland/waybar/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   configPath = ./config;
-  settingsPath = import (configPath + /settings.nix) { inherit config; };
+  settingsPath = import (configPath + /settings.nix) { inherit config flake; };
   stylePath = import (configPath + /style.nix) { inherit config flake; };
 in
 {
diff --git a/modules/nixos/services/espanso/default.nix b/modules/nixos/services/espanso/default.nix
old mode 100644
new mode 100755