diff --git a/src/app/components/creator/content-list/content-list.component.html b/src/app/components/creator/content-list/content-list.component.html
index e6dc728eec0e1c8387b7a4b79504c4a11afa227b..8d84de4ee25f196db78fd93003299373048ad06f 100644
--- a/src/app/components/creator/content-list/content-list.component.html
+++ b/src/app/components/creator/content-list/content-list.component.html
@@ -1,4 +1,4 @@
-<div fxLayout="row" fxLayoutGap="20px" fxLayoutAlign="center">
+ <div fxLayout="row" fxLayoutGap="20px" fxLayoutAlign="center">
   <mat-card>
     <mat-card-header>
       <mat-card-title>
diff --git a/src/app/components/creator/content-list/content-list.component.scss b/src/app/components/creator/content-list/content-list.component.scss
index d48250df0010d3f13cd64deb5d646d6a994cdedf..b18bfd992625698414569bef53201c91a9e76118 100644
--- a/src/app/components/creator/content-list/content-list.component.scss
+++ b/src/app/components/creator/content-list/content-list.component.scss
@@ -40,7 +40,7 @@ mat-expansion-panel-header {
 
 h2 {
   font-size: larger;
-  color: var(--on-surface) !important;
+  color: var(--on-surface);
 }
 
 .actionButton {
@@ -80,3 +80,8 @@ mat-tooltip-component {
 mat-progress-spinner {
   margin-top: 10px;
 }
+
+h3 {
+  font-size: larger;
+  color: var(--on-surface);
+}
diff --git a/src/app/components/home/home-page/home-page.component.scss b/src/app/components/home/home-page/home-page.component.scss
index d20082412fe82d9467152f7691aff97756bf33d0..bb9dd76b9595fde43a8b4980d91798b961edf249 100644
--- a/src/app/components/home/home-page/home-page.component.scss
+++ b/src/app/components/home/home-page/home-page.component.scss
@@ -10,7 +10,7 @@
   font-weight: bold;
   text-align: center;
   letter-spacing: 10px;
-  color: var(--secondary);
+  color: var(--on-surface);
   animation: moveInLeft 2s ease-out;
   padding-top: 10px;
 }
diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
index fd6c36de1b6d33f459f4871754066f3f70482ad4..2e0712ce23eb6c51a0ad95764a10e1d8028d4f48 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
@@ -26,3 +26,8 @@ textarea {
 mat-hint {
   color: var(--on-surface) !important;
 }
+
+::placeholder {
+  color: var(--on-primary);
+  opacity: 1;
+}
diff --git a/src/app/components/shared/comment-list/comment-list.component.scss b/src/app/components/shared/comment-list/comment-list.component.scss
index a1dd71f938aa6fb359a0afe7320442335f7360b2..150eb5f1f53b32b415a8cb8b830a0ba82578d6a1 100644
--- a/src/app/components/shared/comment-list/comment-list.component.scss
+++ b/src/app/components/shared/comment-list/comment-list.component.scss
@@ -98,7 +98,7 @@ h4  {
 }
 
 .counter-filtered {
-  background-color: var(--secondary);
+  background-color: var(--secondary-variant);
   color: var(--on-secondary);
 }
 
diff --git a/src/app/components/shared/room-list/room-list.component.scss b/src/app/components/shared/room-list/room-list.component.scss
index 66f62efcb56028758a847c00e63126aaecc4a9bf..73265ef94f61f51d6cbdb444fa04de9ee2457f56 100644
--- a/src/app/components/shared/room-list/room-list.component.scss
+++ b/src/app/components/shared/room-list/room-list.component.scss
@@ -1,6 +1,6 @@
 button {
   margin-right: 10px;
-  color: var(--primary);
+  color: var(--secondary);
 }
 
 .mat-expansion-panel-header-description {
diff --git a/src/theme/blue-theme/blueTheme.const.ts b/src/theme/blue-theme/blueTheme.const.ts
index 38b2781314c080a099585b5b7dce9562e9136e8b..9d1f0702bb8ac37d3f6c0e0084ebd995f7636de7 100644
--- a/src/theme/blue-theme/blueTheme.const.ts
+++ b/src/theme/blue-theme/blueTheme.const.ts
@@ -15,8 +15,8 @@ export const blue = {
   '--on-background': '#000000',
   '--on-surface': '#000000',
 
-  '--green': '#81c784',
-  '--red': '#FF8A80',
+  '--green': '#4caf50',
+  '--red': '#f44336',
   '--yellow': '#FFD54F',
   '--blue': '#3f51b5',
   '--purple': '#9c27b0',
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index e4f182d9eb387ad56bdbc1b86749127031e75253..f86db1480a7003945bd35de19d98d59b106e295a 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -1,22 +1,22 @@
 export const dark = {
 
-  '--primary' : '#004d40',
-  '--primary-variant': '#39796b',
+  '--primary' : '#4db6ac',
+  '--primary-variant': '#80cbc4',
 
-  '--secondary': '#bdbdbd',
-  '--secondary-variant': '#efefef',
+  '--secondary': '#3949ab',
+  '--secondary-variant': '#6f74dd',
 
   '--background': '#424242',
   '--surface': '#212121',
   '--dialog': '#757575',
 
-  '--on-primary': '#FFFFFF',
-  '--on-secondary': '#000000',
+  '--on-primary': '#000000',
+  '--on-secondary': '#FFFFFF',
   '--on-background': '#FFFFFF',
   '--on-surface': '#FFFFFF',
 
-  '--green': '#81c784',
-  '--red': '#FF8A80',
+  '--green': '#4caf50',
+  '--red': '#f44336',
   '--yellow': '#FFD54F',
   '--blue': '#3f51b5',
   '--purple': '#9c27b0',
diff --git a/src/theme/default-theme/_variables.scss b/src/theme/default-theme/_variables.scss
index b12daaf80b49fadc02a8353eaa3c48501389ccfa..a6915f2db597776ebec5a683ebd810244f05950e 100644
--- a/src/theme/default-theme/_variables.scss
+++ b/src/theme/default-theme/_variables.scss
@@ -2,7 +2,7 @@
 // Define the palettes for your theme using the Material Design palettes available in palette.scss
 // (imported above). For each palette, you can optionally specify a default, lighter, and darker
 // hue. Available color palettes: https://www.google.com/design/spec/style/color.html
-$arsnova-primary: mat-palette($mat-green,300);
+$arsnova-primary: mat-palette($mat-grey,900);
 $arsnova-accent: mat-palette($mat-orange, 200); //$mat-blue-gray, A200, A100, A400);
 
 // The warn palette is optional (defaults to red).
diff --git a/src/theme/default-theme/defaultTheme.const.ts b/src/theme/default-theme/defaultTheme.const.ts
index 2e250b754f4368d81df143a1562a9867766c12ff..73bfc7670b596b2b2b1f2ff6ee50942927006247 100644
--- a/src/theme/default-theme/defaultTheme.const.ts
+++ b/src/theme/default-theme/defaultTheme.const.ts
@@ -15,8 +15,8 @@ export const arsnova = {
   '--on-background': '#000000',
   '--on-surface': '#000000',
 
-  '--green': '#80bb26',
-  '--red': '#9c132d',
+  '--green': '#4caf50',
+  '--red': '#f44336',
   '--yellow': '#f5aa01',
   '--blue': '#002878',
   '--purple': '#9c27b0',
diff --git a/src/theme/purple-theme/purpleTheme.const.ts b/src/theme/purple-theme/purpleTheme.const.ts
index 3eaa032ea275dd5931c9e8fc694769f819900a7f..a112b330cebb492297179265705ee8aef55929b8 100644
--- a/src/theme/purple-theme/purpleTheme.const.ts
+++ b/src/theme/purple-theme/purpleTheme.const.ts
@@ -15,8 +15,8 @@ export const purple = {
   '--on-background': '#000000',
   '--on-surface': '#000000',
 
-  '--green': '#81c784',
-  '--red': '#FF8A80',
+  '--green': '#4caf50',
+  '--red': '#f44336',
   '--yellow': '#FFD54F',
   '--blue': '#3f51b5',
   '--purple': '#9c27b0',