diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 8124b40d61dae385858283778a3da0aa462d2a63..61a1b54ef1807333ddcd27a631b4ff78cfb3f610 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -16,16 +16,12 @@ $link-color: $color-text !default
 $body-font-family: "Baskerville", "Times New Roman", "Times", serif !default
 $heading-font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif !default
 
-// Base
-$font-size-base: 16px !default
-$line-height-base: 160% !default
-
 // Headings
 $heading-font-weight: normal !default
 
 // h1
 $h1-font-family: $heading-font-family !default
-$h1-size-md: px2rem(60) !default
+$h1-size-desktop: px2rem(60) !default
 $h1-size: px2rem(30) !default
 $h1-line-height: 120% !default
 $h1-weight: bold !default
@@ -33,7 +29,7 @@ $h1-text-transform: none !default
 
 // h2
 $h2-font-family: $heading-font-family !default
-$h2-size-md: px2rem(40) !default
+$h2-size-desktop: px2rem(40) !default
 $h2-size: px2rem(24) !default
 $h2-line-height: 120% !default
 $h2-weight: $heading-font-weight !default
@@ -41,7 +37,7 @@ $h2-text-transform: none !default
 
 // h3
 $h3-font-family: $heading-font-family !default
-$h3-size-md: px2rem(28) !default
+$h3-size-desktop: px2rem(28) !default
 $h3-size: px2rem(20) !default
 $h3-line-height: 130% !default
 $h3-weight: bold !default
@@ -49,7 +45,7 @@ $h3-text-transform: none !default
 
 // h4
 $h4-font-family: $heading-font-family !default
-$h4-size-md: px2rem(22) !default
+$h4-size-desktop: px2rem(22) !default
 $h4-size: px2rem(16) !default
 $h4-line-height: 130% !default
 $h4-weight: bold !default
@@ -57,7 +53,7 @@ $h4-text-transform: none !default
 
 // h5 or Section
 $h5-font-family: $heading-font-family !default
-$h5-size-md: px2rem(24) !default
+$h5-size-desktop: px2rem(24) !default
 $h5-size: px2rem(20) !default
 $h5-line-height: 130% !default
 $h5-weight: $heading-font-weight !default
@@ -65,7 +61,7 @@ $h5-text-transform: uppercase !default
 
 // h6 or Tab
 $h6-font-family: $heading-font-family !default
-$h6-size-md: px2rem(20) !default
+$h6-size-desktop: px2rem(20) !default
 $h6-size: px2rem(14) !default
 $h6-line-height: 18% !default
 $h6-weight: $heading-font-weight !default
@@ -73,52 +69,52 @@ $h6-text-transform: uppercase !default
 
 // Lead
 $lead-font-family: $heading-font-family !default
-$lead-size-md: px2rem(60) !default
+$lead-size-desktop: px2rem(60) !default
 $lead-size: px2rem(24) !default
 $lead-line-height: 120% !default
 $lead-weight: $heading-font-weight !default
 
 // Body
-$body-size-md: px2rem(22) !default
+$body-size-desktop: px2rem(22) !default
 $body-size: px2rem(18) !default
 $body-line-height: 160% !default
 $body-weight: normal !default
 
 // Small
 $small-font-family: $body-font-family !default
-$small-size-md: px2rem(18) !default
+$small-size-desktop: px2rem(18) !default
 $small-size: px2rem(14) !default
 $small-line-height: 130% !default
 $small-weight: normal !default
 
 // Signature
 $signature-font-family: $heading-font-family !default
-$signature-size-md: px2rem(22) !default
+$signature-size-desktop: px2rem(22) !default
 $signature-size: px2rem(18) !default
 $signature-line-height: 130% !default
 $signature-weight: $heading-font-weight !default
 
 // Meta
 $meta-font-family: $heading-font-family !default
-$meta-size-md: px2rem(16) !default
+$meta-size-desktop: px2rem(16) !default
 $meta-size: px2rem(14) !default
 $meta-line-height: 150% !default
 $meta-weight: $heading-font-weight !default
 
 // Quotes
 $quote-font-family: $body-font-family !default
-$quote-size-md-short: px2rem(60) !default
-$quote-size-md-long: px2rem(40) !default
+$quote-size-desktop-short: px2rem(60) !default
+$quote-size-desktop-long: px2rem(40) !default
 $quote-size: px2rem(24) !default
 $quote-line-height: 120% !default
 $quote-weight: normal !default
 $quote-style: italic !default
 
 // Buttons
-$btn-font-size-md: px2rem(18) !default // TODO
+$btn-font-size-desktop: px2rem(18) !default // TODO
 $btn-font-size: px2rem(14) !default
-$btn-padding-x-md: px2rem(50) !default
-$btn-padding-y-md: px2rem(15) !default
+$btn-padding-x-desktop: px2rem(50) !default
+$btn-padding-y-desktop: px2rem(15) !default
 $btn-padding-x: px2rem(20) !default
 $btn-padding-y: px2rem(13) !default
 $btn-border-radius: px2rem(4) !default
@@ -170,9 +166,9 @@ $header-sticky-color: $header-color !default
 $header-sticky-transition: $header-transition !default
 $header-nav-padding-y: px2rem(30) !default
 $header-logo-height: 32px !default
-$header-logo-height-md: $header-logo-height !default
+$header-logo-height-desktop: $header-logo-height !default
 $header-height: 99px !default
-$header-height-md: 74px !default
+$header-height-desktop: 74px !default
 $header-sticky-invert-logo: false !default
 
 // Navs
@@ -182,11 +178,11 @@ $body-overlay-color: rgba(0, 0, 0, 0.3) !default
 $footer-color: $color-text !default
 $footer-background-color: $color-background-alt !default
 $footer-logo-height: $header-logo-height !default
-$footer-logo-height-md: $footer-logo-height !default
+$footer-logo-height-desktop: $footer-logo-height !default
 
 // Hero
 $hero-height: 300px !default
-$hero-height-md: 400px !default
+$hero-height-desktop: 400px !default
 $hero-color: $color-text !default
 $hero-background-color: $color-background-alt !default
 
@@ -220,7 +216,7 @@ $icons: map-merge($icons, ("twitter": "\e90d"))
 
 // Breakpoints
 // TODO: réécrire en sass les mixins bootstrap
-$grid-breakpoints: (xs: 0, sm: 576px, md: 992px, lg: 1024px, xl: 1200px, xxl: 1440px)  !default
+$grid-breakpoints: (xs: 0, sm: 576px, md: 768px, desktop: 992px, lg: 992px, xl: 1200px, xxl: 1440px) !default
 
 // System
 
@@ -230,17 +226,17 @@ $toc-active-color: $color-accent !default // TODO : checker ce que ça fait
 $toc-background-color: $color-background-alt !default
 $toc-font-family: $body-font-family !default
 $toc-font-size: $body-size !default
-$toc-font-size-md: $body-size-md !default
+$toc-font-size-desktop: $body-size-desktop !default
 $toc-line-height: $body-line-height !default
 $toc-title-font-family: $meta-font-family !default
 $toc-title-font-size: $meta-size !default
-$toc-title-font-size-md: $meta-size-md !default
+$toc-title-font-size-desktop: $meta-size-desktop !default
 
 // Table
 $table-head-font-size: $h4-size !default
-$table-head-font-size-md: $h4-size-md !default
+$table-head-font-size-desktop: $h4-size-desktop !default
 $table-body-size: $body-size !default
-$table-body-size-md: $body-size-md !default
+$table-body-size-desktop: $body-size-desktop !default
 
 // BLOCKS
 
@@ -255,7 +251,7 @@ $block-definition-border-color: $color-border !default
 $block-definition-border-color-hovered: $color-accent !default
 $block-definition-color-hovered: $color-accent !default
 $block-definition-font-size: $body-size !default
-$block-definition-font-size-md: $body-size-md !default
+$block-definition-font-size-desktop: $body-size-desktop !default
 
 // Block pages
 $block-pages-card-background: color-contrast($color-background, 10%) !default
@@ -272,9 +268,9 @@ $block-timeline-horizontal-background: $color-background-alt !default
 $block-timeline-horizontal-color: $color-text !default
 
 // Block testimonials
-$block-testimonials-xl-font-size: $quote-size-md-short !default
+$block-testimonials-xl-font-size: $quote-size-desktop-short !default
 $block-testimonials-xl-line-height: $quote-line-height !default
-$block-testimonials-xl-font-size-long-text: $quote-size-md-long !default
+$block-testimonials-xl-font-size-long-text: $quote-size-desktop-long !default
 $block-testimonials-xl-line-height-long-text: $quote-line-height !default
 $block-testimonials-color: $color-accent !default
 $block-testimonials-font-family: $quote-font-family !default
@@ -288,8 +284,8 @@ $block-testimonials-pagination-progress-background: $color-accent !default
 $block-key_figures-font-size: px2rem(16) !default
 $block-key_figures-number-font-size: px2rem(32) !default
 
-$block-key_figures-font-size-md: px2rem(18) !default
-$block-key_figures-number-font-size-md: px2rem(40) !default
+$block-key_figures-font-size-desktop: px2rem(18) !default
+$block-key_figures-number-font-size-desktop: px2rem(40) !default
 
 $block-key_figures-font-size-lg: px2rem(20) !default
 $block-key_figures-number-font-size-lg: px2rem(50) !default
@@ -324,9 +320,9 @@ $persons-avatar-background-color: $color-background-alt !default
 
 // Program
 $program-essential-font-size: $meta-size !default
-$program-essential-font-size-md: $meta-size-md !default
+$program-essential-font-size-desktop: $meta-size-desktop !default
 $program-share-font-size: $meta-size !default
-$program-share-font-size-md: $meta-size-md !default
+$program-share-font-size-desktop: $meta-size-desktop !default
 $program-zindex-toc: $zindex-toc !default
 
 // MISC
diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index 89dcfdf3987bb5d82060f9a157e7cc0bd88e7178..ab6a8dd971359981157ff284ba7d4f826cd0782a 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -95,7 +95,7 @@
     padding-left: half($grid-gutter-sm)
     padding-right: half($grid-gutter-sm)
     width: 100%
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         padding-left: $grid-gutter
         padding-right: $grid-gutter
 
@@ -109,7 +109,7 @@
         display: grid
         grid-gap: $gap-y $gap-x
         grid-template-columns: repeat($cols, 1fr)
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         grid-gap: $grid-gutter-sm
 
 // This must be used for content inside columns
@@ -203,16 +203,16 @@
         > .title
             @include h2
             transition: color 0.55s
-            @include media-breakpoint-down(md)
+            @include media-breakpoint-down(desktop)
                 @include icon("arrow-right", "after", px2rem(16), true)
                     bottom: $spacing0
                     position: absolute
                     right: 0
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 @include arrow-right-hover
                 display: block
                 &::after
-                    font-size: $font-size-base
+                    font-size: px2rem(16)
                     transform: translateX(0)
                     position: relative
                 &:hover
@@ -222,10 +222,10 @@
         a
             text-decoration: none
 
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             a, p
                 display: block
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             align-items: baseline
             display: flex
             justify-content: space-between
@@ -277,7 +277,7 @@
 
 @mixin button-icon($icon: false)
     @include button-reset
-    line-height: $line-height-base
+    line-height: $body-line-height
     border: 1px solid $hero-color
     padding: $spacing0 $spacing1
     white-space: nowrap
@@ -299,7 +299,7 @@
     display: flex
     justify-content: space-between
     align-items: center
-    @include icon("arrow-right", after,  $small-size)
+    @include icon("arrow-right", after, $small-size)
         opacity: 0
         transform: translateX(-20px)
         transition: 0.55s $arrow-ease-transition
@@ -311,7 +311,7 @@
             transform: translateX(0)
 
 @mixin top-flex
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-without-sidebar
             display: flex
             h2, h3
diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index dd3607ef946feb4a447dfce72d414b96a5335735..9fe5bbd4c182392c98f1f887ea374a6489e6215c 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -11,7 +11,7 @@
     h2, h3
         @include h2
     // Desktop with sidebar
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-without-sidebar
             h2, h3
                 @include h5
\ No newline at end of file
diff --git a/assets/sass/_theme/blocks/call_to_action.sass b/assets/sass/_theme/blocks/call_to_action.sass
index 5b796be16f54952a76232277901e36f15aa90603..88e29ae7010587efa74580a290c6cb2b4769059c 100644
--- a/assets/sass/_theme/blocks/call_to_action.sass
+++ b/assets/sass/_theme/blocks/call_to_action.sass
@@ -13,7 +13,7 @@
                 @include h2
         .actions
             [role="group"]
-                @include media-breakpoint-down(md)
+                @include media-breakpoint-down(desktop)
                     display: flex
                     flex-direction: column
             a
@@ -34,7 +34,7 @@
         * + .actions
             margin-top: calc(#{$spacing2} - #{$spacing1})
 
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         background-color: $block-call-to-action-background
         .call_to_action
             padding: $spacing3 0
@@ -53,7 +53,7 @@
                 margin-bottom: offset(1)
                 order: 1
 
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             .call_to_action
                 display: flex
diff --git a/assets/sass/_theme/blocks/chapter.sass b/assets/sass/_theme/blocks/chapter.sass
index 6ab93f805db3a86ca15e5df529d7d6422e592b82..d64c33776a094a77f97828fe54d3de03c14992b3 100644
--- a/assets/sass/_theme/blocks/chapter.sass
+++ b/assets/sass/_theme/blocks/chapter.sass
@@ -17,7 +17,7 @@
             order: 2
         figure
             margin-bottom: $spacing1
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             picture
                 margin-top: $spacing1
diff --git a/assets/sass/_theme/blocks/contact.sass b/assets/sass/_theme/blocks/contact.sass
index daf0c6dfd1b652270a71fe976cd4bb3c1627f376..fcba901628b620f4a7c17b65d1c5b47fa8989020 100644
--- a/assets/sass/_theme/blocks/contact.sass
+++ b/assets/sass/_theme/blocks/contact.sass
@@ -7,7 +7,7 @@
         + .informations
             margin-top: $spacing2
     @include in-page-without-sidebar
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             .top
                 margin-bottom: $spacing2
             .informations
@@ -40,14 +40,14 @@
             + li
                 padding-top: $spacing0
                 border-top: 1px solid $color-border
-            @include media-breakpoint-down(md)
+            @include media-breakpoint-down(desktop)
                 justify-content: end
                 flex-wrap: wrap
                 span
                     min-width: 50%
                     &:nth-child(n+2)
                         text-align: right
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 justify-content: space-between
                 span
                     width: 25%
diff --git a/assets/sass/_theme/blocks/definitions.sass b/assets/sass/_theme/blocks/definitions.sass
index 3d4d018006c82ef744460e8185bc7f3e96762205..10e1ee2b7a8a6189f2c4d7a7993fa69000cdc61f 100644
--- a/assets/sass/_theme/blocks/definitions.sass
+++ b/assets/sass/_theme/blocks/definitions.sass
@@ -14,8 +14,8 @@
         summary,
         p
             font-size: $block-definition-font-size
-            @include media-breakpoint-up(md)
-                font-size: $block-definition-font-size-md
+            @include media-breakpoint-up(desktop)
+                font-size: $block-definition-font-size-desktop
         p
             margin-block-start: 0
             margin-block-end: $spacing1
@@ -24,7 +24,7 @@
             border-bottom: 1px solid $block-definition-border-color
             display: block
             transition: border-color 0.5s
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-without-sidebar
             .definitions
                 @include grid(2, md)
diff --git a/assets/sass/_theme/blocks/files.sass b/assets/sass/_theme/blocks/files.sass
index 8cf7d5bb48b2bc50bb1bae860df4f29f8c68630a..fd199167a4187d6dd41e4c9ca2a7bd4e35029dd9 100644
--- a/assets/sass/_theme/blocks/files.sass
+++ b/assets/sass/_theme/blocks/files.sass
@@ -34,10 +34,10 @@
 
     figcaption
         @include meta
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         li + li
             margin-top: $spacing1
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             ul
                 @include grid(2, md, half($grid-gutter))
diff --git a/assets/sass/_theme/blocks/gallery.sass b/assets/sass/_theme/blocks/gallery.sass
index 291d7f981256af34b5df13c9eec0a77df93fc822..fda78c51198b4cf4b79d6f8da5f160d58f88e0ed 100644
--- a/assets/sass/_theme/blocks/gallery.sass
+++ b/assets/sass/_theme/blocks/gallery.sass
@@ -37,7 +37,7 @@
                 @include grid(3, md, half($grid-gutter), half($grid-gutter))
             @include in-page-without-sidebar
                 @include grid(4, md)
-            @include media-breakpoint-down(md)
+            @include media-breakpoint-down(desktop)
                 @include grid(2)
                 grid-gap: half($grid-gutter-sm) !important
             figure
@@ -56,7 +56,7 @@
         .container
             .top
                 padding-right: half($grid-gutter-sm)
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     padding-right: half($grid-gutter)
         .splide
             display: flex
@@ -72,7 +72,7 @@
                             opacity: 0.6
                         &.is-active
                             opacity: 1
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     margin-right: half(-$grid-gutter)
             &__slide
                 flex-shrink: initial
@@ -90,7 +90,7 @@
                         width: auto
                         height: auto
                         max-width: calc(100vw - #{$grid-gutter-sm} * 2)
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     picture
                         img
                             height: 70vh
diff --git a/assets/sass/_theme/blocks/image.sass b/assets/sass/_theme/blocks/image.sass
index e9fed6b8e668123422445ccccf19dd53d49b4dc3..85668b780f236f9fdcd1fbced0b4e50e4a1de7c8 100644
--- a/assets/sass/_theme/blocks/image.sass
+++ b/assets/sass/_theme/blocks/image.sass
@@ -19,7 +19,7 @@
         margin-right: half(-$grid-gutter-sm)
 
     @include in-page-with-sidebar
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             picture
                 margin-left: 0
                 margin-right: -$grid-gutter
@@ -27,7 +27,7 @@
                 max-height: $block-image-max-height-with-sidebar
                 width: auto
     @include in-page-without-sidebar
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             .block-content
                 position: relative
                 .top
diff --git a/assets/sass/_theme/blocks/key_figures.sass b/assets/sass/_theme/blocks/key_figures.sass
index 2e32fb5d3c30a479d4a6ff8aa1f3740a818f7e3d..e58a1341952399a88c36a3587db9b752738b7b57 100644
--- a/assets/sass/_theme/blocks/key_figures.sass
+++ b/assets/sass/_theme/blocks/key_figures.sass
@@ -8,7 +8,7 @@
             @include grid(2, md)
     .top + ul
         margin-top: $spacing2
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         li + li
             margin-top: $spacing2
     dl
@@ -25,10 +25,10 @@
                 display: inline-block
                 font-size: $block-key_figures-number-font-size
                 margin-inline-end: 0.1em
-            @include media-breakpoint-up(md)
-                font-size: $block-key_figures-font-size-md
+            @include media-breakpoint-up(desktop)
+                font-size: $block-key_figures-font-size-desktop
                 strong
-                    font-size: $block-key_figures-number-font-size-md
+                    font-size: $block-key_figures-number-font-size-desktop
             @include media-breakpoint-up(lg)
                 font-size: $block-key_figures-font-size-lg
                 strong
diff --git a/assets/sass/_theme/blocks/organization_chart.sass b/assets/sass/_theme/blocks/organization_chart.sass
index e47649264751beff6e70956a57719e6a57f9ae0f..ceeb14dfe656cbd736b7fb365e697dd6c19685b3 100644
--- a/assets/sass/_theme/blocks/organization_chart.sass
+++ b/assets/sass/_theme/blocks/organization_chart.sass
@@ -10,7 +10,7 @@
                 margin-top: half($spacing0)
 
 
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             .persons
                 @include grid(1, md)
diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 860eaa23981ec45122fd56d9ca542dcc19610684..e79555dce422c33e7403ebadf1c78039aa450979 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -25,11 +25,11 @@
             + p
                 margin-top: $spacing0
 
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         .top
             margin-bottom: $spacing2
 
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         .top
             h2, h3
                 @include h5
@@ -39,7 +39,7 @@
             margin-top: $spacing1
 
     @include in-page-without-sidebar
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             .top
                 @include grid
                 h2, h3
@@ -51,14 +51,14 @@
                 @include h2
                 grid-column: 5 / 13
                 margin-top: -0.25em
-                font-style: $h2-size-md
+                font-style: $h2-size-desktop
 
     &--grid
         .grid
             a
                 @include icon("arrow-right", "after", px2rem(16), true)
                 @include hover-translate-icon(after, 3)
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             .grid
                 @include grid(2, md)
                 @include in-page-with-sidebar
@@ -133,12 +133,12 @@
                     text-decoration: none
                     @include icon("arrow-right", before, px2rem(10))
                         padding-right: $spacing0
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             .top
                 margin-bottom: $spacing0
             ul
                 margin-top: $spacing1
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             @include in-page-with-sidebar
                 .block-content
                     .top
diff --git a/assets/sass/_theme/blocks/partners.sass b/assets/sass/_theme/blocks/partners.sass
index 09acb39bb18b4d670785c94c411cab8ddc9e561e..04ad633a20e85fbdae950c0af91d862e054b16f6 100644
--- a/assets/sass/_theme/blocks/partners.sass
+++ b/assets/sass/_theme/blocks/partners.sass
@@ -1,5 +1,5 @@
 .block-partners
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             .organizations
                 @include grid(4, xl)
diff --git a/assets/sass/_theme/blocks/posts.sass b/assets/sass/_theme/blocks/posts.sass
index 84d33b91acfbb7476b76f330abfe4de988ef7ff0..30569ff5aac153f2f4408ed7fb940a8d0ec59177 100644
--- a/assets/sass/_theme/blocks/posts.sass
+++ b/assets/sass/_theme/blocks/posts.sass
@@ -18,10 +18,10 @@
             .media
                 margin-top: 0
     &--grid
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             article + article
                 margin-top: $spacing3
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             @include in-page-with-sidebar
                 .grid
                     @include grid(2, md, $grid-gutter, half($grid-gutter))
@@ -36,7 +36,7 @@
                 margin: 0
                 &, img
                     aspect-ratio: auto
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             article
                 position: relative
                 padding-bottom: half($spacing3)
@@ -67,7 +67,7 @@
                     // top: 0
                     // right: 0
 
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             article
                 display: flex
                 flex-direction: row
@@ -123,10 +123,10 @@
             .media
                 margin-top: 0
 
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             .list
                 border-top: 1px solid $color-border
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             .highlight
                 h1
                     @include h2
diff --git a/assets/sass/_theme/blocks/programs.sass b/assets/sass/_theme/blocks/programs.sass
index e51133f4dfb266cb621c2b959afd89ba19203b57..c254953892b1ef4993809b957a5f281f6fe37bf7 100644
--- a/assets/sass/_theme/blocks/programs.sass
+++ b/assets/sass/_theme/blocks/programs.sass
@@ -11,7 +11,7 @@
                 padding-right: $spacing2
                 &:hover
                     color: $color-accent
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-without-sidebar
             .programs
                 li
diff --git a/assets/sass/_theme/blocks/testimonials.sass b/assets/sass/_theme/blocks/testimonials.sass
index 1f3bce8a987a71e864fc74c0156f0a326b91e2cd..4d9ed8cbb63f79959a13d1153e1da0d8c4df22ee 100644
--- a/assets/sass/_theme/blocks/testimonials.sass
+++ b/assets/sass/_theme/blocks/testimonials.sass
@@ -7,7 +7,7 @@
             line-height: $block-testimonials-line-height
             font-style: $block-testimonials-style
             color: $block-testimonials-color
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 font-size: px2rem(30) // TODO : on peut peut-être la sortir avec du RFS ?
             @include media-breakpoint-up(xl)
                 font-size: $block-testimonials-xl-font-size
@@ -37,7 +37,7 @@
         min-width: px2rem(80)
         margin-right: $spacing0
         margin-bottom: 0
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             margin-right: calc(#{$grid-gutter} / 2)
         //     width: calc(#{col(1, 7)} + #{$grid-gutter} / 2)
 
@@ -90,7 +90,7 @@
                 i
                     background-color: $block-testimonials-pagination-progress-background
                     width: 0
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-without-sidebar
             .top
                 padding-left: offset(2)
diff --git a/assets/sass/_theme/blocks/timeline.sass b/assets/sass/_theme/blocks/timeline.sass
index d4ed2402ff4838926f53138fcc5f6f6166ca6caa..66d898705299058c64d9f62f51833bb7ecd8d07f 100644
--- a/assets/sass/_theme/blocks/timeline.sass
+++ b/assets/sass/_theme/blocks/timeline.sass
@@ -32,12 +32,12 @@
                 @include h4
                 + p
                     margin-top: $spacing0
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             .event
                 padding-left: half($grid-gutter-sm)
                 &::after, &::before
                     left: 0
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             @include in-page-without-sidebar
                 .events
                     padding-left: 0
@@ -141,7 +141,7 @@
                 .line
                     background: transparent
 
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             .events
                 ol
                     margin-top: $spacing2
@@ -150,7 +150,7 @@
                     width: calc(100% + #{$grid-gutter})
         
         @include in-page-with-sidebar
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 .timeline
                     padding-left: offset(4)
             // @include media-breakpoint-up(xxl)
@@ -162,7 +162,7 @@
                 .event
                     width: 25%
 
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             .events
                 position: relative
             .timeline-arrows
diff --git a/assets/sass/_theme/blocks/video.sass b/assets/sass/_theme/blocks/video.sass
index f0c2c5f9647b9a5cfa7da3fd346b6acba9c7deec..a0b54ca88c78376de4df61787b406731820cc104 100644
--- a/assets/sass/_theme/blocks/video.sass
+++ b/assets/sass/_theme/blocks/video.sass
@@ -7,7 +7,7 @@
         .transcription
             width: col(7)
             margin-left: auto
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         .video
             margin-left: half(-$grid-gutter-sm)
             margin-right: half(-$grid-gutter-sm)
diff --git a/assets/sass/_theme/design-system/footer.sass b/assets/sass/_theme/design-system/footer.sass
index 3e2edd2228225ea8a6ab57e30f66d2e31a2a8db6..160e0eb8eaff636bc6fcce5b8ab0869f680c7fe0 100644
--- a/assets/sass/_theme/design-system/footer.sass
+++ b/assets/sass/_theme/design-system/footer.sass
@@ -11,8 +11,8 @@ footer[role="contentinfo"]
             height: $footer-logo-height
             max-width: 100%
             width: auto
-            @include media-breakpoint-up(md)
-                height: $footer-logo-height-md
+            @include media-breakpoint-up(desktop)
+                height: $footer-logo-height-desktop
     ul
         @include list-reset
         li
@@ -29,11 +29,11 @@ footer[role="contentinfo"]
             display: block
             margin-top: $spacing0
 
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         .container
             > * + *
                 margin-top: $spacing3
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         .container
             @include grid(2, md, $spacing4)
         .footer
diff --git a/assets/sass/_theme/design-system/grid.sass b/assets/sass/_theme/design-system/grid.sass
index 781197718b20717b6488d9ad8e73991022dde270..ed1fe7577d8538dd3bdef16ae7370b35a265fe23 100644
--- a/assets/sass/_theme/design-system/grid.sass
+++ b/assets/sass/_theme/design-system/grid.sass
@@ -6,7 +6,7 @@
     @include in-page-with-sidebar
         .block
             .block-content
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     padding-left: offset(4)
                 // @include media-breakpoint-up(xxl)
                 //     padding-left: offset(5)
diff --git a/assets/sass/_theme/design-system/header.sass b/assets/sass/_theme/design-system/header.sass
index 7f8fc38084c3d40a922e095c8e2ff4b2aaf8185d..24c5bad0ebbf1f2ef80bc1922970d76941e6eeaa 100644
--- a/assets/sass/_theme/design-system/header.sass
+++ b/assets/sass/_theme/design-system/header.sass
@@ -8,7 +8,7 @@ header[role="banner"]
     top: 0
     width: 100%
     z-index: $zindex-header
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         width: 100%
     .dropdown-menu
         transition: background $header-sticky-transition
@@ -31,9 +31,9 @@ header[role="banner"]
             .logo img
                 filter: invert(1)
     html.is-scrolling-down:not(.has-menu-opened) &
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             transform: translateY(-100%)
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             &:not(:hover)
                 transform: translateY(-100%)
     .logo
@@ -43,8 +43,8 @@ header[role="banner"]
             width: auto
             @if $header-sticky-invert-logo
                 transition: filter $header-sticky-transition
-            @include media-breakpoint-up(md)
-                height: $header-logo-height-md
+            @include media-breakpoint-up(desktop)
+                height: $header-logo-height-desktop
 
 // TODO : Est-ce au bon endroit ?
 body
@@ -88,7 +88,7 @@ header[role="banner"]
             color: inherit
             padding: 0
             position: relative
-            @include media-breakpoint-down(md)
+            @include media-breakpoint-down(desktop)
                 display: flex
                 align-items: center
             &:focus
diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass
index a2f77bd4d7c855e6fac766d5216e932cec6085e7..06237592583eb41e489bf1b23b8c0bc754482dca 100644
--- a/assets/sass/_theme/design-system/hero.sass
+++ b/assets/sass/_theme/design-system/hero.sass
@@ -8,8 +8,8 @@
     padding-bottom: $spacing3
     padding-top: calc(2rem + var(--header-height))
     position: relative
-    @include media-breakpoint-up(md)
-        min-height: $hero-height-md
+    @include media-breakpoint-up(desktop)
+        min-height: $hero-height-desktop
     *:focus-visible
         outline-color: $hero-color
     
@@ -40,7 +40,7 @@
     //             order: 3
     //             margin-top: $spacing3
 
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         &--with-image
             padding-bottom: 0
         &--image-landscape
@@ -54,7 +54,7 @@
             figure
                 margin-bottom: calc(#{-$spacing5} + #{$spacing2})
                 margin-top: $spacing1
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         $negative-margin-bottom: px2rem(150)
         .content
             h1
diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index 66513dee5ae7a15be2b2dbbec9018252eee6a0d2..efd00d71c0df8eaae3edb68560aefd2ddc4b74d8 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/assets/sass/_theme/design-system/layout.sass
@@ -13,8 +13,8 @@
     --grid-gutter: #{$grid-gutter}
     --grid-max-width: #{$grid-max-width}
     --header-height: #{$header-height}
-     @include media-breakpoint-up(md)
-        --header-height: #{$header-height-md}
+     @include media-breakpoint-up(desktop)
+        --header-height: #{$header-height-desktop}
 
 // TODO: choisir entre margin top / bottom --> https://matthewjamestaylor.com/css-margin-top-vs-bottom
 
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index c3c53ee9e335044c27b5208df828ddcd06baaf1c..881223fe0537b1e390388dab50ea3906d80b2577 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -7,7 +7,7 @@
         opacity: 0
 
 .menu
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         -webkit-flex-basis: 100vw
         display: none
         flex-basis: 100vw
@@ -40,7 +40,7 @@
                 &::after
                     transform: rotate(180deg)
 
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             a:hover,
             a:focus
                 color: $header-hover-color
@@ -48,9 +48,9 @@
     .dropdown-menu
         display: none
         background: $header-dropdown-background
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             padding-bottom: $spacing1
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             padding: $spacing1
             position: absolute
         a
@@ -89,7 +89,7 @@
         span
             @include meta
 
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @if $header-dropdown-full
             .dropdown-menu
                 inset: 100% 0 auto 0
@@ -119,7 +119,7 @@
                     + li.has-children
                         margin-top: $spacing1
 
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         &.is-opened
             display: block
         a, span
diff --git a/assets/sass/_theme/design-system/pagination.sass b/assets/sass/_theme/design-system/pagination.sass
index 15ab6e3bcaf2978affdb14dc0cea1b7c57f8be2d..b13d14749b7f1491d57142835a167f75d7116f35 100644
--- a/assets/sass/_theme/design-system/pagination.sass
+++ b/assets/sass/_theme/design-system/pagination.sass
@@ -64,12 +64,12 @@
                 @include icon(arrow-right, after, px2rem(12))
                     margin-left: px2rem(5)
 
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         ul
             padding-top: $spacing1
             .next:first-child
 
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         ul
             flex-direction: column-reverse
             .previous,
diff --git a/assets/sass/_theme/design-system/table.sass b/assets/sass/_theme/design-system/table.sass
index f8502e593aeb2a8bce5c9c3966a1a1588328695f..f0411e1aff7603a38352a6bbe77ea42083bac792 100644
--- a/assets/sass/_theme/design-system/table.sass
+++ b/assets/sass/_theme/design-system/table.sass
@@ -17,15 +17,15 @@ table
     thead
         @include h4
         font-size: $table-head-font-size
-        @include media-breakpoint-up(md)
-            font-size: $table-head-font-size-md
+        @include media-breakpoint-up(desktop)
+            font-size: $table-head-font-size-desktop
         th
             text-align: left
 
     tbody
         font-size: $table-body-size
-        @include media-breakpoint-up(md)
-            font-size: $table-body-size-md
+        @include media-breakpoint-up(desktop)
+            font-size: $table-body-size-desktop
         tr
             border-bottom: 1px solid $color-border
         tr:first-child
@@ -37,7 +37,7 @@ table
     margin-right: half(-$grid-gutter-sm)
     padding-left: half($grid-gutter-sm)
     padding-right: half($grid-gutter-sm)
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         margin-left: half(-$grid-gutter)
         margin-right: half(-$grid-gutter)
         padding-left: half($grid-gutter)
diff --git a/assets/sass/_theme/design-system/table_of_contents.sass b/assets/sass/_theme/design-system/table_of_contents.sass
index d5a4e5039550815f2f3cfd67717b63a688aa0ec4..842c4381243105b3e7a571e05dec094e39e3b80e 100644
--- a/assets/sass/_theme/design-system/table_of_contents.sass
+++ b/assets/sass/_theme/design-system/table_of_contents.sass
@@ -10,7 +10,7 @@
     width: calc(#{col-outside-container(4)} + #{$grid-gutter} * 2)
     transform: translateX(100%)
     transition: var(--toc-transition-duration) transform ease-in-out
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         width: calc(100% - #{$grid-gutter})
     &.is-opened
         transform: translateX(0)
@@ -24,10 +24,10 @@
         border-bottom: 1px solid $color-border
         font-size: $toc-title-font-size
         padding: $header-nav-padding-y
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             padding: $header-nav-padding-y $grid-gutter
-        @include media-breakpoint-up(md)
-            font-size: $toc-title-font-size-md
+        @include media-breakpoint-up(desktop)
+            font-size: $toc-title-font-size-desktop
             padding: calc(#{$spacing0} * 0.5 + #{$header-nav-padding-y}) $grid-gutter
     .toc
         flex: 1
@@ -38,7 +38,7 @@
         > ol
             flex: 1
             padding: $spacing1
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 padding: $spacing1 $grid-gutter
             > li:first-child
                 margin-top: 0
@@ -51,7 +51,7 @@
         border-top: 1px solid $color-border
         line-height: inherit
         @include icon(close, after)
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             border-top: 0
             padding: calc(#{$spacing0} * 0.5 + #{$header-nav-padding-y}) 0
             position: absolute
@@ -63,7 +63,7 @@
 .toc-cta
     display: flex
     position: relative
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include container
         justify-content: end
         text-align: right
@@ -72,7 +72,7 @@
         body.offcanvas-toc &
             display: flex
 
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         border-top: 1px solid $color-border
         position: fixed
         bottom: 0
@@ -97,7 +97,7 @@
         &::after
             font-size: px2rem(13)
             color: $toc-color
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             display: flex
             justify-content: space-between
             align-items: center
@@ -108,11 +108,11 @@
     
     @include in-page-without-sidebar
         @include offcanvas-toc
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         @include offcanvas-toc
 
     // Only desktop and in page with sidebar
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include in-page-with-sidebar
             @include container-margin-left
             pointer-events: none
@@ -153,14 +153,14 @@
     font-family: $toc-title-font-family
     font-size: $toc-title-font-size
     color: $toc-color
-    @include media-breakpoint-up(md)
-        font-size: $toc-title-font-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $toc-title-font-size-desktop
 
 .toc
     font-family: $toc-font-family
     line-height: $toc-line-height
-    @include media-breakpoint-up(md)
-        font-size: $toc-font-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $toc-font-size-desktop
     ol
         @include list-reset
         align-items: flex-start
diff --git a/assets/sass/_theme/design-system/typography.sass b/assets/sass/_theme/design-system/typography.sass
index 6351b29bd8cb8e0507b5ffff873ceb8db0697ff0..62865bd1545df9cd7b11e453acef8a8ae4e9f2ea 100644
--- a/assets/sass/_theme/design-system/typography.sass
+++ b/assets/sass/_theme/design-system/typography.sass
@@ -7,10 +7,10 @@ body
     font-size: $body-size
     font-variant-ligatures: common-ligatures
     text-rendering: optimizelegibility
-    line-height: $line-height-base
+    line-height: $body-line-height
     word-break: break-word
-    @include media-breakpoint-up(md)
-        font-size: $body-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $body-size-desktop
 
 // Experimental, not implemented yet
 p, h1, h2, h3, h4, h5, h6, li, a, th, td, span
@@ -27,8 +27,8 @@ h1, h2, h3, h4, h5, h6
     font-weight: $h1-weight
     line-height: $h1-line-height
     text-transform: $h1-text-transform
-    @include media-breakpoint-up(md)
-        font-size: $h1-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $h1-size-desktop
 
 h1, .h1
     @include h1
@@ -39,8 +39,8 @@ h1, .h1
     font-weight: $h2-weight
     line-height: $h2-line-height
     text-transform: $h2-text-transform
-    @include media-breakpoint-up(md)
-        font-size: $h2-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $h2-size-desktop
 
 h2, .h2
     @include h2
@@ -51,8 +51,8 @@ h2, .h2
     font-weight: $h3-weight
     line-height: $h3-line-height
     text-transform: $h3-text-transform
-    @include media-breakpoint-up(md)
-        font-size: $h3-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $h3-size-desktop
 
 h3, .h3
     @include h3
@@ -63,8 +63,8 @@ h3, .h3
     font-weight: $h4-weight
     line-height: $h4-line-height
     text-transform: $h4-text-transform
-    @include media-breakpoint-up(md)
-        font-size: $h4-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $h4-size-desktop
 
 h4, .h4
     @include h4
@@ -75,8 +75,8 @@ h4, .h4
     font-weight: $h5-weight
     line-height: $h5-line-height
     text-transform: $h5-text-transform
-    @include media-breakpoint-up(md)
-        font-size: $h5-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $h5-size-desktop
     a
         text-decoration: none
 
@@ -89,8 +89,8 @@ h5, .h5
     font-weight: $h6-weight
     line-height: $h6-line-height
     text-transform: $h6-text-transform
-    @include media-breakpoint-up(md)
-        font-size: $h6-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $h6-size-desktop
 
 h6, .h6
     @include h6
@@ -107,21 +107,21 @@ h2, .h2
     font-size: $lead-size
     font-weight: $lead-weight
     line-height: $lead-line-height
-    @include media-breakpoint-up(md)
-        font-size: $lead-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $lead-size-desktop
 
 .lead
     @include lead
     margin-top: 0
     margin-bottom: $spacing3
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         margin-bottom: $spacing4
 
 .p,
 .li
     font-size: $body-size
-    @include media-breakpoint-up(md)
-        font-size: $body-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $body-size-desktop
 
 p
     margin-top: 0
@@ -134,8 +134,8 @@ p
     font-size: $meta-size
     font-weight: $meta-weight
     line-height: $meta-line-height
-    @include media-breakpoint-up(md)
-        font-size: $meta-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $meta-size-desktop
 
 .meta
     @include meta
@@ -145,8 +145,8 @@ p
     font-size: $signature-size
     font-weight: $signature-weight
     line-height: $signature-line-height
-    @include media-breakpoint-up(md)
-        font-size: $signature-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $signature-size-desktop
 
 .signature
     @include signature
@@ -156,8 +156,8 @@ p
     font-size: $small-size
     font-weight: $small-weight
     line-height: $small-line-height
-    @include media-breakpoint-up(md)
-        font-size: $small-size-md
+    @include media-breakpoint-up(desktop)
+        font-size: $small-size-desktop
 
 small, .small
     @include small
@@ -202,9 +202,9 @@ a,
     text-decoration: none
     display: inline-block
     border-radius: $btn-border-radius
-    @include media-breakpoint-up(md)
-        font-size: $btn-font-size-md
-        padding: $btn-padding-y-md $btn-padding-x-md
+    @include media-breakpoint-up(desktop)
+        font-size: $btn-font-size-desktop
+        padding: $btn-padding-y-desktop $btn-padding-x-desktop
 
 .btn
     @include btn
diff --git a/assets/sass/_theme/sections/diplomas.sass b/assets/sass/_theme/sections/diplomas.sass
index f520aaa893ad00301d7ff16da0b88736c83b7e1e..f8f6a3d50db4223f3f82f9758c65bd15025cb3fb 100644
--- a/assets/sass/_theme/sections/diplomas.sass
+++ b/assets/sass/_theme/sections/diplomas.sass
@@ -2,7 +2,7 @@ ul.diplomas
     @include list-reset
     > li
         margin-bottom: $spacing0
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             margin-bottom: $spacing3
         > a
             @include h2
@@ -16,14 +16,14 @@ ul.diplomas
                 margin-left: auto
             &:hover
                 color: $color-accent
-            @include media-breakpoint-down(md)
+            @include media-breakpoint-down(desktop)
                 position: relative
                 padding-right: $spacing1
                 &::after
                     position: absolute
                     bottom: $spacing1
                     right: 0
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 display: flex
                 align-items: baseline
                 span
@@ -35,7 +35,7 @@ ul.diplomas
             padding-top: $spacing1
 
         .programs
-            @include media-breakpoint-down(md)
+            @include media-breakpoint-down(desktop)
                 margin-top: $spacing1
             li
                 @include h3
@@ -49,7 +49,7 @@ ul.diplomas
                         
         .program
             div
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     display: flex
                     > p
                         width: col(6)
@@ -71,7 +71,7 @@ ul.diplomas
         display: none
         position: absolute
         z-index: 2
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             right: half(-$grid-gutter-sm)
             left: half(-$grid-gutter-sm)
         &,
@@ -84,7 +84,7 @@ ul.diplomas
             padding: $spacing1
             text-decoration: none
             white-space: normal
-            @include media-breakpoint-down(md)
+            @include media-breakpoint-down(desktop)
                 padding: $spacing0 $spacing1
             &:not(:first-child)
                 border-top: 1px solid $color-border
@@ -99,14 +99,15 @@ ul.diplomas
             display: block
 
 .essential
+    color: $header-color
     flex-wrap: wrap
     font-size: $program-essential-font-size
     margin-bottom: 0
     margin-top: $spacing3
     @include meta
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         @include grid(12, false, 0)
-        font-size: $program-essential-font-size-md
+        font-size: $program-essential-font-size-desktop
     dt,
     dd
         margin: 0
@@ -117,12 +118,14 @@ ul.diplomas
     dt
         grid-column: 1/3
         color: $color-text-alt
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             padding-bottom: 0
     dd
         grid-column: 3/13
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             padding-top: 0
+        a
+            @include link($hero-color)
 
 .diplomas__term
     ol.programs
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index 22289ddf29c425875ec3d0767ac9bcd8af530fa6..a28002ca14ea4c809063490a758759e526353b94 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -27,7 +27,7 @@
         @include grid(3, md)
         @include grid(3, lg)
         @include grid(3, xl)
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         grid-column-gap: $spacing1 !important
 
 .organizations__section
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index fe41b6230271b935f1b386e4a4c1f58e3ed88a34..47a7b083504dc80d46f1d76e184c75463ea82360 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/assets/sass/_theme/sections/persons.sass
@@ -2,7 +2,7 @@
     ol.programs
         li
             justify-content: flex-start
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 @include grid(2)
             @include icon("arrow-right", "after", px2rem(16), true)
                 color: inherit
@@ -10,12 +10,12 @@
                 right: 0
                 top: $spacing1
                 transform: translateY(half($spacing0))
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     transform: translateY(half($spacing1))
             a
                 color: inherit
                 @include stretched-link(before)
-                @include media-breakpoint-down(md)
+                @include media-breakpoint-down(desktop)
                     margin-right: $spacing1
             p
                 margin-top: unset
@@ -40,7 +40,7 @@
     .description
         @include small
 
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         display: block
         &::after
             content: ''
@@ -82,7 +82,7 @@ ol.persons
         [itemprop="jobTitle"]
             @include small
             margin-top: 0
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             align-items: baseline
             display: flex
             [itemprop="name"]
@@ -90,7 +90,7 @@ ol.persons
             [itemprop="jobTitle"]
                 width: col(6)
                 margin-left: $grid-gutter
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             &::after
                 position: absolute
                 right: 0
@@ -120,11 +120,11 @@ ol.persons
 .taxonomies-persons
     @include list-reset
     li
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             margin-bottom: $spacing1
             a
                 display: block
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             display: inline-block
             margin-right: $spacing2
     a
@@ -143,7 +143,7 @@ ol.persons
 
 .persons__page
     .hero
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             padding-bottom: 0
             margin-bottom: $spacing4
             .avatar
@@ -152,7 +152,7 @@ ol.persons
                 margin-left: auto
                 transform: translateY(100px)
                 margin-top: calc(#{$spacing1} - 100px)
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             .content
                 align-items: center
                 display: flex
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index e9c33b07b61e89125dbac18efbf5d69355387b44..4e40d871665b7265e0038e9022e6cf0a383fea27 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -17,24 +17,24 @@
                 padding-bottom: $spacing3
                 display: flex
                 flex-direction: row
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     @include grid
                 div:not(.media)
                     grid-column: 4/13
-                    @include media-breakpoint-down(md)
+                    @include media-breakpoint-down(desktop)
                         flex: 1
                         margin-left: $spacing0
                     p:not(.title)
-                        @include media-breakpoint-down(md)
+                        @include media-breakpoint-down(desktop)
                             display: none
                 .media
                     background: none
                     margin: 0
-                    @include media-breakpoint-down(md)
+                    @include media-breakpoint-down(desktop)
                         width: 33.33333%
-                    @include media-breakpoint-up(md)
+                    @include media-breakpoint-up(desktop)
                         grid-column: 1/4
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     time 
                         font-size: $h5-size
                         position: absolute
@@ -54,7 +54,7 @@
 
 .categories__term
     @if $posts-layout-list
-        @include media-breakpoint-down(md)
+        @include media-breakpoint-down(desktop)
             .posts 
                 grid-gap: $spacing3
                 article 
@@ -69,7 +69,7 @@
                         width: 100%
 
 .posts__page
-    @include media-breakpoint-down(md)
+    @include media-breakpoint-down(desktop)
         .document-content
             display: flex
             flex-direction: column
@@ -78,7 +78,7 @@
                 padding: 0 half($grid-gutter-sm)
             .block-pagination
                 order: 3
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         aside
             @include container-margin-left
             margin-top: 0
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 95b388c05b11209f220c99582a4f853c7d4b00ef..31d92b47822480f687c52e4392286e001caa3a40 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -10,8 +10,9 @@ ol.programs
     @include list-section
     li
         a:nth-child(2)
-            margin-left: $spacing1
             white-space: nowrap
+            @include media-breakpoint-up(desktop)
+                margin-left: $spacing1
     
 .programs__section
     .hero-program
@@ -36,8 +37,8 @@ ol.programs
             &:active,
             &:focus
                 box-shadow: 0 0 0 0.25rem rgba(white, .5)
-            @include media-breakpoint-up(md)
-                font-size: $program-share-font-size-md
+            @include media-breakpoint-up(desktop)
+                font-size: $program-share-font-size-desktop
         .dropdown-menu
             background: $hero-color
             border-radius: px2rem(4)
@@ -58,7 +59,7 @@ ol.programs
     .buttons
         @include meta
         margin-top: $spacing1
-        @include media-breakpoint-up(md)
+        @include media-breakpoint-up(desktop)
             bottom: 2.25rem
             margin-top: 0
             position: absolute
@@ -76,8 +77,8 @@ ol.programs
             border-color: $hero-color
             font-size: $program-share-font-size
             margin-top: $spacing1
-            @include media-breakpoint-up(md)
-                font-size: $program-share-font-size-md
+            @include media-breakpoint-up(desktop)
+                font-size: $program-share-font-size-desktop
 
     .document-content
         .content
@@ -91,7 +92,7 @@ ol.programs
                 .block-content
                     padding-left: 0
 
-    @include media-breakpoint-up(md)
+    @include media-breakpoint-up(desktop)
         .document-content
             .content
                 @include grid(12, md)
@@ -146,7 +147,7 @@ ol.programs
             position: relative
             padding-bottom: $spacing0
             padding-top: $spacing0
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 @include grid(2)
             @include icon("arrow-right", "after", px2rem(12), true)
                 color: inherit
@@ -158,13 +159,13 @@ ol.programs
                 color: inherit
                 text-decoration: none
                 @include stretched-link(before)
-                @include media-breakpoint-down(md)
+                @include media-breakpoint-down(desktop)
                     margin-right: $spacing1
             p
                 align-self: center
                 margin-top: unset
                 @include small
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     margin-right: $spacing1
             &:hover
                 color: $color-accent
diff --git a/assets/sass/_theme/sections/sitemap.sass b/assets/sass/_theme/sections/sitemap.sass
index f9bb886ef1dd397e6abb4d318c86ee4f7a14c889..f5b664fc2686303266b54ccd0b4f087560b905b1 100644
--- a/assets/sass/_theme/sections/sitemap.sass
+++ b/assets/sass/_theme/sections/sitemap.sass
@@ -1,13 +1,13 @@
 .sitemap__section
     .content
         > div
-            @include media-breakpoint-up(md)
+            @include media-breakpoint-up(desktop)
                 padding-left: offset(5)
             ul 
                 list-style: none
                 margin-bottom: calc(7.5rem / 2)
                 padding: 0
-                @include media-breakpoint-up(md)
+                @include media-breakpoint-up(desktop)
                     margin-bottom: 7.5rem
                 li
                     margin-bottom: 1rem
\ No newline at end of file