diff --git a/resources/assets/less/default.less b/resources/assets/less/default.less
index f64afa38051446a6c28c7ff29bc1a6d0cc3d7ee1..1b94f65debf1c89e6c658dc2571493b23ae75c16 100644
--- a/resources/assets/less/default.less
+++ b/resources/assets/less/default.less
@@ -1,48 +1,2 @@
 @import "./bootstrap/bootstrap.less";
-@import "./metager/metager.less";
-@import "./variables-default.less";
-
-#mglogo>a {
-}
-
-.logo h1 {
-    color: rgb(255, 128, 0);
-}
-
-.pagination {
-    &>.active {
-        &>a,
-        &>span,
-        &>a:hover,
-        &>span:hover,
-        &>a:focus,
-        &>span:focus {
-            background-color: rgb(255, 128, 0);
-            border-color: rgb(255, 128, 0);
-        }
-    }
-    &>li {
-        &>a,
-        &>span,
-        &>a:hover,
-        &>span:hover,
-        &>a:focus,
-        &>span:focus {
-            color: rgb(255, 128, 0);
-        }
-    }
-}
-
-.navbar {
-    border-bottom: 3px solid rgb(255, 128, 0);
-    box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
-    &.navbar-resultpage {
-        border-bottom: 2px solid rgb(255, 128, 0);
-        box-shadow: none;
-    }
-}
-
-.lSPrev>span,
-.lSNext>span {
-    color: rgb(255, 128, 0);
-}
\ No newline at end of file
+@import "./metager/metager.less";
\ No newline at end of file
diff --git a/resources/assets/less/metager/base.less b/resources/assets/less/metager/base.less
index d4ddfb2b78f829b245083b09d41b1c65a3a30ebc..44f99006411d59962114bfa0922b2a4ee366e6c7 100644
--- a/resources/assets/less/metager/base.less
+++ b/resources/assets/less/metager/base.less
@@ -39,6 +39,10 @@ body {
     justify-content: space-between;
 }
 
+.logo h1 {
+    color: rgb(255, 128, 0);
+}
+
 summary {
     cursor: pointer;
     &::-webkit-details-marker {
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index f942e1b9ed26e6b8d00ccd4d83133736211599e1..a570ad8d03c34f1e4c3b4b3e569772f8dbd83acf 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -41,6 +41,20 @@ body {
     }
 }
 
+.navbar {
+    border-bottom: 3px solid rgb(255, 128, 0);
+    box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
+    &.navbar-resultpage {
+        border-bottom: 2px solid rgb(255, 128, 0);
+        box-shadow: none;
+    }
+}
+
+.lSPrev>span,
+.lSNext>span {
+    color: rgb(255, 128, 0);
+}
+
 #map,
 #map div {
     display: flex;
@@ -544,7 +558,8 @@ a {
     }
 }
 
-.disabled, .disabled * {
+.disabled,
+.disabled * {
     color: #aaa !important;
     cursor: not-allowed !important;
 }
diff --git a/resources/assets/less/metager/variables.less b/resources/assets/less/metager/variables.less
index 891650a4e7583ac6311c42e20e71d42a0f6fb0cc..bdca9c861d9be03c01ca7c970a90c291e68c9cdc 100644
--- a/resources/assets/less/metager/variables.less
+++ b/resources/assets/less/metager/variables.less
@@ -8,6 +8,20 @@
 @color-black: black;
 //
 @background-color: rgba(2, 93, 140, 3%);
+//
+@brand-success: #5cb85c;
+@brand-info: #FB0;
+@brand-warning: #f0ad4e;
+@brand-danger: #d9534f;
+@body-bg: rgb(250, 250, 250);
+@input-border-focus: rgb(255, 128, 0);
+@font-family-sans-serif: "Liberation Sans",
+"Helvetica Neue",
+Helvetica,
+Arial,
+sans-serif;
+// Global textual link color.
+@link-color: #2A2ADE;
 // static-pages.less
 @static-pages-color-white: @color-white;
 @static-pages-color-almost-white: @color-almost-white;
@@ -45,14 +59,4 @@
 @base-aufruf-winter-border-color: #953535;
 @base-aufruf-winter-btn-color: white;
 @base-aufruf-winter-btn-hover-background-color: #bd0d0d;
-@base-new-feature-badge-background-color: #f80;
-// Bootstrap Ersatz
-/*
-@screen-sm-min: 768px;
-@screen-md-min: 992px;
-@screen-lg-min: 1200px;
-@screen-xs-max: (@screen-sm-min - 1);
-@screen-sm-max: (@screen-md-min - 1);
-@screen-md-max: (@screen-lg-min - 1);
-@grid-gutter-width: 30px;
-*/
\ No newline at end of file
+@base-new-feature-badge-background-color: #f80;
\ No newline at end of file
diff --git a/resources/assets/less/variables-default.less b/resources/assets/less/variables-default.less
deleted file mode 100644
index d7466d4fd4387c26a58af1d96a94e295b595919b..0000000000000000000000000000000000000000
--- a/resources/assets/less/variables-default.less
+++ /dev/null
@@ -1,29 +0,0 @@
-//@brand-primary: rgb(255, 128, 0);
-@brand-success: #5cb85c;
-@brand-info: #FB0;
-@brand-warning: #f0ad4e;
-@brand-danger: #d9534f;
-@body-bg: rgb(250, 250, 250);
-@input-border-focus: rgb(255, 128, 0);
-@font-family-sans-serif: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-//** Global textual link color.
-@link-color:           #2A2ADE;
-//@link-color:            rgb(255, 128, 0);
-//** Link hover color set via `darken()` function.
-@link-hover-color:      darken(@link-color, 15%);
-//** Link hover decoration.
-@link-hover-decoration: underline;
-
-
-@font-size-base:          14px;
-
-
-@screen-md:                  992px;
-@container-desktop:            (920px + @grid-gutter-width);
-
-@screen-lg:                  1440px;
-@container-large-desktop:      (1370px + @grid-gutter-width);
-
-//** Point at which the navbar becomes uncollapsed.
-@grid-float-breakpoint:     865px;
\ No newline at end of file