diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 5f6d13b4ea1aa0b90941ddd9fe2d2895d88742f9..3de6b69ccafe5c02c06202e47a5f0d421d2b1033 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -423,4 +423,7 @@ $icon-burger-margin-right: -12px
 $icon-close-margin-right: -12px
 $icon-toc-margin-right: -14px
 $icon-arrow-previous-margin-left: -22px // cf. testimonial
-$icon-social-margin-right: -14px
\ No newline at end of file
+$icon-social-margin-right: -14px
+
+$grid-width: Min(#{$grid-max-width}, 100vw) // Inclus les gouttières extérieures
+$column-width: calc( (#{$grid-width} - #{$grid-gutter} * 13) / 12) // On prend toute la largeur, on soustrait les 13 gouttières et on divise par le nombre de colonnes
diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index 27320f1e6d566558b182574620abb52983659ddd..fdb82b095dee3553f740da753d763cdf7c641b89 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -136,11 +136,11 @@ $space-unit: 4 !default
         flex: 0 0 calc(#{100 / $cols}% - #{$gap-x} * #{($cols - 1) / $cols} )
 
 // This must be used for content inside columns
-@function col($quantity, $base: 12)
-    $quantity-on-base: $quantity / $base * 12
-    $width: calc( (100% + #{$grid-gutter}) / 12 * #{$quantity-on-base} - #{$grid-gutter} )
+@function columns($quantity)
+    $width: calc( (#{$column-width} * #{$quantity}) + #{$grid-gutter} * ( #{$quantity} - 1 )) // V2: Plus lisible ?
     @return #{$width}
 
+
 // This must be used for offset, outside columns
 @function offset($quantity, $base: 12)
     $quantity-on-base: $quantity / $base * 12
@@ -346,12 +346,12 @@ $space-unit: 4 !default
         align-items: baseline
         display: flex
         .block-title
-            width: col(4)
+            width: columns(4)
             &:not(.hidden) + .description
                 margin-left: $grid-gutter
         .description
             margin-top: 0
-            width: col(8)
+            width: columns(8)
 
 @mixin collapsed-figcaption
     figcaption
diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index 0adf48cef3fa0d87d9645aeae2ab83934847f5d5..a72a85a8bd6d6e21c4126a0688a95da7b0445b18 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -17,7 +17,7 @@
             margin-top: $spacing4
     @include in-page-without-sidebar
         h2
-            width: col(8)
+            width: columns(8)
 
 // Specific
 $backgrounded_blocks: ".block-call_to_action, .block-chapter--accent_background, .block-chapter--alt_background, .block-timeline--horizontal, .block-pages--cards"
diff --git a/assets/sass/_theme/blocks/call_to_action.sass b/assets/sass/_theme/blocks/call_to_action.sass
index 2d7fab7c6992e13a1166ae233a9bb2089889cd68..163f500af1eae11054bc3884b4091eddb908e48a 100644
--- a/assets/sass/_theme/blocks/call_to_action.sass
+++ b/assets/sass/_theme/blocks/call_to_action.sass
@@ -80,7 +80,7 @@
             > div
                 // TODO : simplifier l'application d'une couleur de fond sur le CTA avec sidebar et sans sidebar
                 background-color: var(--cta-background-color)
-                padding: $grid-gutter col(1, 8)
+                padding: $grid-gutter columns(1)
                 width: 100%
                 position: relative
                 &::after
@@ -95,7 +95,7 @@
             &--with-image
                 picture
                     order: 1
-                    padding-left: col(1, 8)
+                    padding-left: columns(1)
                     padding-right: offset(4, 8)
                     position: relative
                     z-index: 2
diff --git a/assets/sass/_theme/blocks/chapter.sass b/assets/sass/_theme/blocks/chapter.sass
index e5c0f3a3767e84344f5eba3195c3b20e0548bf38..b9e6ee1bc5172a86e951e6a220c3b871e19a2dbb 100644
--- a/assets/sass/_theme/blocks/chapter.sass
+++ b/assets/sass/_theme/blocks/chapter.sass
@@ -1,4 +1,11 @@
 .block-chapter
+    .container
+        &::after
+            content: ''
+            display: block
+            width: columns(12)
+            height: columns(3)
+            background: red
     p:last-child
         margin-bottom: 0
     .notes
@@ -47,10 +54,10 @@
 
     @include in-page-with-sidebar
         figure
-            max-width: col(6, 8)
+            max-width: columns(6)
             &.image-portrait,
             &.image-square
-                max-width: col(4, 8)
+                max-width: columns(4)
         &--alt_background, &--accent_background
             background: none
             padding-bottom: 0
@@ -77,9 +84,9 @@
             flex-direction: row
             .text
                 order: 0
-                width: col(7)
+                width: columns(7)
             figure
-                width: col(4)
+                width: columns(4)
                 margin-left: col-offset(1)
                 margin-bottom: 0
                 text-align: right
diff --git a/assets/sass/_theme/blocks/contact.sass b/assets/sass/_theme/blocks/contact.sass
index be14a1d894192873ea9c494d5fc8827fec3a18fc..219df15c44599e7ec12f5d17e15c64f9c7f94207 100644
--- a/assets/sass/_theme/blocks/contact.sass
+++ b/assets/sass/_theme/blocks/contact.sass
@@ -56,9 +56,9 @@
             display: flex
             margin-top: 0
             address
-                width: col(4)
+                width: columns(4)
                 margin-top: 0
             ul
                 margin-top: 0
-                width: col(8)
+                width: columns(8)
                 margin-left: $grid-gutter
\ No newline at end of file
diff --git a/assets/sass/_theme/blocks/datatable.sass b/assets/sass/_theme/blocks/datatable.sass
index e3eb5c243aa22ac9c4cc5aa6daa7c52244ca8cb2..f78c8467cdd427330534b032389d4cf066efc8fa 100644
--- a/assets/sass/_theme/blocks/datatable.sass
+++ b/assets/sass/_theme/blocks/datatable.sass
@@ -6,4 +6,4 @@
     @include media-breakpoint-up(desktop)
         .top
             p
-                width: col(8)
+                width: columns(8)
diff --git a/assets/sass/_theme/blocks/definitions.sass b/assets/sass/_theme/blocks/definitions.sass
index ff72015af4391988e8d0e72ea05d975246255ca2..8e4005f053206fe51126d96d908b751fffab5fa1 100644
--- a/assets/sass/_theme/blocks/definitions.sass
+++ b/assets/sass/_theme/blocks/definitions.sass
@@ -36,6 +36,6 @@
         .definitions
             details
                 p
-                    padding-left: col(4)
+                    padding-left: columns(4)
                     margin-left: $grid-gutter
 
diff --git a/assets/sass/_theme/blocks/features.sass b/assets/sass/_theme/blocks/features.sass
index b225b1b586cafe45a591b72154af8ab8fba7924d..c0f7d1a5c051349ed451f816c90254c46eeb9254 100644
--- a/assets/sass/_theme/blocks/features.sass
+++ b/assets/sass/_theme/blocks/features.sass
@@ -22,13 +22,13 @@
         li
             flex-direction: row
             figure
-                width: calc(#{col(2, 8)} + #{half($grid-gutter)})
+                width: calc(#{columns(2)} + #{half($grid-gutter)})
                 flex-shrink: 0
                 margin-right: half($grid-gutter)
 
     @include in-page-without-sidebar
         .top
-            width: col(8)
+            width: columns(8)
         ul
             @include list-reset
             @include grid(3, desktop)
diff --git a/assets/sass/_theme/blocks/image.sass b/assets/sass/_theme/blocks/image.sass
index 926546d7722e4d1c75efd20b72747fd535d9e3ce..8bda5d7284d540c379fd41de9074c523216cc6b8 100644
--- a/assets/sass/_theme/blocks/image.sass
+++ b/assets/sass/_theme/blocks/image.sass
@@ -38,12 +38,12 @@
                 position: relative
                 .top
                     position: absolute
-                    width: col(5)
+                    width: columns(5)
             figure
                 display: flex
                 align-items: flex-end
                 > a 
-                    width: col(7)
+                    width: columns(7)
                     margin-left: half($grid-gutter)
                     display: block
                     order: 2
@@ -51,7 +51,7 @@
                     margin-left: 0
                     margin-right: -$grid-gutter
                 figcaption
-                    width: calc(#{col(5)} + #{$grid-gutter} / 2)
+                    width: calc(#{columns(5)} + #{$grid-gutter} / 2)
                     order: 1
                     display: block
                     text-align: right
@@ -67,7 +67,7 @@
                 justify-content: space-between
                 align-items: baseline
                 p
-                    max-width: col(8)
+                    max-width: columns(8)
                 *
                     flex: 1 1
                 .credit
diff --git a/assets/sass/_theme/blocks/organizations.sass b/assets/sass/_theme/blocks/organizations.sass
index 65dec22e92c5078680cd5d1b8a3c1160c86493ad..30dc92b592d43f82a33c90be63a4e46a132e0cf3 100644
--- a/assets/sass/_theme/blocks/organizations.sass
+++ b/assets/sass/_theme/blocks/organizations.sass
@@ -42,7 +42,7 @@
 
     @include in-page-without-sidebar
         .top .description
-            max-width: col(8)
+            max-width: columns(8)
         .map
             margin-left: -$grid-gutter
             margin-right: -$grid-gutter
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 74ec85e673490317a52fe47b3521bfc13d7811db..719e4b989875f0617c545b3f311cbcd54cea3d0d 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -180,9 +180,9 @@
                 article
                     gap: half($grid-gutter)
                     .media
-                        width: calc(#{col(2, 8)} + #{half($grid-gutter)})
+                        width: calc(#{columns(2)} + #{half($grid-gutter)})
                     .page-content
-                        width: col(6, 8)
+                        width: columns(6)
 
         @include in-page-without-sidebar
             .block-title
@@ -194,9 +194,9 @@
                         @include h2
             article
                 .media
-                    width: col(4)
+                    width: columns(4)
                 .page-content
-                    width: col(8)
+                    width: columns(8)
             &:not(.with-description)
                 ul.title-only
                     @include grid(4, desktop, space(2))
@@ -247,7 +247,7 @@
                 aspect-ratio: unset
         @include media-breakpoint-up(desktop)
             article
-                width: col(4, 8)
+                width: columns(4)
                 &:not(:first-child)
                     margin-top: -5%
                 &:nth-child(even)
@@ -263,11 +263,11 @@
                 .description
                     @include body-text
             .grid
-                width: col(10)
+                width: columns(10)
                 margin-left: auto
                 margin-right: auto
                 article
-                    width: col(4, 10)
+                    width: columns(4)
     &--large
         .top
             @include top-flex
@@ -309,6 +309,6 @@
                     @include lead
                     margin-bottom: space(4)
                 &-content
-                    width: col(5)
+                    width: columns(5)
                 .media 
-                    width: col(6)
+                    width: columns(6)
diff --git a/assets/sass/_theme/blocks/persons.sass b/assets/sass/_theme/blocks/persons.sass
index f207f5f00be30093d58fd6eb360cfdd9df247895..16a79536ee9c2b8ee74eeacc738186c9ba3f4933 100644
--- a/assets/sass/_theme/blocks/persons.sass
+++ b/assets/sass/_theme/blocks/persons.sass
@@ -4,7 +4,7 @@
     gap: $spacing1
     .avatar
         margin-right: 0
-        width: col(4)
+        width: columns(4)
     .description
         margin-top: $spacing1
         text-align: left
@@ -21,7 +21,7 @@
                 @include grid(2)
                 article
                     .avatar
-                        width: col(1.5, 4)
+                        width: columns(1.5)
                     .description
                         margin-top: $spacing0
         article
@@ -29,10 +29,10 @@
             gap: $spacing1
             @include media-breakpoint-up(md)
                 .avatar
-                    width: col(2, 8)
+                    width: columns(2)
     @include in-page-without-sidebar
         .top .description
-            max-width: col(8)
+            max-width: columns(8)
         &.block-with-long-text
             .persons
                 @include grid(2)
diff --git a/assets/sass/_theme/blocks/posts.sass b/assets/sass/_theme/blocks/posts.sass
index b8446feb0a92620c17d581cc84bfecc9cdb3a797..394dddb1c4507af3cb4d79fd0e9525394da90ef7 100644
--- a/assets/sass/_theme/blocks/posts.sass
+++ b/assets/sass/_theme/blocks/posts.sass
@@ -100,15 +100,15 @@
                     @include media-breakpoint-up(xl)
                         .media,
                         .post-content
-                            width: calc(#{col(4, 8)} + #{half($grid-gutter)})
+                            width: calc(#{columns(4)} + #{half($grid-gutter)})
         @include in-page-without-sidebar
             .large
                 .post
                     gap: $grid-gutter
                     .media
-                        width: col(6)
+                        width: columns(6)
                     .post-content
-                        width: col(5)
+                        width: columns(5)
                 p[itemprop="articleBody"]
                     margin-top: calc(#{$spacing1} + #{$spacing0})
     &--list
@@ -151,9 +151,9 @@
                 + article
                     margin-top: $spacing1
                 .media
-                    width: calc(#{col(2, 8)} + #{half($grid-gutter)})
+                    width: calc(#{columns(2)} + #{half($grid-gutter)})
                 .post-content
-                    width: col(6, 8)
+                    width: columns(6)
                     margin-left: half($grid-gutter)
 
         @include in-page-without-sidebar
@@ -163,9 +163,9 @@
                 padding-bottom: $spacing3
                 position: relative
                 .media
-                    width: col(3)
+                    width: columns(3)
                 .post-content
-                    width: col(6)
+                    width: columns(6)
                 + article
                     margin-top: $spacing3
                 .post-meta
@@ -215,10 +215,10 @@
                 .post
                     flex-direction: row
                     .media
-                        width: calc(#{col(3, 8)} + #{half($grid-gutter)})
+                        width: calc(#{columns(3)} + #{half($grid-gutter)})
                         margin-bottom: 0
                     .post-content
-                        width: col(5, 8)
+                        width: columns(5)
                         margin-left: half($grid-gutter)
             .list
                 article
@@ -277,14 +277,14 @@
 
         @include in-page-with-sidebar
             .post
-                width: col(4,8)
+                width: columns(4)
 
         @include in-page-without-sidebar
-            width: col(10)
+            width: columns(10)
             margin-left: auto
             margin-right: auto
             .post
-                width: col(4, 10)
+                width: columns(4)
 
 // Move this part to blocks/categories when categories block is ready
 .block-posts
diff --git a/assets/sass/_theme/blocks/testimonials.sass b/assets/sass/_theme/blocks/testimonials.sass
index 338da01140524b2eae8277d0e7fa6c5559f939cf..b268806c75860266413712aabe9f39c43078972c 100644
--- a/assets/sass/_theme/blocks/testimonials.sass
+++ b/assets/sass/_theme/blocks/testimonials.sass
@@ -28,7 +28,7 @@
             display: block
     .avatar
         flex-shrink: 0
-        width: calc(#{col(1, 8)} + #{$grid-gutter} / 2)
+        width: calc(#{columns(1)} + #{$grid-gutter} / 2)
         min-width: px2rem(80)
         margin-right: $spacing0
         margin-bottom: 0
@@ -108,10 +108,10 @@
                     margin-top: $spacing0
                     .avatar
                         position: absolute
-                        left: col(1)
+                        left: columns(1)
                         top: 0
                         margin-left: $grid-gutter
-                        width: col(2)
+                        width: columns(2)
 
         // TODO : en discuter en créa
         // figure
diff --git a/assets/sass/_theme/blocks/timeline.sass b/assets/sass/_theme/blocks/timeline.sass
index 0c527962608f6bc0773634cca4986fda06e248cd..7b5f8f3d554aa06ec4d831c10a37006e14bae847 100644
--- a/assets/sass/_theme/blocks/timeline.sass
+++ b/assets/sass/_theme/blocks/timeline.sass
@@ -45,20 +45,20 @@
             .timeline-event
                 display: flex
                 &::before, &::after
-                    left: col(3)
+                    left: columns(3)
                     margin-left: half($grid-gutter)
                 &::before
                     transform: translateX(-4px)
                 .title
-                    width: col(3)
+                    width: columns(3)
                     text-align: right
                     + p
                         margin-top: 0
                 p
                     padding-left: $grid-gutter
-                    width: col(7)
+                    width: columns(7)
                     &:first-child
-                        margin-left: col(3)
+                        margin-left: columns(3)
 
     &--horizontal
         --min-title-height: 0px
diff --git a/assets/sass/_theme/design-system/button.sass b/assets/sass/_theme/design-system/button.sass
index 60adbd146ac638d4dc53465255c6a469611d198c..6e07e46c8b27430640b1a2c9c90b4503ebff1999 100644
--- a/assets/sass/_theme/design-system/button.sass
+++ b/assets/sass/_theme/design-system/button.sass
@@ -6,7 +6,7 @@
     display: flex
     padding: 0
     @include media-breakpoint-up(desktop)
-        width: col(2,1)
+        width: columns(2)
     &:first-child
         margin-bottom: $spacing0
     &::before 
diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass
index 1cd7c5d3eaa3bf4b370051c5a0f06692cdf60586..d979954a3afe15f4c8d98771654dbfd7576c4396 100644
--- a/assets/sass/_theme/design-system/hero.sass
+++ b/assets/sass/_theme/design-system/hero.sass
@@ -67,28 +67,28 @@
     @include media-breakpoint-up(desktop)
         .content
             > h1, > hgroup
-                width: col(9)
+                width: columns(9)
         &--with-image
             .content
                 display: flex
                 justify-content: space-between
                 > h1, > hgroup
-                    width: col(7)
+                    width: columns(7)
                 figure
-                    width: col(5)
+                    width: columns(5)
 
         &--image-portrait, &--image-square
             .breadcrumb-nav
-                width: calc(#{col(9)} + #{half($grid-gutter)})
+                width: calc(#{columns(9)} + #{half($grid-gutter)})
                 -webkit-mask-image: linear-gradient(to right, black 0%, black 90%, transparent 100%)
                 mask-image: linear-gradient(to right, black 0%, black 90%, transparent 100%)
                 .breadcrumb
                     padding-right: 50px
             .content
                 > h1, > hgroup
-                    width: col(8)
+                    width: columns(8)
                 figure
-                    width: col(3)
+                    width: columns(3)
     + .breadcrumb-container
         margin-top: 0
 
diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index 722758b5ebd320c54d5acb33b0f57e69f6d2628a..f68e2273631a1b9d582377cf8d431871407fab39 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/assets/sass/_theme/design-system/layout.sass
@@ -114,7 +114,7 @@ details
         overflow-y: auto
         @include media-breakpoint-up(desktop)
             padding: $spacing3
-            width: col(8)
+            width: columns(8)
         .modal-header
             margin-bottom: $spacing0
             button
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index 5abd9de7ead9e47a04770d020c990ea56bfbcf53..618b1a48071df6dea09e5caed28eba1497c8bd9f 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -122,9 +122,9 @@
                             display: flex
                             gap: $grid-gutter
                         .dropdown-menu-title
-                            width: col(5)
+                            width: columns(5)
                         .nav-level-2
-                            width: col(7)
+                            width: columns(7)
                             li
                                 margin-bottom: $spacing0
             @else
diff --git a/assets/sass/_theme/design-system/search.sass b/assets/sass/_theme/design-system/search.sass
index 8560a31ddb04fba2f7ac6e64ab354528406a01bb..e7f3e52d2c24715872fb81e99cfc3b159f6cc81e 100644
--- a/assets/sass/_theme/design-system/search.sass
+++ b/assets/sass/_theme/design-system/search.sass
@@ -153,13 +153,13 @@
         @include media-breakpoint-up(desktop)
             &__form
                 position: relative
-                width: col(8)
+                width: columns(8)
                 &::after
-                    left: calc(#{col(8)} - #{space(8)})
+                    left: calc(#{columns(8)} - #{space(8)})
                     top: space(9)
             &__search-input,
             &__message
-                width: calc(#{col(8,12)} - #{space(21.5)})
+                width: calc(#{columns(8)} - #{space(21.5)})
             &__results-area
                 padding-top: space(26)
         @include media-breakpoint-down(desktop)
diff --git a/assets/sass/_theme/design-system/top.sass b/assets/sass/_theme/design-system/top.sass
index 574e1cc322c663e41f3b9500fa430d617a03cfc0..baf33cd30440a23f0ca18e28c6095b56d8fdb163 100644
--- a/assets/sass/_theme/design-system/top.sass
+++ b/assets/sass/_theme/design-system/top.sass
@@ -15,7 +15,7 @@
     //     margin-top: px2rem(5)
     //     p
     //         @include media-breakpoint-up(lg)
-    //             width: col(8)
+    //             width: columns(8)
     .link
         @extend .link-more
 
diff --git a/assets/sass/_theme/sections/diplomas.sass b/assets/sass/_theme/sections/diplomas.sass
index 67b54c24234bc8aa2bbce2dfe42e097f5550707a..51bbd9b9c7b0460fd1085feaa0917d41bcb634d7 100644
--- a/assets/sass/_theme/sections/diplomas.sass
+++ b/assets/sass/_theme/sections/diplomas.sass
@@ -68,7 +68,7 @@ ul.diplomas
                 @include media-breakpoint-up(desktop)
                     display: flex
                     > p
-                        width: col(6)
+                        width: columns(6)
             .title
                 @include h4
 
@@ -116,7 +116,7 @@ ul.diplomas
     .container
         @include media-breakpoint-down(sm)
             .buttons > *
-                width: col(8)
+                width: columns(8)
         @include media-breakpoint-down(md)
             .buttons
                 display: flex
@@ -124,7 +124,7 @@ ul.diplomas
                 flex-wrap: wrap
                 > *
                     min-width: 150px
-                    width: col(7)
+                    width: columns(7)
         @include media-breakpoint-up(md)
             @include grid(2, md)
             align-items: flex-end
@@ -136,7 +136,7 @@ ul.diplomas
                 justify-content: flex-end
                 > *
                     min-width: 200px
-                    width: col(2, 6)
+                    width: columns(2)
             
     .essential
         color: $header-color
diff --git a/assets/sass/_theme/sections/events.sass b/assets/sass/_theme/sections/events.sass
index c9031b2575d14e8486eeac12d061c7950c1e8168..9d163defc08bf5dc4596f3e390e0e7bf20dcf90d 100644
--- a/assets/sass/_theme/sections/events.sass
+++ b/assets/sass/_theme/sections/events.sass
@@ -124,10 +124,10 @@
                     flex-direction: row
                     gap: $spacing1
                     .media
-                        width: col(4)
+                        width: columns(4)
                     &-content
                         order: 1
-                        width: col(8)
+                        width: columns(8)
             @include media-breakpoint-down(md)
                 .media
                     max-width: 33%
@@ -142,12 +142,12 @@
                 gap: $grid-gutter
                 align-items: start
                 &-content
-                    width: col(10)
+                    width: columns(10)
                     > hgroup, > .event-title
                         margin-bottom: $spacing0
                 .media
                     order: 2
-                    width: col(2)
+                    width: columns(2)
             @include in-page-without-sidebar
                 &-dates
                     margin-top: 0
@@ -245,7 +245,7 @@
                     width: 100%
             @include media-breakpoint-up(desktop)
                 .media
-                    width: col(4, 8)
+                    width: columns(4)
                 &-dates
                     @include h3
                     margin-bottom: $spacing2
@@ -267,5 +267,5 @@
                 &-dates
                     @include h3
                 &:not(.event--with-image)
-                    width: col(5)
+                    width: columns(5)
                     margin-left: offset(4)
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index 0254ddae6be16b2eb3dec191ec167507c36b7d03..21c3a38c008547e1330f10c0d608559dc02e5b45 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -88,6 +88,6 @@
                 justify-content: space-between
                 gap: $grid-gutter
             [itemprop="articleBody"]
-                width: col(8)
+                width: columns(8)
             .logo
-                width: col(3)
+                width: columns(3)
diff --git a/assets/sass/_theme/sections/papers.sass b/assets/sass/_theme/sections/papers.sass
index 9cbed0822fb597044d65044c06b3127522c2a7bc..d1b26a8d658032f68678dc4938155833b996bacb 100644
--- a/assets/sass/_theme/sections/papers.sass
+++ b/assets/sass/_theme/sections/papers.sass
@@ -66,7 +66,7 @@
                 height: unset
                 @include sticky(-1px)
             .media
-                width: col(2, 4)
+                width: columns(2)
     .document-content
         min-height: 100vh
         .content
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index 2548a808aefbc1b64dffb45156713f68325d6413..3c3ecedc4af66d1b79fd6fc25e090aeb8cb8d6e7 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/assets/sass/_theme/sections/persons.sass
@@ -110,9 +110,9 @@ ol.persons--list
             align-items: baseline
             display: flex
             [itemprop="name"]
-                width: col(5)
+                width: columns(5)
             [itemprop="jobTitle"]
-                width: col(6)
+                width: columns(6)
                 margin-left: $grid-gutter
         @include media-breakpoint-down(desktop)
             &::after
@@ -170,7 +170,7 @@ ol.persons--list
             padding-bottom: 0
             margin-bottom: $spacing4
             .avatar
-                width: col(6)
+                width: columns(6)
                 margin-top: $spacing1
                 margin-left: auto
                 transform: translateY(100px)
@@ -188,10 +188,10 @@ ol.persons--list
                 margin-top: 0
                 h1
                     margin-bottom: 0
-                    width: col(8)
+                    width: columns(8)
                 .avatar
                     margin-bottom: 0
-                    width: col(3)
+                    width: columns(3)
     .roles
         a
             @include small
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index f355c79af5cdb92d0fe489d8299a564425aee078..1386f8c583431e161138840885c55adb11ac826a 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -66,7 +66,7 @@
                 .post-content
                     [itemprop=headline],
                     > p
-                        max-width: col(6, 9)
+                        max-width: columns(6)
     .posts--grid
         @include grid(1)
         @include grid(2, desktop)
diff --git a/layouts/partials/footer/debug.html b/layouts/partials/footer/debug.html
index fb2fa584fa76cbd6ef6d3f389a1d8cf826751aa5..e5a77b291f027180d4f8864f6d00d833217d68aa 100644
--- a/layouts/partials/footer/debug.html
+++ b/layouts/partials/footer/debug.html
@@ -190,6 +190,9 @@
     if (e.ctrlKey && e.key === 'i') {
       showImageDimension();
     }
+    if (e.ctrlKey && e.key === 'p') {
+      openInProd();
+    }
   });
 
   window.addEventListener('pointermove', e => {
@@ -264,4 +267,9 @@
 
     return (widthRatio + heightRatio) / 2;
   }
+
+  function openInProd() {
+    console.log('{{ .Site.BaseURL }}')
+  }
+
 </script>
\ No newline at end of file
diff --git a/layouts/partials/papers/document-nav.html b/layouts/partials/papers/document-nav.html
index 49b04d431ee141a35109827d2a0609dcd6fb99eb..1b9f6d5693fee74d700b593d0303e628433bfc90 100644
--- a/layouts/partials/papers/document-nav.html
+++ b/layouts/partials/papers/document-nav.html
@@ -16,7 +16,7 @@
                       "desktop"  "408x485"
                     ) -}}
             {{- else if site.Params.default_image.url -}}
-              {{- partial "commons/image-default.html" (dict "class" "img-fluid") -}}
+              {{- partial "commons/image-default.html" -}}
             {{- end -}}
           </div>
         </a>
diff --git a/layouts/partials/papers/sidebar.html b/layouts/partials/papers/sidebar.html
index c00aa0a4b33d633968cddeabdb6f28f52ce8dc4d..0c17ae332d1be1df0693db637bfd208484d4c17f 100644
--- a/layouts/partials/papers/sidebar.html
+++ b/layouts/partials/papers/sidebar.html
@@ -18,7 +18,7 @@
                           "desktop"  "408x485"
                         ) -}}
                 {{- else if site.Params.default_image.url -}}
-                  {{- partial "commons/image-default.html" (dict "class" "img-fluid") -}}
+                  {{- partial "commons/image-default.html" -}}
                 {{- end -}}
               </div>
             </a>
diff --git a/layouts/partials/persons/hero-single.html b/layouts/partials/persons/hero-single.html
index 928702e8ea481a7391e49d791dc7f3feff260616..36f55307da4b0b3f4f9aee8f62402b909ef4066a 100644
--- a/layouts/partials/persons/hero-single.html
+++ b/layouts/partials/persons/hero-single.html
@@ -25,7 +25,6 @@
           {{ partial "commons/image.html"
               (dict
                 "image"    .Params.image
-                "class"    "img-fluid"
                 "sizes"    site.Params.image_sizes.sections.persons.hero_single
               )}}
         </div>
diff --git a/layouts/partials/volumes/volume.html b/layouts/partials/volumes/volume.html
index d6a49058743ad40ca2f50c958cdeea92bd14ef4c..285f8e63d390d830230255db949f9053f644e80f 100644
--- a/layouts/partials/volumes/volume.html
+++ b/layouts/partials/volumes/volume.html
@@ -12,7 +12,7 @@
               "sizes"    site.Params.image_sizes.sections.volumes.item
             ) -}}
     {{- else if site.Params.default_image.url -}}
-      {{- partial "commons/image-default.html" (dict "class" "img-fluid") -}}
+      {{- partial "commons/image-default.html" -}}
     {{- end -}}
   </div>
 </article>