diff --git a/assets/sass/_theme/blocks/definitions.sass b/assets/sass/_theme/blocks/definitions.sass
index 10e1ee2b7a8a6189f2c4d7a7993fa69000cdc61f..9043508e296719d1daac8da9ceb4db9ce9cae388 100644
--- a/assets/sass/_theme/blocks/definitions.sass
+++ b/assets/sass/_theme/blocks/definitions.sass
@@ -27,6 +27,6 @@
     @include media-breakpoint-up(desktop)
         @include in-page-without-sidebar
             .definitions
-                @include grid(2, md)
+                @include grid(2, desktop)
                 grid-row-gap: 0 !important
 
diff --git a/assets/sass/_theme/blocks/files.sass b/assets/sass/_theme/blocks/files.sass
index fd199167a4187d6dd41e4c9ca2a7bd4e35029dd9..65f4c3cf87e6aa5996343704a2ca8e172710dd93 100644
--- a/assets/sass/_theme/blocks/files.sass
+++ b/assets/sass/_theme/blocks/files.sass
@@ -40,7 +40,7 @@
     @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             ul
-                @include grid(2, md, half($grid-gutter))
+                @include grid(2, desktop, half($grid-gutter))
         @include in-page-without-sidebar
             .top
                 display: flex
@@ -51,4 +51,4 @@
                     width: col(8)
                     margin-left: $grid-gutter
             ul
-                @include grid(3, md, half($grid-gutter))
+                @include grid(3, desktop, half($grid-gutter))
diff --git a/assets/sass/_theme/blocks/gallery.sass b/assets/sass/_theme/blocks/gallery.sass
index fda78c51198b4cf4b79d6f8da5f160d58f88e0ed..fdb26009ddd65f4d5dad8dac79832312edafb920 100644
--- a/assets/sass/_theme/blocks/gallery.sass
+++ b/assets/sass/_theme/blocks/gallery.sass
@@ -1,7 +1,7 @@
 .block-gallery
     @include in-page-without-sidebar
         .top
-            @include grid(2, md)
+            @include grid(2, desktop)
             align-items: baseline
     figure
         display: block
@@ -34,9 +34,9 @@
         .gallery
             align-items: baseline
             @include in-page-with-sidebar
-                @include grid(3, md, half($grid-gutter), half($grid-gutter))
+                @include grid(3, desktop, half($grid-gutter), half($grid-gutter))
             @include in-page-without-sidebar
-                @include grid(4, md)
+                @include grid(4, desktop)
             @include media-breakpoint-down(desktop)
                 @include grid(2)
                 grid-gap: half($grid-gutter-sm) !important
diff --git a/assets/sass/_theme/blocks/key_figures.sass b/assets/sass/_theme/blocks/key_figures.sass
index e58a1341952399a88c36a3587db9b752738b7b57..a108b42809899b799a1f66d9d3602c3d5d33c70b 100644
--- a/assets/sass/_theme/blocks/key_figures.sass
+++ b/assets/sass/_theme/blocks/key_figures.sass
@@ -2,10 +2,10 @@
     .top
         margin-bottom: 0
     ul
-        @include grid(3, md)
+        @include grid(3, desktop)
         @include list-reset
         @include in-page-with-sidebar
-            @include grid(2, md)
+            @include grid(2, desktop)
     .top + ul
         margin-top: $spacing2
     @include media-breakpoint-down(desktop)
@@ -25,7 +25,7 @@
                 display: inline-block
                 font-size: $block-key_figures-number-font-size
                 margin-inline-end: 0.1em
-            @include media-breakpoint-up(desktop)
+            @include media-breakpoint-up(md)
                 font-size: $block-key_figures-font-size-desktop
                 strong
                     font-size: $block-key_figures-number-font-size-desktop
diff --git a/assets/sass/_theme/blocks/organization_chart.sass b/assets/sass/_theme/blocks/organization_chart.sass
index ceeb14dfe656cbd736b7fb365e697dd6c19685b3..e93f064e420fb0d4a971b97b3a37abde3bc44b25 100644
--- a/assets/sass/_theme/blocks/organization_chart.sass
+++ b/assets/sass/_theme/blocks/organization_chart.sass
@@ -13,7 +13,7 @@
     @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             .persons
-                @include grid(1, md)
+                @include grid(1, desktop)
                 @include grid(2, xxl)
             article
                 flex-direction: row
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index e6a38d31574c2d1705febb1f90620708d2a6e77f..3e8d25159b005a49cb7ca7a0f316d0f1e61ed32a 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -60,11 +60,11 @@
                 @include hover-translate-icon(after, 3)
         @include media-breakpoint-up(desktop)
             .grid
-                @include grid(2, md)
+                @include grid(2, desktop)
                 @include in-page-with-sidebar
                     grid-column-gap: half($grid-gutter) !important
                 @include in-page-without-sidebar
-                    @include grid(3, md)
+                    @include grid(3, desktop)
 
     &--cards
         background-color: $block-pages-card-background
@@ -73,11 +73,11 @@
         .blocks &:last-of-type
             margin-bottom: 0
         .cards
-            @include grid(2, md)
+            @include grid(2, desktop)
             @include in-page-with-sidebar
                 grid-gap: half($grid-gutter) !important
             @include in-page-without-sidebar
-                @include grid(3, md)
+                @include grid(3, desktop)
         // TODO: move this //
         .block-gallery + &,
         .block-pages--cards + &
@@ -148,7 +148,7 @@
                     .description
                         margin-bottom: $spacing1
                     ul
-                        @include grid(2, md)
+                        @include grid(2, desktop)
                         grid-row-gap: $spacing0 !important
                         grid-column-gap: half($grid-gutter) !important
                         li
@@ -166,7 +166,7 @@
                         grid-row: 2 / 3
                     // Default behavior (without page description)
                     ul
-                        @include grid(4, md)
+                        @include grid(4, desktop)
                         grid-column: 1 / 13
                         li
                             margin-top: 0
diff --git a/assets/sass/_theme/blocks/posts.sass b/assets/sass/_theme/blocks/posts.sass
index 30569ff5aac153f2f4408ed7fb940a8d0ec59177..46afc430ad02bf92a84ae80332a03afdfeb3564b 100644
--- a/assets/sass/_theme/blocks/posts.sass
+++ b/assets/sass/_theme/blocks/posts.sass
@@ -6,7 +6,7 @@
             text-decoration: none
     .posts
         @include grid(1)
-        @include grid($block-posts-grid-columns, md)
+        @include grid($block-posts-grid-columns, desktop)
     article
         h1
             a
@@ -24,7 +24,7 @@
         @include media-breakpoint-up(desktop)
             @include in-page-with-sidebar
                 .grid
-                    @include grid(2, md, $grid-gutter, half($grid-gutter))
+                    @include grid(2, desktop, $grid-gutter, half($grid-gutter))
             @include in-page-without-sidebar
                 .grid
                     @include grid($block-posts-grid-columns)
@@ -146,7 +146,7 @@
                             margin-left: half($grid-gutter)
                 .list
                     article
-                        @include grid(8, md, 0, 0)
+                        @include grid(8, desktop, 0, 0)
                         h1
                             grid-column: 1 / 7
                         time
diff --git a/assets/sass/_theme/design-system/footer.sass b/assets/sass/_theme/design-system/footer.sass
index f755af287553688a4926960fe3f0a11562c19f0a..73b09a9850f3192e6558eb32c99a2ebb409d62c0 100644
--- a/assets/sass/_theme/design-system/footer.sass
+++ b/assets/sass/_theme/design-system/footer.sass
@@ -34,7 +34,7 @@ footer[role="contentinfo"]
                 margin-top: $spacing3
     @include media-breakpoint-up(desktop)
         .container
-            @include grid(2, md, $spacing4)
+            @include grid(2, desktop, $spacing4)
         .footer
             &-site, &-social
                 text-align: right
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index 881223fe0537b1e390388dab50ea3906d80b2577..b692a233f2075d689595faa151f924984e20b0c1 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -97,7 +97,7 @@
                 padding-right: 0
             .nav-level-2
                 @include container
-                @include grid(4, md)
+                @include grid(4, desktop)
         @else 
             .has-children
                 position: relative
diff --git a/assets/sass/_theme/design-system/pagination.sass b/assets/sass/_theme/design-system/pagination.sass
index 6210ee77e27994506cf87b2d938b3010512f0592..f675deddf7eb46c9203f8d884eaa431a36b652f3 100644
--- a/assets/sass/_theme/design-system/pagination.sass
+++ b/assets/sass/_theme/design-system/pagination.sass
@@ -4,6 +4,7 @@
     justify-content: center
     align-items: center
     display: flex
+    flex-wrap: wrap
     margin-top: $spacing3
     margin-bottom: $spacing4
     li
diff --git a/assets/sass/_theme/sections/authors.sass b/assets/sass/_theme/sections/authors.sass
index f8eb3f2dba7d307a8ba5081ada17b589a3dc710a..58c1849da3ff379306c6fc879608401af43a258e 100644
--- a/assets/sass/_theme/sections/authors.sass
+++ b/assets/sass/_theme/sections/authors.sass
@@ -2,4 +2,4 @@
     .container
         margin-top: $spacing2
     .posts
-        @include grid(3, md)
+        @include grid(3, desktop)
diff --git a/assets/sass/_theme/sections/diplomas.sass b/assets/sass/_theme/sections/diplomas.sass
index f8f6a3d50db4223f3f82f9758c65bd15025cb3fb..9cb90068c2c4ca6821c843db5e0bbd63e421a0b4 100644
--- a/assets/sass/_theme/sections/diplomas.sass
+++ b/assets/sass/_theme/sections/diplomas.sass
@@ -30,7 +30,7 @@ ul.diplomas
                     margin-left: $spacing1
                 
         .content
-            @include grid(2, md)
+            @include grid(2, desktop)
             padding-bottom: $spacing1
             padding-top: $spacing1
 
@@ -130,5 +130,5 @@ ul.diplomas
 .diplomas__term
     ol.programs
         li
-            @include grid(2, md)
+            @include grid(2, desktop)
             align-items: start
\ No newline at end of file
diff --git a/assets/sass/_theme/sections/pages.sass b/assets/sass/_theme/sections/pages.sass
index 68572d94657f50824600da770a8674e99437203d..580c991a7a379577d0e5a968dc1102c01ff44a66 100644
--- a/assets/sass/_theme/sections/pages.sass
+++ b/assets/sass/_theme/sections/pages.sass
@@ -7,7 +7,7 @@
 
 .pages
     @include grid(1)
-    @include grid(3, md)
+    @include grid(3, desktop)
 
 .page__children
     margin-top: $spacing3
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 4e40d871665b7265e0038e9022e6cf0a383fea27..cd487357cdb66fa5886ae4afe8932f0941719eb9 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -8,17 +8,17 @@
 .categories__term,
 .persons__page
     @if $posts-layout-list
-        .posts 
-            @include grid(1)
-            grid-gap: 0
+        .posts
             article
                 border-bottom: 1px solid $color-border
-                margin-bottom: $spacing3
-                padding-bottom: $spacing3
                 display: flex
+                margin-bottom: $spacing1
+                padding-bottom: $spacing1
                 flex-direction: row
                 @include media-breakpoint-up(desktop)
                     @include grid
+                    margin-bottom: $spacing3
+                    padding-bottom: $spacing3
                 div:not(.media)
                     grid-column: 4/13
                     @include media-breakpoint-down(desktop)
@@ -49,7 +49,7 @@
     @else 
         .posts
             @include grid(1)
-            @include grid(2, md)
+            @include grid(2, desktop)
             @include grid($posts-grid-columns, xxl)
 
 .categories__term
@@ -149,7 +149,7 @@
 .related
     margin-top: $spacing1
     .posts
-        @include grid(2, md)
+        @include grid(2, desktop)
         margin-bottom: 0
     .link
         @extend .link-more
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 31d92b47822480f687c52e4392286e001caa3a40..80412aa679ae48fb1175bf3e0b19ce960d6d04e7 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -3,7 +3,7 @@
 
 div.programs,
 section.programs
-    @include grid(2, md)
+    @include grid(2, desktop)
     @include grid(3, xl)
 
 ol.programs
@@ -95,7 +95,7 @@ ol.programs
     @include media-breakpoint-up(desktop)
         .document-content
             .content
-                @include grid(12, md)
+                @include grid(12, desktop)
                 position: relative
                 padding-bottom: $spacing4
                 > *