diff --git a/src/app/components/creator/_dialogs/content-delete/content-delete.component.scss b/src/app/components/creator/_dialogs/content-delete/content-delete.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1a636370223fbf7644ef88cc9e72328d915e7094 100644
--- a/src/app/components/creator/_dialogs/content-delete/content-delete.component.scss
+++ b/src/app/components/creator/_dialogs/content-delete/content-delete.component.scss
@@ -0,0 +1,7 @@
+h3 {
+  color: var(--on-surface);
+}
+
+p {
+  color: var(--on-surface);
+}
diff --git a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
index 6b88ae2f97fd729c387c6ed8b7454254cd166329..9b81130f02b15b55905d0cdf1d553eb7c9742f3a 100644
--- a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
+++ b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
@@ -1,10 +1,10 @@
 <h3>{{ 'room-page.sure' | translate }}</h3>
 <p>{{ 'room-page.really-delete-comments' | translate }}</p>
 <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
-  <button mat-raised-button color="primary" (click)="close('abort')">
+  <button mat-raised-button class="abort" (click)="close('abort')">
     {{ 'content.abort' | translate }}
   </button>
-  <button mat-raised-button color="warn" (click)="close('delete')">
+  <button mat-raised-button class="delete" (click)="close('delete')">
     {{ 'content.delete' | translate }}
   </button>
 </div>
diff --git a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.scss b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d2bb99f400bb77daaa2daadaece52c800824d6ee 100644
--- a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.scss
+++ b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.scss
@@ -0,0 +1,18 @@
+h3 {
+  color: var(--on-surface);
+}
+
+p {
+  color: var(--on-surface);
+}
+
+.delete {
+  background-color: var(--red);
+  color: var(--on-secondary);
+}
+
+.abort {
+  background-color: var(--secondary);
+  color: var(--on-secondary);
+}
+
diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
index 388fccfed247ead815b4783b5a0dc7c7e339824b..0edb8b68eca8bae526f29f5541f0903f792bb159 100644
--- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
+++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
@@ -1,10 +1,10 @@
 <h3>{{ 'room-page.sure' | translate }}</h3>
 <p>{{ 'room-page.reallySession' | translate}}<strong>{{room.name}}</strong>{{ 'room-page.really2' | translate}}</p>
 <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
-  <button mat-raised-button color="warn" (click)="dialogRef.close('delete')">
-    {{ 'room-page.delete-room' | translate }}
-  </button>
-  <button mat-raised-button color="primary" (click)="onNoClick()">
+  <button mat-raised-button class="abort" (click)="onNoClick()">
     {{ 'room-page.abort' | translate }}
   </button>
+  <button mat-raised-button class="delete" (click)="dialogRef.close('delete')">
+    {{ 'room-page.delete-room' | translate }}
+  </button>
 </div>
diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.scss b/src/app/components/creator/_dialogs/room-delete/room-delete.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ef5573e7dd77a52ac9c9f36bb75cfb4a5d5d9711 100644
--- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.scss
+++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.scss
@@ -0,0 +1,17 @@
+h3 {
+  color: var(--on-surface);
+}
+
+p {
+  color: var(--on-surface);
+}
+
+.delete {
+  background-color: var(--red);
+  color: var(--on-secondary);
+}
+
+.abort {
+  background-color: var(--secondary);
+  color: var(--on-secondary);
+}
diff --git a/src/app/components/shared/footer/footer.component.ts b/src/app/components/shared/footer/footer.component.ts
index 3c77f549c4999a86b30a6567de81b7c85cb11aaf..64d7807ea8792148f2dca97fe6e017224dc58968 100644
--- a/src/app/components/shared/footer/footer.component.ts
+++ b/src/app/components/shared/footer/footer.component.ts
@@ -20,7 +20,7 @@ export class FooterComponent implements OnInit {
   blogUrl = 'https://arsnova.thm.de/blog/';
   dsgvoUrl = 'https://arsnova.thm.de/blog/datenschutzerklaerung/';
   imprUrl = 'https://arsnova.thm.de/blog/impressum/';
-  demoId = '33602981';
+  demoId = '78844652';
 
   room: Room;
   user: User;
diff --git a/src/app/components/shared/login/login.component.scss b/src/app/components/shared/login/login.component.scss
index 26996c80c91621a53f93cd835e8678f77bb4d0b9..6801891b5d8049c9c4db56f2cfca9819b7d13f18 100644
--- a/src/app/components/shared/login/login.component.scss
+++ b/src/app/components/shared/login/login.component.scss
@@ -1,12 +1,12 @@
 .pwReset {
   padding-left: 0;
-  color: var(--primary);
+  color: var(--secondary);
 }
 
 .regButton {
   margin-top: 20px;
   padding: 0;
-  color: var(--primary);
+  color: var(--secondary);
 }
 
 .loginButton {
@@ -17,6 +17,7 @@
 p {
   font-size: small;
   margin: 30px 5px 0 30px;
+  color: var(--on-surface);
 }
 
 input:-webkit-autofill {