diff --git a/client/app/src/main/resources/main/main-view.css b/client/app/src/main/resources/main/main-view.css
index af0f292..f6a436d 100644
--- a/client/app/src/main/resources/main/main-view.css
+++ b/client/app/src/main/resources/main/main-view.css
@@ -1,70 +1,68 @@
 * {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
+   -fx-dark-background-color: #525E74;
+   -fx-darkest-background-color: #2B2D42;
+
+   -fx-bright-background-color: #77859E;
+   -fx-brighter-background-color: #52567E;
+   -fx-brightest-background-color: #ffffff;
+
+   -fx-bright-border-color: #B0B0B0;
+   -fx-brighter-text-color: #ffffff;
 
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
 }
 
-
-GridPane{
-    -fx-background-color: -fx-base-background-color;
+.mainGrid{
+    -fx-background-color: -fx-darkest-background-color;
 }
 
-.main-panel{
-    -fx-background-color: #282C34;
-}
-
-.vbox-main{
-    -fx-background-color: #333333;
-    -fx-alignment: top-center;
-
+.mainVbox{
+    -fx-background-color: -fx-dark-background-color;
 }
 
 .gridCalendar Line{
-    -fx-stroke: -fx-main-border-color;
+    -fx-stroke: -fx-bright-border-color;
 }
 
 .gridCalender{
-        -fx-background-color: -fx-base-background-color;
+        -fx-background-color: -fx-darkest-background-color;
         -fx-min-height: 80px;
         -fx-max-height: 80px;
 }
 
 .labelMonth{
     -fx-padding: 0 0 0 20;
-    -fx-background-color: #77859E;
+    -fx-background-color: -fx-bright-background-color;
     -fx-font-size: 35px;
     -fx-font-weight: bold;
 }
 
 .scrollDays{
-    -fx-background-color: -fx-base-background-color;
-    -fx-border-color: -fx-main-border-color;
+    -fx-background-color: -fx-darkest-background-color;
+    -fx-border-color: -fx-bright-border-color;
 }
 
 .vBoxDays{
-    -fx-background-color: -fx-base-background-color;
+    -fx-background-color: -fx-darkest-background-color;
 }
 
 .labelDays{
     -fx-alignment: center;
-    -fx-background-color: -fx-base1-background-color;
+    -fx-background-color: -fx-dark-background-color;
     -fx-font-size: 25px;
-    -fx-border-color: -fx-main-border-color;
+    -fx-border-color: -fx-bright-border-color;
 }
 
 Label{
-    -fx-text-fill: -fx-main-text-color;
+    -fx-text-fill: -fx-brighter-text-color;
 }
 
 .event{
-    -fx-background-color: -fx-base1-background-color;
+    -fx-background-color: -fx-dark-background-color;
 }
 
-.main-btn{
-    -fx-background-color: #ffffff;
-    -fx-text-fill: -fx-main-text-color;
+.mainBtn{
+    -fx-background-color: -fx-brightest-background-color;
+    -fx-text-fill: -fx-brighter-text-color;
     -fx-background-radius: 5em;
     -fx-min-width: 40px;
     -fx-min-height: 40px;
diff --git a/client/app/src/main/resources/main/main-view.fxml b/client/app/src/main/resources/main/main-view.fxml
index b5bf7e2..f7b211a 100644
--- a/client/app/src/main/resources/main/main-view.fxml
+++ b/client/app/src/main/resources/main/main-view.fxml
@@ -5,7 +5,8 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.MainController">
+<GridPane styleClass="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
+          fx:controller="main.MainController">
     <columnConstraints>
         <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
         <ColumnConstraints hgrow="ALWAYS" />
@@ -13,17 +14,17 @@
     <rowConstraints>
         <RowConstraints vgrow="SOMETIMES" />
     </rowConstraints>
-    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #525E74;">
+    <VBox styleClass="mainVbox" alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0">
         <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
 
         </ImageView>
-        <Button onAction="#onAddBtnClick" styleClass="main-btn">
+        <Button onAction="#onAddBtnClick" styleClass="mainBtn">
             ADD
         </Button>
-        <Button onAction="#onAddBtnClick" styleClass="main-btn">
+        <Button onAction="#onAddBtnClick" styleClass="mainBtn">
             ADD
         </Button>
-        <Button onAction="#onAddBtnClick" styleClass="main-btn">
+        <Button onAction="#onAddBtnClick" styleClass="mainBtn">
             ADD
         </Button>
     </VBox>
@@ -36,16 +37,19 @@
             <RowConstraints />
             <RowConstraints vgrow="ALWAYS" />
         </rowConstraints>
-        <Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
+        <Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+               styleClass="labelMonth"  GridPane.columnIndex="0" GridPane.rowIndex="0">
             Monat
             <padding>
                 <Insets left="5" />
             </padding>
         </Label>
 
-        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1">
+        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar"
+                  GridPane.columnIndex="0" GridPane.rowIndex="1">
             <columnConstraints>
-                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857"
+                                   percentWidth="14.2857142857" />
                 <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
                 <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
                 <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
@@ -57,7 +61,6 @@
                 <RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER" />
                 <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS" />
             </rowConstraints>
-
         </GridPane>
     </GridPane>
 </GridPane>