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 bb9dd76b9595fde43a8b4980d91798b961edf249..d20082412fe82d9467152f7691aff97756bf33d0 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(--on-surface);
+  color: var(--secondary);
   animation: moveInLeft 2s ease-out;
   padding-top: 10px;
 }
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 150eb5f1f53b32b415a8cb8b830a0ba82578d6a1..708a54277aa2198c22edb6cd5f4d2ad9c793bb2e 100644
--- a/src/app/components/shared/comment-list/comment-list.component.scss
+++ b/src/app/components/shared/comment-list/comment-list.component.scss
@@ -12,23 +12,24 @@ input {
   box-sizing: border-box;
   padding: 0 10px 0 5px;
   width: 100%;
-  background-color: var(--primary-variant);
+  background-color: var(--surface);
   border: none;
   outline: none;
   min-height: 60px;
   font-size: large;
   border-radius: 5px;
-  color: var(--on-primary);
+  color: var(--on-surface);
 }
 
 #search-container {
   border-radius: 5px;
-  background-color: var(--primary-variant);
+  background-color: var(--surface);
   margin-bottom: 2%;
 }
 
 .search-icon {
   padding: 10px;
+  color: var(--on-surface);
 }
 
 .searchBarButton {
@@ -43,12 +44,12 @@ input {
   width: 40px;
   height: 40px;
   margin: 0 5% 0 0;
-  background-color: var(--secondary);
+  background-color: var(--primary);
 }
 
 .addCommentIcon {
   transform: scale(1.5);
-  color: var(--primary-variant)
+  color: var(--surface)
 }
 
 .close {
@@ -60,7 +61,7 @@ input {
   height: 45px;
   width: 45px;
   line-height: 100% !important;
-  color: var(--secondary);
+  color: var(--primary);
 }
 
 .no-comments {
@@ -93,8 +94,8 @@ h4  {
 
 .counter {
   font-size: 18pt;
-  background-color: var(--primary);
-  color: var(--on-primary);
+  background-color: var(--secondary);
+  color: var(--on-secondary);
 }
 
 .counter-filtered {
@@ -111,6 +112,6 @@ h4  {
 }
 
 ::placeholder {
-  color: var(--on-primary);
+  color: var(--on-surface);
   opacity: 1;
 }
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 73265ef94f61f51d6cbdb444fa04de9ee2457f56..66f62efcb56028758a847c00e63126aaecc4a9bf 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(--secondary);
+  color: var(--primary);
 }
 
 .mat-expansion-panel-header-description {
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index d2718ddd343e18754f1b4a0e735f86146fb8d1d2..ed12749df331c78141b5c6808475e181f29a2848 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -11,7 +11,7 @@ export const dark = {
   '--dialog': '#757575',
 
   '--on-primary': '#000000',
-  '--on-secondary': '#FFFFFF',
+  '--on-secondary': '#000000',
   '--on-background': '#FFFFFF',
   '--on-surface': '#FFFFFF',
 
diff --git a/src/theme/default-theme/_variables.scss b/src/theme/default-theme/_variables.scss
index a6915f2db597776ebec5a683ebd810244f05950e..f3ece0b9eaa0538f743146341451fb4b3761171b 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-grey,900);
+$arsnova-primary: mat-palette($mat-grey,100);
 $arsnova-accent: mat-palette($mat-orange, 200); //$mat-blue-gray, A200, A100, A400);
 
 // The warn palette is optional (defaults to red).