3 files changed, 65 insertions, 83 deletions

diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index d4dca17c..b203ad22 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -129,7 +129,7 @@ UserInfoWidget, UserInfoWidget > * {
 
 UserInfoWidget {
     border: none;
-    qproperty-borderColor: #202228;
+    border-bottom: 1px solid #202228;
 }
 
 UserSettingsPage {
@@ -214,13 +214,13 @@ ScrollBar {
 
 SideBarActions {
     border: none;
-    qproperty-borderColor: #202228;
+    border-top: 1px solid #202228;
     background-color: #2d3139;
 }
 
 TopRoomBar {
     border: none;
-    qproperty-borderColor: #202228;
+    border-bottom: 1px solid #202228;
     background-color: #2d3139;
 }
 
@@ -229,10 +229,14 @@ QLineEdit {
     color: #caccd1;
 }
 
+TextInputWidget {
+    border: none;
+    border-top: 1px solid #2d3139;
+}
+
 TextInputWidget,
 TextInputWidget > QTextEdit,
 TextInputWidget > QLineEdit {
-    qproperty-borderColor: #202228;
     background-color: #2d3139;
     color: #caccd1;
 }
diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
index ef659b82..3ebf8415 100644
--- a/resources/styles/nheko.qss
+++ b/resources/styles/nheko.qss
@@ -130,7 +130,7 @@ UserInfoWidget, UserInfoWidget > * {
 
 UserInfoWidget {
     border: none;
-    qproperty-borderColor: #dcdcdc;
+    border-bottom: 1px solid #dcdcdc;
 }
 
 UserSettingsPage {
@@ -206,7 +206,8 @@ TextField {
 }
 
 TextInputWidget {
-    qproperty-borderColor: #dcdcdc;
+    border: none;
+    border-top: 1px solid #dcdcdc;
 }
 
 ScrollBar {
@@ -216,12 +217,12 @@ ScrollBar {
 
 SideBarActions {
     border: none;
-    qproperty-borderColor: #dcdcdc;
+    border-top: 1px solid #dcdcdc;
 }
 
 TopRoomBar {
     border: none;
-    qproperty-borderColor: #dcdcdc;
+    border-bottom: 1px solid #dcdcdc;
 }
 
 Toggle {
diff --git a/resources/styles/system.qss b/resources/styles/system.qss
index 9df3f1a7..4348d6e7 100644
--- a/resources/styles/system.qss
+++ b/resources/styles/system.qss
@@ -1,53 +1,52 @@
-OverlayWidget,
-OverlayWidget > * {
-    background-color: palette(window);
+TypingDisplay {
+    qproperty-textColor: palette(text);
+    qproperty-backgroundColor: palette(window);
 }
 
-#mainContent,
-#mainContent > * {
-    background-color: palette(window);
+TimelineView,
+TimelineView > * {
+    border: none;
 }
 
-#sideBar {
+TextInputWidget {
     border: none;
-    border-right: 1px solid palette(text);
-    border-left: 1px solid palette(text);
+    border-top: 1px solid palette(mid);
+}
+
+SideBarActions {
+    border: none;
+    border-top: 1px solid palette(mid);
 }
 
 TopRoomBar {
-    qproperty-borderColor: palette(text);
     border: none;
+    border-bottom: 1px solid palette(mid);
 }
 
-TimelineView,
-TimelineView > *,
-TimelineItem,
-TimelineItem > * {
+RoomList,
+RoomList > * {
     background-color: palette(window);
     border: none;
 }
 
-QuickSwitcher {
-    background-color: palette(window);
+UserInfoWidget {
+    border: none;
+    border-bottom: 1px solid palette(mid);
 }
 
-TypingDisplay {
-    qproperty-textColor: palette(text);
-    qproperty-backgroundColor: palette(window);
+#sideBar {
+    border: none;
+    border-right: 1px solid palette(mid);
+    border-left: 1px solid palette(mid);
 }
 
 InfoMessage {
     qproperty-textColor: palette(text);
-    qproperty-boxColor: palette(window);
-}
-
-SuggestionsPopup {
-    background-color: palette(window);
+    qproperty-boxColor: palette(base);
 }
 
 PopupItem {
-    background-color: palette(window);
-    qproperty-hoverColor: rgba(192, 193, 195, 120);
+    qproperty-hoverColor: palette(base);
 }
 
 FlatButton {
@@ -74,47 +73,44 @@ TextField {
     qproperty-backgroundColor: palette(window);
 }
 
-WelcomePage,
-LoginPage,
-RegisterPage {
+QTextEdit,
+ReceiptItem,
+MemberItem,
+QLineEdit,
+QListWidget {
     background-color: palette(window);
 }
 
-RoomList,
-RoomList > * {
-    border: none;
-}
-
 RoomInfoListItem {
     qproperty-highlightedBackgroundColor: palette(highlight);
-    qproperty-hoverBackgroundColor: palette(light);
+    qproperty-hoverBackgroundColor: palette(base);
     qproperty-backgroundColor: palette(window);
 
     qproperty-titleColor: palette(text);
     qproperty-subtitleColor: palette(text);
 
-    qproperty-highlightedTitleColor: palette(light);
-    qproperty-highlightedSubtitleColor: palette(light);
+    qproperty-highlightedTitleColor: palette(highlightedtext);
+    qproperty-highlightedSubtitleColor: palette(highlightedtext);
 
-    qproperty-btnColor: palette(mid);
-    qproperty-btnTextColor: palette(text);
+    qproperty-btnColor: palette(button);
+    qproperty-btnTextColor: palette(buttonText);
 
     qproperty-timestampColor: palette(text);
-    qproperty-highlightedTimestampColor: palette(light);
+    qproperty-highlightedTimestampColor: palette(highlightedtext);
 
-    qproperty-avatarBgColor: palette(mid);
+    qproperty-avatarBgColor: palette(base);
     qproperty-avatarFgColor: palette(text);
 
+    qproperty-bubbleBgColor: palette(base);
     qproperty-bubbleFgColor: palette(text);
-    qproperty-bubbleBgColor: palette(mid);
 }
 
 CommunitiesListItem {
     qproperty-highlightedBackgroundColor: palette(highlight);
-    qproperty-hoverBackgroundColor: palette(light);
+    qproperty-hoverBackgroundColor: palette(base);
     qproperty-backgroundColor: palette(window);
 
-    qproperty-avatarBgColor: palette(mid);
+    qproperty-avatarBgColor: palette(base);
     qproperty-avatarFgColor: palette(text);
 }
 
@@ -126,42 +122,23 @@ LoadingIndicator {
     qproperty-color: palette(light);
 }
 
-UserInfoWidget,
-UserInfoWidget > * {
-    background-color: palette(window);
-}
-
-emoji--Category,
-emoji--Category > * {
-    background-color: palette(window);
-}
-
-emoji--Panel,
-emoji--Panel > * {
-    background-color: palette(window);
-}
-
-QTextEdit,
-QLineEdit {
-    background-color: palette(window);
-}
-
-ScrollBar {
-    qproperty-handleColor: palette(text);
-    qproperty-backgroundColor: palette(window);
-}
-
 FloatingButton {
-    qproperty-backgroundColor: palette(window);
+    qproperty-backgroundColor: palette(base);
     qproperty-foregroundColor: palette(text);
 }
 
-QListWidget {
-    background-color: palette(window);
-    color: palette(text);
-}
-
 SnackBar {
     qproperty-textColor: palette(text);
     qproperty-bgColor: palette(base);
 }
+
+MemberItem {
+    background-color: palette(window);
+}
+
+Toggle {
+    qproperty-activeColor: palette(highlight);
+    qproperty-disabledColor: palette(dark);
+    qproperty-inactiveColor: palette(mid);
+    qproperty-trackColor: palette(base);
+}