diff --git a/Components/Input.qml b/Components/Input.qml
index 77186d5..0e629ae 100644
--- a/Components/Input.qml
+++ b/Components/Input.qml
@@ -150,7 +150,7 @@ Column {
 
                 background: Rectangle {
                     radius: config.RoundCorners / 2
-                    color: root.palette.window
+                    color: root.palette.alternateBase
                     layer.enabled: true
                 }
 
@@ -206,7 +206,7 @@ Column {
             height: root.font.pointSize * 3
             width: parent.width
             placeholderText: config.TranslatePlaceholderUsername || textConstants.userName
-            placeholderTextColor: config.PlaceholderColor
+            placeholderTextColor: root.palette.shadow
             selectByMouse: true
             horizontalAlignment: TextInput.AlignHCenter
             renderType: Text.QtRendering
@@ -331,7 +331,7 @@ Column {
             selectByMouse: true
             echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
             placeholderText: config.TranslatePlaceholderPassword || textConstants.password
-            placeholderTextColor: config.PlaceholderColor
+            placeholderTextColor: root.palette.shadow
             horizontalAlignment: TextInput.AlignHCenter
             passwordCharacter: "•"
             passwordMaskDelay: config.HideCompletePassword == "true" ? undefined : 1000
@@ -392,7 +392,7 @@ Column {
 
             contentItem: Text {
                 text: parent.text
-                color: config.OverrideLoginButtonTextColor != "" ? config.OverrideLoginButtonTextColor : root.palette.highlight.hslLightness >= 0.7 ? "#444" : "white"
+                color: root.palette.mid
                 font.pointSize: root.font.pointSize
                 font.family: root.font.family
                 horizontalAlignment: Text.AlignHCenter
@@ -413,7 +413,7 @@ Column {
                     when: loginButton.down
                     PropertyChanges {
                         target: buttonBackground
-                        color: Qt.darker(root.palette.highlight, 1.1)
+                        color: Qt.darker(root.palette.link, 1.1)
                         opacity: 1
                     }
                     PropertyChanges {
@@ -425,7 +425,7 @@ Column {
                     when: loginButton.hovered
                     PropertyChanges {
                         target: buttonBackground
-                        color: Qt.lighter(root.palette.highlight, 1.15)
+                        color: Qt.lighter(root.palette.link, 1.15)
                         opacity: 1
                     }
                     PropertyChanges {
@@ -438,7 +438,7 @@ Column {
                     when: loginButton.activeFocus
                     PropertyChanges {
                         target: buttonBackground
-                        color: Qt.lighter(root.palette.highlight, 1.2)
+                        color: Qt.lighter(root.palette.link, 1.2)
                         opacity: 1
                     }
                     PropertyChanges {
@@ -451,7 +451,7 @@ Column {
                     when: loginButton.enabled
                     PropertyChanges {
                         target: buttonBackground;
-                        color: root.palette.highlight;
+                        color: root.palette.link;
                         opacity: 1
                     }
                     PropertyChanges {
diff --git a/Components/SessionButton.qml b/Components/SessionButton.qml
index ffa912e..ef9220b 100644
--- a/Components/SessionButton.qml
+++ b/Components/SessionButton.qml
@@ -106,7 +106,7 @@ Item {
 
             background: Rectangle {
                 radius: config.RoundCorners / 2
-                color: config.BackgroundColor
+                color: root.palette.alternateBase
                 layer.enabled: true
             }
 
diff --git a/Components/SystemButtons.qml b/Components/SystemButtons.qml
index 763fd75..aef0c24 100644
--- a/Components/SystemButtons.qml
+++ b/Components/SystemButtons.qml
@@ -30,7 +30,7 @@ RowLayout {
             icon.source: modelData ? Qt.resolvedUrl("../Assets/" + modelData[0] + ".svg") : ""
             icon.height: 2 * Math.round((root.font.pointSize * 3) / 2)
             icon.width: 2 * Math.round((root.font.pointSize * 3) / 2)
-            icon.color: config.IconColor
+            icon.color: config.SystemButtonsIconColor
             display: AbstractButton.TextUnderIcon
             visible: config.HideSystemButtons != "true" && modelData[2]
             hoverEnabled: true
diff --git a/Main.qml b/Main.qml
index 13a18c2..17d2993 100644
--- a/Main.qml
+++ b/Main.qml
@@ -21,11 +21,15 @@ Pane {
 
     padding: config.ScreenPadding
     palette.button: "transparent"
-    palette.highlight: config.AccentColor
-    palette.highlightedText: config.OverrideTextFieldColor !== "" ? config.OverrideTextFieldColor : root.palette.highlight
-    palette.text: config.MainColor
-    palette.buttonText: config.MainColor
+    palette.highlight: config.HighlightColor
     palette.window: config.BackgroundColor
+    palette.text: config.TextColor
+    palette.shadow: config.PlaceholderColor
+    palette.buttonText: root.palette.text
+    palette.highlightedText: config.HighlightTextColor == "" ? root.palette.highlight : config.HighlightTextColor
+    palette.link: config.LoginButtonBackgroundColor == "" ? root.palette.highlight : config.LoginButtonBackgroundColor
+    palette.mid: config.LoginButtonTextColor == "" ? root.palette.text : config.LoginButtonTextColor
+    palette.alternateBase: config.BackgroundListColor == "" ? root.palette.window : config.BackgroundListColor
 
     font.family: config.Font
     font.pointSize: config.FontSize !== "" ? config.FontSize : parseInt(height / 80)
diff --git a/theme.conf b/theme.conf
index 30ee31f..71c72ab 100644
--- a/theme.conf
+++ b/theme.conf
@@ -47,18 +47,25 @@ BackgroundVerticalAlignment="center"
 
 #################### Colors ####################
 
-MainColor="#F8F8F2"
-AccentColor="#343746"
+HighlightColor="#343746"
+# Main color.
 BackgroundColor="#21222C"
-## Used for the user and session selection background as well as for ScreenPadding and FormBackground when either is true. If PartialBlur and FormBackground are both enabled this color will blend with the blur effect.
+# Background color.
+# Connected with: HaveFormBackground
+TextColor="#ffffff"
 PlaceholderColor="#bbbbbb"
-## Placholder text color. Example: username, password.
-IconColor="#ffffff"
-## System icon colors
-OverrideTextFieldColor=""
-## The text color of the username & password when focused/pressed may become difficult to read depending on your color choices. Use this option to set it independently for legibility.
-OverrideLoginButtonTextColor=""
-## The text of the login button may become difficult to read depending on your color choices. Use this option to set it independently for legibility.
+# Placholder text color (username, password).
+SystemButtonsIconColor="#F8F8F2"
+# System icon colors.
+
+HighlightTextColor=""
+# Overrides HighlightColor.
+LoginButtonTextColor=""
+# Overrides TextColor.
+LoginButtonBackgroundColor=""
+# Overrides HighlightColor.
+BackgroundListColor=""
+# Overrides BackgroundColor.
 
 #################### Form ####################