diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 18b2f5e79..e71f2cfa2 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -158,7 +158,7 @@ android {
         multiDexEnabled true
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2551
+        versionCode 2552
         versionName "3.0"
     }
 
diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml
index 1f440f35e..3c2046b70 100644
--- a/Habitica/res/layout/activity_gift_gems.xml
+++ b/Habitica/res/layout/activity_gift_gems.xml
@@ -31,7 +31,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_gravity="bottom"
-            android:background="?attr/colorPrimary"
+            android:background="?headerOffsetColor"
             android:elevation="0dp"
             android:fillViewport="false"
 
@@ -41,7 +41,7 @@
 
             app:layout_collapseMode="pin"
             app:tabGravity="fill"
-            app:tabIndicatorColor="@android:color/white"
+            app:tabIndicatorColor="?colorPrimary"
             app:tabMode="fixed" />
 
         <androidx.viewpager.widget.ViewPager
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 1c5b18459..46a26521e 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -99,7 +99,6 @@
                     android:fillViewport="false"
                     app:layout_anchor="@+id/collapsing_toolbar"
                     app:layout_anchorGravity="bottom"
-
                     app:layout_collapseMode="pin"
                     app:tabGravity="fill"
                     app:tabIndicatorColor="?colorPrimary"
diff --git a/Habitica/res/layout/activity_skill_tasks.xml b/Habitica/res/layout/activity_skill_tasks.xml
index c6a966e56..dbcb1e0b8 100644
--- a/Habitica/res/layout/activity_skill_tasks.xml
+++ b/Habitica/res/layout/activity_skill_tasks.xml
@@ -28,17 +28,15 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
-        android:background="?attr/colorPrimary"
+        android:background="?headerOffsetColor"
         android:elevation="0dp"
         android:fillViewport="false"
-
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:layout_anchor="@+id/collapsing_toolbar"
         app:layout_anchorGravity="bottom"
-
         app:layout_collapseMode="pin"
         app:tabGravity="fill"
-        app:tabIndicatorColor="@android:color/white"
+        app:tabIndicatorColor="?colorPrimary"
         app:tabMode="fixed" />
 
     <androidx.viewpager.widget.ViewPager
diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index 26416e524..a126c679b 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -47,7 +47,8 @@
                     android:layout_height="wrap_content"
                     style="@style/TaskFormTextInputLayoutAppearance"
                     app:boxStrokeColor="?attr/colorPrimary"
-                    android:backgroundTint="?attr/colorPrimary"
+                    app:hintTextColor="?colorPrimaryText"
+                    android:backgroundTint="?attr/colorPrimaryText"
                     android:alpha="0.75">
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/text_edit_text"
@@ -63,7 +64,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:boxStrokeColor="?attr/colorPrimary"
-                    android:backgroundTint="?attr/colorPrimary"
+                    android:backgroundTint="?attr/colorPrimaryText"
+                    app:hintTextColor="?colorPrimaryText"
                     android:layout_marginTop="@dimen/spacing_large"
                     android:alpha="0.75">
                     <androidx.appcompat.widget.AppCompatEditText
diff --git a/Habitica/res/layout/dialog_habitica_primary_button.xml b/Habitica/res/layout/dialog_habitica_primary_button.xml
index 9241826b1..e4668cc3f 100644
--- a/Habitica/res/layout/dialog_habitica_primary_button.xml
+++ b/Habitica/res/layout/dialog_habitica_primary_button.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="60dp"
-    style="@style/HabiticaButton.Primary">
+    style="@style/HabiticaButton.Primary"
+    tools:text="Test">
 </Button>
\ No newline at end of file
diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml
index 85d3b5aad..c2c4dda27 100644
--- a/Habitica/res/layout/drawer_main.xml
+++ b/Habitica/res/layout/drawer_main.xml
@@ -83,7 +83,7 @@
                 android:gravity="center"
                 android:minWidth="20dp"
                 android:paddingTop="0dp"
-                android:textColor="#FFF"
+                android:textColor="@color/text_inverted"
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:text="1"
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index ccfcf5c92..e4f47611e 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -394,7 +394,7 @@
     <string name="empty_title_todos">You don&amp;rsquo;t have any To-Dos</string>
     <string name="empty_description_todos">To-Dos are tasks that only need to be completed once. Add checklists to your To-Dos to increase their value.</string>
     <string name="empty_title_rewards">You don&amp;rsquo;t have any Rewards</string>
-    <string name="reset_walkthrough">Reset Justin&amp;rsquo;s Walkthrough</string>
+    <string name="reset_walkthrough">Reset Tutorials</string>
     <string name="read_community_guidelines">Review our <u>Community Guidelines</u> before posting</string>
     <string name="maintenance">Maintenance</string>
     <string name="reload_content">Reload Content</string>
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
index 151f101ee..0787c9a54 100644
--- a/Habitica/res/values-night/colors.xml
+++ b/Habitica/res/values-night/colors.xml
@@ -6,6 +6,7 @@
     <color name="text_ternary">@color/gray_400</color>
     <color name="text_quad">@color/gray_300</color>
     <color name="text_dimmed">@color/gray_200</color>
+    <color name="text_inverted">@color/gray_10</color>
     <color name="text_brand">@color/brand_400</color>
     <color name="text_brand_neon">@color/brand_500</color>
     <color name="text_red">@color/red_10</color>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 9715b09e7..048577fc6 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -160,6 +160,7 @@
     <color name="text_ternary">@color/gray_200</color>
     <color name="text_quad">@color/gray_300</color>
     <color name="text_dimmed">@color/gray_400</color>
+    <color name="text_inverted">@color/gray_700</color>
     <color name="text_brand">@color/brand_300</color>
     <color name="text_brand_neon">@color/brand_400</color>
     <color name="text_red">@color/red_10</color>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 755781a6b..9052a81e3 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -64,7 +64,7 @@
         <item name="colorPrimary">@color/gray_500</item>
         <item name="barColor">@color/gray_1</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
-        <item name="textColorPrimaryDark">@color/gray_400</item>
+        <item name="textColorPrimaryDark">@color/brand_500</item>
     </style>
 
     <style name="MainAppTheme.Red">
@@ -641,7 +641,7 @@
 
     <style name="HabiticaButton.Primary" parent="HabiticaButton">
         <item name="android:backgroundTint">@color/color_accent</item>
-        <item name="android:textColor">?textColorPrimaryDark</item>
+        <item name="android:textColor">@color/white</item>
     </style>
 
     <style name="HabiticaButton.Small" parent="HabiticaButton">
@@ -720,16 +720,19 @@
         <!-- reference our hint & error styles -->
         <item name="boxBackgroundColor">@color/white</item>
         <item name="android:textColor">?attr/colorPrimaryText</item>
-        <item name="android:textColorHint">@color/textColorLight</item>
+        <item name="android:textColorHint">?colorPrimaryText</item>
         <item name="colorControlNormal">?attr/colorPrimary</item>
         <item name="colorControlActivated">?attr/colorPrimary</item>
         <item name="colorControlHighlight">?attr/colorPrimary</item>
-        <item name="colorAccent">?attr/colorPrimary</item>
+        <item name="colorAccent">?attr/colorPrimaryText</item>
+        <item name="colorPrimary">?attr/colorPrimaryText</item>
         <item name="hintTextAppearance">@style/TaskFormHintTextAppearance</item>
     </style>
 
     <style name="TaskFormHintTextAppearance">
+        <item name="android:colorPrimary">?attr/colorPrimaryText</item>
         <item name="colorPrimary">?attr/colorPrimaryText</item>
+        <item name="textColorPrimary">?attr/colorPrimaryText</item>
         <item name="android:textSize">12sp</item>
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="fontFamily">@string/font_family_medium</item>
@@ -742,7 +745,7 @@
         <item name="android:colorControlNormal">?attr/colorPrimary</item>
         <item name="android:colorControlActivated">?attr/colorPrimary</item>
         <item name="android:colorControlHighlight">?attr/colorPrimary</item>
-        <item name="android:colorAccent">@color/brand_400</item>
+        <item name="android:colorAccent">?colorPrimaryText</item>
     </style>
 
     <style name="TextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
index 5829d6e93..da0fa66e0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
@@ -2,6 +2,5 @@ package com.habitrpg.android.habitica.models
 
 class Transaction {
     var receipt: String? = null
-
     var signature: String? = null
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
index 2ab1036cb..652a2df0c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
@@ -66,6 +66,10 @@ class HabitScoringButtonsView @JvmOverloads constructor(
             isNegative = !isNegative
             sendAccessibilityEvent(AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION)
         }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
 
         isPositive = true
         isNegative = true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
index 9dea1b431..27485c61d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
@@ -31,7 +31,8 @@ class TaskDifficultyButtons @JvmOverloads constructor(
     }
     private lateinit var selectedButton: View
 
-    init {
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
         addAllButtons()
     }