diff --git a/app/src/main/java/be/scri/services/GeneralKeyboardIME.kt b/app/src/main/java/be/scri/services/GeneralKeyboardIME.kt
index 1bef045e..19714f2e 100644
--- a/app/src/main/java/be/scri/services/GeneralKeyboardIME.kt
+++ b/app/src/main/java/be/scri/services/GeneralKeyboardIME.kt
@@ -153,13 +153,24 @@ abstract class GeneralKeyboardIME(
         setupCommandBarTheme(binding)
     }
 
-    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.setBackgroundColor(getColor(R.color.special_key_dark))
+            promptTextView?.setBackgroundColor(getColor(R.color.special_key_dark))
+            keyboardBinding.promptTextBorder?.setBackgroundColor(getColor(R.color.special_key_dark))
+        } else {
+            commandBarButton.setBackgroundColor(getColor(white))
+            promptTextView?.setBackgroundColor(getColor(white))
+            keyboardBinding.promptTextBorder?.setBackgroundColor(getColor(white))
+        }
+
         Log.d(
             "KeyboardUpdate",
             "CommandBar Hint Updated: [State: $currentState, Language: $language, Hint: $hintMessage]",
@@ -167,7 +178,20 @@ abstract class GeneralKeyboardIME(
     }
 
     private fun updateKeyboardMode(isCommandMode: Boolean = false) {
-        updateCommandBarHintandPrompt()
+        val sharedPref = getSharedPreferences("app_preferences", MODE_PRIVATE)
+        val currentNightMode = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+        val isSystemDarkMode = currentNightMode == Configuration.UI_MODE_NIGHT_YES
+        val isUserDarkMode = sharedPref.getBoolean("dark_mode", isSystemDarkMode)
+
+        if (isUserDarkMode) {
+            val color = ContextCompat.getColorStateList(this, R.color.light_key_color)
+            keyboardBinding.scribeKey.foregroundTintList = color
+        } else {
+            val colorLight = ContextCompat.getColorStateList(this, R.color.light_key_text_color)
+            keyboardBinding.scribeKey.foregroundTintList = colorLight
+        }
+
+        updateCommandBarHintandPrompt(isUserDarkMode)
         enterKeyType =
             if (isCommandMode) {
                 KeyboardBase.MyCustomActions.IME_ACTION_COMMAND
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>