diff --git a/static/css/datapoints.css b/static/css/datapoints.css
index 8333e8e..54d331a 100644
--- a/static/css/datapoints.css
+++ b/static/css/datapoints.css
@@ -26,9 +26,12 @@ body {
 }
 h1,
 h2 {
-  margin-top: 0px;
   margin-bottom: 4px;
 }
+h1:first-child,
+h2:first-child {
+  margin-top: 0px;
+}
 h1 {
   font-size: 1.5em;
   color: #fb4934;
@@ -36,10 +39,11 @@ h1 {
 }
 h2 {
   font-size: 1.25em;
+  color: #b8bb26;
   font-weight: 500;
 }
 a {
-  color: #fabd2f;
+  color: #3f9da1;
   text-decoration: none;
 }
 a:hover {
@@ -107,9 +111,11 @@ label {
 #datapoints .group {
   font-size: 1.1em;
   font-weight: bold;
-  color: #fabd2f;
+  color: #b8bb26;
   margin-top: 1.5em;
   padding-bottom: 4px;
+}
+#datapoints h2 {
   border-bottom: unset;
 }
 #datapoints .header {
diff --git a/static/css/main.css b/static/css/main.css
index c2dc070..67e2da9 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -26,9 +26,12 @@ body {
 }
 h1,
 h2 {
-  margin-top: 0px;
   margin-bottom: 4px;
 }
+h1:first-child,
+h2:first-child {
+  margin-top: 0px;
+}
 h1 {
   font-size: 1.5em;
   color: #fb4934;
@@ -36,10 +39,11 @@ h1 {
 }
 h2 {
   font-size: 1.25em;
+  color: #b8bb26;
   font-weight: 500;
 }
 a {
-  color: #fabd2f;
+  color: #3f9da1;
   text-decoration: none;
 }
 a:hover {
@@ -178,6 +182,10 @@ label {
   margin-top: 12px;
   margin-bottom: 20px;
 }
+#areas .area .section.configuration {
+  margin-top: 8px;
+  margin-bottom: 8px;
+}
 #areas .area .section:last-child {
   margin-bottom: 12px;
 }
diff --git a/static/css/problems.css b/static/css/problems.css
index 4cb921b..820b6e0 100644
--- a/static/css/problems.css
+++ b/static/css/problems.css
@@ -26,9 +26,12 @@ body {
 }
 h1,
 h2 {
-  margin-top: 0px;
   margin-bottom: 4px;
 }
+h1:first-child,
+h2:first-child {
+  margin-top: 0px;
+}
 h1 {
   font-size: 1.5em;
   color: #fb4934;
@@ -36,10 +39,11 @@ h1 {
 }
 h2 {
   font-size: 1.25em;
+  color: #b8bb26;
   font-weight: 500;
 }
 a {
-  color: #fabd2f;
+  color: #3f9da1;
   text-decoration: none;
 }
 a:hover {
diff --git a/static/css/theme.css b/static/css/theme.css
index 104cf3d..215acbb 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -26,9 +26,12 @@ body {
 }
 h1,
 h2 {
-  margin-top: 0px;
   margin-bottom: 4px;
 }
+h1:first-child,
+h2:first-child {
+  margin-top: 0px;
+}
 h1 {
   font-size: 1.5em;
   color: #fb4934;
@@ -36,10 +39,11 @@ h1 {
 }
 h2 {
   font-size: 1.25em;
+  color: #b8bb26;
   font-weight: 500;
 }
 a {
-  color: #fabd2f;
+  color: #3f9da1;
   text-decoration: none;
 }
 a:hover {
diff --git a/static/css/trigger_edit.css b/static/css/trigger_edit.css
index b2600b6..71cbb6a 100644
--- a/static/css/trigger_edit.css
+++ b/static/css/trigger_edit.css
@@ -26,9 +26,12 @@ body {
 }
 h1,
 h2 {
-  margin-top: 0px;
   margin-bottom: 4px;
 }
+h1:first-child,
+h2:first-child {
+  margin-top: 0px;
+}
 h1 {
   font-size: 1.5em;
   color: #fb4934;
@@ -36,10 +39,11 @@ h1 {
 }
 h2 {
   font-size: 1.25em;
+  color: #b8bb26;
   font-weight: 500;
 }
 a {
-  color: #fabd2f;
+  color: #3f9da1;
   text-decoration: none;
 }
 a:hover {
diff --git a/static/less/datapoints.less b/static/less/datapoints.less
index 770db5f..04086c7 100644
--- a/static/less/datapoints.less
+++ b/static/less/datapoints.less
@@ -9,9 +9,11 @@
 	.group {
 		font-size: 1.10em;
 		font-weight: bold;
-		color: @color2;
+		color: @color3;
 		margin-top: 1.5em;
 		padding-bottom: 4px;
+	}
+	h2 {
 		border-bottom: unset;
 	}
 
diff --git a/static/less/main.less b/static/less/main.less
index baf874c..bd42096 100644
--- a/static/less/main.less
+++ b/static/less/main.less
@@ -94,6 +94,11 @@
 			margin-top: 12px;
 			margin-bottom: 20px;
 
+			&.configuration {
+				margin-top: 8px;
+				margin-bottom: 8px;
+			}
+
 			&:last-child {
 				margin-bottom: 12px;
 			}
diff --git a/static/less/theme.less b/static/less/theme.less
index 11ae2fc..93872ea 100644
--- a/static/less/theme.less
+++ b/static/less/theme.less
@@ -52,8 +52,10 @@ body {
 
 h1,
 h2 {
-	margin-top: 0px;
 	margin-bottom: 4px;
+	&:first-child {
+		margin-top: 0px;
+	}
 }
 
 h1 {
@@ -64,11 +66,12 @@ h1 {
 
 h2 {
 	font-size: 1.25em;
+	color: @color3;
 	font-weight: @bold;
 }
 
 a {
-	color: @color2;
+	color: @color4;
 	text-decoration: none;
 
 	&:hover {
diff --git a/views/pages/configuration.gotmpl b/views/pages/configuration.gotmpl
index d65b27d..0fdfd54 100644
--- a/views/pages/configuration.gotmpl
+++ b/views/pages/configuration.gotmpl
@@ -64,7 +64,7 @@
 				<a href="#" onclick="newSection({{ .ID }})">Create</a>
 			</div>
 			{{ range .SortedSections }}
-			<div class="section">
+			<div class="section configuration">
 				<div class="name" onclick="renameSection({{ .ID }}, {{ .Name }})">{{ .Name }}</div>
 			</div>
 			{{ end }}
diff --git a/views/pages/datapoints.gotmpl b/views/pages/datapoints.gotmpl
index 91fc6c1..4f4340d 100644
--- a/views/pages/datapoints.gotmpl
+++ b/views/pages/datapoints.gotmpl
@@ -10,7 +10,7 @@
 		{{ $prevGroup := "kalle" }}
 		{{ range .Data.Datapoints }}
 			{{ if ne $prevGroup .Group }}
-			<div class="line group">{{ .Group }}</div>
+			<h2 class="line">{{ .Group }}</h2>
 			<div class="header">Name</div>
 			<div class="header">Datatype</div>
 			<div class="header">Last value</div>