diff --git a/gui/main.qml b/gui/main.qml
index ea0fa40..7d24c2e 100644
--- a/gui/main.qml
+++ b/gui/main.qml
@@ -185,6 +185,13 @@ ApplicationWindow {
                     text: modelData.id || ""
                     highlighted: (modelData.id === ollie.activeSessionId)
                     onClicked: ollie.activeSessionId = modelData.id
+                    contentItem: Label {
+                        text: modelData.id || ""
+                        color: theme.textColor
+                        font.pointSize: theme.fontSize > 0 ? theme.fontSize : Qt.application.font.pointSize
+                        verticalAlignment: Text.AlignVCenter
+                        leftPadding: 8
+                    }
 
                     Rectangle {
                         width: 8; height: 8; radius: 4
@@ -235,7 +242,7 @@ ApplicationWindow {
                 }
             }
 
-            Rectangle { Layout.fillWidth: true; height: 1; color: palette.mid }
+            Rectangle { Layout.fillWidth: true; height: 1; color: theme.midColor }
 
             // Chat display — block-based ListView
             ScrollView {
@@ -276,14 +283,14 @@ ApplicationWindow {
                             radius: 3
                             color: {
                                 switch (blockType) {
-                                case "user":      return "#e3f2fd"
-                                case "assistant": return "#f3e5f5"
-                                case "reasoning": return "#fff3e0"
-                                case "call":      return "#e8f5e9"
-                                case "tool":      return "#fce4ec"
-                                case "error":     return "#ffebee"
-                                case "info":      return "#f5f5f5"
-                                default:          return "#fafafa"
+                                case "user":      return Qt.lighter(theme.highlightColor, 1.8)
+                                case "assistant": return Qt.lighter(theme.linkColor, 1.8)
+                                case "reasoning": return Qt.lighter(theme.midColor, 1.5)
+                                case "call":      return Qt.lighter(theme.buttonColor, 1.1)
+                                case "tool":      return Qt.lighter(theme.darkColor, 2.0)
+                                case "error":     return Qt.lighter("#e53935", 1.6)
+                                case "info":      return Qt.lighter(theme.midColor, 1.3)
+                                default:          return theme.baseColor
                                 }
                             }
 
@@ -307,7 +314,8 @@ ApplicationWindow {
                                     }
                                     font.pointSize: theme.fontSize > 0 ? theme.fontSize * 0.85 : 11
                                     font.bold: true
-                                    opacity: 0.8
+                                    color: theme.textColor
+                                    opacity: 0.9
                                 }
                             }
                         }
@@ -323,12 +331,13 @@ ApplicationWindow {
                             textFormat: Text.PlainText
                             font.family: theme.fontFamily || "monospace"
                             font.pointSize: theme.fontSize > 0 ? theme.fontSize : 12
+                            color: theme.textColor
                         }
                     }
                 }
             }
 
-            Rectangle { Layout.fillWidth: true; height: 1; color: palette.mid }
+            Rectangle { Layout.fillWidth: true; height: 1; color: theme.midColor }
 
             // Input
             RowLayout {