diff --git a/app/src/main/java/be/scri/services/GeneralKeyboardIME.kt b/app/src/main/java/be/scri/services/GeneralKeyboardIME.kt
index bc630f78..683746d6 100644
--- a/app/src/main/java/be/scri/services/GeneralKeyboardIME.kt
+++ b/app/src/main/java/be/scri/services/GeneralKeyboardIME.kt
@@ -452,13 +452,30 @@ abstract class GeneralKeyboardIME(
      * This function is responsible for modifying the UI elements of the command bar
      * to provide appropriate hints and prompts to the user.
      */
-    private fun updateCommandBarHintAndPrompt() {
+    private fun updateCommandBarHintAndPrompt(isUserDarkMode: Boolean? = null) {
         val commandBarButton = keyboardBinding.commandBar
         val hintMessage = HintUtils.getCommandBarHint(currentState, language)
         val promptText = HintUtils.getPromptText(currentState, language)
         val promptTextView = keyboardBinding.promptText
         promptTextView.text = promptText
         commandBarButton.hint = hintMessage
+
+        if (isUserDarkMode == true) {
+            commandBarButton.setHintTextColor(getColor(R.color.hint_white))
+            commandBarButton.setTextColor(getColor(white))
+            commandBarButton.backgroundTintList = ContextCompat.getColorStateList(this, R.color.command_bar_color_dark)
+            promptTextView.setTextColor(getColor(white))
+            promptTextView.setBackgroundColor(getColor(R.color.command_bar_color_dark))
+            keyboardBinding.promptTextBorder.setBackgroundColor(getColor(R.color.command_bar_color_dark))
+        } else {
+            commandBarButton.setHintTextColor(getColor(R.color.hint_black))
+            commandBarButton.setTextColor(Color.BLACK)
+            commandBarButton.backgroundTintList = ContextCompat.getColorStateList(this, R.color.white)
+            promptTextView.setTextColor(Color.BLACK)
+            promptTextView.setBackgroundColor(getColor(white))
+            keyboardBinding.promptTextBorder.setBackgroundColor(getColor(white))
+        }
+
         Log.d(
             "KeyboardUpdate",
             "CommandBar Hint Updated: [State: $currentState, Language: $language, Hint: $hintMessage]",
@@ -524,10 +541,14 @@ abstract class GeneralKeyboardIME(
         when (isUserDarkMode) {
             true -> {
                 keyboardBinding.topKeyboardDivider.setBackgroundColor(getColor(R.color.special_key_dark))
+                val color = ContextCompat.getColorStateList(this, R.color.light_key_color)
+                keyboardBinding.scribeKey.foregroundTintList = color
             }
 
             false -> {
                 keyboardBinding.topKeyboardDivider.setBackgroundColor(getColor(R.color.special_key_light))
+                val colorLight = ContextCompat.getColorStateList(this, R.color.light_key_text_color)
+                keyboardBinding.scribeKey.foregroundTintList = colorLight
             }
         }
         handleModeChange(keyboardSymbols, keyboardView, this)
@@ -541,7 +562,7 @@ abstract class GeneralKeyboardIME(
             updateUI()
         }
         setInputView(keyboardHolder)
-        updateCommandBarHintAndPrompt()
+        updateCommandBarHintAndPrompt(isUserDarkMode)
     }
 
     /**
diff --git a/app/src/main/res/drawable/button_background_rounded.xml b/app/src/main/res/drawable/button_background_rounded.xml
index 36f4690e..25cf89d7 100644
--- a/app/src/main/res/drawable/button_background_rounded.xml
+++ b/app/src/main/res/drawable/button_background_rounded.xml
@@ -4,7 +4,7 @@
         <layer-list>
             <item android:id="@+id/button_background_shape">
                 <shape android:shape="rectangle">
-                    <solid android:color="@color/light_scribe_blue"/>
+                    <solid android:color="@color/color_primary"/>
                     <corners android:radius="12dp"/>
                 </shape>
             </item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bee80d87..8743f10a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,6 +16,7 @@
     <color name="transparent">@android:color/transparent</color>
     <color name="special_key_light">#aeb3be</color>
     <color name="special_key_dark">#202020</color>
+    <color name="command_bar_color_dark">#2E2E2E</color>
 
     <color name="nav_bar_selected_color_light">@color/dark_scribe_color</color>
     <color name="nav_bar_selected_color_dark">@color/light_scribe_color</color>