diff --git a/content/_index.de.html b/content/_index.de.html
index 5b49b190..720ecde6 100644
--- a/content/_index.de.html
+++ b/content/_index.de.html
@@ -15,27 +15,27 @@
 
 	<h2 class="display-4 mb-3">Überholabstandsmessung für Radfahrende</h2>
 	<p class="mb-5">Open Innovation, Open Source, Open Data, Open Science</p>
-<div>
-	<a class="btn btn-lg btn-secondary me-3 mb-4" href="https://forum.openbikesensor.org" target="_blank" rel="noopener noreferrer nofollow">
-		<i class="fab fa-discourse me-1"></i> Forum
+
+	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://forum.openbikesensor.org" target="_blank" rel="noopener noreferrer nofollow">
+		<i class="fab fa-discourse mr-1"></i> Forum
 	</a>
 
-	<a class="btn btn-lg btn-secondary me-3 mb-4" href="https://matrix.to/#/#openbikesensor:matrix.org" rel="noopener noreferrer nofollow">
+	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://matrix.to/#/#openbikesensor:matrix.org" rel="noopener noreferrer nofollow">
 		<img alt="Matrix logo" src="/icons/matrix favicon.svg" width="26pt" style="vertical-align:top" /> Matrix
 	</a>
 
-	<a class="btn btn-lg btn-secondary me-3 mb-4" href="https://github.com/openbikesensor" target="_blank" rel="noopener noreferrer nofollow">
-		<i class="fab fa-github me-1"></i> GitHub
+	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://github.com/openbikesensor" target="_blank" rel="noopener noreferrer nofollow">
+		<i class="fab fa-github mr-1"></i> GitHub
 	</a>
 
-	<a class="btn btn-lg btn-secondary me-3 mb-4" href="{{< relref "/docs" >}}">
-    <i class="fas fa-book-open me-1"></i> Dokumentation
+	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="{{< relref "/docs" >}}">
+    <i class="fas fa-book-open mr-1"></i> Dokumentation
 	</a>
 
-	<a class="btn btn-lg btn-secondary me-3 mb-4" href="#unterstuetzen" rel="noopener noreferrer nofollow">
-		<i class="fas fa-hand-holding-heart me-1"></i> Unterstützen
+	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="#unterstuetzen" rel="noopener noreferrer nofollow">
+		<i class="fas fa-hand-holding-heart mr-1"></i> Unterstützen
 	</a>
-</div>
+
 </div>
 {{< /blocks/cover >}}
 
diff --git a/layouts/faq/li.html b/layouts/faq/li.html
index d9ccc39b..5162d9a4 100644
--- a/layouts/faq/li.html
+++ b/layouts/faq/li.html
@@ -1,5 +1,5 @@
 {{ if .IsNode }}
-  <h2 class="display-2 text-center my-5 fw-light">{{ .Title }}</h2>
+  <h2 class="display-2 text-center my-5 font-weight-light">{{ .Title }}</h2>
   {{ .Content }}
 
   <div class="row">
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 65a1857e..6bd95f93 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -3,13 +3,13 @@
 <nav class="js-navbar-scroll navbar navbar-expand navbar-dark flex-column flex-md-row td-navbar">
     {{ if not $large }}<div class="container">{{ end }}
         <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
-		<span class="navbar-logo">{{ if .Site.Params.ui.navbar_logo }}{{ with resources.Get "icons/logo.svg" }}{{ ( . | minify).Content | safeHTML }}{{ end }}{{ end }}</span><span class="text-uppercase fw-bold">{{ .Site.Title }}</span>
+		<span class="navbar-logo">{{ if .Site.Params.ui.navbar_logo }}{{ with resources.Get "icons/logo.svg" }}{{ ( . | minify).Content | safeHTML }}{{ end }}{{ end }}</span><span class="text-uppercase font-weight-bold">{{ .Site.Title }}</span>
 	</a>
 	<div class="td-navbar-nav-scroll ml-md-auto" id="main_navbar">
 		<ul class="navbar-nav mt-2 mt-lg-0">
 			{{ $p := . }}
 			{{ range .Site.Menus.main }}
-      <li class="nav-item ms-4 mb-2 mb-lg-0{{ if .HasChildren }} dropdown{{ end }}">
+      <li class="nav-item mr-4 mb-2 mb-lg-0{{ if .HasChildren }} dropdown{{ end }}">
 				{{ $active := or ($p.IsMenuCurrent "main" .) ($p.HasMenuCurrent "main" .) }}
 				{{ with .Page }}
 				{{ $active = or $active ( $.IsDescendant .)  }}
diff --git a/layouts/partials/page-meta-links.html b/layouts/partials/page-meta-links.html
index 46abba5d..11703e35 100644
--- a/layouts/partials/page-meta-links.html
+++ b/layouts/partials/page-meta-links.html
@@ -4,7 +4,7 @@
   {{ $gh_subdir := ($.Param "github_subdir") }}
   {{ $gh_project_repo := ($.Param "github_project_repo") }}
   {{ $gh_branch := (default "master" ($.Param "github_branch")) }}
-  <div class="td-page-meta ms-2 pb-1 pt-2 mb-0">
+  <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
   {{ if $gh_repo }}
     {{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted }}
     {{ $editURL := printf "%s/edit/%s" $gh_repo $gh_repo_path }}
diff --git a/layouts/partials/sidebar-tree.html b/layouts/partials/sidebar-tree.html
index cc0cc6ff..3d3c1c30 100644
--- a/layouts/partials/sidebar-tree.html
+++ b/layouts/partials/sidebar-tree.html
@@ -2,7 +2,7 @@
     <div id="content-mobile">
         <form class="td-sidebar__search d-flex align-items-center">
             {{ partial "search-input.html" . }}
-            <button class="btn btn-link td-sidebar__toggle d-md-none p-0 ms-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
+            <button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
             </button>
         </form>
     </div>
diff --git a/layouts/shortcodes/blocks/feature.html b/layouts/shortcodes/blocks/feature.html
index cffec75b..9c409f57 100644
--- a/layouts/shortcodes/blocks/feature.html
+++ b/layouts/shortcodes/blocks/feature.html
@@ -6,5 +6,5 @@ <h4 class="h3">
     {{ .Get "title" | markdownify }}
   </h4>
   <p class="mb-0">{{ .Inner }}</p>
-  {{ with .Get "url" }}<p class="mt-auto"><a href="{{ . }}" class="btn btn-outline-light">{{ with $url_text }}{{ $url_text }}{{ else }}{{ T "ui_read_more" }}{{ end }} <i class="fa fa-arrow-right ms-2"></i></a></p>{{ end }}
+  {{ with .Get "url" }}<p class="mt-auto"><a href="{{ . }}" class="btn btn-outline-light">{{ with $url_text }}{{ $url_text }}{{ else }}{{ T "ui_read_more" }}{{ end }} <i class="fa fa-arrow-right ml-2"></i></a></p>{{ end }}
 </div>