diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue
index 6df9de8b..d733213d 100644
--- a/src/components/input/editor.vue
+++ b/src/components/input/editor.vue
@@ -461,6 +461,11 @@ export default {
 	&-lines pre {
 		margin: 0 !important;
 	}
+
+	&-placeholder {
+		color: $grey-400;
+		font-style: italic;
+	}
 }
 
 .editor-preview {
@@ -497,6 +502,7 @@ export default {
 
 pre.CodeMirror-line {
 	margin-bottom: 0 !important;
+	color: $grey-700 !important;
 }
 
 .cm-header {
diff --git a/src/styles/components/attachments.scss b/src/styles/components/attachments.scss
index 9266af82..45645001 100644
--- a/src/styles/components/attachments.scss
+++ b/src/styles/components/attachments.scss
@@ -20,7 +20,7 @@
       .filename {
         font-weight: bold;
         margin-bottom: .25rem;
-        color: $dark;
+        color: $text;
       }
 
       .info {
diff --git a/src/styles/components/base/multiselect.scss b/src/styles/components/base/multiselect.scss
index 3a357212..2d1997e2 100644
--- a/src/styles/components/base/multiselect.scss
+++ b/src/styles/components/base/multiselect.scss
@@ -109,7 +109,7 @@
 				box-shadow: none !important;
 
 				.hint-text {
-					color: $dark;
+					color: $text;
 				}
 			}
 
diff --git a/src/styles/components/gantt.scss b/src/styles/components/gantt.scss
index b27c7a15..da6c2d45 100644
--- a/src/styles/components/gantt.scss
+++ b/src/styles/components/gantt.scss
@@ -97,14 +97,14 @@ $gantt-vertical-border-color: $grey-100;
         }
 
         &.has-dark-text {
-          color: $dark;
+          color: $text;
 
           &.done span:after {
             border-top: 1px solid $dark;
           }
 
           .edit-toggle {
-            color: $dark;
+            color: $text;
           }
         }
 
diff --git a/src/styles/components/task.scss b/src/styles/components/task.scss
index 0938992c..3438c41e 100644
--- a/src/styles/components/task.scss
+++ b/src/styles/components/task.scss
@@ -224,7 +224,7 @@
   background: $green;
   color: $white;
   padding: .5rem;
-  font-size: 1.5rem;
+  font-size: 1rem;
   margin-left: .5rem;
   font-weight: bold;
   line-height: 1;
diff --git a/src/styles/theme/navigation.scss b/src/styles/theme/navigation.scss
index 19881bab..a9b0aa1e 100644
--- a/src/styles/theme/navigation.scss
+++ b/src/styles/theme/navigation.scss
@@ -66,29 +66,6 @@
   }
 }
 
-.hero {
-  .navbar {
-    border: none;
-    box-shadow: none;
-  }
-
-  @each $name, $pair in $colors {
-    $color: nth($pair, 1);
-    $color-invert: nth($pair, 2);
-
-    &.is-#{$name} {
-      .navbar {
-        box-shadow: none;
-      }
-    }
-  }
-  @include touch {
-    .navbar-menu {
-      box-shadow: none;
-    }
-  }
-}
-
 .navbar-menu .navbar-item .icon {
   margin: 0 0.5rem;
 }
@@ -378,7 +355,7 @@
   z-index: 31;
   font-weight: bold;
   font-size: 2rem;
-  color: $dark;
+  color: $text;
   line-height: 1;
 
   &:hover, &:focus {
@@ -390,7 +367,7 @@
   position: fixed;
 
   &:hover, &:focus {
-    color: $dark;
+    color: $text;
   }
 }
 
diff --git a/src/styles/theme/variables/variables.scss b/src/styles/theme/variables/variables.scss
index eea4eabb..89f7af16 100644
--- a/src/styles/theme/variables/variables.scss
+++ b/src/styles/theme/variables/variables.scss
@@ -6,7 +6,6 @@ $green: #00db60;
 $red: #ff4136;
 $blue: #1973ff;
 $primary: $blue;
-$dark: $grey-900;
 
 $info-invert: #fff;
 $family-sans-serif: 'Open Sans', Helvetica, Arial, sans-serif;
@@ -27,7 +26,7 @@ $vikunja-green: #4DB788;
 
 $navbar-padding: 2rem;
 $vikunja-nav-background: $light-background;
-$vikunja-nav-color: $grey-800;
+$vikunja-nav-color: $grey-700;
 $vikunja-nav-selected-width: 0.4rem;
 
 $transition-duration: 150ms;