diff --git a/gui/Programmeinstellungen.qml b/gui/Programmeinstellungen.qml
index 38a2a39..62eef3b 100644
--- a/gui/Programmeinstellungen.qml
+++ b/gui/Programmeinstellungen.qml
@@ -25,8 +25,14 @@ ApplicationWindow
     height: 480
     visible: true
     title: qsTr("PYQCRM - Einstellungen")
+<<<<<<< HEAD
     Material.theme: Material.Dark
     Material.accent: Material.BlueGrey
+=======
+    Material.theme: Material.White
+
+
+>>>>>>> db16247 (2 Varianten GUI mit Material.theme Unterstützung)
 
     ColumnLayout
     {
@@ -44,6 +50,16 @@ ApplicationWindow
             {
                 text: qsTr("Datenbank einrichten")
             }
+
+            TabButton
+            {
+                text: qsTr("TEST TAB") //NUR TESTTAB UM LAYOUT OPTIONEN ZU TESTEN
+            }
+
+            TabButton
+            {
+                text: qsTr("TEST TAB 2")
+            }
         }
 
         StackLayout
@@ -104,13 +120,21 @@ ApplicationWindow
                 id: settingsDB
                 Layout.fillWidth: parent.width
 
+<<<<<<< HEAD
                 GridLayout
+=======
+                Rectangle
+>>>>>>> db16247 (2 Varianten GUI mit Material.theme Unterstützung)
                 {
                     id: dbGrid
                     columns: 2
                     anchors.fill: parent
 
+<<<<<<< HEAD
                     Label
+=======
+                    GridLayout
+>>>>>>> db16247 (2 Varianten GUI mit Material.theme Unterstützung)
                     {
                         text: qsTr("DB-Host:")
                         Layout.alignment: Qt.AlignRight
@@ -182,6 +206,165 @@ ApplicationWindow
                     }
                 }
             }
+            //ANFANG TESTCODE KEINE IDS VERGEBEN
+            Item
+            {
+
+                Frame
+                {
+                    anchors.fill: parent
+                    anchors.margins: 9
+
+                    GridLayout
+                    {
+
+                        columns: 2
+                        anchors.fill: parent
+                        Label
+                        {
+                            text: qsTr("DB-Host:")
+                            Layout.alignment: Qt.AlignRight
+                        }
+
+                        TextField
+                        {
+
+                            placeholderText: qsTr("Hier Host eingeben")
+                            Layout.fillWidth: true
+                        }
+
+                        Label
+                        {
+                            text: qsTr("DB-Port:")
+                            Layout.alignment: Qt.AlignRight
+                        }
+
+                        TextField
+                        {
+
+                            placeholderText: qsTr("Hier DB-Port eingeben")
+                            Layout.fillWidth: true
+                        }
+
+                        Label
+                        {
+                            text: qsTr("DB-Name:")
+                            Layout.alignment: Qt.AlignRight
+                        }
+
+                        TextField
+                        {
+
+                            placeholderText: qsTr("Hier DB-Name eingeben")
+                            Layout.fillWidth: true
+                        }
+
+                        Label
+                        {
+                           text: qsTr("DB-Benutzername:")
+                           Layout.alignment: Qt.AlignRight
+                        }
+
+                        TextField
+                        {
+
+                            placeholderText: qsTr("Hier DB-Benutzername eingeben")
+                            Layout.fillWidth: true
+                        }
+
+                        Label
+                        {
+                            text: qsTr("DB-Passwort:")
+                            Layout.alignment: Qt.AlignRight
+                        }
+
+                        TextField
+                        {
+
+                            echoMode: TextInput.Password
+                            placeholderText: qsTr("Hier DB-Passwort eingeben")
+                            Layout.fillWidth: true
+                        }
+                    }
+                }
+            }
+
+            Item
+            {
+                GridLayout
+                {
+                    anchors.fill: parent
+                    anchors.margins: 9
+                    columns: 2
+
+                    Label
+                    {
+                        text: qsTr("DB-Host:")
+                        Layout.alignment: Qt.AlignRight
+                    }
+
+                    TextField
+                    {
+                        placeholderText: qsTr("Hier Host eingeben")
+                        Layout.fillWidth: true
+                    }
+
+                    Label
+                    {
+                        text: qsTr("DB-Port:")
+                        Layout.alignment: Qt.AlignRight
+                    }
+
+                    TextField
+                    {
+                        placeholderText: qsTr("Hier DB-Port eingeben")
+                        Layout.fillWidth: true
+                    }
+
+                    Label
+                    {
+                        text: qsTr("DB-Name:")
+                        Layout.alignment: Qt.AlignRight
+                    }
+
+                    TextField
+                    {
+                        placeholderText: qsTr("Hier DB-Name eingeben")
+                        Layout.fillWidth: true
+                    }
+
+                    Label
+                    {
+                       text: qsTr("DB-Benutzername:")
+                       Layout.alignment: Qt.AlignRight
+                    }
+
+                    TextField
+                    {
+                        placeholderText: qsTr("Hier DB-Benutzername eingeben")
+                        Layout.fillWidth: true
+                    }
+
+                    Label
+                    {
+                        text: qsTr("DB-Passwort:")
+                        Layout.alignment: Qt.AlignRight
+                    }
+
+                    TextField
+                    {
+                        echoMode: TextInput.Password
+                        placeholderText: qsTr("Hier DB-Passwort eingeben")
+                        Layout.fillWidth: true
+                    }
+
+                    Label
+                    {
+                        //Spacer Label
+                    }
+                }
+            }
+            //ENDE TESTCODE
         }
         RowLayout
         {