diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml
index 6217d70a..ef66e05a 100644
--- a/resources/qml/Avatar.qml
+++ b/resources/qml/Avatar.qml
@@ -25,7 +25,7 @@ AbstractButton {
     background: Rectangle {
         id: bg
 
-        color: palette.alternateBase
+        color: palette.dark
         radius: Settings.avatarCircles ? height / 2 : height / 8
     }
 
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index 8b6af57a..c8394937 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -20,7 +20,7 @@ Rectangle {
     Layout.fillWidth: true
     Layout.minimumHeight: 40
     Layout.preferredHeight: row.implicitHeight
-    color: palette.window
+    color: palette.base
 
     Component {
         id: placeCallDialog
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index 350b3846..e1becea5 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -37,7 +37,7 @@ Page {
             verticalPadding: 0
 
             background: Rectangle {
-                color: palette.window
+                color: palette.base
             }
             contentItem: RowLayout {
                 id: buttonRow
@@ -456,7 +456,7 @@ Page {
             required property string directChatOtherUserId
             required property bool hasLoudNotification
             required property bool hasUnreadMessages
-            property color importantText: palette.text
+            property color importantText: palette.brightText
             required property bool isDirect
             required property bool isInvite
             required property bool isSpace
@@ -466,7 +466,7 @@ Page {
             required property string roomName
             required property var tags
             required property string time
-            property color unimportantText: palette.buttonText
+            property color unimportantText: palette.text
 
             ToolTip.delay: Nheko.tooltipDelay
             ToolTip.text: roomName
diff --git a/resources/qml/TimelineSectionHeader.qml b/resources/qml/TimelineSectionHeader.qml
index 4ae4f286..cf350439 100644
--- a/resources/qml/TimelineSectionHeader.qml
+++ b/resources/qml/TimelineSectionHeader.qml
@@ -33,7 +33,7 @@ Column {
         id: dateBubble
 
         anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
-        color: palette.text
+        color: palette.brightText
         height: Math.round(fontMetrics.height * 1.4)
         horizontalAlignment: Text.AlignHCenter
         text: room ? room.formatDateSeparator(timestamp) : ""
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 53b1951c..bbb88f2b 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -97,7 +97,7 @@ Item {
 
             Layout.fillHeight: true
             Layout.fillWidth: true
-            color: palette.base
+            color: palette.window
 
             ColumnLayout {
                 anchors.fill: parent
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml
index 281f60d5..ee858263 100644
--- a/resources/qml/TopBar.qml
+++ b/resources/qml/TopBar.qml
@@ -31,7 +31,7 @@ Pane {
     z: 3
 
     background: Rectangle {
-        color: palette.window
+        color: palette.base
     }
     contentItem: Item {
         GridLayout {
@@ -86,7 +86,7 @@ Pane {
                 Layout.rowSpan: 2
                 ToolTip.text: qsTr("Back to room list")
                 ToolTip.visible: hovered
-                image: ":/icons/icons/ui/angle-arrow-left.svg"
+                image: ":/icons/icons/ui/angle-arrow-left.svg?" + palette.light
                 visible: showBackButton
 
                 onClicked: Rooms.resetCurrentRoom()
@@ -108,7 +108,7 @@ Pane {
                 Layout.column: 2
                 Layout.fillWidth: true
                 Layout.row: 1
-                color: palette.text
+                color: palette.brightText
                 elide: Text.ElideRight
                 font.bold: true
                 font.pointSize: fontMetrics.font.pointSize * 1.1
@@ -126,9 +126,9 @@ Pane {
                 clip: true
                 enabled: false
                 // don't use the disabled color
-                color: topBar.palette.text
+                color: topBar.palette.brightText
                 selectByMouse: false
-                text: roomTopic
+                text: "<style type=\"text/css\">a { font-weight: bold; color:" + topBar.palette.brightText + ";}</style>" + roomTopic
             }
             ImageButton {
                 id: pinButton
@@ -232,7 +232,7 @@ Pane {
                 Layout.rowSpan: 2
                 ToolTip.text: qsTr("Room options")
                 ToolTip.visible: hovered
-                image: ":/icons/icons/ui/options.svg"
+                image: ":/icons/icons/ui/options.svg?" + palette.light
                 visible: !!room
 
                 onClicked: roomOptionsMenu.open(roomOptionsButton)
diff --git a/resources/qml/TypingIndicator.qml b/resources/qml/TypingIndicator.qml
index c681a2f9..cda87595 100644
--- a/resources/qml/TypingIndicator.qml
+++ b/resources/qml/TypingIndicator.qml
@@ -14,7 +14,7 @@ Item {
         id: typingRect
 
         anchors.fill: parent
-        color: palette.base
+        color: palette.dark
         visible: (room && room.typingUsers.length > 0)
         z: 3
 
@@ -26,7 +26,7 @@ Item {
             anchors.leftMargin: 10
             anchors.right: parent.right
             anchors.rightMargin: 10
-            color: palette.text
+            color: palette.brightText
             text: room ? room.formatTypingUsers(room.typingUsers, palette.base) : ""
             textFormat: Text.RichText
         }
diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml
index 3f31e7ed..b2845dbe 100644
--- a/resources/qml/delegates/FileMessage.qml
+++ b/resources/qml/delegates/FileMessage.qml
@@ -30,7 +30,7 @@ Control {
         Rectangle {
             id: button
 
-            color: palette.light
+            color: palette.base
             radius: 22
             Layout.preferredHeight: 44
             Layout.preferredWidth: 44
@@ -44,7 +44,7 @@ Control {
                 sourceSize.width: 40
 
                 anchors.centerIn: parent
-                source: "qrc:/icons/icons/ui/download.svg"
+                source: "qrc:/icons/icons/ui/download.svg?"+Nheko.colors.brightText
                 fillMode: Image.Pad
             }
 
@@ -71,7 +71,7 @@ Control {
                 text: evRoot.filename
                 textFormat: Text.PlainText
                 elide: Text.ElideRight
-                color: palette.text
+                color: palette.brightText
             }
 
             Text {
@@ -82,7 +82,7 @@ Control {
                 text: evRoot.filesize
                 textFormat: Text.PlainText
                 elide: Text.ElideRight
-                color: palette.text
+                color: palette.brightText
             }
 
         }
@@ -90,7 +90,7 @@ Control {
     }
 
     background: Rectangle {
-        color: palette.alternateBase
+        color: palette.base
         radius: fontMetrics.lineSpacing / 2 + 2 * Nheko.paddingSmall
         visible: !Settings.bubbles // the bubble in a bubble looks odd
     }
diff --git a/resources/qml/delegates/NoticeMessage.qml b/resources/qml/delegates/NoticeMessage.qml
index 88efe7b7..81f531b7 100644
--- a/resources/qml/delegates/NoticeMessage.qml
+++ b/resources/qml/delegates/NoticeMessage.qml
@@ -9,7 +9,7 @@ import im.nheko 1.0
 TextMessage {
     property bool isStateEvent
     font.italic: true
-    color: palette.buttonText
+    color: palette.text
     font.pointSize: isStateEvent? 0.8*Settings.fontSize : Settings.fontSize
     horizontalAlignment: isStateEvent? Text.AlignHCenter : undefined
 }
diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml
index c9ca1ed3..6b10c5b8 100644
--- a/resources/qml/delegates/Pill.qml
+++ b/resources/qml/delegates/Pill.qml
@@ -7,14 +7,14 @@ import QtQuick.Controls 2.1
 
 Label {
     property bool isStateEvent
-    color: palette.text
+    color: palette.brightText
     horizontalAlignment: Text.AlignHCenter
     height: Math.round(fontMetrics.height * 1.4)
     width: contentWidth * 1.2
 
     background: Rectangle {
         radius: parent.height / 2
-        color: palette.alternateBase
+        color: palette.base
     }
 
 }
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index e948df02..3011836d 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -47,7 +47,7 @@ Item {
     Rectangle {
         id: videoContainer
 
-        color: content.type == MtxEvent.VideoMessage ? palette.window : "transparent"
+        color: content.type == MtxEvent.VideoMessage ? palette.dark : "transparent"
         width: parent.width
         height: parent.height - fileInfoLabel.height
 
@@ -98,8 +98,10 @@ Item {
         anchors.top: videoContainer.bottom
         text: content.body + " [" + filesize + "]"
         textFormat: Text.RichText
+        leftPadding: Nheko.paddingSmall * 2
+        verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight
-        color: palette.text
+        color: palette.brightText
 
         background: Rectangle {
             color: palette.base
diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
index f0884a06..350062e8 100644
--- a/resources/qml/delegates/Reply.qml
+++ b/resources/qml/delegates/Reply.qml
@@ -101,7 +101,7 @@ AbstractButton {
 
         z: -1
         property color userColor: TimelineManager.userColor(r.userId, palette.base)
-        property color bgColor: palette.base
+        property color bgColor: palette.dark
         color: Qt.tint(bgColor, Qt.hsla(userColor.hslHue, 0.5, userColor.hslLightness, 0.1))
     }
 
diff --git a/resources/qml/delegates/TextMessage.qml b/resources/qml/delegates/TextMessage.qml
index 3625aea1..ce4d05db 100644
--- a/resources/qml/delegates/TextMessage.qml
+++ b/resources/qml/delegates/TextMessage.qml
@@ -19,8 +19,8 @@ MatrixText {
     // table border-collapse doesn't seem to work
     text: `
     <style type="text/css">
-    code { background-color: ` + palette.alternateBase + `; white-space: pre-wrap; }
-    pre { background-color: ` + palette.alternateBase + `; white-space: pre-wrap; }
+    code { background-color: ` + palette.dark + `; white-space: pre-wrap; }
+    pre { background-color: ` + palette.dark + `; white-space: pre-wrap; }
     table {
         border-width: 1px;
         border-collapse: collapse;
diff --git a/resources/qml/ui/media/MediaControls.qml b/resources/qml/ui/media/MediaControls.qml
index f4373908..4a792a3a 100644
--- a/resources/qml/ui/media/MediaControls.qml
+++ b/resources/qml/ui/media/MediaControls.qml
@@ -50,7 +50,7 @@ Rectangle {
     }
 
     color: {
-        var wc = palette.alternateBase;
+        var wc = palette.base;
         return Qt.rgba(wc.r, wc.g, wc.b, 0.5);
     }
     opacity: control.shouldShowControls ? 1 : 0
@@ -95,7 +95,7 @@ Rectangle {
                 id: playbackStateImage
 
                 Layout.alignment: Qt.AlignLeft
-                buttonTextColor: palette.text
+                buttonTextColor: palette.brightText
                 Layout.preferredHeight: 24
                 Layout.preferredWidth: 24
                 image: {
@@ -115,7 +115,7 @@ Rectangle {
                 id: volumeButton
 
                 Layout.alignment: Qt.AlignLeft
-                buttonTextColor: palette.text
+                buttonTextColor: palette.brightText
                 Layout.preferredHeight: 24
                 Layout.preferredWidth: 24
                 image: {
@@ -204,7 +204,7 @@ Rectangle {
             Label {
                 Layout.alignment: Qt.AlignRight
                 text: (!control.mediaLoaded ? "-- " : durationToString(control.positionValue)) + " / " + durationToString(control.duration)
-                color: palette.text
+                color: palette.brightText
             }
 
         }