diff --git a/client/app/src/main/java/events/CreateEventController.java b/client/app/src/main/java/events/CreateEventController.java
index 0ad9304..0388faf 100644
--- a/client/app/src/main/java/events/CreateEventController.java
+++ b/client/app/src/main/java/events/CreateEventController.java
@@ -42,6 +42,7 @@ public class CreateEventController {
     public CreateEventController() {
     }
 
+    //Marco Kühn//
     @FXML
     public void initialize() {
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
@@ -52,7 +53,7 @@ public class CreateEventController {
         timeEnd.setConverter(defaultConverter);
     }
 
-
+    //Marc Beyer//
     @FXML
     protected void createBtnClick(ActionEvent actionEvent) {
         try {
@@ -84,11 +85,13 @@ public class CreateEventController {
         }
     }
 
+    //Marc Beyer//
     protected void sendHttpRequest(Event event) throws HttpRequestException {
         DataController dataController = new DataController();
         dataController.createEvent(event);
     }
 
+    //Marc Beyer//
     @FXML
     protected void abortBtnClick(ActionEvent event) {
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
diff --git a/client/app/src/main/java/main/MainApplication.java b/client/app/src/main/java/main/MainApplication.java
index 7cc4ba0..dc77157 100644
--- a/client/app/src/main/java/main/MainApplication.java
+++ b/client/app/src/main/java/main/MainApplication.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package main;
 
 import config.Config;
@@ -14,6 +15,7 @@ import java.io.IOException;
 import java.util.Objects;
 import java.util.function.Consumer;
 
+
 public class MainApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {
diff --git a/client/app/src/main/java/main/MainController.java b/client/app/src/main/java/main/MainController.java
index 541db6c..8473f08 100644
--- a/client/app/src/main/java/main/MainController.java
+++ b/client/app/src/main/java/main/MainController.java
@@ -1,3 +1,4 @@
+/* Marco Kühn, Marc Beyer */
 package main;
 
 import config.Config;
diff --git a/client/app/src/main/java/main/OptionController.java b/client/app/src/main/java/main/OptionController.java
index 0cf0c33..e2915aa 100644
--- a/client/app/src/main/java/main/OptionController.java
+++ b/client/app/src/main/java/main/OptionController.java
@@ -1,3 +1,4 @@
+/* Marco Kühn */
 package main;
 
 import com.jfoenix.controls.*;
diff --git a/client/app/src/main/java/users/CreateUserController.java b/client/app/src/main/java/users/CreateUserController.java
index 3b5d622..f6604df 100644
--- a/client/app/src/main/java/users/CreateUserController.java
+++ b/client/app/src/main/java/users/CreateUserController.java
@@ -1,13 +1,14 @@
+//Alex Rechtin//
 package users;
 
+import com.jfoenix.controls.JFXPasswordField;
+import com.jfoenix.controls.JFXTextField;
+import com.jfoenix.controls.JFXToggleButton;
 import helper.HttpRequestException;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
-import javafx.scene.control.PasswordField;
-import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleButton;
 import javafx.stage.Stage;
 import container.DataController;
 import container.User;
@@ -17,17 +18,17 @@ import java.util.Objects;
 public class CreateUserController {
 
     @FXML
-    protected TextField textName;
+    protected JFXTextField textName;
     @FXML
-    protected PasswordField textPassword;
+    protected JFXPasswordField textPassword;
     @FXML
-    protected PasswordField textPasswordSecond;
+    protected JFXPasswordField textPasswordSecond;
     @FXML
-    protected ToggleButton checkButtonIsAdmin;
+    protected JFXToggleButton checkButtonIsAdmin;
     @FXML
-    protected TextField textLogin;
+    protected JFXTextField textLogin;
     @FXML
-    protected TextField textForename;
+    protected JFXTextField textForename;
     @FXML
     protected Label labelError;
 
diff --git a/client/app/src/main/java/users/EditUserController.java b/client/app/src/main/java/users/EditUserController.java
index 703eb3d..3b00b42 100644
--- a/client/app/src/main/java/users/EditUserController.java
+++ b/client/app/src/main/java/users/EditUserController.java
@@ -1,3 +1,4 @@
+/* Marc Beyer */
 package users;
 
 import container.DataController;
diff --git a/client/app/src/main/java/users/LoginController.java b/client/app/src/main/java/users/LoginController.java
index c5cb83f..eecd403 100644
--- a/client/app/src/main/java/users/LoginController.java
+++ b/client/app/src/main/java/users/LoginController.java
@@ -1,3 +1,4 @@
+//Alex Rechtin//
 package users;
 
 import com.jfoenix.controls.*;
diff --git a/client/app/src/main/resources/main/create-event.css b/client/app/src/main/resources/main/create-event.css
index 85eff94..3e91667 100644
--- a/client/app/src/main/resources/main/create-event.css
+++ b/client/app/src/main/resources/main/create-event.css
@@ -1,24 +1,38 @@
+/*Marco Kühn*/
+* {
+   -fx-dark-background-color: #3E415F;
+
+   -fx-darkest-background-color: #2B2D42;
+
+   -fx-bright-background-color: #8D99AE;
+   -fx-brighter-background-color: #ff5555;
+   -fx-brightest-background-color: #ffffff;
+
+   -fx-bright-border-color: #B0B0B0;
+   -fx-brighter-text-color: #ffffff;
+}
+
 GridPane{
-    -fx-background-color: #3E415F;
+    -fx-background-color: -fx-dark-background-color;
     -fx-padding: 20px;
     -fx-font-size: 20px;
     -fx-font-family: Segoe UI;
 
     -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
+    -fx-border-color: -fx-bright-border-color;
     -fx-border-style: solid;
     -fx-border-width: 2;
     -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
 }
 
 Label{
-    -fx-text-fill: white;
+    -fx-text-fill: -fx-brighter-text-color;
     -fx-max-width: 150px;
     -fx-min-width: 150px;
 }
 
 .mainLabel{
-    -fx-background-color: #8D99AE;
+    -fx-background-color: -fx-bright-background-color;
     -fx-padding: 10px;
     -fx-max-width: 200px;
     -fx-min-width: 200px;
@@ -28,22 +42,22 @@ Label{
 
 .inputField{
     -fx-padding: 10px;
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .mainButton{
     -fx-font-weight: bold;
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 JFXButton{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 #labelError{
     -fx-font-weight: bold;
     -fx-max-width: 1000px;
-    -fx-text-fill: #ff5555;
+    -fx-text-fill: -fx-brighter-background-color;
     -fx-padding: 16px;
     -fx-min-height: 140px;
     -fx-max-height: 400px;
@@ -52,15 +66,15 @@ JFXButton{
 }
 
 .inputDate{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .comboBox{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .timePicker{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .jfx-time-picker .date-picker-popup{
diff --git a/client/app/src/main/resources/main/create-event.fxml b/client/app/src/main/resources/main/create-event.fxml
index b674c45..e46c1cf 100644
--- a/client/app/src/main/resources/main/create-event.fxml
+++ b/client/app/src/main/resources/main/create-event.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
diff --git a/client/app/src/main/resources/main/edit-event.fxml b/client/app/src/main/resources/main/edit-event.fxml
index b052b58..f416926 100644
--- a/client/app/src/main/resources/main/edit-event.fxml
+++ b/client/app/src/main/resources/main/edit-event.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
diff --git a/client/app/src/main/resources/main/main-view.css b/client/app/src/main/resources/main/main-view.css
index 56d1402..3df14ed 100644
--- a/client/app/src/main/resources/main/main-view.css
+++ b/client/app/src/main/resources/main/main-view.css
@@ -1,65 +1,70 @@
+/*Alex Rechtin, Marco Kühn*/
 * {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
+    -fx-dark-background-color: #525E74;
+    -fx-darkest-background-color: #2B2D42;
 
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
+    -fx-bright-background-color: #77859E;
+    -fx-brighter-background-color: #282C34 ;
+    -fx-brightest-background-color: #333333 ;
+
+    -fx-bright-border-color: #B0B0B0;
+    -fx-brighter-text-color: #ffffff;
 }
 
 
 GridPane{
-    -fx-background-color: -fx-base-background-color;
+    -fx-background-color: -fx-darkest-background-color;
 }
 
 .main-panel{
-    -fx-background-color: #282C34;
+    -fx-background-color: -fx-brighter-background-color;
 }
 
 .vbox-main{
-    -fx-background-color: #333333;
+    -fx-background-color: -fx-brightest-background-color;
     -fx-alignment: top-center;
 
 }
 
 .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{
@@ -76,7 +81,7 @@ Label{
 }
 
 .buttonBox{
-    -fx-background-color: #77859E;
+    -fx-background-color: -fx-bright-background-color;
 }
 
 .navBtn{
diff --git a/client/app/src/main/resources/main/main-view.fxml b/client/app/src/main/resources/main/main-view.fxml
index 8f2d3f8..5cd69e3 100644
--- a/client/app/src/main/resources/main/main-view.fxml
+++ b/client/app/src/main/resources/main/main-view.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Alex Rechtin, Marco Kühn -->
+
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
diff --git a/client/app/src/main/resources/main/option-view.css b/client/app/src/main/resources/main/option-view.css
index 291a5d3..1c99062 100644
--- a/client/app/src/main/resources/main/option-view.css
+++ b/client/app/src/main/resources/main/option-view.css
@@ -1,24 +1,35 @@
+/* Marco Kühn */
+* {
+   -fx-dark-background-color: #3E415F;
+
+   -fx-bright-background-color: #ff5555;
+   -fx-brighter-background-color: #8D99AE;
+   -fx-brightest-background-color: #ffffff;
+
+   -fx-bright-border-color: #B0B0B0;
+   -fx-brighter-text-color: #ffffff;
+}
 GridPane{
-    -fx-background-color: #3E415F;
+    -fx-background-color: -fx-dark-background-color;
     -fx-padding: 20px;
     -fx-font-size: 20px;
     -fx-font-family: Segoe UI;
 
     -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
+    -fx-border-color: -fx-bright-border-color;
     -fx-border-style: solid;
     -fx-border-width: 2;
     -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
 }
 
 Label{
-    -fx-text-fill: white;
+    -fx-text-fill: -fx-brighter-text-color;
     -fx-max-width: 200px;
     -fx-min-width: 200px;
 }
 
 .mainLabel{
-    -fx-background-color: #8D99AE;
+    -fx-background-color: -fx-brighter-background-color;
     -fx-padding: 10px;
     -fx-max-width: 200px;
     -fx-min-width: 200px;
@@ -28,17 +39,17 @@ Label{
 
 .mainButton{
     -fx-font-weight: bold;
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 JFXButton{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 #labelError{
     -fx-font-weight: bold;
     -fx-max-width: 1000px;
-    -fx-text-fill: #ff5555;
+    -fx-text-fill: -fx-bright-background-color;
     -fx-padding: 16px;
     -fx-min-height: 140px;
     -fx-max-height: 400px;
@@ -47,7 +58,7 @@ JFXButton{
 }
 
 .comboBox{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
     -fx-max-width: 200px;
     -fx-min-width: 200px;
 }
diff --git a/client/app/src/main/resources/main/option-view.fxml b/client/app/src/main/resources/main/option-view.fxml
index 13e2edd..56ef502 100644
--- a/client/app/src/main/resources/main/option-view.fxml
+++ b/client/app/src/main/resources/main/option-view.fxml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Marco Kühn -->
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
diff --git a/client/app/src/main/resources/users/create-user.css b/client/app/src/main/resources/users/create-user.css
index 6d2ca93..f6343dd 100644
--- a/client/app/src/main/resources/users/create-user.css
+++ b/client/app/src/main/resources/users/create-user.css
@@ -1,20 +1,21 @@
+/*Alex Rechtin*/
 * {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
-
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
+  -fx-dark-background-color: #3E415F;
+  -fx-bright-background-color: #ffffff;
+  -fx-bright-border-color: #B0B0B0;
+  -fx-brighter-text-color: #ff5555;
+  -fx-brightest-text-color: #ffffff;
 }
 
 
 GridPane{
-    -fx-background-color: #3E415F;
+    -fx-background-color: -fx-dark-background-color;
     -fx-padding: 20px;
     -fx-font-size: 20px;
     -fx-font-family: Segoe UI;
 
     -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
+    -fx-border-color: -fx-bright-border-color;
     -fx-border-style: solid;
     -fx-border-width: 2;
     -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
@@ -30,12 +31,13 @@ GridPane{
 
 
 Label{
-    -fx-text-fill: white;
+    -fx-text-fill: -fx-brightest-text-color;
     -fx-max-width: 150px;
     -fx-min-width: 150px;
 }
 
 .textField{
+    -fx-background-color: -fx-bright-background-color;
     -fx-max-width: 400px;
     -fx-min-width: 400px;
 }
@@ -43,9 +45,11 @@ Label{
 .errorMessage{
     -fx-max-width: 400px;
     -fx-min-width: 400px;
+    -fx-text-fill: -fx-brighter-text-color;
 }
 
-Button{
+JFXButton{
+    -fx-background-color: -fx-bright-background-color;
     -fx-max-width: 150px;
     -fx-min-width: 150px;
 }
diff --git a/client/app/src/main/resources/users/create-user.fxml b/client/app/src/main/resources/users/create-user.fxml
index ec367cc..db8cd57 100644
--- a/client/app/src/main/resources/users/create-user.fxml
+++ b/client/app/src/main/resources/users/create-user.fxml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.*?>
+<!-- Alex Rechtin -->
+
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import com.jfoenix.controls.JFXToggleButton?>
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXPasswordField?>
+<?import com.jfoenix.controls.JFXTextField?>
 <GridPane xmlns="http://javafx.com/javafx"
           xmlns:fx="http://javafx.com/fxml"
           fx:controller="users.CreateUserController">
@@ -31,15 +36,15 @@
     <Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
 
     <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
 
-    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+    <JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+    <JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+    <JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
 
     <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
 
@@ -49,8 +54,8 @@
         <HBox.margin>
             <Insets right="100" left="100"/>
         </HBox.margin>
-        <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button>
+        <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
+        <JFXButton onAction="#createUser" styleClass="btnLogin" >Anlegen</JFXButton>
 
     </HBox>
 </GridPane>
diff --git a/client/app/src/main/resources/users/edit-user.fxml b/client/app/src/main/resources/users/edit-user.fxml
index 7ee0071..718ba2b 100644
--- a/client/app/src/main/resources/users/edit-user.fxml
+++ b/client/app/src/main/resources/users/edit-user.fxml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.*?>
+<!-- Alex Rechtin-->
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import com.jfoenix.controls.JFXToggleButton?>
+<?import com.jfoenix.controls.JFXTextField?>
+<?import com.jfoenix.controls.JFXPasswordField?>
+<?import com.jfoenix.controls.JFXButton?>
+<?import javafx.scene.control.Label?>
 <GridPane xmlns="http://javafx.com/javafx"
           xmlns:fx="http://javafx.com/fxml"
           fx:controller="users.EditUserController">
@@ -31,15 +35,15 @@
     <Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
 
     <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
 
-    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+    <JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+    <JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+    <JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
 
     <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
 
@@ -49,8 +53,8 @@
         <HBox.margin>
             <Insets right="100" left="100"/>
         </HBox.margin>
-        <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button>
+        <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
+        <JFXButton onAction="#createUser" styleClass="btnLogin" >Bearbeiten</JFXButton>
 
     </HBox>
 </GridPane>
diff --git a/client/app/src/main/resources/users/login.css b/client/app/src/main/resources/users/login.css
index 687435b..c0a102f 100644
--- a/client/app/src/main/resources/users/login.css
+++ b/client/app/src/main/resources/users/login.css
@@ -1,26 +1,30 @@
+/* Marco Kühn*/
 * {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
+      -fx-dark-background-color: #3E415F;
 
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
+      -fx-brightest-background-color: #ffffff;
+
+      -fx-bright-border-color: #B0B0B0;
+
+      -fx-bright-text-color: ##ff5555;
+      -fx-brighter-text-color: #ffffff;
 }
 
 GridPane{
-    -fx-background-color: #3E415F;
+    -fx-background-color: -fx-dark-background-color;
     -fx-padding: 20px;
     -fx-font-size: 20px;
     -fx-font-family: Segoe UI;
 
     -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
+    -fx-border-color: -fx-bright-border-color;
     -fx-border-style: solid;
     -fx-border-width: 2;
     -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
 }
 
 Label{
-    -fx-text-fill: white;
+    -fx-text-fill: -fx-brighter-text-color;
     -fx-max-width: 150px;
     -fx-min-width: 150px;
 }
@@ -28,7 +32,7 @@ Label{
 .errorLbl{
     -fx-font-weight: bold;
         -fx-max-width: 200px;
-        -fx-text-fill: #ff5555;
+        -fx-text-fill: -fx-bright-text-color;
         -fx-padding: 16px;
         -fx-min-height: 140px;
         -fx-max-height: 400px;
@@ -37,17 +41,17 @@ Label{
 }
 
 .userField{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .passField{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .quitBtn{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .loginBtn{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
\ No newline at end of file
diff --git a/client/app/src/main/resources/users/login.fxml b/client/app/src/main/resources/users/login.fxml
index 9356f08..711054b 100644
--- a/client/app/src/main/resources/users/login.fxml
+++ b/client/app/src/main/resources/users/login.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>
diff --git a/client/data/src/main/java/config/Config.java b/client/data/src/main/java/config/Config.java
index 518838c..cfbe489 100644
--- a/client/data/src/main/java/config/Config.java
+++ b/client/data/src/main/java/config/Config.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package config;
 
 public class Config {
diff --git a/client/data/src/main/java/config/ConfigLoader.java b/client/data/src/main/java/config/ConfigLoader.java
index f78c894..68e1f86 100644
--- a/client/data/src/main/java/config/ConfigLoader.java
+++ b/client/data/src/main/java/config/ConfigLoader.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/client/data/src/main/java/helper/HttpRequestException.java b/client/data/src/main/java/helper/HttpRequestException.java
index 972dd3f..1734ddc 100644
--- a/client/data/src/main/java/helper/HttpRequestException.java
+++ b/client/data/src/main/java/helper/HttpRequestException.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package helper;
 
 public class HttpRequestException extends Exception{
diff --git a/client/data/src/main/java/helper/Tuple.java b/client/data/src/main/java/helper/Tuple.java
index e342ad6..5ae234e 100644
--- a/client/data/src/main/java/helper/Tuple.java
+++ b/client/data/src/main/java/helper/Tuple.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package helper;
 
 public class Tuple<X, Y> {