7 files changed, 27 insertions, 27 deletions
diff --git a/resources/qml/components/AvatarListTile.qml b/resources/qml/components/AvatarListTile.qml
index 02c92a09..dad20e52 100644
--- a/resources/qml/components/AvatarListTile.qml
+++ b/resources/qml/components/AvatarListTile.qml
@@ -11,11 +11,11 @@ import im.nheko 1.0
 Rectangle {
     id: tile
 
-    property color background: Nheko.colors.window
-    property color importantText: Nheko.colors.text
-    property color unimportantText: Nheko.colors.buttonText
-    property color bubbleBackground: Nheko.colors.highlight
-    property color bubbleText: Nheko.colors.highlightedText
+    property color background: palette.window
+    property color importantText: palette.text
+    property color unimportantText: palette.buttonText
+    property color bubbleBackground: palette.highlight
+    property color bubbleText: palette.highlightedText
     property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 2.3)
     required property string avatarUrl
     required property string title
@@ -37,11 +37,11 @@ Rectangle {
 
             PropertyChanges {
                 target: tile
-                background: Nheko.colors.dark
-                importantText: Nheko.colors.brightText
-                unimportantText: Nheko.colors.brightText
-                bubbleBackground: Nheko.colors.highlight
-                bubbleText: Nheko.colors.highlightedText
+                background: palette.dark
+                importantText: palette.brightText
+                unimportantText: palette.brightText
+                bubbleBackground: palette.highlight
+                bubbleText: palette.highlightedText
             }
 
         },
@@ -51,11 +51,11 @@ Rectangle {
 
             PropertyChanges {
                 target: tile
-                background: Nheko.colors.highlight
-                importantText: Nheko.colors.highlightedText
-                unimportantText: Nheko.colors.highlightedText
-                bubbleBackground: Nheko.colors.highlightedText
-                bubbleText: Nheko.colors.highlight
+                background: palette.highlight
+                importantText: palette.highlightedText
+                unimportantText: palette.highlightedText
+                bubbleBackground: palette.highlightedText
+                bubbleText: palette.highlight
             }
 
         }
diff --git a/resources/qml/components/FlatButton.qml b/resources/qml/components/FlatButton.qml
index a3dedf35..0636bc04 100644
--- a/resources/qml/components/FlatButton.qml
+++ b/resources/qml/components/FlatButton.qml
@@ -47,7 +47,7 @@ Button {
             font.capitalization: Font.AllUppercase
             font.pointSize: Math.ceil(fontMetrics.font.pointSize * 1.5)
             //font.capitalization: Font.AllUppercase
-            color: Nheko.colors.light
+            color: palette.light
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             elide: Text.ElideRight
@@ -58,7 +58,7 @@ Button {
         //height: control.contentItem.implicitHeight * 2
         //width: control.contentItem.implicitWidth * 2
         radius: height / 8
-        color: Qt.lighter(Nheko.colors.dark, control.down ? 1.4 : (control.hovered ? 1.2 : 1))
+        color: Qt.lighter(palette.dark, control.down ? 1.4 : (control.hovered ? 1.2 : 1))
     }
 
 }
diff --git a/resources/qml/components/MainWindowDialog.qml b/resources/qml/components/MainWindowDialog.qml
index 1b063e0f..10c07aae 100644
--- a/resources/qml/components/MainWindowDialog.qml
+++ b/resources/qml/components/MainWindowDialog.qml
@@ -32,7 +32,7 @@ Dialog {
     ]
 
     background: Rectangle {
-        color: Nheko.colors.window
+        color: palette.window
         border.color: Nheko.theme.separator
         border.width: 1
         radius: Nheko.paddingSmall
diff --git a/resources/qml/components/NhekoTabButton.qml b/resources/qml/components/NhekoTabButton.qml
index 13549068..796177e8 100644
--- a/resources/qml/components/NhekoTabButton.qml
+++ b/resources/qml/components/NhekoTabButton.qml
@@ -13,15 +13,15 @@ TabButton {
         text: control.text
         font: control.font
         opacity: enabled ? 1.0 : 0.3
-        color: control.down ? Nheko.colors.highlightedText : Nheko.colors.text
+        color: control.down ? palette.highlightedText : palette.text
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight
     }
 
     background: Rectangle {
-        border.color: control.down ? Nheko.colors.highlight : Nheko.theme.separator
-        color: control.checked ? Nheko.colors.highlight : Nheko.colors.base
+        border.color: control.down ? palette.highlight : Nheko.theme.separator
+        color: control.checked ? palette.highlight : palette.base
         border.width: 1
         radius: 2
     }
diff --git a/resources/qml/components/ReorderableListview.qml b/resources/qml/components/ReorderableListview.qml
index 137e92f8..4e67082e 100644
--- a/resources/qml/components/ReorderableListview.qml
+++ b/resources/qml/components/ReorderableListview.qml
@@ -47,9 +47,9 @@ Item {
                 width: dragArea.width; height: actualDelegate.implicitHeight + 4
 
                 border.width: dragArea.enabled ? 1 : 0
-                border.color: Nheko.colors.highlight
+                border.color: palette.highlight
 
-                color: dragArea.held ? Nheko.colors.highlight : Nheko.colors.base
+                color: dragArea.held ? palette.highlight : palette.base
                 Behavior on color { ColorAnimation { duration: 100 } }
 
                 radius: 2
diff --git a/resources/qml/components/TextButton.qml b/resources/qml/components/TextButton.qml
index a48aee2b..0b1ac270 100644
--- a/resources/qml/components/TextButton.qml
+++ b/resources/qml/components/TextButton.qml
@@ -11,8 +11,8 @@ AbstractButton {
     id: button
 
     property alias cursor: mouseArea.cursorShape
-    property color highlightColor: Nheko.colors.highlight
-    property color buttonTextColor: Nheko.colors.buttonText
+    property color highlightColor: palette.highlight
+    property color buttonTextColor: palette.buttonText
 
     focusPolicy: Qt.NoFocus
     width: buttonText.implicitWidth
diff --git a/resources/qml/components/UserListRow.qml b/resources/qml/components/UserListRow.qml
index 316baab0..2047f700 100644
--- a/resources/qml/components/UserListRow.qml
+++ b/resources/qml/components/UserListRow.qml
@@ -36,7 +36,7 @@ ItemDelegate {
         Label {
             Layout.fillWidth: true
             text: displayName
-            color: TimelineManager.userColor(userid, Nheko.colors.window)
+            color: TimelineManager.userColor(userid, palette.window)
             font.pointSize: fontMetrics.font.pointSize
         }
 
@@ -44,7 +44,7 @@ ItemDelegate {
             Layout.fillWidth: true
             Layout.alignment: Qt.AlignTop
             text: userid
-            color: Nheko.colors.buttonText
+            color: palette.buttonText
             font.pointSize: fontMetrics.font.pointSize * 0.9
         }
     }