diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 7d9d097fa..321b79442 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 2531
+        versionCode 2542
         versionName "3.0"
     }
 
diff --git a/Habitica/res/color/dialog_button_text_color.xml b/Habitica/res/color/dialog_button_text_color.xml
new file mode 100644
index 000000000..3d5214e3c
--- /dev/null
+++ b/Habitica/res/color/dialog_button_text_color.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="1.00" android:color="@color/text_brand_neon" android:state_checkable="true" android:state_checked="true" android:state_enabled="true"/>
+    <item android:alpha="0.60" android:color="?attr/colorOnSurface" android:state_checkable="true" android:state_checked="false" android:state_enabled="true"/>
+    <item android:alpha="1.00" android:color="@color/text_brand_neon" android:state_enabled="true"/>
+    <item android:alpha="0.38" android:color="?attr/colorOnSurface"/>
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png
new file mode 100644
index 000000000..08657fd5c
Binary files /dev/null and b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-mdpi/subscribe_header_dark.png b/Habitica/res/drawable-mdpi/subscribe_header_dark.png
new file mode 100644
index 000000000..77e46fbd0
Binary files /dev/null and b/Habitica/res/drawable-mdpi/subscribe_header_dark.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png
new file mode 100644
index 000000000..eb06901ee
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscribe_header_dark.png b/Habitica/res/drawable-xhdpi/subscribe_header_dark.png
new file mode 100644
index 000000000..859b8a208
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/subscribe_header_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png
new file mode 100644
index 000000000..4c91cbd4f
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscribe_header_dark.png b/Habitica/res/drawable-xxhdpi/subscribe_header_dark.png
new file mode 100644
index 000000000..68bce9fcd
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/subscribe_header_dark.png differ
diff --git a/Habitica/res/drawable/achievement_badge_bg.xml b/Habitica/res/drawable/achievement_badge_bg.xml
index 47576caee..591490270 100644
--- a/Habitica/res/drawable/achievement_badge_bg.xml
+++ b/Habitica/res/drawable/achievement_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">
-    <solid android:color="@color/gray_300" />
+    <solid android:color="@color/dimmed_background" />
     <corners android:radius="12dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/border.xml b/Habitica/res/drawable/border.xml
deleted file mode 100644
index 961ca4066..000000000
--- a/Habitica/res/drawable/border.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparent" />
-
-    <stroke
-        android:width="1dip"
-        android:color="#000000"/>
-
-</shape>
diff --git a/Habitica/res/drawable/checklist_unchecked.xml b/Habitica/res/drawable/checklist_unchecked.xml
index 1109b6b19..d754d2671 100644
--- a/Habitica/res/drawable/checklist_unchecked.xml
+++ b/Habitica/res/drawable/checklist_unchecked.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-    <solid android:color="#A6FFFFFF" />
+    <solid android:color="@color/checkbox_fill" />
     <size android:height="20dp" android:width="20dp" />
     <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/ic_check_white_18dp.xml b/Habitica/res/drawable/ic_check_white_18dp.xml
index 6b98d7012..ab7e02962 100644
--- a/Habitica/res/drawable/ic_check_white_18dp.xml
+++ b/Habitica/res/drawable/ic_check_white_18dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="18dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="18dp">
-    <path android:fillColor="#FFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+    <path android:fillColor="@color/white" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_close_white_24dp.xml b/Habitica/res/drawable/ic_close_white_24dp.xml
index 4881cf5be..dcb92cdd5 100644
--- a/Habitica/res/drawable/ic_close_white_24dp.xml
+++ b/Habitica/res/drawable/ic_close_white_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#FFFFFF" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+    <path android:fillColor="@color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
index 91fb946f2..386b0cde9 100644
--- a/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
+++ b/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#7e000000" android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml b/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
index 0f8503e44..03a069141 100644
--- a/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
+++ b/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#7e000000" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+    <path android:fillColor="@color/text_primary" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_launcher_foreground.xml b/Habitica/res/drawable/ic_launcher_foreground.xml
index d07e5042a..4fc0d90b9 100644
--- a/Habitica/res/drawable/ic_launcher_foreground.xml
+++ b/Habitica/res/drawable/ic_launcher_foreground.xml
@@ -7,12 +7,12 @@
         android:pathData="M290.6,290.5C287.6,286.6 284.4,291.1 276.8,290.3C271.8,289.8 271.8,287.6 271.8,257.7C271.8,257.7 271.3,255.9 274.2,254.2C277.1,252.6 285.8,238.1 280.4,225.8C275.1,213.4 278.9,214 281.2,215.3C283.4,216.5 284.5,214.9 283.2,208.2C280.4,194.2 276.1,189.4 266,183.1C259.4,179 261.8,171.5 271.2,172C275.9,172.3 275.9,172.3 276.4,168.7C277.4,163 275.5,153.2 268.5,151.9C263.6,151 257.5,156.2 250.3,152.6C243.1,148.9 231.2,158 226.3,160.1C221.5,162.2 217.4,162.2 211.9,162.1C206.3,162 214.8,171.3 223.3,173.4C230.7,175.2 227.8,176.5 227.4,182.5C226.9,189.2 228.8,192.1 225.7,192.8C220.9,193.8 215.6,181 207.4,175.6C188.7,163.3 177.7,169.2 145.1,133.4C139.5,127.2 141.8,146.4 145.2,156.6C154.5,184 172.5,187.6 181,188.4C188.1,189.1 192.9,187.5 192.9,190.2C192.9,192.2 184.5,193.1 181.3,193.1C178.2,193.1 174.7,192.8 170.7,192.1C164.2,190.9 174.1,207.3 180.5,212.5C191.2,221.3 203.4,224.6 213.3,225.6C216.1,225.9 220.2,225.9 220.2,228.1C220.2,230.2 218,230.7 215.5,230.7C201.7,230.8 193.8,241.9 191.5,254.6C190.1,262.7 191.2,271.9 191.3,278.7L191.9,283.6C193,292.1 162.1,295.5 158,281.6C153.6,266.5 177.9,258.6 178.4,244.2C178.7,235.1 170.4,231 170.4,231L170.4,227.3L170.4,217.7L160.8,217.7L160.8,208.2L151.3,208.2L151.3,198.6L141.7,198.6L141.7,208.2L141.7,217.7L141.7,227.3L151.3,227.3L151.3,236.8L160.8,236.8L167,236.8C170.6,236.8 173.4,239.2 173.1,244.3C172.3,256.8 145.5,264.6 152.9,284.6C158.2,299.1 181.1,299.3 204,299.3L204,299.3L246.9,299.3C248.2,299.3 250.1,298.7 247.3,291.7C245.1,286.2 237.5,290.1 231.1,290.1C224.2,290.1 224,284.3 228.4,278.2C231.1,274.5 234.5,271.7 240.3,269C249.2,264.9 256,270.2 259.4,274.8C264.2,281.4 265.7,289 261.5,290.2C256.3,291.6 254.8,291.8 254.6,296.7C254.5,300.2 256.1,299.2 264.2,299.2L290.9,299.2C295.1,299.2 294.8,296 290.6,290.5"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:strokeWidth="1"/>
     <path
         android:pathData="M132.2,198.9l9.5,0l0,-9.5l-9.5,0z"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:strokeWidth="1"/>
 </vector>
diff --git a/Habitica/res/drawable/layout_top_rounded_bg.xml b/Habitica/res/drawable/layout_top_rounded_bg_white.xml
similarity index 85%
rename from Habitica/res/drawable/layout_top_rounded_bg.xml
rename to Habitica/res/drawable/layout_top_rounded_bg_white.xml
index bc5828111..dc5b74047 100644
--- a/Habitica/res/drawable/layout_top_rounded_bg.xml
+++ b/Habitica/res/drawable/layout_top_rounded_bg_white.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="?attr/colorContentBackground" />
+    <solid android:color="@color/white" />
     <corners android:topLeftRadius="@dimen/rounded_button_radius" android:topRightRadius="@dimen/rounded_button_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/plus.xml b/Habitica/res/drawable/plus.xml
index cf36e152d..86497d05e 100644
--- a/Habitica/res/drawable/plus.xml
+++ b/Habitica/res/drawable/plus.xml
@@ -1,4 +1,4 @@
-<vector android:height="16dp" android:tint="#FFFFFF"
+<vector android:height="16dp" android:tint="@color/white"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/Habitica/res/drawable/round_checklist_unchecked.xml b/Habitica/res/drawable/round_checklist_unchecked.xml
index 54c3938e2..07a4ebfaa 100644
--- a/Habitica/res/drawable/round_checklist_unchecked.xml
+++ b/Habitica/res/drawable/round_checklist_unchecked.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="#A6FFFFFF" />
+    <solid android:color="@color/checkbox_fill" />
     <size android:height="20dp" android:width="20dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index cad6106d9..43372388a 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -32,8 +32,8 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <androidx.cardview.widget.CardView
-                style="@style/CardView.Default"
+            <FrameLayout
+                android:background="@drawable/layout_rounded_bg_window"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -116,10 +116,10 @@
                             tools:text="100"/>
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
-            <androidx.cardview.widget.CardView
-                style="@style/CardView.Default"
+            <FrameLayout
+                android:background="@drawable/layout_rounded_bg_window"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <LinearLayout
@@ -157,10 +157,10 @@
                         android:textSize="13sp"
                         android:drawableTop="@drawable/icon_gift_subscription"/>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
-            <androidx.cardview.widget.CardView
-                style="@style/CardView.Default"
+            <FrameLayout
+                android:background="@drawable/layout_rounded_bg_window"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -183,11 +183,11 @@
                         android:shrinkColumns="1"
                         android:stretchColumns="0" />
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
-            <androidx.cardview.widget.CardView
+            <FrameLayout
+                android:background="@drawable/layout_rounded_bg_window"
                 android:id="@+id/costume_card"
-                style="@style/CardView.Default"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -210,11 +210,11 @@
                         android:shrinkColumns="1"
                         android:stretchColumns="0" />
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
-            <androidx.cardview.widget.CardView
+            <FrameLayout
+                android:background="@drawable/layout_rounded_bg_window"
                 android:id="@+id/attributes_card_view"
-                style="@style/CardView.Default"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:clickable="true"
@@ -279,11 +279,11 @@
 
                     </TableLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
 
-            <androidx.cardview.widget.CardView
-                style="@style/CardView.Default"
+            <FrameLayout
+                android:background="@drawable/layout_rounded_bg_window"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -348,12 +348,12 @@
                         </TableRow>
                     </TableLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
 
-            <androidx.cardview.widget.CardView
+            <FrameLayout
+                android:background="@drawable/layout_rounded_bg_window"
                 android:id="@+id/profile_achievements_card"
-                style="@style/CardView.Default"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -384,7 +384,7 @@
                         android:scrollbarThumbVertical="@color/scrollbarThumb"
                         android:scrollbars="vertical" />
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/activity_gift1get1_info.xml b/Habitica/res/layout/activity_gift1get1_info.xml
index 304d8cfc0..dd6c47ec5 100644
--- a/Habitica/res/layout/activity_gift1get1_info.xml
+++ b/Habitica/res/layout/activity_gift1get1_info.xml
@@ -106,7 +106,7 @@
             <Button
                 android:id="@+id/gift_button"
                 android:layout_width="match_parent"
-                android:layout_height="38dp"
+                android:layout_height="wrap_content"
                 style="@style/HabiticaButton.Purple"
                 android:text="@string/gift_a_subscription"
                 android:layout_marginTop="24dp"
diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml
index 04cf7241a..d584d2685 100644
--- a/Habitica/res/layout/activity_gift_subscription.xml
+++ b/Habitica/res/layout/activity_gift_subscription.xml
@@ -110,7 +110,7 @@
                 <Button
                     android:text="@string/send_gift"
                     android:layout_width="match_parent"
-                    android:layout_height="36dp"
+                    android:layout_height="wrap_content"
                     android:id="@+id/subscription_button"
                     style="@style/HabiticaButton.Purple.Small"
                     android:textAllCaps="false"
diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml
index c817d745c..13312a722 100644
--- a/Habitica/res/layout/activity_group_form.xml
+++ b/Habitica/res/layout/activity_group_form.xml
@@ -104,7 +104,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:text="@string/only_leader_create_challenge"/>
-            <Switch
+            <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/leader_create_challenge_switch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 55ca2e3ec..1b30631d5 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -40,8 +40,8 @@
                 android:layout_height="wrap_content"
                 app:srcCompat="@drawable/cloud_1"
                 android:id="@+id/left_cloud_view"
-                android:layout_toLeftOf="@id/cloud_anchor"
-                android:layout_marginRight="150dp"
+                android:layout_toStartOf="@id/cloud_anchor"
+                android:layout_marginEnd="150dp"
                 android:layout_alignParentBottom="true"
                 android:scaleType="centerCrop"
                 android:paddingBottom="460dp"
@@ -51,8 +51,8 @@
                 android:layout_height="wrap_content"
                 app:srcCompat="@drawable/cloud_2"
                 android:id="@+id/right_cloud_view"
-                android:layout_toRightOf="@id/cloud_anchor"
-                android:layout_marginLeft="170dp"
+                android:layout_toEndOf="@id/cloud_anchor"
+                android:layout_marginStart="170dp"
                 android:layout_alignParentBottom="true"
                 android:scaleType="centerCrop"
                 android:paddingBottom="400dp"
@@ -87,7 +87,7 @@
                 android:layout_margin="24dp"
                 android:contentDescription="@string/brand_name" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/new_game_button"
                 android:layout_width="@dimen/login_intro_button_size"
                 android:layout_height="@dimen/login_intro_button_size"
@@ -95,9 +95,10 @@
                 android:layout_gravity="center_vertical|center_horizontal"
                 android:textColor="@color/white"
                 android:layout_marginTop="@dimen/spacing_large"
-                android:background="@drawable/login_begin_button"/>
+                android:background="@drawable/login_begin_button"
+                android:backgroundTint="@color/brand_100"/>
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/show_login_button"
                 android:layout_width="@dimen/login_intro_button_size"
                 android:layout_height="@dimen/login_intro_button_size"
@@ -105,7 +106,8 @@
                 android:layout_gravity="center_vertical|center_horizontal"
                 android:textColor="@color/white"
                 android:layout_marginTop="@dimen/spacing_large"
-                android:background="@drawable/login_begin_button"/>
+                android:background="@drawable/login_begin_button"
+                android:backgroundTint="@color/brand_100"/>
 
             <ScrollView
                 android:layout_width="match_parent"
@@ -131,7 +133,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:drawableEnd="@drawable/ic_username"
-                        android:drawableRight="@drawable/ic_username"
                         android:imeOptions="actionNext"
                         android:inputType="textPersonName"
                         android:nextFocusDown="@+id/email"
@@ -146,12 +147,12 @@
                         android:layout_height="wrap_content"
                         android:inputType="textEmailAddress"
                         android:imeOptions="actionNext"
-                        android:drawableRight="@drawable/ic_email"
                         android:nextFocusDown="@+id/password"
                         android:drawableEnd="@drawable/ic_email"
                         android:hint="@string/emailAddress"
                         android:textColor="@color/white_75_alpha"
                         android:theme="@style/LoginEditTextTheme"
+                        android:autofillHints="emailAddress"
                         />
 
                     <EditText
@@ -161,7 +162,6 @@
                         android:inputType="textPassword"
                         android:imeOptions="actionNext"
                         android:nextFocusDown="@+id/confirm_password"
-                        android:drawableRight="@drawable/ic_password"
                         android:drawableEnd="@drawable/ic_password"
                         android:hint="@string/password"
                         android:textColor="@color/white_75_alpha"
@@ -172,12 +172,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textPassword"
-                        android:drawableRight="@drawable/ic_password"
                         android:drawableEnd="@drawable/ic_password"
                         android:imeOptions="actionDone"
                         android:hint="@string/confirmpassword"
                         android:textColor="@color/white_75_alpha"
-                        android:theme="@style/LoginEditTextTheme"/>
+                        android:theme="@style/LoginEditTextTheme"
+                        android:autofillHints="newPassword"/>
 
                     <ProgressBar
                         android:id="@+id/PB_AsyncTask"
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 18b0b2d11..1c5b18459 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -46,6 +46,7 @@
                         android:layout_marginTop="?attr/actionBarSize"
                         android:layout_marginEnd="@dimen/header_border_spacing"
                         android:layout_marginStart="@dimen/header_border_spacing"
+                        android:layout_marginBottom="@dimen/spacing_medium"
                         app:layout_collapseMode="parallax" />
 
                     <androidx.appcompat.widget.Toolbar
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index f3dc3905e..47d63a855 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_centerHorizontal="true"
-              android:adjustViewBounds="true"
-              android:background="?attr/headerBackgroundColor"
-              android:focusable="true"
-              android:focusableInTouchMode="true"
-              android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:layout_centerHorizontal="true"
+    android:adjustViewBounds="true"
+    android:background="?attr/headerBackgroundColor"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical"
+    android:layout_marginBottom="8dp">
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -72,7 +73,7 @@
                 android:drawablePadding="6dp"
                 android:gravity="center"
                 android:textColor="?headerTextColor"
-                android:textSize="14sp"
+                android:textSize="12sp"
                 tools:text="Lvl 12 Warrior"/>
 
         <ImageView
diff --git a/Habitica/res/layout/bottom_navigation_item.xml b/Habitica/res/layout/bottom_navigation_item.xml
index c486a0e2c..c41bd5bd6 100644
--- a/Habitica/res/layout/bottom_navigation_item.xml
+++ b/Habitica/res/layout/bottom_navigation_item.xml
@@ -34,7 +34,7 @@
             android:id="@+id/selected_title_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/white"
+            android:textColor="?colorPrimaryDistinct"
             tools:text="@string/habits"
             android:layout_gravity="center"
             android:textSize="12sp"
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index d5f47fba7..daa3e7bc5 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -7,7 +7,6 @@
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
     android:clickable="true"
-    android:background="#fff"
     android:orientation="horizontal"
     android:baselineAligned="false"
     android:paddingEnd="16dp">
@@ -36,7 +35,6 @@
             android:textColor="@color/gem_icon_color"
             android:textSize="17sp"
             android:textStyle="bold"/>
-
     </LinearLayout>
 
     <LinearLayout
@@ -54,6 +52,7 @@
             style="@style/ChallengeName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textColor="@color/text_primary"
             android:maxLines="3"
             tools:text="Name" />
 
diff --git a/Habitica/res/layout/chat_item.xml b/Habitica/res/layout/chat_item.xml
index aa15dc9a2..a1ca54217 100644
--- a/Habitica/res/layout/chat_item.xml
+++ b/Habitica/res/layout/chat_item.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
-    android:background="@color/window_background"
+    android:background="@color/content_background"
     android:paddingLeft="@dimen/chat_horizontal_inset"
     android:paddingRight="@dimen/chat_horizontal_inset"
     android:paddingTop="@dimen/spacing_small"
@@ -32,6 +32,9 @@
             style="@style/CardContent.Compact"
             android:background="@drawable/layout_rounded_bg_content"
             android:padding="@dimen/spacing_medium">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
                     <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
                         android:id="@+id/user_label"
                         style="@style/ChatMessageUserTextViewStyle"
@@ -50,16 +53,16 @@
                         android:textColor="@color/white"
                         style="@style/Pill.Purple"
                         tools:text="Moderator"
-                        android:layout_marginLeft="@dimen/spacing_small"/>
+                        android:layout_marginStart="@dimen/spacing_small"/>
                     <View
                         android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="1dp"/>
                     <LinearLayout
                         android:id="@+id/like_background_layout"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="5dp"
                         android:layout_marginStart="5dp"
                         android:background="@drawable/layout_rounded_bg">
                         <TextView
@@ -71,6 +74,7 @@
                             android:gravity="center_vertical"
                             android:focusable="true" />
                     </LinearLayout>
+            </LinearLayout>
             <TextView
                 android:id="@+id/subline_textview"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index 3e6450a79..115bae47f 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -12,20 +12,24 @@
             android:layout_width="@dimen/button_width"
             android:layout_height="match_parent"
             tools:background="@color/red_10">
-            <FrameLayout
+            <View
                 android:id="@+id/checkBoxBackground"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:gravity="center"
                 android:background="@drawable/checklist_unchecked"
-                android:layout_gravity="center">
+                android:layout_gravity="center" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/task_tint_overlay"/>
                 <ImageView
                     android:id="@+id/checkmark"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:layout_gravity="center"
+                    android:scaleType="center"
                     android:src="@drawable/checkmark" />
-            </FrameLayout>
         </FrameLayout>
         <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/checkedTextView"
diff --git a/Habitica/res/layout/customization_grid_background_item.xml b/Habitica/res/layout/customization_grid_background_item.xml
index 015dd88d8..98a32f827 100644
--- a/Habitica/res/layout/customization_grid_background_item.xml
+++ b/Habitica/res/layout/customization_grid_background_item.xml
@@ -16,10 +16,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:background="@android:color/black" />
         <com.facebook.drawee.view.SimpleDraweeView
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index b092308a2..c9203ce35 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -33,7 +33,6 @@
                         android:textColor="@color/text_quad"
                         tools:text="150"
                         style="@style/Body1"
-                        app:hasLightBackground="true"
                         android:textSize="15sp"
                         android:layout_gravity="center" />
         </FrameLayout>
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 50bcdec72..9f7cf2f70 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -31,15 +31,26 @@
                 <FrameLayout
                     android:id="@+id/checkBoxHolder"
                     android:layout_width="@dimen/button_width"
-                    android:layout_height="match_parent">
-
-                    <CheckBox
-                        android:id="@+id/checkBox"
-                        android:layout_width="@dimen/checkbox_size"
-                        android:layout_height="@dimen/checkbox_size"
+                    android:layout_height="match_parent"
+                    tools:background="@color/red_10">
+                    <View
+                        android:id="@+id/checkBoxBackground"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:gravity="center"
+                        android:background="@drawable/daily_unchecked"
+                        android:layout_gravity="center" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/task_tint_overlay"/>
+                    <ImageView
+                        android:id="@+id/checkmark"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
                         android:layout_gravity="center"
-                        android:button="@drawable/daily_checkbox"
-                        android:gravity="center" />
+                        android:scaleType="center"
+                        android:src="@drawable/checkmark" />
                 </FrameLayout>
                 <include layout="@layout/task_main_content" />
                 <ProgressBar
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_button.xml b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
index 1d7a85dce..69ef0af4a 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
@@ -23,6 +23,5 @@
         tools:text="10"
         tools:textColor="@color/green_10"
         style="@style/Subheader1"
-        app:hasLightBackground="true"
         android:layout_marginStart="12dp"/>
 </LinearLayout>
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_header.xml b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
index c7bfbe570..d63e1a41a 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_header.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
@@ -30,7 +30,6 @@
             android:id="@+id/currencyView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:hasLightBackground="true"
             android:paddingTop="12dp"
             android:paddingBottom="12dp"
             android:layout_gravity="center_vertical"/>
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 3a3dcff4e..0a667b62b 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -28,7 +28,7 @@
         <RadioGroup
             android:id="@+id/task_filter_wrapper"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="40dp"
             android:orientation="horizontal"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="24dp">
diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml
index 315accc1a..85d3b5aad 100644
--- a/Habitica/res/layout/drawer_main.xml
+++ b/Habitica/res/layout/drawer_main.xml
@@ -148,7 +148,7 @@
                 android:gravity="center"
                 android:minWidth="20dp"
                 android:paddingTop="0dp"
-                android:textColor="#FFF"
+                android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:text="1"
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index e6e440e8c..bd28cfe8f 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -11,7 +11,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/spacing_medium">
 
         <TextView
             android:layout_width="wrap_content"
@@ -20,10 +21,10 @@
             android:text="@string/avatar_body"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
+            android:background="@drawable/layout_rounded_bg_window"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/CardView.Default">
+            android:layout_height="wrap_content">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -67,7 +68,7 @@
                     android:id="@+id/avatarSkinView"
                     app:equipmentTitle="@string/avatar_skin"/>
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -75,10 +76,10 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/CardView.Default">
+            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
@@ -118,7 +119,7 @@
                     android:id="@+id/avatar_headband_view"
                     app:equipmentTitle="@string/avatar_headband"/>
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -126,10 +127,10 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/CardView.Default">
+            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -162,7 +163,7 @@
                     android:id="@+id/avatarHairMustacheView"
                     app:equipmentTitle="@string/avatar_mustache" />
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
 
         <TextView
             android:layout_width="wrap_content"
@@ -171,10 +172,10 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/CardView.Default">
+            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -185,6 +186,6 @@
                     android:id="@+id/avatarBackgroundView"
                     app:equipmentTitle="@string/avatar_background" />
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index c88f4bd90..2fabe98b8 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -38,10 +38,10 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.5"
-                    android:background="@drawable/layout_rounded_bg"
+                    android:background="@drawable/layout_rounded_bg_window"
                     android:padding="@dimen/spacing_medium"
                     android:orientation="vertical"
-                    android:layout_marginRight="@dimen/spacing_medium">
+                    android:layout_marginEnd="@dimen/spacing_medium">
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
                             android:textSize="17sp"
                             android:textColor="@color/text_secondary"
                             tools:text="5"
-                            android:layout_marginLeft="@dimen/spacing_small"
+                            android:layout_marginStart="@dimen/spacing_small"
                             />
                     </LinearLayout>
                     <TextView
@@ -73,10 +73,10 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.5"
-                    android:background="@drawable/layout_rounded_bg"
+                    android:background="@drawable/layout_rounded_bg_window"
                     android:padding="@dimen/spacing_medium"
                     android:orientation="vertical"
-                    android:layout_marginLeft="@dimen/spacing_medium">
+                    android:layout_marginStart="@dimen/spacing_medium">
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
                             android:textSize="17sp"
                             android:textColor="@color/text_secondary"
                             tools:text="5"
-                            android:layout_marginLeft="@dimen/spacing_small"
+                            android:layout_marginStart="@dimen/spacing_small"
                             />
                     </LinearLayout>
                     <TextView
diff --git a/Habitica/res/layout/fragment_challengeslist.xml b/Habitica/res/layout/fragment_challengeslist.xml
index fb1348dcb..06763f8db 100644
--- a/Habitica/res/layout/fragment_challengeslist.xml
+++ b/Habitica/res/layout/fragment_challengeslist.xml
@@ -1,10 +1,8 @@
 <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-
     android:id="@+id/refreshLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#fff"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
         <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
             android:id="@+id/recyclerView"
diff --git a/Habitica/res/layout/fragment_equipment_overview.xml b/Habitica/res/layout/fragment_equipment_overview.xml
index 0eabc7c09..5c62ec980 100644
--- a/Habitica/res/layout/fragment_equipment_overview.xml
+++ b/Habitica/res/layout/fragment_equipment_overview.xml
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/equip_automatically"
                 android:layout_marginEnd="6dp"/>
-            <Switch
+            <com.google.android.material.switchmaterial.SwitchMaterial
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/autoEquipSwitch"/>
@@ -61,11 +61,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="6dp"
                 android:text="@string/wear_costume"/>
-            <Switch
+            <com.google.android.material.switchmaterial.SwitchMaterial
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/costumeSwitch"/>
-
         </LinearLayout>
         <com.habitrpg.android.habitica.ui.views.equipment.EquipmentOverviewView
             android:id="@+id/costume_view"
diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml
index f2e2159d0..053f182f9 100644
--- a/Habitica/res/layout/fragment_faq_overview.xml
+++ b/Habitica/res/layout/fragment_faq_overview.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         app:subtitle="HP"
         app:title="@string/health_points"
-        app:titleColor="@color/red_10"
+        app:titleColor="@color/text_red_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         app:subtitle="EXP"
         app:title="@string/experience_points"
-        app:titleColor="@color/yellow_50"
+        app:titleColor="@color/text_yellow_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         app:subtitle="MP"
         app:title="@string/mana_points"
-        app:titleColor="@color/blue_10"
+        app:titleColor="@color/text_blue_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -55,7 +55,7 @@
         android:layout_height="wrap_content"
         app:subtitle="@string/currency"
         app:title="@string/gold_capitalilzed"
-        app:titleColor="@color/orange_10"
+        app:titleColor="@color/text_orange_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -66,7 +66,7 @@
         android:layout_height="wrap_content"
         app:subtitle="@string/premium_currency"
         app:title="@string/gems"
-        app:titleColor="@color/green_10"
+        app:titleColor="@color/text_green_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -77,7 +77,7 @@
         android:layout_height="wrap_content"
         app:subtitle="@string/subscriber_currency"
         app:title="@string/mystic_hourglasses"
-        app:titleColor="@color/brand_300"
+        app:titleColor="@color/text_brand_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
@@ -88,7 +88,7 @@
         android:layout_height="wrap_content"
         app:subtitle="STR, CON, INT, PER"
         app:title="@string/stat_allocation"
-        app:titleColor="#7f3300"
+        app:titleColor="@color/text_brown_white"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index 7e1d91f8e..702e659a8 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -59,6 +59,7 @@
             android:layout_marginTop="10dp"
             android:clipChildren="true"
             android:clipToPadding="true"
+            android:clickable="true"
             android:visibility="gone">
             <ImageView
                 android:id="@+id/promo_banner_left_image"
@@ -90,7 +91,7 @@
                     android:id="@+id/promo_banner_duration_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/Subheader2"/>
+                    style="@style/Overline"/>
             </LinearLayout>
             <TextView
                 android:layout_width="wrap_content"
@@ -130,31 +131,31 @@
                 android:layout_marginStart="@dimen/spacing_large"
                 android:layout_marginEnd="@dimen/spacing_large" />
 
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:text="@string/gem_purchase_listitem1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItem"
                 />
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:text="@string/gem_purchase_listitem2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItem"
                 />
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:text="@string/gem_purchase_listitem3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItem"
                 />
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:text="@string/gem_purchase_listitem4"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItem"
                 />
-            <TextView
+            <com.habitrpg.android.habitica.ui.views.DayNightTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/no_billing_gems"
@@ -228,7 +229,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:src="@drawable/gift_sub_gift"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="30dp"
                 android:layout_marginBottom="6dp" />
             <TextView
                 android:layout_width="match_parent"
@@ -253,8 +254,8 @@
             android:layout_width="wrap_content"
             android:paddingLeft="41dp"
             android:paddingRight="41dp"
-            android:paddingBottom="14dp"
-            android:paddingTop="14dp"
+            android:paddingBottom="20dp"
+            android:paddingTop="20dp"
             android:text="@string/gem_purchase_title"
             android:layout_gravity="center_horizontal"
             android:gravity="center"
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index 2b9f6a447..a17f79d4b 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -9,12 +9,12 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/window_background">
+        android:background="@color/content_background">
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/window_background">
+            android:background="@color/content_background">
             <TextView
                 android:id="@+id/title_view"
                 android:layout_width="match_parent"
@@ -34,7 +34,7 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="60dp"
-                    android:background="@drawable/layout_rounded_bg_content"
+                    android:background="@drawable/layout_rounded_bg_window"
                     android:layout_marginRight="@dimen/spacing_large"
                     android:paddingTop="@dimen/spacing_small"
                     android:paddingBottom="@dimen/spacing_small"
@@ -68,7 +68,7 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="60dp"
-                    android:background="@drawable/layout_rounded_bg_content"
+                    android:background="@drawable/layout_rounded_bg_window"
                     android:paddingTop="@dimen/spacing_small"
                     android:paddingBottom="@dimen/spacing_small"
                     android:paddingLeft="@dimen/spacing_medium"
diff --git a/Habitica/res/layout/fragment_guilds_overview.xml b/Habitica/res/layout/fragment_guilds_overview.xml
index e16c5052f..79bd2fb86 100644
--- a/Habitica/res/layout/fragment_guilds_overview.xml
+++ b/Habitica/res/layout/fragment_guilds_overview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/refresh_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,7 +12,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/spacing_medium">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -29,6 +30,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:divider="?android:listDivider"
+                    tools:layout_height="50dp"
                     android:showDividers="middle">
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
@@ -36,8 +38,10 @@
                 android:id="@+id/publicGuildsButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/card_horizontal_padding"
-                android:text="@string/public_guilds" />
+                style="@style/HabiticaButton.Offset"
+                android:textColor="@color/text_primary"
+                android:text="@string/public_guilds"
+                android:layout_marginTop="@dimen/spacing_large"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_promo_info.xml b/Habitica/res/layout/fragment_promo_info.xml
index 25bf63a6e..dbb872b2d 100644
--- a/Habitica/res/layout/fragment_promo_info.xml
+++ b/Habitica/res/layout/fragment_promo_info.xml
@@ -76,10 +76,12 @@
             android:textSize="15sp"
             android:fontFamily="@string/font_family_medium"
             android:layout_marginBottom="@dimen/spacing_large"/>
-        <Button
+        <TextView
             android:id="@+id/prompt_button"
             android:layout_width="match_parent"
-            android:layout_height="38dp" />
+            android:layout_height="38dp"
+            android:textSize="16sp"
+            android:gravity="center" />
 
         <TextView
             android:id="@+id/instructions_title_view"
diff --git a/Habitica/res/layout/fragment_stats.xml b/Habitica/res/layout/fragment_stats.xml
index 353b27c78..c3ac11b6b 100644
--- a/Habitica/res/layout/fragment_stats.xml
+++ b/Habitica/res/layout/fragment_stats.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical"
@@ -26,7 +25,8 @@
                 android:id="@+id/leftSparklesView"
                 android:layout_width="77dp"
                 android:layout_height="24dp"
-                android:scaleType="fitCenter"/>
+                android:scaleType="fitCenter"
+                android:contentDescription="@null" />
             <TextView
                 android:id="@+id/numberOfPointsTextView"
                 android:layout_width="wrap_content"
@@ -38,7 +38,8 @@
                 android:id="@+id/rightSparklesView"
                 android:layout_width="77dp"
                 android:layout_height="24dp"
-                android:scaleType="fitCenter"/>
+                android:scaleType="fitCenter"
+                android:contentDescription="@null" />
         </LinearLayout>
         <TextView
             android:id="@+id/unlock_at_level"
@@ -53,34 +54,34 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:statsTitle="@string/strength"
-            app:titleBackgroundColor="@color/red_50"
-            app:statsColor="@color/red_10"
+            app:titleBackgroundColor="@color/background_red"
+            app:statsColor="@color/text_red"
             android:layout_marginBottom="12dp"/>
         <com.habitrpg.android.habitica.ui.views.stats.StatsView
             android:id="@+id/intelligenceStatsView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:statsTitle="@string/intelligence"
-            app:titleBackgroundColor="@color/blue_50"
-            app:statsColor="@color/blue_10"
+            app:titleBackgroundColor="@color/background_blue"
+            app:statsColor="@color/text_blue"
             android:layout_marginBottom="12dp"/>
         <com.habitrpg.android.habitica.ui.views.stats.StatsView
             android:id="@+id/constitutionStatsView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:statsTitle="@string/constitution"
-            app:titleBackgroundColor="@color/yellow_10"
-            app:statsColor="@color/yellow_5"
+            app:titleBackgroundColor="@color/background_yellow"
+            app:statsColor="@color/text_yellow"
             android:layout_marginBottom="12dp"/>
         <com.habitrpg.android.habitica.ui.views.stats.StatsView
             android:id="@+id/perceptionStatsView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:statsTitle="@string/perception"
-            app:titleBackgroundColor="@color/brand_300"
-            app:statsColor="@color/brand_300"
+            app:titleBackgroundColor="@color/background_brand"
+            app:statsColor="@color/text_brand"
             android:layout_marginBottom="12dp"/>
-        <Switch
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/automaticAllocationSwitch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -113,7 +114,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/transparent"
-                    android:layout_marginLeft="12dp"/>
+                    android:layout_marginStart="12dp"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -130,7 +131,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/transparent"
-                    android:layout_marginLeft="12dp"/>
+                    android:layout_marginStart="12dp"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -146,7 +147,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/transparent"
-                    android:layout_marginLeft="12dp"/>
+                    android:layout_marginStart="12dp"/>
             </LinearLayout>
         </LinearLayout>
         <View
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index 27d44ea1c..723b4eb5d 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -82,7 +82,7 @@
                 android:text="@string/subscribe_prompt"
                 android:gravity="center"
                 style="@style/Subheader1"
-                android:textColor="@color/brand_300"
+                android:textColor="@color/text_brand"
                 android:lineSpacingExtra="4dp"
                 android:layout_marginTop="8dp"
                 android:layout_gravity="center_horizontal"/>
@@ -286,7 +286,7 @@
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
                     style="@style/Subheader1"
-                    android:textColor="@color/brand_300"
+                    android:textColor="@color/text_brand"
                     android:text="@string/subscribe_options_title"
                     android:layout_marginBottom="20dp"/>
 
@@ -350,7 +350,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/gift_subscription"
                 android:background="@color/transparent"
-                android:textColor="?colorAccent"
+                android:textColor="@color/text_brand_neon"
                 android:textAllCaps="false"/>
         </LinearLayout>
         <LinearLayout
diff --git a/Habitica/res/layout/fragment_support_bug_fix.xml b/Habitica/res/layout/fragment_support_bug_fix.xml
index 71013a04b..fd64224b6 100644
--- a/Habitica/res/layout/fragment_support_bug_fix.xml
+++ b/Habitica/res/layout/fragment_support_bug_fix.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 <LinearLayout
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -83,13 +84,14 @@
             android:text="@string/update_app_description"
             style="@style/Body2"/>
     </LinearLayout>
-    <TextView
+    <com.habitrpg.android.habitica.ui.views.DayNightTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/need_more_help"
         android:gravity="center"
         android:textStyle="bold"
-        android:textColor="@color/brand_300"
+        app:dayTextColor="@color/text_brand"
+        app:nightTextColor="@color/gray_400"
         android:textSize="16sp"
         android:layout_marginTop="@dimen/spacing_large"
         />
@@ -105,7 +107,7 @@
     <Button
         android:id="@+id/report_bug_button"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="wrap_content"
         style="@style/HabiticaButton.Purple"
         android:text="@string/report_bug"
         android:elevation="0dp"
diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
index 8ace229ee..970dfc43d 100644
--- a/Habitica/res/layout/fragment_support_main.xml
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -152,7 +152,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="38dp"
-                android:text="@string/contact_us"
+                android:text="@string/submit_feedback"
                 android:gravity="center"
                 android:layout_marginStart="@dimen/spacing_medium"
                 android:layout_marginEnd="@dimen/spacing_medium"
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index adcd59eb5..bf8e89f7c 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -20,14 +20,19 @@
             android:id="@+id/btnPlusWrapper"
             android:layout_width="@dimen/button_width"
             android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/btnPlusIconView"
+            <View
+                android:id="@+id/button_plus_circle_view"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:layout_gravity="center"/>
+            <ImageView
+                android:id="@+id/btnPlusIconView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:scaleType="center"
                 android:layout_gravity="center"
-                android:src="@drawable/habit_plus" />
+                android:src="@drawable/habit_plus"
+                android:background="@color/task_tint_overlay" />
 
             <Button
                 android:id="@+id/btnPlus"
@@ -59,14 +64,19 @@
             android:id="@+id/btnMinusWrapper"
             android:layout_width="@dimen/button_width"
             android:layout_height="match_parent">
-            <ImageView
-                android:id="@+id/btnMinusIconView"
+            <View
+                android:id="@+id/button_minus_circle_view"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:layout_gravity="center"/>
+            <ImageView
+                android:id="@+id/btnMinusIconView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:scaleType="center"
-                android:background="@drawable/habit_circle"
-                android:src="@drawable/habit_minus" />
+                android:src="@drawable/habit_minus"
+                android:background="@color/task_tint_overlay" />
             <Button
                 android:id="@+id/btnMinus"
                 style="@style/HabitButton"
diff --git a/Habitica/res/layout/main_navigation_view.xml b/Habitica/res/layout/main_navigation_view.xml
index d0e64e2ce..89897e1ce 100644
--- a/Habitica/res/layout/main_navigation_view.xml
+++ b/Habitica/res/layout/main_navigation_view.xml
@@ -45,23 +45,25 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="48dp"
-        android:layout_alignParentBottom="true"
-        android:paddingTop="@dimen/spacing_small"
-        android:paddingBottom="@dimen/spacing_small">
+        android:layout_alignParentBottom="true">
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
             android:id="@+id/habits_tab"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             app:title="@string/habits"
-            app:iconDrawable="@drawable/icon_habits_selected"/>
+            app:iconDrawable="@drawable/icon_habits_selected"
+            android:paddingTop="@dimen/spacing_small"
+            android:paddingBottom="@dimen/spacing_small"/>
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
             android:layout_width="0dp"
             android:id="@+id/dailies_tab"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             app:title="@string/dailies"
-            app:iconDrawable="@drawable/icon_dailies_selected"/>
+            app:iconDrawable="@drawable/icon_dailies_selected"
+            android:paddingTop="@dimen/spacing_small"
+            android:paddingBottom="@dimen/spacing_small"/>
         <androidx.legacy.widget.Space
             android:layout_width="50dp"
             android:layout_height="wrap_content" />
@@ -71,14 +73,18 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             app:title="@string/todos"
-            app:iconDrawable="@drawable/icon_todos_selected"/>
+            app:iconDrawable="@drawable/icon_todos_selected"
+            android:paddingTop="@dimen/spacing_small"
+            android:paddingBottom="@dimen/spacing_small"/>
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
             android:id="@+id/rewards_tab"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             app:title="@string/rewards"
-            app:iconDrawable="@drawable/icon_rewards_selected"/>
+            app:iconDrawable="@drawable/icon_rewards_selected"
+            android:paddingTop="@dimen/spacing_small"
+            android:paddingBottom="@dimen/spacing_small"/>
     </LinearLayout>
 
     <FrameLayout
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index ef6bab6f1..084378710 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -17,19 +17,19 @@
 
             android:layout_width="36dp"
             android:layout_height="39dp"
-            android:layout_marginRight="3dp" />
+            android:layout_marginEnd="3dp" />
 
         <TextView
             android:id="@+id/achievement_count_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             tools:text="2"
             android:background="@drawable/layout_rounded_bg_primary"
             android:paddingLeft="2dp"
             android:paddingRight="2dp"
             android:textSize="12sp"
-            android:textColor="#ffffff" />
+            android:textColor="@color/white" />
     </FrameLayout>
 
     <TextView
diff --git a/Habitica/res/layout/promo_menu.xml b/Habitica/res/layout/promo_menu.xml
index 0b174b659..5c32a1f94 100644
--- a/Habitica/res/layout/promo_menu.xml
+++ b/Habitica/res/layout/promo_menu.xml
@@ -43,10 +43,10 @@
         <Button
             android:id="@+id/button"
             android:layout_width="wrap_content"
-            android:layout_height="32dp"
+            android:layout_height="38dp"
             android:minWidth="110dp"
             style="@style/HabiticaButton.Purple"
-            android:layout_marginTop="14dp"/>
+            android:layout_marginTop="10dp"/>
     </LinearLayout>
     <ImageView
         android:id="@+id/left_image_view"
diff --git a/Habitica/res/layout/promo_subscription_buy_gems.xml b/Habitica/res/layout/promo_subscription_buy_gems.xml
index dbcfec906..37eaeb43d 100644
--- a/Habitica/res/layout/promo_subscription_buy_gems.xml
+++ b/Habitica/res/layout/promo_subscription_buy_gems.xml
@@ -35,10 +35,10 @@
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
-        android:layout_height="32dp"
+        android:layout_height="40dp"
         android:minWidth="110dp"
         android:text="@string/subscribe"
-        style="@style/HabiticaButton.Purple"
+        style="@style/HabiticaButton.Purple.Small"
         android:layout_marginTop="14dp"/>
 </LinearLayout>
     <ImageView
diff --git a/Habitica/res/layout/purchase_gem_view.xml b/Habitica/res/layout/purchase_gem_view.xml
index eec80af16..f305aa3e7 100644
--- a/Habitica/res/layout/purchase_gem_view.xml
+++ b/Habitica/res/layout/purchase_gem_view.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/gem_view_background"
+    android:background="@drawable/layout_rounded_bg_window"
     android:gravity="center"
               android:padding="14dp">
     <ImageView
@@ -20,14 +20,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center">
-        <ImageView
-            android:id="@+id/amount_background_right"
+        <FrameLayout
             android:layout_width="30dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:scaleType="fitStart"
             android:layout_marginEnd="8dp"
-            />
+            android:clipChildren="true"
+            android:clipToPadding="true">
+            <ImageView
+                android:id="@+id/amount_background_left"
+                android:layout_width="132dp"
+                android:layout_height="35dp"
+                android:layout_gravity="start"
+                />
+        </FrameLayout>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -37,14 +43,20 @@
         android:layout_gravity="center"
         android:textSize="36sp"
         tools:text="21" />
-        <ImageView
-            android:id="@+id/amount_background_left"
+        <FrameLayout
             android:layout_width="30dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:scaleType="fitEnd"
             android:layout_marginStart="8dp"
-            />
+            android:clipChildren="true"
+            android:clipToPadding="true">
+            <ImageView
+                android:id="@+id/amount_background_right"
+                android:layout_width="132dp"
+                android:layout_height="35dp"
+                android:layout_gravity="end"
+                />
+        </FrameLayout>
     </LinearLayout>
 
     <TextView
@@ -56,14 +68,18 @@
         android:gravity="center"
         android:layout_marginBottom="14dp" />
 
-    <Button
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="38dp"
         android:id="@+id/purchase_button"
         android:background="@drawable/purchase_button_background"
-        android:layout_marginHorizontal="8dp"
         android:textColor="@color/white"
-        style="@style/Body1"
+        android:gravity="center"
+        android:textSize="16sp"
+        android:letterSpacing="0.02"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_small"
         tools:text="$ 4.99"/>
     <TextView
         android:id="@+id/footer_text_view"
@@ -71,7 +87,6 @@
         android:layout_height="wrap_content"
         android:textColor="#CAC7CE"
         android:visibility="gone"
-        android:layout_marginTop="2dp"
         android:layout_marginBottom="4dp"
         android:layout_gravity="center"
         android:gravity="center"
diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index ca23fa519..bbfb27cfe 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -3,7 +3,6 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:clickable="true"
                 android:background="@color/content_background"
                 android:focusable="true">
@@ -36,7 +35,6 @@
                 android:textColor="@color/text_quad"
                 tools:text="150"
                 style="@style/Body1"
-                app:hasLightBackground="true"
                 android:textSize="15sp" />
             <TextView
                 android:id="@+id/unlockLabel"
@@ -48,7 +46,7 @@
                 android:textSize="11sp"
                 android:textColor="@color/text_quad"
                 android:paddingStart="2dp"
-                android:paddingRight="2dp"
+                android:paddingEnd="2dp"
                 />
         </LinearLayout>
     </LinearLayout>
@@ -58,7 +56,7 @@
         android:layout_height="@dimen/shopitem_status_size"
         android:visibility="gone"
         tools:visibility="visible"
-        android:layout_alignLeft="@id/container"
+        android:layout_alignStart="@id/container"
         android:layout_alignTop="@id/container"
         android:gravity="center"
         android:scaleType="center"
@@ -67,11 +65,11 @@
         android:id="@+id/item_detail_indicator"
         android:layout_width="@dimen/shopitem_status_size"
         android:layout_height="@dimen/shopitem_status_size"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:visibility="gone"
-        android:layout_alignRight="@id/container"
+        android:layout_alignEnd="@id/container"
         android:gravity="center"
         android:textColor="@color/white"
-        android:layout_marginRight="-4dp"
+        android:layout_marginEnd="-4dp"
         android:textSize="12sp" />
 </RelativeLayout>
diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml
index c0cb26661..d89e38410 100644
--- a/Habitica/res/layout/shop_header.xml
+++ b/Habitica/res/layout/shop_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mrge xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -26,7 +26,7 @@
         android:background="@drawable/name_plate"
         android:gravity="center_vertical"
         android:textColor="@color/white"
-        android:layout_marginLeft="45dp"
+        android:layout_marginStart="45dp"
         android:layout_marginTop="83dp"
         android:textStyle="bold" />
     <TextView
@@ -39,4 +39,4 @@
         android:layout_marginBottom="4dp"
         style="@style/Body1"
         tools:text="Welcome to the Market! Stock up on new gear or buy rare eggs and potions. Check in periodically for new stock." />
-</mrge>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/system_chat_message.xml b/Habitica/res/layout/system_chat_message.xml
index 5c775e01c..17c4fa78f 100644
--- a/Habitica/res/layout/system_chat_message.xml
+++ b/Habitica/res/layout/system_chat_message.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="55dp"
-    android:paddingRight="@dimen/chat_horizontal_inset"
+    android:paddingStart="55dp"
+    android:paddingEnd="@dimen/chat_horizontal_inset"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
     android:background="@color/window_background">
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="@dimen/spacing_large"
-        android:textColor="@color/brand_300"
+        android:textColor="@color/text_brand_neon"
         tools:text="System message"
         style="@style/Body1"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/task_main_content.xml b/Habitica/res/layout/task_main_content.xml
index a9c250ca6..c81d7ad95 100644
--- a/Habitica/res/layout/task_main_content.xml
+++ b/Habitica/res/layout/task_main_content.xml
@@ -47,6 +47,7 @@
             android:layout_height="wrap_content"
             style="@style/Caption4"
             android:text="@string/pending_approval"
+            android:textColor="@color/text_quad"
             />
         <Space
             android:layout_width="wrap_content"
@@ -62,16 +63,18 @@
                 android:layout_height="@dimen/task_icon_size"
                 android:scaleType="center"
                 app:srcCompat="@drawable/task_icon_calendar"
-                android:layout_marginEnd="2dp"/>
+                android:layout_marginEnd="2dp"
+                app:tint="@color/text_dimmed"
+                app:tintMode="multiply"/>
             <TextView
                 android:id="@+id/specialTaskText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textColor="@color/task_secondary_text"
                 android:visibility="invisible"
                 style="@style/Caption3"
                 tools:visibility="visible"
+                android:textColor="@color/text_quad"
                 tools:text="special"  />
 
             <TextView
@@ -79,9 +82,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/task_icon_size"
                 android:layout_marginStart="@dimen/task_icon_space"
-                android:drawableStart="@drawable/task_icon_streak"
+                app:drawableStartCompat="@drawable/task_icon_streak"
+                app:drawableTint="@color/text_dimmed"
+                app:drawableTintMode="multiply"
                 android:drawablePadding="2dp"
-                android:textColor="@color/task_secondary_text"
+                android:textColor="@color/text_quad"
                 tools:text="10"
                 android:gravity="center_vertical"
                 style="@style/Caption3" />
@@ -93,7 +98,9 @@
                 android:layout_marginStart="@dimen/task_icon_space"
                 android:contentDescription="@string/belongs_to_challenge"
                 android:scaleType="center"
-                app:srcCompat="@drawable/task_megaphone" />
+                app:srcCompat="@drawable/task_megaphone"
+                app:tint="@color/text_dimmed"
+                app:tintMode="multiply" />
             <ImageView
                 android:id="@+id/iconviewReminder"
                 android:layout_width="@dimen/task_icon_size"
@@ -101,12 +108,14 @@
                 android:layout_marginStart="@dimen/task_icon_space"
                 android:contentDescription="@string/has_reminder"
                 android:scaleType="center"
-                app:srcCompat="@drawable/task_icon_reminder" />
+                app:srcCompat="@drawable/task_icon_reminder"
+                app:tint="@color/text_dimmed"
+                app:tintMode="multiply"/>
             <TextView
                 android:id="@+id/reminder_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/task_secondary_text"
+                android:textColor="@color/text_quad"
                 style="@style/Caption3" />
         </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 2c0698523..c11dc9160 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/colorContentBackground"
     android:foreground="?selectableItemBackground"
     android:orientation="vertical">
@@ -30,14 +31,26 @@
                 <FrameLayout
                     android:id="@+id/checkBoxHolder"
                     android:layout_width="@dimen/button_width"
-                    android:layout_height="match_parent">
-                    <CheckBox
-                        android:id="@+id/checkBox"
-                        android:layout_width="@dimen/checkbox_size"
-                        android:layout_height="@dimen/checkbox_size"
+                    android:layout_height="match_parent"
+                    tools:background="@color/red_10">
+                    <View
+                        android:id="@+id/checkBoxBackground"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:gravity="center"
+                        android:background="@drawable/todo_unchecked"
+                        android:layout_gravity="center" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/task_tint_overlay"/>
+                    <ImageView
+                        android:id="@+id/checkmark"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
                         android:layout_gravity="center"
-                        android:button="@drawable/todo_checkbox"
-                        android:gravity="center" />
+                        android:scaleType="center"
+                        android:src="@drawable/checkmark" />
                 </FrameLayout>
                 <include layout="@layout/task_main_content" />
                 <ProgressBar
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 4a3af252c..488271dcf 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -107,15 +107,6 @@
             android:id="@+id/openChallengeDetail"
             app:destination="@id/challengeDetailFragment" />
     </fragment>
-    <fragment
-        android:id="@+id/shopsFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment"
-        android:label="@string/sidebar_shops" >
-        <argument
-            android:name="selectedTab"
-            app:argType="integer"
-            android:defaultValue="0" />
-    </fragment>
     <fragment
         android:id="@+id/avatarOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment"
@@ -434,5 +425,5 @@
     <fragment
         android:id="@+id/promoInfoFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment"
-        android:label="PromoInfoFragment" />
+        android:label="" />
 </navigation>
\ No newline at end of file
diff --git a/Habitica/res/values-night/colors.tavern.xml b/Habitica/res/values-night/colors.tavern.xml
index 1960e2e45..7ae5acbb0 100644
--- a/Habitica/res/values-night/colors.tavern.xml
+++ b/Habitica/res/values-night/colors.tavern.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="tavern.nolikes.background">#121212</color>
-    <color name="tavern.somelikes.background">#333333</color>
+    <color name="tavern.nolikes.background">#0A0A0A</color>
+    <color name="tavern.somelikes.background">#464646</color>
     <color name="tavern.userliked.background">@color/text_green</color>
-    <color name="tavern.nolikes.foreground">#4D4D4D</color>
-    <color name="tavern.somelikes.foreground">#000000</color>
-    <color name="tavern.userliked.foreground">#000000</color>
+    <color name="tavern.nolikes.foreground">@color/gray_400</color>
+    <color name="tavern.somelikes.foreground">@color/gray_700</color>
+    <color name="tavern.userliked.foreground">@color/gray_700</color>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
index e303e312d..5ff23ba2f 100644
--- a/Habitica/res/values-night/colors.xml
+++ b/Habitica/res/values-night/colors.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="color_accent">@color/brand_300</color>
+    <color name="color_accent">@color/brand_400</color>
     <color name="text_primary">@color/gray_600</color>
     <color name="text_secondary">@color/gray_500</color>
     <color name="text_ternary">@color/gray_400</color>
-    <color name="text_quad">@color/gray_400</color>
+    <color name="text_quad">@color/gray_300</color>
     <color name="text_dimmed">@color/gray_200</color>
     <color name="text_brand">@color/brand_400</color>
     <color name="text_brand_neon">@color/brand_500</color>
@@ -26,17 +26,35 @@
     <color name="disabled_background">@color/gray_200</color>
     <color name="separator">@color/gray_200</color>
     <color name="system_bars">@color/gray_1</color>
-    <color name="habit_inactive_gray">@color/gray_50</color>
+    <color name="habit_inactive_gray">@color/gray_10</color>
     <color name="equipment_overview_background">@color/gray_10</color>
     <color name="inverted_background">@color/gray_10</color>
     <color name="inverted_background_offset">@color/gray_50</color>
+    <color name="background_red">@color/red_10</color>
+    <color name="background_orange">@color/orange_10</color>
+    <color name="background_yellow">@color/yellow_5</color>
+    <color name="background_green">@color/green_10</color>
+    <color name="background_blue">@color/blue_10</color>
+    <color name="background_teal">@color/teal_10</color>
+    <color name="background_brand">@color/brand_200</color>
 
-    <color name="checkbox_fill">#50ffffff</color>
+    <color name="checkbox_fill">#40000000</color>
     <color name="taskform_gray">#3D3945</color>
+    <color name="reward_buy_button_text">#FFFFB445</color>
+    <color name="task_tint_overlay">#4D19171C</color>
 
     <color name="content_95_alpha">#f21A181D</color>
     <color name="content_80_alpha">#cc1A181D</color>
     <color name="content_75_alpha">#bf1A181D</color>
     <color name="content_50_alpha">#7f1A181D</color>
     <color name="content_15_alpha">#261A181D</color>
+
+    <color name="text_red_white">@color/white</color>
+    <color name="text_orange_white">@color/white</color>
+    <color name="text_yellow_white">@color/white</color>
+    <color name="text_green_white">@color/white</color>
+    <color name="text_blue_white">@color/white</color>
+    <color name="text_teal_white">@color/white</color>
+    <color name="text_brown_white">@color/white</color>
+    <color name="text_brand_white">@color/white</color>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 0ecb2be9b..bed48aedd 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -148,4 +148,8 @@
         <attr name="maxValue" format="integer" />
         <attr name="minValue" format="integer" />
     </declare-styleable>
+    <declare-styleable name="DayNightTextView">
+        <attr name="dayTextColor" format="color" />
+        <attr name="nightTextColor" format="color" />
+    </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index f634bfc02..875cfa0bf 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -99,8 +99,6 @@
 
     <color name="habit_inactive_gray">#F9F9F9</color>
 
-    <!-- Preferences -->
-    <color name="preference_fallback_accent_color">@color/colorAccent</color>
     <!-- buttons -->
     <color name="btn_success">@color/green_10</color>
     <color name="btn_danger">@color/red_10</color>
@@ -139,6 +137,7 @@
     <color name="hair_red">#EC720E</color>
     <color name="hair_black">#313131</color>
     <color name="reward_buy_button_bg">#4cfedead</color>
+    <color name="reward_buy_button_text">#D9784A00</color>
     <color name="ic_launcher_background">#331960</color>
     <color name="scrollbarThumb">@color/content_background_offset</color>
     <color name="setup_background">#efeff4</color>
@@ -153,8 +152,6 @@
     <color name="orange_1">#7f3300</color>
 
 
-
-
     <color name="color_accent">@color/brand_400</color>
 
     <color name="text_primary">@color/gray_50</color>
@@ -185,13 +182,30 @@
     <color name="equipment_overview_background">@color/gray_50</color>
     <color name="inverted_background">@color/gray_100</color>
     <color name="inverted_background_offset">@color/gray_200</color>
+    <color name="background_red">@color/red_50</color>
+    <color name="background_orange">@color/orange_50</color>
+    <color name="background_yellow">@color/yellow_10</color>
+    <color name="background_green">@color/green_50</color>
+    <color name="background_blue">@color/blue_50</color>
+    <color name="background_teal">@color/teal_50</color>
+    <color name="background_brand">@color/brand_300</color>
 
     <color name="checkbox_fill">#50ffffff</color>
     <color name="taskform_gray">#99edecee</color>
+    <color name="task_tint_overlay">#00000000</color>
 
     <color name="content_95_alpha">#f2ffffff</color>
     <color name="content_80_alpha">#ccffffff</color>
     <color name="content_75_alpha">#bfffffff</color>
     <color name="content_50_alpha">#7fffffff</color>
     <color name="content_15_alpha">#26ffffff</color>
+
+    <color name="text_red_white">@color/red_10</color>
+    <color name="text_orange_white">@color/orange_10</color>
+    <color name="text_yellow_white">@color/yellow_10</color>
+    <color name="text_green_white">@color/green_10</color>
+    <color name="text_blue_white">@color/blue_10</color>
+    <color name="text_teal_white">@color/teal_10</color>
+    <color name="text_brown_white">#7f3300</color>
+    <color name="text_brand_white">@color/brand_300</color>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 8da6df30b..72c0a4a19 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1105,4 +1105,5 @@
     <string name="dark_mode">Dark Mode</string>
     <string name="theme_mode">Theme Mode</string>
     <string name="theme_color">Theme Color</string>
+    <string name="submit_feedback">Submit Feedback</string>
 </resources>
diff --git a/Habitica/res/values/styles.challenges.xml b/Habitica/res/values/styles.challenges.xml
index 3c22d9e79..2e93580f2 100644
--- a/Habitica/res/values/styles.challenges.xml
+++ b/Habitica/res/values/styles.challenges.xml
@@ -4,7 +4,7 @@
         <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_condensed
         </item>
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#000</item>
+        <item name="android:textColor">@color/text_primary</item>
     </style>
 
     <style name="ChallengeTaskDetails">
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 8308b60cc..3cd91fa77 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -62,9 +62,9 @@
 
     <style name="MainAppTheme.Dark">
         <item name="colorPrimary">@color/gray_500</item>
-        <item name="barColor">@color/gray_10</item>
-        <item name="colorPrimaryOffset">@color/gray_300</item>
-        <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="barColor">@color/gray_1</item>
+        <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_400</item>
     </style>
 
     <style name="MainAppTheme.Red">
@@ -89,6 +89,7 @@
     <style name="MainAppTheme.Red.Dark">
         <item name="barColor">@color/gray_10</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
     </style>
 
     <style name="MainAppTheme.Maroon">
@@ -112,6 +113,7 @@
     <style name="MainAppTheme.Maroon.Dark">
         <item name="barColor">@color/gray_10</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
     </style>
 
     <style name="MainAppTheme.Orange">
@@ -136,6 +138,7 @@
     <style name="MainAppTheme.Orange.Dark">
         <item name="barColor">@color/gray_10</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
     </style>
 
     <style name="MainAppTheme.Yellow">
@@ -160,6 +163,7 @@
     <style name="MainAppTheme.Yellow.Dark">
         <item name="barColor">@color/gray_10</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
     </style>
 
     <style name="MainAppTheme.Green">
@@ -184,6 +188,7 @@
     <style name="MainAppTheme.Green.Dark">
         <item name="barColor">@color/gray_10</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
     </style>
 
     <style name="MainAppTheme.Teal">
@@ -208,6 +213,7 @@
     <style name="MainAppTheme.Teal.Dark">
         <item name="barColor">@color/gray_10</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
     </style>
 
     <style name="MainAppTheme.Blue">
@@ -232,6 +238,7 @@
     <style name="MainAppTheme.Blue.Dark">
         <item name="barColor">@color/gray_10</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
+        <item name="textColorPrimaryDark">@color/gray_200</item>
     </style>
 
     <style name="BottomSheetTheme" parent="Theme.AppCompat.NoActionBar">
@@ -250,7 +257,7 @@
     </style>
 
 
-    <style name="PopupTheme" parent="Widget.AppCompat.Light.PopupMenu">
+    <style name="PopupTheme" parent="Widget.AppCompat.PopupMenu.Overflow">
         <item name="android:popupBackground">@color/content_background</item>
     </style>
 
@@ -273,8 +280,9 @@
         <item name="android:padding">@dimen/card_padding_compact</item>
     </style>
 
-    <style name="CardView.Default" parent="CardView">
+    <style name="CardView.Default" parent="Widget.MaterialComponents.CardView">
         <item name="android:layout_margin">@dimen/card_margin</item>
+        <item name="android:backgroundTint">@color/window_background</item>
     </style>
 
     <style name="RowWrapper">
@@ -346,7 +354,20 @@
     </style>
 
     <style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@color/brand_400</item>
+        <item name="colorPrimary">@color/text_brand_neon</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+    </style>
+
+
+    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/text_red</item>
+    </style>
+
+    <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/dialog_button_text_color</item>
     </style>
 
     <style name="HabiticaAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
@@ -402,7 +423,8 @@
     </style>
 
     <style name="GemPurchaseListItem">
-        <item name="android:textColor">@color/brand_300</item>
+        <item name="dayTextColor">@color/text_brand</item>
+        <item name="nightTextColor">@color/gray_400</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:textSize">12sp</item>
         <item name="android:drawableLeft">@drawable/ic_check_purple</item>
@@ -548,6 +570,7 @@
     <style name="LoginButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:shadowColor">@color/transparent</item>
         <item name="android:background">@drawable/login_button</item>
+        <item name="backgroundTint">@color/brand_50</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:layout_gravity">center_horizontal</item>
         <item name="android:textAllCaps">false</item>
@@ -588,6 +611,7 @@
     <style name="HabiticaButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0.02</item>
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:minHeight">@dimen/button_height</item>
         <item name="android:textColor">@color/white</item>
@@ -601,6 +625,7 @@
     <style name="HabiticaButton.Borderless" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0.02</item>
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:minHeight">@dimen/button_height</item>
         <item name="android:shadowColor">@color/transparent</item>
@@ -612,7 +637,7 @@
 
     <style name="HabiticaButton.Primary" parent="HabiticaButton">
         <item name="android:backgroundTint">@color/color_accent</item>
-        <item name="android:text">?textColorPrimaryDark</item>
+        <item name="android:textColor">?textColorPrimaryDark</item>
     </style>
 
     <style name="HabiticaButton.Small" parent="HabiticaButton">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index fdad191f0..a52c17d83 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -54,7 +54,6 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentO
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment;
@@ -207,8 +206,6 @@ public interface UserComponent {
 
     void inject(InboxMessageListFragment inboxMessageListFragment);
 
-    void inject(ShopsFragment shopsFragment);
-
     void inject(ShopFragment shopFragment);
 
     void inject(PushNotificationManager pushNotificationManager);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
index cc5295c13..19fa5a2fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
@@ -11,5 +11,5 @@ interface ContentRepository {
     fun retrieveContent(context: Context?): Flowable<ContentResult>
     fun retrieveContent(context: Context?, forced: Boolean): Flowable<ContentResult>
 
-    fun retrieveWorldState(): Flowable<WorldState>
+    fun retrieveWorldState(context: Context?): Flowable<WorldState>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index 061e1cba1..a43f03908 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -210,9 +210,9 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
     }
 
     override fun feedPet(pet: Pet, food: Food): Flowable<FeedResponse> {
-        return apiClient.feedPet(pet.key, food.key)
+        return apiClient.feedPet(pet.key ?: "", food.key)
                 .doOnNext { feedResponse ->
-                    localRepository.feedPet(food.key, pet.key, feedResponse.value ?: 0, userID)
+                    localRepository.feedPet(food.key, pet.key ?: "", feedResponse.value ?: 0, userID)
                 }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index f5e34b563..cdee022e5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -95,7 +95,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
     }
 
     override fun sleep(user: User): Flowable<User> {
-        localRepository.executeTransaction { user.preferences?.isSleep = !(user.preferences?.sleep ?: false) }
+        localRepository.executeTransaction { user.preferences?.sleep = !(user.preferences?.sleep ?: false) }
         return apiClient.sleep().map { user }
     }
 
@@ -211,7 +211,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
                 .doOnNext { user ->
                     localRepository.executeTransaction {
                         user.authentication?.localAuthentication?.username = newLoginName
-                        user.flags?.isVerifiedUsername = true
+                        user.flags?.verifiedUsername = true
                     }
                 }
                 .firstElement()
@@ -290,8 +290,8 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         if (user != null && appConfigManager.enableLocalChanges()) {
             localRepository.executeTransaction {
                 when (type) {
-                    "skin" -> user.preferences?.setSkin(identifier)
-                    "shirt" -> user.preferences?.setShirt(identifier)
+                    "skin" -> user.preferences?.skin =identifier
+                    "shirt" -> user.preferences?.shirt = identifier
                     "hair" -> {
                         when (category) {
                             "color" -> user.preferences?.hair?.color = identifier
@@ -302,8 +302,8 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
                             "base" -> user.preferences?.hair?.base = identifier.toInt()
                         }
                     }
-                    "background" -> user.preferences?.setBackground(identifier)
-                    "chair" -> user.preferences?.setChair(identifier)
+                    "background" -> user.preferences?.background = identifier
+                    "chair" -> user.preferences?.chair = identifier
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
index 1f3b97fe7..ae44e22f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.inventory.Animal
 
-fun Animal.getTranslatedType(c: Context?): String {
+fun Animal.getTranslatedType(c: Context?): String? {
     if (c == null) {
         return type
     }
@@ -15,7 +15,7 @@ fun Animal.getTranslatedType(c: Context?): String {
         "wacky"   -> c.getString(R.string.wacky)
         "special" -> c.getString(R.string.special)
         "premium" -> c.getString(R.string.magic_potion)
-        else      -> {
+        else -> {
             type
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
index f90bb8e51..dcbf71eca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.helpers
 
 import android.os.Bundle
+import android.util.Log
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
 import java.lang.ref.WeakReference
@@ -21,7 +22,11 @@ object MainNavigationController {
             lastNavigation = Date()
             try {
                 navController?.get()?.navigate(transactionId, args)
-            } catch (_: IllegalArgumentException) {}
+            } catch (e: IllegalArgumentException) {
+                Log.e("Main Navigation", e.localizedMessage)
+            } catch (error: Exception) {
+                Log.e("Main Navigation", error.localizedMessage)
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
index 8cc768194..71c44d2cf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
@@ -124,7 +124,7 @@ class ScoreTaskLocallyInteractor {
             var totalPerception = levelStat
 
             totalStrength += user.stats?.buffs?.str?.toInt() ?: 0
-            totalIntelligence += user.stats?.buffs?.get_int()?.toInt() ?: 0
+            totalIntelligence += user.stats?.buffs?._int?.toInt() ?: 0
             totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0
             totalPerception += user.stats?.buffs?.per?.toInt() ?: 0
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
index f122dae58..24e37bd57 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
@@ -12,10 +12,10 @@ interface Avatar {
     val sleep: Boolean
     val stats: Stats?
     val preferences: AvatarPreferences?
-    val gemCount: Int?
-    val hourglassCount: Int?
+    val gemCount: Int
+    val hourglassCount: Int
     val costume: Outfit?
     val equipped: Outfit?
     fun hasClass(): Boolean
-    val isValid: Boolean
+    fun isValid(): Boolean
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt
index 211909ca1..47a7e5255 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt
@@ -4,9 +4,9 @@ interface Animal {
     var key: String?
     var text: String?
     var type: String?
-    var animal: String?
-    var color: String?
+    var animal: String
+    var color: String
     var premium: Boolean
-    var numberOwned: Int?
-    var totalNumber: Int?
+    var numberOwned: Int
+    var totalNumber: Int
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
deleted file mode 100644
index 1fd23de3c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmObject;
-import io.realm.annotations.Ignore;
-import io.realm.annotations.PrimaryKey;
-
-public class Mount extends RealmObject implements Animal {
-
-    @PrimaryKey
-    String key;
-    String animal, color, text, type;
-    boolean premium;
-
-    @Ignore
-    private Integer numberOwned;
-
-    @Ignore
-    private Integer totalNumber;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @Override
-    public String getText() {
-        return text;
-    }
-
-    @Override
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    @Override
-    public String getType() {
-        return type;
-    }
-
-    @Override
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getAnimal() {
-        if (animal == null) {
-            return key.split("-")[0];
-        }
-        return animal;
-    }
-
-    public void setAnimal(String animal) {
-        this.animal = animal;
-    }
-
-    public String getColor() {
-        if (color == null) {
-            return key.split("-")[1];
-        }
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public boolean getPremium() {
-        return premium;
-    }
-
-    public void setPremium(boolean premium) {
-        this.premium = premium;
-    }
-
-    public Integer getNumberOwned() {
-        if (numberOwned == null) {
-            return 0;
-        }
-        return numberOwned;
-    }
-
-    public void setNumberOwned(Integer numberOwned) {
-        this.numberOwned = numberOwned;
-    }
-
-    public Integer getTotalNumber() {
-        if (totalNumber == null) {
-            return 0;
-        }
-        return totalNumber;
-    }
-
-    public void setTotalNumber(Integer totalNumber) {
-        this.totalNumber = totalNumber;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.kt
new file mode 100644
index 000000000..3e4386536
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.kt
@@ -0,0 +1,31 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+
+open class Mount : RealmObject(), Animal {
+    @PrimaryKey
+    override var key: String? = null
+    override var animal: String = ""
+        get() {
+            return if (field.isBlank()) {
+                key?.split("-")?.toTypedArray()?.get(0) ?: ""
+            } else field
+        }
+    override var color: String = ""
+        get() {
+            return if (field.isBlank()) {
+                key?.split("-")?.toTypedArray()?.get(1) ?: ""
+            } else field
+        }
+    override var text: String? = null
+    override var type: String? = null
+    override var premium = false
+
+
+    @Ignore
+    override var numberOwned: Int = 0
+    @Ignore
+    override var totalNumber: Int = 0
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
deleted file mode 100644
index 642c2c1fc..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import io.realm.RealmObject;
-import io.realm.annotations.Ignore;
-import io.realm.annotations.PrimaryKey;
-
-public class Pet extends RealmObject implements Animal{
-
-    @PrimaryKey
-    String key;
-    String animal, color, text, type;
-    boolean premium;
-
-    @Ignore
-    private Integer numberOwned;
-
-    @Ignore
-    private Integer totalNumber;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @Override
-    public String getText() {
-        return text;
-    }
-
-
-    @Override
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    @Override
-    public String getType() {
-        return type;
-    }
-
-    @Override
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getAnimal() {
-        if (animal == null) {
-            return getKey().split("-")[0];
-        }
-        return animal;
-    }
-
-    public void setAnimal(String animal) {
-        this.animal = animal;
-    }
-
-    public String getColor() {
-        if (color == null) {
-            return getKey().split("-")[1];
-        }
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public boolean getPremium() {
-        return premium;
-    }
-
-    public void setPremium(boolean premium) {
-        this.premium = premium;
-    }
-
-    public Integer getNumberOwned() {
-        if (numberOwned == null) {
-            return 0;
-        }
-        return numberOwned;
-    }
-
-    public void setNumberOwned(Integer numberOwned) {
-        this.numberOwned = numberOwned;
-    }
-
-    public Integer getTotalNumber() {
-        if (totalNumber == null) {
-            return 0;
-        }
-
-        return totalNumber;
-    }
-
-    public void setTotalNumber(Integer totalNumber) {
-        this.totalNumber = totalNumber;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.kt
new file mode 100644
index 000000000..7d2d69566
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.kt
@@ -0,0 +1,30 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+
+open class Pet : RealmObject(), Animal {
+    @PrimaryKey
+    override var key: String? = null
+    override var animal: String = ""
+    get() {
+        return if (field.isBlank()) {
+            key?.split("-")?.toTypedArray()?.get(0) ?: ""
+        } else field
+    }
+    override var color: String = ""
+    get() {
+        return if (field.isBlank()) {
+            key?.split("-")?.toTypedArray()?.get(1) ?: ""
+        } else field
+    }
+    override var text: String? = null
+    override var type: String? = null
+    override var premium = false
+
+    @Ignore
+    override var numberOwned: Int = 0
+    @Ignore
+    override var totalNumber: Int = 0
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
index 4a80be93c..f59028103 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
@@ -10,7 +10,6 @@ import io.realm.annotations.PrimaryKey
 
 open class Member : RealmObject(), Avatar {
 
-
     @PrimaryKey
     @SerializedName("_id")
     var id: String? = null
@@ -27,7 +26,7 @@ open class Member : RealmObject(), Avatar {
                 this.inbox?.userId = subID
             }
             if (preferences != null && preferences?.isManaged != true) {
-                preferences?.setUserId(subID)
+                preferences?.userId = subID
             }
             if (this.profile != null && this.profile?.isManaged != true) {
                 this.profile?.userId = subID
@@ -45,7 +44,13 @@ open class Member : RealmObject(), Avatar {
                 this.authentication?.userId = subID
             }
         }
-    private var stats: Stats? = null
+    override var stats: Stats? = null
+        set(value) {
+            field = value
+            if (value != null && this.id != null && !value.isManaged) {
+                field?.userId = this.id
+            }
+        }
     var inbox: Inbox? = null
         set(inbox) {
             field = inbox
@@ -53,7 +58,17 @@ open class Member : RealmObject(), Avatar {
                 inbox.userId = this.id
             }
         }
-    private var preferences: MemberPreferences? = null
+    override var preferences: MemberPreferences? = null
+        set(value) {
+            field = value
+            if (value != null && this.id != null && !value.isManaged) {
+                field?.userId = this.id
+            }
+        }
+    override val gemCount: Int
+        get() = 0
+    override val hourglassCount: Int
+        get() = 0
     var profile: Profile? = null
         set(profile) {
             field = profile
@@ -96,11 +111,23 @@ open class Member : RealmObject(), Avatar {
                 items.userId = this.id
             }
         }
-    private var costume: Outfit? = null
-    private var equipped: Outfit? = null
+    override var costume: Outfit? = null
+    set(value) {
+        field = value
+        if (value != null && this.id != null) {
+            field?.userId = this.id + "costume"
+        }
+    }
+    override var equipped: Outfit? = null
+    set(value) {
+        field = value
+        if (value != null && this.id != null) {
+            field?.userId = this.id + "equipped"
+        }
+    }
 
-    private var currentMount: String? = null
-    private var currentPet: String? = null
+    override var currentMount: String? = null
+    override var currentPet: String? = null
 
     var participatesInQuest: Boolean? = null
     var loginIncentives: Int = 0
@@ -120,79 +147,10 @@ open class Member : RealmObject(), Avatar {
     val formattedUsername: String?
         get() = if (username != null) "@$username" else null
 
-    override fun getPreferences(): MemberPreferences? {
-        return preferences
-    }
-
-    fun setPreferences(preferences: MemberPreferences?) {
-        this.preferences = preferences
-        if (preferences != null && this.id != null && !preferences.isManaged) {
-            preferences.setUserId(this.id ?: "")
-        }
-    }
-
-    override fun getStats(): Stats? {
-        return stats
-    }
-
-    fun setStats(stats: Stats?) {
-        this.stats = stats
-        if (stats != null && this.id != null && !stats.isManaged) {
-            stats.userId = this.id
-        }
-    }
-
-    override fun getGemCount(): Int? {
-        return 0
-    }
-
-    override fun getHourglassCount(): Int? {
-        return 0
-    }
-
-    override fun getCostume(): Outfit? {
-        return costume
-    }
-
-    fun setCostume(costume: Outfit?) {
-        this.costume = costume
-        if (costume != null && this.id != null) {
-            costume.userId = this.id + "costume"
-        }
-    }
-
-    override fun getEquipped(): Outfit? {
-        return equipped
-    }
-
     override fun hasClass(): Boolean {
         return preferences?.disableClasses == false && stats?.habitClass?.isNotEmpty() == true
     }
 
-    fun setEquipped(equipped: Outfit?) {
-        this.equipped = equipped
-        if (equipped != null && this.id != null) {
-            equipped.userId = this.id + "equipped"
-        }
-    }
-
-    override fun getCurrentMount(): String? {
-        return currentMount
-    }
-
-    fun setCurrentMount(currentMount: String) {
-        this.currentMount = currentMount
-    }
-
-    override fun getCurrentPet(): String? {
-        return currentPet
-    }
-
-    fun setCurrentPet(currentPet: String) {
-        this.currentPet = currentPet
-    }
-
-    override fun getSleep(): Boolean {
-        return getPreferences()?.sleep ?: false
-    }
+    override val sleep: Boolean
+        get() = preferences?.sleep ?: false
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
index 011d2a9c8..d764ba74e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
@@ -10,104 +10,31 @@ import io.realm.annotations.PrimaryKey
 open class MemberPreferences : RealmObject(), AvatarPreferences {
 
     @PrimaryKey
-    private var userId: String? = null
-
-    private var hair: Hair? = null
-    private var costume: Boolean = false
-    private var disableClasses: Boolean = false
-    private var sleep: Boolean = false
-    private var shirt: String? = null
-    private var skin: String? = null
-    private var size: String? = null
-    private var background: String? = null
-    private var chair: String? = null
-
-    fun setUserId(userId: String) {
-        this.userId = userId
-        if (hair != null && !hair!!.isManaged) {
-            hair!!.userId = userId
+    override var userId: String? = null
+    set(value) {
+        field = value
+        if (hair?.isManaged != true) {
+            hair?.userId = userId
         }
     }
 
-    override fun getUserId(): String? {
-        return userId
-    }
-
-    override fun getHair(): Hair? {
-        return hair
-    }
-
-    fun setHair(hair: Hair) {
-        this.hair = hair
-    }
-
-    override fun getCostume(): Boolean {
-        return costume
-    }
-
-    fun setCostume(costume: Boolean) {
-        this.costume = costume
-    }
-
-    override fun getDisableClasses(): Boolean {
-        return disableClasses
-    }
-
-    fun setDisableClasses(disableClasses: Boolean) {
-        this.disableClasses = disableClasses
-    }
-
-    override fun getSleep(): Boolean {
-        return sleep
-    }
-
-    fun setSleep(sleep: Boolean) {
-        this.sleep = sleep
-    }
-
-    override fun getShirt(): String? {
-        return shirt
-    }
-
-    fun setShirt(shirt: String) {
-        this.shirt = shirt
-    }
-
-    override fun getSkin(): String? {
-        return skin
-    }
-
-    fun setSkin(skin: String) {
-        this.skin = skin
-    }
-
-    override fun getSize(): String? {
-        return size
-    }
-
-    fun setSize(size: String) {
-        this.size = size
-    }
-
-    override fun getBackground(): String? {
-        return background
-    }
-
-    fun setBackground(background: String) {
-        this.background = background
-    }
-
-    override fun getChair(): String? {
-        return if (chair != null && chair != "none") {
-            if (chair!!.length > 5 && chair!!.substring(0, 6) != "chair_") {
-                chair
+    override var hair: Hair? = null
+    override var costume: Boolean = false
+    override var disableClasses: Boolean = false
+    override var sleep: Boolean = false
+    override var shirt: String? = null
+    override var skin: String? = null
+    override var size: String? = null
+    override var background: String? = null
+    override var chair: String? = null
+    get() {
+        return if (field != null && field != "none") {
+            if (field!!.length > 5 && field?.substring(0, 6) != "chair_") {
+                field
             } else {
-                "chair_" + chair!!
+                "chair_$field"
             }
         } else null
     }
 
-    fun setChair(chair: String) {
-        this.chair = chair
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
index 74c348dda..83b28dabe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
@@ -23,8 +23,8 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         get() = "fall_extra_gems"
     override val promoType: PromoType
         get() = PromoType.GEMS_AMOUNT
-    override val startDate: Date = startDate ?: DateUtils.createDate(2020, 9, 22)
-    override val endDate: Date = endDate ?: DateUtils.createDate(2020, 9, 30)
+    override val startDate: Date = startDate ?: DateUtils.createDate(2020, 8, 22)
+    override val endDate: Date = endDate ?: DateUtils.createDate(2020, 8, 30)
 
     override fun pillBackgroundDrawable(context: Context): Drawable {
         return ContextCompat.getDrawable(context, R.drawable.fall_promo_pill_bg) ?: ShapeDrawable()
@@ -57,7 +57,7 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
                 ContextCompat.getDrawable(context, R.drawable.fall_promo_menu_right)
         )
 
-        view.binding.button.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_1)
+        view.binding.button.backgroundTintList = ContextCompat.getColorStateList(context, R.color.gray_1)
         view.binding.button.setText(R.string.learn_more)
         view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.white))
         view.binding.button.setOnClickListener {
@@ -136,7 +136,7 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         fragment.binding?.promptButton?.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
 
         fragment.binding?.instructionDescriptionView?.text = context.getString(R.string.fall_promo_info_instructions, formatter.format(startDate), formatter.format(endDate))
-        val limitationsFormatter = SimpleDateFormat.getDateTimeInstance()
+        val limitationsFormatter = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG)
         fragment.binding?.limitationsDescriptionView?.text = context.getString(R.string.gems_promo_info_limitations, limitationsFormatter.format(startDate), limitationsFormatter.format(endDate))
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
index 4fe32a1bf..bc8e23e76 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
@@ -38,8 +38,8 @@ abstract class HabiticaPromotion {
 
 fun getHabiticaPromotionFromKey(key: String, startDate: Date?, endDate: Date?): HabiticaPromotion? {
     return when (key) {
-        "fall_extra_gems" -> FallExtraGemsHabiticaPromotion(startDate, endDate)
-        "spooky_extra_gems" -> SpookyExtraGemsHabiticaPromotion(startDate, endDate)
+        "fall_extra_gems", "fall2020", "testFall2020" -> FallExtraGemsHabiticaPromotion(startDate, endDate)
+        "spooky_extra_gems", "fall2020SecondPromo", "spooky2020" -> SpookyExtraGemsHabiticaPromotion(startDate, endDate)
         else -> null
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt
index 030c48b7c..7c2c65798 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt
@@ -23,19 +23,19 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
         get() = "spooky_extra_gems"
     override val promoType: PromoType
         get() = PromoType.GEMS_AMOUNT
-    override val startDate: Date = startDate ?: DateUtils.createDate(2020, 10, 29)
-    override val endDate: Date = endDate ?: DateUtils.createDate(2020, 11, 2)
+    override val startDate: Date = startDate ?: DateUtils.createDate(2020, 9, 29)
+    override val endDate: Date = endDate ?: DateUtils.createDate(2020, 10, 2)
 
     override fun pillBackgroundDrawable(context: Context): Drawable {
         return ContextCompat.getDrawable(context, R.drawable.spooky_promo_pill_bg) ?: ShapeDrawable()
     }
 
     override fun backgroundColor(context: Context): Int {
-        return ContextCompat.getColor(context, R.color.gray_1)
+        return ContextCompat.getColor(context, R.color.gray_10)
     }
 
     override fun promoBackgroundDrawable(context: Context): Drawable {
-        return ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_1)
+        return ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_10)
                 ?: ShapeDrawable()
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
index cd6b32c81..a6e246422 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.models.social
 
 import com.habitrpg.android.habitica.models.Avatar
-import com.habitrpg.android.habitica.models.AvatarPreferences
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Outfit
 import com.habitrpg.android.habitica.models.user.Preferences
@@ -18,47 +17,32 @@ open class UserStyles : RealmObject(), Avatar {
             preferences?.userId = id
             items?.userId = id
         }
-    override fun getCurrentMount(): String? {
-        return items?.currentMount
-    }
 
-    override fun getCurrentPet(): String? {
-        return items?.currentPet
-    }
+    override val currentMount: String?
+        get() = items?.currentMount
 
-    override fun getSleep(): Boolean {
-        return false
-    }
+    override val currentPet: String?
+        get() = items?.currentPet
 
-    override fun getStats(): Stats? {
-        return stats
-    }
+    override val sleep: Boolean
+        get() = false
 
-    override fun getPreferences(): AvatarPreferences? {
-        return preferences
-    }
+    override val gemCount: Int
+        get() = 0
+    override val hourglassCount: Int
+        get() = 0
 
-    override fun getGemCount(): Int {
-        return 0
-    }
+    override val costume: Outfit?
+        get() = items?.gear?.costume
 
-    override fun getHourglassCount(): Int {
-        return 0
-    }
-
-    override fun getCostume(): Outfit? {
-        return items?.gear?.costume
-    }
-
-    override fun getEquipped(): Outfit? {
-        return items?.gear?.equipped
-    }
+    override val equipped: Outfit?
+        get() = items?.gear?.equipped
 
     override fun hasClass(): Boolean {
         return false
     }
 
-    private var stats: Stats? = null
-    private var preferences: Preferences? = null
+    override var stats: Stats? = null
+    override var preferences: Preferences? = null
     private var items: Items? = null
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
index ff2cde0ba..735569bda 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
@@ -19,7 +19,7 @@ open class Flags : RealmObject() {
     var armoireEnabled = false
     var armoireOpened = false
     var armoireEmpty = false
-    var isCommunityGuidelinesAccepted = false
-    var isVerifiedUsername = false
+    var communityGuidelinesAccepted = false
+    var verifiedUsername = false
     var isWarnedLowHealth = false
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index 8d450cfc4..caf02668f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -11,23 +11,41 @@ import java.util.*
 open class Preferences : RealmObject(), AvatarPreferences {
 
     @PrimaryKey
-    private var userId: String? = null
+    override var userId: String? = null
+    set(value) {
+        field = value
+        if (hair?.isManaged == false) {
+            hair?.userId = value
+        }
+        if (suppressModals?.isManaged == false) {
+            suppressModals?.userId = value
+        }
+    }
 
-    private var hair: Hair? = null
+    override var hair: Hair? = null
     var suppressModals: SuppressedModals? = null
-    private var costume: Boolean = false
+    override var costume: Boolean = false
     @SerializedName("disableClasses")
-    var isDisableClasses: Boolean = false
+    override var disableClasses: Boolean = false
     @SerializedName("sleep")
-    var isSleep: Boolean = false
+    override var sleep: Boolean = false
     var dailyDueDefaultView: Boolean = false
     var automaticAllocation: Boolean = false
     var allocationMode: String? = null
-    private var shirt: String? = null
-    private var skin: String? = null
-    private var size: String? = null
-    private var background: String? = null
-    private var chair: String? = null
+    override var shirt: String? = null
+    override var skin: String? = null
+    override var size: String? = null
+    override var background: String? = null
+    override var chair: String? = null
+    get() {
+        return if (field != null && field != "none") {
+            if (field?.contains("chair_") == true) {
+                field
+            } else {
+                "chair_" + field!!
+            }
+        } else null
+    }
     var language: String? = null
     var sound: String? = null
     var dayStart: Int = 0
@@ -37,90 +55,6 @@ open class Preferences : RealmObject(), AvatarPreferences {
     var emailNotifications: EmailNotificationsPreference? = null
     var autoEquip: Boolean = true
 
-    override fun getBackground(): String? {
-        return background
-    }
-
-    fun setBackground(background: String) {
-        this.background = background
-    }
-
-    override fun getCostume(): Boolean {
-        return costume
-    }
-
-    fun setCostume(costume: Boolean) {
-        this.costume = costume
-    }
-
-    override fun getDisableClasses(): Boolean {
-        return isDisableClasses
-    }
-
-    override fun getSleep(): Boolean {
-        return isSleep
-    }
-
-    override fun getShirt(): String? {
-        return shirt
-    }
-
-    fun setShirt(shirt: String) {
-        this.shirt = shirt
-    }
-
-    override fun getSkin(): String? {
-        return skin
-    }
-
-    fun setSkin(skin: String) {
-        this.skin = skin
-    }
-
-    override fun getSize(): String? {
-        return size
-    }
-
-    fun setSize(size: String) {
-        this.size = size
-    }
-
-    override fun getHair(): Hair? {
-        return hair
-    }
-
-    fun setHair(hair: Hair) {
-        this.hair = hair
-    }
-
-    override fun getChair(): String? {
-        return if (chair != null && chair != "none") {
-            if (chair?.contains("chair_") == true) {
-                chair
-            } else {
-                "chair_" + chair!!
-            }
-        } else null
-    }
-
-    fun setChair(chair: String) {
-        this.chair = chair
-    }
-
-    override fun getUserId(): String? {
-        return userId
-    }
-
-    fun setUserId(userId: String?) {
-        this.userId = userId
-        if (hair?.isManaged == false) {
-            hair?.userId = userId
-        }
-        if (suppressModals?.isManaged == false) {
-            suppressModals?.userId = userId
-        }
-    }
-
     fun hasTaskBasedAllocation(): Boolean {
         return allocationMode?.toLowerCase(Locale.ROOT) == "taskbased" && automaticAllocation
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
index e5d09d4d1..0fb8a326b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
@@ -63,7 +63,13 @@ open class User : RealmObject(), Avatar, VersionedObject {
     override var versionNumber: Int = 0
 
     var balance: Double = 0.toDouble()
-    private var stats: Stats? = null
+    override var stats: Stats? = null
+        set(value) {
+            field = value
+            if (value != null && this.id != null && !value.isManaged) {
+                field?.userId = this.id
+            }
+        }
     var inbox: Inbox? = null
         set(inbox) {
             field = inbox
@@ -71,7 +77,13 @@ open class User : RealmObject(), Avatar, VersionedObject {
                 inbox.userId = this.id
             }
         }
-    private var preferences: Preferences? = null
+    override var preferences: Preferences? = null
+    set(value) {
+        field = value
+        if (value != null && this.id != null && !value.isManaged) {
+            field?.userId = this.id
+        }
+    }
     var profile: Profile? = null
         set(profile) {
             field = profile
@@ -174,59 +186,29 @@ open class User : RealmObject(), Avatar, VersionedObject {
     val formattedUsername: String?
         get() = if (username != null) "@$username" else null
 
-    override fun getPreferences(): Preferences? {
-        return preferences
-    }
+    override val gemCount: Int
+        get() = (this.balance * 4).toInt()
 
-    fun setPreferences(preferences: Preferences?) {
-        this.preferences = preferences
-        if (preferences != null && this.id != null && !preferences.isManaged) {
-            preferences.userId = this.id
-        }
-    }
+    override val hourglassCount: Int
+        get() = purchased?.plan?.consecutive?.trinkets ?: 0
 
-    override fun getStats(): Stats? {
-        return stats
-    }
+    override val costume: Outfit?
+        get() = items?.gear?.costume
 
-    fun setStats(stats: Stats?) {
-        this.stats = stats
-        if (stats != null && this.id != null && !stats.isManaged) {
-            stats.userId = this.id
-        }
-    }
-
-    override fun getGemCount(): Int {
-        return (this.balance * 4).toInt()
-    }
-
-    override fun getHourglassCount(): Int {
-        return purchased?.plan?.consecutive?.trinkets ?: 0
-    }
-
-    override fun getCostume(): Outfit? {
-        return items?.gear?.costume
-    }
-
-    override fun getEquipped(): Outfit? {
-        return items?.gear?.equipped
-    }
+    override val equipped: Outfit?
+        get() = items?.gear?.equipped
 
     override fun hasClass(): Boolean {
         return preferences?.disableClasses != true && flags?.classSelected == true && stats?.habitClass?.isNotEmpty() == true
     }
 
-    override fun getCurrentMount(): String? {
-        return items?.currentMount ?: ""
-    }
+    override val currentMount: String?
+        get() = items?.currentMount ?: ""
+    override val currentPet: String?
+        get() = items?.currentPet ?: ""
 
-    override fun getCurrentPet(): String? {
-        return items?.currentPet ?: ""
-    }
-
-    override fun getSleep(): Boolean {
-        return preferences?.sleep ?: false
-    }
+    override val sleep: Boolean
+        get() = preferences?.sleep ?: false
 
     fun hasParty(): Boolean {
         return this.party?.id?.length ?: 0 > 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
index fd64539a1..ab6963a6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
@@ -202,7 +202,7 @@ class AvatarView : View {
     private fun getAvatarLayerMap(avatar: Avatar, substitutions: Map<String, Map<String, String>>): EnumMap<LayerType, String> {
         val layerMap = EnumMap<LayerType, String>(LayerType::class.java)
 
-        if (!avatar.isValid) {
+        if (!avatar.isValid()) {
             return layerMap
         }
 
@@ -449,7 +449,7 @@ class AvatarView : View {
         initAvatarRectMatrix()
 
         // draw only when user is set
-        if (avatar?.isValid != true) return
+        if (avatar?.isValid() != true) return
 
         // request image layers if not yet processed
         if (multiDraweeHolder.size() == 0) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
index ca5e03258..e479b872f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
@@ -78,8 +78,8 @@ class AvatarWithBarsViewModel(private val context: Context, private val binding:
 
         binding.currencyView.gold = stats.gp ?: 0.0
         if (user is User) {
-            binding.currencyView.hourglasses = user.hourglassCount.toDouble()
-            binding.currencyView.gems = user.gemCount.toDouble()
+            binding.currencyView.hourglasses = user.hourglassCount?.toDouble() ?: 0.0
+            binding.currencyView.gems = user.gemCount?.toDouble() ?: 0.0
         }
 
         binding.currencyView.setOnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index 73fd637b8..261ece338 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -87,6 +87,7 @@ abstract class BaseActivity : AppCompatActivity() {
         loadTheme(PreferenceManager.getDefaultSharedPreferences(this))
     }
 
+
     override fun onPause() {
         isActivityVisible = false
         super.onPause()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
index 680c6fbaa..c08f376d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -405,7 +405,7 @@ class FullProfileActivity : BaseActivity() {
 
         addAttributeRow(getString(R.string.profile_allocated), stats.strength?.toFloat() ?: 0f, stats.intelligence?.toFloat() ?: 0f, stats.constitution?.toFloat() ?: 0f, stats.per?.toFloat() ?: 0f, true, false)
         addAttributeRow(getString(R.string.buffs), buffs?.str
-                ?: 0f, buffs?.get_int() ?: 0f, buffs?.con ?: 0f, buffs?.per ?: 0f, roundDown = true, isSummary = false)
+                ?: 0f, buffs?._int ?: 0f, buffs?.con ?: 0f, buffs?.per ?: 0f, roundDown = true, isSummary = false)
 
         // Summary row
         addAttributeRow("", attributeStrSum, attributeIntSum, attributeConSum, attributePerSum, roundDown = false, isSummary = true)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
index aad47184e..a7de2a8f1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
@@ -26,7 +26,6 @@ class GemPurchaseActivity : BaseActivity() {
     lateinit var userRepository: UserRepository
 
     internal var fragment: CheckoutFragment? = null
-    var isActive = false
     var purchaseHandler: PurchaseHandler? = null
 
     override fun getLayoutResId(): Int {
@@ -74,16 +73,6 @@ class GemPurchaseActivity : BaseActivity() {
         purchaseHandler?.startListening()
     }
 
-    override fun onResume() {
-        super.onResume()
-        isActive = true
-    }
-
-    override fun onPause() {
-        super.onPause()
-        isActive = false
-    }
-
     public override fun onStop() {
         purchaseHandler?.stopListening()
         super.onStop()
@@ -113,7 +102,7 @@ class GemPurchaseActivity : BaseActivity() {
 
     @Subscribe
     fun onConsumablePurchased(event: ConsumablePurchasedEvent) {
-        if (isActive) {
+        if (isActivityVisible) {
             purchaseHandler?.consumePurchase(event.purchase)
             compositeSubscription.add(userRepository.retrieveUser(false).subscribe({}, RxErrorHandler.handleEmptyError()))
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
index 819267186..bb20834ce 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
@@ -39,7 +39,7 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         super.onCreate(savedInstanceState)
 
         setupIntro()
-        //binding.viewPagerIndicator.setViewPager(binding.viewPager)
+        binding.viewPagerIndicator.setViewPager(binding.viewPager)
 
         binding.skipButton.setOnClickListener(this)
         binding.finishButton.setOnClickListener(this)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
index b9592ac46..721ec63ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
@@ -258,12 +258,20 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         if (this.isRegistering) {
             binding.loginBtn.text = getString(R.string.register_btn)
             binding.username.setHint(R.string.username)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                binding.username.setAutofillHints("newUsername")
+                binding.password.setAutofillHints("newPassword")
+            }
             binding.password.imeOptions = EditorInfo.IME_ACTION_NEXT
             binding.fbLoginButton.setText(R.string.register_btn_fb)
             binding.googleLoginButton.setText(R.string.register_btn_google)
         } else {
             binding.loginBtn.text = getString(R.string.login_btn)
             binding.username.setHint(R.string.email_username)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                binding.username.setAutofillHints("username")
+                binding.password.setAutofillHints("password")
+            }
             binding.password.imeOptions = EditorInfo.IME_ACTION_DONE
             binding.fbLoginButton.setText(R.string.login_btn_fb)
             binding.googleLoginButton.setText(R.string.login_btn_google)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index ecae48645..293607acd 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -417,7 +417,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             displayDeathDialogIfNeeded()
             YesterdailyDialog.showDialogIfNeeded(this, user?.id, userRepository, taskRepository)
 
-            if (user?.flags?.isVerifiedUsername == false && isActivityVisible) {
+            if (user?.flags?.verifiedUsername == false && isActivityVisible) {
                 val intent = Intent(this, VerifyUsernameActivity::class.java)
                 startActivity(intent)
             }
@@ -595,7 +595,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                         pushNotificationManager.addPushDeviceUsingStoredToken()
                     }
                     .flatMap { contentRepository.retrieveContent(this,false) }
-                    .flatMap { contentRepository.retrieveWorldState() }
+                    .flatMap { contentRepository.retrieveWorldState(this) }
                     .subscribe({ }, RxErrorHandler.handleEmptyError()))
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
index 61f615e1c..2dee954cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
@@ -177,7 +177,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                     val dialog = HabiticaAlertDialog(itemView.context)
                     dialog.setMessage(R.string.purchase_from_timetravel_shop)
                     dialog.addButton(R.string.go_shopping, true) { _, _ ->
-                        MainNavigationController.navigate(R.id.shopsFragment, bundleOf(Pair("selectedTab", 3)))
+                        MainNavigationController.navigate(R.id.timeTravelersShopFragment)
                     }
                     dialog.addButton(R.string.reward_dialog_dismiss, false)
                     dialog.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
index 0146c630a..e0f2a0d63 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
@@ -163,6 +163,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
 
             if (isSelected) {
                 itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.offset_background))
+                itemView.background.alpha = 69
                 titleTextView?.setTextColor(tintColor)
             } else {
                 itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.content_background))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
index 687bf5d27..d6467ff7d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.SkillListItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.user.SpecialItems
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
@@ -85,7 +86,11 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
                 binding.countLabel.visibility = View.VISIBLE
                 binding.countLabel.text = getOwnedCount(skill.key).toString()
                 binding.priceLabel.setText(R.string.skill_transformation_use)
-                binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.color_accent))
+                if (context.isUsingNightModeResources()) {
+                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.brand_500))
+                } else {
+                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.color_accent))
+                }
                 binding.buttonIconView.setImageDrawable(null)
                 binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
                 binding.buttonIconView.alpha = 1.0f
@@ -93,7 +98,11 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
             } else {
                 binding.countLabel.visibility = View.GONE
                 binding.priceLabel.text = skill.mana?.toString()
-                binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_10))
+                if (context.isUsingNightModeResources()) {
+                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_500))
+                } else {
+                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_10))
+                }
                 binding.buttonIconView.setImageDrawable(magicDrawable)
 
                 if (skill.mana ?: 0 > mana) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
index b7e73282e..bd239eb2b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
@@ -182,9 +182,9 @@ class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
                 val color = if (animal.type == "special") animal.color else null
                 if (animal.numberOwned > 0 || ownedEggs?.containsKey(animal.animal ?: "") == true) {
                     if (itemType == "pets") {
-                        MainNavigationController.navigate(StableFragmentDirections.openPetDetail(animal.animal, animal.type, color))
+                        MainNavigationController.navigate(StableFragmentDirections.openPetDetail(animal.animal ?: "", animal.type ?: "", color))
                     } else {
-                        MainNavigationController.navigate(StableFragmentDirections.openMountDetail(animal.animal, animal.type, color))
+                        MainNavigationController.navigate(StableFragmentDirections.openMountDetail(animal.animal ?: "", animal.type ?: "", color))
                     }
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
index ce23e4a7e..6539ceef6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
@@ -89,7 +89,7 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
             binding.gemIcon.setImageBitmap(HabiticaIconsHelper.imageOfGem())
 
             if (!viewUserChallengesOnly) {
-                binding.challengeName.setTextColor(ContextCompat.getColor(itemView.context, R.color.brand_200))
+                binding.challengeName.setTextColor(ContextCompat.getColor(itemView.context, R.color.text_brand))
             }
         }
 
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 a1c68bf80..1f278acc7 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
@@ -93,7 +93,7 @@ class NavigationDrawerFragment : DialogFragment() {
             context?.let {
                 adapter.tintColor = it.getThemeColor(R.attr.colorPrimary)
                 if (context?.isUsingNightModeResources() == true) {
-                    adapter.backgroundTintColor = ContextCompat.getColor(it, R.color.gray_10)
+                    adapter.backgroundTintColor = ContextCompat.getColor(it, R.color.gray_50)
                 } else {
                     adapter.backgroundTintColor = it.getThemeColor(R.attr.colorPrimary)
                 }
@@ -196,7 +196,7 @@ class NavigationDrawerFragment : DialogFragment() {
 
     private fun updateUser(user: User) {
         setMessagesCount(user.inbox?.newMessages ?: 0)
-        setSettingsCount(if (user.flags?.isVerifiedUsername != true) 1 else 0 )
+        setSettingsCount(if (user.flags?.verifiedUsername != true) 1 else 0 )
         setDisplayName(user.profile?.name)
         setUsername(user.formattedUsername)
         binding?.avatarView?.setAvatar(user)
@@ -312,7 +312,7 @@ class NavigationDrawerFragment : DialogFragment() {
     override fun onResume() {
         super.onResume()
 
-        activePromo = configManager.activePromo()
+        activePromo = context?.let { configManager.activePromo(it) }
         val promoItem = getItemWithIdentifier(SIDEBAR_PROMO) ?: return
         if (activePromo != null) {
             promoItem.isVisible = true
@@ -386,8 +386,9 @@ class NavigationDrawerFragment : DialogFragment() {
     }
 
     fun setSelection(transitionId: Int?, bundle: Bundle? = null, openSelection: Boolean = true) {
-        adapter.selectedItem = transitionId
         closeDrawer()
+        if (adapter.selectedItem == transitionId) return
+        adapter.selectedItem = transitionId
 
         if (!openSelection) {
             return
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
index 7e9ac7ac7..2b7731602 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
@@ -31,7 +31,7 @@ class PromoInfoFragment : BaseMainFragment<FragmentPromoInfoBinding>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val promo = configManager.activePromo()
+        val promo = context?.let { configManager.activePromo(it) }
         promo?.configureInfoFragment(this)
     }
 }
\ No newline at end of file
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 46c9dd1c2..9d81ca85a 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
@@ -217,11 +217,11 @@ class StatsFragment: BaseMainFragment<FragmentStatsBinding>() {
         binding?.perceptionStatsView?.levelValue = levelStat
 
         totalStrength += currentUser.stats?.buffs?.str?.toInt() ?: 0
-        totalIntelligence += currentUser.stats?.buffs?.get_int()?.toInt() ?: 0
+        totalIntelligence += currentUser.stats?.buffs?._int?.toInt() ?: 0
         totalConstitution += currentUser.stats?.buffs?.con?.toInt() ?: 0
         totalPerception += currentUser.stats?.buffs?.per?.toInt() ?: 0
         binding?.strengthStatsView?.buffValue = currentUser.stats?.buffs?.str?.toInt() ?: 0
-        binding?.intelligenceStatsView?.buffValue = currentUser.stats?.buffs?.get_int()?.toInt() ?: 0
+        binding?.intelligenceStatsView?.buffValue = currentUser.stats?.buffs?._int?.toInt() ?: 0
         binding?.constitutionStatsView?.buffValue = currentUser.stats?.buffs?.con?.toInt() ?: 0
         binding?.perceptionStatsView?.buffValue = currentUser.stats?.buffs?.per?.toInt() ?: 0
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
index bc2911a43..37c45cde3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
@@ -242,7 +242,7 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
     }
 
     private fun openMarket() {
-        MainNavigationController.navigate(R.id.shopsFragment)
+        MainNavigationController.navigate(R.id.marketFragment)
     }
 
     companion object {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
index 9a7d42a13..85e7a4e30 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
@@ -4,10 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.shops.Shop
 
-class MarketFragment: ShopsFragment() {
+class MarketFragment: ShopFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        lockTab = 0
+        shopIdentifier = Shop.MARKET
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
index 1850f81a1..f82675a92 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
@@ -4,10 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.shops.Shop
 
-class QuestShopFragment: ShopsFragment() {
+class QuestShopFragment: ShopFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        lockTab = 1
+        shopIdentifier = Shop.QUEST_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
index 695b6a64f..433f522b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
@@ -4,10 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.shops.Shop
 
-class SeasonalShopFragment: ShopsFragment() {
+class SeasonalShopFragment: ShopFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        lockTab = 2
+        shopIdentifier = Shop.SEASONAL_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index 772e1d690..1fdb0a8fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -4,7 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.GridLayoutManager
+import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
@@ -21,23 +23,29 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.inventory.ShopRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.views.CurrencyViews
 import org.greenrobot.eventbus.Subscribe
 import javax.inject.Inject
 
-class ShopFragment : BaseFragment<FragmentRecyclerviewBinding>() {
+open class ShopFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
+
+
+
+    internal val currencyView: CurrencyViews by lazy {
+        val view = CurrencyViews(context)
+        view
+    }
 
     var adapter: ShopRecyclerAdapter? = null
     var shopIdentifier: String? = null
-    var user: User? = null
     var shop: Shop? = null
     @Inject
     lateinit var inventoryRepository: InventoryRepository
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
-    lateinit var userRepository: UserRepository
-    @Inject
     lateinit var configManager: AppConfigManager
 
     private var layoutManager: GridLayoutManager? = null
@@ -50,14 +58,21 @@ class ShopFragment : BaseFragment<FragmentRecyclerviewBinding>() {
         return FragmentRecyclerviewBinding.inflate(inflater, container, false)
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        this.hidesToolbar = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
     override fun onDestroyView() {
-        userRepository.close()
         inventoryRepository.close()
+        socialRepository.close()
+        toolbarAccessoryContainer?.removeView(currencyView)
         super.onDestroyView()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        toolbarAccessoryContainer?.addView(currencyView)
         binding?.recyclerView?.setBackgroundResource(R.color.content_background)
 
         adapter = binding?.recyclerView?.adapter as? ShopRecyclerAdapter
@@ -102,7 +117,10 @@ class ShopFragment : BaseFragment<FragmentRecyclerviewBinding>() {
             }
         }
 
-        adapter?.user = user
+        compositeSubscription.add(userRepository.getUser().subscribe({
+            adapter?.user = user
+            updateCurrencyView(it)
+        }, RxErrorHandler.handleEmptyError()))
 
         compositeSubscription.add(socialRepository.getGroup(Group.TAVERN_ID)
                 .filter { it.hasActiveQuest }
@@ -113,6 +131,10 @@ class ShopFragment : BaseFragment<FragmentRecyclerviewBinding>() {
                 }, RxErrorHandler.handleEmptyError()))
 
         view.post { setGridSpanCount(view.width) }
+
+        currencyView.hourglassVisibility = View.GONE
+
+        context?.let { FirebaseAnalytics.getInstance(it).logEvent("open_shop", bundleOf(Pair("shopIdentifier", shopIdentifier))) }
     }
 
     override fun onResume() {
@@ -152,8 +174,6 @@ class ShopFragment : BaseFragment<FragmentRecyclerviewBinding>() {
                     this.adapter?.setShop(it)
                 }, RxErrorHandler.handleEmptyError()))
 
-
-
         compositeSubscription.add(this.inventoryRepository.getOwnedItems()
                 .subscribe({ adapter?.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(this.inventoryRepository.getInAppRewards()
@@ -238,4 +258,10 @@ class ShopFragment : BaseFragment<FragmentRecyclerviewBinding>() {
         }
     }
 
+
+    private fun updateCurrencyView(user: User) {
+        currencyView.gold = user.stats?.gp ?: 0.0
+        currencyView.gems = user.gemCount.toDouble()
+        currencyView.hourglasses = user.hourglassCount.toDouble()
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
deleted file mode 100644
index a0ce53343..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.shops
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.os.bundleOf
-import androidx.fragment.app.FragmentPagerAdapter
-import com.google.firebase.analytics.FirebaseAnalytics
-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.databinding.FragmentViewpagerBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.shops.Shop
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.views.CurrencyViews
-import javax.inject.Inject
-
-
-open class ShopsFragment : BaseMainFragment<FragmentViewpagerBinding>() {
-
-    protected var lockTab: Int? = null
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    private val currencyView: CurrencyViews by lazy {
-        val view = CurrencyViews(context)
-        view
-    }
-
-    override var binding: FragmentViewpagerBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
-        return FragmentViewpagerBinding.inflate(inflater, container, false)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        this.usesTabLayout = true
-        this.hidesToolbar = true
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding?.viewPager?.currentItem = 0
-        setViewPagerAdapter()
-        toolbarAccessoryContainer?.addView(currencyView)
-
-        if (lockTab == null) {
-            arguments?.let {
-                val args = ShopsFragmentArgs.fromBundle(it)
-                if (args.selectedTab > 0) {
-                    binding?.viewPager?.currentItem = args.selectedTab
-                }
-            }
-        } else {
-            this.usesTabLayout = false
-            tabLayout?.visibility = View.GONE
-            binding?.viewPager?.currentItem = lockTab ?: 0
-        }
-
-        context?.let { FirebaseAnalytics.getInstance(it).logEvent("open_shop", bundleOf(Pair("shopIndex", lockTab))) }
-
-        compositeSubscription.add(userRepository.getUser().subscribe({ updateCurrencyView(it) }, RxErrorHandler.handleEmptyError()))
-    }
-
-    override fun onDestroyView() {
-        toolbarAccessoryContainer?.removeView(currencyView)
-        super.onDestroyView()
-    }
-
-    override fun onDestroy() {
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    private fun setViewPagerAdapter() {
-        val fragmentManager = childFragmentManager
-
-        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager) {
-
-            override fun getItem(position: Int): androidx.fragment.app.Fragment {
-
-                val fragment = ShopFragment()
-
-                fragment.shopIdentifier = when (lockTab ?: position) {
-                    0 -> Shop.MARKET
-                    1 -> Shop.QUEST_SHOP
-                    2 -> Shop.SEASONAL_SHOP
-                    3 -> Shop.TIME_TRAVELERS_SHOP
-                    else -> ""
-                }
-                fragment.user = this@ShopsFragment.user
-
-                return fragment
-            }
-
-            override fun getCount(): Int = if (lockTab != null) 1 else 4
-
-            override fun getPageTitle(position: Int): CharSequence? {
-                return when (position) {
-                    0 -> context?.getString(R.string.market)
-                    1 -> context?.getString(R.string.quests)
-                    2 -> context?.getString(R.string.seasonalShop)
-                    3 -> context?.getString(R.string.timeTravelers)
-                    else -> ""
-                }
-            }
-        }
-
-        if (binding?.viewPager != null) {
-            tabLayout?.setupWithViewPager(binding?.viewPager)
-        }
-    }
-
-    private fun updateCurrencyView(user: User) {
-        currencyView.gold = user.stats?.gp ?: 0.0
-        currencyView.gems = user.gemCount.toDouble()
-        currencyView.hourglasses = user.hourglassCount.toDouble()
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
index 2bcc6b3a8..59bdc7542 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
@@ -4,10 +4,19 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.shops.Shop
 
-class TimeTravelersShopFragment: ShopsFragment() {
+class TimeTravelersShopFragment: ShopFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        lockTab = 3
+        shopIdentifier = Shop.TIME_TRAVELERS_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        currencyView.goldVisibility = View.GONE
+        currencyView.gemVisibility = View.GONE
+        currencyView.hourglassVisibility = View.VISIBLE
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
index c71478c79..002ea37a1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
@@ -131,7 +131,7 @@ class MountDetailRecyclerFragment : BaseMainFragment<FragmentRecyclerviewBinding
                         for (mount in unsortedAnimals) {
                             if (mount.type == "wacky" || mount.type == "special") continue
                             if (mount.type != lastMount?.type) {
-                                currentSection = StableSection(mount.type, mount.getTranslatedType(context))
+                                currentSection = StableSection(mount.type, mount.getTranslatedType(context) ?: "")
                                 items.add(currentSection)
                             }
                             currentSection?.let {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
index 8c286a7e9..4094d8d2f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
@@ -151,7 +151,7 @@ class PetDetailRecyclerFragment : BaseMainFragment<FragmentRecyclerviewBinding>(
                         for (pet in it.first) {
                             if (pet.type == "wacky" || pet.type == "special") continue
                             if (pet.type != lastPet?.type) {
-                                currentSection = StableSection(pet.type, pet.getTranslatedType(context))
+                                currentSection = StableSection(pet.type, pet.getTranslatedType(context) ?: "")
                                 items.add(currentSection)
                             }
                             currentSection?.let {section ->
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
index 1b8cb1a9a..af01f35a3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
@@ -46,7 +46,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
         super.onCreate(savedInstanceState)
 
         findPreference("login_name").title = context?.getString(R.string.username)
-        findPreference("confirm_username").isVisible = user?.flags?.isVerifiedUsername != true
+        findPreference("confirm_username").isVisible = user?.flags?.verifiedUsername != true
     }
 
     private fun updateUserFields() {
@@ -54,7 +54,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
         configurePreference(findPreference("email"), user?.authentication?.localAuthentication?.email, true)
         findPreference("change_password").isVisible = user?.authentication?.localAuthentication?.email?.isNotEmpty() == true
         findPreference("add_local_auth").isVisible = user?.authentication?.localAuthentication?.email?.isNotEmpty() != true
-        findPreference("confirm_username").isVisible = user?.flags?.isVerifiedUsername != true
+        findPreference("confirm_username").isVisible = user?.flags?.verifiedUsername != true
         val preference = findPreference("authentication_methods")
         val methods = mutableListOf<String>()
         if (user?.authentication?.localAuthentication?.email != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
index 7433efdbc..19d698ecd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
@@ -19,7 +19,6 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.helpers.*
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
-import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.prefs.TimePreference
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
@@ -76,10 +75,9 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         serverUrlPreference?.isVisible = false
         serverUrlPreference?.summary = preferenceManager.sharedPreferences.getString("server_url", "")
         val themePreference = findPreference("theme_name") as? ListPreference
-        themePreference?.isVisible = configManager.testingLevel() == AppTestingLevel.ALPHA || configManager.testingLevel() == AppTestingLevel.STAFF || BuildConfig.DEBUG
         themePreference?.summary = themePreference?.entry ?: "Default"
         val themeModePreference = findPreference("theme_mode") as? ListPreference
-        themeModePreference?.summary = themePreference?.entry ?: "Follow System"
+        themeModePreference?.summary = themeModePreference?.entry ?: "Follow System"
 
 
         val taskDisplayPreference = findPreference("task_display") as? ListPreference
@@ -227,6 +225,10 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 val activity = activity as? PrefsActivity ?: return
                 activity.reload()
             }
+            "theme_mode" -> {
+                val activity = activity as? PrefsActivity ?: return
+                activity.reload()
+            }
             "dailyDueDefaultView" -> userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
                     .subscribe({ }, RxErrorHandler.handleEmptyError())
             "server_url" -> {
@@ -250,18 +252,14 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
     override fun onDisplayPreferenceDialog(preference: Preference) {
         if (preference is TimePreference) {
             if (preference.getKey() == "cds_time") {
-                if (fragmentManager?.findFragmentByTag(DayStartPreferenceDialogFragment.TAG) == null) {
-                    fragmentManager?.let {
-                        DayStartPreferenceDialogFragment.newInstance(this, preference.getKey())
-                                .show(it, DayStartPreferenceDialogFragment.TAG)
-                    }
+                if (parentFragmentManager.findFragmentByTag(DayStartPreferenceDialogFragment.TAG) == null) {
+                    DayStartPreferenceDialogFragment.newInstance(this, preference.getKey())
+                                .show(parentFragmentManager, DayStartPreferenceDialogFragment.TAG)
                 }
             } else {
-                if (fragmentManager?.findFragmentByTag(TimePreferenceDialogFragment.TAG) == null) {
-                    fragmentManager?.let {
+                if (parentFragmentManager.findFragmentByTag(TimePreferenceDialogFragment.TAG) == null) {
                         TimePreferenceDialogFragment.newInstance(this, preference.getKey())
-                                .show(it, TimePreferenceDialogFragment.TAG)
-                    }
+                                .show(parentFragmentManager, TimePreferenceDialogFragment.TAG)
                 }
             }
         } else {
@@ -296,7 +294,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         audioThemePreference?.summary = audioThemePreference?.entry
 
         val preference = findPreference("authentication")
-        if (user?.flags?.isVerifiedUsername == true) {
+        if (user?.flags?.verifiedUsername == true) {
             preference.layoutResource = R.layout.preference_child_summary
             preference.summary = context?.getString(R.string.authentication_summary)
         } else {
@@ -308,7 +306,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         val inbox = user?.inbox
         disablePMsPreference?.isChecked = inbox?.optOut ?: true
 
-        if (user?.contributor?.admin == true) {
+        if (configManager.testingLevel() == AppTestingLevel.STAFF || BuildConfig.DEBUG) {
             serverUrlPreference?.isVisible = true
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
index 92b7237dc..27a5da1c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
@@ -1,27 +1,27 @@
 package com.habitrpg.android.habitica.ui.fragments.purchases
 
 import android.content.Intent
-import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 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.databinding.FragmentGemPurchaseBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.*
-import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity
 import com.habitrpg.android.habitica.ui.activities.GiftGemsActivity
 import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import javax.inject.Inject
 
@@ -33,8 +33,6 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>(), GemPurc
         return FragmentGemPurchaseBinding.inflate(inflater, container, false)
     }
 
-    @Inject
-    lateinit var crashlyticsProxy: CrashlyticsProxy
     @Inject
     lateinit var userRepository: UserRepository
     @Inject
@@ -54,9 +52,6 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>(), GemPurc
         binding?.gems42View?.setOnPurchaseClickListener { purchaseGems(PurchaseTypes.Purchase42Gems) }
         binding?.gems84View?.setOnPurchaseClickListener { purchaseGems(PurchaseTypes.Purchase84Gems) }
 
-        val heartDrawable = BitmapDrawable(resources, HabiticaIconsHelper.imageOfHeartLarge())
-        binding?.supportTextView?.setCompoundDrawablesWithIntrinsicBounds(null, null, null, heartDrawable)
-
         compositeSubscription.add(userRepository.getUser().subscribe({
             binding?.subscriptionPromo?.visibility = if (it.isSubscribed) View.GONE else View.VISIBLE
         }, RxErrorHandler.handleEmptyError()))
@@ -66,7 +61,11 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>(), GemPurc
         binding?.giftSubscriptionContainer?.isVisible = appConfigManager.enableGiftOneGetOne()
         binding?.giftSubscriptionContainer?.setOnClickListener { showGiftSubscriptionDialog() }
 
-        val promo = appConfigManager.activePromo()
+        if (context?.isUsingNightModeResources() == true) {
+            binding?.headerImageView?.setImageResource(R.drawable.gem_purchase_header_dark)
+        }
+
+        val promo = context?.let { appConfigManager.activePromo(it) }
         if (promo != null) {
             binding?.let {
                 promo.configurePurchaseBanner(it)
@@ -76,7 +75,11 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>(), GemPurc
                 promo.configureGemView(it.gems84View.binding, 84)
             }
             binding?.promoBanner?.setOnClickListener {
-                MainNavigationController.navigate(R.id.promoInfoFragment)
+                val fragment = PromoInfoFragment()
+                parentFragmentManager
+                        .beginTransaction()
+                        .replace(R.id.fragment_container, fragment as Fragment)
+                        .commit()
             }
         } else {
             binding?.promoBanner?.visibility = View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index 180f88939..a7f39c5cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -15,6 +15,7 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.events.UserSubscribedEvent
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
@@ -78,10 +79,10 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>(), GemPur
         binding?.giftSubscriptionContainer?.setOnClickListener { showGiftSubscriptionDialog() }
         binding?.giftSubscriptionButton?.setOnClickListener { showGiftSubscriptionDialog() }
 
-        binding?.subscription1month?.setOnPurchaseClickListener({ selectSubscription(PurchaseTypes.Subscription1Month) })
-        binding?.subscription3month?.setOnPurchaseClickListener({ selectSubscription(PurchaseTypes.Subscription3Month) })
-        binding?.subscription6month?.setOnPurchaseClickListener({ selectSubscription(PurchaseTypes.Subscription6Month) })
-        binding?.subscription12month?.setOnPurchaseClickListener({ selectSubscription(PurchaseTypes.Subscription12Month) })
+        binding?.subscription1month?.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription1Month) }
+        binding?.subscription3month?.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription3Month) }
+        binding?.subscription6month?.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription6Month) }
+        binding?.subscription12month?.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription12Month) }
 
         binding?.subscribeButton?.setOnClickListener { subscribeUser() }
 
@@ -204,14 +205,22 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>(), GemPur
             }
 
             if (isSubscribed) {
-                binding?.headerImageView?.setImageResource(R.drawable.subscriber_header)
+                if (context?.isUsingNightModeResources() == true) {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header_dark)
+                } else {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscriber_header)
+                }
                 binding?.subscriptionDetails?.visibility = View.VISIBLE
                 binding?.subscriptionDetails?.currentUserID = user?.id
                 user?.purchased?.plan?.let { binding?.subscriptionDetails?.setPlan(it) }
                 binding?.subscribeBenefitsTitle?.setText(R.string.subscribe_prompt_thanks)
                 binding?.subscriptionOptions?.visibility = View.GONE
             } else {
-                binding?.headerImageView?.setImageResource(R.drawable.subscribe_header)
+                if (context?.isUsingNightModeResources() == true) {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header_dark)
+                } else {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header)
+                }
                 if (!hasLoadedSubscriptionOptions) {
                     return
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
index a92dc0cc4..c02ab603c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
@@ -99,7 +99,7 @@ class ChatFragment : BaseFragment<FragmentChatBinding>() {
 
         viewModel?.getUserData()?.observe(viewLifecycleOwner, {
             chatAdapter?.user = it
-            binding?.chatBarView?.hasAcceptedGuidelines = it?.flags?.isCommunityGuidelinesAccepted == true
+            binding?.chatBarView?.hasAcceptedGuidelines = it?.flags?.communityGuidelinesAccepted == true
         })
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 634e19e8b..9d909a1ae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -76,7 +76,7 @@ class ChallengeListFragment : BaseFragment<FragmentChallengeslistBinding>(), and
         binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this.activity)
         binding?.recyclerView?.adapter = challengeAdapter
         if (!viewUserChallengesOnly) {
-            binding?.recyclerView?.setBackgroundResource(R.color.white)
+            binding?.recyclerView?.setBackgroundResource(R.color.content_background)
         }
 
         compositeSubscription.add(socialRepository.getGroup(Group.TAVERN_ID).combineLatest(socialRepository.getUserGroups("guild")).subscribe({
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
index f5f6d7562..24ce93f84 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
@@ -47,7 +47,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
         view.post { setGridSpanCount(view.width) }
         context?.let {
-            binding?.recyclerView?.setBackgroundColor(ContextCompat.getColor(it, R.color.white))
+            binding?.recyclerView?.setBackgroundColor(ContextCompat.getColor(it, R.color.content_background))
         }
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index 03857a7aa..6d4d9f4eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -162,6 +162,7 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        context?.let { binding?.recyclerView?.setBackgroundColor(ContextCompat.getColor(it, R.color.content_background)) }
         if (Task.TYPE_DAILY == classType) {
             if (user?.isValid == true && user?.preferences?.dailyDueDefaultView == true) {
                 taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
index 24d601990..aedbf3db6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
@@ -164,7 +164,7 @@ object DataBindingUtils {
         tempMap["Mount_Body_Gryphon-Gryphatrice"] = "gif"
         tempMap["background_clocktower"] = "gif"
         tempMap["background_airship"] = "gif"
-        tempMap["background_steamwork"] = "gif"
+        tempMap["background_steamworks"] = "gif"
         tempMap["Pet_HatchingPotion_Veggie"] = "gif"
         tempMap["Pet_HatchingPotion_Dessert"] = "gif"
         tempMap["Pet-HatchingPotion-Dessert"] = "gif"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
index 0a5996232..545c1cda0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
@@ -148,7 +148,7 @@ class ChatRecyclerViewHolder(itemView: View, private var userId: String, private
         binding.messageWrapper.background = if ((name != null && msg.text?.contains("@$name") == true) || (username != null && msg.text?.contains(username) == true)) {
             ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_700)
         } else {
-            ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
+            ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
         }
         binding.messageWrapper.setScaledPadding(context, 8, 8, 8, 8)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
index 3667d9116..48325f27a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
@@ -56,7 +56,7 @@ class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject
         menu.setTitle(animal?.text)
         menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.equip)))
         menu.setSelectionRunnable {
-            animal?.let { equipEvents.onNext(it.key) }
+            animal?.let { equipEvents.onNext(it.key ?: "") }
         }
         menu.show()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
index 6d479c769..0cea784fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
@@ -122,7 +122,7 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject<S
             when (index) {
                 0 -> {
                     animal?.let {
-                        equipEvents.onNext(it.key)
+                        equipEvents.onNext(it.key ?: "")
                     }
                 }
                 1 -> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
index b2c1bf1b3..8a582e985 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
@@ -30,8 +30,8 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
     var errorButtonClicked: Action? = null
     protected var context: Context
     private val mainTaskWrapper: ViewGroup = itemView.findViewById(R.id.main_task_wrapper)
-    private val titleTextView: EllipsisTextView = itemView.findViewById(R.id.checkedTextView)
-    private val notesTextView: EllipsisTextView? = itemView.findViewById(R.id.notesTextView)
+    protected val titleTextView: EllipsisTextView = itemView.findViewById(R.id.checkedTextView)
+    protected val notesTextView: EllipsisTextView? = itemView.findViewById(R.id.notesTextView)
     protected val calendarIconView: ImageView? = itemView.findViewById(R.id.iconViewCalendar)
     protected val specialTaskTextView: TextView? = itemView.findViewById(R.id.specialTaskText)
     private val iconViewChallenge: ImageView? = itemView.findViewById(R.id.iconviewChallenge)
@@ -115,6 +115,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
     }
 
     override fun bind(data: Task, position: Int, displayMode: String) {
+        notesExpanded = false
         task = data
         itemView.setBackgroundColor(context.getThemeColor(R.attr.colorContentBackground))
 
@@ -123,6 +124,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         notesTextView?.maxLines = 5
         if (data.notes?.isNotEmpty() == true) {
             notesTextView?.visibility = View.VISIBLE
+            notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
             //expandNotesButton.visibility = if (notesTextView.hadEllipses() || notesExpanded) View.VISIBLE else View.GONE
         } else {
             notesTextView?.visibility = View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
index a4a837161..38163ba0f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
@@ -24,10 +24,10 @@ import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 
-abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), var scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit), openTaskFunc: ((Task) -> Unit), brokenTaskFunc: ((Task) -> Unit)) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc), CompoundButton.OnCheckedChangeListener {
+abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), var scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit), openTaskFunc: ((Task) -> Unit), brokenTaskFunc: ((Task) -> Unit)) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
 
     private val checkboxHolder: ViewGroup = itemView.findViewById(R.id.checkBoxHolder)
-    internal val checkbox: CheckBox = itemView.findViewById(R.id.checkBox)
+    internal val checkmarkView: ImageView = itemView.findViewById(R.id.checkmark)
     internal val checklistView: LinearLayout = itemView.findViewById(R.id.checklistView)
     internal val checklistIndicatorWrapper: ViewGroup = itemView.findViewById(R.id.checklistIndicatorWrapper)
     private val checklistCompletedTextView: TextView = itemView.findViewById(R.id.checkListCompletedTextView)
@@ -37,33 +37,36 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
     init {
         checklistIndicatorWrapper.isClickable = true
         checklistIndicatorWrapper.setOnClickListener { onChecklistIndicatorClicked() }
-        expandCheckboxTouchArea(checkboxHolder, checkbox)
+        checkboxHolder.setOnClickListener {
+            onCheckedChanged(!(task?.completed ?: false))
+        }
     }
 
-    override fun bind(newTask: Task, position: Int, displayMode: String) {
-        checkbox.setOnCheckedChangeListener(this)
-        var completed = newTask.completed
-        if (newTask.isPendingApproval) {
+    override fun bind(data: Task, position: Int, displayMode: String) {
+        var completed = data.completed
+        if (data.isPendingApproval) {
             completed = false
         }
-        this.checkbox.isChecked = completed
-        if (this.shouldDisplayAsActive(newTask) && !newTask.isPendingApproval) {
-            this.checkboxHolder.setBackgroundResource(newTask.lightTaskColor)
+        this.checkmarkView.visibility = if (completed) View.VISIBLE else View.GONE
+        this.checklistCompletedTextView.text = data.completedChecklistCount.toString()
+        this.checklistAllTextView.text = data.checklist?.size.toString()
+
+        this.checklistView.removeAllViews()
+        this.updateChecklistDisplay()
+
+        this.checklistIndicatorWrapper.visibility = if (data.checklist?.size == 0) View.GONE else View.VISIBLE
+        super.bind(data, position, displayMode)
+
+        if (this.shouldDisplayAsActive(data) && !data.isPendingApproval) {
+            this.checkboxHolder.setBackgroundResource(data.lightTaskColor)
         } else {
-            if (newTask.completed) {
+            notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
+            if (data.completed) {
                 this.checkboxHolder.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
             } else {
                 this.checkboxHolder.setBackgroundColor(this.taskGray)
             }
         }
-        this.checklistCompletedTextView.text = newTask.completedChecklistCount.toString()
-        this.checklistAllTextView.text = newTask.checklist?.size.toString()
-
-        this.checklistView.removeAllViews()
-        this.updateChecklistDisplay()
-
-        this.checklistIndicatorWrapper.visibility = if (newTask.checklist?.size == 0) View.GONE else View.VISIBLE
-        super.bind(newTask, position, displayMode)
     }
 
     abstract fun shouldDisplayAsActive(newTask: Task): Boolean
@@ -76,7 +79,7 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
                 checklistView.removeAllViews()
                 for (item in this.task?.checklist ?: emptyList<ChecklistItem>()) {
                     val itemView = layoutInflater?.inflate(R.layout.checklist_item_row, this.checklistView, false)
-                    val checkboxBackground = itemView?.findViewById<FrameLayout>(R.id.checkBoxBackground)
+                    val checkboxBackground = itemView?.findViewById<View>(R.id.checkBoxBackground)
                     if (task?.type == Task.TYPE_TODO) {
                         checkboxBackground?.setBackgroundResource(R.drawable.round_checklist_unchecked)
                     }
@@ -165,21 +168,18 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
         }
     }
 
-    override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
-        if (buttonView == checkbox) {
-            if (task?.isValid != true) {
-                return
-            }
-            if (isChecked != task?.completed) {
-                task?.let { scoreTaskFunc(it, if (task?.completed == false) TaskDirection.UP else TaskDirection.DOWN) }
-            }
+    fun onCheckedChanged(isChecked: Boolean) {
+        if (task?.isValid != true) {
+            return
+        }
+        if (isChecked != task?.completed) {
+            task?.let { scoreTaskFunc(it, if (task?.completed == false) TaskDirection.UP else TaskDirection.DOWN) }
         }
     }
 
     override fun setDisabled(openTaskDisabled: Boolean, taskActionsDisabled: Boolean) {
         super.setDisabled(openTaskDisabled, taskActionsDisabled)
-
-        this.checkbox.isEnabled = !taskActionsDisabled
+        this.checkboxHolder.isEnabled = !taskActionsDisabled
     }
 
     companion object {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
index a7d9b0380..61fa6a000 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
@@ -15,9 +15,11 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
 
     private val btnPlusWrapper: FrameLayout = itemView.findViewById(R.id.btnPlusWrapper)
     private val btnPlusIconView: ImageView = itemView.findViewById(R.id.btnPlusIconView)
+    private val btnPlusCircleView: View = itemView.findViewById(R.id.button_plus_circle_view)
     private val btnPlus: Button = itemView.findViewById(R.id.btnPlus)
     private val btnMinusWrapper: FrameLayout = itemView.findViewById(R.id.btnMinusWrapper)
     private val btnMinusIconView: ImageView = itemView.findViewById(R.id.btnMinusIconView)
+    private val btnMinusCircleView: View = itemView.findViewById(R.id.button_minus_circle_view)
     private val btnMinus: Button = itemView.findViewById(R.id.btnMinus)
 
     init {
@@ -33,26 +35,23 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
             plusIcon?.setTintMode(PorterDuff.Mode.MULTIPLY)
             this.btnPlusIconView.setImageDrawable(plusIcon)
             val drawable = ContextCompat.getDrawable(context, R.drawable.habit_circle)
-            if (context.isUsingNightModeResources()) {
-                this.btnPlusWrapper.setBackgroundResource(data.mediumTaskColor)
-                drawable?.setTint(ContextCompat.getColor(context, data.darkTaskColor))
-            } else {
-                this.btnPlusWrapper.setBackgroundResource(data.lightTaskColor)
-                drawable?.setTint(ContextCompat.getColor(context, data.mediumTaskColor))
-            }
+            this.btnPlusWrapper.setBackgroundResource(data.lightTaskColor)
+            drawable?.setTint(ContextCompat.getColor(context, data.mediumTaskColor))
             drawable?.setTintMode(PorterDuff.Mode.MULTIPLY)
-            btnPlusIconView.background = drawable
+            btnPlusCircleView.background = drawable
             this.btnPlus.visibility = View.VISIBLE
             this.btnPlus.isClickable = true
+            btnPlusIconView.background.alpha = 255
         } else {
             this.btnPlusWrapper.setBackgroundResource(R.color.habit_inactive_gray)
             val plusIcon = ContextCompat.getDrawable(context, R.drawable.habit_plus)
             plusIcon?.setTint(ContextCompat.getColor(context, R.color.content_background_offset))
             plusIcon?.setTintMode(PorterDuff.Mode.MULTIPLY)
             this.btnPlusIconView.setImageDrawable(plusIcon)
-            btnPlusIconView.background = ContextCompat.getDrawable(context, R.drawable.habit_circle_disabled)
+            btnPlusCircleView.background = ContextCompat.getDrawable(context, R.drawable.habit_circle_disabled)
             this.btnPlus.visibility = View.GONE
             this.btnPlus.isClickable = false
+            btnPlusIconView.background.alpha = 0
         }
 
         if (data.down == true) {
@@ -62,26 +61,23 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
             minusIcon?.setTintMode(PorterDuff.Mode.MULTIPLY)
             this.btnMinusIconView.setImageDrawable(minusIcon)
             val drawable = ContextCompat.getDrawable(context, R.drawable.habit_circle)
-            if (context.isUsingNightModeResources()) {
-                this.btnMinusWrapper.setBackgroundResource(data.mediumTaskColor)
-                drawable?.setTint(ContextCompat.getColor(context, data.darkTaskColor))
-            } else {
-                this.btnMinusWrapper.setBackgroundResource(data.lightTaskColor)
-                drawable?.setTint(ContextCompat.getColor(context, data.mediumTaskColor))
-            }
+            this.btnMinusWrapper.setBackgroundResource(data.lightTaskColor)
+            drawable?.setTint(ContextCompat.getColor(context, data.mediumTaskColor))
             drawable?.setTintMode(PorterDuff.Mode.MULTIPLY)
-            btnMinusIconView.background = drawable
+            btnMinusCircleView.background = drawable
             this.btnMinus.visibility = View.VISIBLE
             this.btnMinus.isClickable = true
+            btnMinusIconView.background.alpha = 255
         } else {
             this.btnMinusWrapper.setBackgroundResource(R.color.habit_inactive_gray)
             val minusIcon = ContextCompat.getDrawable(context, R.drawable.habit_minus)
             minusIcon?.setTint(ContextCompat.getColor(context, R.color.content_background_offset))
             minusIcon?.setTintMode(PorterDuff.Mode.MULTIPLY)
             this.btnMinusIconView.setImageDrawable(minusIcon)
-            btnMinusIconView.background = ContextCompat.getDrawable(context, R.drawable.habit_circle_disabled)
+            btnMinusCircleView.background = ContextCompat.getDrawable(context, R.drawable.habit_circle_disabled)
             this.btnMinus.visibility = View.GONE
             this.btnMinus.isClickable = false
+            btnMinusIconView.background.alpha = 0
         }
 
         var streakString = ""
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
index cef44db21..84c99319c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
@@ -63,8 +63,8 @@ class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) ->
 
         if (canBuy) {
             binding.goldIcon.alpha = 1.0f
-            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.yellow_1))
-            binding.buyButton.setBackgroundColor(ContextCompat.getColor(context, R.color.yellow_500))
+            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.reward_buy_button_text))
+            binding.buyButton.setBackgroundColor(ContextCompat.getColor(context, R.color.reward_buy_button_bg))
         } else {
             binding.goldIcon.alpha = 0.6f
             binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
index 4ffa6fb0e..9aa9d2f83 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
@@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.NumberAbbreviator
 
 class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
+    var hideWhenEmpty: Boolean = false
     var lightBackground: Boolean = false
         set(value) {
             field = value
@@ -32,8 +33,9 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
                 attrs,
                 R.styleable.CurrencyViews,
                 0, 0)
+        val fallBackLight = !context.isUsingNightModeResources()
         lightBackground = try {
-            attributes?.getBoolean(R.styleable.CurrencyView_hasLightBackground, true) ?: true
+            attributes?.getBoolean(R.styleable.CurrencyView_hasLightBackground, fallBackLight) ?: fallBackLight
         } catch (_: ArrayIndexOutOfBoundsException) {
             !context.isUsingNightModeResources()
         }
@@ -79,6 +81,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
                 setTextColor(ContextCompat.getColor(context, R.color.brand_500))
             }
         }
+        hideWhenEmpty = "hourglasses" == currency
     }
 
     private var drawable: BitmapDrawable? = null
@@ -135,7 +138,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
     }
 
     private fun updateVisibility() {
-        visibility = if ("hourglasses" == this.currency) {
+        visibility = if (hideWhenEmpty) {
             if ("0" == text) View.GONE else View.VISIBLE
         } else {
             View.VISIBLE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
index 32f0a7a10..48b0c5dbf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.views
 import android.content.Context
 import android.util.AttributeSet
 import android.util.TypedValue
+import android.view.View
 import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
@@ -29,6 +30,19 @@ class CurrencyViews : LinearLayout {
         get() = hourglassTextView.value
         set(value) { hourglassTextView.value = value }
 
+    var hourglassVisibility
+        get() = hourglassTextView.visibility
+        set(value) {
+            hourglassTextView.visibility = value
+            hourglassTextView.hideWhenEmpty = false
+        }
+    var goldVisibility: Int
+        get() = goldTextView.visibility
+        set(value) { goldTextView.visibility = value }
+    var gemVisibility
+        get() = gemTextView.visibility
+        set(value) { gemTextView.visibility = value }
+
 
     constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
         val attributes = context?.theme?.obtainStyledAttributes(
@@ -36,7 +50,7 @@ class CurrencyViews : LinearLayout {
                 R.styleable.CurrencyViews,
                 0, 0)
         setupViews()
-        val fallBackLight = !(context?.isUsingNightModeResources() == true)
+        val fallBackLight = context?.isUsingNightModeResources() != true
         lightBackground = attributes?.getBoolean(R.styleable.CurrencyViews_hasLightBackground, fallBackLight) ?: fallBackLight
     }
 
@@ -53,6 +67,7 @@ class CurrencyViews : LinearLayout {
 
     private fun setupView(view: CurrencyView, margin: Int) {
         this.addView(view)
+        view.textSize = 12f
         val params = view.layoutParams as? LayoutParams
         params?.marginStart = margin
         view.layoutParams = params
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt
new file mode 100644
index 000000000..ac487cdb6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt
@@ -0,0 +1,22 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
+
+
+class DayNightTextView(context: Context, attrs: AttributeSet?) : AppCompatTextView(context, attrs) {
+
+    init {
+        val attributes = context.theme?.obtainStyledAttributes(attrs, R.styleable.DayNightTextView, 0, 0)
+        setTextColor(if (context.isUsingNightModeResources()) {
+            attributes?.getColor(R.styleable.DayNightTextView_nightTextColor, ContextCompat.getColor(context, R.color.text_primary))
+        } else {
+            attributes?.getColor(R.styleable.DayNightTextView_dayTextColor, ContextCompat.getColor(context, R.color.text_primary))
+        } ?: ContextCompat.getColor(context, R.color.text_primary))
+    }
+
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
index dfc304370..4d00285fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
@@ -46,11 +46,11 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
 
     override fun onFinishInflate() {
         super.onFinishInflate()
+        leftCloudView = findViewById(R.id.left_cloud_view)
+        rightCloudView = findViewById(R.id.right_cloud_view)
         starViews = ArrayList()
         generateStars()
         animateClouds()
-        leftCloudView = findViewById(R.id.left_cloud_view)
-        rightCloudView = findViewById(R.id.right_cloud_view)
     }
 
     private fun animateClouds() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
index a2e4cbb4b..14ad0c727 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
@@ -25,7 +25,7 @@ class BottomNavigationItem @JvmOverloads constructor(
         if (isActive) {
             binding.selectedTitleView.visibility = selectedVisibility
             binding.titleView.visibility = View.GONE
-            binding.iconView.drawable.setColorFilter(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.MULTIPLY )
+            binding.iconView.drawable.setColorFilter(context.getThemeColor(R.attr.colorPrimaryDistinct), PorterDuff.Mode.MULTIPLY )
         } else {
             binding.selectedTitleView.visibility = View.GONE
             binding.titleView.visibility = deselectedVisibility
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
index 3b79dd94f..5613695e8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
@@ -47,9 +47,12 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
     var onAddListener:  ((String) -> Unit)? = null
     var activeTaskType: String = Task.TYPE_HABIT
     set(value) {
+        val wasChanged = field != value
         field = value
-        updateItemSelection()
-        onTabSelectedListener?.invoke(value)
+        if (wasChanged) {
+            updateItemSelection()
+            onTabSelectedListener?.invoke(value)
+        }
     }
 
     val barHeight: Int
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
index d8211e1d7..7bd59bbe8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
@@ -69,7 +69,7 @@ class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context,
                 R.styleable.StatsView,
                 0, 0)
 
-        val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layout_top_rounded_bg)
+        val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layout_top_rounded_bg_white)
         if (attributes != null) {
             statColor = attributes.getColor(R.styleable.StatsView_statsColor, 0)
             backgroundDrawable?.setColorFilter(attributes.getColor(R.styleable.StatsView_titleBackgroundColor, 0), PorterDuff.Mode.MULTIPLY)
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 67a972899..14ee844b1 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
@@ -130,7 +130,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
                     verticalPadding,
                     tagCheckbox.paddingRight,
                     verticalPadding)
-            tagCheckbox.setTextColor(ContextCompat.getColor(context, R.color.textColorLight))
+            tagCheckbox.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
             CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList)
             tagCheckbox.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
@@ -155,7 +155,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
         button.setOnClickListener { createTag() }
         button.setCompoundDrawablesWithIntrinsicBounds(addIcon, null, null, null)
         button.setBackgroundResource(R.drawable.layout_rounded_bg_lighter_gray)
-        button.setTextColor(ContextCompat.getColor(context, R.color.text_light))
+        button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
         tagsList.addView(button)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
index 1715e2cee..60bff958d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
@@ -124,6 +124,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
         val checkbox = taskView.findViewById(R.id.checkBox) as? CheckBox
         val checkboxHolder = taskView.findViewById<View>(R.id.checkBoxHolder)
         checkbox?.isChecked = completed
+        checkbox?.buttonTintList = ContextCompat.getColorStateList(context, R.color.checkbox_fill)
         if (completed) {
             checkboxHolder.setBackgroundColor(this.taskGray)
         } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
index ebeb26846..4dc27ac58 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
@@ -51,10 +51,6 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
             pet.key = petObj.getAsString("key")
             pet.text = petObj.getAsString("text")
             pet.type = petObj.getAsString("type")
-            if (pet.type == "special") {
-                pet.animal = pet.key.split("-")[0]
-                pet.color = pet.key.split("-")[1]
-            }
             if (pet.type == "premium") {
                 pet.premium = true
             }
@@ -70,10 +66,6 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
             mount.key = mountObj.getAsString("key")
             mount.text = mountObj.getAsString("text")
             mount.type = mountObj.getAsString("type")
-            if (mount.type == "special") {
-                mount.animal = mount.key.split("-")[0]
-                mount.color = mount.key.split("-")[1]
-            }
             if (mount.type == "premium") {
                 mount.premium = true
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
index ff5c4e42c..334eafc8e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
@@ -17,18 +17,20 @@ import java.util.TimeZone
 
 class DateDeserializer : JsonDeserializer<Date>, JsonSerializer<Date> {
 
-    private val dateFormat: DateFormat
-    private val alternativeFormat: DateFormat
-    private val nextDueFormat: DateFormat
+    private var dateFormats = mutableListOf<DateFormat>()
 
     init {
-        dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
-        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
-        alternativeFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US)
-        alternativeFormat.timeZone = TimeZone.getTimeZone("UTC")
-        nextDueFormat = SimpleDateFormat("E MMM dd yyyy HH:mm:ss zzzz", Locale.US)
-        nextDueFormat.timeZone = TimeZone.getTimeZone("UTC")
+        addFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+        addFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
+        addFormat("E MMM dd yyyy HH:mm:ss zzzz")
+        addFormat("yyyy-MM-dd'T'HH:mm:sszzz")
+        addFormat("yyyy-MM-dd")
+    }
 
+    private fun addFormat(s: String) {
+        val dateFormat = SimpleDateFormat(s, Locale.US)
+        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
+        dateFormats.add(dateFormat)
     }
 
     @Synchronized
@@ -45,37 +47,18 @@ class DateDeserializer : JsonDeserializer<Date>, JsonSerializer<Date> {
             return null
         }
         val jsonString = element.asString
-        return try {
-            dateFormat.parse(jsonString)
-        } catch (e: ParseException) {
-            try {
-                alternativeFormat.parse(jsonString)
-            } catch (e1: ParseException) {
-                try {
-                    nextDueFormat.parse(jsonString)
-                } catch (e2: ParseException) {
-                    try {
-                        val timestamp = jsonElement.asLong
-                        if (timestamp > 0) {
-                            Date(timestamp)
-                        } else {
-                            null
-                        }
-                    } catch (e3: NumberFormatException) {
-                        null
-                    }
-
-                }
-
-            }
-
+        var date: Date? = null
+        var index = 0
+        while (index < dateFormats.size && date != null) {
+            date = dateFormats[index].parse(jsonString)
+            index += 1
         }
-
+        return date
     }
 
     override fun serialize(src: Date?, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
         return if (src == null) {
             JsonPrimitive("")
-        } else JsonPrimitive(this.dateFormat.format(src))
+        } else JsonPrimitive(this.dateFormats[0].format(src))
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
index 1e0dd78e1..d7eb91821 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
@@ -60,10 +60,10 @@ class MemberSerialization : JsonDeserializer<Member> {
 
             val items = obj.getAsJsonObject("items")
             if (items.has("currentMount") && items.get("currentMount").isJsonPrimitive) {
-                member.setCurrentMount(items.get("currentMount").asString)
+                member.currentMount = items.get("currentMount").asString
             }
             if (items.has("currentPet") && items.get("currentPet").isJsonPrimitive) {
-                member.setCurrentPet(items.get("currentPet").asString)
+                member.currentPet = items.get("currentPet").asString
             }
             if (items.has("gear")) {
                 val gear = items.getAsJsonObject("gear")
diff --git a/Habitica/staff/release/output-metadata.json b/Habitica/staff/release/output-metadata.json
index a8d7fe899..f6e588bb8 100644
--- a/Habitica/staff/release/output-metadata.json
+++ b/Habitica/staff/release/output-metadata.json
@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 2523,
+      "versionCode": 2542,
       "versionName": "3.0",
       "enabled": true,
       "outputFile": "Habitica-staff-release.apk"