diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig
index 1d599c424a2af143b760a877ea5670240b0b667e..691e4e5ed63e995fea11235265bbf28b2d482acb 100644
--- a/modules/core/templates/frontpage_config.twig
+++ b/modules/core/templates/frontpage_config.twig
@@ -6,13 +6,13 @@
     {% include "@core/_frontpage_menu.twig" %}
 
     <div style="margin-top: 1em;">
-        <code style="background: white; background: #f5f5f5; border: 1px dotted #bbb; padding: 1em;  color: #555" >{{ directory }} ({{ version }})</code>
+        <code class="simplesaml_version">{{ directory }} ({{ version }})</code>
     </div>
 
     {% set icon_enabled = '<img src="/' ~ baseurlpath ~ 'resources/icons/silk/accept.png" alt="enabled" />' %}
     {% set icon_disabled = '<img src="/' ~ baseurlpath ~ 'resources/icons/silk/delete.png" alt="disabled" />' %}
 
-    <div style="clear: both" class="enablebox mini">
+    <div class="enablebox mini">
         <table>
 	    <tr class="{%- if enablematrix.saml20idp %}enabled{% else %}disabled{% endif -%}">
                 <td>SAML 2.0 IdP</td>
diff --git a/www/assets/css/src/default.css b/www/assets/css/src/default.css
index dee63a056db12eb7b14f47ed8116e27c56837257..bf67a925cf5daba8ef36fa1c1541ffa58bcbc0ca 100644
--- a/www/assets/css/src/default.css
+++ b/www/assets/css/src/default.css
@@ -598,4 +598,36 @@ MEDIA QUERIES
     }
 }
 
+/*************************************************
+ * Specifics for modules/core/frontpage*
+ ************************************************/
+code.simplesaml_version {
+    background: #f5f5f5;
+    border: 1px dotted #bbb;
+    padding: 1em;
+    color: #555;
+}
+.float-r {
+	float: right;
+}
+.enablebox table {
+	border: 1px solid #eee;
 
+	margin-left: 1em;
+}
+.enablebox.mini table {
+	float: right;
+}
+.enablebox tr td {
+	padding: .5px 1em 1px .5em;
+	margin: 0px;
+}
+.enablebox {
+	font-size: 85%;
+}
+.enablebox tr.enabled td {
+	background: #eee;
+}
+.enablebox tr.disabled td {
+	background: #ccc;
+}
diff --git a/www/resources/default.css b/www/resources/default.css
index 3c0371bb5cffa5add05af9b70e4fa132be57d426..b6ea1c4b4e5db27d291f1f65f8a62d06757514df 100644
--- a/www/resources/default.css
+++ b/www/resources/default.css
@@ -261,28 +261,6 @@ div.caution {
 th.rowtitle {
         text-align: left;
 }
-.enablebox table {
-	border: 1px solid #eee;
-
-	margin-left: 1em;
-}
-.enablebox.mini table {
-	float: right;
-}
-.enablebox tr td {
-	padding: .5px 1em 1px .5em;
-	margin: 0px;
-}
-.enablebox {
-	font-size: 85%;
-}
-.enablebox tr.enabled td {
-	background: #eee;
-}
-.enablebox tr.disabled td {
-	background: #ccc;
-}
-
 .metadatabox {
 	overflow: scroll;
 	border: 1px solid #eee;