diff --git a/Modules/AudioWidget.qml b/Modules/AudioWidget.qml
index 62513fe..b81384c 100644
--- a/Modules/AudioWidget.qml
+++ b/Modules/AudioWidget.qml
@@ -13,7 +13,7 @@ Item {
     anchors.bottom: parent.bottom
 
     property bool expanded: false
-    property color textColor: DynamicColors.palette.m3primary
+    property color textColor: DynamicColors.palette.m3onSurface
     property color barColor: DynamicColors.palette.m3primary
 
     Behavior on implicitWidth {
diff --git a/Modules/Resources.qml b/Modules/Resources.qml
index b569ab3..053246b 100644
--- a/Modules/Resources.qml
+++ b/Modules/Resources.qml
@@ -40,7 +40,7 @@ Item {
                 Layout.alignment: Qt.AlignVCenter
                 font.pixelSize: 18
                 text: "memory_alt"
-                color: DynamicColors.palette.m3primary
+                color: DynamicColors.palette.m3onSurface
             }
 
             Resource {
@@ -53,7 +53,7 @@ Item {
                 Layout.alignment: Qt.AlignVCenter
                 font.pixelSize: 18
                 text: "memory"
-                color: DynamicColors.palette.m3secondary
+                color: DynamicColors.palette.m3onSurface
             }
 
             Resource {
@@ -66,7 +66,7 @@ Item {
                 Layout.alignment: Qt.AlignVCenter
                 font.pixelSize: 18
                 text: "gamepad"
-                color: DynamicColors.palette.m3tertiary
+                color: DynamicColors.palette.m3onSurface
             }
 
             Resource {
@@ -78,7 +78,7 @@ Item {
                 Layout.alignment: Qt.AlignVCenter
                 font.pixelSize: 18
                 text: "developer_board"
-                color: DynamicColors.palette.m3primary
+                color: DynamicColors.palette.m3onSurface
             }
 
             Resource {
diff --git a/cli/src/zshell/subcommands/scheme.py b/cli/src/zshell/subcommands/scheme.py
index 9f7d7dd..d30273a 100644
--- a/cli/src/zshell/subcommands/scheme.py
+++ b/cli/src/zshell/subcommands/scheme.py
@@ -168,7 +168,7 @@ def generate(
     try:
         if preset:
             # try local presets directory: presets/<preset>/<flavour>.txt or presets/<preset>-<flavour>.txt
-            base1 = Path("zshell") / "assets" / "schemes" / \
+            base1 = Path(__file__).parent.parent / "assets" / "schemes" / \
                 preset / flavour / f"{mode}.txt"
             if base1.exists():
                 preset_path = base1