diff --git a/Habitica/res/drawable-hdpi/bottom_navigation_inset.png b/Habitica/res/drawable-hdpi/bottom_navigation_inset.png
index 860db0a48..40ed16502 100644
Binary files a/Habitica/res/drawable-hdpi/bottom_navigation_inset.png and b/Habitica/res/drawable-hdpi/bottom_navigation_inset.png differ
diff --git a/Habitica/res/drawable-hdpi/fab_background.png b/Habitica/res/drawable-hdpi/fab_background.png
index ecb2de088..964c73697 100644
Binary files a/Habitica/res/drawable-hdpi/fab_background.png and b/Habitica/res/drawable-hdpi/fab_background.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_filters_active.png b/Habitica/res/drawable-hdpi/ic_filters_active.png
new file mode 100644
index 000000000..cda14097a
Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_filters_active.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_filters_active.webp b/Habitica/res/drawable-hdpi/ic_filters_active.webp
deleted file mode 100644
index 3a693b1b1..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_filters_active.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/bottom_navigation_inset.png b/Habitica/res/drawable-mdpi/bottom_navigation_inset.png
index 2e127891d..a197240c4 100644
Binary files a/Habitica/res/drawable-mdpi/bottom_navigation_inset.png and b/Habitica/res/drawable-mdpi/bottom_navigation_inset.png differ
diff --git a/Habitica/res/drawable-mdpi/fab_background.png b/Habitica/res/drawable-mdpi/fab_background.png
index d13cf484c..c481beb8f 100644
Binary files a/Habitica/res/drawable-mdpi/fab_background.png and b/Habitica/res/drawable-mdpi/fab_background.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_filters_active.png b/Habitica/res/drawable-mdpi/ic_filters_active.png
new file mode 100644
index 000000000..12b7bc722
Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_filters_active.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_filters_active.webp b/Habitica/res/drawable-mdpi/ic_filters_active.webp
deleted file mode 100644
index c9d245b16..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_filters_active.webp and /dev/null differ
diff --git a/Habitica/res/drawable-v21/selection_highlight.xml b/Habitica/res/drawable-v21/selection_highlight.xml
index 1a8620380..0f322185c 100644
--- a/Habitica/res/drawable-v21/selection_highlight.xml
+++ b/Habitica/res/drawable-v21/selection_highlight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/brand_500">
+        android:color="?colorPrimaryDistinct">
     <item android:id="@android:id/mask"
-          android:drawable="@color/brand" />
+          android:drawable="?colorPrimary" />
 </ripple>
\ No newline at end of file
diff --git a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png
index 4e51dfca6..fb975edf0 100644
Binary files a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png and b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png differ
diff --git a/Habitica/res/drawable-xhdpi/fab_background.png b/Habitica/res/drawable-xhdpi/fab_background.png
index 913c83f7f..52e62daa4 100644
Binary files a/Habitica/res/drawable-xhdpi/fab_background.png and b/Habitica/res/drawable-xhdpi/fab_background.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_filters_active.png b/Habitica/res/drawable-xhdpi/ic_filters_active.png
new file mode 100644
index 000000000..ef97e6075
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_filters_active.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_filters_active.webp b/Habitica/res/drawable-xhdpi/ic_filters_active.webp
deleted file mode 100644
index 81154be70..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_filters_active.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png
index 809c54194..a812bb243 100644
Binary files a/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png and b/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_background.png b/Habitica/res/drawable-xxhdpi/fab_background.png
index 05e7eb474..06b3a327f 100644
Binary files a/Habitica/res/drawable-xxhdpi/fab_background.png and b/Habitica/res/drawable-xxhdpi/fab_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_filters_active.png b/Habitica/res/drawable-xxhdpi/ic_filters_active.png
new file mode 100644
index 000000000..16f38de00
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_filters_active.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_filters_active.webp b/Habitica/res/drawable-xxhdpi/ic_filters_active.webp
deleted file mode 100644
index 4a041c142..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_filters_active.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_filters_active.png b/Habitica/res/drawable-xxxhdpi/ic_filters_active.png
new file mode 100644
index 000000000..caa6c3a8b
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_filters_active.png differ
diff --git a/Habitica/res/drawable/avatar_customization_category_bg.xml b/Habitica/res/drawable/avatar_customization_category_bg.xml
index 300ee34d1..2f30bb800 100644
--- a/Habitica/res/drawable/avatar_customization_category_bg.xml
+++ b/Habitica/res/drawable/avatar_customization_category_bg.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 <item>
     <shape android:shape="rectangle">
-        <solid android:color="@color/brand_200" />
+        <solid android:color="?colorPrimaryOffset" />
     </shape>
 </item>
     <item android:left="0dp" android:right="0dp" android:gravity="bottom">
diff --git a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
index 4c115a7e4..3be259e51 100644
--- a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
+++ b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/brand_100" />
+            <solid android:color="?colorPrimary" />
         </shape>
     </item>
     <item android:left="0dp" android:right="0dp" android:gravity="bottom">
diff --git a/Habitica/res/drawable/badge_bg.xml b/Habitica/res/drawable/badge_bg.xml
index c6f2317f4..0213c8e97 100644
--- a/Habitica/res/drawable/badge_bg.xml
+++ b/Habitica/res/drawable/badge_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="3dp" />
-    <solid android:color="@color/brand_400" />
+    <solid android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/badge_circle.xml b/Habitica/res/drawable/badge_circle.xml
index 618daf35c..7e70e56da 100644
--- a/Habitica/res/drawable/badge_circle.xml
+++ b/Habitica/res/drawable/badge_circle.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners
-        android:radius="10dip"/>
-    <solid
-        android:color="@color/brand_400" />
+    <corners android:radius="10dip"/>
+    <solid android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/button_background_primary.xml b/Habitica/res/drawable/button_background_primary.xml
index 609b534a1..ea1e79105 100644
--- a/Habitica/res/drawable/button_background_primary.xml
+++ b/Habitica/res/drawable/button_background_primary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/brand_400" />
+    <solid android:color="?colorAccent" />
     <corners android:radius="8dp"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
     <stroke android:width="1dp" android:color="#19000000" />
diff --git a/Habitica/res/drawable/challenge_gem_add_button_enabled.xml b/Habitica/res/drawable/challenge_gem_add_button_enabled.xml
index 1c28c6c3d..3d41b91b5 100644
--- a/Habitica/res/drawable/challenge_gem_add_button_enabled.xml
+++ b/Habitica/res/drawable/challenge_gem_add_button_enabled.xml
@@ -3,6 +3,6 @@
     <item >
         <bitmap
             android:src="@drawable/ic_add_white_18dp"
-            android:tint="@color/brand_400" />
+            android:tint="?colorAccent" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml b/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml
index 7bbf3519b..cd660f431 100644
--- a/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml
+++ b/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml
@@ -3,6 +3,6 @@
     <item >
         <bitmap
             android:src="@drawable/minus"
-            android:tint="@color/brand_400" />
+            android:tint="?colorAccent" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_100.xml b/Habitica/res/drawable/layout_rounded_bg_brand_100.xml
deleted file mode 100644
index cf946dc8e..000000000
--- a/Habitica/res/drawable/layout_rounded_bg_brand_100.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/brand_100" />
-    <corners android:radius="@dimen/bar_radius"/>
-    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
-</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/nav_item_color_state.xml b/Habitica/res/drawable/nav_item_color_state.xml
index 709a1af70..0f4955173 100644
--- a/Habitica/res/drawable/nav_item_color_state.xml
+++ b/Habitica/res/drawable/nav_item_color_state.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/white" android:state_enabled="true" />
-    <item android:color="@color/brand_200" android:state_enabled="false" />
+    <item android:color="?colorPrimaryOffset" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_purple.xml b/Habitica/res/drawable/pill_bg_purple.xml
index 9dea0a7a0..7a466382f 100644
--- a/Habitica/res/drawable/pill_bg_purple.xml
+++ b/Habitica/res/drawable/pill_bg_purple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/brand_100"/>
+    <solid android:color="?colorPrimary"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_radio_selected.xml b/Habitica/res/drawable/pill_bg_radio_selected.xml
index 6d8163ecf..7160d31ed 100644
--- a/Habitica/res/drawable/pill_bg_radio_selected.xml
+++ b/Habitica/res/drawable/pill_bg_radio_selected.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/brand_400"/>
+    <solid android:color="?colorAccent"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/purchase_button_background.xml b/Habitica/res/drawable/purchase_button_background.xml
index 829c7542d..3f9430413 100644
--- a/Habitica/res/drawable/purchase_button_background.xml
+++ b/Habitica/res/drawable/purchase_button_background.xml
@@ -5,7 +5,7 @@
     <item android:state_pressed="true" >
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/brand_500" >
+                android:color="?colorPrimaryDistinct" >
             </solid>
             <corners
                 android:radius="8dp">
@@ -16,7 +16,7 @@
     <item android:state_focused="true" >
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/brand_400">
+                android:color="?colorAccent">
             </solid>
             <corners
                 android:radius="8dp">
@@ -36,7 +36,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/brand_300">
+                android:color="?colorPrimaryOffset">
             </solid>
             <corners
                 android:radius="8dp">
diff --git a/Habitica/res/drawable/subscription_unselected.xml b/Habitica/res/drawable/subscription_unselected.xml
index c290a3fdd..ce7b3e2bf 100644
--- a/Habitica/res/drawable/subscription_unselected.xml
+++ b/Habitica/res/drawable/subscription_unselected.xml
@@ -2,7 +2,7 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
     <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-    <stroke android:color="@color/brand_100" android:width="1dp" />
+    <stroke android:color="?colorPrimary" android:width="1dp" />
     <size android:height="16dp" android:width="16dp" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
diff --git a/Habitica/res/layout/activity_challenge_detail.xml b/Habitica/res/layout/activity_challenge_detail.xml
index 6917d816c..4470417ee 100644
--- a/Habitica/res/layout/activity_challenge_detail.xml
+++ b/Habitica/res/layout/activity_challenge_detail.xml
@@ -164,7 +164,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="54dp"
                     android:layout_gravity="bottom"
-                    android:background="@color/brand_200"
+                    android:background="?colorPrimaryOffset"
                     android:elevation="0dp"
                     android:fillViewport="false"
 
diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml
index 3fc64b936..00e64ce85 100644
--- a/Habitica/res/layout/activity_create_challenge.xml
+++ b/Habitica/res/layout/activity_create_challenge.xml
@@ -18,7 +18,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/brand_200"
+            android:background="?colorPrimaryOffset"
             android:orientation="vertical"
             android:paddingLeft="@dimen/activity_horizontal_margin"
             android:paddingRight="@dimen/activity_horizontal_margin"
@@ -28,7 +28,7 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColorHint="@color/brand_500"
+                android:textColorHint="?textColorPrimaryDark"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat"
                 android:id="@+id/create_challenge_title_input_layout">
 
@@ -39,8 +39,8 @@
                     android:hint="@string/new_challenge_title"
                     android:id="@+id/create_challenge_title"
                     android:textColor="@color/white"
-                    android:textColorHighlight="@color/brand_500"
-                    android:textColorHint="@color/brand_500"
+                    android:textColorHighlight="?textColorPrimaryDark"
+                    android:textColorHint="?textColorPrimaryDark"
 
                     tools:text="Get in shape"
                     android:inputType="text" />
@@ -49,7 +49,7 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColorHint="@color/brand_500"
+                android:textColorHint="?textColorPrimaryDark"
 
                 android:id="@+id/create_challenge_description_input_layout"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat">
@@ -64,17 +64,12 @@
                     android:maxLines="5"
                     android:minLines="3"
                     android:textColor="@color/white"
-                    android:textColorHighlight="@color/brand_500"
-                    android:textColorHint="@color/brand_500" />
+                    android:textColorHighlight="?textColorPrimaryDark"
+                    android:textColorHint="?textColorPrimaryDark" />
             </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:background="@color/brand_700" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -169,8 +164,7 @@
                 android:layout_height="20dp"
                 android:layout_marginTop="39dp"
                 android:drawablePadding="12dp"
-                android:drawableRight="@drawable/ic_info_outline_black_24dp"
-                android:drawableTint="@color/brand_300"
+                android:drawableEnd="@drawable/ic_info_outline_black_24dp"
                 android:gravity="center"
                 android:text="@string/short_name"
                 android:textColor="#cc000000" />
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index 83b64c701..cd2961f30 100644
--- a/Habitica/res/layout/activity_gem_purchase.xml
+++ b/Habitica/res/layout/activity_gem_purchase.xml
@@ -67,7 +67,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="54dp"
                         android:layout_gravity="bottom"
-                        android:background="@color/brand_200"
+                        android:background="?colorPrimaryOffset"
                         android:elevation="0dp"
                         android:fillViewport="false"
 
diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml
index b5975816f..9096e6b16 100644
--- a/Habitica/res/layout/activity_group_form.xml
+++ b/Habitica/res/layout/activity_group_form.xml
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/create"
                 style="@style/HabiticaButton.Borderless"
-                android:textColor="@color/brand_400"
+                android:textColor="?colorAccent"
                 android:paddingEnd="@dimen/spacing_large"
                 android:paddingStart="@dimen/spacing_large"
                 android:minWidth="20dp"/>
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index 4eafee561..32c259677 100644
--- a/Habitica/res/layout/activity_report_message.xml
+++ b/Habitica/res/layout/activity_report_message.xml
@@ -133,7 +133,7 @@
                     tools:text="@string/report_explanation"
                     android:textColor="@color/gray_200"
                     style="@style/Caption3"
-                    android:textColorLink="@color/brand_400"
+                    android:textColorLink="?colorAccent"
                     />
             </LinearLayout>
             </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/activity_verify_username.xml b/Habitica/res/layout/activity_verify_username.xml
index 3208082fa..861aed5a5 100644
--- a/Habitica/res/layout/activity_verify_username.xml
+++ b/Habitica/res/layout/activity_verify_username.xml
@@ -27,7 +27,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/brand_200"
+                    android:textColor="?colorPrimaryOffset"
                     android:text="@string/usernamePromptTitle"
                     android:gravity="center"
                     android:textSize="16sp"
diff --git a/Habitica/res/layout/avatar_category.xml b/Habitica/res/layout/avatar_category.xml
index d610d4b8d..838f1fd71 100644
--- a/Habitica/res/layout/avatar_category.xml
+++ b/Habitica/res/layout/avatar_category.xml
@@ -10,5 +10,5 @@
     android:layout_width="70dp"
     android:layout_height="70dp"
     android:gravity="center"
-    tools:background="@color/brand_200"
+    tools:background="?colorPrimaryOffset"
     tools:drawableTop="@drawable/icon_body" />
diff --git a/Habitica/res/layout/avatar_setup_drawer.xml b/Habitica/res/layout/avatar_setup_drawer.xml
index 17c206b01..449b68542 100644
--- a/Habitica/res/layout/avatar_setup_drawer.xml
+++ b/Habitica/res/layout/avatar_setup_drawer.xml
@@ -17,7 +17,7 @@
                 android:id="@+id/subcategory_tabs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:tabIndicatorColor="@color/brand_400"
+                app:tabIndicatorColor="?colorAccent"
                 app:tabIndicatorHeight="2dp"
                 app:tabTextColor="@color/white_50_alpha"
                 app:tabSelectedTextColor="@color/white"
diff --git a/Habitica/res/layout/bottom_navigation_item.xml b/Habitica/res/layout/bottom_navigation_item.xml
index ab9e92b15..118d1233e 100644
--- a/Habitica/res/layout/bottom_navigation_item.xml
+++ b/Habitica/res/layout/bottom_navigation_item.xml
@@ -4,7 +4,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.RelativeLayout"
-    tools:background="@color/brand_100">
+    tools:background="?colorPrimary">
         <ImageView
             android:id="@+id/icon_view"
             android:layout_width="wrap_content"
@@ -18,7 +18,7 @@
             android:id="@+id/title_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/brand_500"
+            android:textColor="?textColorPrimaryDark"
             tools:text="@string/habits"
             android:layout_gravity="center"
             android:textSize="12sp"
diff --git a/Habitica/res/layout/challenge_add_task_item.xml b/Habitica/res/layout/challenge_add_task_item.xml
index 5df449e54..9a7a08479 100644
--- a/Habitica/res/layout/challenge_add_task_item.xml
+++ b/Habitica/res/layout/challenge_add_task_item.xml
@@ -18,7 +18,7 @@
         android:layout_marginStart="24dp"
         android:textAllCaps="false"
         style="@style/Subheader2"
-        android:textColor="@color/brand_400"
+        android:textColor="?colorAccent"
         android:background="#f9f9f9"
         android:id="@+id/btn_add_task"
         tools:text="Add habit">
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 3f7ab165e..cff249bfa 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -76,7 +76,7 @@
                     style="@style/Base.Widget.AppCompat.Button.Borderless"
                     android:text="@string/expand_notes"
                     android:padding="0dp"
-                    android:textColor="@color/brand_400"/>
+                    android:textColor="?colorAccent"/>
                 <TextView
                         android:id="@+id/approvalRequiredTextField"
                         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/dialog_habitica_base.xml b/Habitica/res/layout/dialog_habitica_base.xml
index 25ac24c58..121d68f3c 100644
--- a/Habitica/res/layout/dialog_habitica_base.xml
+++ b/Habitica/res/layout/dialog_habitica_base.xml
@@ -99,7 +99,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/close"
-        android:textColor="@color/brand_400"
+        android:textColor="?colorAccent"
         android:background="@drawable/alert_dialog_background"
         android:layout_marginTop="@dimen/spacing_large"
         android:visibility="gone"
diff --git a/Habitica/res/layout/dialog_habitica_secondary_button.xml b/Habitica/res/layout/dialog_habitica_secondary_button.xml
index 2c27e3e7b..82aaffe5a 100644
--- a/Habitica/res/layout/dialog_habitica_secondary_button.xml
+++ b/Habitica/res/layout/dialog_habitica_secondary_button.xml
@@ -3,6 +3,6 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     style="@style/HabiticaButton.Borderless"
-    android:textColor="@color/brand_400">
+    android:textColor="?colorAccent">
 
 </Button>
\ No newline at end of file
diff --git a/Habitica/res/layout/drawer_main_section_header.xml b/Habitica/res/layout/drawer_main_section_header.xml
index e9f3ba3b0..cfcd03d51 100644
--- a/Habitica/res/layout/drawer_main_section_header.xml
+++ b/Habitica/res/layout/drawer_main_section_header.xml
@@ -3,7 +3,7 @@
           android:layout_width="match_parent"
           android:layout_height="22dp"
           xmlns:tools="http://schemas.android.com/tools"
-          android:background="@color/brand_100"
+          android:background="?colorPrimary"
           tools:text="Social"
     style="@style/Body1"
     android:textSize="12sp"
diff --git a/Habitica/res/layout/empty_view_timetravelers.xml b/Habitica/res/layout/empty_view_timetravelers.xml
index d8b011541..5c190cc3d 100644
--- a/Habitica/res/layout/empty_view_timetravelers.xml
+++ b/Habitica/res/layout/empty_view_timetravelers.xml
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="38dp"
         android:text="@string/want_to_subscribe"
-        android:textColor="@color/brand_400"
+        android:textColor="?colorAccent"
         android:background="@drawable/layout_rounded_bg_lighter_gray"
         android:layout_marginTop="18dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/filter_menu_item.xml b/Habitica/res/layout/filter_menu_item.xml
index f4c6346e1..2456ec557 100644
--- a/Habitica/res/layout/filter_menu_item.xml
+++ b/Habitica/res/layout/filter_menu_item.xml
@@ -4,7 +4,7 @@
                 android:layout_height="48dp"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_gravity="right|end"
-        tools:background="@color/brand_100"
+        tools:background="?colorPrimary"
                 android:clickable="true">
 
     <ImageView
diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index 3ed993968..3b98608a8 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -98,7 +98,6 @@
             android:layout_width="250dp"
             android:layout_height="35dp"
             android:layout_gravity="center_horizontal"
-
             android:layout_marginTop="35sp"
             android:background="@drawable/rounded_purple_square"
             android:text="@string/about.rate_our_app"
@@ -112,7 +111,6 @@
             android:layout_height="35dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20sp"
-
             android:background="@drawable/rounded_purple_square"
             android:text="@string/about.bugreport"
             android:textAllCaps="false"
@@ -147,7 +145,6 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10sp"
             android:background="@drawable/rounded_purple_square"
-
             android:text="@string/about.source_code"
             android:textAllCaps="false"
             android:textColor="@color/white"
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index d8dded035..fd63ca2d3 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -101,7 +101,7 @@
             android:text="@string/gem.purchase.subtitle"
             android:gravity="center"
             android:textStyle="normal|bold"
-            android:textColor="@color/brand_100"
+            android:textColor="?colorPrimary"
             android:textSize="16sp"
             android:lineSpacingExtra="4dp"
             android:layout_marginTop="23dp"
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index dcbac3ba1..71adea6c8 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -141,7 +141,7 @@
                         android:id="@+id/username_textview"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/brand_400"
+                        android:textColor="?colorAccent"
                         style="@style/HabiticaButton.Gray.600"
                         android:background="@drawable/layout_rounded_bg_gray_700"
                         android:layout_marginTop="@dimen/spacing_large"
diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index 35fc181d4..1a694a4ea 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         style="@style/FragmentDialogTitle"
         android:id="@+id/titleTextView"
-        android:background="@color/brand_100"
+        android:background="?colorPrimary"
         android:textColor="@android:color/white" />
     <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
         android:id="@+id/recyclerView"
diff --git a/Habitica/res/layout/fragment_shop.xml b/Habitica/res/layout/fragment_shop.xml
index 73730b4f5..261e6764e 100644
--- a/Habitica/res/layout/fragment_shop.xml
+++ b/Habitica/res/layout/fragment_shop.xml
@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             style="@style/FragmentDialogTitle"
             android:id="@+id/titleTextView"
-            android:background="@color/brand_100"
+            android:background="?colorPrimary"
             android:textColor="@android:color/white" />
         <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
             android:id="@+id/recyclerView"
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index 4a27ad0b0..ea2e954fd 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -79,7 +79,7 @@
                 android:text="@string/subscribe_prompt"
                 android:gravity="center"
                 android:textStyle="normal|bold"
-                android:textColor="@color/brand_100"
+                android:textColor="?colorPrimary"
                 android:textSize="16sp"
                 android:lineSpacingExtra="4dp"
                 android:layout_marginTop="8dp"
@@ -297,7 +297,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/gift_subscription"
                 android:background="@color/transparent"
-                android:textColor="@color/brand_400"
+                android:textColor="?colorAccent"
                 android:textAllCaps="false"/>
 
         </LinearLayout>
diff --git a/Habitica/res/layout/gear_list_item.xml b/Habitica/res/layout/gear_list_item.xml
index 221de234d..5e2927df8 100644
--- a/Habitica/res/layout/gear_list_item.xml
+++ b/Habitica/res/layout/gear_list_item.xml
@@ -49,7 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/two_handed"
-            android:textColor="@color/brand_400"
+            android:textColor="?colorAccent"
             android:drawablePadding="@dimen/spacing_small"
             android:layout_marginBottom="@dimen/spacing_small"/>
         <com.nex3z.flowlayout.FlowLayout
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index a67d13b4e..99dc484bd 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -78,7 +78,7 @@
                 style="@style/Base.Widget.AppCompat.Button.Borderless"
                 android:text="@string/expand_notes"
                 android:padding="0dp"
-                android:textColor="@color/brand_400"/>
+                android:textColor="?colorAccent"/>
             <TextView
                     android:id="@+id/approvalRequiredTextField"
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/main_navigation_view.xml b/Habitica/res/layout/main_navigation_view.xml
index 3d1f00701..3b5d5009c 100644
--- a/Habitica/res/layout/main_navigation_view.xml
+++ b/Habitica/res/layout/main_navigation_view.xml
@@ -18,8 +18,9 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:background="@color/brand_100" />
+            android:background="?barColor" />
         <ImageView
+            android:id="@+id/cutout_background"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/bottom_navigation_inset"/>
@@ -27,7 +28,7 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:background="@color/brand_100" />
+            android:background="?barColor" />
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/notifications_header.xml b/Habitica/res/layout/notifications_header.xml
index e060a4296..b139c9250 100644
--- a/Habitica/res/layout/notifications_header.xml
+++ b/Habitica/res/layout/notifications_header.xml
@@ -48,6 +48,6 @@
         android:layout_height="wrap_content"
         android:background="@color/transparent"
         android:text="@string/dismiss_all"
-        android:textColor="@color/brand_400" />
+        android:textColor="?colorAccent" />
 
 </LinearLayout>
diff --git a/Habitica/res/layout/purchase_subscription_view.xml b/Habitica/res/layout/purchase_subscription_view.xml
index a80db4647..224b040ef 100644
--- a/Habitica/res/layout/purchase_subscription_view.xml
+++ b/Habitica/res/layout/purchase_subscription_view.xml
@@ -35,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/priceLabel"
-            android:textColor="@color/brand_100"
+            android:textColor="?colorPrimary"
             android:textSize="24sp"
             android:fontFamily="@string/font_family_medium"
             tools:text="$ 21" />
@@ -44,7 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/descriptionTextView"
-            android:textColor="@color/brand_100"
+            android:textColor="?colorPrimary"
             tools:text="recurring every month"
             />
         <LinearLayout
diff --git a/Habitica/res/layout/quest_menu_view.xml b/Habitica/res/layout/quest_menu_view.xml
index a148f2ae7..597fc5bc5 100644
--- a/Habitica/res/layout/quest_menu_view.xml
+++ b/Habitica/res/layout/quest_menu_view.xml
@@ -65,7 +65,7 @@
             android:layout_height="30dp"
             android:gravity="center_vertical"
             android:orientation="horizontal"
-            tools:background="@color/brand_50"
+            tools:background="?colorPrimaryDark"
             android:paddingLeft="@dimen/spacing_medium"
             android:paddingRight="@dimen/spacing_large">
             <ImageView
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 78bc1e770..fa2aeeb37 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -55,7 +55,7 @@
                 style="@style/Base.Widget.AppCompat.Button.Borderless"
                 android:text="@string/expand_notes"
                 android:padding="0dp"
-                android:textColor="@color/brand_400"/>
+                android:textColor="?colorAccent"/>
             <TextView
                     android:id="@+id/approvalRequiredTextField"
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/setup_customization_item.xml b/Habitica/res/layout/setup_customization_item.xml
index 0c9e02535..d4a2a2be2 100644
--- a/Habitica/res/layout/setup_customization_item.xml
+++ b/Habitica/res/layout/setup_customization_item.xml
@@ -6,7 +6,7 @@
               android:gravity="center_vertical"
               android:paddingLeft="6dp"
               android:paddingRight="6dp"
-        tools:background="@color/brand_200">
+        tools:background="?colorPrimaryOffset">
     <ImageView
             android:id="@+id/imageView"
             android:layout_width="@dimen/setup_customization_size"
diff --git a/Habitica/res/layout/tavern_daniel_item.xml b/Habitica/res/layout/tavern_daniel_item.xml
deleted file mode 100644
index 7b07d8f96..000000000
--- a/Habitica/res/layout/tavern_daniel_item.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="120dp"
-        android:src="@drawable/npc_daniel"
-        android:layout_margin="10dp"
-        android:layout_gravity="center"
-        />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center|center_horizontal"
-        android:orientation="vertical">
-
-        <Button
-            android:id="@+id/btn.toggle.inn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/tavern.inn.rest"
-            android:layout_gravity="center"
-            android:textColor="@color/white"
-            android:drawableTint="@color/white"
-            android:backgroundTint="@color/brand"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/inn_description"
-            />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index e92cea4e4..51daa288c 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -77,7 +77,7 @@
                     style="@style/Base.Widget.AppCompat.Button.Borderless"
                     android:text="@string/expand_notes"
                     android:padding="0dp"
-                    android:textColor="@color/brand_400"/>
+                    android:textColor="?colorAccent"/>
                 <TextView
                         android:id="@+id/approvalRequiredTextField"
                         android:layout_width="match_parent"
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 85496f65e..0931820a9 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -380,7 +380,7 @@
     </style>
 
     <style name="subscriptionBoxText">
-        <item name="android:textColor">@color/brand_100</item>
+        <item name="android:textColor">?colorPrimary</item>
     </style>
 
     <style name="subscriptionBoxText.Title">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index 38df6bd1e..47fef591e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -10,13 +10,13 @@ import android.view.*
 import android.widget.*
 import androidx.appcompat.widget.AppCompatCheckedTextView
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.content.ContextCompat
 import com.google.android.material.textfield.TextInputLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
@@ -306,7 +306,7 @@ class ChallengeFormActivity : BaseActivity() {
             supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)
 
             supportActionBar.title = ""
-            supportActionBar.setBackgroundDrawable(ColorDrawable(ContextCompat.getColor(this, R.color.brand_200)))
+            supportActionBar.setBackgroundDrawable(ColorDrawable(getThemeColor(R.attr.colorPrimaryOffset)))
             supportActionBar.elevation = 0f
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
index e9f7bf4d3..f849645f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
@@ -20,6 +20,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
@@ -125,7 +126,7 @@ class ReportMessageActivity : BaseActivity() {
     private fun setStatusBarDim(dim: Boolean) {
         if (dim) {
             appBar.elevation = 0f
-            window.statusBarColor = ContextCompat.getColor(this, R.color.brand_50)
+            window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
             closeButton.visibility = View.GONE
             toolbarTextView.setTypeface(null, Typeface.BOLD)
         } else {
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 92c6b5d23..61de9d9f1 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
@@ -27,6 +27,7 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.Tag
@@ -129,7 +130,7 @@ class TaskFormActivity : BaseActivity() {
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
-        tintColor = ContextCompat.getColor(this, R.color.brand_300)
+        tintColor = getThemeColor(R.attr.colorAccent)
 
         val bundle = intent.extras ?: return
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index b391f0522..9ae046a0f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -379,10 +379,14 @@ class NavigationDrawerFragment : DialogFragment() {
 
     private fun setNotificationsSeen(allSeen: Boolean) {
         context?.let {
-            val colorId = if (allSeen) R.color.gray_200 else R.color.brand_400
+            val color = if (allSeen) {
+                ContextCompat.getColor(it, R.color.gray_200)
+            } else {
+                it.getThemeColor(R.attr.colorAccent)
+            }
 
             val bg = notificationsBadge.background as? GradientDrawable
-            bg?.color = ColorStateList.valueOf(ContextCompat.getColor(it, colorId))
+            bg?.color = ColorStateList.valueOf(color)
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index 29798255c..32e9b5aca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.extensions.addOkButton
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -77,7 +78,7 @@ class StatsFragment: BaseMainFragment() {
         leftSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesLeft())
         rightSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesRight())
         context?.let {
-            val color = ContextCompat.getColor(it, R.color.brand_200)
+            val color = it.getThemeColor(R.attr.colorPrimaryOffset)
             distributeEvenlyHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
             distributeClassHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
             distributeTaskHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index c92c3bd08..1e758a51a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.tasks
 
 import android.app.Activity
 import android.content.Intent
+import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.*
 import androidx.fragment.app.FragmentPagerAdapter
@@ -9,6 +10,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -212,7 +214,11 @@ class TasksFragment : BaseMainFragment() {
         if (filterCount == 0) {
             filterMenuItem?.setIcon(R.drawable.ic_action_filter_list)
         } else {
-            filterMenuItem?.setIcon(R.drawable.ic_filters_active)
+            context?.let {
+                val filterIcon = it.getDrawable(R.drawable.ic_filters_active)
+                filterIcon?.setColorFilter(it.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY)
+                filterMenuItem?.setIcon(filterIcon)
+            }
         }
     }
 
@@ -220,7 +226,7 @@ class TasksFragment : BaseMainFragment() {
         if (bottomNavigation == null) {
             return
         }
-        compositeSubscription.add(tutorialRepository.getTutorialSteps(Arrays.asList("habits", "dailies", "todos", "rewards")).subscribe(Consumer { tutorialSteps ->
+        compositeSubscription.add(tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards")).subscribe(Consumer { tutorialSteps ->
             val activeTutorialFragments = ArrayList<String>()
             for (step in tutorialSteps) {
                 var id = -1
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
index 5d3979f4a..0e7db3a04 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
@@ -11,6 +11,7 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
@@ -145,7 +146,7 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
         }
 
         if (attributes?.getBoolean(R.styleable.CollapsibleSectionView_hasAdditionalInfo, false) == true) {
-            infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(ContextCompat.getColor(context, R.color.brand_200)))
+            infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(context.getThemeColor(R.attr.colorPrimaryOffset)))
         } else {
             infoIconView.visibility = View.GONE
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
index 02a970854..1d66da404 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
@@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
@@ -105,7 +106,7 @@ class ChatBarView : LinearLayout {
 
     private fun setSendButtonEnabled(enabled: Boolean) {
         val tintColor: Int = if (enabled) {
-            ContextCompat.getColor(context, R.color.brand_400)
+            context.getThemeColor(R.attr.colorAccent)
         } else {
             ContextCompat.getColor(context, R.color.gray_400)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
index 38cfc9b0e..965e46731 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
@@ -9,6 +9,7 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.disposables.Disposable
@@ -144,7 +145,7 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     private fun updateTitle() {
         allocatedTitle.text = "$allocatedPoints/$pointsToAllocate"
         if (allocatedPoints > 0) {
-            titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.brand_400))
+            titleView.setBackgroundColor(context.getThemeColor(R.attr.colorAccent))
         } else {
             titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_400))
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
index a761cfcfc..4befe3fac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
@@ -19,6 +19,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TagRepository
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -116,7 +117,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
                         intArrayOf(android.R.attr.state_checked) //enabled
                 ),
                 intArrayOf(Color.LTGRAY, //disabled
-                        ContextCompat.getColor(context, R.color.brand_400) //enabled
+                        context.getThemeColor(R.attr.colorAccent) //enabled
                 )
         )
         val leftPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, context.resources.displayMetrics).toInt()