diff --git a/flake.nix b/flake.nix
index 4a0d2c3..1e29a6a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -117,7 +117,9 @@
     theme = themes.custom (themes.raw.gruvbox-dark-hard // {
       corner-radius = 12;
       border-width  = 3;
-      padding       = 10;
+
+      margin  = 10;
+      padding = 10;
 
       font.size.normal = 12;
       font.size.big    = 18;
diff --git a/machines/enka/dunst/default.nix b/machines/enka/dunst/default.nix
index 2633cbe..eec4d55 100644
--- a/machines/enka/dunst/default.nix
+++ b/machines/enka/dunst/default.nix
@@ -10,7 +10,7 @@ homeConfiguration "nixos" {
       dmenu = "fuzzel --dmenu";
 
       corner_radius      = corner-radius;
-      gap_size           = padding;
+      gap_size           = margin;
       horizontal_padding = padding;
       padding            = padding;
 
diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix
index f35cada..4c681ab 100644
--- a/machines/enka/hyprland/default.nix
+++ b/machines/enka/hyprland/default.nix
@@ -150,8 +150,8 @@
       general {
         max_fps = 60
 
-        gaps_in     = ${toString (padding / 2)}
-        gaps_out    = ${toString padding}
+        gaps_in     = ${toString (margin/ 2)}
+        gaps_out    = ${toString margin}
         border_size = ${toString border-width}
 
         col.active_border         = 0xFF${base0A}
diff --git a/machines/enka/waybar/default.nix b/machines/enka/waybar/default.nix
index 0da51c9..7a0cb47 100644
--- a/machines/enka/waybar/default.nix
+++ b/machines/enka/waybar/default.nix
@@ -8,9 +8,9 @@ homeConfiguration "nixos" {
       layer  = "top";
       height = 2 * corner-radius;
 
-      margin-right = padding;
-      margin-left  = padding;
-      margin-top   = padding;
+      margin-right = margin;
+      margin-left  = margin;
+      margin-top   = margin;
 
       modules-left = [
         "hyprland/workspaces"
@@ -129,8 +129,7 @@ homeConfiguration "nixos" {
       }
 
       .modules-right {
-        margin-right: ${toString padding}px;
-
+        margin-right: ${toString margin}px;
       }
 
       #waybar {