diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass
index 613ffb570a7fc88affb3b7c1e5020af9cdf82aa7..596031b148a624644ca1730ea04bf909e181666f 100644
--- a/assets/sass/_theme/hugo-osuny.sass
+++ b/assets/sass/_theme/hugo-osuny.sass
@@ -29,37 +29,37 @@
 @import "design-system/typography"
 
 // Blocks
-// @import "blocks/datatable"
-// @import "blocks/call_to_action"
-// @import "blocks/chapter"
-// @import "blocks/contact"
-// @import "blocks/definitions"
-// @import "blocks/embed"
-// @import "blocks/files"
-// @import "blocks/gallery"
-// @import "blocks/image"
-// @import "blocks/key_figures"
-// @import "blocks/organization_chart"
-// @import "blocks/pages"
-// @import "blocks/partners"
-// @import "blocks/posts"
-// @import "blocks/testimonials"
-// @import "blocks/timeline"
-// @import "blocks/video"
+@import "blocks/datatable"
+@import "blocks/call_to_action"
+@import "blocks/chapter"
+@import "blocks/contact"
+@import "blocks/definitions"
+@import "blocks/embed"
+@import "blocks/files"
+@import "blocks/gallery"
+@import "blocks/image"
+@import "blocks/key_figures"
+@import "blocks/organization_chart"
+@import "blocks/pages"
+@import "blocks/partners"
+@import "blocks/posts"
+@import "blocks/testimonials"
+@import "blocks/timeline"
+@import "blocks/video"
 
-// // Sections
-// @import "sections/administrators"
-// @import "sections/authors"
-// @import "sections/categories"
-// @import "sections/diplomas"
-// @import "sections/home"
-// @import "sections/organizations"
-// @import "sections/pages"
-// @import "sections/papers"
-// @import "sections/persons"
-// @import "sections/posts"
-// @import "sections/programs"
-// @import "sections/researchers"
-// @import "sections/sitemap"
-// @import "sections/teachers"
-// @import "sections/volumes"
+// Sections
+@import "sections/administrators"
+@import "sections/authors"
+@import "sections/categories"
+@import "sections/diplomas"
+@import "sections/home"
+@import "sections/organizations"
+@import "sections/pages"
+@import "sections/papers"
+@import "sections/persons"
+@import "sections/posts"
+@import "sections/programs"
+@import "sections/researchers"
+@import "sections/sitemap"
+@import "sections/teachers"
+@import "sections/volumes"
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index fc2a17518bbc8002923deaf327dced883d2d6f0c..89229052403292785bc29e1a89e752f3032453a4 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/assets/sass/_theme/sections/persons.sass
@@ -34,7 +34,7 @@ div.persons
     @include grid(5, xxl)
 
 .persons__section
-    @include page-without-nav
+    @include in-page-without-nav
         .lead
             padding-top: $spacing2
             @include media-breakpoint-up(md)
diff --git a/layouts/pages/list.html b/layouts/pages/list.html
index f3bd7a143e22605b747377a4c5c0ad8d65968503..ef199dab9138769be9a66b9cf6a7179ca5ea71f3 100644
--- a/layouts/pages/list.html
+++ b/layouts/pages/list.html
@@ -21,10 +21,7 @@
     </div>
   {{ else }}
     {{ partial "pages/image.html" .Params.image }}
-    {{/* LEGACY */}}{{ partial "pages/body.html" .Content }}
-    {{/* LEGACY */}}{{ partial "pages/body.html" .Params.legacy_text }}
     {{ partial "pages/children.html" .Params.children }}
-    {{/* LEGACY */}}{{ partial "posts/related.html" $category }}
   {{ end }}
 
 {{ end }}
diff --git a/layouts/partials/blocks/toc.html b/layouts/partials/blocks/toc.html
index 1421948044fcf657e186f22aebec41735f045350..1d269b143043695d51666e439f7c842ec5bb7698 100644
--- a/layouts/partials/blocks/toc.html
+++ b/layouts/partials/blocks/toc.html
@@ -1,7 +1,7 @@
 {{ range . -}}
   {{- if .title }}
     <li>
-      <a class="nav-link" href="#block-{{ .position }}">{{ partial "PrepareHTML" .title }}</a>
+      <a href="#block-{{ .position }}">{{ partial "PrepareHTML" .title }}</a>
     </li>
   {{ end -}}
 {{- end -}}
diff --git a/layouts/partials/pages/toc.html b/layouts/partials/pages/toc.html
index 90f330e04bf5ab9ca939789b081b8441b03d0f9b..564018ca31ba0b12c3a1a8a4596fbe3b8556708c 100644
--- a/layouts/partials/pages/toc.html
+++ b/layouts/partials/pages/toc.html
@@ -40,25 +40,25 @@
       {{ $h2s := partial "H2Extract" .context.Content }}
       {{- if and (not $h2s) (partial "GetTextFromHTML" .context.Content) }}
         <li>
-          <a class="nav-link" href="#page-informations">{{ i18n "pages.informations" }}</a>
+          <a href="#page-informations">{{ i18n "pages.informations" }}</a>
         </li>
       {{ end -}}
 
       {{- range $index, $h2 := $h2s }}
         <li>
-          <a class="nav-link" href="#page-h2-{{$index}}">{{ plainify $h2 }}</a>
+          <a href="#page-h2-{{$index}}">{{ plainify $h2 }}</a>
         </li>
       {{ end -}}
 
       {{- if .context.Pages }}
         <li>
-          <a class="nav-link" href="#page-children">{{ i18n "pages.details" }}</a>
+          <a href="#page-children">{{ i18n "pages.details" }}</a>
         </li>
       {{ end -}}
 
       {{- if .category.Pages }}
         <li>
-          <a class="nav-link" href="#page-posts">{{ i18n "pages.posts" }}</a>
+          <a href="#page-posts">{{ i18n "pages.posts" }}</a>
         </li>
       {{ end -}}
 
diff --git a/layouts/partials/posts/toc.html b/layouts/partials/posts/toc.html
index bb92ceb81254fcceb574975fd8403f0dcb6d0523..2fdfb7a1d0a4a340159446e416b2e716b9707c8b 100644
--- a/layouts/partials/posts/toc.html
+++ b/layouts/partials/posts/toc.html
@@ -4,12 +4,12 @@
   <ol>
     {{- if and (not $h2s) (partial "GetTextFromHTML" .Content) }}
       <li>
-        <a class="nav-link" href="#page-informations">{{ i18n "pages.informations" }}</a>
+        <a href="#page-informations">{{ i18n "pages.informations" }}</a>
       </li>
     {{ end -}}
     {{- range $index, $h2 := $h2s }}
       <li>
-        <a class="nav-link" href="#page-h2-{{$index}}">{{ plainify $h2 }}</a>
+        <a href="#page-h2-{{$index}}">{{ plainify $h2 }}</a>
       </li>
     {{- end -}}
     {{- partial "blocks/toc.html" .Params.blocks -}}
diff --git a/layouts/partials/programs/toc.html b/layouts/partials/programs/toc.html
index 73bf0556dac180693c4701144746ef898833660c..c37f2f6d2cabbce13cf5397a3f135f019e0a8cb7 100644
--- a/layouts/partials/programs/toc.html
+++ b/layouts/partials/programs/toc.html
@@ -2,19 +2,19 @@
 <nav class="toc" id="nav-toc" aria-label="{{ i18n "commons.toc" }}">
   <ol>
     <li>
-      <a class="nav-link" href="#essential">{{ i18n "programs.toc.essential" }}</a>
+      <a href="#essential">{{ i18n "programs.toc.essential" }}</a>
     </li>
     <li>
-      <a class="nav-link" href="#presentation">{{ i18n "programs.toc.presentation" }}</a>
+      <a href="#presentation">{{ i18n "programs.toc.presentation" }}</a>
     </li>
     <li>
-      <a class="nav-link" href="#pedagogy">{{ i18n "programs.toc.pedagogy" }}</a>
+      <a href="#pedagogy">{{ i18n "programs.toc.pedagogy" }}</a>
     </li>
     <li>
-      <a class="nav-link" href="#results">{{ i18n "programs.toc.results" }}</a>
+      <a href="#results">{{ i18n "programs.toc.results" }}</a>
     </li>
     <li>
-      <a class="nav-link" href="#admission">{{ i18n "programs.toc.admission" }}</a>
+      <a href="#admission">{{ i18n "programs.toc.admission" }}</a>
     </li>
   </ol>
 </nav>
diff --git a/layouts/partials/sitemap/toc.html b/layouts/partials/sitemap/toc.html
index 412e3550e0c385d3009863d89f589836f7e59069..49a56588ba823b9ecde52462a812f1e0f2ba04da 100644
--- a/layouts/partials/sitemap/toc.html
+++ b/layouts/partials/sitemap/toc.html
@@ -3,7 +3,7 @@
     {{ range site.Sections }}
       {{ if ne .Type "sitemap" }}
         <li>
-          <a class="nav-link" href="#{{ .Type }}">{{ safeHTML .Title }}</a>
+          <a href="#{{ .Type }}">{{ safeHTML .Title }}</a>
         </li>
       {{ end }}
     {{ end }}