diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index 1fab3885b1f56a1e1afccc22d26965e008e1c4e9..14bf82b99012c78ba94cd083a4b9d886b2a191ae 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/assets/sass/_theme/design-system/layout.sass
@@ -11,6 +11,7 @@
     --spacing4: #{$spacing4}
     --spacing5: #{$spacing5}
     --grid-gutter: #{$grid-gutter}
+    --grid-gutter-sm: #{$grid-gutter-sm}
     --grid-max-width: #{$grid-max-width}
     --header-height: #{$header-height}
     --header-menu-max-height: calc(100vh - var(--header-height) - #{$spacing4})
diff --git a/layouts/partials/footer/debug.html b/layouts/partials/footer/debug.html
index bb2359ce3f2b72ccb554ac33362ed622f1486996..dbd95c491865f2521ec2657fc008772029cbabd1 100644
--- a/layouts/partials/footer/debug.html
+++ b/layouts/partials/footer/debug.html
@@ -24,17 +24,13 @@
 
 <div class="d-cross"></div>
 <style>
-  :root {
-    --d-grid-margin: 64px;
-    --d-grid-sm-margin: 44px;
-  }
   .d-grid {
     bottom: 0;
     display: none;
-    grid-gap: var(--d-grid-margin);
+    grid-gap: var(--grid-gutter);
     grid-template-columns: repeat(12, 1fr);
     opacity: 0.3;
-    padding: 0 var(--d-grid-margin);
+    padding: 0 var(--grid-gutter);
     pointer-events: none;
     position: fixed;
     margin: auto;
@@ -42,7 +38,7 @@
     top: 0;
     left: 50%;
     transform: translateX(-50%);
-    width: calc(1680px + var(--d-grid-margin));
+    width: calc(var(--grid-max-width) + var(--grid-gutter));
     z-index: 9999;
     font-family: sans-serif;
     font-size: 12px;
@@ -143,8 +139,8 @@
       display: none;
     }
     .d-grid {
-      border-left: calc(var(--d-grid-sm-margin) / 2) solid fuchsia;
-      border-right: calc(var(--d-grid-sm-margin) / 2) solid fuchsia;
+      border-left: calc(var(--grid-gutter-sm) / 2) solid fuchsia;
+      border-right: calc(var(--grid-gutter-sm) / 2) solid fuchsia;
     }
   }