diff --git a/includes/aether/template-bottom1.inc b/includes/aether/template-bottom1.inc
new file mode 100644
--- /dev/null
+++ b/includes/aether/template-bottom1.inc
@@ -0,0 +1,15 @@
+</div>
+<div class="col-12 col-lg-3">
+<div class="card">
+<?php
+  $template_menulist1 = "<div class=\"menutitle\"><div>";  // before the menu section title
+  $template_menulist2 = "</div></div>";  // between the menu section title and the list of pages
+  $template_menulist3 = ""; // after the list of pages
+
+  $template_menusublist1 = ""; // before each link to a (sub)page with shown (sub)subpages
+  $template_menusublist2 = ""; // between the link to a (sub)page and its list of (sub)subpages
+  $template_menusublist3 = ""; // after each list of subpages
+
+  $template_menuitem1 = ""; // before each link to a (sub)page without shown (sub)subpages 
+  $template_menuitem2 = ""; // after each link to a (sub)page without shown (sub)subpages
+?>
diff --git a/includes/layout_flatblue/template-bottom2.inc b/includes/aether/template-bottom2.inc
copy from includes/layout_flatblue/template-bottom2.inc
copy to includes/aether/template-bottom2.inc
--- a/includes/layout_flatblue/template-bottom2.inc
+++ b/includes/aether/template-bottom2.inc
@@ -89,7 +89,7 @@
                 <input type="hidden" name="cmd" value="_donations" />
                 <input type="hidden" name="lc" value="GB" />
                 <input type="hidden" name="item_name" value="Development and communication of KDE software" />
-                <input type="hidden" name="custom" value="<?php print "//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]/donation_box"; ?>" />
+                <input type="hidden" name="custom" value="<?php print htmlspecialchars("//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]/donation_box"); ?>" />
                 <input type="hidden" name="currency_code" value="EUR" />
                 <input type="hidden" name="cbt" value="Return to www.kde.org" />
                 <input type="hidden" name="return" value="https://www.kde.org/community/donations/thanks_paypal.php" />
@@ -102,22 +102,17 @@
 <?php
 }
 ?>
-
+        
           </div>
         </div>
-        <div class="clearer"></div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div id="end_body"></div>
+     </main>
 
-    <div id="footer"><div id="footer_text">
+    <footer><div id="footer_text">
         <?php print $contact; ?>
 				<?php i18n("KDE<sup>&#174;</sup> and <a href=\"/media/images/trademark_kde_gear_black_logo.png\">the K Desktop Environment<sup>&#174;</sup> logo</a> are registered trademarks of ")?>
 				<a href="http://ev.kde.org/" title="Homepage of the KDE non-profit Organization">KDE e.V.</a> |
         <a href="<?php print $legalLink; ?>"><?php i18n("Legal")?></a>
-    </div></div>
-  </div>
+    </div></footer>
 
 <!--
 WARNING: DO NOT SEND MAIL TO THE FOLLOWING EMAIL ADDRESS! YOU WILL
diff --git a/includes/aether/template-header.inc b/includes/aether/template-header.inc
new file mode 100644
--- /dev/null
+++ b/includes/aether/template-header.inc
@@ -0,0 +1,23 @@
+    <meta charset="UTF-8"/>
+    <title><?= $site_title ?></title>
+    <meta name="description" content="K Desktop Environment Homepage, KDE.org" />
+    <meta name="robots" content="all" />
+    <meta name="no-email-collection" content="http://www.unspam.com/noemailcollection" />
+    <link rel="stylesheet" href="https://cdn.kde.org/aether-devel/bootstrap.css" />
+    <link rel="stylesheet" href="https://cdn.kde.org/aether-devel/aether-kde-org.css" />
+<?php
+  if (file_exists("$site_root/favicon.ico")) {
+    print "<link rel=\"shortcut icon\" href=\"$site_root/favicon.ico\" />";
+    print "<link rel=\"icon\" href=\"$site_root/favicon.ico\" />";
+  } else {
+    print "<link rel=\"icon\" href=\"/media/images/favicon.ico\" />";
+    print "<link rel=\"shortcut icon\" href=\"/media/images/favicon.ico\" />";
+  }
+
+  if (isset($rss_feed_link))
+    print "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"$rss_feed_title\" href=\"$rss_feed_link\" />\n";
+  if (isset($rss_feed2_link))
+    print "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"$rss_feed2_title\" href=\"$rss_feed2_link\" />\n";
+
+  $cssparameters = "";
+?>
diff --git a/includes/aether/template-top1.inc b/includes/aether/template-top1.inc
new file mode 100644
--- /dev/null
+++ b/includes/aether/template-top1.inc
@@ -0,0 +1,25 @@
+<header id="KGlobalHeader mb-2" class="header clearfix d-print-none">
+    <nav id="kHeaderNav" class="navbar navbar-expand-md container" >
+    <a class="navbar-brand active" href="/Welcome_to_KDE_UserBase" id="KGlobalLogo">
+        <?= $site_title ?>
+    </a>
+    <?php if ((isset($menuright) && count($menuright) > 0)) { ?>
+    <div class="collapse navbar-collapse justify-content-between" id="kde-navbar">
+        <ul class="navbar-nav">
+            <?php foreach ($menuright as $url=>$link) { ?>
+                <li class="nav-item">
+                    <a class="nav-link" href="<?= "$site_root/$url" ?>">
+                        <?= $link ?>
+                    </a>
+                </li>
+            <?php } ?>
+        </ul>
+    </div>
+    <button class="navbar-toggler navbar-toggler-right webfonts-changed" type="button" data-toggle="collapse" data-target="#kde-navbar" aria-controls="kde-navbar" aria-expanded="false" aria-label="Toggle navigation" data-_extension-text-contrast="fg">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <?php } ?>
+</header>
+<main class="container mt-4">
+    <div class="row">
+        <div class="col-12 col-lg-9">
diff --git a/includes/aether/template-top2.inc b/includes/aether/template-top2.inc
new file mode 100644
--- /dev/null
+++ b/includes/aether/template-top2.inc
@@ -0,0 +1,2 @@
+<?php // This file contains content between the heading and the page text
+?>
diff --git a/includes/layout_flatblue/template-bottom2.inc b/includes/layout_flatblue/template-bottom2.inc
--- a/includes/layout_flatblue/template-bottom2.inc
+++ b/includes/layout_flatblue/template-bottom2.inc
@@ -89,6 +89,7 @@
                 <input type="hidden" name="cmd" value="_donations" />
                 <input type="hidden" name="lc" value="GB" />
                 <input type="hidden" name="item_name" value="Development and communication of KDE software" />
+                <input type="hidden" name="custom" value="<?php print htmlspecialchars("//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]/donation_box"); ?>" />
                 <input type="hidden" name="custom" value="<?php print "//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]/donation_box"; ?>" />
                 <input type="hidden" name="currency_code" value="EUR" />
                 <input type="hidden" name="cbt" value="Return to www.kde.org" />
diff --git a/includes/newlayout/template-bottom2.inc b/includes/newlayout/template-bottom2.inc
--- a/includes/newlayout/template-bottom2.inc
+++ b/includes/newlayout/template-bottom2.inc
@@ -89,7 +89,7 @@
                 <input type="hidden" name="cmd" value="_donations" />
                 <input type="hidden" name="lc" value="GB" />
                 <input type="hidden" name="item_name" value="Development and communication of KDE software" />
-                <input type="hidden" name="custom" value="<?php print "//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]/donation_box"; ?>" />
+                <input type="hidden" name="custom" value="<?php print htmlspecialchars("//$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]/donation_box"); ?>" />
                 <input type="hidden" name="currency_code" value="EUR" />
                 <input type="hidden" name="cbt" value="Return to www.kde.org" />
                 <input type="hidden" name="return" value="https://www.kde.org/community/donations/thanks_paypal.php" />