diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index c727e83c31121162a1d1f215bf88a9d5420b510a..29c3754af22d6d8851ae5dbeeab48006f641c81a 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -39,9 +39,3 @@ $backgrounded_blocks: ".block-call_to_action, .block-chapter--accent_background,
     &--alt_background, &--accent_background
         & + &
             margin-top: 0
-
-// Heading + block_cta + full-width
-// .heading + .block-call_to_action
-//     margin-top: $spacing-5
-//     padding-top: 0
-    
diff --git a/assets/sass/_theme/blocks/gallery.sass b/assets/sass/_theme/blocks/gallery.sass
index 713f81cc800c272d0c47236a73911730600e07b5..f5fc7b1b00aa9aa4bae34ece7b84f5caf61ae272 100644
--- a/assets/sass/_theme/blocks/gallery.sass
+++ b/assets/sass/_theme/blocks/gallery.sass
@@ -42,7 +42,7 @@
                 figure
                     display: flex
                     flex-direction: column
-                    gap: space(3)
+                    gap: $spacing-2
     &--carousel
         overflow: hidden
         position: relative
@@ -94,9 +94,9 @@
                             width: auto
                             max-width: none
                 figcaption
-                    margin-top: space(3)
+                    margin-top: $spacing-2
                     > * + *
-                        margin-top: space(2)
+                        margin-top: $spacing-1
 
             &__arrows
                 margin-left: pxToRem(-18)
@@ -108,10 +108,10 @@
                 &--next
                     @include button-reset
                     @include icon(arrow-left, before)
-                    height: space(12)
+                    height: $spacing-4
                     padding: 0
                     position: static
-                    width: space(12)
+                    width: $spacing-4
                     svg
                         display: none
                 &--next
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 10de93aadb8529a167c18a88e761c3f1bbcf5b62..9223e15c4fcbfa6e9a77fd75e3d8b94eff8ff442 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -193,7 +193,7 @@
                     width: columns(4)
             &:not(.with-description)
                 ul.title-only
-                    @include grid(4, desktop, space(2))
+                    @include grid(4, desktop, $spacing-1)
                     grid-column: 1 / 13
                     li
                         margin-top: 0
diff --git a/assets/sass/_theme/dependencies/glightbox.sass b/assets/sass/_theme/dependencies/glightbox.sass
index ce139ae33aa8851731b5a349b6b8d6fc744fa368..a09d705b9162359cb199cc6ae1cdc79be845ee7b 100644
--- a/assets/sass/_theme/dependencies/glightbox.sass
+++ b/assets/sass/_theme/dependencies/glightbox.sass
@@ -34,7 +34,7 @@
         @include icon(arrow-left)
         left: 0
     .gdesc-inner
-        padding: 0 $spacing-2 space(2)
+        padding: 0 $spacing-2 $spacing-1
         text-align: center
         .gslide-desc
             @include meta
diff --git a/assets/sass/_theme/sections/events.sass b/assets/sass/_theme/sections/events.sass
index 0830cae35edfe2d8de149e6a056b8530835c3592..99ef8e19772d268aa63fddd6a2316b651b84b5c6 100644
--- a/assets/sass/_theme/sections/events.sass
+++ b/assets/sass/_theme/sections/events.sass
@@ -55,7 +55,7 @@
                 padding-right: 0.3rem
     .events-categories
         display: flex
-        gap: space(2)
+        gap: $spacing-1
         a
             @include link($color-accent)
     .events-actions
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 4a58c016d820b19bb7ddd27bd60325440407d6b3..d6c0cf36941cf08cb5fd7e9b368ef57c2dda2eeb 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -92,7 +92,7 @@
     li
         display: inline-block
         vertical-align: middle
-        margin-left: space(2)
+        margin-left: $spacing-1
         &:last-child
             &::after
                 content: none