Merge remote-tracking branch 'origin/5.10' into dev

Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e

46 files changed, 163 insertions, 149 deletions

diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml
index d331d2b6..84b618e1 100644
--- a/src/imports/controls/ApplicationWindow.qml
+++ b/src/imports/controls/ApplicationWindow.qml
@@ -43,13 +43,13 @@ import QtQuick.Templates 2.4 as T
 T.ApplicationWindow {
     id: window
 
-    color: Default.backgroundColor
+    color: palette.window
 
     overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(window.palette.shadow, 0.5)
     }
 
     overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(window.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 9562c904..7039dfc9 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -56,8 +56,7 @@ T.Button {
     icon.width: 24
     icon.height: 24
     icon.color: control.checked || control.highlighted ? control.palette.brightText :
-                control.visualFocus ? control.palette.highlight :
-                control.flat && !control.down ? control.palette.windowText : control.palette.buttonText
+                control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText
 
     contentItem: IconLabel {
         spacing: control.spacing
@@ -68,18 +67,16 @@ T.Button {
         text: control.text
         font: control.font
         color: control.checked || control.highlighted ? control.palette.brightText :
-               control.visualFocus ? control.palette.highlight :
-               control.flat && !control.down ? control.palette.windowText : control.palette.buttonText
+               control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText
     }
 
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
         visible: !control.flat || control.down || control.checked || control.highlighted
-        color: control.checked || control.highlighted ?
-            (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)) :
-            (control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor))
-        border.color: Default.focusColor
+        color: Color.blend(control.checked || control.highlighted ? control.palette.dark : control.palette.button,
+                                                                    control.palette.mid, control.down ? 0.5 : 0.0)
+        border.color: control.palette.highlight
         border.width: control.visualFocus ? 2 : 0
     }
 }
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml
index cee40c21..2b14b7e4 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/CheckDelegate.qml
@@ -82,6 +82,6 @@ T.CheckDelegate {
         implicitWidth: 100
         implicitHeight: 40
         visible: control.down || control.highlighted
-        color: control.down ? Default.delegatePressedColor : Default.delegateColor
+        color: control.down ? control.palette.midlight : control.palette.light
     }
 }
diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml
index 27aa89aa..d79fa55f 100644
--- a/src/imports/controls/CheckIndicator.qml
+++ b/src/imports/controls/CheckIndicator.qml
@@ -46,19 +46,15 @@ Rectangle {
     implicitWidth: 28
     implicitHeight: 28
 
-    color: control.enabled ? (control.down
-        ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
-        : Default.backgroundColor) : Default.disabledDarkColor
+    color: control.down ? control.palette.light : control.palette.base
     border.width: control.visualFocus ? 2 : 1
-    border.color: control.enabled ? (control.visualFocus
-        ? Default.focusColor
-        : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : "transparent"
-    opacity: enabled ? 1 : 0.3
+    border.color: control.visualFocus ? control.palette.highlight : control.palette.mid
 
     ColorImage {
         x: (parent.width - width) / 2
         y: (parent.height - height) / 2
-        color: control.visualFocus ? Default.focusColor : undefined
+        defaultColor: "#353637"
+        color: control.palette.text
         source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
         visible: control.checkState === Qt.Checked
     }
@@ -68,7 +64,7 @@ Rectangle {
         y: (parent.height - height) / 2
         width: 16
         height: 3
-        color: control.visualFocus ? Default.focusColor : Default.frameDarkColor
+        color: control.palette.text
         visible: control.checkState === Qt.PartiallyChecked
     }
 }
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 5bbe273b..3bfa2ea7 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -64,7 +64,8 @@ T.ComboBox {
     indicator: ColorImage {
         x: control.mirrored ? control.padding : control.width - width - control.padding
         y: control.topPadding + (control.availableHeight - height) / 2
-        color: !control.editable && control.visualFocus ? Default.focusColor : undefined
+        color: control.palette.dark
+        defaultColor: "#353637"
         source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png"
         opacity: enabled ? 1 : 0.3
     }
@@ -84,16 +85,17 @@ T.ComboBox {
         validator: control.validator
 
         font: control.font
-        color: !control.editable && control.visualFocus ? Default.focusColor : control.palette.text
+        color: control.editable ? control.palette.text : control.palette.buttonText
         selectionColor: control.palette.highlight
         selectedTextColor: control.palette.highlightedText
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
 
         background: Rectangle {
-            visible: control.editable && !control.flat
+            visible: control.enabled && control.editable && !control.flat
             border.width: parent && parent.activeFocus ? 2 : 1
-            border.color: parent && parent.activeFocus ? Default.focusColor : Default.buttonColor
+            border.color: parent && parent.activeFocus ? control.palette.highlight : control.palette.button
+            color: control.palette.base
         }
     }
 
@@ -101,9 +103,8 @@ T.ComboBox {
         implicitWidth: 140
         implicitHeight: 40
 
-        color: !control.editable && control.visualFocus ? (control.pressed ? Default.focusPressedColor : Default.focusLightColor) :
-            (control.down || popup.visible ? Default.buttonPressedColor : Default.buttonColor)
-        border.color: Default.focusColor
+        color: control.down || popup.visible ? control.palette.mid : control.palette.button
+        border.color: control.palette.highlight
         border.width: !control.editable && control.visualFocus ? 2 : 0
         visible: !control.flat || control.down
     }
@@ -127,7 +128,7 @@ T.ComboBox {
                 width: parent.width
                 height: parent.height
                 color: "transparent"
-                border.color: Default.frameLightColor
+                border.color: control.palette.mid
             }
 
             T.ScrollIndicator.vertical: ScrollIndicator { }
diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml
index 835d6b25..e879c73f 100644
--- a/src/imports/controls/DelayButton.qml
+++ b/src/imports/controls/DelayButton.qml
@@ -79,7 +79,7 @@ T.DelayButton {
                 text: control.text
                 font: control.font
                 opacity: enabled ? 1 : 0.3
-                color: control.visualFocus ? control.palette.highlight : control.palette.buttonText
+                color: control.palette.buttonText
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 elide: Text.ElideRight
@@ -113,14 +113,15 @@ T.DelayButton {
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
-        color: control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor)
-        border.color: Default.focusColor
+        color: Color.blend(control.palette.button, control.palette.mid, control.down ? 0.5 : 0.0)
+        border.color: control.palette.highlight
         border.width: control.visualFocus ? 2 : 0
 
-        Rectangle {
+        PaddedRectangle {
+            padding: control.visualFocus ? 2 : 0
             width: control.progress * parent.width
             height: parent.height
-            color: control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)
+            color: Color.blend(control.palette.dark, control.palette.mid, control.down ? 0.5 : 0.0)
         }
     }
 }
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index cb3b1c1a..6b96187a 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -48,7 +48,7 @@ T.Dial {
     background: DialImpl {
         width: control.availableWidth
         height: control.availableHeight
-        color: control.visualFocus ? Default.focusColor : Default.frameDarkColor
+        color: control.visualFocus ? control.palette.highlight : control.palette.dark
         progress: control.position
         opacity: control.enabled ? 1 : 0.3
     }
@@ -59,7 +59,8 @@ T.Dial {
         y: background.y + background.height / 2 - handle.height / 2
         width: 14
         height: 10
-        color: control.visualFocus ? Default.focusColor : undefined
+        defaultColor: "#353637"
+        color: control.visualFocus ? control.palette.highlight : control.palette.dark
         source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/dial-indicator.png"
         antialiasing: true
         opacity: control.enabled ? 1 : 0.3
diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml
index 9c19c045..913e23f1 100644
--- a/src/imports/controls/Dialog.qml
+++ b/src/imports/controls/Dialog.qml
@@ -57,7 +57,8 @@ T.Dialog {
     padding: 12
 
     background: Rectangle {
-        border.color: Default.frameDarkColor
+        color: control.palette.window
+        border.color: control.palette.dark
     }
 
     header: Label {
@@ -70,6 +71,7 @@ T.Dialog {
             x: 1; y: 1
             width: parent.width - 2
             height: parent.height - 1
+            color: control.palette.window
         }
     }
 
@@ -78,10 +80,10 @@ T.Dialog {
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/DialogButtonBox.qml
index ef08eed3..51a5cc49 100644
--- a/src/imports/controls/DialogButtonBox.qml
+++ b/src/imports/controls/DialogButtonBox.qml
@@ -69,5 +69,6 @@ T.DialogButtonBox {
         x: 1; y: 1
         width: parent.width - 2
         height: parent.height - 2
+        color: control.palette.window
     }
 }
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml
index 9aaf8159..dbafbd92 100644
--- a/src/imports/controls/Drawer.qml
+++ b/src/imports/controls/Drawer.qml
@@ -59,21 +59,22 @@ T.Drawer {
     exit: Transition { SmoothedAnimation { velocity: 5 } }
 
     background: Rectangle {
+        color: control.palette.window
         Rectangle {
             readonly property bool horizontal: control.edge === Qt.LeftEdge || control.edge === Qt.RightEdge
             width: horizontal ? 1 : parent.width
             height: horizontal ? parent.height : 1
-            color: Default.frameDarkColor
+            color: control.palette.dark
             x: control.edge === Qt.LeftEdge ? parent.width - 1 : 0
             y: control.edge === Qt.TopEdge ? parent.height - 1 : 0
         }
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml
index 896ce9ac..7c8a4db7 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/Frame.qml
@@ -52,6 +52,6 @@ T.Frame {
 
     background: Rectangle {
         color: "transparent"
-        border.color: Default.frameLightColor
+        border.color: control.palette.mid
     }
 }
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index dc529bd6..1a481e22 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -72,6 +72,6 @@ T.GroupBox {
         height: parent.height - control.topPadding + control.padding
 
         color: "transparent"
-        border.color: Default.frameLightColor
+        border.color: control.palette.mid
     }
 }
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml
index a03deac0..6367bc86 100644
--- a/src/imports/controls/ItemDelegate.qml
+++ b/src/imports/controls/ItemDelegate.qml
@@ -72,8 +72,7 @@ T.ItemDelegate {
         implicitWidth: 100
         implicitHeight: 40
         visible: control.down || control.highlighted || control.visualFocus
-        color: control.visualFocus
-            ? (control.pressed ? Default.focusPressedColor : Default.delegateFocusColor)
-            : (control.down ? Default.delegatePressedColor : Default.delegateColor)
+        color: Color.blend(control.down ? control.palette.midlight : control.palette.light,
+                                          control.palette.highlight, control.visualFocus ? 0.15 : 0.0)
     }
 }
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml
index 448beaca..deadc274 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/Menu.qml
@@ -66,15 +66,15 @@ T.Menu {
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 40
-        color: Default.backgroundColor
-        border.color: Default.frameDarkColor
+        color: control.palette.window
+        border.color: control.palette.dark
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/MenuBar.qml b/src/imports/controls/MenuBar.qml
index bec4c5fb..058c8736 100644
--- a/src/imports/controls/MenuBar.qml
+++ b/src/imports/controls/MenuBar.qml
@@ -58,6 +58,6 @@ T.MenuBar {
 
     background: Rectangle {
         implicitHeight: 40
-        color: Default.delegateColor
+        color: control.palette.button
     }
 }
diff --git a/src/imports/controls/MenuBarItem.qml b/src/imports/controls/MenuBarItem.qml
index dd890de5..02e3ac43 100644
--- a/src/imports/controls/MenuBarItem.qml
+++ b/src/imports/controls/MenuBarItem.qml
@@ -56,7 +56,7 @@ T.MenuBarItem {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor
+    icon.color: control.palette.buttonText
 
     contentItem: IconLabel {
         spacing: control.spacing
@@ -67,12 +67,12 @@ T.MenuBarItem {
         icon: control.icon
         text: control.text
         font: control.font
-        color: control.enabled ? Default.textDarkColor : Default.textDisabledColor
+        color: control.palette.buttonText
     }
 
     background: Rectangle {
         implicitWidth: 40
         implicitHeight: 40
-        color: control.highlighted || control.down ? Default.delegatePressedColor : "transparent"
+        color: control.down || control.highlighted ? control.palette.mid : "transparent"
     }
 }
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index e8d1d426..9737efb0 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -54,7 +54,7 @@ T.MenuItem {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor
+    icon.color: control.palette.windowText
 
     contentItem: IconLabel {
         readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0
@@ -79,7 +79,8 @@ T.MenuItem {
 
         visible: control.checked
         source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : ""
-        color: control.enabled ? undefined : Default.textDisabledColor
+        color: control.palette.windowText
+        defaultColor: "#353637"
     }
 
     arrow: ColorImage {
@@ -89,7 +90,8 @@ T.MenuItem {
         visible: control.subMenu
         mirror: control.mirrored
         source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/arrow-indicator.png" : ""
-        color: control.enabled ? undefined : Default.textDisabledColor
+        color: control.palette.windowText
+        defaultColor: "#353637"
     }
 
     background: Item {
@@ -101,7 +103,7 @@ T.MenuItem {
             y: 1
             width: parent.width - 2
             height: parent.height - 2
-            color: control.highlighted || control.down ? Default.delegateColor : "transparent"
+            color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent"
         }
     }
 }
diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/MenuSeparator.qml
index 42dd64be..ac47e32c 100644
--- a/src/imports/controls/MenuSeparator.qml
+++ b/src/imports/controls/MenuSeparator.qml
@@ -52,6 +52,6 @@ T.MenuSeparator {
     contentItem: Rectangle {
         implicitWidth: 188
         implicitHeight: 1
-        color: Default.separatorColor
+        color: control.palette.mid
     }
 }
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml
index aecc444f..df56dcbe 100644
--- a/src/imports/controls/Page.qml
+++ b/src/imports/controls/Page.qml
@@ -55,6 +55,6 @@ T.Page {
     contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
 
     background: Rectangle {
-        color: Default.backgroundColor
+        color: control.palette.window
     }
 }
diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml
index 8145c3c6..7517e2f2 100644
--- a/src/imports/controls/Pane.qml
+++ b/src/imports/controls/Pane.qml
@@ -51,6 +51,6 @@ T.Pane {
     padding: 12
 
     background: Rectangle {
-        color: Default.backgroundColor
+        color: control.palette.window
     }
 }
diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml
index cb419f55..7ea706ed 100644
--- a/src/imports/controls/Popup.qml
+++ b/src/imports/controls/Popup.qml
@@ -53,14 +53,15 @@ T.Popup {
     padding: 12
 
     background: Rectangle {
-        border.color: Default.frameDarkColor
+        color: control.palette.window
+        border.color: control.palette.dark
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index 8fa7ba21..7ac857b5 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -64,6 +64,6 @@ T.ProgressBar {
         width: control.availableWidth
         height: 6
 
-        color: control.palette.light
+        color: control.palette.midlight
     }
 }
diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml
index 9a84685d..f1bcc839 100644
--- a/src/imports/controls/RadioDelegate.qml
+++ b/src/imports/controls/RadioDelegate.qml
@@ -82,6 +82,6 @@ T.RadioDelegate {
         implicitWidth: 100
         implicitHeight: 40
         visible: control.down || control.highlighted
-        color: control.down ? Default.delegatePressedColor : Default.delegateColor
+        color: control.down ? control.palette.midlight : control.palette.light
     }
 }
diff --git a/src/imports/controls/RadioIndicator.qml b/src/imports/controls/RadioIndicator.qml
index a0cf06d3..f5da9792 100644
--- a/src/imports/controls/RadioIndicator.qml
+++ b/src/imports/controls/RadioIndicator.qml
@@ -43,12 +43,9 @@ Rectangle {
     implicitHeight: 28
 
     radius: width / 2
-    color: control.down
-        ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
-        : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)
+    color: control.down ? control.palette.light : control.palette.base
     border.width: control.visualFocus ? 2 : 1
-    border.color: control.visualFocus ? Default.focusColor : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)
-    opacity: enabled ? 1 : 0.3
+    border.color: control.visualFocus ? control.palette.highlight : control.palette.mid
 
     property Item control
 
@@ -58,7 +55,7 @@ Rectangle {
         width: 20
         height: 20
         radius: width / 2
-        color: control.down ? Default.textDarkColor : Default.buttonCheckedColor
+        color: control.palette.text
         visible: control.checked
     }
 }
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
index c2b2edb6..f2c9266e 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/RangeSlider.qml
@@ -58,12 +58,8 @@ T.RangeSlider {
         implicitHeight: 28
         radius: width / 2
         border.width: activeFocus ? 2 : 1
-        border.color: control.enabled ? (activeFocus
-            ? Default.focusColor
-            : (control.first.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
-        color: control.enabled ? (first.pressed
-            ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
-            : (activeFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor
+        border.color: activeFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight
+        color: control.first.pressed ? control.palette.light : control.palette.window
     }
 
     second.handle: Rectangle {
@@ -73,12 +69,8 @@ T.RangeSlider {
         implicitHeight: 28
         radius: width / 2
         border.width: activeFocus ? 2 : 1
-        border.color: control.enabled ? (activeFocus
-            ? Default.focusColor
-            : (control.second.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
-        color: control.enabled ? (second.pressed
-            ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
-            : (activeFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor
+        border.color: activeFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight
+        color: control.second.pressed ? control.palette.light : control.palette.window
     }
 
     background: Rectangle {
@@ -89,7 +81,7 @@ T.RangeSlider {
         width: control.horizontal ? control.availableWidth : implicitWidth
         height: control.horizontal ? implicitHeight : control.availableHeight
         radius: 3
-        color: Default.buttonColor
+        color: control.palette.midlight
         scale: control.horizontal && control.mirrored ? -1 : 1
 
         Rectangle {
@@ -98,7 +90,7 @@ T.RangeSlider {
             width: control.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 6 : 6
             height: control.horizontal ? 6 : control.second.position * parent.height - control.first.position * parent.height - 6
 
-            color: Default.textColor
+            color: control.palette.dark
         }
     }
 }
diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml
index f4431132..9692b9de 100644
--- a/src/imports/controls/RoundButton.qml
+++ b/src/imports/controls/RoundButton.qml
@@ -54,8 +54,7 @@ T.RoundButton {
     icon.width: 24
     icon.height: 24
     icon.color: control.checked || control.highlighted ? control.palette.brightText :
-                control.visualFocus ? control.palette.highlight :
-                control.flat && !control.down ? control.palette.windowText : control.palette.buttonText
+                control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText
 
     contentItem: IconLabel {
         spacing: control.spacing
@@ -66,8 +65,7 @@ T.RoundButton {
         text: control.text
         font: control.font
         color: control.checked || control.highlighted ? control.palette.brightText :
-               control.visualFocus ? control.palette.highlight :
-               control.flat && !control.down ? control.palette.windowText : control.palette.buttonText
+               control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText
     }
 
     background: Rectangle {
@@ -76,10 +74,9 @@ T.RoundButton {
         radius: control.radius
         opacity: enabled ? 1 : 0.3
         visible: !control.flat || control.down || control.checked || control.highlighted
-        color: control.checked || control.highlighted ?
-            (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.buttonCheckedColor)) :
-            (control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor))
-        border.color: Default.focusColor
+        color: Color.blend(control.checked || control.highlighted ? control.palette.dark : control.palette.button,
+                                                                    control.palette.mid, control.down ? 0.5 : 0.0)
+        border.color: control.palette.highlight
         border.width: control.visualFocus ? 2 : 0
     }
 }
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml
index 56467ffa..b67a2564 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/ScrollBar.qml
@@ -57,7 +57,7 @@ T.ScrollBar {
         implicitHeight: control.interactive ? 6 : 2
 
         radius: width / 2
-        color: control.pressed ? Default.scrollBarPressedColor : Default.scrollBarColor
+        color: control.pressed ? control.palette.dark : control.palette.mid
         opacity: 0.0
 
         states: State {
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index 048a5749..0025d489 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -55,7 +55,7 @@ T.ScrollIndicator {
         implicitWidth: 2
         implicitHeight: 2
 
-        color: Default.scrollBarColor
+        color: control.palette.mid
         visible: control.size < 1.0
         opacity: 0.0
 
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index a3cd0f5f..9d4942c9 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -55,13 +55,9 @@ T.Slider {
         implicitWidth: 28
         implicitHeight: 28
         radius: width / 2
-        color: control.enabled ? (control.pressed
-            ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
-            : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor
+        color: control.pressed ? control.palette.light : control.palette.window
         border.width: control.visualFocus ? 2 : 1
-        border.color: control.enabled ? (control.visualFocus
-            ? Default.focusColor
-            : (control.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
+        border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight
     }
 
     background: Rectangle {
@@ -72,7 +68,7 @@ T.Slider {
         width: control.horizontal ? control.availableWidth : implicitWidth
         height: control.horizontal ? implicitHeight : control.availableHeight
         radius: 3
-        color: Default.buttonColor
+        color: control.palette.midlight
         scale: control.horizontal && control.mirrored ? -1 : 1
 
         Rectangle {
@@ -81,7 +77,7 @@ T.Slider {
             height: control.horizontal ? 6 : control.position * parent.height
 
             radius: 3
-            color: Default.textColor
+            color: control.palette.dark
         }
     }
 }
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index 0855d2f0..d74c836a 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -84,7 +84,7 @@ T.SpinBox {
             height: control.height
             visible: control.activeFocus
             color: "transparent"
-            border.color: Default.focusColor
+            border.color: control.palette.highlight
             border.width: 2
         }
     }
@@ -94,21 +94,21 @@ T.SpinBox {
         height: parent.height
         implicitWidth: 40
         implicitHeight: 40
-        color: up.pressed ? Default.buttonPressedColor : Default.buttonColor
+        color: up.pressed ? control.palette.mid : control.palette.button
 
         Rectangle {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             width: parent.width / 3
             height: 2
-            color: enabled ? Default.textColor : Default.textDisabledColor
+            color: enabled ? control.palette.buttonText : control.palette.mid
         }
         Rectangle {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             width: 2
             height: parent.width / 3
-            color: enabled ? Default.textColor : Default.textDisabledColor
+            color: enabled ? control.palette.buttonText : control.palette.mid
         }
     }
 
@@ -117,19 +117,20 @@ T.SpinBox {
         height: parent.height
         implicitWidth: 40
         implicitHeight: 40
-        color: down.pressed ? Default.buttonPressedColor : Default.buttonColor
+        color: down.pressed ? control.palette.mid : control.palette.button
 
         Rectangle {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             width: parent.width / 3
             height: 2
-            color: enabled ? Default.textColor : Default.textDisabledColor
+            color: enabled ? control.palette.buttonText : control.palette.mid
         }
     }
 
     background: Rectangle {
         implicitWidth: 140
-        border.color: Default.buttonColor
+        color: enabled ? control.palette.base : control.palette.button
+        border.color: control.palette.button
     }
 }
diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml
index bed2ed03..4f2c9ee1 100644
--- a/src/imports/controls/SwipeDelegate.qml
+++ b/src/imports/controls/SwipeDelegate.qml
@@ -73,8 +73,7 @@ T.SwipeDelegate {
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
-        color: control.visualFocus
-            ? (control.down ? Default.focusPressedColor : Default.delegateFocusColor)
-            : (control.down ? Default.delegatePressedColor : Default.backgroundColor)
+        color: Color.blend(control.down ? control.palette.midlight : control.palette.light,
+                                          control.palette.highlight, control.visualFocus ? 0.15 : 0.0)
     }
 }
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml
index 4fb5fa5c..0caa6fc5 100644
--- a/src/imports/controls/SwitchDelegate.qml
+++ b/src/imports/controls/SwitchDelegate.qml
@@ -81,6 +81,6 @@ T.SwitchDelegate {
         implicitWidth: 100
         implicitHeight: 40
         visible: control.down || control.highlighted
-        color: control.down ? Default.delegatePressedColor : Default.delegateColor
+        color: control.down ? control.palette.midlight : control.palette.light
     }
 }
diff --git a/src/imports/controls/SwitchIndicator.qml b/src/imports/controls/SwitchIndicator.qml
index d5f97567..6b38709f 100644
--- a/src/imports/controls/SwitchIndicator.qml
+++ b/src/imports/controls/SwitchIndicator.qml
@@ -49,9 +49,7 @@ Item {
         width: 56
         height: 16
         radius: 8
-        color: control.checked ? (control.visualFocus ? Default.focusColor : Default.buttonCheckedColor) : Default.buttonColor
-        border.width: control.visualFocus ? 2 : 0
-        border.color: Default.focusColor
+        color: control.checked ? control.palette.dark : control.palette.midlight
     }
 
     Rectangle {
@@ -60,13 +58,9 @@ Item {
         width: 28
         height: 28
         radius: 16
-        color: control.enabled ? (control.down
-            ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
-            : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor
+        color: control.down ? control.palette.light : control.palette.window
         border.width: control.visualFocus ? 2 : 1
-        border.color: control.enabled ? (control.visualFocus
-            ? Default.focusColor
-            : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
+        border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight
 
         Behavior on x {
             enabled: !control.down
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index 13866a73..d95d7f39 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -63,5 +63,7 @@ T.TabBar {
         preferredHighlightEnd: width - 40
     }
 
-    background: Rectangle { }
+    background: Rectangle {
+        color: control.palette.window
+    }
 }
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index cd343262..964f4e1f 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -53,7 +53,7 @@ T.TabButton {
 
     icon.width: 24
     icon.height: 24
-    icon.color: Color.transparent(!checked ? Default.textLightColor : down ? Default.textDarkColor : Default.textColor, enabled ? 1 : 0.3)
+    icon.color: checked ? control.palette.windowText : control.palette.brightText
 
     contentItem: IconLabel {
         spacing: control.spacing
@@ -63,14 +63,12 @@ T.TabButton {
         icon: control.icon
         text: control.text
         font: control.font
-        color: Color.transparent(!control.checked ? Default.textLightColor : control.down ? Default.textDarkColor : Default.textColor,
-                                 enabled ? 1 : 0.3)
+        color: checked ? control.palette.windowText : control.palette.brightText
     }
 
     background: Rectangle {
         implicitHeight: 40
-        color: control.down
-            ? (control.checked ? Default.tabButtonCheckedPressedColor : Default.tabButtonPressedColor)
-            : (control.checked ? "transparent" : Default.tabButtonColor)
+        color: Color.blend(control.checked ? control.palette.window : control.palette.dark,
+                                             control.palette.mid, control.down ? 0.5 : 0.0)
     }
 }
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index af705c43..00a97957 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -65,7 +65,8 @@ T.TextArea {
 
         text: control.placeholderText
         font: control.font
-        color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor
+        opacity: 0.5
+        color: control.palette.text
         verticalAlignment: control.verticalAlignment
         visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
         elide: Text.ElideRight
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 7a8ffe45..333c5bba 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -66,7 +66,8 @@ T.TextField {
 
         text: control.placeholderText
         font: control.font
-        color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor
+        opacity: 0.5
+        color: control.palette.text
         verticalAlignment: control.verticalAlignment
         visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
         elide: Text.ElideRight
@@ -76,7 +77,7 @@ T.TextField {
         implicitWidth: 200
         implicitHeight: 40
         border.width: control.activeFocus ? 2 : 1
-        color: control.enabled ? Default.backgroundColor : Default.indicatorFrameDisabledColor
-        border.color: control.activeFocus ? Default.focusColor : (control.enabled ? Default.disabledLightColor : "transparent")
+        color: control.palette.base
+        border.color: control.activeFocus ? control.palette.highlight : control.palette.mid
     }
 }
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml
index ea7274a9..ba6684b9 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/ToolBar.qml
@@ -50,6 +50,6 @@ T.ToolBar {
 
     background: Rectangle {
         implicitHeight: 40
-        color: Default.delegateColor
+        color: control.palette.button
     }
 }
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index abe0a225..371d1546 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -53,7 +53,7 @@ T.ToolButton {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? (visualFocus ? Default.focusColor : Default.textDarkColor) : Default.textDisabledLightColor
+    icon.color: visualFocus ? control.palette.highlight : control.palette.buttonText
 
     contentItem: IconLabel {
         spacing: control.spacing
@@ -63,15 +63,14 @@ T.ToolButton {
         icon: control.icon
         text: control.text
         font: control.font
-        color: control.enabled ? (control.visualFocus ? Default.focusColor : Default.textDarkColor) : Default.textDisabledLightColor
+        color: control.visualFocus ? control.palette.highlight : control.palette.buttonText
     }
 
     background: Rectangle {
         implicitWidth: 40
         implicitHeight: 40
 
-        color: Qt.darker(Default.toolButtonColor, control.enabled && (control.checked || control.highlighted) ? 1.5 : 1.0)
-        opacity: control.down ? 1.0 : control.enabled && (control.checked || control.highlighted) ? 0.5 : 0
-        visible: control.down || (control.enabled && (control.checked || control.highlighted))
+        opacity: control.down ? 1.0 : 0.5
+        color: control.down || control.checked || control.highlighted ? control.palette.mid : control.palette.button
     }
 }
diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/ToolSeparator.qml
index 36e6286f..306ca575 100644
--- a/src/imports/controls/ToolSeparator.qml
+++ b/src/imports/controls/ToolSeparator.qml
@@ -52,6 +52,6 @@ T.ToolSeparator {
     contentItem: Rectangle {
         implicitWidth: vertical ? 1 : 30
         implicitHeight: vertical ? 30 : 1
-        color: Default.separatorColor
+        color: control.palette.mid
     }
 }
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-styles.png b/src/imports/controls/doc/images/qtquickcontrols2-styles.png
index aae046fd..39626e50 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-styles.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-styles.png
diff --git a/src/imports/controls/imagine/design/imagine.sketch b/src/imports/controls/imagine/design/imagine.sketch
new file mode 100644
index 00000000..eab0877b
--- /dev/null
+++ b/src/imports/controls/imagine/design/imagine.sketch
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index d5bdfefe..eba8e74e 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -70,14 +70,11 @@ Module {
         isSingleton: true
         exportMetaObjectRevisions: [0]
         Property { name: "backgroundColor"; type: "QColor"; isReadonly: true }
-        Property { name: "overlayModalColor"; type: "QColor"; isReadonly: true }
-        Property { name: "overlayDimColor"; type: "QColor"; isReadonly: true }
         Property { name: "textColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDarkColor"; type: "QColor"; isReadonly: true }
         Property { name: "textLightColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDisabledColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDisabledLightColor"; type: "QColor"; isReadonly: true }
-        Property { name: "focusColor"; type: "QColor"; isReadonly: true }
         Property { name: "focusLightColor"; type: "QColor"; isReadonly: true }
         Property { name: "focusPressedColor"; type: "QColor"; isReadonly: true }
         Property { name: "buttonColor"; type: "QColor"; isReadonly: true }
@@ -101,7 +98,6 @@ Module {
         Property { name: "frameLightColor"; type: "QColor"; isReadonly: true }
         Property { name: "scrollBarColor"; type: "QColor"; isReadonly: true }
         Property { name: "scrollBarPressedColor"; type: "QColor"; isReadonly: true }
-        Property { name: "separatorColor"; type: "QColor"; isReadonly: true }
         Property { name: "disabledDarkColor"; type: "QColor"; isReadonly: true }
         Property { name: "disabledLightColor"; type: "QColor"; isReadonly: true }
     }
diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp
index 3f91eb58..15c59798 100644
--- a/src/imports/controls/qquickdefaultstyle.cpp
+++ b/src/imports/controls/qquickdefaultstyle.cpp
@@ -73,6 +73,16 @@ QColor QQuickDefaultStyle::textLightColor() const
     return QColor::fromRgba(0xFFFFFFFF);
 }
 
+QColor QQuickDefaultStyle::textLinkColor() const
+{
+    return QColor::fromRgba(0xFF45A7D7);
+}
+
+QColor QQuickDefaultStyle::textSelectionColor() const
+{
+    return QColor::fromRgba(0xFFFDDD5C);
+}
+
 QColor QQuickDefaultStyle::textDisabledColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
@@ -208,6 +218,16 @@ QColor QQuickDefaultStyle::scrollBarPressedColor() const
     return QColor::fromRgba(0xFF28282A);
 }
 
+QColor QQuickDefaultStyle::progressBarColor() const
+{
+    return QColor::fromRgba(0xFFE4E4E4);
+}
+
+QColor QQuickDefaultStyle::pageIndicatorColor() const
+{
+    return QColor::fromRgba(0xFF28282A);
+}
+
 QColor QQuickDefaultStyle::separatorColor() const
 {
     return QColor::fromRgba(0xFFCCCCCC);
diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h
index e2f9bf4a..fcd489a0 100644
--- a/src/imports/controls/qquickdefaultstyle_p.h
+++ b/src/imports/controls/qquickdefaultstyle_p.h
@@ -62,6 +62,8 @@ class QQuickDefaultStyle : public QObject
     Q_PROPERTY(QColor textColor READ textColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDarkColor READ textDarkColor CONSTANT FINAL)
     Q_PROPERTY(QColor textLightColor READ textLightColor CONSTANT FINAL)
+    Q_PROPERTY(QColor textLinkColor READ textLinkColor CONSTANT FINAL)
+    Q_PROPERTY(QColor textSelectionColor READ textSelectionColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDisabledColor READ textDisabledColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDisabledLightColor READ textDisabledLightColor CONSTANT FINAL)
     Q_PROPERTY(QColor textPlaceholderColor READ textPlaceholderColor CONSTANT FINAL)
@@ -89,6 +91,8 @@ class QQuickDefaultStyle : public QObject
     Q_PROPERTY(QColor frameLightColor READ frameLightColor CONSTANT FINAL)
     Q_PROPERTY(QColor scrollBarColor READ scrollBarColor CONSTANT FINAL)
     Q_PROPERTY(QColor scrollBarPressedColor READ scrollBarPressedColor CONSTANT FINAL)
+    Q_PROPERTY(QColor progressBarColor READ progressBarColor CONSTANT FINAL)
+    Q_PROPERTY(QColor pageIndicatorColor READ pageIndicatorColor CONSTANT FINAL)
     Q_PROPERTY(QColor separatorColor READ separatorColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL)
@@ -131,6 +135,8 @@ public:
     QColor frameLightColor() const;
     QColor scrollBarColor() const;
     QColor scrollBarPressedColor() const;
+    QColor progressBarColor() const;
+    QColor pageIndicatorColor() const;
     QColor separatorColor() const;
     QColor disabledDarkColor() const;
     QColor disabledLightColor() const;
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp
index 60d76556..f4b6f5d7 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/qquickdefaulttheme.cpp
@@ -41,6 +41,11 @@ QT_BEGIN_NAMESPACE
 QQuickDefaultTheme::QQuickDefaultTheme()
     : QQuickTheme(QStringLiteral("Default"))
 {
+    systemPalette.setColor(QPalette::Base, QColor::fromRgba(0xFFFFFFFF));
+    systemPalette.setColor(QPalette::Disabled, QPalette::Base, QColor::fromRgba(0xFFD6D6D6));
+
+    systemPalette.setColor(QPalette::Button, QColor::fromRgba(0xFFE0E0E0));
+
     systemPalette.setColor(QPalette::ButtonText, QColor::fromRgba(0xFF26282A));
     systemPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgba(0x4D26282A));
 
@@ -54,16 +59,24 @@ QQuickDefaultTheme::QQuickDefaultTheme()
 
     systemPalette.setColor(QPalette::HighlightedText, QColor::fromRgba(0xFFFFFFFF));
 
-    systemPalette.setColor(QPalette::Light, QColor::fromRgba(0xFFE4E4E4));
+    systemPalette.setColor(QPalette::Light, QColor::fromRgba(0xFFF6F6F6));
 
     systemPalette.setColor(QPalette::Link, QColor::fromRgba(0xFF45A7D7));
 
+    systemPalette.setColor(QPalette::Mid, QColor::fromRgba(0xFFBDBDBD));
+
+    systemPalette.setColor(QPalette::Midlight, QColor::fromRgba(0xFFE4E4E4));
+
     systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637));
-    systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2));
+    systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0x7F353637));
+
+    systemPalette.setColor(QPalette::Shadow, QColor::fromRgba(0xFF28282A));
 
     systemPalette.setColor(QPalette::ToolTipBase, QColor::fromRgba(0xFFFFFFFF));
     systemPalette.setColor(QPalette::ToolTipText, QColor::fromRgba(0xFF000000));
 
+    systemPalette.setColor(QPalette::Window, QColor::fromRgba(0xFFFFFFFF));
+
     systemPalette.setColor(QPalette::WindowText, QColor::fromRgba(0xFF26282A));
     systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgba(0xFFBDBEBF));