diff --git a/src/Foundation.hs b/src/Foundation.hs
index d7b1060ae..05b086ed0 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1162,6 +1162,8 @@ siteLayout' headingOverride widget = do
 
   isModal <- hasCustomHeader HeaderIsModal
 
+  primaryLanguage <- unsafeHead . Text.splitOn "-" <$> selectLanguage appLanguages
+
   mcurrentRoute <- getCurrentRoute
 
   -- Get the breadcrumbs, as defined in the YesodBreadcrumbs instance.
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 4fc2f9366..6f4b83866 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -1,94 +1,93 @@
 $newline never
-<div .container>
-  <dl .deflist>
-    <dt .deflist__dt>Fakultät/Institut
+<dl .deflist>
+  <dt .deflist__dt>Fakultät/Institut
+  <dd .deflist__dd>
+    <div>
+      #{schoolName}
+
+  $maybe descr <- courseDescription course
+    <dt .deflist__dt>_{MsgCourseDescription}
     <dd .deflist__dd>
       <div>
-        #{schoolName}
+        #{descr}
 
-    $maybe descr <- courseDescription course
-      <dt .deflist__dt>_{MsgCourseDescription}
+  $with numlecs <- length lecturers
+    $if numlecs /= 0
+      $if numlecs > 1
+        <dt .deflist__dt>_{MsgLecturersFor}
+      $else
+        <dt .deflist__dt>_{MsgLecturerFor}
       <dd .deflist__dd>
         <div>
-          #{descr}
-
-    $with numlecs <- length lecturers
-      $if numlecs /= 0
-        $if numlecs > 1
-          <dt .deflist__dt>_{MsgLecturersFor}
-        $else
-          <dt .deflist__dt>_{MsgLecturerFor}
-        <dd .deflist__dd>
-          <div>
-            <ul .list--inline .list--comma-separated>
-              $forall lect <- lecturers
-                <li>^{nameEmailWidget' lect}
-    $with numassi <- length assistants
-      $if numassi /= 0
-        $if numassi > 1
-          <dt .deflist__dt>_{MsgAssistantsFor}
-        $else
-          <dt .deflist__dt>_{MsgAssistantFor}
-        <dd .deflist__dd>
-          <div>
-            <ul .list--inline .list--comma-separated>
-              $forall assi <- assistants
-                <li>^{nameEmailWidget' assi}
-    $with numcorrector <- length correctors
-      $if numcorrector /= 0
-        <dt .deflist__dt>_{MsgCorrectorsFor numcorrector}
-        <dd .deflist__dd>
-          <div>
-            <ul .list--inline .list--comma-separated>
-              $forall corrector <- correctors
-                <li>^{nameEmailWidget' corrector}
-
-    $maybe link <- courseLinkExternal course
-      <dt .deflist__dt>Website
+          <ul .list--inline .list--comma-separated>
+            $forall lect <- lecturers
+              <li>^{nameEmailWidget' lect}
+  $with numassi <- length assistants
+    $if numassi /= 0
+      $if numassi > 1
+        <dt .deflist__dt>_{MsgAssistantsFor}
+      $else
+        <dt .deflist__dt>_{MsgAssistantFor}
       <dd .deflist__dd>
         <div>
-          <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
+          <ul .list--inline .list--comma-separated>
+            $forall assi <- assistants
+              <li>^{nameEmailWidget' assi}
+  $with numcorrector <- length correctors
+    $if numcorrector /= 0
+      <dt .deflist__dt>_{MsgCorrectorsFor numcorrector}
+      <dd .deflist__dd>
+        <div>
+          <ul .list--inline .list--comma-separated>
+            $forall corrector <- correctors
+              <li>^{nameEmailWidget' corrector}
+
+  $maybe link <- courseLinkExternal course
+    <dt .deflist__dt>Website
+    <dd .deflist__dd>
+      <div>
+        <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
 $#    $if NTop (Just 0) < NTop (courseCapacity course)
-    <dt .deflist__dt>Teilnehmer
-    <dd .deflist__dd>
-        <div>
-          #{participants}
-          $maybe capacity <- courseCapacity course
-            \ von #{capacity}
-    $maybe regFrom <- mRegFrom
-      <dt .deflist__dt>Anmeldezeitraum
-      <dd .deflist__dd>
-        <div>
-          Ab #{regFrom}
-          $maybe regTo <- mRegTo
-            \ bis #{regTo}
-        $maybe dereg <- mDereg
-          <div>
-            \ <em>Achtung:</em>
-            \ Abmeldung nur bis #{dereg} erlaubt.
-    $if registrationOpen || isJust mRegAt
-      <dt .deflist__dt>
-      <dd .deflist__dd>
-        <div .course__registration>
-          $if registrationOpen
-            $# regForm is defined through templates/widgets/registerForm
-            ^{regForm}
-          $maybe date <- mRegAt
-            _{MsgRegisteredSince date}
-    <dt .deflist__dt>
-      Material
+  <dt .deflist__dt>Teilnehmer
+  <dd .deflist__dd>
+      <div>
+        #{participants}
+        $maybe capacity <- courseCapacity course
+          \ von #{capacity}
+  $maybe regFrom <- mRegFrom
+    <dt .deflist__dt>Anmeldezeitraum
     <dd .deflist__dd>
       <div>
-        $if courseMaterialFree course
-          Das Kursmaterial ist ohne Anmeldung frei zugänglich.
-        $else
-          Eine Anmeldung zum Kurs ist Voraussetzung zum Zugang zu Kursmaterial
-          (z.B. Übungsblätter).
-    $if hasTutorials
-      <dt .deflist__dt>_{MsgCourseTutorials}
-      <dd .deflist__dd>
-        ^{tutorialTable}
-      
+        Ab #{regFrom}
+        $maybe regTo <- mRegTo
+          \ bis #{regTo}
+      $maybe dereg <- mDereg
+        <div>
+          \ <em>Achtung:</em>
+          \ Abmeldung nur bis #{dereg} erlaubt.
+  $if registrationOpen || isJust mRegAt
+    <dt .deflist__dt>
+    <dd .deflist__dd>
+      <div .course__registration>
+        $if registrationOpen
+          $# regForm is defined through templates/widgets/registerForm
+          ^{regForm}
+        $maybe date <- mRegAt
+          _{MsgRegisteredSince date}
+  <dt .deflist__dt>
+    Material
+  <dd .deflist__dd>
+    <div>
+      $if courseMaterialFree course
+        Das Kursmaterial ist ohne Anmeldung frei zugänglich.
+      $else
+        Eine Anmeldung zum Kurs ist Voraussetzung zum Zugang zu Kursmaterial
+        (z.B. Übungsblätter).
+  $if hasTutorials
+    <dt .deflist__dt>_{MsgCourseTutorials}
+    <dd .deflist__dd>
+      ^{tutorialTable}
+
 
 $# <div .container>
 $#   <div .tab-group>
diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet
index 014edc30f..9626ad816 100644
--- a/templates/default-layout-wrapper.hamlet
+++ b/templates/default-layout-wrapper.hamlet
@@ -1,20 +1,28 @@
 $newline never
 \<!doctype html>
-\<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-\<!--[if IE 7]>    <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-\<!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-\<!--[if gt IE 8]><!-->
-<html class="no-js" lang="en"> <!--<![endif]-->
+<html lang=#{primaryLanguage}>
   <head>
     <meta charset="UTF-8">
-    <title>#{pageTitle pc}
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
+    $case currentTheme
+      $of ThemeDefault
+        <meta name="theme-color" content="#0a9342">
+      $of ThemeLavender
+        <meta name="theme-color" content="#584c9c">
+      $of ThemeNeutralBlue
+        <meta name="theme-color" content="#3e606f">
+      $of ThemeAberdeenReds
+        <meta name="theme-color" content="#820333">
+      $of ThemeMossGreen
+        <meta name="theme-color" content="#5c996b">
+      $of ThemeSkyLove
+        <meta name="theme-color" content="#87abe5">
+
+    $# title-tag is required even if it is empty
+    <title>#{pageTitle pc}
+
     ^{pageHead pc}
 
-  <body .no-js .theme--#{toPathPiece currentTheme} :isAuth:.logged-in>
-    <!-- removes no-js class from body if client supports javascript -->
-    <script>
-      document.body.classList.remove('no-js');
-
+  <body .theme--#{toPathPiece currentTheme} :isAuth:.logged-in>
     ^{pageBody pc}
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 701b464ce..21ac81042 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $if not isModal
   <!-- secondary navigation at the side -->
   ^{asidenav}
diff --git a/templates/home/openCourses.hamlet b/templates/home/openCourses.hamlet
index d578cf404..913275128 100644
--- a/templates/home/openCourses.hamlet
+++ b/templates/home/openCourses.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <section>
   <h2>_{MsgHomeOpenCourses}
   ^{courseTable}
diff --git a/templates/home/upcomingSheets.hamlet b/templates/home/upcomingSheets.hamlet
index d109294c9..f82dcf616 100644
--- a/templates/home/upcomingSheets.hamlet
+++ b/templates/home/upcomingSheets.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <section>
   <h2>_{MsgHomeUpcomingSheets}
   ^{sheetTable}
diff --git a/templates/table/layout-standalone.hamlet b/templates/table/layout-standalone.hamlet
index 34b53ce1f..589eb3eeb 100644
--- a/templates/table/layout-standalone.hamlet
+++ b/templates/table/layout-standalone.hamlet
@@ -1 +1,2 @@
+$newline never
 ^{pageBody tbl}
diff --git a/templates/table/sortable-header.hamlet b/templates/table/sortable-header.hamlet
index 188c3a779..39ae44b3b 100644
--- a/templates/table/sortable-header.hamlet
+++ b/templates/table/sortable-header.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $maybe flag <- sortableKey
   $case directions
     $of [SortAsc]
diff --git a/templates/terms.hamlet b/templates/terms.hamlet
index 2d2943787..cdf839b7f 100644
--- a/templates/terms.hamlet
+++ b/templates/terms.hamlet
@@ -1,2 +1,2 @@
-<div .container>
-  ^{table}
+$newline never
+^{table}
diff --git a/templates/widgets/alerts/alerts.hamlet b/templates/widgets/alerts/alerts.hamlet
index 196890850..4527e62d3 100644
--- a/templates/widgets/alerts/alerts.hamlet
+++ b/templates/widgets/alerts/alerts.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <div #alerts-1 .alerts uw-alerts>
   <div .alerts__toggler>
   $forall (status, msg) <- mmsgs
diff --git a/templates/widgets/footer/footer.hamlet b/templates/widgets/footer/footer.hamlet
index e133ec47b..b7d8f6a35 100644
--- a/templates/widgets/footer/footer.hamlet
+++ b/templates/widgets/footer/footer.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <footer .footer>
   <div .footer-links>
     $forall (MenuItem{menuItemType, menuItemRoute = _, menuItemIcon = _, menuItemLabel, menuItemModal = _}, menuIdent, route) <- menuTypes
diff --git a/templates/widgets/footer/footer.lucius b/templates/widgets/footer/footer.lucius
index b00b13588..26c2ae10f 100644
--- a/templates/widgets/footer/footer.lucius
+++ b/templates/widgets/footer/footer.lucius
@@ -14,3 +14,11 @@
     background-color: var(--color-grey-light);
   }
 }
+
+.footer-links * {
+    margin-right: 0.5em;
+
+    &:last {
+        margin-right: 0;
+    }
+}
diff --git a/templates/widgets/navbar/item.hamlet b/templates/widgets/navbar/item.hamlet
index 470ea054f..6446b6366 100644
--- a/templates/widgets/navbar/item.hamlet
+++ b/templates/widgets/navbar/item.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <a .navbar__link-wrapper href=#{route} ##{menuIdent}>
   <i .fas.fa-#{fromMaybe "none" menuItemIcon}>
   <div .navbar__link-label>_{SomeMessage menuItemLabel}