diff --git a/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt b/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt
index a60a3a293..ab05af735 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt
@@ -32,6 +32,8 @@ val LightPink = Color(0xFFFFE6E6)
 val LightGreen = Color(0xFFCFE8A9)
 val LightRed = Color(0xFFFFB3B3)
 
+val Black = Color(0x000000)
+
 val MeshtasticGreen = Color(0xFF67EA94)
 
 val HyperlinkBlue = Color(0xFF43C3B0)
diff --git a/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt b/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt
index f92940895..4258b8385 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt
@@ -22,6 +22,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.darkColors
 import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
 
 private val DarkColorPalette = darkColors(
     primary = MeshtasticGreen,
@@ -33,6 +34,7 @@ private val LightColorPalette = lightColors(
     primary = MeshtasticGreen,
     primaryVariant = LightSkyBlue,
     secondary = Teal200,
+    onPrimary = Color.Black
 
     /* Other default colors to override
     background = Color.White,
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b4826228f..143290068 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,7 +17,7 @@
 -->
 
 <resources>
-    <color name="colorOnPrimary">#FFFFFF</color>
+    <color name="colorOnPrimary">#000000</color>
     <color name="colorPrimary">#67EA94</color>
     <color name="colorPrimaryDark">#67EA94</color>
     <color name="colorMsg">#F2F2F2</color>
@@ -30,5 +30,5 @@
     <color name="colourGrey">#535353</color>
     <color name="colorAnnotation">#0288D1</color>
     <color name="toolbarBackground">#67EA94</color>
-    <color name="toolbarText">#FFFFFF</color>
+    <color name="toolbarText">#000000</color>
 </resources>