diff --git a/Habitica/res/layout/task_form_checklist_item.xml b/Habitica/res/layout/task_form_checklist_item.xml
index ad92d5b6b..56225309a 100644
--- a/Habitica/res/layout/task_form_checklist_item.xml
+++ b/Habitica/res/layout/task_form_checklist_item.xml
@@ -28,6 +28,7 @@
         android:layout_weight="1"
         android:layout_height="wrap_content"
         android:background="@color/transparent"
+        android:textColorHint="?textColorTintedSecondary"
         android:hint="@string/new_checklist_item"
         android:textSize="14sp"/>
     <ImageView
diff --git a/Habitica/res/layout/task_form_reminder_item.xml b/Habitica/res/layout/task_form_reminder_item.xml
index fbfa7e8ca..a5663bd75 100644
--- a/Habitica/res/layout/task_form_reminder_item.xml
+++ b/Habitica/res/layout/task_form_reminder_item.xml
@@ -26,6 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/transparent"
+        android:textColor="?textColorTintedSecondary"
         android:text="@string/new_reminder"
         android:textSize="14sp"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/task_form_task_scheduling.xml b/Habitica/res/layout/task_form_task_scheduling.xml
index d872a42c8..3d057574c 100644
--- a/Habitica/res/layout/task_form_task_scheduling.xml
+++ b/Habitica/res/layout/task_form_task_scheduling.xml
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/start_date"
-            android:textColor="@color/text_quad"
+            android:textColor="?textColorTintedSecondary"
             android:textSize="12sp" />
         <TextView
             android:id="@+id/start_date_textview"
@@ -59,7 +59,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/repeats"
-                android:textColor="@color/text_quad"
+                android:textColor="?textColorTintedSecondary"
                 android:textSize="12sp"
                 android:labelFor="@+id/repeats_every_spinner"/>
 
@@ -86,7 +86,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/every"
-                android:textColor="@color/text_quad"
+                android:textColor="?textColorTintedSecondary"
                 android:textSize="12sp" />
 
             <LinearLayout
@@ -147,7 +147,7 @@
         android:id="@+id/summary_textview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_quad"
+        android:textColor="?textColorTintedSecondary"
         android:textSize="12sp"
         android:layout_marginTop="@dimen/spacing_medium"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 284396ae5..dbf2a4c87 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -4,11 +4,14 @@ import android.app.Activity
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
+import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.provider.Settings
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
@@ -16,6 +19,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.CheckBox
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.widget.AppCompatCheckBox
 import androidx.compose.runtime.mutableStateListOf
@@ -38,7 +42,6 @@ import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.databinding.ActivityTaskFormBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.helpers.launchCatching
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
@@ -428,9 +431,9 @@ class TaskFormActivity : BaseActivity() {
         menu.findItem(R.id.action_save).isEnabled = canSave
         if (forcedTheme == "taskform" || forcedTheme == "maroon") {
             menu.iterator().forEach {
-//                val spannable = SpannableString(it.title)
-//                spannable.setSpan(ForegroundColorSpan(Color.WHITE), 0, spannable.length, 0)
-//                it.title = spannable
+                val spannable = SpannableString(it.title)
+                spannable.setSpan(ForegroundColorSpan(Color.WHITE), 0, spannable.length, 0)
+                it.title = spannable
             }
         }
         return true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
index 63b5bef6e..f709a43d4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
@@ -129,6 +129,7 @@ class ReminderItemFormView @JvmOverloads constructor(
         }
         binding.textView.labelFor = binding.button.id
     }
+
     override fun onTimeSet(view: TimePicker?, hourOfDay: Int, minute: Int) {
         valueChangedListener?.let {
             val zonedDateTime = (item.getZonedDateTime() ?: ZonedDateTime.now())